Merge pull request #1926 from mailchimp/Issue1921-2.1

closes #1921 for magento 2.1
mailchimp · Mar 18, 2024 · c14928e · c14928e
2 parents 7ec1cc3 + b946c43
commit c14928e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Model/Api/Order.php b/Model/Api/Order.php
@@ -398,7 +398,7 @@ protected function GeneratePOSTPayload(\Magento\Sales\Model\Order $order, $mailc
         } else {
             $data['order_total'] = $order->getGrandTotal();
             $data['tax_total'] = $order->getTaxAmount();
-            $data['discount_total'] = abs($order->getDiscountAmount());
+            $data['discount_total'] =$order->getDiscountAmount() ? abs($order->getDiscountAmount()) : 0;
             $data['shipping_total'] = $order->getShippingAmount();
         }
 
@@ -452,7 +452,7 @@ protected function GeneratePOSTPayload(\Magento\Sales\Model\Order $order, $mailc
                     "product_variant_id" => $variant,
                     "quantity" => (int)$item->getQtyOrdered(),
                     "price" => $item->getPrice(),
-                    "discount" => abs($item->getDiscountAmount())
+                    "discount" => $item->getDiscountAmount() ? abs($item->getDiscountAmount()) : 0
                 ];
             }
         }
@@ -718,7 +718,7 @@ protected function _getPromoData(\Magento\Sales\Model\Order $order)
                 if ($code->getCouponId() !== null) {
                     $rule = $this->ruleRepository->getById($code->getRuleId());
                     if ($rule->getRuleId() !== null) {
-                        $amountDiscounted = $order->getBaseDiscountAmount();
+                        $amountDiscounted = $order->getBaseDiscountAmount() ? $order->getBaseDiscountAmount() : 0;
                         $type = $rule->getSimpleAction();
                         if ($type == 'by_percent') {
                             $type = 'percentage';