Merge pull request #8 from zawaze/master

Update and fix
thelia-modules · Sep 3, 2018 · f3d1e65 · f3d1e65
2 parents 9e2d073 + 2ef10fd
commit f3d1e65
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 4 deletions.
diff --git a/Config/config.xml b/Config/config.xml
@@ -28,6 +28,9 @@
             <argument type="service" id="thelia.taxEngine"/>
             <tag name="kernel.event_subscriber"/>
         </service>
+
+        <service id="module.data.service" class="OrderCreation\Service\ModuleDataService">
+        </service>
     </services>
 
     <hooks>

diff --git a/Config/module.xml b/Config/module.xml
@@ -7,7 +7,7 @@
     <descriptive locale="fr_FR">
         <title>Creation de commande dans le BackOffice</title>
     </descriptive>
-    <version>1.5</version>
+    <version>1.6</version>
     <author>
         <name>gbarral</name>
         <email>[email protected]</email>

diff --git a/Controller/Admin/OrderCreationAdminController.php b/Controller/Admin/OrderCreationAdminController.php
@@ -12,6 +12,7 @@
 use OrderCreation\Form\OrderCreationCreateForm;
 use OrderCreation\OrderCreation;
 use OrderCreation\OrderCreationConfiguration;
+use OrderCreation\Service\ModuleDataService;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\ActiveQuery\Join;
 use Propel\Runtime\Propel;
@@ -48,8 +49,17 @@ public function addItemAction($position)
 
     public function getConfigurationAjaxAction()
     {
+        $tabResult =[];
+
         $moduleId = OrderCreationConfiguration::getDeliveryModuleId();
-        return JsonResponse::create(["moduleId" => $moduleId]);
+        $tabResult['moduleId'] = $moduleId;
+
+        if(OrderCreationConfiguration::getSoColissimoMode()){
+            $mode = OrderCreationConfiguration::getDeliveryModuleId();
+            $tabResult['modeTT'] = $mode;
+        }
+
+        return JsonResponse::create($tabResult);
     }
 
     public function configureAction()
@@ -64,6 +74,18 @@ public function configureAction()
             $form = $this->validateForm($configurationForm, "POST");
             $data = $form->getData();
             OrderCreationConfiguration::setDeliveryModuleId($data['order_creation_delivery_module_id']);
+
+            /** @var ModuleDataService $moduleService */
+            $moduleService = $this->container->get('module.data.service');
+
+            $codeModule = $moduleService->getModuleCode($data['order_creation_delivery_module_id']);
+
+            if(OrderCreation::SOCOLISSIMO == $codeModule){
+                OrderCreationConfiguration::setSoColissimoMode('DOM');
+            } else {
+                OrderCreationConfiguration::setSoColissimoMode('');
+            }
+
             $this->adminLogAppend(
                 OrderCreation::MESSAGE_DOMAIN . ".configuration.message",
                 AccessManager::UPDATE,

diff --git a/Form/ConfigurationForm.php b/Form/ConfigurationForm.php
@@ -26,7 +26,7 @@ protected function buildForm()
             ->add(
                 'order_creation_delivery_module_id',
                 TextType::class, [
-                    'label' => Translator::getInstance()->trans("Delivery module use to create order in back office", OrderCreation::MESSAGE_DOMAIN),
+                    'label' => Translator::getInstance()->trans("Delivery module use to create order in back office", [], OrderCreation::MESSAGE_DOMAIN),
                     'label_attr' => array(
                         'help' =>  $this->translator->trans('Leave blank to select delivery module on each order', [], OrderCreation::MESSAGE_DOMAIN)
                     ),

diff --git a/OrderCreation.php b/OrderCreation.php
@@ -17,4 +17,6 @@
 class OrderCreation extends BaseModule
 {
     const MESSAGE_DOMAIN = "ordercreation";
+
+    const SOCOLISSIMO = "SoColissimo";
 }
diff --git a/OrderCreationConfiguration.php b/OrderCreationConfiguration.php
@@ -12,6 +12,7 @@
 class OrderCreationConfiguration
 {
     const CONFIG_KEY_DELIVERY_MODULE_ID = 'order_creation_delivery_module_id';
+    const SOCOLISSIMO_MODE = 'order_creation_socolissimo_mode';
 
     /**
      * @param $moduleId integer | null
@@ -21,6 +22,16 @@ public static function setDeliveryModuleId($moduleId)
         OrderCreation::setConfigValue(self::CONFIG_KEY_DELIVERY_MODULE_ID, $moduleId);
     }
 
+    public static function setSoColissimoMode($mode)
+    {
+        OrderCreation::setConfigValue(self::SOCOLISSIMO_MODE, $mode);
+    }
+
+    public static function getSoColissimoMode()
+    {
+        return OrderCreation::getConfigValue(self::SOCOLISSIMO_MODE, null);
+    }
+
     /**
      * @return integer | null
      */
@@ -29,4 +40,5 @@ public static function getDeliveryModuleId()
         return OrderCreation::getConfigValue(self::CONFIG_KEY_DELIVERY_MODULE_ID, null);
     }
 
+
 }
diff --git a/templates/backOffice/default/customer-edit-js.html b/templates/backOffice/default/customer-edit-js.html
@@ -8,6 +8,10 @@
                 if (!json.moduleId) {
                     return;
                 }
+
+                if(json.modeTT){
+                    $('#mode-socolissimo').append('<input type="hidden "name="socolissimo-home" value="DOM" >');
+                }
                 $('#create-order-form-td-delivery-module').hide();
                 $('#create-order-form-td-payment_module_id').colspan = 2;
             }

diff --git a/templates/backOffice/default/forms/create-order-form.html b/templates/backOffice/default/forms/create-order-form.html
@@ -22,7 +22,7 @@
                 <td>
                     {form_field form=$form field='delivery_address_id'}
                     <div class="form-group {if $error}has-error{/if}">
-                        <label for="{$label_attr.for}" class="control-label">{$label} * : </label>
+                        <label for="{$label_attr.for}" class="control-label">{$label} * :</label>
 
                         <select name="{$name}" id="{$label_attr.for}" class="form-control" required="required">
                             <option value="0" {if $value == $ID}selected="selected"{/if} >{intl l="Choose" d="ordercreation"}</option>
@@ -131,6 +131,8 @@
             </tfoot>
         </table>
 
+        <div id="mode-socolissimo"></div>
+
     {/capture}
     {include
         file = "includes/generic-create-dialog.html"