Procházet zdrojové kódy

fix import catalog cert date, fix filters with date

Alexander Musikhin před 1 týdnem
rodič
revize
ccbfb68d30

+ 1 - 0
app/Http/Controllers/FilterController.php

@@ -44,6 +44,7 @@ class FilterController extends Controller
                 foreach ($gp['filters'] as $colName => $vals) {
                     $q->where(function ($query) use ($gp, $colName, $vals) {
                         foreach (explode('||', $vals) as $val) {
+                            if($val == '-пусто-') $val = null;
                             $query->orWhere($colName, '=', $val);
                         }
                     });

+ 2 - 1
app/Services/ImportService.php

@@ -63,6 +63,7 @@ class ImportService
                 $record = $this->rowToArray($row);
                 if($record[0] === 'Фото') continue;
                 if(!isset($record[4])) continue;
+                $certDate = (int) $record[18];
                 Product::query()
                     ->updateOrCreate(['year' => $year, 'nomenclature_number' => $record[4]],
                     [
@@ -82,7 +83,7 @@ class ImportService
                         'statement_name'        => (string) $record[15],
                         'service_life'          => (int) $record[16],
                         'certificate_number'    => (string) $record[17],
-                        'certificate_date'      => DateHelper::isDate($record[18] ?? '') ? DateHelper::getDateForDB($record[18]) : null,
+                        'certificate_date'      => ($certDate > 0) ? DateHelper::excelDateToISODate($certDate) : null,
                         'certificate_issuer'    => (string) $record[19],
                         'certificate_type'      => (string) $record[20],
                         'weight'                => (float) $record[21],