compatible osc

mageplaza · Jun 18, 2021 · 47e9868 · 47e9868
1 parent fd59302
commit 47e9868
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 14 deletions.
diff --git a/Api/CheckoutManagementInterface.php b/Api/CheckoutManagementInterface.php
@@ -30,8 +30,9 @@ interface CheckoutManagementInterface
     /**
      * @param string $cartId
      * @param string $address
+     * @param boolean $isOsc
      *
      * @return bool
      */
-    public function updateOrder($cartId, $address);
+    public function updateOrder($cartId, $address, $isOsc);
 }
diff --git a/Helper/EmailMarketing.php b/Helper/EmailMarketing.php
@@ -710,12 +710,14 @@ public function getOrderViewUrl($storeId, $orderId, $path = 'sales/order/view')
 
     /**
      * @param Quote $quote
+     * @param array|null $address
+     * @param boolean $isOsc
      *
      * @return array
-     * @throws NoSuchEntityException
      * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
-    public function getACEData($quote, $address = null)
+    public function getACEData($quote, array $address = null, $isOsc = false)
     {
         $isActive         = (bool) $quote->getIsActive();
         $quoteCompletedAt = null;
@@ -755,7 +757,7 @@ public function getACEData($quote, $address = null)
             'total_tax'              => !$quote->isVirtual() ? $quote->getShippingAddress()->getBaseTaxAmount() : 0,
             'customer_locale'        => null,
             'shipping_address'       => $this->getShippingAddress($quote, $address),
-            'billing_address'        => $this->getBillingAddress($quote, $address)
+            'billing_address'        => $this->getBillingAddress($quote, $address, $isOsc)
         ];
     }
 
@@ -773,15 +775,21 @@ public function getShippingAddress(Quote $quote, $address = null)
     /**
      * @param Quote $quote
      * @param array|null $address
+     * @param boolean $isOsc
      *
      * @return array
      */
-    public function getBillingAddress(Quote $quote, $address = null)
+    public function getBillingAddress(Quote $quote, $address = null, $isOsc = false)
     {
+        $field         = 'billingAddress';
         $paymentMethod = $quote->getPayment()->getMethod();
 
         if ($paymentMethod) {
-            return $this->getAddress($quote, $quote->getBillingAddress(), $address, 'billingAddress' . $paymentMethod);
+            if (!$isOsc) {
+                $field .= $paymentMethod;
+            }
+
+            return $this->getAddress($quote, $quote->getBillingAddress(), $address, $field);
         }
 
         return [];

diff --git a/Model/CheckoutManagement.php b/Model/CheckoutManagement.php
@@ -68,7 +68,7 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
-    public function updateOrder($cartId, $address)
+    public function updateOrder($cartId, $address, $isOsc)
     {
         if ($this->helperEmailMarketing->isEnableEmailMarketing() &&
             $this->helperEmailMarketing->getSecretKey() &&
@@ -77,8 +77,8 @@ public function updateOrder($cartId, $address)
             $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
             /** @var Quote $quote */
             $quote           = $this->cartRepository->getActive($quoteIdMask->getQuoteId());
-            $shippingAddress = EmailMarketing::jsonDecode($address);
-            $ACEData         = $this->helperEmailMarketing->getACEData($quote, $shippingAddress);
+            $newAddress = EmailMarketing::jsonDecode($address);
+            $ACEData         = $this->helperEmailMarketing->getACEData($quote, $newAddress, $isOsc);
 
             $this->helperEmailMarketing->sendRequestWithoutWaitResponse(
                 $ACEData,

diff --git a/view/frontend/web/js/action/send-address.js b/view/frontend/web/js/action/send-address.js
@@ -25,11 +25,12 @@ define([
 ], function (storage, resourceUrlManager, quote) {
     'use strict';
 
-    return function (address) {
+    return function (address, isOsc) {
         return storage.post(
             resourceUrlManager.getUrlForUpdateOrder(quote),
             JSON.stringify({
-                address: address
+                address: address,
+                isOsc: isOsc
             }),
             false
         );

diff --git a/view/frontend/web/js/model/billing-address-on-change.js b/view/frontend/web/js/model/billing-address-on-change.js
@@ -62,7 +62,7 @@ define([
                 element.on('value', function () {
                     clearTimeout(self.validateAddressTimeout);
                     self.validateAddressTimeout = setTimeout(function () {
-                        sendAddress(JSON.stringify(self.collectObservedData()));
+                        sendAddress(JSON.stringify(self.collectObservedData()), self.isOsc());
                     }, delay);
                 });
 
@@ -87,6 +87,9 @@ define([
             });
 
             return observedValues;
+        },
+        isOsc: function () {
+            return !!window.checkoutConfig.oscConfig;
         }
     };
 });
diff --git a/view/frontend/web/js/model/shipping-address-on-change.js b/view/frontend/web/js/model/shipping-address-on-change.js
@@ -62,7 +62,7 @@ define([
                 element.on('value', function () {
                     clearTimeout(self.validateAddressTimeout);
                     self.validateAddressTimeout = setTimeout(function () {
-                        sendAddress(JSON.stringify(self.collectObservedData()));
+                        sendAddress(JSON.stringify(self.collectObservedData()), false);
                     }, delay);
                 });
 

diff --git a/view/frontend/web/js/view/billing-address-mixins.js b/view/frontend/web/js/view/billing-address-mixins.js
@@ -61,8 +61,17 @@ define(
 
         var mixin = {
             initialize: function () {
+                var fieldset;
+
                 this._super();
-                billingAddressOnChange.initFields(this.get('name') + '.form-fields')
+
+                if (window.checkoutConfig.oscConfig) {
+                    fieldset = this.get('name') + '.billing-address-fieldset';
+                } else {
+                    fieldset = this.get('name') + '.form-fields';
+                }
+
+                billingAddressOnChange.initFields(fieldset);
             },
         };