From f782f880063d0853e42e282ff5731daa6be88769 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Wed, 25 Jul 2012 12:11:25 +0000 Subject: [PATCH] [-] FO : #PSCFV-3318 - Guest Tracking must use order reference and not order id git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16565 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/front/GuestTrackingController.php | 104 ++++++++++-------- themes/default/css/global.css | 5 +- themes/default/guest-tracking.tpl | 42 +++++-- themes/default/lang/fr.php | 4 +- translations/fr/errors.php | 5 +- 5 files changed, 100 insertions(+), 60 deletions(-) diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index 093573772..90bcd7fb0 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -29,6 +29,7 @@ class GuestTrackingControllerCore extends FrontController { public $ssl = true; public $php_self = 'guest-tracking'; + public $display_column_left = false; /** * Initialize guest tracking controller @@ -49,12 +50,22 @@ class GuestTrackingControllerCore extends FrontController { if (Tools::isSubmit('submitGuestTracking') || Tools::isSubmit('submitTransformGuestToCustomer')) { + // These lines are here for retrocompatibility with old theme $id_order = (int)Tools::getValue('id_order'); - $email = Tools::getValue('email'); - $order = new Order((int)$id_order); + $order_collection = array(); + if (Tools::getValue('id_order', false)) + $order_collection[] = $id_order; - if (empty($id_order)) - $this->errors[] = Tools::displayError('Please provide your Order ID'); + // Get order reference, ignore package reference (after the #, on the order reference) + $order_reference = current(explode('#', Tools::getValue('order_reference'))); + // Ignore $result_number + if (!empty($order_reference)) + $order_collection = Order::getByReference($order_reference); + + $email = Tools::getValue('email'); + + if (empty($order_reference) && empty($order_id)) + $this->errors[] = Tools::displayError('Please provide your Order Reference'); else if (empty($email)) $this->errors[] = Tools::displayError('Please provide your e-mail address'); else if (!Validate::isEmail($email)) @@ -67,13 +78,13 @@ class GuestTrackingControllerCore extends FrontController Tools::displayError('Please login to your customer account to view this order, this section is reserved for guest accounts'); $this->context->smarty->assign('show_login_link', true); } - else if (!Validate::isLoadedObject($order)) - $this->errors[] = Tools::displayError('Invalid Order ID'); - else if (!$order->isAssociatedAtGuest($email)) - $this->errors[] = Tools::displayError('Invalid order ID'); + else if (!count($order_collection)) + $this->errors[] = Tools::displayError('Invalid Order Reference'); + else if (!$order_collection->getFirst()->isAssociatedAtGuest($email)) + $this->errors[] = Tools::displayError('Invalid Order Reference'); else { - $this->assignOrderTracking($order); + $this->assignOrderTracking($order_collection); if (Tools::isSubmit('submitTransformGuestToCustomer')) { $customer = new Customer((int)$order->id_customer); @@ -113,54 +124,55 @@ class GuestTrackingControllerCore extends FrontController /** * Assign template vars related to order tracking informations */ - protected function assignOrderTracking($order) + protected function assignOrderTracking($order_collection) { - $customer = new Customer((int)$order->id_customer); - $id_order_state = (int)($order->getCurrentState()); - $carrier = new Carrier((int)($order->id_carrier), (int)($order->id_lang)); - $addressInvoice = new Address((int)($order->id_address_invoice)); - $addressDelivery = new Address((int)($order->id_address_delivery)); - $inv_adr_fields = AddressFormat::getOrderedAddressFields($addressInvoice->id_country); - $dlv_adr_fields = AddressFormat::getOrderedAddressFields($addressDelivery->id_country); + $customer = new Customer((int)($order_collection->getFirst()->id_customer)); + + $order_collection = ($order_collection->getAll()); + + $order_list = array(); + foreach ($order_collection as $order) + $order_list[] = $order; + + foreach ($order_list as &$order) + { + $order->id_order_state = (int)($order->getCurrentState()); + $order->invoice = (OrderState::invoiceAvailable((int)($order->id_order_state)) && $order->invoice_number); + $order->order_history = $order->getHistory((int)$this->context->language->id, false, true); + $order->carrier = new Carrier((int)($order->id_carrier), (int)($order->id_lang)); + $order->address_invoice = new Address((int)($order->id_address_invoice)); + $order->address_delivery = new Address((int)($order->id_address_delivery)); + $order->inv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_invoice->id_country); + $order->dlv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_delivery->id_country); + $order->invoiceAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_invoice, $order->inv_adr_fields); + $order->deliveryAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_delivery, $order->dlv_adr_fields); + $order->currency = new Currency($order->id_currency); + $order->discounts = $order->getCartRules(); + $order->invoiceState = (Validate::isLoadedObject($order->address_invoice) && $order->address_invoice->id_state) ? new State((int)($order->addressInvoice->id_state)) : false; + $order->deliveryState = (Validate::isLoadedObject($order->address_delivery) && $order->address_delivery->id_state) ? new State((int)($order->addressDelivery->id_state)) : false; + $order->products = $order->getProducts(); + $order->customizedDatas = Product::getAllCustomizedDatas((int)($order->id_cart)); + Product::addCustomizationPrice($order->products, $order->customizedDatas); + $order->total_old = ($order->total_discounts > 0) ? (float)($order->total_paid - $order->total_discounts) : false; + + if ($order->carrier->url && $order->shipping_number) + $order->followup = str_replace('@', $order->shipping_number, $order->carrier->url); + $order->hook_orderdetaildisplayed = Hook::exec('displayOrderDetail', array('order' => $order)); + + Hook::exec('actionOrderDetail', array('carrier' => $order->carrier, 'order' => $order)); + } - $invoiceAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($addressInvoice, $inv_adr_fields); - $deliveryAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($addressDelivery, $dlv_adr_fields); - - if ($order->total_discounts > 0) - $this->context->smarty->assign('total_old', (float)($order->total_paid - $order->total_discounts)); - $products = $order->getProducts(); - $customizedDatas = Product::getAllCustomizedDatas((int)($order->id_cart)); - Product::addCustomizationPrice($products, $customizedDatas); - - $this->processAddressFormat($addressDelivery, $addressInvoice); $this->context->smarty->assign(array( 'shop_name' => Configuration::get('PS_SHOP_NAME'), - 'order' => $order, + 'order_collection' => $order_list, 'return_allowed' => false, - 'currency' => new Currency($order->id_currency), - 'order_state' => (int)($id_order_state), 'invoiceAllowed' => (int)(Configuration::get('PS_INVOICE')), - 'invoice' => (OrderState::invoiceAvailable((int)($id_order_state)) && $order->invoice_number), - 'order_history' => $order->getHistory((int)$this->context->language->id, false, true), - 'products' => $products, - 'discounts' => $order->getCartRules(), - 'carrier' => $carrier, - 'address_invoice' => $addressInvoice, - 'invoiceState' => (Validate::isLoadedObject($addressInvoice) && $addressInvoice->id_state) ? new State((int)($addressInvoice->id_state)) : false, - 'address_delivery' => $addressDelivery, - 'deliveryState' => (Validate::isLoadedObject($addressDelivery) && $addressDelivery->id_state) ? new State((int)($addressDelivery->id_state)) : false, 'is_guest' => true, 'group_use_tax' => (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC), 'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_, 'CUSTOMIZE_TEXTFIELD' => _CUSTOMIZE_TEXTFIELD_, 'use_tax' => Configuration::get('PS_TAX'), - 'customizedDatas' => $customizedDatas, - 'invoiceAddressFormatedValues' => $invoiceAddressFormatedValues, - 'deliveryAddressFormatedValues' => $deliveryAddressFormatedValues)); - if ($carrier->url && $order->shipping_number) - $this->context->smarty->assign('followup', str_replace('@', $order->shipping_number, $carrier->url)); - $this->context->smarty->assign('HOOK_ORDERDETAILDISPLAYED', Hook::exec('displayOrderDetail', array('order' => $order))); - Hook::exec('actionOrderDetail', array('carrier' => $carrier, 'order' => $order)); + )); } public function setMedia() diff --git a/themes/default/css/global.css b/themes/default/css/global.css index 140f23774..c5b462cab 100644 --- a/themes/default/css/global.css +++ b/themes/default/css/global.css @@ -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 diff --git a/themes/default/guest-tracking.tpl b/themes/default/guest-tracking.tpl index 7f8eed360..9823a34f0 100644 --- a/themes/default/guest-tracking.tpl +++ b/themes/default/guest-tracking.tpl @@ -29,12 +29,38 @@

{l s='Guest Tracking'}

-{if isset($order)} -
-
- {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} + +
+
+ {include file="./order-detail.tpl"} +
-
+ {/foreach}

{l s='For more advantages...'}

@@ -72,9 +98,9 @@

{l s='To track your order, please enter the following information:'}

- - - {l s='For example: 010123'} + + + {l s='For example: QIIXJXNUI or QIIXJXNUI#1'}

diff --git a/themes/default/lang/fr.php b/themes/default/lang/fr.php index a854df267..ec0e3575f 100644 --- a/themes/default/lang/fr.php +++ b/themes/default/lang/fr.php @@ -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 :'; diff --git a/translations/fr/errors.php b/translations/fr/errors.php index a7679dd62..5c54ac2c9 100644 --- a/translations/fr/errors.php +++ b/translations/fr/errors.php @@ -242,6 +242,7 @@ $_ERRORS['546212fa1d2694600b976add6bf722f7'] = 'vers les catégories'; $_ERRORS['54bff0a0282d2be7fe5ee14aa4628291'] = 'Une erreur est survenue lors de la suppression d\'un prix spécifique'; $_ERRORS['54f64a4831edb6e1d8e2f0e5ee74cc65'] = 'Impossible de supprimer ce détail de commande pour cette commande'; $_ERRORS['55124c4465a9478df5fd59ff3017433a'] = 'Le mot de passe ne correspond pas au mot de passe de confirmation'; +$_ERRORS['55928faf54a8a75a359d952cab91682d'] = 'Référence commande invalide'; $_ERRORS['55d56a8de1af2dc393f6bf33e873f0b4'] = 'Impossible de charger cette boutique.'; $_ERRORS['5636dd80d3968f9b1ce4400bd71c5a7a'] = 'Une erreur s\'est produite lors de la mise en ligne de l\'image'; $_ERRORS['56b207f28525081cec398738b3d25225'] = 'Objet impossible à charger (introuvable)'; @@ -302,7 +303,6 @@ $_ERRORS['6b9cc232bf4044274ec42062b60736fb'] = 'Les factures sont désactivées $_ERRORS['6cf73576720519e739771a4fa489410b'] = 'Langue introuvable'; $_ERRORS['6d6b26b2dd85a175eed3b6a30e188c47'] = 'les code postal est invalide.'; $_ERRORS['6da9714ab9db11108de5b4a82bf7f59e'] = 'Vous ne pouvez plus utiliser ce bon de réduction (limite d\'utilisation atteinte)'; -$_ERRORS['6df7b457f3065876e5146908a7836fbc'] = 'Numéro de commande non valable'; $_ERRORS['6e659c47c94d1e1dc7121859f43fb2b0'] = 'adresse e-mail invalide'; $_ERRORS['6f03c3be2e1596fff656d9d045f87824'] = 'Date de fin non valable'; $_ERRORS['6f268ac84ce6195ecf4e3dfe437e2aee'] = 'Erreur fatale : pas de client'; @@ -315,7 +315,6 @@ $_ERRORS['700c53d8cec1b1e9cf6c247944126166'] = 'Une erreur est survenue durant l $_ERRORS['708d2bfb476ba46221602d549f0e7a4d'] = 'Identifiant de catégorie manquant'; $_ERRORS['71754079aaeefc5c6e745ddd59f8a35f'] = 'Commande gratuite'; $_ERRORS['71f4f008985ea6abc73e89a668e15197'] = 'Cet attribut existe déjà.'; -$_ERRORS['72ac7ea6f82331cfc457b95489678119'] = 'Veuillez fournir votre numéro de commande'; $_ERRORS['73fe0bd9b8402c2328fbf6dcb8e090f1'] = 'La liaison avec la base de donées ne peut pas être établie : %s'; $_ERRORS['74d93d946c302d8decb44dec33f4b3e6'] = 'La date de début n\'est pas valable (AAAA-MM-JJ)'; $_ERRORS['74efb694173710062ae76c1e9949817e'] = 'Prix/réduction non valable'; @@ -521,7 +520,6 @@ $_ERRORS['cb46295650e6e2a53d528e353546c2a5'] = 'Une erreur s\'est produite penda $_ERRORS['cba0b206627d45fbf0ae707e20d4a38f'] = 'mot de passe non valable'; $_ERRORS['cc7e699f0084632117f35dc294d29f16'] = 'Une erreur s\'est produite pendant la mise à jour de l\'état de l\'objet.'; $_ERRORS['ccacacd12f75e1ab3f9ce3e234ed5777'] = 'Aucun moteur de grille sélectionné'; -$_ERRORS['cd41badf2abd4a993073f9b5611de271'] = 'Numéro de commande non valable'; $_ERRORS['ce30da82a4a6b974c18780af4597c8ee'] = 'Une erreur est survenue pendant la configuration des priorités.'; $_ERRORS['cf8a93e045f508c8a3c6430084f45825'] = 'Une erreur s\'est produite. Aucun stock n\'a été ajouté.'; $_ERRORS['cfb0a6025f8279ec130db5d2883ead88'] = 'Une erreur s\'est produite pendant la mise à jour des paramètres de la personnalisation.'; @@ -614,6 +612,7 @@ $_ERRORS['ed9b5732158eef63ac4d236e04101d2b'] = 'Aucun mode de devises du module $_ERRORS['eddeabd79f8ca673d888fa2ffe9cf69a'] = 'Aucun gabarit trouvé pour le module'; $_ERRORS['edeb9e20655b946e4bee4ac44a6c0a7f'] = 'Le serveur ne dispose pas des permissions pour l\'écriture.'; $_ERRORS['edf1f94126dbe21f81874c2f63a64d62'] = 'Pour utiliser le cache APC, vous devez installer l\'extension PECL APC sur votre serveur.'; +$_ERRORS['ee04ba9806062933d8f54b942854c67d'] = 'Merci de renseigner votre référence de commande'; $_ERRORS['ee659eedee80f24fcff876dd3a39beed'] = 'Impossible de charger les paramètres, une combinaison manque, ou l\'objet ne peut pas être chargé.'; $_ERRORS['ee66f9c9930cb33d2a5dde9b240d3f7e'] = 'est requis.'; $_ERRORS['eedef2c356c6598d1c1c35c30459ba3c'] = 'Le bon de réduction ne peut terminer avant qu\'il ne commence.';