Merge branch 'atie' into 'main'

add menu WTD dlm page cawangan(PC)

See merge request online-sistem1/lelong!453
This commit is contained in:
Nur Izzati Zulkifli
2023-06-07 00:05:14 +00:00
5 changed files with 86 additions and 6 deletions
+31
View File
@@ -2476,6 +2476,37 @@ Sekian, terima kasih.';
return view('wtd.excellistsagwtdprosesbycust',compact('customers','cawanganDetail','cawid','jumlahbil','jumlahbaki'));
}
Public function listwtdprosescaw (){
$user = Auth::user();
$cawangan_all = Cawangan::where('caw_code', $user->kodcaw)->get();
foreach($cawangan_all as $index3=>$cawangan){
$cawangan_all_groupby_caw = $cawangan->groupBy('caw_code');
$bilwtddraft = WtdDraft::on('main')
->selectRaw('COUNT(norujukan) as bilangan')
->where('kodcaw', $cawangan->caw_code)
->where('batchno_serah', '0')
->get();
// dd($wtddraft);
$wtddraft = WtdDraft::on('main')
->where('kodcaw', $cawangan->caw_code)
->where('batchno_serah', '0')
->get();
$wtddraft_groupby_caw = $wtddraft->groupBy('kodcaw');
$wtddraft_data_pluck_norujukan = $wtddraft->pluck('norujukan')->toArray();
$lelong_all = LelongCawangan::on($cawangan->caw_code)->whereIn('lelong.norujukan', $wtddraft_data_pluck_norujukan)
->join('gadai','gadai.norujukan','=','lelong.norujukan')
->select('nokp', 'lelong.norujukan','lelong.t_lelong AS tarikhlelong','lelong.hargajual','lelong.gst_hj','gadai.bakipjm','lelong.bakiupah','lelong.cajlelong','lelong.gst_cl','lelong.cajlain','lelong.baki')
->orderBy('nokp', 'asc')
->orderBy('lelong.norujukan','ASC')
->get();
$cawangan_all[$index3]["cawangan_info"] = $cawangan;
$cawangan_all[$index3]["bil"] = $bilwtddraft;
$cawangan_all[$index3]["jumlahbaki"] = number_format($lelong_all->SUM('baki'), 2, '.', ',');
}
return view('wtd.listcawanganwtdproses',compact('cawangan_all'));
}
+5
View File
@@ -77,6 +77,10 @@ class RolesSeeder extends Seeder
'name' => 'tangguhlelong',
'description' => 'Penangguhan Lelong Cawangan'
]);
Permission::create([
'name' => 'WTDcaw',
'description' => 'Wang Tidak Dituntut Cawangan'
]);
//jurulelong
Permission::create([
@@ -217,6 +221,7 @@ class RolesSeeder extends Seeder
$role4->givePermissionTo('tangguhlelong');
$role4->givePermissionTo('report');
$role4->givePermissionTo('pengurusangambar');
$role4->givePermissionTo('WTDcaw');
$role5 = Role::create(['name' => 'jurulelong']);
$role5->givePermissionTo('pendaftaranbatch');
@@ -302,6 +302,24 @@
</a>
</li>
@endif
<li class="{{ (request()->is('wtdcaw/')) ? 'active' : '' }}">
<a href="#wtdCawSubmenu" 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">
add_circle
</span>
Wang Tidak Dituntut
</div>
<span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
</div>
</a>
<ul class="list-unstyled collapse {{ (request()->is('wtdcaw/*')) ? 'show' : '' }}" id="wtdCawSubmenu">
<li class="{{ (request()->is('wtdcaw/listwtdprosescaw/*') || request()->is('wtdcaw/listwtdprosescaw') ) ? 'active' : '' }}">
<a href="{{url('wtdcaw/listwtdprosescaw')}}">Dalam Proses</a>
</li>
</ul>
</li>
<li class="{{ (request()->is('report/')) ? 'active' : '' }}">
<a href="#reportSubmenu" data-toggle="collapse" aria-expanded="false">
@@ -9,7 +9,7 @@
<div class="card-header header-style">
<div class="header-style-title">
Senarai Cawangan WTD Dalam Proses
Senarai WTD Dalam Proses
</div>
</div>
@@ -45,14 +45,29 @@
<td><span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $bid->bil[0]->bilangan}}</span></td>
<td align="right"> <b>{{ $bid->jumlahbaki}}</b></td>
<td align="center">
<a class="btn btn-success btn-sm m-1" href="{{ route('wtd.listsagwtdproses',['kodcaw'=>$bid->cawangan_info->caw_code]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a>
<a class="btn btn-warning btn-sm m-1" href="{{ route('wtd.pdflistsagwtdproses',['kodcaw'=>$bid->cawangan_info->caw_code]) }}" data-toggle="tooltip" data-placement="top" title="PDF"><i class="fas fa-download"></i></a>
<a class="btn btn-primary btn-sm m-1" href="{{ route('wtd.excellistsagwtdproses',['kodcaw'=>$bid->cawangan_info->caw_code]) }}" data-toggle="tooltip" data-placement="top" title="Excel"><i class="fas fa-download"></i></a>
<td align="center">
@hasrole('operasi')
<a class="btn btn-success btn-sm m-1" href="{{ route('wtd.listsagwtdproses',['kodcaw'=>$bid->cawangan_info->caw_code]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a>
<a class="btn btn-warning btn-sm m-1" href="{{ route('wtd.pdflistsagwtdproses',['kodcaw'=>$bid->cawangan_info->caw_code]) }}" data-toggle="tooltip" data-placement="top" title="PDF"><i class="fas fa-download"></i></a>
<a class="btn btn-primary btn-sm m-1" href="{{ route('wtd.excellistsagwtdproses',['kodcaw'=>$bid->cawangan_info->caw_code]) }}" data-toggle="tooltip" data-placement="top" title="Excel"><i class="fas fa-download"></i></a>
@endhasrole
@hasrole('pengurus-cawangan')
<a class="btn btn-success btn-sm m-1" href="{{ route('wtdcaw.listsagwtdprosescaw',['kodcaw'=>$bid->cawangan_info->caw_code]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a>
<a class="btn btn-warning btn-sm m-1" href="{{ route('wtdcaw.pdflistsagwtdproses',['kodcaw'=>$bid->cawangan_info->caw_code]) }}" data-toggle="tooltip" data-placement="top" title="PDF"><i class="fas fa-download"></i></a>
<a class="btn btn-primary btn-sm m-1" href="{{ route('wtdcaw.excellistsagwtdproses',['kodcaw'=>$bid->cawangan_info->caw_code]) }}" data-toggle="tooltip" data-placement="top" title="Excel"><i class="fas fa-download"></i></a>
@endhasrole
<td align="center">
@hasrole('operasi')
<a class="btn btn-success btn-sm m-1" href="{{ route('wtd.listsagwtdprosesbycust',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="PDF"><i class="fas fa-list"></i></a>
<a class="btn btn-warning btn-sm m-1" href="{{ route('wtd.pdflistsagwtdprosesbycust',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="PDF"><i class="fas fa-download"></i></a>
<a class="btn btn-primary btn-sm m-1" href="{{ route('wtd.excellistsagwtdprosesbycust',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="Excel"><i class="fas fa-download"></i></a></td>
</tr>
@endhasrole
@hasrole('pengurus-cawangan')
<a class="btn btn-success btn-sm m-1" href="{{ route('wtdcaw.listsagwtdprosesbycustcaw',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="PDF"><i class="fas fa-list"></i></a>
<a class="btn btn-warning btn-sm m-1" href="{{ route('wtdcaw.pdflistsagwtdprosesbycust',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="PDF"><i class="fas fa-download"></i></a>
<a class="btn btn-primary btn-sm m-1" href="{{ route('wtdcaw.excellistsagwtdprosesbycust',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="Excel"><i class="fas fa-download"></i></a></td>
@endhasrole
</tr>
@endforeach
</tbody>
+11
View File
@@ -700,4 +700,15 @@ Route::group(['middleware' => ['permission:WTD'],'prefix'=>'wtd'], function () {
Route::get('/excellistsagwtdproses/{kodcaw}',['as'=>'wtd.excellistsagwtdproses','uses'=>'NotisController@excellistsagwtdproses']);
Route::get('/excellistsagwtdprosesbycust/{cawid}',['as'=>'wtd.excellistsagwtdprosesbycust','uses'=>'NotisController@excellistsagwtdprosesbycust']);
});
Route::group(['middleware' => ['permission:WTDcaw'],'prefix'=>'wtdcaw'], function () {
Route::get('/listwtdprosescaw',['as'=>'wtdcaw.listwtdprosescaw','uses'=>'NotisController@listwtdprosescaw']);
Route::get('/listsagwtdprosescaw/{kodcaw}',['as'=>'wtdcaw.listsagwtdprosescaw','uses'=>'NotisController@listsagwtdproses']);
Route::get('/pdflistsagwtdproses/{kodcaw}',['as'=>'wtdcaw.pdflistsagwtdproses','uses'=>'NotisController@pdflistsagwtdproses']);
Route::get('/listsagwtdprosesbycustcaw/{cawid}',['as'=>'wtdcaw.listsagwtdprosesbycustcaw','uses'=>'NotisController@listsagwtdprosesbycust']);
Route::get('/pdflistsagwtdprosesbycust/{cawid}',['as'=>'wtdcaw.pdflistsagwtdprosesbycust','uses'=>'NotisController@pdflistsagwtdprosesbycust']);
Route::get('/excellistsagwtdproses/{kodcaw}',['as'=>'wtdcaw.excellistsagwtdproses','uses'=>'NotisController@excellistsagwtdproses']);
Route::get('/excellistsagwtdprosesbycust/{cawid}',['as'=>'wtdcaw.excellistsagwtdprosesbycust','uses'=>'NotisController@excellistsagwtdprosesbycust']);
});