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

[-] FO : #PSCFV-2920 - Hidding order number, use order reference instead

Browse Source
This commit is contained in:
mDeflotte
2012-06-26 15:19:35 +00:00
parent 9804065771
commit 100b210d22
74 changed files with 149 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+2 -2
View File
@@ -2153,7 +2153,7 @@ class AdminImportControllerCore extends AdminController
{
if ($product['id_product'] == $id_product_attribute)
$this->errors[] = sprintf($this->l('Product (%d/%D) cannot be added twice (at line %d).'), $id_product,
$id_product_attribute, $current_line + 1);
$id_product_attribute, $current_line + 1);
else
$product['id_product'] = $id_product_attribute;
}
@@ -2163,7 +2163,7 @@ class AdminImportControllerCore extends AdminController
// checks parameters
if (false === ($supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier)))
$this->errors[] = sprintf($this->l('Product (%d/%d) is not available for this order (at line %d).'), $id_product,
$id_product_attribute, $current_line + 1);
$id_product_attribute, $current_line + 1);
if ($unit_price_te < 0)
$this->errors[] = sprintf($this->l('Unit Price (tax excl.) (%d) is not valid (at line %d).'), $unit_price_te, $current_line + 1);
if ($quantity_expected < 0)
controllers/admin/AdminOrdersController.php
+4 -1
View File
@@ -285,7 +285,8 @@ class AdminOrdersControllerCore extends AdminController
'{followup}' => str_replace('@', $order->shipping_number, $carrier->url),
'{firstname}' => $customer->firstname,
'{lastname}' => $customer->lastname,
'{id_order}' => $order->id
'{id_order}' => $order->id,
'{order_name}' => $order->getUniqReference()
);
if (@Mail::Send((int)$order->id_lang, 'in_transit', Mail::l('Package in transit', (int)$order->id_lang), $templateVars,
$customer->email, $customer->firstname.' '.$customer->lastname, null, null, null, null,
@@ -430,6 +431,7 @@ class AdminOrdersControllerCore extends AdminController
'{lastname}' => $customer->lastname,
'{firstname}' => $customer->firstname,
'{id_order}' => $order->id,
'{order_name}' => $order->getUniqReference(),
'{message}' => $message
);
if (@Mail::Send((int)$order->id_lang, 'order_merchant_comment',
@@ -646,6 +648,7 @@ class AdminOrdersControllerCore extends AdminController
$params['{lastname}'] = $customer->lastname;
$params['{firstname}'] = $customer->firstname;
$params['{id_order}'] = $order->id;
$params['{order_name}'] = $order->getUniqReference();
}
// Generate credit slip
controllers/admin/AdminShippingController.php
+1 -1
View File
@@ -151,7 +151,7 @@ class AdminShippingControllerCore extends AdminController
$carrier = new Carrier($id_carrier);
if (Validate::isLoadedObject($carrier))
{
/* Get configuration values */
/* Get configuration values */
$shipping_method = $carrier->getShippingMethod();
$rangeTable = $carrier->getRangeTable();