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

// little fix about advanced stock management

Browse Source
This commit is contained in:
vChabot
2011-12-08 09:22:02 +00:00
parent d0bcf038be
commit 3260412f3c
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+11 -3
View File
@@ -223,7 +223,7 @@ class AdminOrdersControllerCore extends AdminController
$history = new OrderHistory(); $history = new OrderHistory();
$history->id_order = (int)$id_order; $history->id_order = (int)$id_order;
$history->id_employee = (int)$this->context->employee->id; $history->id_employee = (int)$this->context->employee->id;
if (!(int)Tools::getValue('id_warehouse')) if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && !(int)Tools::getValue('id_warehouse'))
$this->_errors[] = Tools::displayError('An error occurred while changing the status.'); $this->_errors[] = Tools::displayError('An error occurred while changing the status.');
else else
{ {
@@ -1004,7 +1004,15 @@ class AdminOrdersControllerCore extends AdminController
$order->total_wrapping_tax_excl += abs($cart->getOrderTotal(false, Cart::ONLY_WRAPPING)); $order->total_wrapping_tax_excl += abs($cart->getOrderTotal(false, Cart::ONLY_WRAPPING));
$order->total_wrapping_tax_incl += abs($cart->getOrderTotal($use_taxes, Cart::ONLY_WRAPPING)); $order->total_wrapping_tax_incl += abs($cart->getOrderTotal($use_taxes, Cart::ONLY_WRAPPING));
$order_invoice->add(); $order_invoice->add();
// Adding an entry in order_carrier table $order_carrier = new OrderCarrier();
$order_carrier->id_order = (int)$order->id;
$order_carrier->id_carrier = (int)$order->id_carrier;
$order_carrier->id_order_invoice = (int)$order_invoice->id;
$order_carrier->weight = (float)$cart->getTotalWeight();
$order_carrier->shipping_cost_tax_excl = (float)$order_invoice->total_shipping_tax_excl;
$order_carrier->shipping_cost_tax_incl = ($use_taxes) ? (float)$order_invoice->total_shipping_tax_incl : (float)$order_invoice->total_shipping_tax_excl;
$order_carrier->add();
/*// Adding an entry in order_carrier table
Db::getInstance()->execute(' Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'order_carrier` (`id_order`, `id_carrier`, `id_order_invoice`, `weight`, `shipping_cost_tax_excl`, `shipping_cost_tax_incl`, `date_add`) VALUES INSERT INTO `'._DB_PREFIX_.'order_carrier` (`id_order`, `id_carrier`, `id_order_invoice`, `weight`, `shipping_cost_tax_excl`, `shipping_cost_tax_incl`, `date_add`) VALUES
('.(int)$order->id.', ('.(int)$order->id.',
@@ -1013,7 +1021,7 @@ class AdminOrdersControllerCore extends AdminController
'.(float)$cart->getTotalWeight().', '.(float)$cart->getTotalWeight().',
'.$order_invoice->total_shipping_tax_excl.', '.$order_invoice->total_shipping_tax_excl.',
'.(($use_taxes) ? $order_invoice->total_shipping_tax_incl : $order_invoice->total_shipping_tax_excl).', '.(($use_taxes) ? $order_invoice->total_shipping_tax_incl : $order_invoice->total_shipping_tax_excl).',
NOW())'); NOW())');*/
} }
// Update current invoice // Update current invoice
else else