Merge remote-tracking branch 'origin/master' into mhmfajar

2022-12-12 08:46:02 +07:00
parent a3760b8757 23468df422
commit 6d6439cc94
17 changed files with 1202 additions and 689 deletions
--- a/Modules/Client/Transformers/MemberResources.php
+++ b/Modules/Client/Transformers/MemberResources.php
@@ -19,7 +19,7 @@ class MemberResources extends JsonResource
            'memberId' => $this->member_id,
            'fullName' => $this->full_name,
            $this->mergeWhen($request->input('claimMember') === 'false', [
-                'division' => $this->division->name,
+                'division' => $this->division->name ?? '',
                'status' => $this->active
            ]),
            'limit' => [