create receipt report logic
This commit is contained in:
@@ -3,66 +3,57 @@
|
||||
namespace App\Http\Controllers\V3\Dashboard;
|
||||
|
||||
use App\Enums\AccidentStates;
|
||||
use App\Exports\V3\AccidentReceipt\DataTableReport;
|
||||
use App\Facades\DataTable\DataTableFacade;
|
||||
use App\Facades\File\FileFacade;
|
||||
use App\Facades\Sms\Sms;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\V3\AccidentReceipt\ConfirmPaymentInfoRequest;
|
||||
use App\Http\Requests\V3\AccidentReceipt\StoreRequest;
|
||||
use App\Http\Requests\V3\AccidentReceipt\UpdateRequest;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
use App\Models\Accident;
|
||||
use App\Models\City;
|
||||
use App\Models\DailyAccidentSettings;
|
||||
use App\Models\Damage;
|
||||
use App\Models\Province;
|
||||
use App\Services\Cartables\AccidentReceiptTableService;
|
||||
use App\Services\NominatimService;
|
||||
use App\Services\PaymentService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||
|
||||
class AccidentReceiptController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public function index(Request $request): JsonResponse
|
||||
public function index(Request $request, AccidentReceiptTableService $accidentReceiptTableService): JsonResponse
|
||||
{
|
||||
$allowedFilters = ['*'];
|
||||
$allowedSortings = ['*'];
|
||||
$data = $accidentReceiptTableService->dataTable($request);
|
||||
|
||||
$user = auth()->user();
|
||||
$query = null;
|
||||
|
||||
if ($user->hasPermissionTo('show-receipt')) {
|
||||
$query = Accident::query();
|
||||
}
|
||||
else {
|
||||
if (is_null($user->province_id)) {
|
||||
return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
|
||||
}
|
||||
|
||||
$query = Accident::query()->where('province_id', '=', $user->province_id);
|
||||
}
|
||||
|
||||
$data = DataTableFacade::run(
|
||||
$query,
|
||||
$request,
|
||||
allowedFilters: $allowedFilters,
|
||||
allowedSortings: $allowedSortings
|
||||
);
|
||||
|
||||
|
||||
$user->addActivityComplete(1122);
|
||||
auth()->user()->addActivityComplete(1122);
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
public function excelReport(Request $request, AccidentReceiptTableService $accidentReceiptTableService): BinaryFileResponse
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
public function accidentDamage(Accident $accident): JsonResponse
|
||||
{
|
||||
return $this->successResponse($accident->damages()->get(['unit', 'amount', 'value']));
|
||||
}
|
||||
|
||||
public function store(Request $request, NominatimService $nominatimService): JsonResponse
|
||||
public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
|
||||
{
|
||||
DB::transaction(function () use ($request, $nominatimService) {
|
||||
|
||||
@@ -150,7 +141,7 @@ class AccidentReceiptController extends Controller
|
||||
return $this->successResponse($accident->load('damages'));
|
||||
}
|
||||
|
||||
public function update(Accident $accident, Request $request, NominatimService $nominatimService): JsonResponse
|
||||
public function update(Accident $accident, UpdateRequest $request, NominatimService $nominatimService): JsonResponse
|
||||
{
|
||||
DB::transaction(function () use ($request, $accident, $nominatimService) {
|
||||
|
||||
@@ -213,7 +204,6 @@ class AccidentReceiptController extends Controller
|
||||
$sum += $item->amount;
|
||||
}
|
||||
|
||||
|
||||
$ojrate_nasb = $sum/100*20;
|
||||
$sum += $ojrate_nasb;
|
||||
|
||||
@@ -267,10 +257,10 @@ class AccidentReceiptController extends Controller
|
||||
DB::transaction(function () use ($request, $accident) {
|
||||
if ($request->has('deposit_insurance_status')) {
|
||||
if ($request->has('deposit_insurance_image')) {
|
||||
$accident->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_image = $request->file('deposit_insurance_image')->storeAs('receipts_files/'.$accident->id, 'deposit_insurance_image_'.$accident->id.'_'.time().'.'.$request->file('deposit_insurance_image')->extension(), 'public');
|
||||
}
|
||||
|
||||
$accident->deposit_insurance_amount = $request->deposit_insurance_amount;
|
||||
$deposit_insurance_amount = $request->deposit_insurance_amount;
|
||||
} else {
|
||||
$accident->deposit_insurance_image = null;
|
||||
$accident->deposit_insurance_amount = null;
|
||||
@@ -278,16 +268,20 @@ class AccidentReceiptController extends Controller
|
||||
|
||||
if ($request->has('deposit_daghi_status')) {
|
||||
if ($request->has('deposit_daghi_image')) {
|
||||
$accident->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_image = $request->file('deposit_daghi_image')->storeAs('receipts_files/'.$accident->id, 'deposit_daghi_image_'.$accident->id.'_'.time().'.'.$request->file('deposit_daghi_image')->extension(), 'public');
|
||||
}
|
||||
|
||||
$accident->deposit_daghi_amount = $request->deposit_daghi_amount;
|
||||
$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,
|
||||
'status' => AccidentStates::SABT_FISH->value,
|
||||
'status_fa' => AccidentStates::name(AccidentStates::SABT_FISH->value),
|
||||
]);
|
||||
@@ -308,11 +302,11 @@ class AccidentReceiptController extends Controller
|
||||
return $this->errorResponse('error');
|
||||
}
|
||||
|
||||
$accident->final_amount = $final_amount;
|
||||
|
||||
$accident->bill_code = $paymentService->invoiceBillApi($accident->driver_national_code, $final_amount);
|
||||
$bill_code = $paymentService->invoiceBillApi($accident->driver_national_code, $final_amount);
|
||||
|
||||
$accident->update([
|
||||
'final_amount' => $final_amount,
|
||||
'bill_code' => $bill_code,
|
||||
'status' => AccidentStates::SODOR_FACTOR->value,
|
||||
'status_fa' => AccidentStates::name(AccidentStates::SODOR_FACTOR->value),
|
||||
]);
|
||||
@@ -367,7 +361,6 @@ class AccidentReceiptController extends Controller
|
||||
auth()->user()->addActivityComplete(1131);
|
||||
});
|
||||
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\V3\Dashboard\Reports;
|
||||
|
||||
use App\Exports\V3\AccidentReceipt\CityReport;
|
||||
use App\Exports\V3\AccidentReceipt\ProvinceReport;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
use App\Services\Cartables\AccidentReceiptTableService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||
|
||||
class AccidentReceiptReportController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public function provinceReport(Request $request, AccidentReceiptTableService $accidentReceiptTableService): JsonResponse
|
||||
{
|
||||
$data = $accidentReceiptTableService->provinceReport($request);
|
||||
return $this->successResponse($data['data']);
|
||||
}
|
||||
|
||||
public function cityReport(Request $request, AccidentReceiptTableService $accidentReceiptTableService): JsonResponse
|
||||
{
|
||||
$data = $accidentReceiptTableService->cityReport($request);
|
||||
return $this->successResponse($data['data']);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ use App\Models\EdarateShahri;
|
||||
use App\Models\InfoItem;
|
||||
use App\Models\Province;
|
||||
use App\Models\RoadItemsProject;
|
||||
use App\Services\Reports\RoadItemReportService;
|
||||
use App\Services\Cartables\RoadItemTableService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
@@ -32,9 +32,9 @@ class RoadItemsReportController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function countryActivityPerSubItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
|
||||
public function countryActivityPerSubItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
|
||||
{
|
||||
$activities = $roadItemReportService->countryActivityPerSubItem($request);
|
||||
$activities = $roadItemTableService->countryActivityPerSubItem($request);
|
||||
$provinces = Province::all(['id', 'name_fa']);
|
||||
$subItems = InfoItem::query()
|
||||
->where('item', $request->item)
|
||||
@@ -47,9 +47,9 @@ class RoadItemsReportController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function provinceActivityPerSubItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
|
||||
public function provinceActivityPerSubItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
|
||||
{
|
||||
$activities = $roadItemReportService->provinceActivityPerSubItem($request);
|
||||
$activities = $roadItemTableService->provinceActivityPerSubItem($request);
|
||||
|
||||
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
|
||||
|
||||
@@ -64,13 +64,13 @@ class RoadItemsReportController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function countryActivityPerItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
|
||||
public function countryActivityPerItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
|
||||
{
|
||||
if (auth()->check()) {
|
||||
auth()->user()->addActivityComplete(1033);
|
||||
}
|
||||
|
||||
$activities = $roadItemReportService->countryActivityPerItem($request);
|
||||
$activities = $roadItemTableService->countryActivityPerItem($request);
|
||||
$provinces = Province::all(['id', 'name_fa']);
|
||||
|
||||
return $this->successResponse([
|
||||
@@ -79,9 +79,9 @@ class RoadItemsReportController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function provinceActivityPerItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
|
||||
public function provinceActivityPerItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
|
||||
{
|
||||
$activities = $roadItemReportService->provinceActivityPerItem($request);
|
||||
$activities = $roadItemTableService->provinceActivityPerItem($request);
|
||||
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
|
||||
|
||||
return $this->successResponse([
|
||||
@@ -90,11 +90,11 @@ class RoadItemsReportController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function countryActivityExcelPerItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
|
||||
public function countryActivityExcelPerItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
|
||||
{
|
||||
auth()->user()->addActivityComplete(1034);
|
||||
$name = 'گزارش کشوری از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
|
||||
$activities = $roadItemReportService->countryActivityPerItem($request);
|
||||
$activities = $roadItemTableService->countryActivityPerItem($request);
|
||||
return Excel::download(new CountryActivityPerItemReport([
|
||||
'activities' => $activities,
|
||||
'provinces' => Province::all(['id', 'name_fa']),
|
||||
@@ -102,11 +102,11 @@ class RoadItemsReportController extends Controller
|
||||
]), $name);
|
||||
}
|
||||
|
||||
public function provinceActivityExcelPerItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
|
||||
public function provinceActivityExcelPerItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
|
||||
{
|
||||
auth()->user()->addActivityComplete(1034);
|
||||
$name = 'گزارش استانی از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
|
||||
$activities = $roadItemReportService->provinceActivityPerItem($request);
|
||||
$activities = $roadItemTableService->provinceActivityPerItem($request);
|
||||
return Excel::download(new ProvinceActivityPerItemReport([
|
||||
'activities' => $activities,
|
||||
'edarateShahri' => EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']),
|
||||
@@ -114,11 +114,11 @@ class RoadItemsReportController extends Controller
|
||||
]), $name);
|
||||
}
|
||||
|
||||
public function countryActivityExcelPerSubItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
|
||||
public function countryActivityExcelPerSubItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
|
||||
{
|
||||
auth()->user()->addActivityComplete(1034);
|
||||
$name = "گزارش کشوری از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
|
||||
$activities = $roadItemReportService->countryActivityPerSubItem($request);
|
||||
$activities = $roadItemTableService->countryActivityPerSubItem($request);
|
||||
$subItems = InfoItem::query()
|
||||
->where('item', $request->item)
|
||||
->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
|
||||
@@ -130,10 +130,10 @@ class RoadItemsReportController extends Controller
|
||||
]), $name);
|
||||
}
|
||||
|
||||
public function provinceActivityExcelPerSubItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
|
||||
public function provinceActivityExcelPerSubItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
|
||||
{
|
||||
auth()->user()->addActivityComplete(1034);
|
||||
$activities = $roadItemReportService->provinceActivityPerSubItem($request);
|
||||
$activities = $roadItemTableService->provinceActivityPerSubItem($request);
|
||||
$name = "گزارش استانی از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
|
||||
$subItems = InfoItem::query()
|
||||
->where('item', $request->item)
|
||||
|
||||
@@ -10,7 +10,7 @@ use App\Models\EdarateShahri;
|
||||
use App\Models\Province;
|
||||
use App\Models\RoadObserved;
|
||||
use App\Models\RoadPatrol;
|
||||
use App\Services\Reports\RoadPatrolReportService;
|
||||
use App\Services\Cartables\RoadPatrolTableService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
@@ -19,9 +19,9 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||
class RoadPatrolReportController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
public function countryPatrolActivity(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
|
||||
public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
|
||||
{
|
||||
$activities = $roadPatrolReportService->countryActivity($request);
|
||||
$activities = $roadPatrolTableService->countryActivity($request);
|
||||
|
||||
$provinces = Province::all(['id', 'name_fa']);
|
||||
|
||||
@@ -31,11 +31,11 @@ class RoadPatrolReportController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function provincePatrolActivity(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
|
||||
public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
|
||||
{
|
||||
$request->validate(["province_id" => "required",]);
|
||||
|
||||
$activities = $roadPatrolReportService->provinceActivity($request);
|
||||
$activities = $roadPatrolTableService->provinceActivity($request);
|
||||
|
||||
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
|
||||
|
||||
@@ -45,9 +45,9 @@ class RoadPatrolReportController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function countryActivityExcel(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
|
||||
public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
|
||||
{
|
||||
$activities = $roadPatrolReportService->countryActivity($request);
|
||||
$activities = $roadPatrolTableService->countryActivity($request);
|
||||
$provinces = Province::all(['id', 'name_fa']);
|
||||
|
||||
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
|
||||
@@ -58,9 +58,9 @@ class RoadPatrolReportController extends Controller
|
||||
]), $name);
|
||||
}
|
||||
|
||||
public function provinceActivityExcel(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
|
||||
public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
|
||||
{
|
||||
$activities = $roadPatrolReportService->provinceActivity($request);
|
||||
$activities = $roadPatrolTableService->provinceActivity($request);
|
||||
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
|
||||
|
||||
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
|
||||
|
||||
@@ -13,7 +13,7 @@ use App\Models\EdarateShahri;
|
||||
use App\Models\InfoItem;
|
||||
use App\Models\RoadItemsProject;
|
||||
use App\Services\NominatimService;
|
||||
use App\Services\Reports\RoadItemReportService;
|
||||
use App\Services\Cartables\RoadItemTableService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
@@ -28,9 +28,9 @@ class RoadItemsProjectController extends Controller
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*/
|
||||
public function supervisorIndex(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
|
||||
public function supervisorIndex(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
|
||||
{
|
||||
$data = $roadItemReportService->supervisorCartableReport($request);
|
||||
$data = $roadItemTableService->supervisorCartableReport($request);
|
||||
|
||||
foreach ($data['data'] as $road_item) {
|
||||
if (Gate::allows('gate-supervise-road-item', $road_item)) {
|
||||
@@ -96,16 +96,16 @@ class RoadItemsProjectController extends Controller
|
||||
}
|
||||
|
||||
|
||||
public function supervisorCartableReport(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
|
||||
public function supervisorCartableReport(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
|
||||
{
|
||||
$name = 'گزارش از کارتابل ارزیابی فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
|
||||
$data = $roadItemReportService->supervisorCartableReport($request, true);
|
||||
$data = $roadItemTableService->supervisorCartableReport($request, true);
|
||||
return Excel::download(new SupervisorCartableReport($data['data']), $name);
|
||||
}
|
||||
|
||||
public function operatorIndex(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
|
||||
public function operatorIndex(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
|
||||
{
|
||||
$data = $roadItemReportService->operatorCartableReport($request);
|
||||
$data = $roadItemTableService->operatorCartableReport($request);
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
@@ -264,10 +264,10 @@ class RoadItemsProjectController extends Controller
|
||||
return $this->successResponse();
|
||||
}
|
||||
|
||||
public function operatorCartableReport(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
|
||||
public function operatorCartableReport(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
|
||||
{
|
||||
$name = 'گزارش از کارتابل عملیات فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
|
||||
$data = $roadItemReportService->operatorCartableReport($request, true);
|
||||
$data = $roadItemTableService->operatorCartableReport($request, true);
|
||||
return Excel::download(new OperatorCartableReport($data['data']), $name);
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ use App\Models\RoadItemsProject;
|
||||
use App\Models\RoadObserved;
|
||||
use App\Models\RoadPatrol;
|
||||
use App\Services\NominatimService;
|
||||
use App\Services\Reports\RoadPatrolReportService;
|
||||
use App\Services\Cartables\RoadPatrolTableService;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -30,9 +30,9 @@ class RoadPatrolProjectController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public function supervisorIndex(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
|
||||
public function supervisorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
|
||||
{
|
||||
$data = $roadPatrolReportService->supervisorCartableReport($request);
|
||||
$data = $roadPatrolTableService->supervisorCartableReport($request);
|
||||
|
||||
foreach ($data['data'] as $road_patrol) {
|
||||
if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
|
||||
@@ -80,16 +80,16 @@ class RoadPatrolProjectController extends Controller
|
||||
return $this->successResponse();
|
||||
}
|
||||
|
||||
public function supervisorCartableReport(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
|
||||
public function supervisorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
|
||||
{
|
||||
$name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
|
||||
$data = $roadPatrolReportService->supervisorCartableReport($request, true);
|
||||
$data = $roadPatrolTableService->supervisorCartableReport($request, true);
|
||||
return Excel::download(new SupervisorCartableReport($data['data']), $name);
|
||||
}
|
||||
|
||||
public function operatorIndex(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
|
||||
public function operatorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
|
||||
{
|
||||
$data = $roadPatrolReportService->operatorCartableReport($request);
|
||||
$data = $roadPatrolTableService->operatorCartableReport($request);
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
@@ -322,10 +322,10 @@ class RoadPatrolProjectController extends Controller
|
||||
return $this->successResponse($roadPatrol);
|
||||
}
|
||||
|
||||
public function operatorCartableReport(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
|
||||
public function operatorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
|
||||
{
|
||||
$name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
|
||||
$data = $roadPatrolReportService->operatorCartableReport($request, true);
|
||||
$data = $roadPatrolTableService->operatorCartableReport($request, true);
|
||||
return Excel::download(new OperatorCartableReport($data['data']), $name);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user