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

2024-06-20 16:10:13 +07:00
parent 0690eae429 e18afa93bf
commit 5ae872a5be
309 changed files with 1622 additions and 1651 deletions
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -88,8 +88,15 @@ class Helper

    public static function principalName($code)
    {
-        $principalName = Member::where('member_id', $code)->get()->first();
-        return $principalName->name;
+        $principalName = Member::where('member_id', $code)->first();
+
+        if ($principalName !== null) {
+            return $principalName->name;
+        } else {
+            // Tangani situasi di mana member_id tidak ditemukan
+            return 'Member not found'; // Atau berikan nilai default atau pesan error yang sesuai
+        }
+
    }

    public static function userName($id)