RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename the damage item

Browse Source
This commit is contained in:
amirghasempoor
2025-02-23 15:53:49 +03:30
parent 05775d72e1
commit 3ccaaf7491
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/V3/Dashboard/AccidentReceiptController.php
View File

@@ -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;
}

8
app/Http/Controllers/V3/Dashboard/Reports/AccidentReceiptReportController.php
View File

@@ -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']),
]);
}

3
app/Http/Requests/V3/AccidentReceipt/StoreRequest.php
View File

@@ -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',
];
}
}

3
app/Http/Requests/V3/AccidentReceipt/UpdateRequest.php
View File

@@ -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',
];
}
}