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
classes/order/Order.php
+38 -1
View File
@@ -873,7 +873,7 @@ class OrderCore extends ObjectModel
*/
public static function getOrdersIdInvoiceByDate($date_from, $date_to, $id_customer = null, $type = null)
{
Tools::displayAsDeprecated();
Tools::displayAsDeprecated();
$sql = 'SELECT `id_order`
FROM `'._DB_PREFIX_.'orders`
WHERE DATE_ADD(invoice_date, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\' AND invoice_date >= \''.pSQL($date_from).'\'
@@ -1788,5 +1788,42 @@ class OrderCore extends ObjectModel
return OrderPayment::getByOrderReference($this->reference);
}
/**
* Return a unique reference like : GWJTHMZUN#2
*
* With multishipping, order reference are the same for all orders made with the same cart
* this method suffix the order referece by a # and the order number
*
* @since 1.5.0.14
*/
public function getUniqReference()
{
$query = new DbQuery();
$query->select('MIN(id_order) as min, MAX(id_order) as max');
$query->from('orders');
$query->where('id_cart = '.(int)$this->id_cart);
$query->orderBy('id_order');
$order = Db::getInstance()->getRow($query);
if ($order['min'] == $order['max'])
return $this->reference;
else
return $this->reference.'#'.($this->id + 1 - $order['min']);
}
/**
* Return a unique reference like : GWJTHMZUN#2
*
* With multishipping, order reference are the same for all orders made with the same cart
* this method suffix the order referece by a # and the order number
*
* @since 1.5.0.14
*/
public static function getUniqReferenceOf($id_order)
{
$order = new Order($id_order);
return $order->getUniqReference();
}
}
classes/order/OrderHistory.php
+7 -2
View File
@@ -312,11 +312,16 @@ class OrderHistoryCore extends ObjectModel
if (isset($result['template']) && Validate::isEmail($result['email']))
{
$topic = $result['osname'];
$data = array('{lastname}' => $result['lastname'], '{firstname}' => $result['firstname'], '{id_order}' => (int)$this->id_order);
$data = array(
'{lastname}' => $result['lastname'],
'{firstname}' => $result['firstname'],
'{id_order}' => (int)$this->id_order,
'{order_name}' => $order->getUniqReference()
);
if ($template_vars)
$data = array_merge($data, $template_vars);
$data['{total_paid}'] = Tools::displayPrice((float)$order->total_paid, new Currency((int)$order->id_currency), false);
$data['{order_name}'] = sprintf('#%06d', (int)$order->id);
$data['{order_name}'] = $order->getUniqReference();
// An additional email is sent the first time a virtual item is validated
$virtual_products = $order->getVirtualProducts();