From f5a156b3909ba4cb84778d6ec4b0be6caae2bfb9 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 23 Feb 2022 16:32:04 +0800 Subject: [PATCH] update pengesahan pembida --- .../Controllers/AuthMobile/AuthController.php | 6 ++ app/Http/Controllers/PembidaController.php | 18 ++++++ database/seeders/RolesSeeder.php | 5 ++ .../pembayaran/senarailelongbayaran.blade.php | 58 ++++++++++++++++- resources/views/pembida/show.blade.php | 64 ++++++++++++++++++- routes/web.php | 1 + 6 files changed, 149 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php index 875a2d1f..4ef4bced 100644 --- a/app/Http/Controllers/AuthMobile/AuthController.php +++ b/app/Http/Controllers/AuthMobile/AuthController.php @@ -96,6 +96,12 @@ class AuthController extends Controller 'message' => 'User Banned' ], 401); } + else if($user->status == 'rejected') + { + return response([ + 'message' => 'Permohonan Ditolak' + ], 401); + } else { return response([ diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 57f261a3..b846638b 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -34,6 +34,7 @@ class PembidaController extends Controller // $alluser = User::all(); $alluser = User::doesntHave('roles') ->where('user_type','=',2) + ->where('status', '!=', 'rejected') ->get(); // dd($alluser); @@ -92,6 +93,23 @@ class PembidaController extends Controller ->with('success','Pengesahan Berjaya'); } + public function reject(Request $request) + { + // dd($request->all()); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateString(); + + $user = User::where('id','=',$request->user_id)->first(); + $user->disahkan_pada = $currentdate; + $user->disahkan_oleh = Auth::user()->id; + $user->note = $request->note; + $user->status = 'rejected'; + $user->save(); + + return redirect()->route('pembida.senaraipembida') + ->with('unsuccessful','Pengesahan Ditolak'); + } + } diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 925d8758..101e3f16 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -67,6 +67,10 @@ class RolesSeeder extends Seeder 'name' => 'pengesahanbayarancash', 'description' => 'Pengesahan bayaran pembida di cawangan (cash)' ]); + Permission::create([ + 'name' => 'serahan', + 'description' => 'Penyerahan Marhun Kepada Pembida Yang Menang' + ]); //jurulelong Permission::create([ @@ -138,6 +142,7 @@ class RolesSeeder extends Seeder $role4->givePermissionTo('pendaftaranpembida'); $role4->givePermissionTo('jananotis'); $role4->givePermissionTo('pengesahanbayarancash'); + $role4->givePermissionTo('serahan'); $role5 = Role::create(['name' => 'jurulelong']); diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php index 9bd40667..fe176589 100644 --- a/resources/views/pembayaran/senarailelongbayaran.blade.php +++ b/resources/views/pembayaran/senarailelongbayaran.blade.php @@ -5,7 +5,12 @@
| No | @@ -29,4 +34,55 @@ + + @endsection \ No newline at end of file diff --git a/resources/views/pembida/show.blade.php b/resources/views/pembida/show.blade.php index 9f602658..3ea15637 100644 --- a/resources/views/pembida/show.blade.php +++ b/resources/views/pembida/show.blade.php @@ -49,14 +49,54 @@ Kembali + - {{-- --}} + + +
|---|