Merge branch 'release/1.10.0'

hipay · Jun 12, 2020 · 171f442 · 171f442
2 parents f9add67 + e8acc90
commit 171f442
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 100 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,106 +1,128 @@
- # 1.9.1
-  - **Fix**: Fix Entity query
-  - **Fix**: Fix js minifying
-
- # 1.9.0
-  - **New**: Added Multibanco payment method
-
- # 1.8.1
-  - **Fix**: Removed fake value for shipto_house_number
-
- # 1.8.0
-  - **New**: Retreive configuration from PHP SDK
-  - **Fix**: Corrected Astropay
-
- # 1.7.3
-  - Fix: Missing method for Config class
-  - Fix: Wrong version in request source
-
- # 1.7.2
-  - Fix: notification controller 302 HTTP code error (Magento 2.3.2) [#121](https://github.com/hipay/hipay-fullservice-sdk-magento2/issues/121)
-  - Fix: MO/TO credentials retrieval
-  - Fix: Disable oneclick when not logged-in
-  - Fix: Save oneclick cards on 116 and 118 notification
-
- # 1.7.1
-  - Fix: wrong method declaration (PHP7.1 and less) [#122](https://github.com/hipay/hipay-fullservice-sdk-magento2/issues/122)
-
- # 1.7.0
-  - Init 3DS V2
-
- # 1.6.1
-  - Update payment method configuration form
-  - Fix issue [#119](https://github.com/hipay/hipay-fullservice-sdk-magento2/issues/119)
-
- # 1.6.0
-  - Add MyBank payment method
-
- # 1.5.0
-  - Add error message on field
-  - Update payment method configuration
-
- # 1.4.3
-  - Fix bad require and bug with magento validation
-  - Improve notification capture with authorization
-
-# 1.4.2
-  - Fix multi_use for one-click
-  - Fix Magento 2.3 compliance
-
-# 1.4.1
-  - Fix entity name for new magento checks
-  - Fix Magento 2.3 compliance
-
- # 1.4.0
- - **Add Payment Method Hosted Fields** 
-
- # 1.3.4
- - Fix cvv not mandatory for Maestro card
- - Add command to convert data serialized to json 
-
+# Changelog
+
+## 1.10.0
+
+- **New**: Added merchant promotion field for Oney With or Without Fees payment methods
+
+## 1.9.1
+
+- **Fix**: Fix Entity query
+- **Fix**: Fix js minifying
+
+## 1.9.0
+
+- **New**: Added Multibanco payment method
+
+## 1.8.1
+
+- **Fix**: Removed fake value for shipto_house_number
+
+## 1.8.0
+
+- **New**: Retreive configuration from PHP SDK
+- **Fix**: Corrected Astropay
+
+## 1.7.3
+
+- Fix: Missing method for Config class
+- Fix: Wrong version in request source
+
+## 1.7.2
+
+- Fix: notification controller 302 HTTP code error (Magento 2.3.2) [#121](https://github.com/hipay/hipay-fullservice-sdk-magento2/issues/121)
+- Fix: MO/TO credentials retrieval
+- Fix: Disable oneclick when not logged-in
+- Fix: Save oneclick cards on 116 and 118 notification
+
+## 1.7.1
+
+- Fix: wrong method declaration (PHP7.1 and less) [#122](https://github.com/hipay/hipay-fullservice-sdk-magento2/issues/122)
+
+## 1.7.0
+
+- Init 3DS V2
+
+## 1.6.1
+
+- Update payment method configuration form
+- Fix issue [#119](https://github.com/hipay/hipay-fullservice-sdk-magento2/issues/119)
+
+## 1.6.0
+
+- Add MyBank payment method
+
+## 1.5.0
+
+- Add error message on field
+- Update payment method configuration
+
+## 1.4.3
+
+- Fix bad require and bug with magento validation
+- Improve notification capture with authorization
+
+## 1.4.2
+
+- Fix multi_use for one-click
+- Fix Magento 2.3 compliance
+
+## 1.4.1
+
+- Fix entity name for new magento checks
+- Fix Magento 2.3 compliance
+
+## 1.4.0
+
+- **Add Payment Method Hosted Fields**
+
+## 1.3.4
+
+- Fix cvv not mandatory for Maestro card
+- Add command to convert data serialized to json
+
 If you are migrating Magento from 2.1.X to 2.2.X and have defined 3DS or OneClick rules, you will need to run the new command to perform the migration.
-See: https://devdocs.magento.com/guides/v2.2/release-notes/backward-incompatible-changes/
+See: <https://devdocs.magento.com/guides/v2.2/release-notes/backward-incompatible-changes/>
 
 After your magento upgrade, execute in your magento directory:
-  
+
      php bin/magento hipay:upgradeToJson
-
 
-# 1.3.3
+## 1.3.3
+
 - Fix the exception with manual captures
 - Fix compilation error
 
-# 1.3.2
+## 1.3.2
 
 - [#114](https://github.com/hipay/hipay-fullservice-sdk-magento2/issues/114) Fix issue #114 : Fatal error on failure order (#114)
 - Fix : Split payment AI method cannot be displayed alone
 
-# 1.3.1
+## 1.3.1
 
 - Fix : Change refund workflow
 - Fix : Split payment status
 
-# 1.3.0
+## 1.3.0
 
 - Add proxy settings (gateway requests)
 - Fix : SEPA remove electronic signature
 - Fix : partial refund
 
-# 1.2.2
+## 1.2.2
 
 - Fix : Astropay payment method bug
 - Fix : Category mapping bug
 - Code rework/reformatting
 
-# 1.2.1
+## 1.2.1
 
 - Fix : Api call wrongly formatted (gender)
 - Fix : Issue [#107](https://github.com/hipay/hipay-fullservice-sdk-magento2/issues/107)
 - Fix : Error on DI compilation [#113](https://github.com/hipay/hipay-fullservice-sdk-magento2/pull/113)
 - Add casperJS tests
 - Improve CI
 
-# 1.2.0
+## 1.2.0
 
 - Add support for multi-currency payments
 - Add hash algorithm selection in BO
@@ -110,49 +132,53 @@ After your magento upgrade, execute in your magento directory:
 - Fix : MOTO
 - Fix : basket
 
-# 1.1.8
+## 1.1.8
 
 - Add support for product without category and option basket
 
-# 1.1.7
+## 1.1.7
 
-- New payment method support : Bnp Personal Finance 3X and 4X 
+- New payment method support : Bnp Personal Finance 3X and 4X
 
-# 1.1.6
+## 1.1.6
 
 - Fix invoice/credit-memo status (Pending/Paid) for partials captures
 
-# 1.1.5
+## 1.1.5
 
 - Add time_limit_to_pay in HostedPaymentPageRequest
 - Remove CDATA parameters ( Use custom_data now )
 
-# 1.1.4
+## 1.1.4
 
 Fixed bugs:
-  - Missing authentication indicator
 
-# 1.1.3
+- Missing authentication indicator
+
+## 1.1.3
 
 Fixed bugs:
-  - Error with RequestHandler compilation
 
-# 1.1.2
+- Error with RequestHandler compilation
+
+## 1.1.2
 
 Fixed bugs:
- - Fix autoclosing tag for fingerprint javascript inclusion
- - Change composer installation. Remove module installation in folder (app/code/Hipay). Now installation is in folder vendor
- - Fix wrong invoice status with multiple partials capture
- - Bad configuration for fingerprint.js
+
+- Fix autoclosing tag for fingerprint javascript inclusion
+- Change composer installation. Remove module installation in folder (app/code/Hipay). Now installation is in folder vendor
+- Fix wrong invoice status with multiple partials capture
+- Bad configuration for fingerprint.js
 
 New feature:
- - Parameter support  : "operation_id"
 
-# 1.1.1
+- Parameter support : "operation_id"
+
+## 1.1.1
 
 - Bugfix CCType for hosted payment
 
-# 1.1.0
+## 1.1.0
 
 - New feature FACILY PAY ONEY
 - New feature KLARNA
@@ -174,35 +200,34 @@ New feature:
 - FIX New branding
 - FIX translations
 
-# 1.0.8
+## 1.0.8
 
 - Skip Magento fraud checking
 
-# 1.0.7
+## 1.0.7
 
 - Bugfix Add display selector value to TPP request
 
-# 1.0.6
+## 1.0.6
 
 - Bugfix template iFrame send by the request new order
 
-# 1.0.5
+## 1.0.5
 
 - Update documentation URL to the HiPay portal developer
 
-# 1.0.4
+## 1.0.4
 
 - Bugfix PeriodUnit method and Docker image
 
-# 1.0.3
+## 1.0.3
 
 - Bugfix namespace in class Sisal, Qiwi Wallet and unit tests
 
-# 1.0.2
+## 1.0.2
 
 - Update version composer.json with new version PHP SDK and bumps package version
 
-# 1.0.1
+## 1.0.1
 
 - README updates
-
diff --git a/Model/Request/Order.php b/Model/Request/Order.php
@@ -313,13 +313,27 @@ public function mapRequest()
         // Extras information
         $this->processExtraInformations($orderRequest, $useOrderCurrency);
 
-        if($payment_product == 'multibanco') {
+        if ($payment_product == 'multibanco') {
             $timeLimit = $this->_config->getValue('multibanco_order_expiration_time');
             if ($timeLimit && in_array($timeLimit, [3, 30, 90])) {
                 $orderRequest->expiration_limit = $timeLimit;
             }
         }
 
+        if (preg_match("/[34]xcb-no-fees|[34]xcb/", $payment_product)) {
+            $merchantPromotion = $this->_config->getValue('merchant_promotion');
+            $orderRequest->payment_product_parameters = json_encode(
+                array(
+                    "merchantPromotion" => $merchantPromotion && !empty($merchantPromotion) ?
+                    $merchantPromotion :
+                    \HiPay\Fullservice\Helper\MerchantPromotionCalculator::calculate(
+                        $payment_product,
+                        $orderRequest->amount
+                    )
+                )
+            );
+        }
+
         return $orderRequest;
     }
 

diff --git a/composer.json b/composer.json
@@ -2,12 +2,12 @@
   "name": "hipay/hipay-fullservice-sdk-magento2",
   "description": "The HiPay Fullservice module for Magento 2 is a PHP module which allows you to accept payments in your Magento 2 online store.",
   "type": "magento2-module",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "license": [
     "Apache-2.0"
   ],
   "require": {
-    "hipay/hipay-fullservice-sdk-php": "2.5.2"
+    "hipay/hipay-fullservice-sdk-php": "2.5.3"
   },
   "scripts": {
     "post-install-cmd": [

diff --git a/etc/adminhtml/system/method/facilypay3X.xml b/etc/adminhtml/system/method/facilypay3X.xml
@@ -32,6 +32,10 @@
 		<label>Facily Pay fees</label>
 		<source_model>HiPay\FullserviceMagento\Model\System\Config\Source\ProductCode\Facilypay3X</source_model>
 	</field>
+	<field id="merchant_promotion" translate="label" type="text" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
+		<label>Merchant Promotion</label>
+		<comment>OPC provided by Oney</comment>
+	</field>
 <!--	<field id="default_mapping_shipping_method" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
 		<label>Default mapping shipping method</label>
 		<source_model>HiPay\FullserviceMagento\Model\System\Config\Source\ShippingMethodsHipay</source_model>

diff --git a/etc/adminhtml/system/method/facilypay4X.xml b/etc/adminhtml/system/method/facilypay4X.xml
@@ -32,6 +32,10 @@
 		<label>Facily Pay fees</label>
 		<source_model>HiPay\FullserviceMagento\Model\System\Config\Source\ProductCode\Facilypay4X</source_model>
 	</field>
+	<field id="merchant_promotion" translate="label" type="text" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
+		<label>Merchant Promotion</label>
+		<comment>OPC provided by Oney</comment>
+	</field>
 <!--	<field id="default_mapping_shipping_method" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
 		<label>Default mapping shipping method</label>
 		<source_model>HiPay\FullserviceMagento\Model\System\Config\Source\ShippingMethodsHipay</source_model>

diff --git a/etc/config.xml b/etc/config.xml
@@ -899,6 +899,7 @@
                 <active>0</active>
                 <title>Hipay Entreprise Oney Facily Pay 3X</title>
                 <payment_product_fees>3xcb</payment_product_fees>
+                <merchant_promotion></merchant_promotion>
                 <payment_action>Sale</payment_action>
                 <min_order_total>100</min_order_total>
                 <order_status>pending</order_status>
@@ -927,6 +928,7 @@
                 <active>0</active>
                 <title>Hipay Entreprise Oney Facily Pay 4X</title>
                 <payment_product_fees>4xcb</payment_product_fees>
+                <merchant_promotion></merchant_promotion>
                 <payment_action>Sale</payment_action>
                 <min_order_total>100</min_order_total>
                 <order_status>pending</order_status>