From 83c589b46af48fb371f24cf6f1413f19e08c025e Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 2 Mar 2022 17:00:34 +0800 Subject: [PATCH] update --- app/Http/Controllers/AccountController.php | 9 ++-- app/Http/Controllers/MarhunController.php | 3 +- .../views/jananotis/notislelong.blade.php | 49 +++++++++++++++++- .../views/lelong/senarailelong.blade.php | 8 +-- .../lelong/senarailelongtaklaku.blade.php | 4 +- .../views/lelong/senaraisagpemenang.blade.php | 8 +-- .../views/pembayaran/SAGBidItem.blade.php | 1 + .../pembayaran/kaunterpembayaran.blade.php | 2 +- .../views/pembida/senaraipembida.blade.php | 4 +- .../senaraipembidakeseluruhan.blade.php | 2 +- .../views/pengurusanpengguna/index.blade.php | 4 ++ .../views/pengurusanpengguna/roles.blade.php | 2 +- .../views/serahan/laporanserahan.blade.php | 50 ++++++++++++++++++- resources/views/serahan/pembayaran.blade.php | 14 ++++-- .../views/simulasi/senaraisimulasi.blade.php | 2 +- 15 files changed, 131 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 59142949..967a5cb1 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -72,8 +72,8 @@ class AccountController extends Controller return view('account.listbayaranonline',compact('listwinner','lelong_id')); } - public function sahsagonline($lelong_id, $user_id){ - + public function sahsagonline($lelong_id, $user_id) + { $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') ->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id') ->where('lelongbid.lelong_id', $lelong_id) @@ -82,8 +82,6 @@ class AccountController extends Controller ->where('payment.status_payment_opt', 2) ->get()->toArray(); - // dd($senaraisag); - $total_payment = 0; foreach($senaraisag as $index1=>$sagbid){ @@ -97,7 +95,8 @@ class AccountController extends Controller return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id','total_payment')); } - public function sahbayaronline($lelong_id, $user_id){ + public function sahbayaronline($lelong_id, $user_id) + { $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index c8f5f298..dda6fa7f 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -46,8 +46,6 @@ class MarhunController extends Controller $lelongid = LelongBid::select('lelong_id')->where('caw_id','=',$caw->id)->groupBy('lelong_id')->get(); $lelong = Lelong::whereIn('id', $lelongid)->get(); - - return view('marhun.senaraimarhun',compact('lelongbid','lelong')); } @@ -130,6 +128,7 @@ class MarhunController extends Controller $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong.sts_lelong', 0) ->get(); return view('marhun.senarailelongmarhun',compact('senarai')); diff --git a/resources/views/jananotis/notislelong.blade.php b/resources/views/jananotis/notislelong.blade.php index 192be8f6..8330441c 100644 --- a/resources/views/jananotis/notislelong.blade.php +++ b/resources/views/jananotis/notislelong.blade.php @@ -12,7 +12,7 @@ @endif
- +
@@ -48,5 +48,52 @@ $(function () { $('[data-toggle="tooltip"]').tooltip() }) + var tablenotislelong = $('#tablenotislelong').DataTable({ + "columnDefs": [ + { + "targets": 0, + "orderable": false + }, + { + "targets": 3, + "orderable": false + } + ], + order: [[1, 'asc']], + "info": false, + "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'); + + // $('#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(); + // } + // } + // ] + }); + + // $('.addcaw').tooltip(); + // $('.export').tooltip(); + // // $( '.dt-buttons').addClass('btn-group'); + // $( '.addcaw').removeClass('dt-button'); + // $( '.export').removeClass('dt-button'); @endsection diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 3f9301d9..69a1f91d 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -12,7 +12,7 @@ @endif -
+
@@ -85,14 +85,14 @@ } }); - var tablesimulasi = $('#simulasi').DataTable( { + var tablelelong = $('#tablelelong').DataTable( { "columnDefs": [ { "targets": 0, "orderable": false }, { - "targets": 5, + "targets": 6, "orderable": false } ], @@ -132,7 +132,7 @@ function selectall(cb) { - tablesimulasi.rows().nodes().to$().find('input[type="checkbox"]').each(function(){ + tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){ $(this).prop('checked', cb.checked); }) } diff --git a/resources/views/lelong/senarailelongtaklaku.blade.php b/resources/views/lelong/senarailelongtaklaku.blade.php index 16b89424..ca183c3e 100644 --- a/resources/views/lelong/senarailelongtaklaku.blade.php +++ b/resources/views/lelong/senarailelongtaklaku.blade.php @@ -46,14 +46,14 @@ $('[data-toggle="tooltip"]').tooltip() }) - var tablesenarailelongtaklaku = $('#ssenarailelongtaklaku').DataTable({ + var tablesenarailelongtaklaku = $('#senarailelongtaklaku').DataTable({ "columnDefs": [ { "targets": 0, "orderable": false }, { - "targets": 3, + "targets": 6, "orderable": false } ], diff --git a/resources/views/lelong/senaraisagpemenang.blade.php b/resources/views/lelong/senaraisagpemenang.blade.php index a5ade6ae..bb12e6ba 100644 --- a/resources/views/lelong/senaraisagpemenang.blade.php +++ b/resources/views/lelong/senaraisagpemenang.blade.php @@ -10,7 +10,7 @@

{{ $message }}

@endif -
+
@@ -42,15 +42,11 @@ @endsection \ No newline at end of file diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index b224a8af..98e1c0ea 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -69,7 +69,7 @@ "orderable": false }, { - "targets": 6, + "targets": 8, "orderable": false } ], diff --git a/resources/views/pembida/senaraipembida.blade.php b/resources/views/pembida/senaraipembida.blade.php index 5ad480d3..571a4ba0 100644 --- a/resources/views/pembida/senaraipembida.blade.php +++ b/resources/views/pembida/senaraipembida.blade.php @@ -16,7 +16,7 @@ @csrf -
No
+
@@ -89,7 +89,7 @@ "orderable": false }, { - "targets": 4, + "targets": 5, "orderable": false } ], diff --git a/resources/views/pembida/senaraipembidakeseluruhan.blade.php b/resources/views/pembida/senaraipembidakeseluruhan.blade.php index fc245d3c..cc7f977d 100644 --- a/resources/views/pembida/senaraipembidakeseluruhan.blade.php +++ b/resources/views/pembida/senaraipembidakeseluruhan.blade.php @@ -92,7 +92,7 @@ "orderable": false }, { - "targets": 4, + "targets": 5, "orderable": false } ], diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php index e42cd8a1..aabdf4c1 100644 --- a/resources/views/pengurusanpengguna/index.blade.php +++ b/resources/views/pengurusanpengguna/index.blade.php @@ -95,6 +95,10 @@ { "targets": 4, "orderable": false + }, + { + "targets": 5, + "orderable": false } ], order: [[1, 'asc']], diff --git a/resources/views/pengurusanpengguna/roles.blade.php b/resources/views/pengurusanpengguna/roles.blade.php index fb02db1c..59468825 100644 --- a/resources/views/pengurusanpengguna/roles.blade.php +++ b/resources/views/pengurusanpengguna/roles.blade.php @@ -107,7 +107,7 @@ "orderable": false }, { - "targets": 2, + "targets": 3, "orderable": false } ], diff --git a/resources/views/serahan/laporanserahan.blade.php b/resources/views/serahan/laporanserahan.blade.php index ec4018fc..05eabacc 100644 --- a/resources/views/serahan/laporanserahan.blade.php +++ b/resources/views/serahan/laporanserahan.blade.php @@ -4,7 +4,6 @@
- @if ($message = Session::get('success'))

{{ $message }}

@@ -12,7 +11,7 @@ @endif -
+
@@ -48,6 +47,53 @@ $(function () { $('[data-toggle="tooltip"]').tooltip() }) + var tablelaporanserahan = $('#tablelaporanserahan').DataTable({ + "columnDefs": [ + { + "targets": 0, + "orderable": false + }, + { + "targets": 3, + "orderable": false + } + ], + order: [[1, 'asc']], + "info": false, + "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'); + + // $('#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(); + // } + // } + // ] + }); + + // $('.addcaw').tooltip(); + // $('.export').tooltip(); + // // $( '.dt-buttons').addClass('btn-group'); + // $( '.addcaw').removeClass('dt-button'); + // $( '.export').removeClass('dt-button'); diff --git a/resources/views/serahan/pembayaran.blade.php b/resources/views/serahan/pembayaran.blade.php index 594ec942..1b353a3d 100644 --- a/resources/views/serahan/pembayaran.blade.php +++ b/resources/views/serahan/pembayaran.blade.php @@ -5,7 +5,7 @@
-
+
@@ -72,14 +72,22 @@ } }); - var tablesimulasi = $('#simulasi').DataTable( { + var tableserahanpembayaran = $('#serahanpembayaran').DataTable( { "columnDefs": [ { "targets": 0, "orderable": false }, { - "targets": 5, + "targets": 6, + "orderable": false + }, + { + "targets": 7, + "orderable": false + }, + { + "targets": 8, "orderable": false } ], diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 9b008f91..ff6713dd 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -12,7 +12,7 @@ @endif -
No
+