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

Merge branch 'develop' into 'feature/roadObservationSupervisorCartable'

Browse Source 
Develop

See merge request witelgroup/rms_v2!80
This commit is contained in:
amirghasempoor
2025-02-24 08:46:40 +00:00
parent 19dd88cd25 710af2ac01
commit e527cc5f43
14 changed files with 633 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,8 @@ class AccidentReceiptController extends Controller
{
auth()->user()->addActivityComplete(1126);
$name = 'گزارش از خسارات وارده به ابنیه فنی و تاسیسات راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
$data = $accidentReceiptTableService->dataTable($request);
return Excel::download(new DataTableReport($data), $name);
$data = $accidentReceiptTableService->dataTable($request, true);
return Excel::download(new DataTableReport($data['data']), $name);
}
public function accidentDamage(Accident $accident): JsonResponse
@@ -79,11 +79,11 @@ class AccidentReceiptController extends Controller
'accident_type_fa' => DailyAccidentSettings::query()->where('type', 'accident_type')->where('name', $request->accident_type)->first()->value,
'way_id' => $nominatimService->get_way_id_from_nominatim($request->lat, $request->lng),
'report_base' => $request->report_base,
// 'police_file' => $request->report_base ? null : FileFacade::save($request->file('police_file'), 'receipts_files/'),
'police_file' => $request->report_base ? null : FileFacade::save($request->file('police_file'), 'receipts_files/'),
'police_serial' => $request->police_serial ?? null,
'police_file_date' => $request->police_file_date ?? null,
// 'damage_picture1' => $request->has('damage_picture1') ? FileFacade::save($request->file('damage_picture1'), 'receipts_files/') : null,
// 'damage_picture2' => $request->has('damage_picture2') ? FileFacade::save($request->file('damage_picture2'), 'receipts_files/') : null,
'damage_picture1' => FileFacade::save($request->file('damage_picture1'), 'receipts_files/'),
'damage_picture2' => FileFacade::save($request->file('damage_picture2'), 'receipts_files/'),
'status' => AccidentStates::BEDON_EGHDAM->value,
'status_fa' => AccidentStates::name(AccidentStates::BEDON_EGHDAM->value),
];
@@ -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;
@@ -109,26 +109,7 @@ class AccidentReceiptController extends Controller
$accident = Accident::query()->create($accidentData);
$filesData = [
[
'name' => 'damage_picture1',
'path' => FileFacade::save($request->file('damage_picture1'), "receipts_files/{$accident->id}/"),
],
[
'name' => 'damage_picture2',
'path' => FileFacade::save($request->file('damage_picture2'), "receipts_files/{$accident->id}/")
]
];
if (!$request->report_base) {
$filesData[] = [
'name' => 'police_file',
'path' => FileFacade::save($request->file('police_file'), "receipts_files/{$accident->id}/")
];
}
$accident->damages()->attach($damageData);
$accident->files()->createMany($filesData);
auth()->user()->addActivityComplete(1123);
});
@@ -148,23 +129,6 @@ class AccidentReceiptController extends Controller
$province = Province::query()->where('id', '=', $request->province_id)->first();
$city = City::query()->where('id', '=', $request->city_id)->first();
if ($request->report_base && $accident->police_file) {
FileFacade::delete($accident->police_file, true);
}
if (!$request->report_base && $request->filled('police_file')) {
FileFacade::delete($accident->police_file, true);
}
if ($request->has('damage_picture1')) {
FileFacade::delete($accident->damage_picture1, true);
$damage_picture1 = FileFacade::save($request->file('damage_picture1'), 'receipts_files/');
}
if ($request->has('damage_picture2')) {
FileFacade::delete($accident->damage_picture2, true);
$damage_picture2 = FileFacade::save($request->file('damage_picture2'), 'receipts_files/');
}
$accidentData = [
'province_id' => $province->id,
'province_fa' => $province->name_fa,
@@ -184,24 +148,40 @@ class AccidentReceiptController extends Controller
'accident_type_fa' => DailyAccidentSettings::query()->where('type', 'accident_type')->where('name', $request->accident_type)->first()->value,
'way_id' => $nominatimService->get_way_id_from_nominatim($request->lat, $request->lng),
'report_base' => $request->report_base,
'police_file' => $request->report_base == 0 ? FileFacade::save($request->file('police_file'), 'receipts_files/') : null,
'police_serial' => $request->police_serial ?? null,
'police_file_date' => $request->police_file_date ?? null,
'damage_picture1' => $damage_picture1,
'damage_picture2' => $damage_picture2,
];
if ($request->report_base && $accident->police_file) {
FileFacade::delete($accident->police_file, true);
}
if (!$request->report_base) {
FileFacade::delete($accident->police_file, true);
$accidentData['police_file'] = FileFacade::save($request->file('police_file'), "receipts_files/{$accident->id}/");
}
if ($request->has('damage_picture1')) {
FileFacade::delete($accident->damage_picture1, true);
$accidentData['damage_picture1'] = FileFacade::save($request->file('damage_picture1'), "receipts_files/{$accident->id}/");
}
if ($request->has('damage_picture2')) {
FileFacade::delete($accident->damage_picture2, true);
$accidentData['damage_picture2'] = FileFacade::save($request->file('damage_picture2'), "receipts_files/{$accident->id}/");
}
$sum = 0;
$damageData = [];
foreach ($request->items_damge as $key => $item) {
$damage = Damage::query()->find($item->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 += $item->amount;
$sum += $item['amount'];
}
$ojrate_nasb = $sum/100*20;
@@ -224,11 +204,14 @@ class AccidentReceiptController extends Controller
{
FileFacade::delete('storage/receipts_files/'.$accident->id);
$accident->damages()->detach();
DB::transaction(function () use ($accident) {
$accident->delete();
$accident->damages()->detach();
auth()->user()->addActivityComplete(1125);
$accident->delete();
auth()->user()->addActivityComplete(1125);
});
return $this->successResponse();
}
@@ -255,54 +238,33 @@ class AccidentReceiptController extends Controller
public function confirmPaymentInfo(ConfirmPaymentInfoRequest $request, Accident $accident): JsonResponse
{
DB::transaction(function () use ($request, $accident) {
if ($request->has('deposit_insurance_status')) {
if ($request->has('deposit_insurance_image')) {
$deposit_insurance_image = $request->file('deposit_insurance_image')->storeAs('receipts_files/'.$accident->id, 'deposit_insurance_image_'.$accident->id.'_'.time().'.'.$request->file('deposit_insurance_image')->extension(), 'public');
}
$deposit_insurance_amount = $request->deposit_insurance_amount;
} else {
$accident->deposit_insurance_image = null;
$accident->deposit_insurance_amount = null;
}
if ($request->has('deposit_daghi_status')) {
if ($request->has('deposit_daghi_image')) {
$deposit_daghi_image = $request->file('deposit_daghi_image')->storeAs('receipts_files/'.$accident->id, 'deposit_daghi_image_'.$accident->id.'_'.time().'.'.$request->file('deposit_daghi_image')->extension(), 'public');
}
$deposit_daghi_amount = $request->deposit_daghi_amount;
} else {
$accident->deposit_daghi_image = null;
$accident->deposit_daghi_amount = null;
}
$accident->update([
'deposit_insurance_image' => $deposit_insurance_image,
'deposit_insurance_amount' => $deposit_insurance_amount,
'deposit_daghi_image' => $deposit_daghi_image,
'deposit_daghi_amount' => $deposit_daghi_amount,
'deposit_insurance_image' => $request->deposit_insurance_image != null ? FileFacade::save($request->deposit_insurance_image, "receipts_files/{$accident->id}/deposit_insurance/") : null,
'deposit_insurance_amount' => $request->deposit_insurance_amount ?? 0,
'deposit_daghi_image' => $request->deposit_insurance_image != null ? FileFacade::save($request->deposit_daghi_image, "receipts_files/{$accident->id}/deposit_daghi/") : null,
'deposit_daghi_amount' => $request->deposit_daghi_amount ?? 0,
'status' => AccidentStates::SABT_FISH->value,
'status_fa' => AccidentStates::name(AccidentStates::SABT_FISH->value),
]);
auth()->user()->addActivityComplete(1132);
return $this->successResponse();
});
return $this->successResponse();
}
public function submitInvoice(Accident $accident, PaymentService $paymentService): JsonResponse
{
DB::transaction(function () use ($accident, $paymentService) {
$final_amount = $accident->sum - ($accident->deposit_insurance_amount + $accident->deposit_daghi_amount);
$final_amount = $accident->sum - ($accident->deposit_insurance_amount + $accident->deposit_daghi_amount);
if ($final_amount < 0) {
return $this->errorResponse('error');
}
if ($final_amount < 0) {
return $this->errorResponse('error');
}
$bill_code = $paymentService->invoiceBillApi($accident->driver_national_code, $final_amount);
$bill_code = $paymentService->invoiceBillApi($accident->driver_national_code, $final_amount);
DB::transaction(function () use ($bill_code, $final_amount, $accident) {
$accident->update([
'final_amount' => $final_amount,
@@ -311,14 +273,14 @@ class AccidentReceiptController extends Controller
'status_fa' => AccidentStates::name(AccidentStates::SODOR_FACTOR->value),
]);
$msg = "فاکتور با شناسه پرداخت \n" . explode("/", $accident->bill_code)[0]. "\n در سامانه سازمان راهداری ثبت شد. برای پرداخت از لینک زیر اقدام نمایید.\n\n".env("PAYMENT_LINK")."/#/pay/".explode("/", $accident->bill_code)[0]."/$final_amount";
Sms::sendSms($accident->driver_phone_number, $msg);
auth()->user()->addActivityComplete(1129);
return $this->successResponse();
});
$msg = "فاکتور با شناسه پرداخت \n" . explode("/", $accident->bill_code)[0]. "\n در سامانه سازمان راهداری ثبت شد. برای پرداخت از لینک زیر اقدام نمایید.\n\n".env("PAYMENT_LINK")."/#/pay/".explode("/", $accident->bill_code)[0]."/$final_amount";
Sms::sendSms($accident->driver_phone_number, $msg);
return $this->successResponse();
}
public function checkPaymentStatus(Accident $accident, PaymentService $paymentService): JsonResponse
@@ -344,9 +306,9 @@ class AccidentReceiptController extends Controller
}
auth()->user()->addActivityComplete(1130);
return $this->successResponse();
});
return $this->successResponse($accident);
}
public function generatePoliceDocument(Request $request, Accident $accident): JsonResponse
@@ -361,6 +323,20 @@ class AccidentReceiptController extends Controller
auth()->user()->addActivityComplete(1131);
});
return $this->successResponse($accident);
}
public function sendSmsAgain(Accident $accident): JsonResponse
{
$msg = "فاکتور با شناسه پرداخت \n" . explode("/", $accident->bill_code)[0]. "\n در سامانه سازمان راهداری ثبت شد. برای پرداخت از لینک زیر اقدام نمایید.\n\n".env("PAYMENT_LINK")."/#/pay/".explode("/", $accident->bill_code)[0]."/$accident->final_amount";
Sms::sendSms($accident->driver_phone_number, $msg);
return $this->successResponse();
}
public function accidentTypes(): JsonResponse
{
return $this->successResponse(DailyAccidentSettings::query()->where('type', 'accident_type')->get());
}
}

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

@@ -2,10 +2,12 @@
namespace App\Http\Controllers\V3\Dashboard\Reports;
use App\Exports\V3\AccidentReceipt\CityReport;
use App\Exports\V3\AccidentReceipt\ProvinceReport;
use App\Exports\V3\AccidentReceipt\CountryReport;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\City;
use App\Models\Province;
use App\Services\Cartables\AccidentReceiptTableService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -16,29 +18,42 @@ class AccidentReceiptReportController extends Controller
{
use ApiResponse;
public function countryReport(Request $request, AccidentReceiptTableService $accidentReceiptTableService): JsonResponse
{
$data = $accidentReceiptTableService->countryReport($request);
return $this->successResponse([
'activities' => $data['data'],
'provinces' => Province::all(['id', 'name_fa']),
]);
}
public function provinceReport(Request $request, AccidentReceiptTableService $accidentReceiptTableService): JsonResponse
{
$data = $accidentReceiptTableService->provinceReport($request);
return $this->successResponse($data['data']);
return $this->successResponse([
'activities' => $data['data'],
'cities' => City::query()->where('province_id', '=', $request->province_id)
->where('type_id', '=', 1)
->get(['id', 'name_fa']),
]);
}
public function cityReport(Request $request, AccidentReceiptTableService $accidentReceiptTableService): JsonResponse
public function countryExcelReport(Request $request, AccidentReceiptTableService $accidentReceiptTableService): BinaryFileResponse
{
$data = $accidentReceiptTableService->cityReport($request);
return $this->successResponse($data['data']);
$data = $accidentReceiptTableService->countryReport($request);
$name = 'گزارش از خسارات وارده به ابنیه فنی و تاسیسات راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new CountryReport($data), $name);
}
public function provinceExcelReport(Request $request, AccidentReceiptTableService $accidentReceiptTableService): BinaryFileResponse
{
$data = $accidentReceiptTableService->provinceReport($request);
$name = 'گزارش از خسارات وارده به ابنیه فنی و تاسیسات راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ProvinceReport($data), $name);
}
public function cityExcelReport(Request $request, AccidentReceiptTableService $accidentReceiptTableService): BinaryFileResponse
{
$data = $accidentReceiptTableService->cityReport($request);
$name = 'گزارش از خسارات وارده به ابنیه فنی و تاسیسات راه ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new CityReport($data), $name);
return Excel::download(new ProvinceReport([
'report' => $data,
'cities' => City::query()->where('province_id', '=', $request->province_id)
->where('type_id', '=', 1)
->get(['id', 'name_fa']),
]), $name);
}
}