From e2bf6f42709bf1ab4b94051514ec24501b480462 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Fri, 25 Nov 2022 17:39:03 +0800 Subject: [PATCH 1/2] update new pada lelong --- app/Http/Controllers/LelongController.php | 15 +++++++++------ app/Http/Controllers/ReportController.php | 7 ++++--- resources/views/lelong/senaraimarhun.blade.php | 6 +++++- resources/views/pdf/pdflelongreport.blade.php | 6 +++++- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 6b69a5c3..648b112a 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -250,8 +250,10 @@ class LelongController extends Controller //$cajlelong += $lel_bid->cajlelong; $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); + $cajlelongnew = round($sumcajlelong, 1, 1); + // $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1); + $cajlelong = $cajlelong + $cajlelongnew; + $totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - $cajlelongnew; if (strpos($totalbaki, '-') !== false) { $rugi = -$totalbaki; $rugilelong += $rugi; @@ -1304,8 +1306,9 @@ class LelongController extends Controller $arraymarhun = []; foreach ($marhuns as $index1=> $cal) { $sumcajlelong = $cal['hargaasas'] * ($lelonglel->cajlelong/100); - $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1); - $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1); + $cajlelongnew = round($sumcajlelong,1,1); + $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew; + $marhuns[$index1]['cajlelong'] = $cajlelongnew; $marhuns[$index1]['baki'] = $totalbaki; $marhuns[$index1]['keuntungan'] = $keuntungan; @@ -1314,7 +1317,7 @@ class LelongController extends Controller $total_hargaasas = $total_hargaasas + $cal['hargaasas']; $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; $total_bakiupah = $total_bakiupah + $cal['bakiupah']; - $total_cazlelong = $total_cazlelong + bcdiv($sumcajlelong,1,1); + $total_cazlelong = $total_cazlelong + $cajlelongnew; array_push($arraymarhun,[ 'norujukan' => $cal['norujukan'], @@ -1324,7 +1327,7 @@ class LelongController extends Controller 'hargaasas' => $cal['hargaasas'], 'pinjaman' => $cal['pinjaman'], 'bakiupah' => $cal['bakiupah'], - 'cajlelong' => $cal['cajlelong'], + 'cajlelong' => $cajlelongnew, 'baki' => $cal['baki'], ]); } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index bb46a616..ba6fe4a2 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -797,8 +797,9 @@ class ReportController extends Controller // dd($customer); $simulasilel = Lelong::where('id',$lelongid)->get(); $sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100); - $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1); - $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1); + $cajlelongnew = round($sumcajlelong,1,1); + $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew; + $marhuns[$index1]['cajlelong'] = $cajlelongnew; $marhuns[$index1]['baki'] = $totalbaki; @@ -828,7 +829,7 @@ class ReportController extends Controller $total_hargaasas = $total_hargaasas + $cal['hargaasas']; $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; $total_bakiupah = $total_bakiupah + $cal['bakiupah']; - $total_cazlelong = $total_cazlelong + bcdiv($sumcajlelong,1,1); + $total_cazlelong = $total_cazlelong + $cajlelongnew; } diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index 1277a272..aaad5b81 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -132,7 +132,11 @@ {{ number_format($total_bakiupah, 2, '.', ',') }} {{ number_format($total_cazlelong, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }} - {{ number_format($bakilelong, 2, '.', ',') }} + @if($bakilelong > 0) + {{ number_format($bakilelong, 2, '.', ',') }} + @else + ({{number_format(-($bakilelong), 2, '.', ',')}}) + @endif diff --git a/resources/views/pdf/pdflelongreport.blade.php b/resources/views/pdf/pdflelongreport.blade.php index 5a5865a5..8735b522 100644 --- a/resources/views/pdf/pdflelongreport.blade.php +++ b/resources/views/pdf/pdflelongreport.blade.php @@ -214,7 +214,11 @@ {{ number_format($total_bakiupah, 2, '.', ',') }} {{ number_format($total_cazlelong, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }} - {{ number_format($bakilelong, 2, '.', ',') }} + @if($bakilelong > 0) + {{ number_format($bakilelong, 2, '.', ',') }} + @else + ({{number_format(-($bakilelong), 2, '.', ',')}}) + @endif From f92fdb477feae64e8c43b6cdb84a229070af1e23 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Fri, 25 Nov 2022 18:09:15 +0800 Subject: [PATCH 2/2] update tarikh pada lelong all --- app/Http/Controllers/LelongController.php | 46 +++++++++---------- .../views/lelong/showlelongallsim.blade.php | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 648b112a..670af09c 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -3688,7 +3688,6 @@ class LelongController extends Controller $kali = $kali; $lelong = Lelong::where('kali','=',$kali)->first(); - // dd($t_simulasi); $cawanganlel = CawanganLelong::where('kali','=',$kali)->get(); // dd($cawangansim); @@ -3757,26 +3756,28 @@ class LelongController extends Controller // dd($bid['id']); $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get(); $berat = $berat + $bid['berat']; + // $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun')); $nilai_marhun = $nilai_marhun + $bid['nilaimarhun']; $pinjaman =$pinjaman + $bid['pinjaman']; $bakiupah = $bakiupah + $bid['bakiupah']; $hargaasas = $hargaasas + $bid['hargaasas']; - $cajlelong = $cajlelong + $bid['cajlelong']; + // $cajlelong = $cajlelong + $bid['cajlelong']; - // $lelongsim = Lelong::where('id',$id)->get(); - // $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); - // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); - // $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1); + $lelongsim = Lelong::where('id',$id)->get(); + $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); + $cajlelongnew = round($sumcajlelong,1,1); + $cajlelong = $cajlelong + $cajlelongnew; + $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew; - // if($totalbaki > 0) - // { - // $bakilelong = $bakilelong + $totalbaki; - // } - // else - // { - // $rugilelong = $rugilelong - $totalbaki; - // } + if($totalbaki > 0) + { + $bakilelong = $bakilelong + $totalbaki; + } + else + { + $rugilelong = $rugilelong - $totalbaki; + } @@ -3788,7 +3789,7 @@ class LelongController extends Controller 'id_cawangan'=> $cawangan['id'], 'cawangan'=>$cawangan['caw_name'], 't_lelong'=>$lelong['tarikh_lelong'], - 't_simulasi'=>$t_lelong['tarikh_lelong'], + 't_lelong'=>$t_lelong['tarikh_lelong'], 'bil_marhun'=>sizeof($databid), 'berat'=>$berat, 'n_marhun'=>$nilai_marhun, @@ -5246,10 +5247,8 @@ class LelongController extends Controller { $kali = $request->kali; - // dd($lelong_id); - - $lelong = Lelong::where('kali','=',$kali)->first(); + $lelonglel = CawanganLelong::where('kali','=',$kali)->get(); // dd($simulasilel); // $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get(); @@ -5297,7 +5296,7 @@ class LelongController extends Controller $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id') ->where('cawangan_lelong.lelong_id','=', $lellel->lelong_id) ->where('cawangan_lelong.kali','=',$kali)->first(); - // dd($t_simulasi); + // dump($t_lelong); // dd($databid->toArray()); $packet = 0; $berat = 0; @@ -5322,8 +5321,9 @@ class LelongController extends Controller $lelongsim = Lelong::where('id',$id)->get(); $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); - $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); - $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1); + $cajlelongnew = round($sumcajlelong,1,1); + $cajlelong = $cajlelong + $cajlelongnew; + $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew; if($totalbaki > 0) { @@ -5342,7 +5342,7 @@ class LelongController extends Controller array_push($arraycaw,[ 'id_cawangan'=> $cawangan['id'], 'cawangan'=>$cawangan['caw_name'], - 't_lelong'=>$lelong['tarikh_lelong'], + 't_lelong'=>$t_lelong['tarikh_lelong'], 'bil_marhun'=>sizeof($databid), // 'jbg'=>$bid['jbg'], 'berat'=>$berat, @@ -5366,7 +5366,7 @@ class LelongController extends Controller $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun; $total_bakiupah = $total_bakiupah + $bakiupah; - + // dd($t_lelong); $data = Lelong::where('kali','=',$kali) ->first(); } diff --git a/resources/views/lelong/showlelongallsim.blade.php b/resources/views/lelong/showlelongallsim.blade.php index 74032233..7a4da1cc 100644 --- a/resources/views/lelong/showlelongallsim.blade.php +++ b/resources/views/lelong/showlelongallsim.blade.php @@ -159,7 +159,7 @@ {{$index+1}} @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_simulasi'] ); + $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); @endphp