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/mondialrelay/cron.php
+2 -2
View File
@@ -54,7 +54,7 @@ foreach ($expeditions as $expedition)
{
if ($expedition['id_order'] == NULL)
continue;
if (OrderHistory::getLastOrderState((int)($expedition['id_order']))->id == Configuration::get('PS_OS_DELIVERED'))
if (OrderHistory::getLastOrderState((int)($expedition['id_order']))->id == _PS_OS_DELIVERED_)
continue;
$params['Expedition'] = $expedition['exp_number'];
$params['Security'] = strtoupper(md5($params['Enseigne'].$params['Expedition'].'FR'.Configuration::get('MR_KEY_WEBSERVICE')));
@@ -70,7 +70,7 @@ foreach ($expeditions as $expedition)
{
$history = new OrderHistory();
$history->id_order = (int)($expedition['id_order']);
$history->changeIdOrderState((int)(Configuration::get('PS_OS_DELIVERED')), (int)($expedition['id_order']));
$history->changeIdOrderState((int)(_PS_OS_DELIVERED_), (int)($expedition['id_order']));
$history->addWithemail();
}
}