Merge pull request #182 from mollie/9.1.12

9.1.12 -- Bugfixes and cleanup

Author: QualityWorks

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 # Changelog #
 
+#### Changes in release 9.1.12
+  + Bugfix in database table patching
+  + Bugfix model load
+  + Bugfix PatchTable
+  + Cleaned up code
+
 #### Changes in release 9.1.11
   + Bugfix in database table patching
 

catalog/controller/payment/mollie/base.php

@@ -316,7 +316,11 @@ public function payment()
             //Check if coupon applied
             if(isset($this->session->data['coupon'])) {
                 //Get coupon data
-                $coupon = Util::load()->model('extension/total/coupon');
+                if(Util::version()->isMaximal("2.0.3.1")) {
+                    $coupon = Util::load()->model('checkout/coupon');
+                } else {
+                    $coupon = Util::load()->model('total/coupon');
+                }               
 
                 $coupon_info = $coupon->getCoupon($this->session->data['coupon']);
 

catalog/controller/payment/mollie/helper.php

@@ -5,7 +5,7 @@
 
 class MollieHelper
 {
-	const PLUGIN_VERSION = "9.1.11";
+	const PLUGIN_VERSION = "9.1.12";
 	const OUTH_URL = 'https://api.mollie.com/oauth2';
 
 	// All available modules. These should correspond to the Mollie_API_Object_Method constants.

system/comercia/load.php

@@ -380,6 +380,10 @@ private function rewriteModel($model)
                 [
                     "" => "extension/event",
                     "3.0" => "setting/event"
+                ],
+                [
+                    "" => "total/coupon",
+                    "2.3" => "extension/total/coupon"
                 ]
             ]
         );

system/comercia/patch.php

@@ -6,19 +6,20 @@ class Patch
     var $db;
     function __construct()
     {
-        $prefix=DB_PREFIX;
         require_once(__DIR__."/patchTable.php");
         $this->db=Util::registry()->get("db");
 
-        $table = $this->table("comercia_patch");
-        if (!$table->exists()) {
-            $table->addField("path","varchar(255)");
-            $table->addField("patch", "varchar(50)");
-            $table->addField("success", "int");
-            $table->addField("date", "int");
-            $table->create();
-        }
+        $this->table("comercia_patch")
+            ->addField("comercia_patch_id", "INT NOT NULL AUTO_INCREMENT", "primary")
+            ->addField("path", "varchar(255)")
+            ->addField("patch", "varchar(50)")
+            ->addField("success", "int")
+            ->addField("date", "int")
+            ->create();
 
+        $this->table("comercia_patch")
+            ->addField("comercia_patch_id", "INT NOT NULL AUTO_INCREMENT", "primary")
+            ->update();
     }
 
     function runPatchesFromFile($path){

system/comercia/patchTable.php

@@ -55,11 +55,15 @@ function update()
                         $query .= ",";
                     }
 
-                    if ($action["default"]!==null && $action["default"]!==false){
+                    if ($action["default"]!==null && $action["default"]!==false && $action["default"]!=='primary'){
                         $action["default"]="'".$action["default"]."'";
                     }
 
-                    $query .= "ADD `" . $action["name"] . "` " . $action["type"]. ($action["default"]!==false?" DEFAULT " . $action["default"]:"");
+                    $query .= "ADD `" . $action["name"] . "` " . $action["type"]. (($action["default"]!==false && $action["default"]!=='primary')?" DEFAULT " . $action["default"]:"");
+
+                    if (strtolower($action['default']) == 'primary') {
+                        $query .= ", ADD PRIMARY KEY (" . $action["name"] . ")";
+                    }
 
                     $i++;
                 }
@@ -73,12 +77,16 @@ function update()
                         $query .= ",";
                     }
 
-                    if($action["default"]!==null && $action["default"]!==false){
+                    if($action["default"]!==null && $action["default"]!==false && $action["default"]!=='primary'){
                         $action["default"]="'".$action["default"]."'";
                     }
 
-                    $query .= "MODIFY `" . $action["name"] . "` " . $action["type"]. ($action["default"]!==false?" DEFAULT ".$action["default"]:"");
-					
+                    $query .= "MODIFY `" . $action["name"] . "` " . $action["type"]. (($action["default"]!==false && $action["default"]!=='primary')?" DEFAULT ".$action["default"]:"");
+
+                    if (strtolower($action['default']) == 'primary') {
+                        $query .= ", ADD PRIMARY KEY (" . $action["name"] . ")";
+                    }
+
                     $i++;
                 }
             }
@@ -117,6 +125,7 @@ function create()
     {
 		if (!$this->exists($this->name)) {
 			$prefix = DB_PREFIX;
+			$primary = false;
 			$query = "create table `" . $prefix . $this->name . "` (";
 
 			$i = 0;
@@ -135,7 +144,13 @@ function create()
 					$i++;
 				}
 			}
-			$query .= ",PRIMARY KEY (".$primary."))";
+
+			if ($primary) {
+                $query .= ",PRIMARY KEY (" . $primary . ")";
+            }
+
+			$query .= ")";
+
 
 			$this->db->query($query);
 

system/comercia/stringHelper.php

@@ -12,6 +12,11 @@ function ccToUnderline($subject){
     }
 
     function rewriteForVersion($string,$words){
+        // Check if file exists
+        if(file_exists(DIR_APPLICATION . 'model/' . $string . '.php')) {
+            return $string;
+        }
+
         foreach($words as $word){
             $match=false;
             $versionMatch=@isset($word[0])?:array_values($word)[0];

vqmod/xml/mollie.xml

@@ -1,6 +1,6 @@
 <modification>
     <id>Quality Works - Mollie</id>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <vqmver>2.3.0</vqmver>
     <author>Quality Works</author>
 
@@ -305,7 +305,7 @@
         $order_id = $this->request->get['order_id'];
         $order = $this->model_sale_order->getOrder($order_id);
 
-        $mollieOrderDetails = $this->model_sale_order->getMollieOrderDetails($order_id);
+        $mollieOrderDetails = $this->model_sale_order->getMolliePayment($order_id);
         if(!$mollieOrderDetails) {
             $log->write("Mollie order(mollie_order_id) not found for order_id - $order_id");
             $json['error'] = $this->language->get('text_order_not_found');
@@ -354,16 +354,7 @@
     <file name="admin/model/sale/order.php">
         <operation error="log">
             <search position="before"><![CDATA[public function getOrder($order_id)]]></search>
-            <add><![CDATA[public function getMollieOrderDetails($order_id) {
-        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "mollie_payments` WHERE order_id = '" . (int)$order_id . "'");
-
-        if($query->num_rows) {
-            return $query->row;
-        }
-
-        return false;
-    }
-
+            <add><![CDATA[
     public function updateMolliePayment($order_id, $refund_id, $payment_status) {
         $this->db->query("UPDATE `" . DB_PREFIX . "mollie_payments` SET refund_id = '" . $refund_id . "', bank_status = '" . $payment_status . "' WHERE order_id = '" . (int)$order_id . "'");
     }