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

Fix senarai lelong

Browse Source
This commit is contained in:
Amir
2022-11-09 16:41:13 +08:00
parent be2590f268
commit de79d7bd79
5 changed files with 157 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+121 -112
View File
@@ -40,6 +40,7 @@ use App\Models\Negeri;
use Carbon\Carbon;
use App\Models\LelongTebus;
use App\Models\Payment;
use App\Models\TangguhLelong;
use App\Models\Tetapan;
use App\Models\TransaksiKeuntungan;
@@ -92,55 +93,81 @@ class LelongController extends Controller
public function exportData($lelongid)
{
$lelong = Lelong::where('id', $lelongid)->first();
$lelong = Lelong::with('cawangan')->where('lelong.id', $lelongid)->first();
$lelongbycaw = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
->select('cawangan.caw_name', 'cawangan.caw_code', 'cawangan.id')
->where('lelong.id', $lelongid)
return view('lelong.exportData', compact('lelong'));
}
public function exportDataToApi(Request $request)
{
$cawanganLelong = CawanganLelong::with('cawangan')->where('caw_id', $request->cawangan)->where('lelong_id', $request->lelong_id)->first();
$lelongBidMaster = LelongBid::where('lelong_id', $request->lelong_id)
->where('status_jual', 1)
->where('status_payment', 1)
->get();
// dd($lelongbycaw);
foreach ($lelongbycaw as $index => $data) {
$lelongbycaw[$index]['lelong'] = $lelong->toArray();
$lelongbid = Lelongbid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->where('lelong_id', $lelongid)
->where('lelongbid.caw_id', $data['id'])
->where('status_jual', 1)
->where('lelongbidder.status_bidder', 1)
// ->where('lelongbidder.status_payment', 1)
->get();
// dd($lelongbid);
$lelongbid = $lelongBidMaster->pluck('id');
$lelongbidId = $lelongBidMaster->keyBy('id');
foreach ($lelongbid as $index2 => $value)
{
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $value['id'])->get();
$lelongbid[$index2]['lelongbidmarhun'] = $lelongbidmarhun->toArray();
$lelongbidmarhun = LelongBidMarhun::whereIn('lelongbid_id', $lelongbid)->get();
$insertbatchlel = Http::withOptions(['verify' => config('app.api_verify')])
->post(config('app.api_url').'taglel/update',[
'kodcaw'=>$cawsimulasi['cawangan']->caw_code,
'norujukan'=>$data->norujukan
])
->json();
foreach ($lelongbidmarhun as $index) {
if ($lelongbidId[$index->lelongbid_id]) {
$index['norujukan'] = $lelongbidId[$index->lelongbid_id]->norujukan;
}
$lelongbycaw[$index]['lelongbid'] = $lelongbid->toArray();
}
return view('lelong.exportData', compact('lelongbycaw', 'lelong'));
$paymentOnline = Payment::where('lelong_id', $request->lelong_id)
->where('status', '=', 2)
->where('remark', '=', 'BERJAYA BAYARAN ONLINE')
->where('kodcaw', '=', $cawanganLelong->cawangan->caw_code)
->sum('total_payment');
$paymentTunai = Payment::where('lelong_id', $request->lelong_id)
->where('status', '=', 1)
->where('kodcaw', '=', $cawanganLelong->cawangan->caw_code)
->sum('total_payment');
// dd($paymentOnline, $paymentTunai);
// dd($lelongBidMaster->toArray(), $lelongbidmarhun->toArray(), floatval($paymentOnline), floatval($paymentTunai));
$exportData = Http::withOptions(['verify' => config('app.api_verify')])->post(
config('app.api_url') . 'exportLelong',
[
'kodcaw' => $cawanganLelong->cawangan->caw_code,
'tarikh' => $request->tarikh_lelong,
'lelongbid' => $lelongBidMaster->toArray(),
'lelongbidmarhun' => $lelongbidmarhun->toArray(),
'gldetail' => floatval($paymentOnline),
'tunai' => floatval($paymentTunai),
]
)->json();
$cawanganLelong->export_data_sts = "SUCCESS";
$cawanganLelong->update();
return redirect()->route('lelong.exportDataByCawangan', $request->lelong_id)->with('success', 'Data berjaya di export!');
}
public function show(Request $request, $id)
{
$lelong_id = $id;
$lelong = Lelong::where('id','=',$id)->first();
// $cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get();
$cawanganlel = CawanganLelong::with(['cawangan', 'lelongBid.lelongBidMarhun'])->where('lelong_id', '=', $id)->get();
$lelkarat = LelKarat::where('lelong_id','=',$id)->get();
$lelong = Lelong::with(['cawangan', 'lelongBid.lelongBidMarhun', 'lelKarat'])->first();
$lelkarat = $lelong->lelKarat;
$jeniskarat = JenisKarat::all();
$arraydata = [];
$cawanganAll = $lelong->cawangan;
$lelBidGroupByCawId = $lelong->lelongBid->groupBy('caw_id');
foreach ($cawanganAll as $caw_key_by_id) {
if ($lelBidGroupByCawId[$caw_key_by_id['id']]); {
$caw_key_by_id['lelongBid'] = $lelBidGroupByCawId[$caw_key_by_id['id']];
}
}
$arraycaw = [];
$data = [];
$total_marhun = 0;
$total_berat = 0;
@@ -171,7 +198,7 @@ class LelongController extends Controller
$totalkeuntungan2 = 0;
foreach ($cawanganlel as $cawlel) {
foreach ($cawanganAll as $caw) {
$berat = 0;
$nilai_marhun = 0;
$pinjaman = 0;
@@ -180,7 +207,7 @@ class LelongController extends Controller
$cajlelong = 0;
$rugilelong = 0;
$bakilelong = 0;
foreach ($cawlel->lelongBid as $lel_bid) {
foreach ($caw['lelongBid'] as $lel_bid) {
$total_marhun += 1;
$nilai_marhun += $lel_bid->nilaimarhun;
$pinjaman += $lel_bid->pinjaman;
@@ -189,22 +216,16 @@ class LelongController extends Controller
$hargaasas += $lel_bid->hargaasas;
$cajlelong += $lel_bid->cajlelong;
$lelongcaj = Lelong::where('id',$id)->get();
$sumcajlelong = $lel_bid['hargaasas'] * ($lelongcaj[0]['cajlelong']/100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
if(strpos($totalbaki, '-') !== false)
{
$rugi = -$totalbaki;
$rugilelong += $rugi;
$sumcajlelong = $lel_bid['hargaasas'] * ($lelong->cajlelong / 100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
$totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - bcdiv($sumcajlelong, 1, 1);
if (strpos($totalbaki, '-') !== false) {
$rugi = -$totalbaki;
$rugilelong += $rugi;
} else {
$baki = $totalbaki;
$bakilelong += $baki;
}
else {
$baki = $totalbaki;
$bakilelong += $baki;
}
// dd($totalbaki);
foreach ($lel_bid->lelongBidMarhun as $lel_bid_marhun) {
if ($lel_bid_marhun->karat == "24.0Kgb") {
@@ -217,7 +238,7 @@ class LelongController extends Controller
$total22K += $lel_bid_marhun->berat;
} else if ($lel_bid_marhun->karat == "21.0K") {
$total21K += $lel_bid_marhun->berat;
} else if ($lel_bid_marhun->karat == "20.0Kp") {
} else if ($lel_bid_marhun->karat == "20.0K") {
$total20K += $lel_bid_marhun->berat;
} else if ($lel_bid_marhun->karat == "18.0Kp") {
$total18Kp += $lel_bid_marhun->berat;
@@ -230,31 +251,23 @@ class LelongController extends Controller
}
}
}
array_push($arraycaw,[
'id_cawangan'=> $cawlel['caw_id'],
'cawangan' => $cawlel->cawangan->caw_name,
't_lelong'=>$lelong['tarikh_lelong'],
'bil_marhun'=>sizeof($cawlel->lelongBid),
'berat'=>$berat,
'n_marhun'=>$nilai_marhun,
'pinjaman'=>$pinjaman,
'upahsimpan'=>$bakiupah,
'bakiupah'=>$bakiupah,
'hargaasas'=>$hargaasas,
'cajlelong'=>$cajlelong,
'rugilelong'=>$rugilelong,
'bakilelong'=>$bakilelong,
array_push($arraycaw, [
'id_cawangan' => $caw['id'],
'cawangan' => $caw->caw_name,
't_lelong' => $lelong->tarikh_lelong,
'bil_marhun' => count($caw['lelongBid']),
'berat' => $berat,
'n_marhun' => $nilai_marhun,
'pinjaman' => $pinjaman,
'upahsimpan' => $bakiupah,
'bakiupah' => $bakiupah,
'hargaasas' => $hargaasas,
'cajlelong' => $cajlelong,
'rugilelong' => $rugilelong,
'bakilelong' => $bakilelong,
]);
// $total_marhun = $total_marhun + sizeof($databid);
// $total_berat = $total_berat + $berat;
// $total_pinjaman = $total_pinjaman + $pinjaman;
// $total_hargaasas = $total_hargaasas + $hargaasas;
// $total_cazlelong = $total_cazlelong + $cajlelong;
// $total_rugilelong = $total_rugilelong + $rugilelong;
// $total_bakilelong = $total_bakilelong + $bakilelong;
// $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
// $total_bakiupah = $total_bakiupah + $bakiupah;
$total_nilaimarhun += $nilai_marhun;
$total_pinjaman += $pinjaman;
$total_bakiupah += $bakiupah;
@@ -263,45 +276,41 @@ class LelongController extends Controller
$total_cazlelong += $cajlelong;
$total_berat += $berat;
$total_hargaasas += $hargaasas;
$data = Lelong::where('lelong.id','=',$lelong_id)
->get();
$tarikhkemaskini = LelKarat::where('lelong_id','=',$id)
->where('karat','=',"22.0K")->first();
// dd($tarikhkemaskini);
}
return view('lelong.showlelong',compact(
'arraycaw',
'total_marhun',
'total_berat',
'total_nmarhun',
'total_pinjaman',
'total_upah',
'total_hargaasas',
'total_cazlelong',
'total_rugilelong',
'total_bakilelong',
'total24Kgb',
'total24K',
'total23k',
'total22K',
'total21K',
'total20K',
'total18Kp',
'total18K',
'total14Kp',
'total14K',
'total9K',
'lelkarat',
'lelong_id',
'jeniskarat',
'data',
'total_bakiupah',
'total_nilaimarhun','tarikhkemaskini'));
$tarikhkemaskini = $lelong->lelKarat[0];
$data = $lelong;
return view('lelong.showlelong', compact(
'arraycaw',
'total_marhun',
'total_berat',
'total_nmarhun',
'total_pinjaman',
'total_upah',
'total_hargaasas',
'total_cazlelong',
'total_rugilelong',
'total_bakilelong',
'total24Kgb',
'total24K',
'total23k',
'total22K',
'total21K',
'total20K',
'total18Kp',
'total18K',
'total14Kp',
'total14K',
'total9K',
'lelkarat',
'lelong_id',
'jeniskarat',
'data',
'total_bakiupah',
'total_nilaimarhun',
'tarikhkemaskini'
));
}
public function show2(Request $request, $id)
app/Models/Lelong.php
+5
View File
@@ -35,4 +35,9 @@ class Lelong extends Model
{
return $this->hasMany(LelongBid::class, 'lelong_id', 'id');
}
public function lelKarat()
{
return $this->hasMany(LelKarat::class, 'lelong_id', 'id');
}
}
resources/views/lelong/exportData.blade.php
+26 -27
View File
@@ -6,9 +6,14 @@
<div class="card">
<div class="card-header">Export Data Lelong</div>
<div class="card-body">
<a href="javascript:window.history.go(-1);" class="btn btn-light">
<a href="{{ route('lelong.senarailelong') }}" class="btn btn-light">
<h3><i class="fas fa-arrow-alt-circle-left"></i></h3>
</a>
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<p>ID Lelong: {{$lelong['id']}}</p>
<p>Tarikh Lelong: {{$lelong['tarikh_lelong']}}</p>
<p>Masa Mula Lelong: {{$lelong['masamula_lelong']}}</p>
@@ -19,36 +24,30 @@
<th>Bil</th>
<th>Kod Cawangan</th>
<th>Cawangan</th>
<th>Status</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@foreach($lelongbycaw as $data)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$data['caw_code']}}</td>
<td>
{{$data['caw_name']}}
{{--<table class="table">
<thead class="bg-secondary text-white">
<tr>
<th>No Rujukan</th>
<th>Marhun</th>
</tr>
</thead>
<tbody>
@foreach($data['lelongbid'] as $value)
<tr>
<td>{{$value['norujukan']}}</td>
<td>{{$value['marhun']}}</td>
</tr>
@endforeach
</tbody>
</table>--}}
</td>
<td><button class="btn btn-primary">EXPORT</button></td>
</tr>
@endforeach
<form action="{{ route('lelong.exportDataToApi') }}" method="POST">
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong->id }}">
<input type="hidden" name="tarikh_lelong" value="{{ $lelong->tarikh_lelong }}">
@foreach($lelong->cawangan as $data)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$data->caw_code}}</td>
<td>{{$data->caw_name}}</td>
@if($data->pivot->export_data_sts == null)
<td><span class="badge badge-danger">Belum Selesai</span></td>
<td><button type="submit" name="cawangan" value="{{ $data->id }}" class="btn btn-sm btn-primary">EXPORT <i class="fas fa-file-export"></i></button></td>
@elseif($data->pivot->export_data_sts == "SUCCESS")
<td class="text-success">Selesai</td>
<td></td>
@endif
</tr>
@endforeach
</form>
</tbody>
</table>
</div>
resources/views/lelong/showlelong.blade.php
+4 -11
View File
@@ -16,7 +16,7 @@
<br>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
{{ $message }}
</div>
@endif
<form id="exportform" action="{{route('lelong.exportlelong')}}" method="POST">
@@ -40,23 +40,22 @@
<td>Keuntungan Keseluruhan : RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
</tr>
<tr>
@foreach($data as $data1)
<td>Tarikh Lelong :
@php
$today = date('d-m-Y');
$kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
$myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
$myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp
</td>
@endforeach
</tr>
</table>
</div>
<div class="col-md-2"></div>
<div class="col-md-5">
<div class=""></div>
<table class="table table-striped table-xl" id="conclusion2" style="width:100%">
<td>
{{-- {{dd($kemaskini)}} --}}
@@ -78,9 +77,7 @@
<td>Caj Lelong Keseluruhan : RM{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
</tr>
<tr>
@foreach($data as $data)
<td>Tempoh : {{$data['jbg'] }}</td>
@endforeach
</tr>
</table>
</div>
@@ -226,11 +223,6 @@
</div>
</div>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
{{-- {{$cawangan[0] }} --}}
</div>
<div class="modal fade" tabindex="-1" id="modalfilter">
@@ -384,6 +376,7 @@
"orderable": false
}
],
"scrollX": true,
order: [[0, 'asc']],
// "ordering": false,
"searching":false,
routes/web.php
+1
View File
@@ -195,6 +195,7 @@ Route::group(['prefix'=>'lelong'], function () {
Route::post('/pdflapbrglelpembida',['as'=>'lelong.pdflapbrglelpembida','uses'=>'LelongController@pdflapbrglelpembida']);
Route::get('/export-data/{lelongid}', ['as'=>'lelong.exportDataByCawangan', 'uses'=>'LelongController@exportData']);
Route::post('/exportdatatoapi', ['as'=>'lelong.exportDataToApi', 'uses'=>'LelongController@exportDataToApi']);
});