diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 74038170..3cf746ea 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -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(); diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php index 27f95d67..d9e971e4 100644 --- a/app/Http/Controllers/TamatKontController.php +++ b/app/Http/Controllers/TamatKontController.php @@ -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, ) } diff --git a/resources/views/jananotis/gadaibycaw.blade.php b/resources/views/jananotis/gadaibycaw.blade.php index 78191866..eee23806 100644 --- a/resources/views/jananotis/gadaibycaw.blade.php +++ b/resources/views/jananotis/gadaibycaw.blade.php @@ -11,7 +11,17 @@

{{ $message }}

@endif - + +
+
+
+

Tarikh Lelong : {{ $t_lelong }}

+

Tarikh Gadai Sehingga : {{ $t_gadais->t_gadai }}

+

Anggaran Tarikh Daftar Lelong : {{ $t_anggaran }}

+
+
+
+
@@ -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: '', @@ -83,22 +93,30 @@ // }) // } // }, - // { - // className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - // titleAttr: 'Export to CSV', - // text: '', - // 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: '', + 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: '', + 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'); @endsection diff --git a/resources/views/jananotis/senaraitemp.blade.php b/resources/views/jananotis/senaraitemp.blade.php index 60f7fb99..5a395acf 100644 --- a/resources/views/jananotis/senaraitemp.blade.php +++ b/resources/views/jananotis/senaraitemp.blade.php @@ -15,11 +15,11 @@

Tarikh Lelong : {{ $t_lelong }}

-

Tarikh Gadai Sehingga :

+

Tarikh Gadai Sehingga : {{ $t_gadais->t_gadai }}

-
Bil
+
@@ -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 } ], diff --git a/resources/views/jananotis/tempbycaw.blade.php b/resources/views/jananotis/tempbycaw.blade.php index 108fcbb0..0f2f60c9 100644 --- a/resources/views/jananotis/tempbycaw.blade.php +++ b/resources/views/jananotis/tempbycaw.blade.php @@ -4,14 +4,27 @@
-

Butiran Gadaian Cawangan {{ $details }}

+

Butiran Gadaian Cawangan {{ $details }}

@if ($message = Session::get('failed'))

{{ $message }}

@endif -
+ + + @csrf +
+
+
+

Tarikh Lelong : {{ $t_lelong }}

+

Tarikh Gadai Sehingga : {{ $t_gadais->t_gadai }}

+

Anggaran Tarikh Daftar Lelong : {{ $t_anggaran }}

+
+
+
+ +
@@ -23,6 +36,7 @@ + @@ -41,6 +55,10 @@ @endforeach
BilBaki Pembiayaan (RM) Keuntungan 6 Bulan (RM) Keuntungan Telah Bayar (RM)
+
+ +
+ @@ -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: '', - // 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: '', + // 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: '', - // 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: '', + 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: '', + 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'); @endsection