KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'atie' into 'main'

Browse Source 
add role pengurus operasi (bosman)

See merge request online-sistem1/lelong!387
This commit is contained in:
Nur Izzati Zulkifli
2023-02-12 08:53:27 +00:00
parent 0f0caf8e71 a030e6b9b8
commit b1484ee509
8 changed files with 172 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/seeders/RolesSeeder.php
+24 -1
View File
@@ -168,6 +168,12 @@ class RolesSeeder extends Seeder
'description' => 'Laporan Lelong Khas'
]);
//callcenter
Permission::create([
'name' => 'notisperingatan',
'description' => 'Penjanaan Notis Peringatan Oleh Call Center'
]);
// create roles and assign existing permissions
$role1 = Role::create(['name' => 'admin']);
$role1->givePermissionTo('pengguna');
@@ -233,7 +239,16 @@ class RolesSeeder extends Seeder
$role9->givePermissionTo('sebelumdaftarbatch');
$role9->givePermissionTo('lelonghargajual');
$role9->givePermissionTo('reportcawkhas');
$role10 = Role::create(['name' => 'callcenter']);
$role10->givePermissionTo('notisperingatan');
$role11 = Role::create(['name' => 'pengurus-operasi']);
$role11->givePermissionTo('pengurusangambar');
$role11->givePermissionTo('pengesahan');
$role11->givePermissionTo('report');
$role11->givePermissionTo('pengesahanpembida');
$role11->givePermissionTo('pendaftaranbatch');
// $role3 = Role::create(['name' => 'Super-Admin']);
@@ -324,5 +339,13 @@ class RolesSeeder extends Seeder
'user_type' => 1
]);
$user->assignRole($role9);
$user = \App\Models\User::factory()->create([
'name' => 'Call Center',
'username' => 'callcenter',
'email' => 'callcenter@example.com',
'user_type' => 1
]);
$user->assignRole($role10);
}
}
resources/views/home.blade.php
+11
View File
@@ -14,6 +14,17 @@
@endif
<!-- {{ __('Selamat Datang!') }} -->
@hasrole('pengurus-operasi')
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
</div>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
@endhasrole
@hasrole('admin')
I am a admin!
<div id="appHelloComponent"></div>
resources/views/includes/sidebar.blade.php
+114
View File
@@ -16,6 +16,97 @@
</div>
</a>
</li>
@hasrole('pengurus-operasi')
<li>
<a href="#lelongSubmenu" data-toggle="collapse" aria-expanded="false">
<div class="sidebar-menu">
<div class="sidebar-menu-main-title">
<span class="material-symbols-rounded sidebar-menu-item-main">
published_with_changes
</span>
Lelongan
</div>
<span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
</div>
</a>
<ul class="list-unstyled collapse {{ (request()->is('lelong/*')) ? 'show' : '' || (request()->is('jananotis/*')) ? 'show' : '' }}" id="lelongSubmenu">
<li class="{{ (request()->is('lelong/senarailelong/*') || request()->is('lelong/senarailelong') ) ? 'active' : '' }}">
<a href="{{url('lelong/senarailelong')}}">Senarai Lelong</a>
</li>
<li class="{{ (request()->is('lelong/senarailelongall/*') || request()->is('lelong/senarailelongall') ) ? 'active' : '' }}">
<a href="{{url('lelong/senarailelongall')}}">Senarai Lelong All</a>
</li>
<li class="{{ (request()->is('lelong/senarailelongtaklaku/*') || request()->is('lelong/senarailelongtaklaku') ) ? 'active' : '' }}">
<a href="{{url('lelong/senarailelongtaklaku')}}">Senarai Lelong Tidak Laku</a>
</li>
</ul>
</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">
settings
</span>
Pengurusan Gambar Marhun
</div>
</a>
</li>
<li class="{{ (request()->is('pengesahan/senaraitlhtangguh') || request()->is('pengesahan/senaraitlhtangguh/*')) ? 'active' : '' }}">
<a href="{{url('pengesahan/senaraitlhtangguh')}}">
<div class="sidebar-menu-main-title">
<span class="material-symbols-rounded sidebar-menu-item-main">
pending_actions
</span>
Tangguh Lelong
</div>
</a>
</li>
<li>
<a href="#pembidaSubmenu" data-toggle="collapse" aria-expanded="false">
<div class="sidebar-menu">
<div class="sidebar-menu-main-title">
<span class="material-symbols-rounded sidebar-menu-item-main">
assignment_ind
</span>
Pembida
</div>
<span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
</div>
</a>
<ul class="list-unstyled collapse {{ (request()->is('pembida/*')) ? 'show' : '' }}" id="pembidaSubmenu">
<li class="{{ (request()->is('pembida/senaraipembidakeseluruhan/*') || request()->is('pembida/senaraipembidakeseluruhan') ) ? 'active' : '' }}">
<a href="{{url('pembida/senaraipembidakeseluruhan')}}">Senarai Pembida</a>
</li>
<li class="{{ (request()->is('report/lapbidaanpembidaindex/*') || request()->is('report/lapbidaanpembidaindex') ) ? 'active' : '' }}">
<a href="{{url('report/lapbidaanpembidaindex')}}">Bidaan Pembida</a>
</li>
<li class="{{ (request()->is('pembida/statuspembayaran/*') || request()->is('pembida/statuspembayaran') ) ? 'active' : '' }}">
<a href="{{url('pembida/statuspembayaran')}}">Status Pembayaran</a>
</li>
<li class="{{ (request()->is('pembida/statusserahanbidaan/*') || request()->is('pembida/statusserahanbidaan') ) ? 'active' : '' }}">
<a href="{{url('pembida/statusserahanbidaan')}}">Status Serahan Bidaan</a>
</li>
</ul>
</li>
<li class="{{ (request()->is('report/lapubahmarhunlelong') || request()->is('report/lapubahmarhunlelong/*')) ? 'active' : '' }}">
<a href="{{url('report/lapubahmarhunlelong')}}">
<div class="sidebar-menu-main-title">
<span class="material-symbols-rounded sidebar-menu-item-main">
published_with_changes
</span>
Perubahan Marhun
</div>
</a>
</li>
@endhasrole
@hasrole('admin')
<li>
<a href="#penggunaSubmenu" data-toggle="collapse" aria-expanded="false">
@@ -73,6 +164,29 @@
</a>
</li>
@endhasrole
@hasrole('callcenter')
<li>
<a href="#ccSubmenu" data-toggle="collapse" aria-expanded="false">
<div class="sidebar-menu">
<div class="sidebar-menu-main-title">
<span class="material-symbols-rounded sidebar-menu-item-main">
settings_accessibility
</span>
Notis Peringatan
</div>
<span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
</div>
</a>
<ul class="list-unstyled collapse {{ (request()->is('notisperingatan/*')) ? 'show' : '' }}" id="ccSubmenu">
<li class="{{ (request()->is('notisperingatan/jananotisperingatan/*') || request()->is('notisperingatan/jananotisperingatan') ) ? 'active' : '' }}">
<a href="{{url('notisperingatan/jananotisperingatan')}}">Jana Notis Peringatan</a>
</li>
<li class="{{ (request()->is('notisperingatan/senarainotisall/*') || request()->is('notisperingatan/senarainotisall') ) ? 'active' : '' }}">
<a href="{{url('notisperingatan/senarainotisall')}}">Senarai Notis All</a>
</li>
</ul>
</li>
@endhasrole
@hasrole('pengurus-cawangan')
<li>
<a href="#jananotisSubmenu" data-toggle="collapse" aria-expanded="false">
resources/views/lelong/exportData.blade.php
+2
View File
@@ -79,12 +79,14 @@
<td class="text-success">Selesai Export</td>
@elseif($data->selesai_bayar == $data->lelong_laku)
<td>
@hasrole('operasi')
<form action="{{ route('lelong.exportDataToApi') }}" method="POST">
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong->id }}">
<input type="hidden" name="tarikh_lelong" value="{{ $lelong->tarikh_lelong }}">
<button type="submit" name="cawangan" value="{{ $data->id }}" class="btn btn-primary">EXPORT <i class="fas fa-file-export"></i></button>
</form>
@endhasrole
</td>
@elseif($data->selesai_bayar < $data->lelong_laku)
<td>Bayaran belum diselesai sepenuhnya</td>
resources/views/lelong/senarailelong.blade.php
+2
View File
@@ -84,7 +84,9 @@
<td style="white-space: nowrap;">
{{-- <a class="btn m-1 btn-warning confirmrefresh" href="{{ route('lelong.kemaskinidata',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Lelong"><i class="fas fa-sync-alt"></i></a> --}}
<a class="btn m-1 btn-primary" href="{{ route('lelong.show',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Lelong"><i class="far fa-edit"></i></a>
@hasrole('operasi')
<a class="btn m-1 btn-danger confirmdel" href="{{ route('lelong.delete',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Lelong"><i class="far fa-trash-alt"></i></a>
@endhasrole
</td>
</tr>
@endforeach
resources/views/lelong/showrenewxlaku.blade.php
+2
View File
@@ -92,7 +92,9 @@
</div>
</div>
@hasrole('operasi')
<button type="submit" class="btn btn-success">Daftar Lelong</button>
@endhasrole
</form>
resources/views/pembida/kemaskini.blade.php
+2
View File
@@ -91,7 +91,9 @@
<div class="text-right pt-4">
<input type="hidden" name="userid" value="{{$user->id}}">
<a href="{{url('pembida/senaraipembidakeseluruhan')}}" class="btn btn-primary">Kembali</a>
@hasrole('operasi')
<button type="button" class="btn btn-success" onclick="kemaskini()" >Kemaskini</button>
@endhasrole
</div>
</form>
routes/web.php
+15
View File
@@ -626,4 +626,19 @@ Route::group(['middleware' => ['permission:pengurusanuploaddownload'], 'prefix'
Route::get('/testupload', ['as' => 'pengurusanuploaddownload.testupload', 'uses' => 'DatabaseController@pengurusanMaxUploadSize']);
Route::post('/uploadfile', ['as' => 'pengurusanuploaddownload.uploadfile', 'uses' => 'DatabaseController@postUploadFile']);
});
Route::group(['middleware' => ['permission:notisperingatan'], 'prefix' => 'notisperingatan'], function () {
Route::get('/jananotisperingatan',['as'=>'notisperingatan.jananotisperingatan','uses'=>'NotisController@jananotisperingatan']);
Route::post('/senaraitempnotisperingatan',['as'=>'notisperingatan.senaraitempnotisperingatan','uses'=>'NotisController@senaraitempnotisperingatan']);
Route::get('/tempbycawnotisperingatan/{kodcaw}/{jbg}/{jbg2}/{fasa}',['as'=>'notisperingatan.tempbycawnotisperingatan','uses'=>'NotisController@tempbycawnotisperingatan']);
Route::get('/tempbycawnotisperingatan2/{kodcaw}/{jbg}/{fasa}',['as'=>'notisperingatan.tempbycawnotisperingatan2','uses'=>'NotisController@tempbycawnotisperingatan']);
Route::post('/janadatanotisperingatan',['as'=>'notisperingatan.janadatanotisperingatan','uses'=>'NotisController@janadatanotisperingatan']);
Route::get('/shownotisperingatan/{id}',['as'=>'notisperingatan.shownotisperingatan','uses'=>'NotisController@shownotisperingatan']);
Route::get('/senarainotisall',['as'=>'notisperingatan.senarainotisall','uses'=>'NotisController@senarainotisall']);
Route::get('/shownotisperingatanall/{tarikhnotis}',['as'=>'notisperingatan.shownotisperingatanall','uses'=>'NotisController@shownotisperingatanall']);
// Route::get('/notisfasa1', ['as' => 'notisperingatan.notisfasa1', 'uses' => 'NotisController@notisfasa1']);
// Route::post('/gadaibycawnotisfasa1',['as'=>'notisperingatan.gadaibycawnotisfasa1','uses'=>'NotisController@gadaibycawnotisfasa1']);
// Route::get('/gadaibycawnotisfasa1pdf/{tempoh}/{tempoh2}',['as'=>'notisperingatan.gadaibycawnotisfasa1pdf','uses'=>'NotisController@gadaibycawnotisfasa1pdf']);
// Route::get('/gadaibycawnotisfasa1excel/{tempoh}/{tempoh2}',['as'=>'notisperingatan.gadaibycawnotisfasa1excel','uses'=>'NotisController@gadaibycawnotisfasa1excel']);
});
// Route::get('/sms', [SmsController::class, 'index']);