From 4eac4b45fa5e7830546a051325433d8077cac602 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Thu, 25 Aug 2022 10:19:43 +0800
Subject: [PATCH] add role penilai, add description marhun, fix registration,

---
 .../Controllers/AuthMobile/AuthController.php   |  2 +-
 .../Mobile/LelongMobileController.php           |  7 ++++++-
 database/seeders/RolesSeeder.php                | 17 ++++++-----------
 resources/views/includes/sidebar.blade.php      |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php
index fa9a6b24..367da1e4 100644
--- a/app/Http/Controllers/AuthMobile/AuthController.php
+++ b/app/Http/Controllers/AuthMobile/AuthController.php
@@ -51,7 +51,7 @@ class AuthController extends Controller
         $user->notelbimbit = $fields['notelbimbit'];
         $user->register_agree = $fields['register_agree'];
         $user->t_daftar = $currentdate;
-        $user->status = 'inprogress';
+        $user->status = 'active';
         $user->user_type = 2; //type 2 = pembida
         
 
diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index ae71e801..25a3d726 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -17,6 +17,7 @@ use App\Models\Cawangan;
 use App\Models\Resit;
 use App\Models\FileResit;
 use App\Models\Invoice;
+use App\Models\JenisEmas;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
@@ -351,7 +352,11 @@ class LelongMobileController extends Controller
 
                 $lelongbid = LelongBid::where('id', $data)->first()->toArray();
                 $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid['id'])->get()->toArray();
-
+                foreach ($lelongbidmarhun as $index1 => $marhun) {
+                    $marhunDesc = JenisEmas::where('marhun', $marhun['marhun'])->first()->toArray();
+                    $lelongbidmarhun[$index1]['marhun_desc'] = $marhunDesc['descpt'];
+                }
+                
                 $lelongbid['lelongbidmarhun'] = $lelongbidmarhun;
 
                 array_push($listLelong, $lelongbid);
diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php
index 0a8a8a6a..9f9a729e 100644
--- a/database/seeders/RolesSeeder.php
+++ b/database/seeders/RolesSeeder.php
@@ -48,12 +48,6 @@ class RolesSeeder extends Seeder
             'description' => 'Kemaskini marhun'
         ]);
 
-        //teller
-        // Permission::create([
-        //     'name' => 'pengesahanbayarancash',
-        //     'description' => 'Pengesahan bayaran pembida di cawangan (cash)'
-        // ]);
-
         //pengurus cawangan
         Permission::create([
             'name' => 'pendaftaranpembida',
@@ -155,8 +149,9 @@ class RolesSeeder extends Seeder
         $role2->givePermissionTo('semakanmarhun');
         $role2->givePermissionTo('kemaskinimarhun');
 
-        $role3 = Role::create(['name' => 'teller']);
-        // $role3->givePermissionTo('pengesahanbayarancash');
+        $role3 = Role::create(['name' => 'penilai']);
+        $role3->givePermissionTo('semakanmarhun');
+        $role3->givePermissionTo('kemaskinimarhun');
 
         $role4 = Role::create(['name' => 'pengurus-cawangan']);
         $role4->givePermissionTo('pendaftaranpembida');
@@ -215,9 +210,9 @@ class RolesSeeder extends Seeder
         $user->assignRole($role2);
 
         $user = \App\Models\User::factory()->create([
-            'name' => 'Teller',
-            'username' => 'Teller',
-            'email' => 'teller@example.com',
+            'name' => 'Penilai',
+            'username' => 'Penilai',
+            'email' => 'penilai@example.com',
             'user_type' => 1
         ]);
         $user->assignRole($role3);
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index bcb4282f..156cb0c6 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -61,10 +61,10 @@
         </ul>
       </li>
       @endhasrole
-      @hasrole('teller')
-      <!-- <li class="{{ (request()->is('home')) ? 'active' : '' }}">
-        <a href="/home">Home</a>
-      </li> -->
+      @hasrole('penilai')
+      <li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
+        <a href="{{url('marhun/senarailelongmarhun')}}">Semakan Marhun</a>
+      </li>
       @endhasrole
       @hasrole('pengurus-cawangan')