calendar calculate correction

2015-06-25 18:08:10 -04:00
parent 43218d85c6
commit 60ea36a601
1 changed files with 5 additions and 0 deletions
--- a/workflow/engine/classes/class.calendar.php
+++ b/workflow/engine/classes/class.calendar.php
@@ -839,6 +839,7 @@ class calendar extends CalendarDefinition
    		$finDate = date('Y-m-d H:i:s');
    	}
    
+
        if ((strtotime($finDate)) <= (strtotime($iniDate))) {
            return 0.00;
        }
@@ -847,6 +848,10 @@ class calendar extends CalendarDefinition
    
    	$finDate = $this->dashGetIniDate($finDate, $calendarData);
    	$newDate = $iniDate;
+
+		$timeIniDate = strtotime($iniDate);
+		$timeFinDate = strtotime($finDate);
+
    	while ($timeIniDate < $timeFinDate) {
    		$newDate = $this->dashGetIniDate($newDate, $calendarData);