create and change code

This commit is contained in:
2025-09-07 14:25:10 +03:30
parent 4594415cec
commit c64fc22ed3
9 changed files with 138 additions and 70 deletions

View File

@@ -9,6 +9,7 @@ enum HarimAction: int
case NO = 3;
case CONFIRM = 4;
case REFER = 5;
case REJECT = 6;
public static function name(int $state): string
{
@@ -18,6 +19,7 @@ enum HarimAction: int
3 => "خیر",
4 => "تائید کردن",
5 => "ارجاع",
6 => "رد درخواست"
];
return $mapArray[$state];

View File

@@ -11,14 +11,15 @@ enum HarimStates: int
case BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM = 5;
case BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN = 6;
case BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL = 7;
case ERSAL_ZEMANAT_NAME_TAVASOTE_KARBAR =8;
case ERSAL_ZEMANAT_NAME_TAVASOTE_HARIM =8;
case ERSAL_BE_PANJAREH_VAHED_NIAZ_BE_RAH_DASTRASI = 9;
case EMKAN_PAZIR_NEMEBASHAD = 10;
case ERSAL_BE_PANJAREH_VAHED_BEDONEH_NIAZ_BE_RAH_DASTRASI = 11;
case UPDATE_FILE_BARGOZARE_SHODE = 12;
case TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_KARBAR = 13;
case TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM = 13;
case TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_TAVASOTE_MOAVEN = 14;
case TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL = 15;
case MOKHALEFAT_BA_DASTGAH = 16;
public static function name(int $state): string
{
@@ -31,14 +32,14 @@ enum HarimStates: int
6 => "بررسی فایل آپلود شده توسط معاون",
7 => "بررسی فایل آپلود شده توسط مدیر",
8 => "ارسال ضمانت نامه توسط کاربر",
9 => "ارسال به پنجره واحد ( نیاز به راه دسترسی)",
9 => "ارسال به پنجره واحد (نیاز به راه دسترسی)",
10 => "امکان پذیر نمی باشد",
11 => "ارسال به پنجره واحد (بدون نیاز به راه دسترسی)",
12 => "بازبینی فایل بارگذاری شده",
13 => "تائید عرصه و اعیان ارسال شده توسط اداره حریم",
14 => "تائید عرصه و اعیان ارسال شده توسط معاون",
15 => "تائید عرصه و اعیان ارسال شده توسط مدیر",
16 => " مخالفت با درخواست"
];
return $mapArray[$state];

View File

@@ -5,12 +5,12 @@ namespace App\Http\Controllers\V3\Dashboard\Harim;
use App\Enums\HarimStates;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Dashboard\Harim\PanjareVahed\GetAccessRoadRequest;
use App\Http\Requests\V3\Dashboard\Harim\PanjareVahed\GetRejectRequest;
use App\Http\Requests\V3\Dashboard\Harim\PanjareVahed\ReceiveNewRequest;
use App\Http\Traits\ApiResponse;
use App\Models\City;
use App\Models\Harim;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
class PanjareVahedController extends Controller
{
@@ -79,4 +79,18 @@ class PanjareVahedController extends Controller
return $this->successResponse();
}
public function getRejectRequest(GetRejectRequest $request)
{
$state = HarimStates::MOKHALEFAT_BA_DASTGAH->value;
Harim::query()
->firstWhere('panjare_vahed_id', '=', $request->panjare_vahed_id)
->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
]);
return $this->successResponse();
}
}

View File

@@ -26,50 +26,17 @@ class RoadMaintenanceStationController extends Controller
$user = auth()->user();
$user->addActivityComplete(1019);
$province = $request->province;
$status = $request->status;
$type = $request->type;
$query = RahdariPoint::query()
->when($status, fn ($query, $status) => $query->where('status', $status))
->when($type, fn ($query, $type) => $query->where('type', $type))
->when($province, fn($query, $province) => $query->where('province_id', $province));
->when($user->hasPermissionTo('show-tollhouse-province') && !$user->hasPermissionTo('show-tollhouse'),
fn ($query) => $query->where('province_id', $user->province_id)
);
if ($user->hasPermissionTo('show-tollhouse-province') && !$user->hasPermissionTo('show-tollhouse')) {
$query->where('province_id', $user->province_id);
}
$data = DataTableFacade::run(
return response()->json(DataTableFacade::run(
$query,
$request,
allowedFilters: ['*'],
allowedSortings: ['*']
);
foreach ($data['data'] as &$stations) {
if ($user->hasPermissionTo('edit-tollhouse')) {
$stations['canEdit'] = 1;
}
elseif ($user->hasPermissionTo('edit-tollhouse-province') && $stations->province_id == $user->province_id) {
$stations['canEdit'] = 1;
}
else {
$stations['canEdit'] = 0;
}
if ($user->hasPermissionTo('delete-tollhouse')) {
$stations['canDelete'] = 1;
}
elseif ($user->hasPermissionTo('delete-tollhouse-province') && $stations->province_id == $user->province_id) {
$stations['canDelete'] = 1;
}
else {
$stations['canDelete'] = 0;
}
}
return response()->json($data);
));
}
/**

View File

@@ -0,0 +1,29 @@
<?php
namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class GetRejectRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return false;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, ValidationRule|array|string>
*/
public function rules(): array
{
return [
'panjare_vahed_id' => 'required|string',
];
}
}