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

update notis tmt kontrak pc & operasi

Browse Source
This commit is contained in:
faiqahzaman
2022-03-30 15:03:44 +08:00
parent 782262643a
commit bb7a68ba50
5 changed files with 203 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SimulasiController.php
+1 -1
View File
@@ -57,7 +57,7 @@ class SimulasiController extends Controller
public function janadata(Request $request)
{
dd($request->all());
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = (int)round($request->jbg);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
app/Http/Controllers/TamatKontController.php
+98 -53
View File
@@ -27,7 +27,48 @@ class TamatKontController extends Controller
if($t_lelong != null)
{
return view('jananotis.notistamatkontrak');
$user = Auth::user();
$getsurat = Gadai::where('t_matang1', '<', $t_lelong)
->where('kodcaw', $user->kodcaw)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->get();
$t_gadais = Gadai::where('t_matang1', '<', $t_lelong)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai')
->first();
$tarikh_lelong = Carbon::parse($t_lelong);
$t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
foreach($getsurat as $index1=>$surats)
{
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('norujukan', $surats['norujukan'])
->get();
$getsurat[$index1]['list_norujukan'] = $senarai;
}
// $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
// ->sum('bayaran_keuntungan');
return view('jananotis.gadaibycaw', compact( 'getsurat',
'senarai',
't_lelong',
'user',
't_gadais',
't_anggaran'
));
}
else
{
@@ -35,35 +76,6 @@ class TamatKontController extends Controller
->with('failed','Sila Masukkan Tarikh Lelongan');
}
$user = Auth::user();
$getsurat = Gadai::where('t_matang1', '<', $t_lelong)
->where('kodcaw', $user->kodcaw)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->get();
foreach($getsurat as $index1=>$surats)
{
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('norujukan', $surats['norujukan'])
->get();
$getsurat[$index1]['list_norujukan'] = $senarai;
}
// $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
// ->sum('bayaran_keuntungan');
return view('jananotis.gadaibycaw', compact( 'getsurat',
'senarai',
't_lelong',
'user'
)
);
}
//Operasi
@@ -79,36 +91,53 @@ class TamatKontController extends Controller
if($t_lelong != null)
{
$getsurat = Gadai::where('t_matang1', '<', $t_lelong)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->get()->toArray();
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->get();
// dd($getsurat);
if(sizeof($getsurat) == 0)
{
return redirect()->route('notistamatkontrak.sebelumtamatkont')
->with('failed','Tiada surat untuk di lelong');
}
$t_gadais = Gadai::where('t_matang1', '<', $t_lelong)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai')
->first();
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('gadai.t_matang1', '<', $t_lelong)
->where('gadai.sttebus', '=', '')
->where('gadai.taglel', '=', 0)
->where('gadai.tagpalsu', '=', 0)
->where('gadai.tagpalsu2', '=', 0)
->whereNotNull('gadai.upah12')
->groupBy('gadai.kodcaw','cawangan.caw_name')
->selectRaw('count(*) as bil_lelong, sum(berat) as total_berat,sum(nilaimarhun) as total_nilaimarhun,sum(pinjaman) as total_pembiayaan,sum(bakipjm) as total_bakipjm,gadai.kodcaw,cawangan.caw_name as caw_name')
->get();
->where('gadai.t_matang1', '<', $t_lelong)
->where('gadai.sttebus', '=', '')
->where('gadai.taglel', '=', 0)
->where('gadai.tagpalsu', '=', 0)
->where('gadai.tagpalsu2', '=', 0)
->whereNotNull('gadai.upah12')
->groupBy('gadai.kodcaw','cawangan.caw_name')
->selectRaw('count(*) as bil_lelong,
sum(berat) as total_berat,
sum(nilaimarhun) as total_nilaimarhun,
sum(pinjaman) as total_pembiayaan,
sum(bakipjm) as total_bakipjm,
gadai.kodcaw,
cawangan.caw_name as caw_name'
)
->get();
$bil_lelong = sizeof($getsurat);
return view('jananotis.senaraitemp', compact( 't_lelong',
'getsurat',
'senarai'
'getsurat',
'senarai',
't_gadais'
));
}
else
@@ -130,13 +159,25 @@ class TamatKontController extends Controller
->whereNotNull('upah12')
->get();
$t_gadais = Gadai::where('t_matang1', '<', $t_lelong)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai')
->first();
$tarikh_lelong = Carbon::parse($t_lelong);
$t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
foreach($getsurat as $index1=>$surats)
{
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('norujukan', $surats['norujukan'])
->get();
dd($senarai);
$getsurat[$index1]['list_norujukan'] = $senarai;
}
@@ -146,8 +187,12 @@ class TamatKontController extends Controller
return view('jananotis.tempbycaw', compact( 'getsurat',
'details',
'senarai',
't_lelong'
)
);
't_lelong',
't_gadais',
't_anggaran',
'tarikh_lelong'
));
}
// public function janasimulasi($t_lelong, )
}
resources/views/jananotis/gadaibycaw.blade.php
+37 -19
View File
@@ -11,7 +11,17 @@
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%; margin-top:1%;">
<div class="container">
<div class="row mb-2">
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
<p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
<p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
</div>
</div>
</div>
<table class="table table-striped table-xl text-center" id="butirangadai" style="width:100%; margin-top:1%;">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
@@ -52,15 +62,15 @@
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablenotislelong = $('#tablenotislelong').DataTable({
var tablebutirangadai = $('#butirangadai').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 3,
"orderable": false
"targets": 8,
"orderable": true
}
],
order: [[1, 'asc']],
@@ -68,7 +78,7 @@
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
@@ -83,22 +93,30 @@
// })
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Senarai Gadaian Excel',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
},
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Senarai Gadaian PDF',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
}
]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
$('.addcaw').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addcaw').removeClass('dt-button');
$( '.export').removeClass('dt-button');
</script>
@endsection
resources/views/jananotis/senaraitemp.blade.php
+4 -4
View File
@@ -15,11 +15,11 @@
<div class="row mb-2">
<div class="col-md-11 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
<p> <b>Tarikh Gadai Sehingga : </b></p>
<p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
</div>
</div>
</div>
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<table class="table table-striped table-xl text-center" id="senaraitemp" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
@@ -63,14 +63,14 @@
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablenotislelong = $('#tablenotislelong').DataTable({
var tablesenaraitemp = $('#senaraitemp').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 3,
"targets": 8,
"orderable": false
}
],
resources/views/jananotis/tempbycaw.blade.php
+63 -34
View File
@@ -4,14 +4,27 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-12 mx-auto card">
<h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Cawangan {{ $details }}</h3>
<h3 class="pt-3" style="margin-bottom:2%; margin-top:1%;">Butiran Gadaian Cawangan {{ $details }}</h3>
@if ($message = Session::get('failed'))
<div class="alert alert-danger">
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%; margin-top:1%;">
<form action="{{route('notistamatkontrak.senaraitemp')}}" id="formtlelong" method="POST">
<input type="hidden" name="t_lelong" value="{{ $tarikh_lelong }}">
@csrf
<div class="container">
<div class="row mb-2">
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
<p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
<p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
</div>
</div>
</div>
<table class="table table-striped table-xl text-center" id="detailsgadai" style="width:100%; margin-top:1%;">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
@@ -23,6 +36,7 @@
<th>Baki Pembiayaan (RM)</th>
<th>Keuntungan 6 Bulan (RM)</th>
<th>Keuntungan Telah Bayar (RM)</th>
</tr>
</thead>
<tbody>
@@ -41,6 +55,10 @@
@endforeach
</tbody>
</table>
<div class="modal-footer">
<button type="button" class="btn btn-primary" onclick="kembali()" style="margin-left:2%; width:9%;">Kembali</button>
</div>
</form>
</div>
</div>
</div>
@@ -49,15 +67,18 @@
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablenotislelong = $('#tablenotislelong').DataTable({
function kembali() {
$("#formtlelong").submit();
}
var tabledetailsgadai = $('#detailsgadai').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
},
{
"targets": 3,
"orderable": false
"targets": 8,
"orderable": true
}
],
order: [[1, 'asc']],
@@ -65,37 +86,45 @@
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'PDF Senarai Gadaian',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Senarai Gadaian Excel',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
},
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Senarai Gadaian PDF',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
}
]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
$('.addcaw').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addcaw').removeClass('dt-button');
$( '.export').removeClass('dt-button');
</script>
@endsection