fix code and use pint for mission in some folder
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Services\Cartables\Mission;
|
||||
|
||||
|
||||
use App\Enums\MissionStates;
|
||||
use App\Facades\DataTable\DataTableFacade;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
@@ -19,16 +18,14 @@ class ControlUnitService
|
||||
$user = Auth::user();
|
||||
|
||||
$query = Mission::query()->whereIn('state_id', [
|
||||
MissionStates::PENDING_CONFIRMATION->value, MissionStates::START_MISSION->value
|
||||
]);
|
||||
MissionStates::PENDING_CONFIRMATION->value, MissionStates::START_MISSION->value,
|
||||
]);
|
||||
|
||||
if ($user->hasPermissionTo('manage-control-unit-station')) {
|
||||
$query->where('station_id', '=', $user->station_id);
|
||||
}
|
||||
elseif ($user->hasPermissionTo('manage-control-unit-city')) {
|
||||
} elseif ($user->hasPermissionTo('manage-control-unit-city')) {
|
||||
$query->where('city_id', '=', $user->city_id);
|
||||
}
|
||||
elseif ($user->hasPermissionTo('manage-control-unit-province')) {
|
||||
} elseif ($user->hasPermissionTo('manage-control-unit-province')) {
|
||||
$query->where('province_id', '=', $user->province_id);
|
||||
}
|
||||
|
||||
@@ -41,8 +38,8 @@ class ControlUnitService
|
||||
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
|
||||
'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
|
||||
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time',
|
||||
'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name'
|
||||
'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name',
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user