@@ -543,9 +543,9 @@ |
||
543 | 543 | } |
544 | 544 | $date->modify('+1 day')->setTime(0, 0, 0); |
545 | 545 | } |
546 | - [$sh,$sm,$ss] = explode(':', $startHour); |
|
547 | - [$eh,$em,$es] = explode(':', $endHour); |
|
548 | - return array_reduce($dates, function ($carry, $item) use ($sh, $sm, $ss, $eh, $em, $es) { |
|
546 | + [$sh, $sm, $ss] = explode(':', $startHour); |
|
547 | + [$eh, $em, $es] = explode(':', $endHour); |
|
548 | + return array_reduce($dates, function($carry, $item) use ($sh, $sm, $ss, $eh, $em, $es) { |
|
549 | 549 | $businessStart = (clone $item['start'])->setTime($sh, $sm, $ss); |
550 | 550 | $businessEnd = (clone $item['end'])->setTime($eh, $em, $es); |
551 | 551 | $start = ($item['start'] < $businessStart) ? $businessStart : $item['start']; |
@@ -79,7 +79,7 @@ |
||
79 | 79 | $custom => $custom, |
80 | 80 | $languages => $languages, |
81 | 81 | ]); |
82 | - self::register($prefix, $label, null, true, (int)$this->_modulexml->progress); |
|
82 | + self::register($prefix, $label, null, true, (int) $this->_modulexml->progress); |
|
83 | 83 | \App\Cache::clear(); |
84 | 84 | \App\Log::trace("Importing $label [$prefix] ... DONE", __METHOD__); |
85 | 85 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | $headerStyle = 'font-size:9px;padding:0px 4px;text-align:center;'; |
37 | 37 | $bodyStyle = 'font-size:8px;border:1px solid #ddd;padding:0px4px;'; |
38 | 38 | $columns = []; |
39 | - foreach (['name', 'date_start', 'time_start', 'assigned_user_id', 'sum_time'] as $fieldName) { |
|
39 | + foreach (['name', 'date_start', 'time_start', 'assigned_user_id', 'sum_time'] as $fieldName) { |
|
40 | 40 | $fieldModel = $fields[$fieldName]; |
41 | 41 | if (!$fieldModel || !$fieldModel->isActiveField()) { |
42 | 42 | continue; |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $moduleModel = $this->relationModel->getParentModuleModel(); |
42 | 42 | $baseTableName = $moduleModel->get('basetable'); |
43 | 43 | $columnFullName = "{$baseTableName}.{$moduleModel->get('basetableid')}"; |
44 | - $queryGenerator->addJoin(['INNER JOIN', $tableName, "{$tableName}.productid = " . $queryGenerator->getColumnName('id')]) |
|
44 | + $queryGenerator->addJoin(['INNER JOIN', $tableName, "{$tableName}.productid = " . $queryGenerator->getColumnName('id')]) |
|
45 | 45 | ->addJoin(['INNER JOIN', $baseTableName, "{$columnFullName} = {$tableName}.crmid"]) |
46 | 46 | ->addNativeCondition([$columnFullName => $this->relationModel->get('parentRecord')->getId()]); |
47 | 47 | } |
@@ -69,7 +69,7 @@ |
||
69 | 69 | $result = false; |
70 | 70 | $where = [$referenceInfo['rel'] => $destinationRecordId, $referenceInfo['base'] => $sourceRecordId]; |
71 | 71 | if ($relatedModuleName === $parentModuleName) { |
72 | - $where = ['or', $where, [$referenceInfo['rel'] => $sourceRecordId, $referenceInfo['base'] => $destinationRecordId]]; |
|
72 | + $where = ['or', $where, [$referenceInfo['rel'] => $sourceRecordId, $referenceInfo['base'] => $destinationRecordId]]; |
|
73 | 73 | } |
74 | 74 | if (!(new App\Db\Query())->from($referenceInfo['table'])->where($where)->exists()) { |
75 | 75 | $result = \App\Db::getInstance()->createCommand()->insert($referenceInfo['table'], [ |
@@ -47,7 +47,7 @@ |
||
47 | 47 | <thead> |
48 | 48 | <tr>'; |
49 | 49 | $groupModels = []; |
50 | - foreach (['ItemNumber', 'Name', 'Quantity', 'UnitPrice', 'TotalPrice', 'GrossPrice'] as $fieldType) { |
|
50 | + foreach (['ItemNumber', 'Name', 'Quantity', 'UnitPrice', 'TotalPrice', 'GrossPrice'] as $fieldType) { |
|
51 | 51 | foreach ($inventory->getFieldsByType($fieldType) as $fieldModel) { |
52 | 52 | $columnName = $fieldModel->getColumnName(); |
53 | 53 | if (!$fieldModel->isVisible()) { |
@@ -72,7 +72,7 @@ |
||
72 | 72 | */ |
73 | 73 | public function getArrayValue() |
74 | 74 | { |
75 | - return array_map(function ($row) { |
|
75 | + return array_map(function($row) { |
|
76 | 76 | return \current(explode(' ', $row)); |
77 | 77 | }, explode(',', $this->value)); |
78 | 78 | } |
@@ -293,17 +293,17 @@ |
||
293 | 293 | $formatToConvert = str_replace(['/', '.'], '-', $fromFormat); |
294 | 294 | $dateToConvert = str_replace($separator, '-', $date); |
295 | 295 | switch ($formatToConvert) { |
296 | - case 'dd-mm-yyyy': |
|
297 | - [$d, $m, $y] = explode('-', $dateToConvert, 3); |
|
298 | - break; |
|
299 | - case 'mm-dd-yyyy': |
|
300 | - [$m, $d, $y] = explode('-', $dateToConvert, 3); |
|
301 | - break; |
|
302 | - case 'yyyy-mm-dd': |
|
303 | - [$y, $m, $d] = explode('-', $dateToConvert, 3); |
|
304 | - break; |
|
305 | - default: |
|
306 | - break; |
|
296 | + case 'dd-mm-yyyy': |
|
297 | + [$d, $m, $y] = explode('-', $dateToConvert, 3); |
|
298 | + break; |
|
299 | + case 'mm-dd-yyyy': |
|
300 | + [$m, $d, $y] = explode('-', $dateToConvert, 3); |
|
301 | + break; |
|
302 | + case 'yyyy-mm-dd': |
|
303 | + [$y, $m, $d] = explode('-', $dateToConvert, 3); |
|
304 | + break; |
|
305 | + default: |
|
306 | + break; |
|
307 | 307 | } |
308 | 308 | $dbDate = $y . '-' . $m . '-' . $d; |
309 | 309 | } else { |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | } |
311 | 311 | } |
312 | 312 | // remove empty values - do not modify existing |
313 | - $fieldData = array_filter($fieldData, function ($fieldValue) { |
|
313 | + $fieldData = array_filter($fieldData, function($fieldValue) { |
|
314 | 314 | return '' !== $fieldValue; |
315 | 315 | }); |
316 | 316 | $fieldData = $this->transformForImport($fieldData); |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | } |
333 | 333 | } |
334 | 334 | // remove empty values - do not modify existing |
335 | - $fieldData = array_filter($fieldData, function ($fieldValue) { |
|
335 | + $fieldData = array_filter($fieldData, function($fieldValue) { |
|
336 | 336 | return '' !== $fieldValue; |
337 | 337 | }); |
338 | 338 | $fieldData = $this->transformForImport($fieldData); |