Merge pull request #319 from mollie/13.1.1

bugfix phonenumber and tag_name
mollie · Mar 15, 2024 · 0d242f3 · 0d242f3
2 parents 914718a + bdffdd8
commit 0d242f3
Show file tree

Hide file tree

Showing 11 changed files with 137 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 # Changelog #
 
+#### Changes in release 13.1.1
+  + Fixed bug caused by missing telephone number
+  + Other bugfix and improvements
+
 #### Changes in release 13.1.0
   + New upcoming payment methods in next version - Twint, Blik, Bancomat Pay
   + Bugfix and improvements

diff --git a/Opencart 1.5 - 3.x/catalog/controller/payment/mollie/base.php b/Opencart 1.5 - 3.x/catalog/controller/payment/mollie/base.php
@@ -830,7 +830,6 @@ public function order()
                 "givenName"     =>   $this->formatText($order['payment_firstname']),
                 "familyName"    =>   $this->formatText($order['payment_lastname']),
                 "email"         =>   $this->formatText($order['email']),
-                "phone"         =>   $this->formatText($order['telephone']),
                 "streetAndNumber" => $this->formatText($order['payment_address_1'] . ' ' . $order['payment_address_2']),
                 "city" => $this->formatText($order['payment_city']),
                 "region" => $this->formatText($order['payment_zone']),
@@ -841,14 +840,17 @@ public function order()
             if (isset($order['payment_company']) && !empty($order['payment_company'])) {
                 $data["billingAddress"]['organizationName'] = $this->formatText($order['payment_company']);
             }
+
+            if (isset($order['telephone']) && !empty($order['telephone'])) {
+                //$data["billingAddress"]['phone'] = $this->formatText($order['telephone']);
+            }
 
 			if (isset($this->session->data['shipping_address'])) {
 				if (!empty($order['shipping_firstname']) || !empty($order['shipping_lastname'])) {
 					$data["shippingAddress"] = [
 						"givenName"     =>   $this->formatText($order['shipping_firstname']),
 						"familyName"    =>   $this->formatText($order['shipping_lastname']),
 						"email"         =>   $this->formatText($order['email']),
-                        "phone"         =>   $this->formatText($order['telephone']),
 						"streetAndNumber" => $this->formatText($order['shipping_address_1'] . ' ' . $order['shipping_address_2']),
 						"city" => $this->formatText($order['shipping_city']),
 						"region" => $this->formatText($order['shipping_zone']),
@@ -859,6 +861,10 @@ public function order()
                     if (isset($order['shipping_company']) && !empty($order['shipping_company'])) {
                         $data["shippingAddress"]['organizationName'] = $this->formatText($order['shipping_company']);
                     }
+
+                    if (isset($order['telephone']) && !empty($order['telephone'])) {
+                        //$data["shippingAddress"]['phone'] = $this->formatText($order['telephone']);
+                    }
 				} else {
 					$data["shippingAddress"] = $data["billingAddress"];
 				}

diff --git a/Opencart 1.5 - 3.x/catalog/model/payment/mollie/base.php b/Opencart 1.5 - 3.x/catalog/model/payment/mollie/base.php
@@ -188,6 +188,13 @@ public function getMethod($address, $total)
 			}
 		}
 
+		// Company name required for Billie method
+		if(static::MODULE_NAME == 'billie') {
+			if (isset($this->session->data['payment_address']) && ($this->session->data['payment_address']['company'] == '')) {
+				return NULL;
+			}
+		}
+
 		// Get billing country	
 		$this->load->model('localisation/country');
 

diff --git a/Opencart 1.5 - 3.x/system/library/mollie/helper.php b/Opencart 1.5 - 3.x/system/library/mollie/helper.php
@@ -4,7 +4,7 @@
 
 class MollieHelper {
 
-	const PLUGIN_VERSION = "13.1.0";
+	const PLUGIN_VERSION = "13.1.1";
 
 	const OUTH_URL = 'https://api.mollie.com/oauth2';
 

diff --git a/Opencart 1.5 - 3.x/system/mollie.ocmod.xml_ b/Opencart 1.5 - 3.x/system/mollie.ocmod.xml_
@@ -992,23 +992,25 @@
                 require_once(DIR_SYSTEM . "/library/mollie/mollieHttpClient.php");
                 $client = new Mollie\mollieHttpClient();
                 $info = $client->get("https://api.github.com/repos/mollie/OpenCart/releases/latest");
-                
-                if(strpos($info["tag_name"], 'oc3') !== false) {
-                    $tag_name = explode('_', explode("-", $info["tag_name"])[0]); // New tag_name = oc3_version-oc4_version
-                } else {
-                    $tag_name = ["oc3", $info["tag_name"]]; // Old tag_name = release version
-                }
 
-                $mollieHelper = new MollieHelper($this->registry);
+                if (isset($info["tag_name"])) {
+                    if(strpos($info["tag_name"], 'oc3') !== false) {
+                        $tag_name = explode('_', explode("-", $info["tag_name"])[0]); // New tag_name = oc3_version-oc4_version
+                    } else {
+                        $tag_name = ["oc3", $info["tag_name"]]; // Old tag_name = release version
+                    }
 
-                if (isset($tag_name[0]) && ($tag_name[0] == 'oc3')) {
-                    if (isset($tag_name[1]) && ($tag_name[1] != $mollieHelper::PLUGIN_VERSION) && version_compare($mollieHelper::PLUGIN_VERSION, $tag_name[1], "<") && (!isset($_COOKIE["hide_mollie_update_message_version"]) || ($_COOKIE["hide_mollie_update_message_version"] != $tag_name[1]))) {
-                        $this->language->load('payment/mollie_ideal');
+                    $mollieHelper = new MollieHelper($this->registry);
 
-                        if (version_compare(phpversion(), $mollieHelper::MIN_PHP_VERSION, "<")) {
-                            $this->data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], HTTPS_SERVER . 'index.php?route=payment/mollie_ideal&token=' . $this->session->data['token'], $tag_name[1]);
-                        } else {
-                            $this->data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], HTTPS_SERVER . 'index.php?route=payment/mollie_ideal/update&token=' . $this->session->data['token'], $tag_name[1]);
+                    if (isset($tag_name[0]) && ($tag_name[0] == 'oc3')) {
+                        if (isset($tag_name[1]) && ($tag_name[1] != $mollieHelper::PLUGIN_VERSION) && version_compare($mollieHelper::PLUGIN_VERSION, $tag_name[1], "<") && (!isset($_COOKIE["hide_mollie_update_message_version"]) || ($_COOKIE["hide_mollie_update_message_version"] != $tag_name[1]))) {
+                            $this->language->load('payment/mollie_ideal');
+
+                            if (version_compare(phpversion(), $mollieHelper::MIN_PHP_VERSION, "<")) {
+                                $this->data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], HTTPS_SERVER . 'index.php?route=payment/mollie_ideal&token=' . $this->session->data['token'], $tag_name[1]);
+                            } else {
+                                $this->data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], HTTPS_SERVER . 'index.php?route=payment/mollie_ideal/update&token=' . $this->session->data['token'], $tag_name[1]);
+                            }
                         }
                     }
                 }
@@ -2390,31 +2392,33 @@ $('#button-partial-refund').on('click', function() {
                 require_once(DIR_SYSTEM . "/library/mollie/mollieHttpClient.php");
                 $client = new Mollie\mollieHttpClient();
                 $info = $client->get("https://api.github.com/repos/mollie/OpenCart/releases/latest");
-                
-                if(strpos($info["tag_name"], 'oc3') !== false) {
-                    $tag_name = explode('_', explode("-", $info["tag_name"])[0]); // New tag_name = oc3_version-oc4_version
-                } else {
-                    $tag_name = ["oc3", $info["tag_name"]]; // Old tag_name = release version
-                }
 
-                $mollieHelper = new MollieHelper($this->registry);
+                if (isset($info["tag_name"])) {
+                    if(strpos($info["tag_name"], 'oc3') !== false) {
+                        $tag_name = explode('_', explode("-", $info["tag_name"])[0]); // New tag_name = oc3_version-oc4_version
+                    } else {
+                        $tag_name = ["oc3", $info["tag_name"]]; // Old tag_name = release version
+                    }
 
-                if (isset($tag_name[0]) && ($tag_name[0] == 'oc3')) {
-                    if (isset($tag_name[1]) && ($tag_name[1] != $mollieHelper::PLUGIN_VERSION) && version_compare($mollieHelper::PLUGIN_VERSION, $tag_name[1], "<") && (!isset($_COOKIE["hide_mollie_update_message_version"]) || ($_COOKIE["hide_mollie_update_message_version"] != $tag_name[1]))) {
-                        $this->load->language('payment/mollie_ideal');
+                    $mollieHelper = new MollieHelper($this->registry);
 
-                        if(version_compare(VERSION, '3.0', '<')) {
-                            $token = 'token=' . $this->session->data['token'];
-                        } else {
-                            $token = 'user_token=' . $this->session->data['user_token'];
-                        }
+                    if (isset($tag_name[0]) && ($tag_name[0] == 'oc3')) {
+                        if (isset($tag_name[1]) && ($tag_name[1] != $mollieHelper::PLUGIN_VERSION) && version_compare($mollieHelper::PLUGIN_VERSION, $tag_name[1], "<") && (!isset($_COOKIE["hide_mollie_update_message_version"]) || ($_COOKIE["hide_mollie_update_message_version"] != $tag_name[1]))) {
+                            $this->load->language('payment/mollie_ideal');
 
-                        if (version_compare(phpversion(), $mollieHelper::MIN_PHP_VERSION, "<")) {
-                            $data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], $this->url->link("payment/mollie_ideal", $token), $tag_name[1]);
-                        } else {
-                            $data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], $this->url->link("payment/mollie_ideal/update", $token), $tag_name[1]);
+                            if(version_compare(VERSION, '3.0', '<')) {
+                                $token = 'token=' . $this->session->data['token'];
+                            } else {
+                                $token = 'user_token=' . $this->session->data['user_token'];
+                            }
+
+                            if (version_compare(phpversion(), $mollieHelper::MIN_PHP_VERSION, "<")) {
+                                $data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], $this->url->link("payment/mollie_ideal", $token), $tag_name[1]);
+                            } else {
+                                $data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], $this->url->link("payment/mollie_ideal/update", $token), $tag_name[1]);
+                            }
                         }
-                }
+                    }
                 }
                 
                 break;

diff --git a/Opencart 1.5 - 3.x/vqmod/xml/mollie.xml_ b/Opencart 1.5 - 3.x/vqmod/xml/mollie.xml_
@@ -991,23 +991,25 @@
                 require_once(DIR_SYSTEM . "/library/mollie/mollieHttpClient.php");
                 $client = new Mollie\mollieHttpClient();
                 $info = $client->get("https://api.github.com/repos/mollie/OpenCart/releases/latest");
-
-                if(strpos($info["tag_name"], 'oc3') !== false) {
-                    $tag_name = explode('_', explode("-", $info["tag_name"])[0]); // New tag_name = oc3_version-oc4_version
-                } else {
-                    $tag_name = ["oc3", $info["tag_name"]]; // Old tag_name = release version
-                }
 
-                $mollieHelper = new MollieHelper($this->registry);
+                if (isset($info["tag_name"])) {
+                    if(strpos($info["tag_name"], 'oc3') !== false) {
+                        $tag_name = explode('_', explode("-", $info["tag_name"])[0]); // New tag_name = oc3_version-oc4_version
+                    } else {
+                        $tag_name = ["oc3", $info["tag_name"]]; // Old tag_name = release version
+                    }
 
-                if (isset($tag_name[0]) && ($tag_name[0] == 'oc3')) {
-                    if (isset($tag_name[1]) && ($tag_name[1] != $mollieHelper::PLUGIN_VERSION) && version_compare($mollieHelper::PLUGIN_VERSION, $tag_name[1], "<") && (!isset($_COOKIE["hide_mollie_update_message_version"]) || ($_COOKIE["hide_mollie_update_message_version"] != $tag_name[1]))) {
-                        $this->language->load('payment/mollie_ideal');
+                    $mollieHelper = new MollieHelper($this->registry);
 
-                        if (version_compare(phpversion(), $mollieHelper::MIN_PHP_VERSION, "<")) {
-                            $this->data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], HTTPS_SERVER . 'index.php?route=payment/mollie_ideal&token=' . $this->session->data['token'], $tag_name[1]);
-                        } else {
-                            $this->data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], HTTPS_SERVER . 'index.php?route=payment/mollie_ideal/update&token=' . $this->session->data['token'], $tag_name[1]);
+                    if (isset($tag_name[0]) && ($tag_name[0] == 'oc3')) {
+                        if (isset($tag_name[1]) && ($tag_name[1] != $mollieHelper::PLUGIN_VERSION) && version_compare($mollieHelper::PLUGIN_VERSION, $tag_name[1], "<") && (!isset($_COOKIE["hide_mollie_update_message_version"]) || ($_COOKIE["hide_mollie_update_message_version"] != $tag_name[1]))) {
+                            $this->language->load('payment/mollie_ideal');
+
+                            if (version_compare(phpversion(), $mollieHelper::MIN_PHP_VERSION, "<")) {
+                                $this->data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], HTTPS_SERVER . 'index.php?route=payment/mollie_ideal&token=' . $this->session->data['token'], $tag_name[1]);
+                            } else {
+                                $this->data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], HTTPS_SERVER . 'index.php?route=payment/mollie_ideal/update&token=' . $this->session->data['token'], $tag_name[1]);
+                            }
                         }
                     }
                 }
@@ -2466,31 +2468,33 @@ $('#button-partial-refund').on('click', function() {
                 require_once(DIR_SYSTEM . "/library/mollie/mollieHttpClient.php");
                 $client = new Mollie\mollieHttpClient();
                 $info = $client->get("https://api.github.com/repos/mollie/OpenCart/releases/latest");
-
-                if(strpos($info["tag_name"], 'oc3') !== false) {
-                    $tag_name = explode('_', explode("-", $info["tag_name"])[0]); // New tag_name = oc3_version-oc4_version
-                } else {
-                    $tag_name = ["oc3", $info["tag_name"]]; // Old tag_name = release version
-                }
 
-                $mollieHelper = new MollieHelper($this->registry);
+                if (isset($info["tag_name"])) {
+                    if(strpos($info["tag_name"], 'oc3') !== false) {
+                        $tag_name = explode('_', explode("-", $info["tag_name"])[0]); // New tag_name = oc3_version-oc4_version
+                    } else {
+                        $tag_name = ["oc3", $info["tag_name"]]; // Old tag_name = release version
+                    }
 
-                if (isset($tag_name[0]) && ($tag_name[0] == 'oc3')) {
-                    if (isset($tag_name[1]) && ($tag_name[1] != $mollieHelper::PLUGIN_VERSION) && version_compare($mollieHelper::PLUGIN_VERSION, $tag_name[1], "<") && (!isset($_COOKIE["hide_mollie_update_message_version"]) || ($_COOKIE["hide_mollie_update_message_version"] != $tag_name[1]))) {
-                        $this->load->language('payment/mollie_ideal');
+                    $mollieHelper = new MollieHelper($this->registry);
 
-                        if(version_compare(VERSION, '3.0', '<')) {
-                            $token = 'token=' . $this->session->data['token'];
-                        } else {
-                            $token = 'user_token=' . $this->session->data['user_token'];
-                        }
+                    if (isset($tag_name[0]) && ($tag_name[0] == 'oc3')) {
+                        if (isset($tag_name[1]) && ($tag_name[1] != $mollieHelper::PLUGIN_VERSION) && version_compare($mollieHelper::PLUGIN_VERSION, $tag_name[1], "<") && (!isset($_COOKIE["hide_mollie_update_message_version"]) || ($_COOKIE["hide_mollie_update_message_version"] != $tag_name[1]))) {
+                            $this->load->language('payment/mollie_ideal');
 
-                        if (version_compare(phpversion(), $mollieHelper::MIN_PHP_VERSION, "<")) {
-                            $data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], $this->url->link("payment/mollie_ideal", $token), $tag_name[1]);
-                        } else {
-                            $data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], $this->url->link("payment/mollie_ideal/update", $token), $tag_name[1]);
+                            if(version_compare(VERSION, '3.0', '<')) {
+                                $token = 'token=' . $this->session->data['token'];
+                            } else {
+                                $token = 'user_token=' . $this->session->data['user_token'];
+                            }
+
+                            if (version_compare(phpversion(), $mollieHelper::MIN_PHP_VERSION, "<")) {
+                                $data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], $this->url->link("payment/mollie_ideal", $token), $tag_name[1]);
+                            } else {
+                                $data['success'] = sprintf($this->language->get('text_update_message'), $tag_name[1], $this->url->link("payment/mollie_ideal/update", $token), $tag_name[1]);
+                            }
                         }
-                }
+                    }
                 }
 
                 break;