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

[-] FO : replaced order id by order reference in the contact form (but kept the id_order for retrocompatibility) #PSCFV-5491

Browse Source
This commit is contained in:
dMetzger
2012-11-14 14:47:26 +00:00
parent 78c4eb0107
commit 0d2aed15be
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
-1
View File
@@ -1843,7 +1843,6 @@ class OrderCore extends ObjectModel
$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);
controllers/front/ContactController.php
+4 -5
View File
@@ -271,20 +271,19 @@ class ContactControllerCore extends FrontController
SELECT id_order
FROM '._DB_PREFIX_.'orders
WHERE id_customer = '.(int)$this->context->customer->id.' ORDER BY date_add');
$order_tab = array();
foreach ($getOrders as $row)
{
$order = new Order($row['id_order']);
$date = explode(' ', $order->date_add);
$orders[$row['id_order']] = Tools::displayDate($date[0], $this->context->language->id);
$orders[] =
$tmp = $order->getProducts();
foreach ($tmp as $key => $val)
$products[$row['id_order']][$val['product_id']] = array('value' => $val['product_id'], 'label' => $val['product_name']);
p(Tools::getValue('id_order'));
$order_tab[] = array('value' => $order->id, 'label' => $order->getUniqReference().' - '.Tools::displayDate($date[0], $this->context->language->id), 'selected' => (int)Tools::getValue('id_order') == $order->id);
}
$order_tab = array();
foreach ($orders as $key => $val)
$order_tab[] = array('value' => $key, 'label' => $key.' -- '.$val, 'selected' => (int)(Tools::getValue('id_order')) == $key);
$this->context->smarty->assign('orderList', $order_tab);
$this->context->smarty->assign('orderedProductList', $products);
}
themes/default/contact-form.tpl
+2 -2
View File
@@ -81,12 +81,12 @@
{if !$PS_CATALOG_MODE}
{if (!isset($customerThread.id_order) || $customerThread.id_order > 0)}
<p class="text select">
<label for="id_order">{l s='Order ID'}</label>
<label for="id_order">{l s='Order Reference'}</label>
{if !isset($customerThread.id_order) && isset($isLogged) && $isLogged == 1}
<select name="id_order" >
<option value="0">{l s='-- Choose --'}</option>
{foreach from=$orderList item=order}
<option value="{$order.value|intval}">{$order.label|escape:'htmlall':'UTF-8'}</option>
<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
{elseif !isset($customerThread.id_order) && !isset($isLogged)}