Merge remote-tracking branch 'origin/staging' into origin/production

2025-02-25 15:00:22 +07:00
parent 6fdc228b6f 4e3bf6d11e
commit 246fc11438
9 changed files with 117 additions and 38 deletions
--- a/Modules/Internal/Transformers/RequestLogShowResource.php
+++ b/Modules/Internal/Transformers/RequestLogShowResource.php
@@ -117,8 +117,7 @@ class RequestLogShowResource extends JsonResource
                    ->get();
        }
        $memberUsage = Helper::getUsageMember($corporateId, $requestLog['member']['id'], $benefitData);
-
-        if(isset($requestLog['specialities_id']))
+        if($requestLog['specialities_id'])
        {
            $spesialis = Speciality::query()
            ->where('id', $requestLog['specialities_id'])
@@ -129,7 +128,7 @@ class RequestLogShowResource extends JsonResource
            $name = '-';
        }

-        if (isset($requestLog['specialities_id'])){
+        if ($requestLog['dppj']){
            $dppj = $requestLog['dppj'];
        } else {
            $dppj = '-';