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

[-] BO : fixed bug #PSCFV-2434 - FIx bug on Product line edition in order page

Browse Source
This commit is contained in:
aFolletete
2012-05-19 10:41:51 +00:00
parent c0971d686a
commit 69fae577a2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+4 -1
View File
@@ -1718,7 +1718,6 @@ class AdminOrdersControllerCore extends AdminController
$old_order_invoice->total_paid_tax_incl -= $order_detail->total_price_tax_incl; $old_order_invoice->total_paid_tax_incl -= $order_detail->total_price_tax_incl;
$res &= $old_order_invoice->update(); $res &= $old_order_invoice->update();
// TODO remove invoice if no item ?
$order_invoice->total_products += $order_detail->total_price_tax_excl; $order_invoice->total_products += $order_detail->total_price_tax_excl;
$order_invoice->total_products_wt += $order_detail->total_price_tax_incl; $order_invoice->total_products_wt += $order_detail->total_price_tax_incl;
@@ -1769,6 +1768,10 @@ class AdminOrdersControllerCore extends AdminController
$products = $this->getProducts($order); $products = $this->getProducts($order);
// Get the last product // Get the last product
$product = $products[$order_detail->id]; $product = $products[$order_detail->id];
$resume = OrderSlip::getProductSlipResume($order_detail->id);
$product['quantity_refundable'] = $product['product_quantity'] - $resume['product_quantity'];
$product['amount_refundable'] = $product['total_price_tax_incl'] - $resume['amount_tax_incl'];
$product['amount_refund'] = Tools::displayPrice($resume['amount_tax_incl']);
// Get invoices collection // Get invoices collection
$invoice_collection = $order->getInvoicesCollection(); $invoice_collection = $order->getInvoicesCollection();