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

// Fix bugs on adding products to an orders on the BO

Browse Source
This commit is contained in:
mDeflotte
2012-06-04 13:25:35 +00:00
parent 2f7be39b12
commit bf5ff3906b
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+13 -2
View File
@@ -1503,7 +1503,18 @@ class AdminOrdersControllerCore extends AdminController
} }
// Add product to cart // Add product to cart
$cart->updateQty($product_informations['product_quantity'], $product->id, isset($combination) ? $combination->id : null, false, 0, 'up', new Shop($cart->id_shop)); $update_quantity = $cart->updateQty($product_informations['product_quantity'], $product->id, isset($product_informations['product_attribute_id']) ? $product_informations['product_attribute_id'] : null,
isset($combination) ? $combination->id : null, 'up', 0, new Shop($cart->id_shop));
if ($update_quantity < 0)
{
// If product has attribute, minimal quantity is set with minimal quantity of attribute
$minimal_quantity = ($product_informations['product_attribute_id']) ? Attribute::getAttributeMinimalQty($product_informations['product_attribute_id']) : $product->minimal_quantity;
die(Tools::jsonEncode(array('error' => sprintf(Tools::displayError('You must add %d minimum quantity', false), $minimal_quantity))));
}
elseif (!$update_quantity)
die(Tools::jsonEncode(array('error' => Tools::displayError('You already have the maximum quantity available for this product.', false))));
// If order is valid, we can create a new invoice or edit an existing invoice // If order is valid, we can create a new invoice or edit an existing invoice
if ($order->hasInvoice()) if ($order->hasInvoice())
{ {
@@ -1617,7 +1628,7 @@ class AdminOrdersControllerCore extends AdminController
$products = $this->getProducts($order); $products = $this->getProducts($order);
// Get the last product // Get the last product
$product = $products[max(array_keys($products))]; $product = end($products);
$resume = OrderSlip::getProductSlipResume($product['id_order_detail']); $resume = OrderSlip::getProductSlipResume($product['id_order_detail']);
$product['quantity_refundable'] = $product['product_quantity'] - $resume['product_quantity']; $product['quantity_refundable'] = $product['product_quantity'] - $resume['product_quantity'];
$product['amount_refundable'] = $product['total_price_tax_incl'] - $resume['amount_tax_incl']; $product['amount_refundable'] = $product['total_price_tax_incl'] - $resume['amount_tax_incl'];