fix the country amount

2025-02-24 11:55:24 +03:30
parent 918a91d52a
commit ff83fde991
6 changed files with 48 additions and 43 deletions
--- 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'],
--- 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'],
--- 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,
        ];
--- 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') }}

        </th>
    </tr>
@@ -66,15 +66,16 @@
        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
            گزارش گشت راهداری
        </th>
+        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
+            فیش
+        </th>
        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
            بیمه
        </th>
        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
            کسر داغی
        </th>
-        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
-            شخص
-        </th>
+
    </tr>

    </thead>
@@ -94,12 +95,12 @@
                {{ $road['kol_sabt_shode'] }}</td>
            <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                {{ $road['vasel_shode'] }}</td>
+            <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
+                {{ $road['vasel_shode_final'] }}</td>
            <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                {{ $road['vasel_shode_bimeh'] }}</td>
            <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                {{ $road['vasel_shode_daghi'] }}</td>
-            <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
-                {{ $road['vasel_shode_final'] }}</td>
        </tr>
    @endforeach
    </tbody>
--- a/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php
+++ b/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php
@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>خسارات وارده به تفکیک استان</title>
+    <title>خسارات وارده به ابنیه فنی</title>
 </head>
 <body>
 <table>
@@ -46,14 +46,14 @@
            <td style="border: 1px solid black;text-align: center;">{{$item->city_fa}}</td>
            <td style="border: 1px solid black;text-align: center;">{{$item->axis_name}}</td>
            <td style="border: 1px solid black;text-align: center;">{{$item->accident_type_fa}}</td>
-            <td style="border: 1px solid black;text-align: center;">{{Hekmatinasser\Verta\Verta::instance($item->accident_date)->format('Y/n/j') ($item->accident_time)}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{Hekmatinasser\Verta\Verta::instance($item->accident_date)->format('Y/n/j')}} {{$item->accident_time}}</td>
            <td style="border: 1px solid black;text-align: center;">{{$item->sum ?? 0}}</td>
            <td style="border: 1px solid black;text-align: center;">{{$item->plaque}}</td>
            <td style="border: 1px solid black;text-align: center;">{{Hekmatinasser\Verta\Verta::instance($item->created_at)->format('Y/n/j')}}</td>
            <td style="border: 1px solid black;text-align: center;">{{$item->status_fa}}</td>
-            <td style="border: 1px solid black;text-align: center;">{{$item->final_amount}}</td>
-            <td style="border: 1px solid black;text-align: center;">{{$item->deposit_insurance_amount}}</td>
-            <td style="border: 1px solid black;text-align: center;">{{$item->deposit_daghi_amount}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item->final_amount ?? 0}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item->deposit_insurance_amount ?? 0}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item->deposit_daghi_amount ?? 0}}</td>
        </tr>
    @endforeach
    </tbody>
--- a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
+++ b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
@@ -67,15 +67,16 @@
        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
            گزارش گشت راهداری
        </th>
+        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
+            فیش
+        </th>
        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
            بیمه
        </th>
        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
            کسر داغی
        </th>
-        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
-            شخص
-        </th>
+
    </tr>

    </thead>
@@ -95,12 +96,12 @@
                    {{ $road['kol_sabt_shode'] }}</td>
                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                    {{ $road['vasel_shode'] }}</td>
+                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
+                    {{ $road['vasel_shode_final'] }}</td>
                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                    {{ $road['vasel_shode_bimeh'] }}</td>
                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                    {{ $road['vasel_shode_daghi'] }}</td>
-                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
-                    {{ $road['vasel_shode_final'] }}</td>
            </tr>
    @endforeach
    </tbody>