Release of 4.6.0

.gitattributes

@@ -0,0 +1,6 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.github/ export-ignore
+/phpcs.ruleset.xml export-ignore
+/phpunit.xml.dist export-ignore
+/Tests/ export-ignore

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 4.6.0
+Release date: March 27th, 2020
+
+### Added
++ PLGPRSS17-97: Add Apple Pay
++ PLGPRSS17-96: Add Direct Bank Transfer
+
+### Fixed
++ PLGPRSS17-94: Fix ClassNotFoundException when cURL returns an error
+
+***
+
 ## 4.5.1
 Release date: February 26th, 2020
 

config_nl.xml

@@ -2,7 +2,7 @@
 <module>
   <name>multisafepay</name>
   <displayName><![CDATA[MultiSafepay]]></displayName>
-  <version><![CDATA[4.5.1]></version>
+  <version><![CDATA[4.6.0]></version>
   <description><![CDATA[Process payments by using MultiSafepay secure payment processing]]></description>
   <author><![CDATA[MultiSafepay]]></author>
   <tab><![CDATA[payments_gateways]]></tab>

controllers/front/payment.php

@@ -131,7 +131,7 @@ public function postProcess()
             "plugin" => array(
                 "shop" => 'Prestashop',
                 "shop_version" => _PS_VERSION_,
-                "plugin_version" => ' - Plugin 4.5.1',
+                "plugin_version" => ' - Plugin 4.6.0',
                 "partner" => "MultiSafepay",
             )
         );

models/Api/MspClient.php

@@ -31,6 +31,8 @@
 
 namespace MultiSafepay\PrestaShop\models\Api;
 
+use Configuration;
+use FileLogger;
 use MultiSafepay\PrestaShop\models\Api\Objects\Orders;
 use MultiSafepay\PrestaShop\models\Api\Objects\Issuers;
 use MultiSafepay\PrestaShop\models\Api\Objects\Gateways;

multisafepay.php

@@ -110,13 +110,15 @@ class Multisafepay extends PaymentModule
         array("code" => "afterpay", "name" => "AfterPay", 'config' => true),
         array("code" => "trustly", "name" => "Trustly", 'config' => true),
         array("code" => "idealqr", "name" => "iDEAL QR", 'config' => true),
+        array("code" => "dbrtp", "name" => "Direct Bank Transfer", 'config' => true),
+        array("code" => "applepay", "name" => "Apple Pay", 'config' => true),
     );
 
     public function __construct()
     {
         $this->name = 'multisafepay';
         $this->tab = 'payments_gateways';
-        $this->version = '4.5.1';
+        $this->version = '4.6.0';
         $this->ps_versions_compliancy = array('min' => '1.7', 'max' => _PS_VERSION_);
         $this->author = 'MultiSafepay';
         $this->controllers = array('validation', 'payment');
@@ -985,6 +987,13 @@ public function hookPaymentOptions($params)
                         case "einvoice":
                             $externalOption->setForm($this->getEinvoice());
                             break;
+                        case "applepay":
+                            $this->context->smarty->assign([
+                                'action' => $this->context->link->getModuleLink($this->name, 'payment', array('payment' => 'applepay'), true),
+                            ]);
+
+                            $externalOption->setForm($this->context->smarty->fetch('module:multisafepay/views/templates/front/applepay.tpl'));
+                            break;
                         case "amex":
                         case "visa":
                         case "mastercard":
@@ -1079,7 +1088,7 @@ protected function getActiveGateways()
                 // check if gateway is enabled in the plug-in
                 if (Tools::getValue('MULTISAFEPAY_GATEWAY_' . $gateway["code"])) {
                     if (!in_array($gateway["code"], $mspGateways)) {
-                        $warnings[] = sprintf("%s %s", $gateway["name"], $this->l('Is not activated in your Multisafepay account'));
+                        $warnings[] = sprintf("%s %s", $gateway["name"], $this->l('Is not activated in your MultiSafepay account'));
                     }
                 }
             }
@@ -1105,7 +1114,7 @@ protected function getActiveGiftcards()
                 // check if giftcards is enabled in the plug-in
                 if (Tools::getValue('MULTISAFEPAY_GIFTCARD_' . $giftcard["code"])) {
                     if (!in_array($giftcard["code"], $mspGateways)) {
-                        $warnings[] = sprintf("%s %s", $giftcard["name"], $this->l('Is not activated in your Multisafepay account'));
+                        $warnings[] = sprintf("%s %s", $giftcard["name"], $this->l('Is not activated in your MultiSafepay account'));
                     }
                 }
             }

views/templates/front/applepay.tpl

@@ -0,0 +1,17 @@
+<form action="{$action}" id="msp-applepay-form" method="POST" class="additional-information">
+  <input type="hidden" name="gateway" value="applepay"/>
+  <script>
+    var applePayPaymentOptionsBlock = document.getElementById('msp-applepay-form').parentElement;
+    var paymentMethodId = applePayPaymentOptionsBlock.getAttribute('id').match(/\d+/g)[0];
+    var PaymentMethodBlock = document.getElementById('payment-option-' + paymentMethodId + '-container');
+    PaymentMethodBlock.style.display = 'none';
+
+    try {
+      if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) {
+        PaymentMethodBlock.style.display = 'block';
+      }
+    } catch (error) {
+      console.warn('MultiSafepay error when trying to initialize Apple Pay:', error);
+    }
+  </script>
+</form>