MAGETWO-66433: Save shipping discount in #5858

vrann · vrann · commit eb4937a46f7a · 2017-03-20T19:57:37.000-07:00
- Merge Pull Request #5858 from flancer64/magento2:patch-4
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -131,6 +131,8 @@ public function collect(
             $this->calculator->processShippingAmount($address);
             $total->addTotalAmount($this->getCode(), -$address->getShippingDiscountAmount());
             $total->addBaseTotalAmount($this->getCode(), -$address->getBaseShippingDiscountAmount());
+            $total->setShippingDiscountAmount($address->getShippingDiscountAmount());
+            $total->setBaseShippingDiscountAmount($address->getBaseShippingDiscountAmount());
         }
 
         $this->calculator->prepareDescription($address);

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,8 @@ public function collect(`
`131`	`131`	`$this->calculator->processShippingAmount($address);`
`132`	`132`	`$total->addTotalAmount($this->getCode(), -$address->getShippingDiscountAmount());`
`133`	`133`	`$total->addBaseTotalAmount($this->getCode(), -$address->getBaseShippingDiscountAmount());`
	`134`	`+ $total->setShippingDiscountAmount($address->getShippingDiscountAmount());`
	`135`	`+ $total->setBaseShippingDiscountAmount($address->getBaseShippingDiscountAmount());`
`134`	`136`	`}`
`135`	`137`
`136`	`138`	`$this->calculator->prepareDescription($address);`