Release 1.3.7

Author: victoralbala

Model/ApiClient.php

@@ -12,6 +12,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Encryption\EncryptorInterface;
+use PostFinanceCheckout\Payment\Model\ApiClientHeaders;
 
 /**
  * Service to provide PostFinance Checkout API client.
@@ -84,6 +85,8 @@ public function getApiClient()
                 $client = new \PostFinanceCheckout\Sdk\ApiClient($userId, $this->encrypter->decrypt($applicationKey));
                 $client->setBasePath($this->getBaseGatewayUrl() . '/api');
                 $this->apiClient = $client;
+                $apiClientHeaders = new ApiClientHeaders();
+                $apiClientHeaders->addHeaders($this->apiClient);
             } else {
                 throw new \PostFinanceCheckout\Payment\Model\ApiClientException(
                     'The PostFinance Checkout API user data are incomplete.');

Model/ApiClientHeaders.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * PostFinance Checkout Magento 2
+ *
+ * This Magento 2 extension enables to process payments with PostFinance Checkout (https://postfinance.ch/en/business/products/e-commerce/postfinance-checkout-all-in-one.html/).
+ *
+ * @package PostFinanceCheckout_Payment
+ * @author wallee AG (http://www.wallee.com/)
+ * @license http://www.apache.org/licenses/LICENSE-2.0  Apache Software License (ASL 2.0)
+ */
+namespace PostFinanceCheckout\Payment\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Encryption\EncryptorInterface;
+use PostFinanceCheckout\Sdk\ApiClient;
+
+/**
+ * Service to provide PostFinance Checkout API client.
+ */
+class ApiClientHeaders
+{
+
+    /**
+     * @var SHOP_SYSTEM
+     */
+    public const SHOP_SYSTEM = 'x-meta-shop-system';
+	
+    /**
+     * @var SHOP_SYSTEM_VERSION
+     */
+    public const SHOP_SYSTEM_VERSION = 'x-meta-shop-system-version';
+	
+    /**
+     * @var SHOP_SYSTEM_AND_VERSION
+     */
+    public const SHOP_SYSTEM_AND_VERSION = 'x-meta-shop-system-and-version';
+
+    /**
+     * Sets the headers.
+     *
+     * @param \PostFinanceCheckout\Sdk\ApiClient $apiClient
+     */
+    public function addHeaders(ApiClient &$apiClient)
+    {
+        $data = self::getDefaultData();
+		foreach ($data as $key => $value) {
+			$apiClient->addDefaultHeader($key, $value);
+		}
+    }
+
+    /**
+	 * @return array
+	 */
+	protected static function getDefaultData()
+	{
+
+        // todo refactor using DI: https://www.rohanhapani.com/how-to-find-out-version-of-magento-2-programmatically/;
+        $om = \Magento\Framework\App\ObjectManager::getInstance();
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();  
+        $productMetadata = $objectManager->get('\Magento\Framework\App\ProductMetadataInterface'); 
+        $shop_version = $productMetadata->getVersion();
+
+		[$major_version, $minor_version, $rest] = explode('.', $shop_version, 3);
+		return [
+			self::SHOP_SYSTEM             => 'magento',
+			self::SHOP_SYSTEM_VERSION     => $shop_version,
+			self::SHOP_SYSTEM_AND_VERSION => 'magento-' . $major_version . '.' . $minor_version,
+		];
+	}
+}

Observer/CollectAmastyCheckoutLineItems.php

@@ -20,6 +20,8 @@
 use PostFinanceCheckout\Payment\Helper\Data as Helper;
 use PostFinanceCheckout\Sdk\Model\LineItemCreate;
 use PostFinanceCheckout\Sdk\Model\LineItemType;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Module\ModuleListInterface;
 
 /**
  * Observer to collect the line items for the amasty checkout.
@@ -45,17 +47,25 @@ class CollectAmastyCheckoutLineItems implements ObserverInterface
      */
     private $helper;
 
+    /**
+     *
+     * @var ModuleListInterface
+     */
+    protected $_moduleList;
+
     /**
      *
      * @param ObjectManagerInterface $objectManager
      * @param ModuleManager $moduleManager
      * @param Helper $helper
+     * @param ModuleListInterface $moduleList
      */
-    public function __construct(ObjectManagerInterface $objectManager, ModuleManager $moduleManager, Helper $helper)
+    public function __construct(ObjectManagerInterface $objectManager, ModuleManager $moduleManager, Helper $helper, ModuleListInterface $moduleList)
     {
         $this->objectManager = $objectManager;
         $this->moduleManager = $moduleManager;
         $this->helper = $helper;
+        $this->_moduleList = $moduleList;
     }
 
     public function execute(Observer $observer)
@@ -92,7 +102,13 @@ protected function convertAmastyCheckoutLineItems($entity)
      */
     protected function convertGiftWrapLineItem($entity)
     {
-        $feeRepository = $this->objectManager->get('Amasty\Checkout\Api\FeeRepositoryInterface');
+        $moduleInfo = $this->_moduleList->getOne('Amasty_Checkout');
+
+        if (version_compare($moduleInfo['setup_version'], '4.0.0', '>=')) {
+            $feeRepository = $this->objectManager->get('Amasty\CheckoutCore\Api\FeeRepositoryInterface');
+        } else {
+            $feeRepository = $this->objectManager->get('Amasty\Checkout\Api\FeeRepositoryInterface');
+        }
 
         $currency = null;
         $fee = null;

README.md

@@ -12,7 +12,7 @@ This repository contains the Magento 2 extension that enables to process payment
 
 ## Documentation
 
-* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html)
+* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html)
 
 
 ## Support
@@ -30,4 +30,4 @@ We do provide special integrations for the following one step checkouts:
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/magento-2/blob/1.3.6/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/magento-2/blob/1.3.7/LICENSE) for more information.

Setup/Patch/Data/AddData.php renamed to Setup/Patch/Data/AddSetupData.php

@@ -7,11 +7,11 @@
 
 
 /**
- * Class AddData
+ * Class AddSetupData
  * @package PostFinanceCheckout\Payment\Setup\Patch\Data
  */
 
-class AddData implements DataPatchInterface, PatchVersionInterface
+class AddSetupData implements DataPatchInterface, PatchVersionInterface
 {
     private $status;
 
@@ -52,12 +52,12 @@ public static function getDependencies(){
     }
 
     /**
-     * @description: Under the version number, it will run
+     * @description: Under the version number, it will run (if new version is 1.3.5, put 1.3.6)
      * @return int:
      */
 
     public static function getVersion(){
-        return '1.2.8';
+        return '1.3.8';
     }
 
     /**

composer.json

@@ -16,7 +16,7 @@
 		}
 	],
 	"type" : "magento2-module",
-	"version" : "1.3.6",
+	"version" : "1.3.7",
 	"require" : {
 		"php" : "~7.1.3||~7.2.0||~7.3.0||~7.4.0||~8.0||~8.1",
 		"magento/framework" : "^102.0.0||^103.0.0",

docs/en/documentation.html

@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/magento-2/releases/tag/1.3.6/">
+		<a href="https://github.com/pfpayments/magento-2/releases/tag/1.3.7/">
 			Source
 		</a>
 	</li>

etc/adminhtml/system.xml

@@ -18,7 +18,7 @@
 			<resource>PostFinanceCheckout_Payment::config</resource>
 			<group id="information" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
 				<label>Information</label>
-				<comment><![CDATA[If you need help setting up the PostFinance Checkout extension, check out the <a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
+				<comment><![CDATA[If you need help setting up the PostFinance Checkout extension, check out the <a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
 				<field id="version" translate="label" type="label" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
 					<label>Module Version</label>
 				</field>

etc/config.xml

@@ -14,7 +14,7 @@
 	<default>
 		<postfinancecheckout_payment>
 			<information>
-				<version>1.3.6</version>
+				<version>1.3.7</version>
 				<sdk_version>3.1.1</sdk_version>
 			</information>
 			<general>

etc/module.xml

@@ -11,7 +11,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="PostFinanceCheckout_Payment" setup_version="1.3.6">
+    <module name="PostFinanceCheckout_Payment" setup_version="1.3.7">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>

i18n/de_DE.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Geschenkverpackung"
 "Hold Delivery","Lieferung halten"
 "ID required","ID erforderlich"
-"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der PostFinance Checkout-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
+"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der PostFinance Checkout-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
 "Inactive","Inaktiv"
 "Information","Informationen"
 "Invoice","Rechnung"

i18n/en_US.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Gift Wrap"
 "Hold Delivery","Hold Delivery"
 "ID required","ID required"
-"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentation</a>."
+"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentation</a>."
 "Inactive","Inactive"
 "Information","Information"
 "Invoice","Invoice"

i18n/fr_CH.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Papier cadeau"
 "Hold Delivery","Suspendre la livraison"
 "ID required","Pièce d'identité requise"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Si vous avez besoin d'aide pour configurer l'extension wallee, consultez la <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentation</a> an."
+"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Si vous avez besoin d'aide pour configurer l'extension wallee, consultez la <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentation</a> an."
 "Inactive","Inactif"
 "Information","Information"
 "Invoice","Facture"

i18n/fr_FR.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Papier cadeau"
 "Hold Delivery","Suspendre la livraison"
 "ID required","Pièce d'identité requise"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Si vous avez besoin d'aide pour configurer l'extension wallee, consultez la <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentation</a> an."
+"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Si vous avez besoin d'aide pour configurer l'extension wallee, consultez la <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentation</a> an."
 "Inactive","Inactif"
 "Information","Information"
 "Invoice","Facture"

i18n/it_CH.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Confezione regalo"
 "Hold Delivery","Sospendi la consegna"
 "ID required","ID richiesto"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Se hai bisogno di aiuto per configurare l'estensione wallee, consulta la <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentazione</a> an."
+"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Se hai bisogno di aiuto per configurare l'estensione wallee, consulta la <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentazione</a> an."
 "Inactive","Inattivo"
 "Information","Informazione"
 "Invoice","Fattura"

i18n/it_IT.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Confezione regalo"
 "Hold Delivery","Sospendi la consegna"
 "ID required","ID richiesto"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Se hai bisogno di aiuto per configurare l'estensione wallee, consulta la <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.6/docs/en/documentation.html"" target=""_blank"">documentazione</a> an."
+"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Se hai bisogno di aiuto per configurare l'estensione wallee, consulta la <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2/1.3.7/docs/en/documentation.html"" target=""_blank"">documentazione</a> an."
 "Inactive","Inattivo"
 "Information","Informazione"
 "Invoice","Fattura"