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

classes/PaymentModule.php

@@ -445,7 +445,8 @@ abstract class PaymentModuleCore extends Module
 									'{voucher_num}' => $voucher->code,
 									'{firstname}' => $customer->firstname,
 									'{lastname}' => $customer->lastname,
-									'{id_order}' => $order->reference
+									'{id_order}' => $order->reference,
+									'{order_name}' => $order->getUniqReference()
 								);
 								Mail::Send(
 									(int)$order->id_lang,
@@ -562,7 +563,7 @@ abstract class PaymentModuleCore extends Module
 						'{invoice_state}' => $invoice->id_state ? $invoice_state->name : '',
 						'{invoice_phone}' => ($invoice->phone) ? $invoice->phone : $invoice->phone_mobile,
 						'{invoice_other}' => $invoice->other,
-						'{order_name}' => sprintf('#%06d', (int)$order->id),
+						'{order_name}' => $order->getUniqReference(),
 						'{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1),
 						'{carrier}' => $virtual_product ? Tools::displayError('No carrier') : $carrier->name,
 						'{payment}' => Tools::substr($order->payment, 0, 32),

classes/Tools.php

@@ -475,8 +475,8 @@ class ToolsCore
 		$price = Tools::ps_round($price, $c_decimals);
 		switch ($c_format)
 		{
-	 	 	/* X 0,000.00 */
-	 	 	case 1:
+			/* X 0,000.00 */
+			case 1:
 				$ret = $c_char.$blank.number_format($price, $c_decimals, '.', ',');
 				break;
 			/* 0 000,00 X*/

classes/order/Order.php

@@ -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

@@ -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();