[-] PDF: Order slip Tax detail computation fix. #PSCSX-6408

PrestaShop · Aug 18, 2015 · 1902360 · 1902360 · Nobodaddy · Sep 6, 2015
1 parent b218400
commit 1902360
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/classes/order/Order.php b/classes/order/Order.php
@@ -2228,7 +2228,16 @@ public function setWsCurrentState($state)
         return true;
     }
 
-    public function getProductTaxesDetails()
+
+    /**
+     * By default this function was made for invoice, to compute tax amounts and balance delta (because of computation made on round values).
+     * If you provide $limitToOrderDetails, only these item will be taken into account. This option is usefull for order slip for example,
+     * where only sublist of the order is refunded.
+     *
+     * @param $limitToOrderDetails Optional array of OrderDetails to take into account. False by default to take all OrderDetails from the current Order.
+     * @return array A list of tax rows applied to the given OrderDetails (or all OrderDetails linked to the current Order).
+     */
+    public function getProductTaxesDetails($limitToOrderDetails = false)
     {
         $round_type = $this->round_type;
         if ($round_type == 0) {
@@ -2278,7 +2287,7 @@ public function getProductTaxesDetails()
         $breakdown = array();
 
         // Get order_details
-        $order_details = $this->getOrderDetailList();
+        $order_details = $limitToOrderDetails ?: $this->getOrderDetailList();
 
         $order_ecotax_tax = 0;
 

diff --git a/classes/pdf/HTMLTemplateOrderSlip.php b/classes/pdf/HTMLTemplateOrderSlip.php
@@ -273,7 +273,7 @@ public function getProductTaxesBreakdown()
         // 	- 'total_amount'
         $breakdown = array();
 
-        $details = $this->order->getProductTaxesDetails();
+        $details = $this->order->getProductTaxesDetails($this->order->products);
 
         foreach ($details as $row) {
             $rate = sprintf('%.3f', $row['tax_rate']);