Release of 1.4.0

MultiSafepay · Feb 26, 2020 · bb7fda6 · bb7fda6
2 parents c73f1b3 + c946013
commit bb7fda6
Show file tree

Hide file tree

Showing 8 changed files with 190 additions and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+/.idea
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+##  1.4.0
+Release date - February 26th, 2020
+
+### Added
++ PLGCSCS-88: Add "Kies uw Bank" as first issuer option
+
+### Changed
++ PLGCSCS-100: Make merchant_item_id unique for product options
++ PLGCSCS-94: Rename Direct Ebanking to SOFORT Banking
++ PLGCSCS-92: Correct payment methods names
++ PLGCSCS-91: Change the number of decimals from 2 to 10 on all shopping cart items in transaction requests
+
+### Fixed
++ PLGCSCS-93: Fix shop version number in transaction request
++ PLGCSCS-83: Fix iDEAL issuer list not showing when user tries to place an order
+
 # Release Notes - CS-Cart4 1.3.0 (Aug 24, 2018) #
 
 ## Added ##
@@ -70,4 +86,4 @@
 
 ## New plug-in ##
 + Supports all payment methodes including Pay After Delivery
-+ Support minimum and maximum value-restricions for showing a gateway.
++ Support minimum and maximum value-restricions for showing a gateway.
diff --git a/app/lib/other/smarty/plugins/block.msp_issuers.php b/app/lib/other/smarty/plugins/block.msp_issuers.php
@@ -25,6 +25,11 @@ function smarty_block_msp_issuers($params, $content, &$smarty, &$repeat)
     $repeat = false;
     $processor_data = fn_get_processor_data($_SESSION['cart']['payment_id']);
 
+    if(empty($processor_data) && isset($_REQUEST['order_id'])) {
+        $order_info = fn_get_order_info($_REQUEST['order_id']);
+        $processor_data = fn_get_processor_data($order_info['payment_id']);
+    }
+
     require_once (DIR_ROOT . '/app/payments/MultiSafepay.combined.php');
 
 
@@ -44,7 +49,8 @@ function smarty_block_msp_issuers($params, $content, &$smarty, &$repeat)
     $iDealIssuers = $msp->getIdealIssuers();
 
 
-    $idealselect = '<br /><select name="payment_info[issuer]" id="issuerselect" style="min-width:250px;">';
+    $idealselect = '<select name="payment_info[issuer]" class="issuerselect" id="issuerselect"><option value="">Kies uw bank</option>';
+
     if ($processor_data['processor_params']['mode'] == 'T') {
         foreach ($iDealIssuers['issuers'] as $issuer) {
             $idealselect .= '<option value="' . $issuer['code']['VALUE'] . '">' . $issuer['description']['VALUE'] . '</option>';

diff --git a/app/lib/other/templater/plugins/block.msp_issuers.php b/app/lib/other/templater/plugins/block.msp_issuers.php
@@ -25,6 +25,11 @@ function smarty_block_msp_issuers($params, $content, &$smarty, &$repeat)
     $repeat = false;
     $processor_data = fn_get_processor_data($_SESSION['cart']['payment_id']);
 
+    if(empty($processor_data) && isset($_REQUEST['order_id'])) {
+        $order_info = fn_get_order_info($_REQUEST['order_id']);
+        $processor_data = fn_get_processor_data($order_info['payment_id']);
+    }
+
     require_once (DIR_ROOT . '/app/payments/MultiSafepay.combined.php');
 
     if ($processor_data['processor_params']['mode'] == 'T') {
@@ -42,7 +47,8 @@ function smarty_block_msp_issuers($params, $content, &$smarty, &$repeat)
     $iDealIssuers = $msp->getIdealIssuers();
 
 
-    $idealselect = '<br /><select name="payment_info[issuer]" id="issuerselect" style="min-width:250px;">';
+    $idealselect = '<select name="payment_info[issuer]" class="issuerselect" id="issuerselect"><option value="">Kies uw bank</option>';
+
     if ($processor_data['processor_params']['mode'] == 'T') {
         foreach ($iDealIssuers['issuers'] as $issuer) {
             $idealselect .= '<option value="' . $issuer['code']['VALUE'] . '">' . $issuer['description']['VALUE'] . '</option>';

diff --git a/app/lib/vendor/smarty/smarty/libs/plugins/block.msp_issuers.php b/app/lib/vendor/smarty/smarty/libs/plugins/block.msp_issuers.php
@@ -25,6 +25,11 @@ function smarty_block_msp_issuers($params, $content, &$smarty, &$repeat)
     $repeat = false;
     $processor_data = fn_get_processor_data($_SESSION['cart']['payment_id']);
 
+    if(empty($processor_data) && isset($_REQUEST['order_id'])) {
+        $order_info = fn_get_order_info($_REQUEST['order_id']);
+        $processor_data = fn_get_processor_data($order_info['payment_id']);
+    }
+
     require_once (DIR_ROOT . '/app/payments/MultiSafepay.combined.php');
 
 
@@ -44,7 +49,8 @@ function smarty_block_msp_issuers($params, $content, &$smarty, &$repeat)
     $iDealIssuers = $msp->getIdealIssuers();
 
 
-    $idealselect = '<br /><select name="payment_info[issuer]" id="issuerselect" style="min-width:250px;">';
+    $idealselect = '<select name="payment_info[issuer]" class="issuerselect" id="issuerselect"><option value="">Kies uw bank</option>';
+
     if ($processor_data['processor_params']['mode'] == 'T') {
         foreach ($iDealIssuers['issuers'] as $issuer) {
             $idealselect .= '<option value="' . $issuer['code']['VALUE'] . '">' . $issuer['description']['VALUE'] . '</option>';