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

Merge pull request #3 from damonsk/development

Browse Source 
[-] FO : fixed bug #PSCFV-5637 - Order reference (string) if passed in from a 1.4 theme...
This commit is contained in:
Vincent Augagneur
2012-11-29 06:15:56 -08:00
parent 12971aa769 0d84da1111
commit 3b63713cdd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/GuestTrackingController.php
+6 -5
View File
@@ -50,17 +50,18 @@ class GuestTrackingControllerCore extends FrontController
if (Tools::isSubmit('submitGuestTracking') || Tools::isSubmit('submitTransformGuestToCustomer')) if (Tools::isSubmit('submitGuestTracking') || Tools::isSubmit('submitTransformGuestToCustomer'))
{ {
// These lines are here for retrocompatibility with old theme // These lines are here for retrocompatibility with old theme
$id_order = (int)Tools::getValue('id_order'); $id_order = Tools::getValue('id_order');
$order_collection = array(); $order_collection = array();
if ($id_order) if ($id_order)
{ {
if (is_numeric($id_order)) if (is_numeric($id_order))
{
$order = new Order((int)$id_order); $order = new Order((int)$id_order);
if (Validate::isLoadedObject($order))
$order_collection[] = $order;
}
else else
$order = Order::getByReference($id_order); $order_collection = Order::getByReference($id_order);
if (Validate::isLoadedObject($order))
$order_collection[] = $order;
} }
// Get order reference, ignore package reference (after the #, on the order reference) // Get order reference, ignore package reference (after the #, on the order reference)