4.1.7

- Added "Use Base Currency" which allows end-users to initiate payments using selected currency instead of base shop currency
Smart2Pay · Jun 25, 2021 · 75efe3f · 75efe3f
1 parent 519d486
commit 75efe3f
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 17 deletions.
diff --git a/Block/Info.php b/Block/Info.php
@@ -74,11 +74,14 @@ protected function _prepareSpecificInformation($transport = null)
             $method_arr = [];
         }
 
-        $this->setDataToTransfer(
-            $transport,
-            __('Payment Method'),
-            $method_arr['display_name'].(!$is_in_frontend?' (#'.$method_arr['method_id'].')':'')
-        );
+        if (!empty($method_arr)) {
+            $this->setDataToTransfer(
+                $transport,
+                __('Payment Method'),
+                $method_arr['display_name'].
+                (!$is_in_frontend?' (#'.$method_arr['method_id'].')':'')
+            );
+        }
 
         if (!$is_in_frontend) {
             $this->setDataToTransfer(

diff --git a/Controller/Payment/Notification.php b/Controller/Payment/Notification.php
@@ -314,13 +314,24 @@ public function execute()
 
                     case \S2P_SDK\S2P_SDK_Meth_Payments::STATUS_SUCCESS:
                     case \S2P_SDK\S2P_SDK_Meth_Payments::STATUS_CAPTURED:
-                        $orderAmount =  number_format(
-                            $order->getBaseGrandTotal(),
-                            2,
-                            '.',
-                            ''
-                        ) * 100;
-                        $orderCurrency = $order->getBaseCurrency()->getCurrencyCode();
+
+                        if (!empty($config_arr['use_base_currency'])) {
+                            $orderAmount =  number_format(
+                                $order->getBaseGrandTotal(),
+                                2,
+                                '.',
+                                ''
+                            ) * 100;
+                            $orderCurrency = $order->getBaseCurrency()->getCurrencyCode();
+                        } else {
+                            $orderAmount =  number_format(
+                                $order->getGrandTotal(),
+                                2,
+                                '.',
+                                ''
+                            ) * 100;
+                            $orderCurrency = $order->getOrderCurrency()->getCurrencyCode();
+                        }
 
                         if ((string)$orderAmount !== (string)$payment_arr['amount']
                          || (string)$orderCurrency !== (string)$payment_arr['currency']) {

diff --git a/Gateway/Request/CaptureRequest.php b/Gateway/Request/CaptureRequest.php
@@ -133,10 +133,18 @@ public function build(array $buildSubject)
 
         $total_surcharge_amount = $surcharge_amount + $surcharge_fixed_amount;
 
-        $order_original_amount = $amount_to_pay = $quote->getBaseGrandTotal();
+        if (!empty($config_arr['use_base_currency'])) {
+            $order_original_amount = $amount_to_pay = $quote->getBaseGrandTotal();
+        } else {
+            $order_original_amount = $amount_to_pay = $quote->getGrandTotal();
+        }
 
         $articles_params = [];
-        $articles_params['transport_amount'] = $quote->getShippingAddress()->getBaseShippingAmount();
+        if (!empty($config_arr['use_base_currency'])) {
+            $articles_params['transport_amount'] = $quote->getShippingAddress()->getBaseShippingAmount();
+        } else {
+            $articles_params['transport_amount'] = $quote->getShippingAddress()->getShippingAmount();
+        }
         $articles_params['total_surcharge'] = $total_surcharge_amount;
         $articles_params['amount_to_pay'] = $amount_to_pay;
 
@@ -173,7 +181,11 @@ public function build(array $buildSubject)
             }
         }
 
-        $currency = $quote->getCurrency()->getBaseCurrencyCode();
+        if (!empty($config_arr['use_base_currency'])) {
+            $currency = $quote->getCurrency()->getBaseCurrencyCode();
+        } else {
+            $currency = $quote->getCurrency()->getQuoteCurrencyCode();
+        }
 
         //
         // SDK functionality

diff --git a/Helper/S2pHelper.php b/Helper/S2pHelper.php
@@ -648,6 +648,7 @@ public function getFullConfigArray($force = false, $storeId = null)
             'auto_invoice' => 0,
             'auto_ship' => 0,
             'use_3dsecure' => 0,
+            'use_base_currency' => 1,
             'order_status' => 'pending',
             'order_status_on_2' => 'processing',
             'order_status_on_3' => 'canceled',

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "smart2pay/magento2",
     "description": "Use Smart2Pay module to have access to 200+ payment methods.",
     "type": "magento2-module",
-    "version": "4.1.6",
+    "version": "4.1.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -163,6 +163,12 @@
                         <config_path>payment/smart2pay/auto_ship</config_path>
                     </field>
                     -->
+                    <field id="use_base_currency" translate="label" type="select" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>Use Base Currency</label>
+                        <comment><![CDATA[Yes: Initiate payments in base currency. No: Initiate payments in current selected currency.]]></comment>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <config_path>payment/smart2pay/use_base_currency</config_path>
+                    </field>
                     <field id="use_3dsecure" translate="label" type="select" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Use 3DSecure</label>
                         <comment><![CDATA[Use 3DSecure for SmartCards payment method.]]></comment>

diff --git a/etc/config.xml b/etc/config.xml
@@ -63,6 +63,7 @@
 
                 <auto_invoice>0</auto_invoice>
                 <auto_ship>0</auto_ship>
+                <use_base_currency>1</use_base_currency>
                 <use_3dsecure>0</use_3dsecure>
                 <order_status>pending</order_status>
                 <order_status_on_2>processing</order_status_on_2>

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Smart2Pay_GlobalPay" setup_version="4.1.6">
+    <module name="Smart2Pay_GlobalPay" setup_version="4.1.7">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Quote"/>