use pint and fix code
This commit is contained in:
@@ -7,7 +7,6 @@ use App\Enums\HarimStates;
|
|||||||
use App\Events\V3\Dashboard\Harim\ConfirmGuaranteeLetterNeedEvent;
|
use App\Events\V3\Dashboard\Harim\ConfirmGuaranteeLetterNeedEvent;
|
||||||
use App\Events\V3\Dashboard\Harim\ConfirmNoRoadAccessNeedEvent;
|
use App\Events\V3\Dashboard\Harim\ConfirmNoRoadAccessNeedEvent;
|
||||||
use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessEditNeedEvent;
|
use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessEditNeedEvent;
|
||||||
use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessNeedEvent;
|
|
||||||
use App\Events\V3\Dashboard\Harim\RejectRequestEvent;
|
use App\Events\V3\Dashboard\Harim\RejectRequestEvent;
|
||||||
use App\Facades\DataTable\DataTableFacade;
|
use App\Facades\DataTable\DataTableFacade;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
@@ -26,7 +25,6 @@ use App\Models\Harim;
|
|||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
|
||||||
class GeneralManagerController extends Controller
|
class GeneralManagerController extends Controller
|
||||||
{
|
{
|
||||||
use ApiResponse;
|
use ApiResponse;
|
||||||
@@ -49,7 +47,7 @@ class GeneralManagerController extends Controller
|
|||||||
public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse
|
public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::EMKAN_PAZIR_NEMEBASHAD->value,
|
'state_id' => HarimStates::EMKAN_PAZIR_NEMEBASHAD->value,
|
||||||
@@ -64,7 +62,7 @@ class GeneralManagerController extends Controller
|
|||||||
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
|
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::REFER->value,
|
action: HarimAction::REFER->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
|
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
|
||||||
@@ -78,7 +76,7 @@ class GeneralManagerController extends Controller
|
|||||||
public function referFile(ReferFileRequest $request, Harim $harim): JsonResponse
|
public function referFile(ReferFileRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::REFER->value,
|
action: HarimAction::REFER->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
|
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
|
||||||
@@ -92,7 +90,7 @@ class GeneralManagerController extends Controller
|
|||||||
public function confirmRoadAccessNeed(ConfirmRoadAccessNeedRequest $request, Harim $harim): JsonResponse
|
public function confirmRoadAccessNeed(ConfirmRoadAccessNeedRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::ERSAL_BE_PANJAREH_VAHED_NIAZ_BE_RAH_DASTRASI->value,
|
'state_id' => HarimStates::ERSAL_BE_PANJAREH_VAHED_NIAZ_BE_RAH_DASTRASI->value,
|
||||||
@@ -106,7 +104,7 @@ class GeneralManagerController extends Controller
|
|||||||
public function confirmNoRoadAccessNeed(ConfirmNoRoadAccessNeedRequest $request, Harim $harim): JsonResponse
|
public function confirmNoRoadAccessNeed(ConfirmNoRoadAccessNeedRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::ERSAL_BE_PANJAREH_VAHED_BEDONEH_NIAZ_BE_RAH_DASTRASI->value,
|
'state_id' => HarimStates::ERSAL_BE_PANJAREH_VAHED_BEDONEH_NIAZ_BE_RAH_DASTRASI->value,
|
||||||
@@ -121,7 +119,7 @@ class GeneralManagerController extends Controller
|
|||||||
public function confirmRoadAccessEditNeed(ConfirmRoadAccessEditNeedRequest $request, Harim $harim): JsonResponse
|
public function confirmRoadAccessEditNeed(ConfirmRoadAccessEditNeedRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::UPDATE_RAHE_DASTRASI_BARGOZARE_SHODE->value,
|
'state_id' => HarimStates::UPDATE_RAHE_DASTRASI_BARGOZARE_SHODE->value,
|
||||||
@@ -136,7 +134,7 @@ class GeneralManagerController extends Controller
|
|||||||
public function confirmGuaranteeLetterNeed(ConfirmGuaranteeLetterNeedRequest $request, Harim $harim): JsonResponse
|
public function confirmGuaranteeLetterNeed(ConfirmGuaranteeLetterNeedRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::ARSE_VA_AYAN_NAHAI->value,
|
'state_id' => HarimStates::ARSE_VA_AYAN_NAHAI->value,
|
||||||
@@ -156,7 +154,7 @@ class GeneralManagerController extends Controller
|
|||||||
public function referPayment(ReferPaymentRequest $request, Harim $harim): JsonResponse
|
public function referPayment(ReferPaymentRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::REFER->value,
|
action: HarimAction::REFER->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value,
|
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value,
|
||||||
@@ -171,7 +169,7 @@ class GeneralManagerController extends Controller
|
|||||||
public function confirmPayment(ConfirmPaymentRequest $request, Harim $harim): JsonResponse
|
public function confirmPayment(ConfirmPaymentRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::ETMAM_FARAYAND->value,
|
'state_id' => HarimStates::ETMAM_FARAYAND->value,
|
||||||
|
|||||||
@@ -19,9 +19,6 @@ use App\Models\Harim;
|
|||||||
use App\Models\Province;
|
use App\Models\Province;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use Throwable;
|
|
||||||
|
|
||||||
|
|
||||||
class HarimOfficeController extends Controller
|
class HarimOfficeController extends Controller
|
||||||
{
|
{
|
||||||
@@ -45,7 +42,7 @@ class HarimOfficeController extends Controller
|
|||||||
public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse
|
public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::NO->value,
|
action: HarimAction::NO->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
|
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
|
||||||
@@ -60,7 +57,7 @@ class HarimOfficeController extends Controller
|
|||||||
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
|
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::REFER->value,
|
action: HarimAction::REFER->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_EDARE_SHAHRESTAN->value,
|
'state_id' => HarimStates::BARESI_EDARE_SHAHRESTAN->value,
|
||||||
@@ -74,7 +71,7 @@ class HarimOfficeController extends Controller
|
|||||||
public function needRoadAccess(NeedRoadAccessRequest $request, Harim $harim): JsonResponse
|
public function needRoadAccess(NeedRoadAccessRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::YES->value,
|
action: HarimAction::YES->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
|
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
|
||||||
@@ -91,7 +88,7 @@ class HarimOfficeController extends Controller
|
|||||||
public function withoutRoadAccess(WithoutRoadAccessRequest $request, Harim $harim): JsonResponse
|
public function withoutRoadAccess(WithoutRoadAccessRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::YES->value,
|
action: HarimAction::YES->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
|
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
|
||||||
@@ -108,7 +105,7 @@ class HarimOfficeController extends Controller
|
|||||||
public function fileAccepted(FileAcceptedRequest $request, Harim $harim): JsonResponse
|
public function fileAccepted(FileAcceptedRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::YES->value,
|
action: HarimAction::YES->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
|
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
|
||||||
@@ -123,7 +120,7 @@ class HarimOfficeController extends Controller
|
|||||||
public function fileRejected(FileRejectedRequest $request, Harim $harim): JsonResponse
|
public function fileRejected(FileRejectedRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::YES->value,
|
action: HarimAction::YES->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
|
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
|
||||||
@@ -135,7 +132,6 @@ class HarimOfficeController extends Controller
|
|||||||
return $this->successResponse();
|
return $this->successResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function show(ShowRequest $request, Harim $harim): JsonResponse
|
public function show(ShowRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
return $this->successResponse($harim->load('histories'));
|
return $this->successResponse($harim->load('histories'));
|
||||||
@@ -155,7 +151,7 @@ class HarimOfficeController extends Controller
|
|||||||
public function computingPayment(ComputingPaymentRequest $request, Harim $harim): JsonResponse
|
public function computingPayment(ComputingPaymentRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value,
|
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value,
|
||||||
|
|||||||
@@ -24,14 +24,13 @@ class PanjareVahedController extends Controller
|
|||||||
$iv = config('harim_web_services.Harim_Info.iv');
|
$iv = config('harim_web_services.Harim_Info.iv');
|
||||||
$keyString = config('harim_web_services.Harim_Info.key');
|
$keyString = config('harim_web_services.Harim_Info.key');
|
||||||
|
|
||||||
$key = hash('sha256',$keyString, true);
|
$key = hash('sha256', $keyString, true);
|
||||||
|
|
||||||
$decrypted = openssl_decrypt($request->data,'aes-256-cbc',$key,false, $iv);
|
$decrypted = openssl_decrypt($request->data, 'aes-256-cbc', $key, false, $iv);
|
||||||
|
|
||||||
$decodedString = json_decode($decrypted);
|
$decodedString = json_decode($decrypted);
|
||||||
$decodedArray = json_decode($decodedString, true);
|
$decodedArray = json_decode($decodedString, true);
|
||||||
|
|
||||||
|
|
||||||
$wkt = 'POLYGON(('.implode(',', array_map(fn ($c) => "{$c[0]} {$c[1]}", $request->primary_area['coordinates'])).'))';
|
$wkt = 'POLYGON(('.implode(',', array_map(fn ($c) => "{$c[0]} {$c[1]}", $request->primary_area['coordinates'])).'))';
|
||||||
$result = DB::selectOne('SELECT ST_AsText(ST_PointOnSurface(ST_GeomFromText(?, 4326))) AS point', [$wkt]);
|
$result = DB::selectOne('SELECT ST_AsText(ST_PointOnSurface(ST_GeomFromText(?, 4326))) AS point', [$wkt]);
|
||||||
preg_match('/POINT\(([^ ]+) ([^ ]+)\)/', $result->point, $matches);
|
preg_match('/POINT\(([^ ]+) ([^ ]+)\)/', $result->point, $matches);
|
||||||
@@ -52,15 +51,13 @@ class PanjareVahedController extends Controller
|
|||||||
->first(['id', 'name_fa', 'province_id']);
|
->first(['id', 'name_fa', 'province_id']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$state = HarimStates::BARESI_EDARE_SHAHRESTAN->value;
|
|
||||||
|
|
||||||
$harim = Harim::query()->firstOrCreate(
|
$harim = Harim::query()->firstOrCreate(
|
||||||
[
|
[
|
||||||
'panjare_vahed_id' => $request->request_id
|
'panjare_vahed_id' => $request->request_id,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'state_id' => $state,
|
'state_id' => HarimStates::BARESI_EDARE_SHAHRESTAN->value,
|
||||||
'state_name' => HarimStates::name($state),
|
'state_name' => HarimStates::BARESI_EDARE_SHAHRESTAN->label(),
|
||||||
'panjare_vahed_id' => $request->request_id,
|
'panjare_vahed_id' => $request->request_id,
|
||||||
'national_id' => $request->national_id,
|
'national_id' => $request->national_id,
|
||||||
'phone_number' => $request->phone_number,
|
'phone_number' => $request->phone_number,
|
||||||
@@ -92,13 +89,11 @@ class PanjareVahedController extends Controller
|
|||||||
|
|
||||||
public function getAccessRoad(GetAccessRoadRequest $request): JsonResponse
|
public function getAccessRoad(GetAccessRoadRequest $request): JsonResponse
|
||||||
{
|
{
|
||||||
$state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value;
|
|
||||||
|
|
||||||
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
|
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
|
||||||
|
|
||||||
$harim->update([
|
$harim->update([
|
||||||
'state_id' => $state,
|
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value,
|
||||||
'state_name' => HarimStates::name($state),
|
'state_name' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->label(),
|
||||||
'access_road' => json_encode($request->access_road),
|
'access_road' => json_encode($request->access_road),
|
||||||
'data' => $request->data['data'],
|
'data' => $request->data['data'],
|
||||||
'token' => $request->data['token'],
|
'token' => $request->data['token'],
|
||||||
@@ -135,13 +130,12 @@ class PanjareVahedController extends Controller
|
|||||||
|
|
||||||
public function getFinalPolygons(GetFinalPolygonsRequest $request): JsonResponse
|
public function getFinalPolygons(GetFinalPolygonsRequest $request): JsonResponse
|
||||||
{
|
{
|
||||||
$state = HarimStates::TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value;
|
|
||||||
|
|
||||||
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
|
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
|
||||||
|
|
||||||
$harim->update([
|
$harim->update([
|
||||||
'state_id' => $state,
|
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value,
|
||||||
'state_name' => HarimStates::name($state),
|
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->label(),
|
||||||
'final_area' => json_encode($request->final_area),
|
'final_area' => json_encode($request->final_area),
|
||||||
'final_plan' => json_encode($request->final_plan),
|
'final_plan' => json_encode($request->final_plan),
|
||||||
'data' => $request->data['data'],
|
'data' => $request->data['data'],
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ use App\Http\Traits\ApiResponse;
|
|||||||
use App\Models\Harim;
|
use App\Models\Harim;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
|
|
||||||
class ProvinceOfficeController extends Controller
|
class ProvinceOfficeController extends Controller
|
||||||
{
|
{
|
||||||
@@ -34,10 +33,11 @@ class ProvinceOfficeController extends Controller
|
|||||||
return response()->json($data);
|
return response()->json($data);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function feedback(FeedBackRequest $request, Harim $harim): JsonResponse
|
public function feedback(FeedBackRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::FEEDBACK->value,
|
action: HarimAction::FEEDBACK->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value,
|
'state_id' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value,
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ use App\Models\Harim;
|
|||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
|
||||||
class TechnicalDeputyController extends Controller
|
class TechnicalDeputyController extends Controller
|
||||||
{
|
{
|
||||||
use ApiResponse;
|
use ApiResponse;
|
||||||
@@ -41,7 +40,7 @@ class TechnicalDeputyController extends Controller
|
|||||||
public function confirmRequest(ConfirmRequest $request, Harim $harim): JsonResponse
|
public function confirmRequest(ConfirmRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_TAVASOT_MODIR_KOL->value,
|
'state_id' => HarimStates::BARESI_TAVASOT_MODIR_KOL->value,
|
||||||
@@ -55,7 +54,7 @@ class TechnicalDeputyController extends Controller
|
|||||||
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
|
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::REFER->value,
|
action: HarimAction::REFER->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value,
|
'state_id' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value,
|
||||||
@@ -69,7 +68,7 @@ class TechnicalDeputyController extends Controller
|
|||||||
public function confirmRoadAccess(ConfirmRoadAccessRequest $request, Harim $harim): JsonResponse
|
public function confirmRoadAccess(ConfirmRoadAccessRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL->value,
|
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL->value,
|
||||||
@@ -83,7 +82,7 @@ class TechnicalDeputyController extends Controller
|
|||||||
public function referRoadAccess(ReferRoadAccessRequest $request, Harim $harim): JsonResponse
|
public function referRoadAccess(ReferRoadAccessRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::REFER->value,
|
action: HarimAction::REFER->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value,
|
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value,
|
||||||
@@ -102,26 +101,28 @@ class TechnicalDeputyController extends Controller
|
|||||||
public function referPayment(ReferPaymentRequest $request, Harim $harim): JsonResponse
|
public function referPayment(ReferPaymentRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::REFER->value,
|
action: HarimAction::REFER->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value,
|
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value,
|
||||||
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->label(),
|
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->label(),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
return $this->successResponse();
|
return $this->successResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function confirmPayment(ConfirmPaymentRequest $request, Harim $harim): JsonResponse
|
public function confirmPayment(ConfirmPaymentRequest $request, Harim $harim): JsonResponse
|
||||||
{
|
{
|
||||||
$harim->updateStateWithHistory(
|
$harim->updateStateWithHistory(
|
||||||
action:HarimAction::CONFIRM->value,
|
action: HarimAction::CONFIRM->value,
|
||||||
description: $request->expert_description,
|
description: $request->expert_description,
|
||||||
data: [
|
data: [
|
||||||
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->value,
|
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->value,
|
||||||
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->label(),
|
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->label(),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
return $this->successResponse();
|
return $this->successResponse();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed;
|
namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed;
|
||||||
|
|
||||||
use App\Models\Harim;
|
|
||||||
use Illuminate\Contracts\Validation\ValidationRule;
|
use Illuminate\Contracts\Validation\ValidationRule;
|
||||||
use Illuminate\Contracts\Validation\Validator;
|
use Illuminate\Contracts\Validation\Validator;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|||||||
Reference in New Issue
Block a user