diff --git a/app/Exports/V3/AccidentReceipt/CountryReport.php b/app/Exports/V3/AccidentReceipt/CountryReport.php index e37c0386..e05bdb64 100644 --- a/app/Exports/V3/AccidentReceipt/CountryReport.php +++ b/app/Exports/V3/AccidentReceipt/CountryReport.php @@ -23,6 +23,20 @@ class CountryReport implements FromView, ShouldAutoSize, WithEvents, WithDrawing { $data = $this->data; + $country = array_search(-1, array_column($data['data'], 'province_id')); + + $activities[] = [ + 'name' => 'کل کشور', + 'tedade' => $data['data'][$country]->tedade, + 'police_rah' => $data['data'][$country]->police_rah, + 'gozaresh_gasht' => $data['data'][$country]->gozaresh_gasht, + 'kol_sabt_shode' => $data['data'][$country]->kol_sabt_shode, + 'vasel_shode' => $data['data'][$country]->vasel_shode ?? 0, + 'vasel_shode_bimeh' => $data['data'][$country]->vasel_shode_bimeh ?? 0, + 'vasel_shode_daghi' => $data['data'][$country]->vasel_shode_daghi ?? 0, + 'vasel_shode_final' => $data['data'][$country]->vasel_shode_final ?? 0, + ]; + foreach (Province::all() as $province) { $existingProvince = array_search($province->id, array_column($data['data'], 'province_id')); @@ -54,18 +68,6 @@ class CountryReport implements FromView, ShouldAutoSize, WithEvents, WithDrawing } } - $activities[] = [ - 'name' => 'کشوری', - 'tedade' => $data['data'][-1]->tedade, - 'police_rah' => $data['data'][-1]->police_rah, - 'gozaresh_gasht' => $data['data'][-1]->gozaresh_gasht, - 'kol_sabt_shode' => $data['data'][-1]->kol_sabt_shode, - 'vasel_shode' => $data['data'][-1]->vasel_shode ?? 0, - 'vasel_shode_bimeh' => $data['data'][-1]->vasel_shode_bimeh ?? 0, - 'vasel_shode_daghi' => $data['data'][-1]->vasel_shode_daghi ?? 0, - 'vasel_shode_final' => $data['data'][-1]->vasel_shode_final ?? 0, - ]; - return view('v3.Reports.AccidentReceipt.CountryReport', [ 'data' => $activities, 'fromDate' => $data['fromDate'], diff --git a/app/Exports/V3/AccidentReceipt/ProvinceReport.php b/app/Exports/V3/AccidentReceipt/ProvinceReport.php index 9339384b..7c37cbf5 100644 --- a/app/Exports/V3/AccidentReceipt/ProvinceReport.php +++ b/app/Exports/V3/AccidentReceipt/ProvinceReport.php @@ -23,6 +23,20 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithEvents, WithDrawin $inputData = $this->data; $reportData =$inputData['report']; + $province = array_search(-1, array_column($reportData, 'province_id')); + + $activities[] = [ + 'name' => 'کل استان', + 'tedade' => $reportData['data'][$province]->tedade, + 'police_rah' => $reportData['data'][$province]->police_rah, + 'gozaresh_gasht' => $reportData['data'][$province]->gozaresh_gasht, + 'kol_sabt_shode' => $reportData['data'][$province]->kol_sabt_shode, + 'vasel_shode' => $reportData['data'][$province]->vasel_shode ?? 0, + 'vasel_shode_bimeh' => $reportData['data'][$province]->vasel_shode_bimeh ?? 0, + 'vasel_shode_daghi' => $reportData['data'][$province]->vasel_shode_daghi ?? 0, + 'vasel_shode_final' => $reportData['data'][$province]->vasel_shode_final ?? 0, + ]; + foreach ($inputData['cities'] as $city) { $existingCity = array_search($city->id, array_column($inputData['data'], 'city_id')); @@ -54,19 +68,6 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithEvents, WithDrawin } } - $activities[] = [ - 'name' => 'استانی', - 'tedade' => $reportData['data'][-1]->tedade, - 'police_rah' => $reportData['data'][-1]->police_rah, - 'gozaresh_gasht' => $reportData['data'][-1]->gozaresh_gasht, - 'kol_sabt_shode' => $reportData['data'][-1]->kol_sabt_shode, - 'vasel_shode' => $reportData['data'][-1]->vasel_shode ?? 0, - 'vasel_shode_bimeh' => $reportData['data'][-1]->vasel_shode_bimeh ?? 0, - 'vasel_shode_daghi' => $reportData['data'][-1]->vasel_shode_daghi ?? 0, - 'vasel_shode_final' => $reportData['data'][-1]->vasel_shode_final ?? 0, - ]; - - return view('v3.Reports.AccidentReceipt.ProvinceReport', [ 'data' => $activities, 'fromDate' => $reportData['fromDate'], diff --git a/app/Services/Cartables/AccidentReceiptTableService.php b/app/Services/Cartables/AccidentReceiptTableService.php index e757516f..4f251709 100644 --- a/app/Services/Cartables/AccidentReceiptTableService.php +++ b/app/Services/Cartables/AccidentReceiptTableService.php @@ -74,7 +74,7 @@ class AccidentReceiptTableService ); return [ - 'data' => collect($data), + 'data' => $data, 'fromDate' => $request->from_date, 'toDate' => $request->date_to, ]; @@ -115,7 +115,7 @@ class AccidentReceiptTableService ); return [ - 'data' => collect($data), + 'data' => $data, 'fromDate' => $request->from_date, 'toDate' => $request->date_to, ]; diff --git a/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php index 9ba1263b..c5745eb6 100644 --- a/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php +++ b/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php @@ -32,7 +32,7 @@ {{ verta($fromDate)->format('Y/n/j') }} تا تاریخ - {{ verta($ToDate)->format('Y/n/j') }} + {{ verta($toDate)->format('Y/n/j') }} @@ -66,15 +66,16 @@
| {{$item->city_fa}} | {{$item->axis_name}} | {{$item->accident_type_fa}} | -{{Hekmatinasser\Verta\Verta::instance($item->accident_date)->format('Y/n/j') ($item->accident_time)}} | +{{Hekmatinasser\Verta\Verta::instance($item->accident_date)->format('Y/n/j')}} {{$item->accident_time}} | {{$item->sum ?? 0}} | {{$item->plaque}} | {{Hekmatinasser\Verta\Verta::instance($item->created_at)->format('Y/n/j')}} | {{$item->status_fa}} | -{{$item->final_amount}} | -{{$item->deposit_insurance_amount}} | -{{$item->deposit_daghi_amount}} | +{{$item->final_amount ?? 0}} | +{{$item->deposit_insurance_amount ?? 0}} | +{{$item->deposit_daghi_amount ?? 0}} | @endforeach diff --git a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php index ae8d4da5..1817487d 100644 --- a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php +++ b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php @@ -67,15 +67,16 @@گزارش گشت راهداری | ++ فیش + | بیمه | کسر داغی | -- شخص - | + @@ -95,12 +96,12 @@ {{ $road['kol_sabt_shode'] }}{{ $road['vasel_shode'] }} | ++ {{ $road['vasel_shode_final'] }} | {{ $road['vasel_shode_bimeh'] }} | {{ $road['vasel_shode_daghi'] }} | -- {{ $road['vasel_shode_final'] }} | @endforeach
|---|