Backend : correctifs

ShopBundle/Controller/Backend/UserMerchantController.php

@@ -12,6 +12,7 @@ use Lc\ShopBundle\Context\UserInterface;
 use Lc\ShopBundle\Form\Backend\UserMerchant\CreditHistoryType;
 use Lc\ShopBundle\Services\CreditUtils;
 use Lc\ShopBundle\Services\Utils;
+use Lc\ShopBundle\Services\UtilsManager;
 use Mailjet\MailjetSwiftMailer\SwiftMailer\MailjetTransport;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -22,10 +23,10 @@ class UserMerchantController extends AdminController
 {
         protected $creditUtils;
 
-        public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, Utils $utils, MerchantUtilsInterface $merchantUtils, MailjetTransport $mailjetTransport, OrderUtilsInterface $orderUtils, TranslatorInterface $translator, CreditUtils $creditUtils)
+        public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator)
         {
-                parent::__construct($security, $userManager, $em, $utils, $merchantUtils, $mailjetTransport, $orderUtils, $translator);
-                $this->creditUtils = $creditUtils;
+                parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator);
+                $this->creditUtils = $utilsManager->getCreditUtils();
         }
 
         public function addCreditHistoryAction(){

ShopBundle/Resources/views/backend/default/block/macros.html.twig

@@ -26,7 +26,7 @@
 {% endmacro card_end %}
 
 
-{#
+
 
 
 {% macro startCard(col, zone = "default", card ='primary', fullWidth = false ) %}
@@ -55,7 +55,7 @@
 </div>
     {% if noCol == false %}</div>{% endif %}
 {% endmacro endCard %}
-#}
+
 
 
 

ShopBundle/Resources/views/backend/default/list.html.twig

@@ -136,7 +136,7 @@
                                     {% elseif metadata.type == 'association'  %}
                                         {% set searchable= "select" %}
                                     {% elseif metadata.type == 'date'  %}
-                                        {% set searchable= "date" %}#}
+                                        {% set searchable= "date" %}
                                     {% elseif metadata.type=="toggle" %}
                                         {% set searchable= "select" %}
                                     {% endif %}

ShopBundle/Resources/views/backend/merchant/panel_general.html.twig

@@ -6,21 +6,21 @@
         <div class="col-12">
             {{ form_row(form.title) }}
         </div>
-        <div class="col-12">
+        {#<div class="col-12">
             {{ form_row(form.subtitle) }}
-        </div>
-        <div class="col-12">
+        </div>#}
+        {#<div class="col-12">
             {{ form_row(form.kmsHub) }}
-        </div>
-        <div class="col-12">
+        </div>#}
+        {#<div class="col-12">
             {{ form_row(form.imageFile) }}
-        </div>
-        <div class="col-12">
+        </div>#}
+        {#<div class="col-12">
             {{ form_row(form.description) }}
-        </div>
-        <div class="col-12">
+        </div>#}
+        {#<div class="col-12">
             {{ form_row(form.user) }}
-        </div>
+        </div>#}
         {{ macros.card_end() }}
     </div>
 </div>