module version + xml sniffing

i-ways · Apr 29, 2021 · 964d823 · 964d823
1 parent 8334017
commit 964d823
Show file tree

Hide file tree

Showing 11 changed files with 233 additions and 68 deletions.
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -1,3 +1,6 @@
+==== 1.3.6 ====
+workaround for checkout sessions loss
+
 ==== 1.3.5 ====
 Version update + bugfix
 

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         }
     ],
     "type": "magento2-module",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "license": [
         "OSL-3.0"
     ],

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
diff --git a/etc/config.xml b/etc/config.xml
@@ -17,7 +17,8 @@
  * @link     https://www.i-ways.net
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <iways_paypalplus>
             <api>

diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
@@ -25,12 +25,14 @@
     <policies>
         <policy id="base-uri">
             <values>
-                <value id="https-www-paypalobjects-com" type="host">https://www.paypalobjects.com</value>
+                <value id="https-www-paypalobjects-com"
+                       type="host">https://www.paypalobjects.com</value>
             </values>
         </policy>
         <policy id="form-action">
             <values>
-                <value id="https-www-sandbox-paypal-com" type="host">https://www.sandbox.paypal.com</value>
+                <value id="https-www-sandbox-paypal-com"
+                       type="host">https://www.sandbox.paypal.com</value>
             </values>
         </policy>
     </policies>

diff --git a/etc/di.xml b/etc/di.xml
@@ -17,16 +17,22 @@
  * @link     https://www.i-ways.net
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Iways\PayPalPlus\Api\GuestPPPPaymentInformationManagementInterface" type="Iways\PayPalPlus\Model\PaymentInformationManagement\GuestPPPPaymentInformationManagement" />
-    <preference for="Iways\PayPalPlus\Api\PPPPaymentInformationManagementInterface" type="Iways\PayPalPlus\Model\PaymentInformationManagement\PPPPaymentInformationManagement" />
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Iways\PayPalPlus\Api\GuestPPPPaymentInformationManagementInterface"
+                type="Iways\PayPalPlus\Model\PaymentInformationManagement\GuestPPPPaymentInformationManagement" />
+    <preference for="Iways\PayPalPlus\Api\PPPPaymentInformationManagementInterface"
+                type="Iways\PayPalPlus\Model\PaymentInformationManagement\PPPPaymentInformationManagement" />
     <type name="Magento\Sales\Model\Order\Payment">
-        <plugin name="addPppAttributes" type="Iways\PayPalPlus\Plugin\Sales\Model\Order\PaymentPlugin" />
+        <plugin name="addPppAttributes"
+                type="Iways\PayPalPlus\Plugin\Sales\Model\Order\PaymentPlugin" />
     </type>
     <type name="Magento\Payment\Model\MethodList">
-        <plugin name="paymentAddPpp" type="Iways\PayPalPlus\Plugin\Payment\Model\MethodListPlugin" />
+        <plugin name="paymentAddPpp"
+                type="Iways\PayPalPlus\Plugin\Payment\Model\MethodListPlugin" />
     </type>
     <type name="Magento\Config\Model\Config\Structure\Element\Group">
-        <plugin name="dynamic_config_groups" type="Iways\PayPalPlus\Plugin\Config\Structure\Element\Group" />
+        <plugin name="dynamic_config_groups"
+                type="Iways\PayPalPlus\Plugin\Config\Structure\Element\Group" />
     </type>
 </config>
diff --git a/etc/extension_attributes.xml b/etc/extension_attributes.xml
@@ -17,61 +17,73 @@
  * @link     https://www.i-ways.net
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
     <extension_attributes for="Magento\Sales\Api\Data\OrderPaymentInterface">
-        <attribute code="ppp_reference_number" type="string">
+        <attribute code="ppp_reference_number"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
-        <attribute code="ppp_instruction_type" type="string">
+        <attribute code="ppp_instruction_type"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
-        <attribute code="ppp_payment_due_date" type="string">
+        <attribute code="ppp_payment_due_date"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
-        <attribute code="ppp_note" type="string">
+        <attribute code="ppp_note"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
-        <attribute code="ppp_bank_name" type="string">
+        <attribute code="ppp_bank_name"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
-        <attribute code="ppp_account_holder_name" type="string">
+        <attribute code="ppp_account_holder_name"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view"/>
             </resources>
         </attribute>
-        <attribute code="ppp_international_bank_account_number" type="string">
+        <attribute code="ppp_international_bank_account_number"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
-        <attribute code="ppp_bank_identifier_code" type="string">
+        <attribute code="ppp_bank_identifier_code"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
-        <attribute code="ppp_routing_number" type="string">
+        <attribute code="ppp_routing_number"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
-        <attribute code="ppp_amount" type="string">
+        <attribute code="ppp_amount"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
-        <attribute code="ppp_currency" type="string">
+        <attribute code="ppp_currency"
+                   type="string">
             <resources>
-                <resource  ref="Magento_Sales::actions_view"/>
+                <resource ref="Magento_Sales::actions_view" />
             </resources>
         </attribute>
     </extension_attributes>

diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -17,11 +17,14 @@
  * @link     https://www.i-ways.net
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Checkout\Model\CompositeConfigProvider">
         <arguments>
-            <argument name="configProviders" xsi:type="array">
-                <item name="iways_paypalplus_payment_config_provider" xsi:type="object">Iways\PayPalPlus\Model\ConfigProvider</item>
+            <argument name="configProviders"
+                      xsi:type="array">
+                <item name="iways_paypalplus_payment_config_provider"
+                      xsi:type="object">Iways\PayPalPlus\Model\ConfigProvider</item>
             </argument>
         </arguments>
     </type>

diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml
@@ -17,9 +17,11 @@
  * @link     https://www.i-ways.net
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
     <router id="standard">
-        <route id="paypalplus" frontName="paypalplus">
+        <route id="paypalplus"
+               frontName="paypalplus">
             <module name="Iways_PayPalPlus" />
         </route>
     </router>

diff --git a/etc/module.xml b/etc/module.xml
@@ -17,8 +17,10 @@
  * @link     https://www.i-ways.net
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Iways_PayPalPlus" setup_version="1.3.5">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Iways_PayPalPlus"
+            setup_version="1.3.6">
         <sequence>
             <module name="Magento_Paypal" />
         </sequence>

diff --git a/etc/webapi.xml b/etc/webapi.xml
@@ -20,20 +20,25 @@
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Webapi:etc/webapi.xsd">
     <!-- Managing payment guest information -->
-    <route url="/V1/guest-carts/:cartId/set-ppp-payment-information" method="POST">
-        <service class="Iways\PayPalPlus\Api\GuestPPPPaymentInformationManagementInterface" method="savePaymentInformation" />
+    <route url="/V1/guest-carts/:cartId/set-ppp-payment-information"
+           method="POST">
+        <service class="Iways\PayPalPlus\Api\GuestPPPPaymentInformationManagementInterface"
+                 method="savePaymentInformation" />
         <resources>
             <resource ref="anonymous" />
         </resources>
     </route>
     <!-- Managing My shipping information -->
-    <route url="/V1/carts/mine/set-ppp-payment-information" method="POST">
-        <service class="Iways\PayPalPlus\Api\PPPPaymentInformationManagementInterface" method="savePaymentInformation" />
+    <route url="/V1/carts/mine/set-ppp-payment-information"
+           method="POST">
+        <service class="Iways\PayPalPlus\Api\PPPPaymentInformationManagementInterface"
+                 method="savePaymentInformation" />
         <resources>
             <resource ref="self" />
         </resources>
         <data>
-            <parameter name="cartId" force="true">%cart_id%</parameter>
+            <parameter name="cartId"
+                       force="true">%cart_id%</parameter>
         </data>
     </route>
 </routes>