@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | if (null === $time) { |
| 145 | 145 | $dateTime = $this->dateTime; |
| 146 | 146 | } elseif (self::validateDate($time, 'H:i')) { |
| 147 | - $dateTime = new DateTime($this->dateTime->format('Y-m-d') . ' ' . $time); |
|
| 147 | + $dateTime = new DateTime($this->dateTime->format('Y-m-d').' '.$time); |
|
| 148 | 148 | } elseif (self::validateDate($time, 'Y-m-d H:i')) { |
| 149 | 149 | $dateTime = new DateTime($time); |
| 150 | 150 | } else { |
@@ -153,8 +153,8 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | [$jobStart, $jobEnd] = explode('-', $this->workingDays[$dateTime->format('w')]); |
| 155 | 155 | |
| 156 | - $dtStart = new DateTime($dateTime->format('Y-m-d') . ' ' . $jobStart); |
|
| 157 | - $dtEnd = new DateTime($dateTime->format('Y-m-d') . ' ' . $jobEnd); |
|
| 156 | + $dtStart = new DateTime($dateTime->format('Y-m-d').' '.$jobStart); |
|
| 157 | + $dtEnd = new DateTime($dateTime->format('Y-m-d').' '.$jobEnd); |
|
| 158 | 158 | |
| 159 | 159 | return $dateTime > $dtStart && $dateTime < $dtEnd; |
| 160 | 160 | } |
@@ -198,27 +198,27 @@ discard block |
||
| 198 | 198 | $nWDateTime = new DateTime($nextWorkingDay); |
| 199 | 199 | $workTime = explode('-', $this->workingDays[$nWDateTime->format('w')]); |
| 200 | 200 | |
| 201 | - return $nextWorkingDay . ' ' . $workTime[0]; |
|
| 201 | + return $nextWorkingDay.' '.$workTime[0]; |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | [$jobStart, $jobEnd] = explode('-', $this->workingDays[$dateTime->format('w')]); |
| 205 | 205 | |
| 206 | 206 | if ($this->isWorkingDate($dateTime->format('Y-m-d'))) { // Если день рабочий проверяем время |
| 207 | 207 | |
| 208 | - $dtStart = new DateTime($dateTime->format('Y-m-d') . ' ' . $jobStart); |
|
| 209 | - $dtEnd = new DateTime($dateTime->format('Y-m-d') . ' ' . $jobEnd); |
|
| 208 | + $dtStart = new DateTime($dateTime->format('Y-m-d').' '.$jobStart); |
|
| 209 | + $dtEnd = new DateTime($dateTime->format('Y-m-d').' '.$jobEnd); |
|
| 210 | 210 | |
| 211 | 211 | // Если начало дня еще не наступило (утро) возвращаем указанную дату + время |
| 212 | 212 | if ($dateTime < $dtStart) { |
| 213 | - $nextWorkingTime = $dateTime->format('Y-m-d') . ' ' . $jobStart; |
|
| 213 | + $nextWorkingTime = $dateTime->format('Y-m-d').' '.$jobStart; |
|
| 214 | 214 | } elseif ($dateTime >= $dtEnd) { // Если рабочий день уже закончился |
| 215 | 215 | // Ищем следующий рабочий день и выводим его + время начало дня |
| 216 | - $nextWorkingTime = $this->nextWorkingDay($dateTime->format('Y-m-d')) . ' ' . $jobStart; |
|
| 216 | + $nextWorkingTime = $this->nextWorkingDay($dateTime->format('Y-m-d')).' '.$jobStart; |
|
| 217 | 217 | } |
| 218 | 218 | } else { // Если день не рабочий |
| 219 | 219 | |
| 220 | 220 | // Ищем следующий рабочий день и выводим его + время начало дня |
| 221 | - $nextWorkingTime = $this->nextWorkingDay($dateTime->format('Y-m-d')) . ' ' . $jobStart; |
|
| 221 | + $nextWorkingTime = $this->nextWorkingDay($dateTime->format('Y-m-d')).' '.$jobStart; |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | return $nextWorkingTime; |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | $day = $nextWorkingDayDT->format('w'); |
| 238 | 238 | $jobStart = explode('-', $this->workingDays[$day])[0]; |
| 239 | 239 | |
| 240 | - return $nextWorkingDayDT->format('Y-m-d') . ' ' . $jobStart; |
|
| 240 | + return $nextWorkingDayDT->format('Y-m-d').' '.$jobStart; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $day = $nextWorkingDayDT->format('w'); |
| 254 | 254 | $jobEnd = explode('-', $this->workingDays[$day])[1]; |
| 255 | 255 | |
| 256 | - return $nextWorkingDayDT->format('Y-m-d') . ' ' . $jobEnd; |
|
| 256 | + return $nextWorkingDayDT->format('Y-m-d').' '.$jobEnd; |
|
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | /** |