diff --git a/04_Laravel/app/Imports/ShippingRatesImport.php b/04_Laravel/app/Imports/ShippingRatesImport.php index 61c7730..a2f5852 100644 --- a/04_Laravel/app/Imports/ShippingRatesImport.php +++ b/04_Laravel/app/Imports/ShippingRatesImport.php @@ -147,7 +147,6 @@ class SimpleRateSheetImport implements OnEachRow, WithStartRow { $cells = $row->toArray(); - // بررسی اعتبار ستون وزن (ستون اول) if (empty($cells[0]) || !is_numeric($cells[0])) { $this->skipped++; return; @@ -157,26 +156,20 @@ class SimpleRateSheetImport implements OnEachRow, WithStartRow $weight = (float) $cells[0]; $zoneNumber = (int) $cells[1]; $rawValue = str_replace([',', ' '], '', (string) ($cells[2] ?? 0)); - $rawValue = is_numeric($rawValue) ? (float) $rawValue : 0; + $value = is_numeric($rawValue) ? (float) $rawValue : 0; - // بررسی اعتبار شماره زون و قیمت - if ($zoneNumber < 1 || $zoneNumber > 10 || $rawValue <= 0) { + if ($zoneNumber < 1 || $zoneNumber > 10 || $value <= 0) { $this->skipped++; return; } - // نرخ‌ها به صورت AED در دیتابیس ذخیره می‌شوند - $value = $rawValue; - $zoneColumn = 'zone_' . $zoneNumber; - // ایجاد مقادیر پیش‌فرض برای زون‌ها $defaults = []; for ($i = 1; $i <= 10; $i++) { $defaults['zone_' . $i] = 0; } - // یافتن یا ایجاد رکورد و به‌روزرسانی قیمت زون $record = ShippingRate::firstOrCreate( [ 'direction' => $this->direction, diff --git a/04_Laravel/resources/views/pdfs/awb.blade.php b/04_Laravel/resources/views/pdfs/awb.blade.php index 45201ad..5e9f256 100644 --- a/04_Laravel/resources/views/pdfs/awb.blade.php +++ b/04_Laravel/resources/views/pdfs/awb.blade.php @@ -43,7 +43,7 @@
- +
Shipment Waybill
We Deliver Value
diff --git a/04_Laravel/resources/views/pdfs/label.blade.php b/04_Laravel/resources/views/pdfs/label.blade.php index fd14cda..050ff33 100644 --- a/04_Laravel/resources/views/pdfs/label.blade.php +++ b/04_Laravel/resources/views/pdfs/label.blade.php @@ -50,7 +50,7 @@
- +
IFNEX LOGISTICS