From 3ccaaf74916607bfe187568163763ecc8116de43 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Sun, 23 Feb 2025 15:53:49 +0330
Subject: [PATCH] rename the damage item

---
 .../Dashboard/AccidentReceiptController.php   | 20 +++++++++----------
 .../AccidentReceiptReportController.php       |  8 +++++---
 .../V3/AccidentReceipt/StoreRequest.php       |  3 +++
 .../V3/AccidentReceipt/UpdateRequest.php      |  3 +++
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/V3/Dashboard/AccidentReceiptController.php b/app/Http/Controllers/V3/Dashboard/AccidentReceiptController.php
index 3541ddc0..9520c2d2 100644
--- a/app/Http/Controllers/V3/Dashboard/AccidentReceiptController.php
+++ b/app/Http/Controllers/V3/Dashboard/AccidentReceiptController.php
@@ -91,14 +91,14 @@ class AccidentReceiptController extends Controller
             $sum = 0;
             $damageData = [];
 
-            foreach ($request->items_damge as $key => $damage) {
-                $damage = Damage::query()->find($damage->id);
-                $damageData[$damage->id] = [
-                    'value' => $damage->value,
+            foreach ($request->damage_items as $key => $item) {
+                $damage = Damage::query()->find($item->id);
+                $damageData[$item->id] = [
+                    'value' => $item->value,
                     'unit' => $damage->unit,
-                    'amount' => $damage->amount,
+                    'amount' => $item->amount,
                 ];
-                $sum += $damage->amount;
+                $sum += $item->amount;
             }
 
             $ojrate_nasb = $sum/100*20;
@@ -176,12 +176,12 @@ class AccidentReceiptController extends Controller
             $sum = 0;
             $damageData = [];
 
-            foreach ($request->items_damge as $key => $item) {
+            foreach ($request->damage_items as $key => $item) {
                 $damage = Damage::query()->find($item->id);
-                $damageData[$damage->id] = [
-                    'value' => $damage->value,
+                $damageData[$item->id] = [
+                    'value' => $item->value,
                     'unit' => $damage->unit,
-                    'amount' => $damage->amount,
+                    'amount' => $item->amount,
                 ];
                 $sum += $item->amount;
             }
diff --git a/app/Http/Controllers/V3/Dashboard/Reports/AccidentReceiptReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/AccidentReceiptReportController.php
index f112be93..1af76f3c 100644
--- a/app/Http/Controllers/V3/Dashboard/Reports/AccidentReceiptReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/Reports/AccidentReceiptReportController.php
@@ -22,7 +22,7 @@ class AccidentReceiptReportController extends Controller
     {
         $data = $accidentReceiptTableService->provinceReport($request);
         return $this->successResponse([
-            'data' => $data['data'],
+            'activities' => $data['data'],
             'provinces' => Province::all(['id', 'name_fa']),
         ]);
     }
@@ -31,8 +31,10 @@ class AccidentReceiptReportController extends Controller
     {
         $data = $accidentReceiptTableService->cityReport($request);
         return $this->successResponse([
-            'data' => $data['data'],
-            'cities' => City::all(['id', 'name_fa']),
+            'activities' => $data['data'],
+            'cities' => City::query()->where('province_id', '=', $request->province_id)
+                ->where('type_id', '=', 1)
+                ->get(['id', 'name_fa']),
         ]);
     }
 
diff --git a/app/Http/Requests/V3/AccidentReceipt/StoreRequest.php b/app/Http/Requests/V3/AccidentReceipt/StoreRequest.php
index b5b5627f..5b7f34bf 100644
--- a/app/Http/Requests/V3/AccidentReceipt/StoreRequest.php
+++ b/app/Http/Requests/V3/AccidentReceipt/StoreRequest.php
@@ -42,6 +42,9 @@ class StoreRequest extends FormRequest
             'police_file_date' => 'required_if:report_base,0|date',
             'damage_picture1' => 'required|file|mimes:pdf,jpg,jpeg,png',
             'damage_picture2' => 'required|file|mimes:pdf,jpg,jpeg,png',
+            'damage_items' => 'required|array',
+            'damage_items.*.value' => 'required',
+            'damage_items.*.amount' => 'required',
         ];
     }
 }
diff --git a/app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php b/app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php
index c5219237..3b50bdf5 100644
--- a/app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php
+++ b/app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php
@@ -40,6 +40,9 @@ class UpdateRequest extends FormRequest
             'police_file_date' => 'required_if:report_base,0|date',
             'damage_picture1' => 'required|file|mimes:pdf,jpg,jpeg,png',
             'damage_picture2' => 'required|file|mimes:pdf,jpg,jpeg,png',
+            'damage_items' => 'required|array',
+            'damage_items.*.value' => 'required',
+            'damage_items.*.amount' => 'required',
         ];
     }
 }