// REVERT MERGE

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-27 13:35:06 +00:00
parent e159c925d8
commit be4811aa6e
182 changed files with 1335 additions and 6181 deletions
+3 -3
View File
@@ -61,13 +61,13 @@ if (!$result OR (Tools::strlen($result) < 8) OR (!$statut = substr($result, -8))
switch ($status)
{
case 'Completed':
$id_order_state = Configuration::get('PS_OS_PAYMENT');
$id_order_state = _PS_OS_PAYMENT_;
break;
case 'Pending':
$id_order_state = Configuration::get('PS_OS_PAYPAL');
$id_order_state = _PS_OS_PAYPAL_;
break;
default:
$id_order_state = Configuration::get('PS_OS_ERROR');
$id_order_state = _PS_OS_ERROR_;
}
if ($order->getCurrentState() == $id_order_state)