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

// Revert normalization

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-11 10:20:59 +00:00
parent a01a13274a
commit d1d4d57eca
48 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dejala/dejala.php
+3 -3
View File
@@ -839,7 +839,7 @@ class Dejala extends CarrierModule
do
{
$wd = date("w", $balladUtc);
if ((int)$calendar[$wd]['stop_hour'] < (int)$calendar[$wd]['start_hour']) continue ;
if ((int)($calendar[$wd]['stop_hour']) < (int)($calendar[$wd]['start_hour'])) continue ;
$dates[$iDate]['value'] = date("Y/m/d", $balladUtc);
$dates[$iDate]['ts'] = $balladUtc ;
@@ -856,9 +856,9 @@ class Dejala extends CarrierModule
return ;
$now = (int)(date("H", $ctime)) ;
if ((int)$dates[0]['stop_hour'] > $now && (int)$dates[0]['start_hour'] < $now)
if ((int)($dates[0]['stop_hour']) > $now && (int)($dates[0]['start_hour']) < $now)
$dates[0]['start_hour'] = $now ;
elseif ((int)$dates[0]['ts'] == $now && (int)$dates[0]['stop_hour'] < $now)
elseif ((int)($dates[0]['ts']) == $now && (int)($dates[0]['stop_hour']) < $now)
array_shift($dates) ;
modules/dejala/dejalacarrierutils.php
+1 -1
View File
@@ -14,7 +14,7 @@ class DejalaCarrierUtils
$id_zone = 1;
$moduleCountryIsoCode = strtoupper($dejalaConfig->country);
$countryID = Country::getByIso($moduleCountryIsoCode);
if ($countryID)
if ((int)($countryID))
$id_zone = Country::getIdZone($countryID);
//TODO Will have to review this and apply proper code.