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

Merge pull request #91 from witelgroup/feature/NewFixHarimsController

Browse Source 
fix last code for better answer
This commit is contained in:
Amir Ghasempoor
2025-11-09 16:27:39 +03:30
committed by GitHub
parent ad5457dd88 bbbe0daf94
commit c82d5ad8b9
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Enums/HarimStates.php
View File

@@ -11,7 +11,7 @@ enum HarimStates: int
case BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM = 5;
case BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN = 6;
case BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL = 7;
case ARSE_VA_AYAN_NAHAI =8;
case DARYAFTE_ARSE_VA_AYAN_NAHAI =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;
@@ -32,7 +32,7 @@ enum HarimStates: int
self::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM => "بررسی راه دسترسی آپلود شده توسط اداره حریم",
self::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN => "بررسی راه دسترسی آپلود شده توسط معاون",
self::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL => "بررسی راه دسترسی آپلود شده توسط مدیر",
self::ARSE_VA_AYAN_NAHAI => "ارسال ضمانت نامه توسط کاربر",
self::DARYAFTE_ARSE_VA_AYAN_NAHAI => "دریافت عرصه و عیان نهایی",
self::ERSAL_BE_PANJAREH_VAHED_NIAZ_BE_RAH_DASTRASI => "ارسال به پنجره واحد (نیاز به راه دسترسی)",
self::EMKAN_PAZIR_NEMEBASHAD => "امکان پذیر نمی باشد",
self::ERSAL_BE_PANJAREH_VAHED_BEDONEH_NIAZ_BE_RAH_DASTRASI => "ارسال به پنجره واحد (بدون نیاز به راه دسترسی)",

13
app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php
View File

@@ -7,6 +7,7 @@ use App\Enums\HarimStates;
use App\Events\V3\Dashboard\Harim\ConfirmGuaranteeLetterNeedEvent;
use App\Events\V3\Dashboard\Harim\ConfirmNoRoadAccessNeedEvent;
use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessEditNeedEvent;
use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessNeedEvent;
use App\Events\V3\Dashboard\Harim\RejectRequestEvent;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
@@ -54,6 +55,7 @@ class GeneralManagerController extends Controller
'state_name' => HarimStates::EMKAN_PAZIR_NEMEBASHAD->label(),
]
);
RejectRequestEvent::dispatch($harim);
return $this->successResponse();
@@ -98,6 +100,8 @@ class GeneralManagerController extends Controller
]
);
ConfirmRoadAccessNeedEvent::dispatch($harim);
return $this->successResponse();
}
@@ -111,6 +115,7 @@ class GeneralManagerController extends Controller
'state_name' => HarimStates::ERSAL_BE_PANJAREH_VAHED_BEDONEH_NIAZ_BE_RAH_DASTRASI->label(),
]
);
ConfirmNoRoadAccessNeedEvent::dispatch($harim);
return $this->successResponse();
@@ -126,6 +131,7 @@ class GeneralManagerController extends Controller
'state_name' => HarimStates::UPDATE_RAHE_DASTRASI_BARGOZARE_SHODE->label(),
]
);
ConfirmRoadAccessEditNeedEvent::dispatch($harim);
return $this->successResponse();
@@ -137,10 +143,11 @@ class GeneralManagerController extends Controller
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::ARSE_VA_AYAN_NAHAI->value,
'state_name' => HarimStates::ARSE_VA_AYAN_NAHAI->label(),
'state_id' => HarimStates::DARYAFTE_ARSE_VA_AYAN_NAHAI->value,
'state_name' => HarimStates::DARYAFTE_ARSE_VA_AYAN_NAHAI->label(),
]
);
ConfirmGuaranteeLetterNeedEvent::dispatch($harim);
return $this->successResponse();
@@ -161,7 +168,6 @@ class GeneralManagerController extends Controller
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->label(),
]
);
ConfirmGuaranteeLetterNeedEvent::dispatch($harim);
return $this->successResponse();
}
@@ -176,7 +182,6 @@ class GeneralManagerController extends Controller
'state_name' => HarimStates::ETMAM_FARAYAND->label(),
]
);
ConfirmGuaranteeLetterNeedEvent::dispatch($harim);
return $this->successResponse();
}

13
app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php
View File

@@ -26,12 +26,10 @@ class PanjareVahedController extends Controller
$city = City::findCityWithLatLng(lat:$matches[2], lng: $matches[1]);
$state = HarimStates::BARESI_EDARE_SHAHRESTAN->value;
$harim = Harim::query()->firstOrCreate(['panjare_vahed_id' => $request->request_id],
[
'state_id' => $state,
'state_name' => HarimStates::name($state),
'state_id' => HarimStates::BARESI_EDARE_SHAHRESTAN->value,
'state_name' => HarimStates::BARESI_EDARE_SHAHRESTAN->label(),
'panjare_vahed_id' => $request->request_id,
'national_id' => $request->national_id,
'phone_number' => $request->phone_number,
@@ -91,8 +89,6 @@ class PanjareVahedController extends Controller
public function getRejectRequest(GetRejectRequest $request): JsonResponse
{
$state = HarimStates::MOKHALEFAT_BA_DASTGAH->value;
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
$harim->panjarehVahedHistories()->create([
@@ -101,8 +97,8 @@ class PanjareVahedController extends Controller
]);
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'state_id' => HarimStates::MOKHALEFAT_BA_DASTGAH->value,
'state_name' => HarimStates::MOKHALEFAT_BA_DASTGAH->label(),
'data' => $request->data,
]);
@@ -115,7 +111,6 @@ class PanjareVahedController extends Controller
public function getFinalPolygons(GetFinalPolygonsRequest $request): JsonResponse
{
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
$harim->panjarehVahedHistories()->create([

14
app/Models/Harim.php
View File

@@ -34,16 +34,18 @@ class Harim extends Model
{
DB::transaction(function () use ($action, $description, $data) {
$this->histories()->create([
'expert_id' => auth()->user()->id,
'previous_state_id' => $this->state_id,
'previous_state_name'=> $this->state_name,
'expert_id' => auth()->user()->id,
'previous_state_id' => $this->state_id,
'previous_state_name' => $this->state_name,
'expert_description' => $description,
'action_id' => $action,
'action_name' => HarimAction::name($action),
'action_id' => $action,
'action_name' => HarimAction::name($action),
]);
$this->update($data);
});
}
public function panjarehVahedHistories(): HasMany
{
return $this->hasMany(PanjarehVahedHistory::class);
@@ -54,7 +56,7 @@ class Harim extends Model
return Attribute::make(
set: function ($value) {
$iv = config('harim_web_services.Harim_Info.iv');
$keyString = config('harim_web_services.Harim_Info.keyString');
$keyString = config('harim_web_services.Harim_Info.key');
$key = hash('sha256',$keyString, true);
$decrypted = openssl_decrypt($value,'aes-256-cbc',$key,false, $iv);
return json_decode($decrypted);