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

// REVERT MERGE

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
modules/paysafecard/payment.php
+6 -6
View File
@@ -42,7 +42,7 @@ if (Tools::getValue('hash') != md5(Configuration::get($module->prefix.'SALT') +
die(Tools::displayError());
$result = $module->getDispositionState((int)($cart->id));
$state = Configuration::get('PS_OS_ERROR');
$state = _PS_OS_ERROR_;
$disposition = Disposition::getByCartId((int)($cart->id));
@@ -53,7 +53,7 @@ if ($result[0] == 0)
if ($state == PrepaidServicesAPI::DISPOSITION_DISPOSED || $state == PrepaidServicesAPI::DISPOSITION_DEBITED)
{
$state = Configuration::get('PS_OS_PAYMENT');
$state = _PS_OS_PAYMENT_;
$message .= $module->getL('disposition_created');
} else {
$message .= $module->getL('disposition_invalid').' '.$state;
@@ -62,7 +62,7 @@ if ($result[0] == 0)
$message .= 'payment_error'.' '.$result[2];
}
if ($state != Configuration::get('PS_OS_ERROR'))
if ($state != _PS_OS_ERROR_)
{
$state = (int)(Configuration::get($module->prefix.'ORDER_STATE_ID'));
@@ -74,19 +74,19 @@ if ($state != Configuration::get('PS_OS_ERROR'))
if ($result[0] != 0)
{
$message .= $module->getL('payment_error').' '.$result[2];
$state = Configuration::get('PS_OS_ERROR');
$state = _PS_OS_ERROR_;
}
else
{
$message .= $module->getL('payment_accepted');
$state = Configuration::get('PS_OS_PAYMENT');
$state = _PS_OS_PAYMENT_;
}
}
}
$module->validateOrder((int)($cart->id), $state, (float)($cart->getOrderTotal(true, Cart::BOTH)), $module->displayName, $message, NULL, (int)($currency->id), false, $cart->secure_key);
if ($state == Configuration::get('PS_OS_ERROR'))
if ($state == _PS_OS_ERROR_)
{
include(dirname(__FILE__).'/../../header.php');
echo $message;