// MERGE with trunk revision 7754

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-27 12:48:42 +00:00
parent 4ade3a0ea0
commit e159c925d8
182 changed files with 6179 additions and 1333 deletions
+1 -1
View File
@@ -68,7 +68,7 @@ class authorizeAIM extends PaymentModule
if ($params['objOrder']->module != $this->name)
return;
if ($params['objOrder']->getCurrentState() != _PS_OS_ERROR_)
if ($params['objOrder']->getCurrentState() != Configuration::get('PS_OS_ERROR'))
$this->context->smarty->assign(array('status' => 'ok', 'id_order' => intval($params['objOrder']->id)));
else
$this->context->smarty->assign('status', 'failed');