// MERGE with trunk revision 7754

This commit is contained in:
rMalie
2011-07-27 12:48:42 +00:00
parent 21017fb5d8
commit 233c0076b7
182 changed files with 6179 additions and 1333 deletions
+4 -4
View File
@@ -384,11 +384,11 @@ class Fianetfraud extends Module
$conf = Configuration::getMultiple(array('SAC_PRODUCTION', 'PS_SAC_ID_FRAUD', 'SAC_SITEID', 'SAC_LOGIN', 'SAC_PASSWORD'));
if ($params['newOrderStatus']->id == Configuration::get('SAC_ID_FRAUD'))
$order_status = 2;
elseif ($params['newOrderStatus']->id == _PS_OS_DELIVERED_)
elseif ($params['newOrderStatus']->id == Configuration::get('PS_OS_DELIVERED'))
$order_status = 1;
elseif ($params['newOrderStatus']->id == _PS_OS_CANCELED_)
elseif ($params['newOrderStatus']->id == Configuration::get('PS_OS_CANCELED'))
$order_status = 2;
elseif ($params['newOrderStatus']->id == _PS_OS_REFUND_)
elseif ($params['newOrderStatus']->id == Configuration::get('PS_OS_REFUND'))
$order_status = 6;
if ($order_status != false)
return file_get_contents('https://secure.fia-net.com/'.($conf['SAC_PRODUCTION'] ? 'fscreener' : 'pprod').'/engine/delivery.cgi?SiteID='.$conf['SAC_SITEID'].'&Pwd='.urlencode($conf['SAC_PASSWORD']).'&RefID='.(int)$params['id_order'].'&Status='.$order_status);
@@ -601,7 +601,7 @@ class Fianetfraud extends Module
{
$orderHistory = new OrderHistory();
$orderHistory->id_order = (int)($row['refid']);
$orderHistory->id_order_state = _PS_OS_PAYMENT_;
$orderHistory->id_order_state = Configuration::get('PS_OS_PAYMENT');
$orderHistory->save();
}
return true;