diff --git a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php new file mode 100644 index 00000000..d19bac12 --- /dev/null +++ b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php @@ -0,0 +1,23 @@ +create([ + + ]); + + return $this->successResponse(); + } +} diff --git a/app/Http/Requests/V3/AccidentReceipt/ConfirmPaymentInfoRequest.php b/app/Http/Requests/V3/AccidentReceipt/ConfirmPaymentInfoRequest.php index 0bbed211..fc24bf06 100644 --- a/app/Http/Requests/V3/AccidentReceipt/ConfirmPaymentInfoRequest.php +++ b/app/Http/Requests/V3/AccidentReceipt/ConfirmPaymentInfoRequest.php @@ -13,7 +13,9 @@ class ConfirmPaymentInfoRequest extends FormRequest */ public function authorize(): bool { - return $this->accident->status === AccidentStates::SODOR_NAME_BIME_VA_DAGHI->value; + return in_array($this->accident->status, + [AccidentStates::SODOR_NAME_BIME_VA_DAGHI->value, AccidentStates::SABT_FISH->value] + ); } /** diff --git a/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php index c840e5d8..fee91a66 100644 --- a/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php +++ b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php @@ -49,11 +49,11 @@ class OperatorService ) s ), provinces AS ( - SELECT DISTINCT province_fa FROM safety_and_privacy WHERE info_id = ? + SELECT DISTINCT province_id FROM safety_and_privacy WHERE info_id = ? ), data AS ( SELECT - p.province_fa, + p.province_id, c.axis_type_id, c.step, COUNT(sp.id) AS total @@ -62,18 +62,18 @@ class OperatorService LEFT JOIN safety_and_privacy sp ON sp.axis_type_id = c.axis_type_id AND sp.step = c.step - AND sp.province_fa = p.province_fa + AND sp.province_id = p.province_id AND sp.info_id = ? - GROUP BY p.province_fa, c.axis_type_id, c.step + GROUP BY p.province_id, c.axis_type_id, c.step ) SELECT - province_fa, + province_id, axis_type_id, step, total, - SUM(total) OVER (PARTITION BY province_fa) AS total_sum + SUM(total) OVER (PARTITION BY province_id) AS total_sum FROM data - ORDER BY province_fa, axis_type_id, step + ORDER BY province_id, axis_type_id, step ", [$info_id, $info_id]); } @@ -90,7 +90,7 @@ class OperatorService ) s ), edarat AS ( - SELECT id AS edare_id, name_fa + SELECT id AS edare_id FROM edarate_shahri WHERE province_id = :provinceId ), @@ -111,7 +111,6 @@ class OperatorService ) SELECT e.edare_id, - e.name_fa AS edare_name, d.axis_type_id, d.step, d.total, @@ -124,5 +123,4 @@ class OperatorService 'infoId' => $info_id, ]); } - } \ No newline at end of file diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php index 5a0bdb29..13531056 100755 --- a/bootstrap/cache/services.php +++ b/bootstrap/cache/services.php @@ -44,11 +44,12 @@ 40 => 'App\\Providers\\AppServiceProvider', 41 => 'App\\Providers\\AuthServiceProvider', 42 => 'App\\Providers\\EventServiceProvider', - 43 => 'App\\Providers\\RouteServiceProvider', - 44 => 'App\\Providers\\TelescopeServiceProvider', - 45 => 'Barryvdh\\Debugbar\\ServiceProvider', - 46 => 'App\\Providers\\DataTableServiceProvider', - 47 => 'App\\Providers\\FileServiceProvider', + 43 => 'App\\Providers\\HorizonServiceProvider', + 44 => 'App\\Providers\\RouteServiceProvider', + 45 => 'App\\Providers\\TelescopeServiceProvider', + 46 => 'Barryvdh\\Debugbar\\ServiceProvider', + 47 => 'App\\Providers\\DataTableServiceProvider', + 48 => 'App\\Providers\\FileServiceProvider', ), 'eager' => array ( @@ -81,11 +82,12 @@ 26 => 'App\\Providers\\AppServiceProvider', 27 => 'App\\Providers\\AuthServiceProvider', 28 => 'App\\Providers\\EventServiceProvider', - 29 => 'App\\Providers\\RouteServiceProvider', - 30 => 'App\\Providers\\TelescopeServiceProvider', - 31 => 'Barryvdh\\Debugbar\\ServiceProvider', - 32 => 'App\\Providers\\DataTableServiceProvider', - 33 => 'App\\Providers\\FileServiceProvider', + 29 => 'App\\Providers\\HorizonServiceProvider', + 30 => 'App\\Providers\\RouteServiceProvider', + 31 => 'App\\Providers\\TelescopeServiceProvider', + 32 => 'Barryvdh\\Debugbar\\ServiceProvider', + 33 => 'App\\Providers\\DataTableServiceProvider', + 34 => 'App\\Providers\\FileServiceProvider', ), 'deferred' => array ( diff --git a/routes/v3.php b/routes/v3.php index e8ec2b33..50eb8330 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -558,32 +558,31 @@ Route::prefix('harim') Route::post('/confirm_guarantee_letter_need/{harim}', 'confirmGuaranteeLetterNeed')->name('confirmGuaranteeLetterNeed'); Route::get('/{harim}', 'show')->name('show'); }); - Route::prefix('user_management') - ->name('user_management.') - ->controller(UserManagementController::class) - ->group(function () { -// Route::get('/', 'index')->name('index'); - Route::get('/index_user', 'indexUser')->name('indexUser'); - Route::get('/activity_report', 'activityReport')->name('activityReport'); - Route::get('/userActivityLogs', 'userActivityLogs')->name('userActivityLogs'); - Route::post('/change_confirmed_status', 'changeConfirmedStatus')->name('changeConfirmedStatus'); - Route::get('/give_permissions_to', 'givePermissionsTo')->name('givePermissionsTo'); - Route::get('/get_user_permissions', 'getUserPermissions')->name('getUserPermissions'); - Route::get('/get_user_summary_report', 'getUserSummaryReport')->name('getUserSummaryReport'); - Route::get('/print_group', 'printGroup')->name('printGroup'); - Route::get('/user_permission', 'userPermission')->name('userPermission'); - Route::get('/assign_permission', 'assignPermission')->name('assignPermission'); - Route::get('/show_all_roles', 'showAllRoles')->name('showAllRoles'); - Route::post('/change_user_enabeld','changeUserEnabeld')->name('changeUserEnabeld'); - Route::post('/','store')->name('store'); - Route::post('/create_role','createRole')->name('createRole'); - Route::post('/edit_role','editRole')->name('editRole'); - Route::get('/{user}', 'show')->name('show'); - Route::post('/{user}', 'update')->name('update'); - Route::delete('/{user}', 'destroy')->name('destroy'); - Route::post('/change_password/{user}', 'changePassword')->name('changePassword'); - Route::post('delete-role/{id}', 'deleteRole')->name('deleteRole'); - - }); }); +Route::prefix('user_management') + ->name('user_management.') + ->controller(UserManagementController::class) + ->group(function () { +// Route::get('/', 'index')->name('index'); + Route::get('/index_user', 'indexUser')->name('indexUser'); + Route::get('/activity_report', 'activityReport')->name('activityReport'); + Route::get('/userActivityLogs', 'userActivityLogs')->name('userActivityLogs'); + Route::post('/change_confirmed_status', 'changeConfirmedStatus')->name('changeConfirmedStatus'); + Route::get('/give_permissions_to', 'givePermissionsTo')->name('givePermissionsTo'); + Route::get('/get_user_permissions', 'getUserPermissions')->name('getUserPermissions'); + Route::get('/get_user_summary_report', 'getUserSummaryReport')->name('getUserSummaryReport'); + Route::get('/print_group', 'printGroup')->name('printGroup'); + Route::get('/user_permission', 'userPermission')->name('userPermission'); + Route::get('/assign_permission', 'assignPermission')->name('assignPermission'); + Route::get('/show_all_roles', 'showAllRoles')->name('showAllRoles'); + Route::post('/change_user_enabeld','changeUserEnabeld')->name('changeUserEnabeld'); + Route::post('/','store')->name('store'); + Route::post('/create_role','createRole')->name('createRole'); + Route::post('/edit_role','editRole')->name('editRole'); + Route::get('/{user}', 'show')->name('show'); + Route::post('/{user}', 'update')->name('update'); + Route::delete('/{user}', 'destroy')->name('destroy'); + Route::post('/change_password/{user}', 'changePassword')->name('changePassword'); + Route::post('delete-role/{id}', 'deleteRole')->name('deleteRole'); + });