diff --git a/app/Models/User.php b/app/Models/User.php
index 50a74808..293389b5 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -70,7 +70,7 @@ class User extends Authenticatable
public function cawangan()
{
- return $this->hasMany(Cawangan::class, 'caw_code' , 'kodcaw');
+ return $this->hasOne(Cawangan::class, 'caw_code' , 'kodcaw');
}
}
diff --git a/resources/views/pdf/penggunapdf.blade.php b/resources/views/pdf/penggunapdf.blade.php
index baf8afd1..c5fc6b7b 100644
--- a/resources/views/pdf/penggunapdf.blade.php
+++ b/resources/views/pdf/penggunapdf.blade.php
@@ -51,9 +51,9 @@
{{$key+1}} |
{{ $value->name }} |
{{ $value->email }} |
- @foreach ($value->cawangan as $cawuser)
- {{$cawuser->caw_name}}
- @endforeach |
+ @if($value->cawangan != NULL)
+ {{$value->cawangan->caw_name}}
+ @endif |
@foreach ($value->roles as $taraf)
diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php
index 3fee9410..f23f6545 100644
--- a/resources/views/pengurusanpengguna/index.blade.php
+++ b/resources/views/pengurusanpengguna/index.blade.php
@@ -49,10 +49,11 @@
| {{ $user->name }} |
{{ $user->username }} |
{{ $user->email }} |
- @foreach ($user->cawangan as $cawuser)
- {{$cawuser->caw_name}}
- @endforeach |
-
+
+ @if($user->cawangan != NULL)
+ {{$user->cawangan->caw_name}}
+ @endif
+ |
@foreach ($user->roles as $taraf)
diff --git a/resources/views/pengurusanpengguna/show.blade.php b/resources/views/pengurusanpengguna/show.blade.php
index b33fd954..192320a1 100644
--- a/resources/views/pengurusanpengguna/show.blade.php
+++ b/resources/views/pengurusanpengguna/show.blade.php
@@ -26,9 +26,11 @@
|