Improve module to Oney compatibility

Author: lopes-vincent

Config/module.xml

@@ -17,7 +17,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <authors>
         <author>
             <name>Vincent Lopes-Vicente</name>

Config/schema.xml

@@ -44,5 +44,14 @@
         </foreign-key>
     </table>
 
+    <table name="pay_plug_module_delivery_type" namespace="PayPlugModule\Model">
+        <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+        <column name="module_id" type="integer" />
+        <column name="delivery_type" size="255" type="VARCHAR" />
+        <foreign-key foreignTable="module" name="fk_pay_plug_module_delivery_type_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
+            <reference foreign="id" local="module_id" />
+        </foreign-key>
+    </table>
+
     <external-schema filename="local/config/schema.xml" referenceOnly="true" />
 </database>

Config/thelia.sql

@@ -73,5 +73,25 @@ CREATE TABLE `order_pay_plug_multi_payment`
         ON DELETE CASCADE
 ) ENGINE=InnoDB;
 
+-- ---------------------------------------------------------------------
+-- pay_plug_module_delivery_type
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `pay_plug_module_delivery_type`;
+
+CREATE TABLE `pay_plug_module_delivery_type`
+(
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `module_id` INTEGER,
+    `delivery_type` VARCHAR(255),
+    PRIMARY KEY (`id`),
+    INDEX `fi_pay_plug_module_delivery_type_module_id` (`module_id`),
+    CONSTRAINT `fk_pay_plug_module_delivery_type_module_id`
+        FOREIGN KEY (`module_id`)
+        REFERENCES `module` (`id`)
+        ON UPDATE RESTRICT
+        ON DELETE CASCADE
+) ENGINE=InnoDB;
+
 # This restores the fkey checks, after having unset them earlier
 SET FOREIGN_KEY_CHECKS = 1;

Config/update/1.0.3.sql

@@ -0,0 +1,27 @@
+# This is a fix for InnoDB in MySQL >= 4.1.x
+# It "suspends judgement" for fkey relationships until are tables are set.
+SET FOREIGN_KEY_CHECKS = 0;
+
+
+-- ---------------------------------------------------------------------
+-- pay_plug_module_delivery_type
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `pay_plug_module_delivery_type`;
+
+CREATE TABLE `pay_plug_module_delivery_type`
+(
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `module_id` INTEGER,
+    `delivery_type` VARCHAR(255),
+    PRIMARY KEY (`id`),
+    INDEX `fi_pay_plug_module_delivery_type_module_id` (`module_id`),
+    CONSTRAINT `fk_pay_plug_module_delivery_type_module_id`
+        FOREIGN KEY (`module_id`)
+        REFERENCES `module` (`id`)
+        ON UPDATE RESTRICT
+        ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+# This restores the fkey checks, after having unset them earlier
+SET FOREIGN_KEY_CHECKS = 1;

Controller/Admin/ConfigurationController.php

@@ -2,7 +2,9 @@
 
 namespace PayPlugModule\Controller\Admin;
 
+use PayPlugModule\Form\ConfigurationForm;
 use PayPlugModule\Model\PayPlugConfigValue;
+use PayPlugModule\Model\PayPlugModuleDeliveryTypeQuery;
 use PayPlugModule\PayPlugModule;
 use PayPlugModule\Service\OrderStatusService;
 use Thelia\Controller\Admin\BaseAdminController;
@@ -18,9 +20,11 @@ public function viewAction()
         /** @var OrderStatusService $orderStatusesService */
         $orderStatusesService = $this->container->get('payplugmodule_order_status_service');
         $orderStatusesService->initAllStatuses();
+        $deliveryModuleFormFields = ConfigurationForm::getDeliveryModuleFormFields();
 
         return $this->render(
-            "PayPlugModule/configuration"
+            "PayPlugModule/configuration",
+                compact('deliveryModuleFormFields')
         );
     }
 
@@ -39,6 +43,14 @@ public function saveAction()
                 if (in_array($key, PayPlugConfigValue::getConfigKeys())) {
                     PayPlugModule::setConfigValue($key, $value);
                 }
+
+                $explodedKey = explode(':', $key);
+                if ($explodedKey[0] === ConfigurationForm::DELIVERY_MODULE_TYPE_KEY_PREFIX) {
+                    $moduleId = $explodedKey[1];
+                    $payPlugModuleDeliveryType = PayPlugModuleDeliveryTypeQuery::create()->filterByModuleId($moduleId)->findOneOrCreate();
+                    $payPlugModuleDeliveryType->setDeliveryType($value)
+                        ->save();
+                }
             }
 
         } catch (\Exception $e) {

Controller/Admin/OrderController.php

@@ -42,7 +42,10 @@ public function refundAction()
             );
         }
 
-        return $this->generateSuccessRedirect($form);
+        // Sleep to let time for PayPlug to send validation
+        sleep(2);
+        $url = $this->retrieveSuccessUrl($form);
+        return $this->generateRedirect($url.'#orderPayPlug');
     }
 
     public function captureAction()
@@ -73,6 +76,9 @@ public function captureAction()
             );
         }
 
-        return $this->generateSuccessRedirect($form);
+        // Sleep to let time for PayPlug to send validation
+        sleep(2);
+        $url = $this->retrieveSuccessUrl($form);
+        return $this->generateRedirect($url.'#orderPayPlug');
     }
 }