// BugFix : Problem with token

This commit is contained in:
mDeflotte
2011-11-22 16:09:49 +00:00
parent 67354e2a4a
commit d9367bae9f
2 changed files with 11 additions and 6 deletions
+5
View File
@@ -278,6 +278,9 @@ class AuthControllerCore extends FrontController
$this->context->cart->id_address_delivery = Address::getFirstCustomerAddressId((int)($customer->id));
$this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)($customer->id));
$this->context->cart->update();
// Add customer to the context
$this->context->customer = $customer;
Hook::exec('authentication');
// Login information have changed, so we check if the cart rules still apply
@@ -291,8 +294,10 @@ class AuthControllerCore extends FrontController
}
}
}
elog('here???');
if ($this->ajax)
{
elog(Tools::getToken(false));
$return = array(
'hasError' => !empty($this->errors),
'errors' => $this->errors,
+6 -6
View File
@@ -272,12 +272,12 @@ function confirmFreeOrder()
{
var array_split = html.split(':');
if (array_split[0] === 'freeorder')
{
if (isGuest)
document.location.href = guestTrackingUrl+'?id_order='+encodeURIComponent(array_split[1])+'&email='+encodeURIComponent(array_split[2]);
else
document.location.href = historyUrl;
}
{
if (isGuest)
document.location.href = guestTrackingUrl+'?id_order='+encodeURIComponent(array_split[1])+'&email='+encodeURIComponent(array_split[2]);
else
document.location.href = historyUrl;
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {alert("TECHNICAL ERROR: unable to confirm the order \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);}
});