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

Merge branch 'main' into afiqhamzah-feat-add-capture-marhun-picture

Browse Source
This commit is contained in:
afiq.hamzah
2022-12-05 15:30:49 +08:00
parent 14673975ef e9ecef4328
commit 2c997c0e00
7 changed files with 129 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Mobile/LelongMobileController.php
+32 -28
View File
@@ -184,41 +184,45 @@ class LelongMobileController extends Controller
return response()->json($lelongbidder);
}
public function bidRecordByCawangan($userId, Request $request)
public function bidRecordByCawangan($userId)
{
$groupCawangan = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->where('user_id', '=', $userId)
->where('lelong_id', $request->lelongId)
->select('caw_id', 'caw_name')
->groupBy('caw_id')
->get()->toArray();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateString();
$lelong = Lelong::where('tarikh_lelong', '=', $currentdate)->select('id')->first();
foreach ($groupCawangan as $index => $cawangan) {
$lelongBidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $userId)
->where('caw_id', $cawangan)
->where('lelong_id', $request->lelongId)
if ($lelong) {
$groupCawangan = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->where('user_id', '=', $userId)
->where('lelong_id', $lelong->id)
->select('caw_id', 'caw_name')
->groupBy('caw_id')
->get()->toArray();
$total_hargabida = 0;
$total_berat = 0;
foreach ($lelongBidder as $index1 => $data) {
$fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get();
$lelongBidder[$index1]['filemarhun'] = $fileMarhun;
foreach ($groupCawangan as $index => $cawangan) {
$total_hargabida += $data['hargabida'];
$total_berat += $data['berat'];
$marhun = LelongBidMarhun::where('lelongbid_id', '=', $data['id'])->get()->toArray();
$lelongBidder[$index1]['lelongbidmarhun'] = $marhun;
$lelongBidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $userId)
->where('caw_id', $cawangan)
->where('lelong_id', $lelong->id)
->get()->toArray();
$total_hargabida = 0;
$total_berat = 0;
foreach ($lelongBidder as $index1 => $data) {
$fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get();
$lelongBidder[$index1]['filemarhun'] = $fileMarhun;
$total_hargabida += $data['hargabida'];
$total_berat += $data['berat'];
$marhun = LelongBidMarhun::where('lelongbid_id', '=', $data['id'])->get()->toArray();
$lelongBidder[$index1]['lelongbidmarhun'] = $marhun;
}
$groupCawangan[$index]['total_berat'] = number_format((float)$total_berat, 2, '.', '');
$groupCawangan[$index]['total_bidaan'] = number_format((float)$total_hargabida, 2, '.', '');
$groupCawangan[$index]['lelongbid'] = $lelongBidder;
}
$groupCawangan[$index]['total_berat'] = number_format((float)$total_berat, 2, '.', '');
$groupCawangan[$index]['total_bidaan'] = number_format((float)$total_hargabida, 2, '.', '');
$groupCawangan[$index]['lelongbid'] = $lelongBidder;
}
if ($groupCawangan) {
return response()->json([
'success' => true,
'lelongbidder' => $groupCawangan
config/database.php
+7 -7
View File
@@ -62,13 +62,13 @@ return [
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
'modes' => [
//'ONLY_FULL_GROUP_BY', // Disable this to allow grouping by one column
'STRICT_TRANS_TABLES',
'NO_ZERO_IN_DATE',
'NO_ZERO_DATE',
'ERROR_FOR_DIVISION_BY_ZERO',
'NO_AUTO_CREATE_USER',
'NO_ENGINE_SUBSTITUTION'
// //'ONLY_FULL_GROUP_BY', // Disable this to allow grouping by one column
// 'STRICT_TRANS_TABLES',
// 'NO_ZERO_IN_DATE',
// 'NO_ZERO_DATE',
// 'ERROR_FOR_DIVISION_BY_ZERO',
// 'NO_AUTO_CREATE_USER',
// 'NO_ENGINE_SUBSTITUTION'
],
],
resources/views/pembida/detailsbidaan.blade.php
+12 -6
View File
@@ -3,11 +3,17 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div><br>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="javascript:window.history.go(-1);" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
senarai SAG Menang
</div>
</div>
<div class="card-body">
@if ($message = Session::get('failed'))
<div class="alert alert-danger">
<p>{{ $message }}</p>
@@ -25,7 +31,7 @@
</div>
</div> -->
</div>
<table class="table table-striped table-xl text-center" id="butirangadai" style="width:100%; margin-top:1%;">
<table class="table table-bordered table-xl text-center" id="butirangadai" style="width:100%; margin-top:1%;">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
resources/views/pembida/detailsbidaanbelumbayar.blade.php
+43 -15
View File
@@ -3,11 +3,17 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div><br>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="javascript:window.history.go(-1);" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
senarai Sag Untuk Isytihar Tak Laku
</div>
</div>
<div class="card-body">
@if ($message = Session::get('failed'))
<div class="alert alert-danger">
<p>{{ $message }}</p>
@@ -20,10 +26,10 @@
<div class="container">
</div>
<table class="table table-striped table-xl text-center" id="butirangadai" style="width:100%; margin-top:1%;">
<table class="table table-bordered table-xl text-center" id="butirangadai" style="width:100%; margin-top:1%;">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" class="check_all"></th>
<th><input type="checkbox" aria-label="Checkbox for following text input" id="checkall"></th>
<th>Bil</th>
<th>No Rujukan</th>
<th>Pembida</th>
@@ -37,7 +43,7 @@
<tbody>
@foreach($infos as $index=> $inf)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $inf['norujukan'] }}" class="custom_name"></td>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $inf['norujukan'] }}" class="checkbox"></td>
<td>{{ $loop->iteration }}</td>
<td>{{ $inf['norujukan'] }}</td>
<td>{{ $inf['nama_bidder'] }}</td>
@@ -67,6 +73,7 @@
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
@@ -128,11 +135,32 @@
$( '.addcaw').removeClass('dt-button');
$( '.export').removeClass('dt-button');
</script>
<script>
$(".check_all").on("click", function(){
$(".custom_name").each(function(){
$(this).attr("checked", true);
});
});
</script>
<script type='text/javascript'>
$(document).ready(function(){
// Check or Uncheck All checkboxes
$("#checkall").change(function(){
var checked = $(this).is(':checked');
if(checked){
$(".checkbox").each(function(){
$(this).prop("checked",true);
});
}else{
$(".checkbox").each(function(){
$(this).prop("checked",false);
});
}
});
// Changing state of CheckAll checkbox
$(".checkbox").click(function(){
if($(".checkbox").length == $(".checkbox:checked").length) {
$("#checkall").prop("checked", true);
} else {
$("#checkall").prop("checked", false);
}
});
});
</script>
@endsection
resources/views/pembida/pembayaranbidaan.blade.php
+15 -9
View File
@@ -4,25 +4,31 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div><br>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="javascript:window.history.go(-1);" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Senarai Pembayaran Bidaan
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<h4> Senarai Pembayaran Bidaan </h4>
<p><i class="fas fa-caret-right"></i> {{ $getkodcaw['caw_name'] }}</p>
<div class="row">
{{-- <div class="row">
<div class="text-center">
@if($listwinner != NULL)
<a class="btn btn-success" href="{{ route('importdata.exportdatacawangan',[$kodcaw,$lelong_id]) }}">Export Data Lelong</a>
@endif
</div>
</div>
<table class="table table-striped table-xl text-center" id="sahsagonline" style="width:100%">
</div> --}}
<table class="table table-bordered table-xl text-center" id="sahsagonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
@@ -62,7 +68,7 @@
@endif
</td>
<td>
<a href="{{ route('pembida.detailsbidaan', [ 'user_id'=>$winner['details']['id'], $kodcaw ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
<a class="btn m-1 btn-info" href="{{ route('pembida.detailsbidaan', [ 'user_id'=>$winner['details']['id'], $kodcaw ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
</td>
</tr>
@endforeach
resources/views/pembida/senlelbelumbayarbidaan.blade.php
+10 -3
View File
@@ -4,14 +4,21 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Bidaan Belum Bayar
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<table class="table table-bordered table-xl text-center" id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -32,7 +39,7 @@
echo($t_lelong);
@endphp</td>
<td class="text-left">
<a href=" {{ route('pembida.belumbayarbidaan', ['lelong_id'=>$lel['lelong_id'], 'kodcaw'=>$lel['kodcaw']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
<a class="btn m-1 btn-info" href=" {{ route('pembida.belumbayarbidaan', ['lelong_id'=>$lel['lelong_id'], 'kodcaw'=>$lel['kodcaw']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
<span class="m-2">{{ $lel['caw_name']}}
</span><br>
</td>
resources/views/pembida/senlelpembayaranbidaan.blade.php
+10 -3
View File
@@ -4,13 +4,20 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="col">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Senarai Pembayaran Bidaan
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<table class="table table-bordered table-xl text-center" id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -36,7 +43,7 @@
@endphp</td>
<td class="text-left">
@foreach($lel['detailsinfo'] as $details)
<a href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
<a class="btn m-1 btn-info" href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
<span class="m-2">{{ $details['caw_name']}}
</span><br>
@endforeach