Merged in amir_dev_2 (pull request #27)

Add role pemasaran
This commit is contained in:
arrahn pkb
2023-10-30 01:45:30 +00:00
9 changed files with 70 additions and 0 deletions
+2
View File
@@ -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')) {
@@ -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'));
}
+12
View File
@@ -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);
}
}
+16
View File
@@ -0,0 +1,16 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row">
<div class="col-md-11 mx-auto">
<div class="card">
<div class="card-header">{{ __('Dashboard') }}</div>
<div class="card-body">
Selamat Datang
</div>
</div>
</div>
</div>
</div>
@endsection
@@ -1021,6 +1021,28 @@
@endhasrole
@hasrole('pembida')
@endhasrole
@hasrole('pemasaran')
<li class="{{ (request()->is('lelong/*') || request()->is('lelong/*')) ? 'active' : '' }}">
<a href="{{url('lelong/senarailelong')}}">
<div class="sidebar-menu-main-title">
<span class="material-symbols-rounded sidebar-menu-item-main">
published_with_changes
</span>
Senarai Lelong
</div>
</a>
</li>
<li class="{{ (request()->is('pengurusangambar/marhun') || request()->is('pengurusangambar/marhun/*')) ? 'active' : '' }}">
<a href="{{url('pengurusangambar/marhun')}}">
<div class="sidebar-menu-main-title">
<span class="material-symbols-rounded sidebar-menu-item-main">
gallery_thumbnail
</span>
Galeri Marhun
</div>
</a>
</li>
@endhasrole
</ul>
<div class="sidebar-footer">
<div class="sidebar-footer-content">Beta V1.0</div>
@@ -223,7 +223,9 @@
<td style="white-space: nowrap;">
{{-- <a class="btn m-1 btn-info" href="{{ route('lelong.showsimulasi',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi"><i class="far fa-edit"></i></a> --}}
<a class="btn m-1 btn-warning" href="{{ route('lelong.showlelongdone',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong Selesai"><i class="far fa-calendar"></i></a>
@hasrole('operasi')
<a class="btn m-1 btn-success" href="{{ route('lelong.exportDataByCawangan',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Export Data"><i class="fas fa-file-export"></i></a>
@endhasrole
</td>
</tr>
@endforeach
@@ -65,7 +65,9 @@
<table class="table text-right table-bordered" id="marhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
@hasrole('operasi')
<th>Tindakan</th>
@endhasrole
<th>No</th>
<th>No Rujukan</th>
{{-- <th>Nama Pelanggan</th> --}}
@@ -87,9 +89,11 @@
@endphp
@foreach ($marhuns as $index=> $marhun)
<tr>
@hasrole('operasi')
<td class="text-center">
<input type="checkbox" aria-label="Checkbox for following text input" id="checkboxdata[]" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
</td>
@endhasrole
<td>{{$loop->iteration}}</td>
<td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
{{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
@@ -128,7 +132,11 @@
<tfoot>
<tr>
{{-- <td align = 'right'></td> --}}
@if($user->hasRole('operasi'))
<td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
@else
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
@endif
<td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
@@ -145,10 +153,12 @@
</table>
@hasrole('operasi')
<div class="text-right pt-4">
{{-- <a href="{{ route('lelong.show',$lelongid) }}" class="btn btn-primary">Kembali</a> --}}
<button type="button" class="btn btn-danger" onclick="confirm()">Hapus</button>
</div>
@endhasrole
{{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
</form>
@@ -56,7 +56,9 @@
</div>
<div class="mb-3">
{{-- <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a> --}}
@hasrole('operasi')
<a href="{{ route('lelong.ubahrugilelong',[$lelongid,'cawid'=>$cawid]) }}" class="btn btn-primary">Ubah Rugi Lelong</a>
@endhasrole
</div>
<form id="deletesag" method="POST">
@csrf
@@ -28,7 +28,9 @@
<nav>
<div class="nav mb-3 nav-tabs" id="nav-tab" role="tablist">
<a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Lelong</a>
@hasrole('operasi')
<a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a>
@endhasrole
</div>
</nav>
<div class="tab-content" id="nav-tabContent">