@@ -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 { |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | $recordModel = $formFields = []; |
| 70 | 70 | if ($companies) { |
| 71 | 71 | $recordModel = Settings_Companies_Record_Model::getInstance($companies['id'])->set('source', $qualifiedModuleName); |
| 72 | - $formFields = array_filter(Settings_Companies_Module_Model::getFormFields(), function ($key) { |
|
| 72 | + $formFields = array_filter(Settings_Companies_Module_Model::getFormFields(), function($key) { |
|
| 73 | 73 | return isset($key['paymentData']); |
| 74 | 74 | }); |
| 75 | 75 | } elseif (!$isCustom) { |
@@ -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); |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | { |
| 67 | 67 | $data = self::get(); |
| 68 | 68 | if (\Config\Developer::$updaterDevMode) { |
| 69 | - $where = ['like', 'from_version', self::$version . '.%', false]; |
|
| 69 | + $where = ['like', 'from_version', self::$version . '.%', false]; |
|
| 70 | 70 | } else { |
| 71 | 71 | $where = ['from_version' => \App\Version::get()]; |
| 72 | 72 | foreach ($data as $key => $row) { |
@@ -231,7 +231,7 @@ |
||
| 231 | 231 | $moduleData = \App\Fields\RecordNumber::getInstance($moduleName); |
| 232 | 232 | $prefix = str_replace(['\{\{YYYY\}\}', '\{\{YY\}\}', '\{\{MM\}\}', '\{\{DD\}\}', '\{\{M\}\}', '\{\{D\}\}'], ['\d{4}', '\d{2}', '\d{2}', '\d{2}', '\d{1,2}', '\d{1,2}'], preg_quote($moduleData->get('prefix'), '/')); |
| 233 | 233 | $postfix = str_replace(['\{\{YYYY\}\}', '\{\{YY\}\}', '\{\{MM\}\}', '\{\{DD\}\}', '\{\{M\}\}', '\{\{D\}\}'], ['\d{4}', '\d{2}', '\d{2}', '\d{2}', '\d{1,2}', '\d{1,2}'], preg_quote($moduleData->get('postfix'), '/')); |
| 234 | - $redex = preg_replace_callback('/\\\\{\\\\{picklist\\\\:([a-z0-9_]+)\\\\}\\\\}/i', function ($matches) { |
|
| 234 | + $redex = preg_replace_callback('/\\\\{\\\\{picklist\\\\:([a-z0-9_]+)\\\\}\\\\}/i', function($matches) { |
|
| 235 | 235 | $picklistPrefix = array_column(\App\Fields\Picklist::getValues($matches[1]), 'prefix'); |
| 236 | 236 | if (!$picklistPrefix) { |
| 237 | 237 | return ''; |