now handles discount on shipping + minor fixes

sveawebpay · Oct 3, 2019 · 2c9410e · 2c9410e
1 parent fcf9691
commit 2c9410e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/app/code/community/Svea/Checkout/Model/Checkout/Api/BuildOrder.php b/app/code/community/Svea/Checkout/Model/Checkout/Api/BuildOrder.php
@@ -486,6 +486,18 @@ protected function _addShipping($quote, $sveaOrder, $noSave)
 
         $sveaOrder->addFee($shippingFee);
 
+        //Add shipping discount
+        if ((float)$shippingAddress->getShippingDiscountAmount()) {
+            if (!$vatPercent && ($shippingAddress->getShippingInclTax() != $shippingAddress->getShippingAmount())) {
+                $vatCalc = $shippingAddress->getShippingInclTax()/$shippingAddress->getShippingAmount();
+            }
+            $itemRowDiscount = WebPayItem::fixedDiscount()
+                ->setName(mb_substr(sprintf('discount-%s', $methodTitle ), 0, 40))
+                ->setVatPercent((int)round($vatPercent))
+                ->setAmountIncVat((float)round($shippingAddress->getShippingDiscountAmount()*($vatCalc),2));
+            $sveaOrder->addDiscount($itemRowDiscount);
+        }
+
         return $this;
     }
 

diff --git a/js/Svea/Checkout/sveacheckout.js b/js/Svea/Checkout/sveacheckout.js
@@ -187,6 +187,10 @@ SveaCheckout.prototype = {
           that.updateCoupon(event);
         }
       }
+
+      if (el.name == 'shipping_method') {
+        that.updateShipping(event);
+      }
     });
 
     /**
@@ -370,7 +374,8 @@ SveaCheckout.prototype = {
        * Remove loading state
        */
       $('sveacheckout-wrapper').removeClassName('loading');
-      if (typeof window.scoApi !== 'Undefined') {
+
+      if (typeof window.scoApi !== 'undefined') {
         window.scoApi.setCheckoutEnabled(true);
       }
     }.bind(this));
@@ -443,7 +448,7 @@ SveaCheckout.prototype = {
      */
     document.addEventListener("startingAjaxFail", function (event) {
       $('sveacheckout-wrapper').removeClassName('loading');
-      if (typeof window.scoApi !== 'Undefined') {
+      if (typeof window.scoApi !== 'undefined') {
         window.scoApi.setCheckoutEnabled(true);
       }
     }.bind(this));
@@ -490,7 +495,9 @@ SveaCheckout.prototype = {
         if (data.value !== oldValue) {
           jQuery('#postcode').val(data.value);
           var change = new CustomEvent('change');
-          document.getElementById('shipping-zip-form').dispatchEvent(change);
+          var shippingZipForm = document.getElementById('shipping-zip-form');
+          if (shippingZipForm != null)
+            document.getElementById('shipping-zip-form').dispatchEvent(change);
         }
       });
     } else {