Handle discounts applied to shipping amounts. Fixes #26

taxjar · Jun 1, 2018 · 87f614f · 87f614f
1 parent 8057843
commit 87f614f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Model/Smartcalcs.php b/Model/Smartcalcs.php
@@ -143,6 +143,8 @@ public function getTaxForOrder(
             return;
         }
 
+        $shipping = $address->getShippingAmount() - $address->getShippingDiscountAmount();
+
         $shippingRegionId = $this->scopeConfig->getValue('shipping/origin/region_id',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $quote->getStoreId()
@@ -177,7 +179,7 @@ public function getTaxForOrder(
         ];
 
         $order = array_merge($fromAddress, $toAddress, [
-            'shipping' => (float) $address->getShippingAmount(),
+            'shipping' => (float) $shipping,
             'line_items' => $this->_getLineItems($quote, $quoteTaxDetails),
             'nexus_addresses' => $this->_getNexusAddresses($quote->getStoreId()),
             'plugin' => 'magento'

diff --git a/Model/Transaction/Order.php b/Model/Transaction/Order.php
@@ -42,7 +42,7 @@ public function build(
     ) {
         $createdAt = new \DateTime($order->getCreatedAt());
         $subtotal = (float) $order->getSubtotal();
-        $shipping = (float) $order->getShippingAmount();
+        $shipping = (float) $order->getShippingAmount() - $order->getShippingDiscountAmount();
         $discount = (float) $order->getDiscountAmount();
         $salesTax = (float) $order->getTaxAmount();
 

diff --git a/Model/Transaction/Refund.php b/Model/Transaction/Refund.php
@@ -48,7 +48,7 @@ public function build(
         \Magento\Sales\Model\Order\Creditmemo $creditmemo
     ) {
         $subtotal = (float) $creditmemo->getSubtotal();
-        $shipping = (float) $creditmemo->getShippingAmount();
+        $shipping = (float) $creditmemo->getShippingAmount() - $creditmemo->getShippingDiscountAmount();
         $discount = (float) $creditmemo->getDiscountAmount();
         $salesTax = (float) $creditmemo->getTaxAmount();