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

update

Browse Source
This commit is contained in:
faiqahzaman
2022-03-02 17:00:34 +08:00
parent 0382a62b7c
commit 83c589b46a
15 changed files with 131 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+4 -5
View File
@@ -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();
app/Http/Controllers/MarhunController.php
+1 -2
View File
@@ -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'));
resources/views/jananotis/notislelong.blade.php
+48 -1
View File
@@ -12,7 +12,7 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="senaraimarhun" style="width:100%">
<table class="table table-striped table-xl" id="tablenotislelong" 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>
@@ -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: '<i class="fas fa-plus" id="test"></i>',
// 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: '<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');
</script>
@endsection
resources/views/lelong/senarailelong.blade.php
+4 -4
View File
@@ -12,7 +12,7 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="lelong" style="width:100%">
<table class="table table-striped table-xl text-center" id="tablelelong" 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>
@@ -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);
})
}
resources/views/lelong/senarailelongtaklaku.blade.php
+2 -2
View File
@@ -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
}
],
resources/views/lelong/senaraisagpemenang.blade.php
+2 -6
View File
@@ -10,7 +10,7 @@
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="tablekaunter" style="width:100%">
<table class="table table-striped table-xl text-center" id="tablesagmenang" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -42,15 +42,11 @@
</div>
<script>
var tablekaunter = $('#tablekaunter').DataTable({
var tablesagmenang = $('#tablesagmenang').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 6,
"orderable": false
}
],
order: [[1, 'asc']],
resources/views/pembayaran/SAGBidItem.blade.php
+1
View File
@@ -354,6 +354,7 @@
}
}
</script>
@endsection
resources/views/pembayaran/kaunterpembayaran.blade.php
+1 -1
View File
@@ -69,7 +69,7 @@
"orderable": false
},
{
"targets": 6,
"targets": 8,
"orderable": false
}
],
resources/views/pembida/senaraipembida.blade.php
+2 -2
View File
@@ -16,7 +16,7 @@
<form id="exportform" action="{{route('pengguna.export')}}" method="POST">
@csrf
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="pengguna" style="width:100%">
<table class="table table-striped table-xl text-center" id="pengguna" 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>
@@ -89,7 +89,7 @@
"orderable": false
},
{
"targets": 4,
"targets": 5,
"orderable": false
}
],
resources/views/pembida/senaraipembidakeseluruhan.blade.php
+1 -1
View File
@@ -92,7 +92,7 @@
"orderable": false
},
{
"targets": 4,
"targets": 5,
"orderable": false
}
],
resources/views/pengurusanpengguna/index.blade.php
+4
View File
@@ -95,6 +95,10 @@
{
"targets": 4,
"orderable": false
},
{
"targets": 5,
"orderable": false
}
],
order: [[1, 'asc']],
resources/views/pengurusanpengguna/roles.blade.php
+1 -1
View File
@@ -107,7 +107,7 @@
"orderable": false
},
{
"targets": 2,
"targets": 3,
"orderable": false
}
],
resources/views/serahan/laporanserahan.blade.php
+48 -2
View File
@@ -4,7 +4,6 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
@@ -12,7 +11,7 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="senaraimarhun" style="width:100%">
<table class="table table-striped table-xl" id="tablelaporanserahan" 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>
@@ -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: '<i class="fas fa-plus" id="test"></i>',
// 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: '<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');
</script>
resources/views/serahan/pembayaran.blade.php
+11 -3
View File
@@ -5,7 +5,7 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<table class="table table-striped table-xl text-center" style="width:100%">
<table class="table table-striped table-xl text-center" id="serahanpembayaran" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -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
}
],
resources/views/simulasi/senaraisimulasi.blade.php
+1 -1
View File
@@ -12,7 +12,7 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="simulasi" style="width:100%">
<table class="table table-striped table-xl text-center" id="simulasi" 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>