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

Merge pull request #3 from witelgroup/feature/DriverAccident

Browse Source 
change export for safty proivecy
This commit is contained in:
Amir Ghasempoor
2025-08-31 11:39:38 +03:30
committed by GitHub
parent 6231dc52b9 78706ac766
commit 389b8307dd
17 changed files with 482 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/V3/Dashboard/Accident/AccidentReceiptController.php
View File

@@ -84,6 +84,7 @@ class AccidentReceiptController extends Controller
'police_file_date' => $request->police_file_date ?? null,
'status' => AccidentStates::BEDON_EGHDAM->value,
'status_fa' => AccidentStates::name(AccidentStates::BEDON_EGHDAM->value),
'driver_rate' => $request->driver_rate,
];
$sum = 0;
@@ -104,6 +105,7 @@ class AccidentReceiptController extends Controller
$accidentData['ojrate_nasb'] = $ojrate_nasb;
$accidentData['sum'] = $sum;
$accidentData['driver_share_amount'] = ($request->sum * $request->driver_rate)/100;
$accident = Accident::query()->create($accidentData);
$accident->damage_picture1 = FileFacade::save($request->file('damage_picture1'), "receipts_files/{$accident->id}");
@@ -153,6 +155,7 @@ class AccidentReceiptController extends Controller
'report_base' => $request->report_base,
'police_serial' => $request->police_serial ?? null,
'police_file_date' => $request->police_file_date ?? null,
'driver_rate' => $request->driver_rate,
];
if ($request->report_base && $accident->police_file) {
@@ -192,6 +195,8 @@ class AccidentReceiptController extends Controller
$accidentData['ojrate_nasb'] = $ojrate_nasb;
$accidentData['sum'] = $sum;
$accidentData['driver_share_amount'] = ($request->sum * $request->driver_rate)/100;
$accident->update($accidentData);
@@ -246,13 +251,25 @@ class AccidentReceiptController extends Controller
public function confirmPaymentInfo(ConfirmPaymentInfoRequest $request, Accident $accident): JsonResponse
{
DB::transaction(function () use ($request, $accident) {
$accident->update([
$final_amount = $accident->driver_share_amount - ($accident->deposit_insurance_amount + $accident->deposit_daghi_amount);
if ($final_amount > 0) {
$status = AccidentStates::SABT_FISH->value;
$status_fa = AccidentStates::name($status);
}
elseif ($final_amount == 0) {
$status = AccidentStates::PARDAKHT_FACTOR->value;
$status_fa = AccidentStates::name($status);
}
$accident->update([
'deposit_insurance_image' => $request->has('deposit_insurance_image') ? 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->has('deposit_daghi_image') ? 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),
'status' => $status,
'status_fa' => $status_fa,
]);
auth()->user()->addActivityComplete(1132);
@@ -266,7 +283,7 @@ class AccidentReceiptController extends Controller
*/
public function submitInvoice(Accident $accident, PaymentService $paymentService): JsonResponse
{
$final_amount = $accident->sum - ($accident->deposit_insurance_amount + $accident->deposit_daghi_amount);
$final_amount = $accident->driver_share_amount - ($accident->deposit_insurance_amount + $accident->deposit_daghi_amount);
throw_if($final_amount < 0, new ProhibitedAction('مبالغ داغی و بیمه از مبلغ کل بیشتر می باشد.'));

10
app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReport/ConstructionActivityController.php
View File

@@ -12,6 +12,7 @@ use App\Services\Cartables\SafetyAndPrivacy\OperatorService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use PhpOffice\PhpSpreadsheet\Exception;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class ConstructionActivityController extends Controller
@@ -38,6 +39,11 @@ class ConstructionActivityController extends Controller
'edarateShahri' => EdarateShahri::where('province_id', $request->province_id)->get(['id', 'name_fa']),
]);
}
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function countryExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
{
$data = $operatorService->countryActivity(89);
@@ -46,6 +52,10 @@ class ConstructionActivityController extends Controller
return Excel::download(new ExcelReport($data), $name);
}
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function provinceExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
{
$data = $operatorService->provinceActivity(