From 3e2c9015edc86ced0ce48e5a90c76e82e44d80f2 Mon Sep 17 00:00:00 2001 From: tubagus fajri Date: Thu, 20 Apr 2023 08:52:59 +0700 Subject: [PATCH] update validasi --- app/Http/Controllers/Api/OLDLMS/MembershipController.php | 7 +++---- app/Http/Resources/OLDLMS/MemberResource.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Api/OLDLMS/MembershipController.php b/app/Http/Controllers/Api/OLDLMS/MembershipController.php index d0b0ee39..0b574f10 100644 --- a/app/Http/Controllers/Api/OLDLMS/MembershipController.php +++ b/app/Http/Controllers/Api/OLDLMS/MembershipController.php @@ -191,8 +191,7 @@ class MembershipController extends Controller 'corporate_id' => 'required' ]); - $corporate = Corporate::findOrFail($request->corporate_id); - + $corporate = Corporate::findOrFail($request->corporate_id); // Make Validation from Linking Rules $linkingRulesArr = $corporate->linking_rules->toArray(); $validationRules = []; @@ -245,9 +244,9 @@ class MembershipController extends Controller ]) ->first(); - if ($member) { - return Helper::responseJson(data: MemberResource::make($member), message: 'Data Member ditemukan!'); + $message = $member->currentPolicy->corporate->welcome_message; + return Helper::responseJson(data: MemberResource::make($member), message: $message); } return Helper::responseJson(data: [], message: 'Member Tidak ditemukan', statusCode: 404, status: 'error'); diff --git a/app/Http/Resources/OLDLMS/MemberResource.php b/app/Http/Resources/OLDLMS/MemberResource.php index 15b4a649..22c58910 100644 --- a/app/Http/Resources/OLDLMS/MemberResource.php +++ b/app/Http/Resources/OLDLMS/MemberResource.php @@ -35,7 +35,7 @@ class MemberResource extends JsonResource 'corporate' => [ 'code' => $this->currentPolicy?->corporate->code ?? null, 'name' => $this->currentPolicy?->corporate->name, - 'welcome_message' => $this->currentPolicy?->corporate?->welcome_message, + 'welcome_message' => html_entity_decode($this->currentPolicy?->corporate->welcome_message), 'help_text' => $this->currentPolicy?->corporate?->help_text, 'avatar_url' => $this->currentpolicy?->corporate?->avatar_url ],