Merge pull request #213 from getbread/asi-3787-mageplaza-compat

ASI-3787 Do not update billing address if Mageplaza OSC is enabled

Author: fkhan-bread

changelog.txt

@@ -1,7 +1,10 @@
 == Changelog ==
 
-= 2.3.7
+= 2.3.8
 * Current release
+* Add compatibility with Mageplaza OSC
+
+= 2.3.7
 * Fixed issue with configurable products
 
 = 2.3.6

composer.json

@@ -3,7 +3,7 @@
     "description": "Offers Bread Pay financing and checkout tools for your Magento store",
     "license": "MIT",
     "minimum-stability": "stable",
-    "version": "2.3.7",
+    "version": "2.3.8",
     "require": {
         "php": "~7.0.13||~7.1.0||~7.1.3||~7.2.0||~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0"
     },

etc/adminhtml/system.ca.xml

@@ -10,7 +10,7 @@
                     <![CDATA[
                             <div>
                                 <span class="rbc-logo"></span>
-                            Payplan by RBC (v2.3.7) <a href="https://www.rbcpayplan.com/" target="_blank">www.rbcpayplan.com</a> - <b>Jump start your eCommerce business with PayPlan Powered by RBC</b>.
+                            Payplan by RBC (v2.3.8) <a href="https://www.rbcpayplan.com/" target="_blank">www.rbcpayplan.com</a> - <b>Jump start your eCommerce business with PayPlan Powered by RBC</b>.
                             <br/> Developer API reference: <a href="https://rbcpayplan.readme.io/rbc-onboarding/docs/magento-2-integration-steps/" target="_blank">Payplan by RBC API Reference</a>
                             </div>
                     ]]>

etc/adminhtml/system.xml

@@ -10,7 +10,7 @@
                     <![CDATA[
                             <div>
                                 <span class="bread-logo"></span>
-                            Bread Pay (v2.3.7) by <a href="https://payments.breadfinancial.com/" target="_blank">payments.breadfinancial.com</a> - <b>Onsite Consumer Financing</b>.
+                            Bread Pay (v2.3.8) by <a href="https://payments.breadfinancial.com/" target="_blank">payments.breadfinancial.com</a> - <b>Onsite Consumer Financing</b>.
                             <br/> Developers API reference: <a href="https://docs.breadpayments.com/bread-classic/docs/magento-2/" target="_blank">Bread Developer API Reference</a>
                             </div>
                     ]]>

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="Bread_BreadCheckout" setup_version="2.3.7">
+    <module name="Bread_BreadCheckout" setup_version="2.3.8">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Sales"/>

view/frontend/web/js/view/payment/method-renderer/breadcheckout.js

@@ -281,6 +281,12 @@ define(
                          */
                         updateAddress: function (data, errorInfo) {
                             var self = this;
+                            
+                            // Bypass update address if using Mageplaza OSC
+                            if (self.isOscMagePlaza()) {
+                                return;
+                            }
+                            
                             /**
                              * Billing address
                              */
@@ -310,6 +316,10 @@ define(
                             return defaultProcessorSavedShipping;
                         },
 
+                        isOscMagePlaza: function() {
+                            return window.checkoutConfig && window.checkoutConfig.oscConfig;
+                        },
+
                         /**
                          * Validate order totals
                          *