Merge pull request #242 from mollie/10.0.1

10.0.1

Author: QualityWorks

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 # Changelog #
 
+#### Changes in release 10.0.1
+  + Fixed bug while saving API keys in multi-store setup
+  + Fixed bug that showed Mollie in payments list twice in admin
+
 #### Changes in release 10.0.0
   + Created two separate versions of the module for OCMOD and VQMOD
   + Removed "util" support

admin/view/template/payment/mollie(max_1.5.6.4).tpl

@@ -276,7 +276,7 @@
 										<div class="input-group message-block">
 											<input type="text" name="<?php echo $store['store_id']; ?>_<?php echo $code; ?>_api_key" value="<?php echo $store[$code . '_api_key']; ?>" placeholder="live_..." id="<?php echo $code; ?>_api_key" class="form-control" store="<?php echo $store['store_id']; ?>" <?php echo $store['store_id']; ?>-data-payment-mollie-api-key/>
 											<input type="text" value="" class="form-control" <?php echo $store['store_id']; ?>-data-payment-mollie-api-key-hide>
-											<span class="toggleAPIKey">Show</span>
+											<span class="toggleAPIKey<?php echo $store['store_id']; ?>">Show</span>
 										</div>
 										<?php if ($store['error_api_key']) { ?>
 										<div class="text-danger"><?php echo $store['error_api_key']; ?></div>
@@ -824,7 +824,7 @@ $(document).ready(function () {
 		$('[<?php echo $store["store_id"] ?>-data-payment-mollie-api-key]').hide();
 		$('[<?php echo $store["store_id"] ?>-data-payment-mollie-api-key-hide]').val(prefix + '******************************');
 
-		const toggleAPIKey = document.querySelector('.toggleAPIKey');
+		const toggleAPIKey = document.querySelector('.toggleAPIKey<?php echo $store['store_id']; ?>');
 
 		toggleAPIKey.addEventListener('click', function (e) {
 			var elem1 = $('[<?php echo $store["store_id"] ?>-data-payment-mollie-api-key-hide]');

admin/view/template/payment/mollie.tpl

@@ -276,7 +276,7 @@
 													<span class="input-group-addon"><?php echo ($store[$code . '_api_key']) ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-minus"></i>' ;?></span>
 													<input type="text" name="<?php echo $store['store_id']; ?>_<?php echo $code; ?>_api_key" value="<?php echo $store[$code . '_api_key']; ?>" placeholder="live_..." id="<?php echo $code; ?>_api_key" class="form-control" store="<?php echo $store['store_id']; ?>" <?php echo $store['store_id']; ?>-data-payment-mollie-api-key/>
 													<input type="text" value="" class="form-control" <?php echo $store['store_id']; ?>-data-payment-mollie-api-key-hide>
-													<span class="input-group-addon toggleAPIKey"><i class="fa fa-eye"></i></span>
+													<span class="input-group-addon toggleAPIKey<?php echo $store['store_id']; ?>"><i class="fa fa-eye"></i></span>
 												</div>
 												<?php if ($store['error_api_key']) { ?>
 												<div class="text-danger"><?php echo $store['error_api_key']; ?></div>
@@ -868,7 +868,7 @@ $(document).ready(function () {
 		$('[<?php echo $store["store_id"] ?>-data-payment-mollie-api-key]').hide();
 		$('[<?php echo $store["store_id"] ?>-data-payment-mollie-api-key-hide]').val(prefix + '******************************');
 
-		const toggleAPIKey = document.querySelector('.toggleAPIKey');
+		const toggleAPIKey = document.querySelector('.toggleAPIKey<?php echo $store['store_id']; ?>');
 
 		toggleAPIKey.addEventListener('click', function (e) {
 			var elem1 = $('[<?php echo $store["store_id"] ?>-data-payment-mollie-api-key-hide]');

catalog/controller/payment/mollie-api-client/helper.php

@@ -5,7 +5,7 @@
 class MollieHelper extends Controller
 {
 
-	const PLUGIN_VERSION = "10.0.0";
+	const PLUGIN_VERSION = "10.0.1";
 
 	const OUTH_URL = 'https://api.mollie.com/oauth2';
 

system/mollie.ocmod.xml

@@ -887,7 +887,12 @@ if (!confirm('{{ text_confirm_refund }}')) {
         <operation error="skip">
             <search><![CDATA[$data['extensions'][] = array(]]></search>
             <add position="before">
-                <![CDATA[if (preg_match('/mollie_[a-z]*/i', $extension)) continue;]]>
+                <![CDATA[
+                if (version_compare(VERSION, '2.3.0.2', '==') && ($file == DIR_APPLICATION . 'controller/payment/mollie.php')) {
+                    continue;
+                }
+
+                if (preg_match('/mollie_[a-z]*/i', $extension)) continue;]]>
             </add>
         </operation>
     </file>

vqmod/xml/mollie.xml

@@ -886,7 +886,12 @@ if (!confirm('{{ text_confirm_refund }}')) {
         <operation error="skip">
             <search><![CDATA[$data['extensions'][] = array(]]></search>
             <add position="before">
-                <![CDATA[if (preg_match('/mollie_[a-z]*/i', $extension)) continue;]]>
+                <![CDATA[
+                if (version_compare(VERSION, '2.3.0.2', '==') && ($file == DIR_APPLICATION . 'controller/payment/mollie.php')) {
+                    continue;
+                }
+
+                if (preg_match('/mollie_[a-z]*/i', $extension)) continue;]]>
             </add>
         </operation>
     </file>