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

[-] FO : #PSCFV-3318 - Guest Tracking must use order reference and not order id

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16565 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-07-25 12:11:25 +00:00
parent bd28cc6e4b
commit f782f88006
5 changed files with 100 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/css/global.css
+4 -1
View File
@@ -1541,7 +1541,10 @@ ul#manufacturers_list li .right_side {float:right;}
color: #0088CC;
padding: 0 10px;
}
.description_box ul {
padding-left: 30px;
padding-bottom: 10px;
}
/* ************************************************************************************************
PAGE SUPPLIER
themes/default/guest-tracking.tpl
+34 -8
View File
@@ -29,12 +29,38 @@
<h1>{l s='Guest Tracking'}</h1>
{if isset($order)}
<div id="block-history">
<div id="block-order-detail" class="std" style="zoom:1">
{include file="./order-detail.tpl"}
{if isset($order_collection)}
{foreach $order_collection as $order}
{assign var=order_state value=$order->getCurrentState()}
{assign var=invoice value=$order->invoice}
{assign var=order_history value=$order->order_history}
{assign var=carrier value=$order->carrier}
{assign var=address_invoice value=$order->address_invoice}
{assign var=address_delivery value=$order->address_delivery}
{assign var=inv_adr_fields value=$order->inv_adr_fields}
{assign var=dlv_adr_fields value=$order->dlv_adr_fields}
{assign var=invoiceAddressFormatedValues value=$order->invoiceAddressFormatedValues}
{assign var=deliveryAddressFormatedValues value=$order->deliveryAddressFormatedValues}
{assign var=currency value=$order->currency}
{assign var=discounts value=$order->discounts}
{assign var=invoiceState value=$order->invoiceState}
{assign var=deliveryState value=$order->deliveryState}
{assign var=products value=$order->products}
{assign var=customizedDatas value=$order->customizedDatas}
{assign var=HOOK_ORDERDETAILDISPLAYED value=$order->hook_orderdetaildisplayed}
{if isset($order->total_old)}
{assign var=total_old value=$order->total_old}
{/if}
{if isset($order->followup)}
{assign var=followup value=$order->followup}
{/if}
<div id="block-history">
<div id="block-order-detail" class="std" style="zoom:1">
{include file="./order-detail.tpl"}
</div>
</div>
</div>
{/foreach}
<h2 id="guestToCustomer">{l s='For more advantages...'}</h2>
@@ -72,9 +98,9 @@
<fieldset class="description_box">
<p>{l s='To track your order, please enter the following information:'}</p>
<p class="text">
<label>{l s='Order ID:'} <b>#</b></label>
<input type="text" name="id_order" value="{if isset($smarty.get.id_order)}{$smarty.get.id_order|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|escape:'htmlall':'UTF-8'}{/if}{/if}" size="8" />
<i>{l s='For example: 010123'}</i>
<label>{l s='Order Reference:'} </label>
<input type="text" name="order_reference" value="{if isset($smarty.get.id_order)}{$smarty.get.id_order|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|escape:'htmlall':'UTF-8'}{/if}{/if}" size="8" />
<i>{l s='For example: QIIXJXNUI or QIIXJXNUI#1'}</i>
</p>
<p class="text">
themes/default/lang/fr.php
+2 -2
View File
@@ -167,14 +167,14 @@ $_LANG['guest-tracking_3aedb5d3a3e36f7bb6baf1fbb9497894'] = 'Suivi d\'invité';
$_LANG['guest-tracking_3b6bf3c0c07b89dc86f415117a1f0b80'] = 'Définissez votre mot de passe :';
$_LANG['guest-tracking_43b2f3ca9c34b5934ff858549406f556'] = 'Pour plus d\'avantages...';
$_LANG['guest-tracking_4fb8550e52b59f7f93d60c1d1b56e93e'] = 'Suivi d\'invité';
$_LANG['guest-tracking_63c193f613dd3d9d6c16da7678efda2a'] = 'Référence de la Commande :';
$_LANG['guest-tracking_71860c77c6745379b0d44304d66b6a13'] = 'page';
$_LANG['guest-tracking_7a8fe8aaa64e691d82f429d39e0df3a5'] = 'Accès personnalisé et sécurisé';
$_LANG['guest-tracking_83fa39a28a4d159061c408fbd6a249e7'] = 'Numéro de commande :';
$_LANG['guest-tracking_92dbb751eb9457441af82a53f3cfae54'] = 'Par exemple : QIIXJXNUI ou QIIXJXNUI#1';
$_LANG['guest-tracking_94966d90747b97d1f0f206c98a8b1ac3'] = 'Envoyer';
$_LANG['guest-tracking_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Informations';
$_LANG['guest-tracking_c2f0859d6f7e84914b60403fa423e9ad'] = 'Votre compte invité a été transformé avec succès en un compte client. Vous pouvez maintenant vous connecter sur cette';
$_LANG['guest-tracking_d2948a89e47a4ad7eb8412c1c260ea88'] = 'Afin de suivre votre commande, veuillez saisir les informations suivantes :';
$_LANG['guest-tracking_d51b1df43394fe14cd03d5bcb3a7216b'] = 'Par exemple : 010123';
$_LANG['guest-tracking_dec9cc6702179299ae451c11633915c6'] = 'Passage de commande rapide et facile';
$_LANG['guest-tracking_df1555fe48479f594280a2e03f9a8186'] = 'E-mail :';
$_LANG['header_0fcd4065ff78fceb3083316ddb958bc1'] = 'Vous ne pouvez pas créer de nouvelle commande depuis votre pays :';