payment/backend
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from witelgroup/feature/AddItemForRahdar

Browse Source 
Feature/add item for rahdar
This commit is contained in:
Amir Ghasempoor
2025-09-06 09:53:44 +03:30
committed by GitHub
parent 816f515940 7191396357
commit 8a068af0ce
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php
View File

@@ -52,11 +52,8 @@ class StoreRequest extends FormRequest
return [
function (Validator $validator) {
$mission = Mission::find($this->mission_id);
if (!$mission) {
$validator->errors()->add('mission_id', 'مأموریت یافت نشد.');
return;
}
$mission = Mission::query()->find($this->mission_id);
$startTime = Carbon::parse($mission->start_time);
$finishTime = Carbon::parse($mission->finish_time);
$activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}");
@@ -67,5 +64,4 @@ class StoreRequest extends FormRequest
}
];
}
}

8
app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php
View File

@@ -6,7 +6,6 @@ use App\Models\Mission;
use Carbon\Carbon;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use Illuminate\Validation\Validator;
class UpdateRequest extends FormRequest
@@ -57,11 +56,8 @@ class UpdateRequest extends FormRequest
return [
function (Validator $validator) {
$mission = Mission::find($this->mission_id);
if (!$mission) {
$validator->errors()->add('mission_id', 'مأموریت یافت نشد.');
return;
}
$mission = Mission::query()->find($this->mission_id);
$startTime = Carbon::parse($mission->start_time);
$finishTime = Carbon::parse($mission->finish_time);
$activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}");

4
app/Services/Cartables/RoadPatrol/OperatorService.php
View File

@@ -12,8 +12,8 @@ class OperatorService
public function dataTable(Request $request, $loadRelations = false)
{
$query = RoadPatrol::query()
->where('operator_id', '=', auth()->user()->id);
// ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
->where('operator_id', '=', auth()->user()->id)
->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
return DataTableFacade::run(
$query,

2
database/migrations/2025_09_03_095512_add_phone_to_rahdaran_table.php
View File

@@ -12,7 +12,7 @@ return new class extends Migration
public function up(): void
{
Schema::table('rahdaran', function (Blueprint $table) {
$table->char('mobile', 11)->nullable();
$table->string('mobile', 11)->nullable();
});
}