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

// MERGE with 1.4 r7770

Browse Source
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/fianetfraud/fianetfraud.php
+5 -5
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);
@@ -529,7 +529,7 @@ class Fianetfraud extends Module
return true;
}
static public function checkWaitingOrders()
public static function checkWaitingOrders()
{
$orders = Db::getInstance()->ExecuteS('SELECT id_order FROM '._DB_PREFIX_.'fianet_fraud_orders WHERE `date_add` > \''.pSQL(strtotime('+5 minute')).'\'');
foreach ($orders AS $order)
@@ -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;