TheCoreDev/bio-concept-labo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Ano_0000004'

Browse Source
This commit is contained in:
Laurent LE CORRE
2019-11-26 13:13:19 +01:00
parent 5690215f7b 80140604fc
commit 11d4c44b41
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/override/controllers/admin/AdminOrdersController.php
View File

@@ -37,15 +37,21 @@ class AdminOrdersController extends AdminOrdersControllerCore
} }
if (Tools::isSubmit('submitShippingNumber') && isset($order)) { if (Tools::isSubmit('submitShippingNumber') && isset($order)) {
if ($this->tabAccess['edit'] == '1') { if ($this->tabAccess['edit'] == '1') {
$tracking_number = Tools::getValue('shipping_tracking_number');
$order_carrier = new OrderCarrier(Tools::getValue('id_order_carrier')); $order_carrier = new OrderCarrier(Tools::getValue('id_order_carrier'));
if (!Validate::isLoadedObject($order_carrier)) { if (!Validate::isLoadedObject($order_carrier)) {
$this->errors[] = Tools::displayError('The order carrier ID is invalid.'); $this->errors[] = Tools::displayError('The order carrier ID is invalid.');
} elseif (!Validate::isTrackingNumber(Tools::getValue('tracking_number'))) { } elseif (!Validate::isTrackingNumber($tracking_number) && !empty($tracking_number)) {
$this->errors[] = Tools::displayError('The tracking number is incorrect.'); $this->errors[] = Tools::displayError('The tracking number is incorrect.');
} else { } else {
$order->shipping_number = Tools::getValue('tracking_number'); // update shipping number
// Keep these two following lines for backward compatibility, remove on 1.6 version
$order->shipping_number = $tracking_number;
$order->update(); $order->update();
$order_carrier->tracking_number = pSQL(Tools::getValue('tracking_number'));
// Update order_carrier
$order_carrier->tracking_number = pSQL($tracking_number);
if ($order_carrier->update()) { if ($order_carrier->update()) {
$customer = new Customer((int) $order->id_customer); $customer = new Customer((int) $order->id_customer);
$carrier = new Carrier((int) $order->id_carrier, $order->id_lang); $carrier = new Carrier((int) $order->id_carrier, $order->id_lang);