dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] PDF : Bug Fixed #PSCFV-2735 - Missing tax details in order slip

Browse Source
This commit is contained in:
fBrignoli
2012-07-09 09:35:58 +00:00
parent 3dec1b324e
commit 06bebfe36a
5 changed files with 148 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderInvoice.php
+2 -1
View File
@@ -321,7 +321,8 @@ class OrderInvoiceCore extends ObjectModel
if ($shipping_tax_amount > 0)
$taxes_breakdown[] = array(
'rate' => $order->carrier_tax_rate,
'total_amount' => $shipping_tax_amount
'total_amount' => $shipping_tax_amount,
'total_tax_excl' => $this->total_shipping_tax_excl
);
return $taxes_breakdown;
classes/order/OrderSlip.php
+13 -7
View File
@@ -78,14 +78,21 @@ class OrderSlipCore extends ObjectModel
public function addSlipDetail($orderDetailList, $productQtyList)
{
foreach ($orderDetailList as $key => $orderDetail)
foreach ($orderDetailList as $key => $id_order_detail)
{
if ($qty = (int)($productQtyList[$key]))
Db::getInstance()->insert('order_slip_detail', array(
'id_order_slip' => (int)$this->id,
'id_order_detail' => (int)$orderDetail,
'product_quantity' => $qty,
));
{
$order_detail = new OrderDetail((int)$id_order_detail);
if (Validate::isLoadedObject($order_detail))
Db::getInstance()->insert('order_slip_detail', array(
'id_order_slip' => (int)$this->id,
'id_order_detail' => (int)$id_order_detail,
'product_quantity' => $qty,
'amount_tax_excl' => $order_detail->unit_price_tax_excl * $qty,
'amount_tax_incl' => $order_detail->unit_price_tax_incl * $qty
));
}
}
}
@@ -281,6 +288,5 @@ class OrderSlipCore extends ObjectModel
Db::getInstance()->insert('order_slip_detail', $insertOrderSlip);
}
}
}