add eventlistener for zipcode updates, and set zipcode accordingly on…

… quote as fix for some shippingmethods
sveawebpay · Jan 23, 2019 · 8c3350f · 8c3350f
1 parent f5b1fae
commit 8c3350f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/Controller/Index/updateCart.php b/Controller/Index/updateCart.php
@@ -84,7 +84,7 @@ public function __construct(
         $this->cart                  = $cart;
         $this->quoteFactory          = $quoteFactory;
         $this->configProvider        = $configProvider;
-        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->quoteIdMaskFactory    = $quoteIdMaskFactory;
 
 
         parent::__construct($context);
@@ -266,9 +266,14 @@ protected function updateQty($quote, $cart)
      */
     protected function updateShipping($quote, $method=null)
     {
+        $sveaOrder = $this->buildOrder->getOrder($quote, false);
         $this->quoteRepository->save($quote);
-
         $shippingAddress = $quote->getShippingAddress();
+
+        if (isset($sveaOrder['ShippingAddress']['PostalCode'])) {
+            $shippingAddress->setPostcode($sveaOrder['ShippingAddress']['PostalCode']);
+        }
+
         if($shippingAddress) {
             $shippingAddress->setCollectShippingRates(true)
                 ->collectShippingRates()

diff --git a/Model/Api/BuildOrder.php b/Model/Api/BuildOrder.php
@@ -735,7 +735,7 @@ protected function _addShipping($sveaOrder, $quote, $noSave)
         $shippingAddress = $quote->getShippingAddress();
 
         //Chosen shipping method.
-        if ($quote->getShippingAddress()->getShippingMethod()) {
+        if ($shippingAddress->getShippingMethod()) {
             $method = $shippingAddress->getShippingMethod();
         }
 

diff --git a/view/frontend/web/js/sveacheckout.js b/view/frontend/web/js/sveacheckout.js
@@ -10,7 +10,6 @@ require([
   'Magento_Checkout/js/model/shipping-service'
 ], function ($, getTotals, quote, shippingEstimation, checkoutData, addressConverter, customerData) {
 
-
   var addressData = {'countryId': sveacheckout.country};
   checkoutData.setShippingAddressFromData(addressData);
 
@@ -122,6 +121,7 @@ require([
     if ('scoApi' in window) {
       window.scoApi.setCheckoutEnabled(false);
     }
+
     // submit form
     $.ajax({
       type: 'POST',
@@ -167,14 +167,29 @@ require([
     });
   }
 
-
   /**
    * Observe the validationresult, check for last error message, if found display it.
    */
-  // Update checkout window
   if ('scoApi' in window) {
-    window.scoApi.observeModel('validation.result', function() {
+    window.scoApi.observeEvent('validation.result', function() {
       window.scoApi.setCheckoutEnabled(true);
     });
   }
+
+  function observeEvents($) {
+    if ('scoApi' in window) {
+      window.scoApi.observeEvent("identity.postalCode", function (data) {
+        $('#shipping-zip-form [name="postcode"]').val(data.value);
+        $('#shipping-zip-form [name="postcode"]').trigger('change', this);
+      });
+    } else {
+      setTimeout(setupObservers, 500, $);
+    }
+  }
+
+  function setupObservers($) {
+    observeEvents($);
+  }
+
+  setupObservers($);
 });