From 26c76b1e665b58e1863f302191104c642109e52e Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 30 Oct 2023 09:31:09 +0800 Subject: [PATCH] Add role pemasaran --- app/Http/Controllers/HomeController.php | 2 ++ app/Http/Controllers/LelongController.php | 2 ++ database/seeders/RolesSeeder.php | 12 ++++++++++ resources/views/homepemasaran.blade.php | 16 ++++++++++++++ resources/views/includes/sidebar.blade.php | 22 +++++++++++++++++++ .../views/lelong/senarailelong.blade.php | 2 ++ .../views/lelong/senaraimarhun.blade.php | 10 +++++++++ .../views/lelong/senaraimarhundone.blade.php | 2 ++ resources/views/lelong/showlelong.blade.php | 2 ++ 9 files changed, 70 insertions(+) create mode 100644 resources/views/homepemasaran.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c807b01d..2f80ec25 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -432,6 +432,8 @@ class HomeController extends Controller return view('homeoperasikpi'); } else if ($user->hasRole('hr')) { return view('homehr'); + } else if ($user->hasRole('pemasaran')) { + return view('homepemasaran'); } else if ($user->hasRole('admin')) { return view('homeadmin'); } else if ($user->hasRole('account')) { diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 9f312757..c159a026 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1470,6 +1470,7 @@ class LelongController extends Controller } public function senaraimarhun($lelongid, $cawid){ + $user = Auth::user(); $total_berat = 0; $total_pinjaman = 0; $total_upah = 0; @@ -1545,6 +1546,7 @@ class LelongController extends Controller 'total_nilaimarhun', 'lelonglel', 'cawanganDetail', + 'user', 'total_cazlelong')); } diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 61008b60..58056523 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -286,6 +286,10 @@ class RolesSeeder extends Seeder $role13 = Role::create(['name' => 'hr']); $role13->givePermissionTo('skoptugasan'); + $role14 = Role::create(['name' => 'pemasaran']); + $role14->givePermissionTo('pengurusangambar'); + $role14->givePermissionTo('pendaftaranbatch'); + // $role3 = Role::create(['name' => 'Super-Admin']); // gets all permissions via Gate::before rule; see AuthServiceProvider @@ -398,5 +402,13 @@ class RolesSeeder extends Seeder 'user_type' => 1 ]); $user->assignRole($role13); + + $user = \App\Models\User::factory()->create([ + 'name' => 'Pemasaran', + 'username' => 'pemasaran', + 'email' => 'pemasaran@example.com', + 'user_type' => 1 + ]); + $user->assignRole($role14); } } diff --git a/resources/views/homepemasaran.blade.php b/resources/views/homepemasaran.blade.php new file mode 100644 index 00000000..92c2e7ce --- /dev/null +++ b/resources/views/homepemasaran.blade.php @@ -0,0 +1,16 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Dashboard') }}
+
+ Selamat Datang +
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 5217023f..2e700eb3 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -1021,6 +1021,28 @@ @endhasrole @hasrole('pembida') @endhasrole + @hasrole('pemasaran') +
  • + +
    + + published_with_changes + + Senarai Lelong +
    +     +
    • +
  • + +
    + + gallery_thumbnail + + Galeri Marhun +
    +     +
    • + @endhasrole
    Beta V1.0
    diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 8ff53b23..74d83c1d 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -223,7 +223,9 @@ {{-- --}} + @hasrole('operasi') + @endhasrole @endforeach diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index 7397aa18..84362f5d 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -65,7 +65,9 @@ + @hasrole('operasi') + @endhasrole {{-- --}} @@ -87,9 +89,11 @@ @endphp @foreach ($marhuns as $index=> $marhun) + @hasrole('operasi') + @endhasrole {{-- --}} @@ -128,7 +132,11 @@ {{-- --}} + @if($user->hasRole('operasi')) + @else + + @endif @@ -145,10 +153,12 @@
    TindakanNo No RujukanNama Pelanggan
    {{$loop->iteration}} {{ $marhun['norujukan']}}{{ $marhun['nama']['nama']}}
    JUMLAH KESELURUHANJUMLAH KESELURUHAN{{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nilaimarhun, 2, '.', ',') }} {{ number_format($total_pinjaman, 2, '.', ',') }}
    + @hasrole('operasi')
    {{-- Kembali --}}
    + @endhasrole {{-- Kembali --}} diff --git a/resources/views/lelong/senaraimarhundone.blade.php b/resources/views/lelong/senaraimarhundone.blade.php index 09231006..138109e5 100644 --- a/resources/views/lelong/senaraimarhundone.blade.php +++ b/resources/views/lelong/senaraimarhundone.blade.php @@ -56,7 +56,9 @@
    {{-- Muat Turun PDF --}} + @hasrole('operasi') Ubah Rugi Lelong + @endhasrole
    @csrf diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index b0903a80..4d297c4e 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -28,7 +28,9 @@