Merge branch 'feature/TransportationUnit' into 'develop'

# Conflicts:
#   app/Enums/MissionStates.php
#   app/Services/Cartables/Mission/TransportationUnitService.php
#   database/migrations/2025_05_17_103927_create_missions_table.php
This commit is contained in:
2025-05-19 11:50:37 +00:00
4 changed files with 44 additions and 10 deletions

View File

@@ -3,24 +3,24 @@
namespace App\Services\Cartables\Mission;
use App\Enums\MissionStates;
use App\Exceptions\ProhibitedAction;
use App\Facades\DataTable\DataTableFacade;
use App\Models\Mission;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class TransportationUnitService
{
public function dataTable(Request $request)
{
$user = auth()->user();
$fields = [
'id', '', '', '', ''
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
'description', 'requested_machine_type', 'requested_machine_numbers', 'type',
'start_date', 'end_date', 'request_date', 'start_point', 'end_point',
];
// throw_if(is_null($user->edarate_shahri_id), new ProhibitedAction('اداره ای برای شما در سامانه ثبت نشده است!'));
$query = Mission::query()->where('state_id', '=', MissionStates::REQUEST_CREATED->value);
$query = Mission::query()
->where('state_id', '=', MissionStates::REQUEST_CREATED->value)
->where('edare_shahri_name', '=', Auth::user()->edarate_shahri_id);
return DataTableFacade::run(
$query,