From 391f6f81faeee61e2be0be476c14e0e073ca04d5 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 23 Mar 2023 11:34:24 +0800 Subject: [PATCH] update simulasi cajlelong dan baki lelong --- app/Http/Controllers/ReportController.php | 16 +++++++++++---- app/Http/Controllers/SimulasiController.php | 13 ++++++------ .../views/lelong/showlelongdone.blade.php | 2 +- .../views/simulasi/senaraimarhunlel.blade.php | 20 +++++++++---------- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 3e48bf66..c65a27a8 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -678,6 +678,8 @@ class ReportController extends Controller $total_rugilelong = 0; $total_baki = 0; + $simulasilel = Simulasi::with('cawangan')->find($simulasi_id); + $marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id') // ->join('gadai','simulasibid.norujukan','=','gadai.norujukan') ->where('simulasi_id','=',$simulasi_id) @@ -721,6 +723,12 @@ class ReportController extends Controller // dd($customer); // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); + $sumcajlelong = $cal['hargaasas'] * ($simulasilel->cajlelong/100); + $cajlelongnew = round($sumcajlelong,1,1); + $baki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew; + $marhuns[$index1]['cajlelong'] = $cal['cajlelong']; + $marhuns[$index1]['baki'] = $baki; + $marhuns[$index1]['keuntungan'] = $keuntungan; $marhuns[$index1]['nama'] = $customer; @@ -735,8 +743,8 @@ class ReportController extends Controller 'hargaasas' => $cal['hargaasas'], 'pinjaman' => $cal['pinjaman'], 'bakiupah' => $cal['bakiupah'], - 'cajlelong' => $cal['cajlelong'], - 'baki' => $cal['baki'], + 'cajlelong' => $cajlelongnew, + 'baki' => $baki, ]); if($cal['baki'] > 0) @@ -753,8 +761,8 @@ class ReportController extends Controller $total_hargaasas = $total_hargaasas + $cal['hargaasas']; $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; $total_bakiupah = $total_bakiupah + $cal['bakiupah']; - $total_cajlelong = $total_cajlelong + $cal['cajlelong']; - $total_baki = $total_baki + $cal['baki']; + $total_cajlelong = $total_cajlelong + $cajlelongnew; + $total_baki = $total_baki + $baki; $datacaw = Cawangan::where('id','=',$cawid) ->get(); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index ca2767bb..889ca2d3 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -980,7 +980,7 @@ class SimulasiController extends Controller $cajlelongnew = round($sumcajlelong, 1, 1); // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); $cajlelong = $cajlelong + $cajlelongnew; - $totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - $sim_bid['cajlelong']; + $totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - $cajlelongnew; if(strpos($totalbaki, '-') !== false) { $rugi = -$totalbaki; @@ -1599,7 +1599,8 @@ class SimulasiController extends Controller // $simulasilel = Simulasi::where('id',$simulasi_id)->get(); $sumcajlelong = $cal['hargaasas'] * ($simulasilel->cajlelong/100); - $baki = $cal['baki']; + $cajlelongnew = round($sumcajlelong,1,1); + $baki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew; $marhuns[$index1]['cajlelong'] = $cal['cajlelong']; $marhuns[$index1]['baki'] = $baki; @@ -1608,8 +1609,8 @@ class SimulasiController extends Controller $total_hargaasas = $total_hargaasas + $cal['hargaasas']; $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; $total_bakiupah = $total_bakiupah + $cal['bakiupah']; - $total_baki = $total_baki + $cal['baki']; - $total_cazlelong = $total_cazlelong + $cal['cajlelong']; + $total_baki = $total_baki + $baki; + $total_cazlelong = $total_cazlelong + $cajlelongnew; array_push($arraymarhun,[ @@ -1621,8 +1622,8 @@ class SimulasiController extends Controller 'hargaasas' => $cal['hargaasas'], 'pinjaman' => $cal['pinjaman'], 'bakiupah' => $cal['bakiupah'], - 'cajlelong' => $cal['cajlelong'], - 'baki' => $cal['baki'], + 'cajlelong' => $cajlelongnew, + 'baki' => $baki, ]); } diff --git a/resources/views/lelong/showlelongdone.blade.php b/resources/views/lelong/showlelongdone.blade.php index 0ca6883f..e349285a 100644 --- a/resources/views/lelong/showlelongdone.blade.php +++ b/resources/views/lelong/showlelongdone.blade.php @@ -157,7 +157,7 @@
RM
- + diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php index b581d722..c860de79 100644 --- a/resources/views/simulasi/senaraimarhunlel.blade.php +++ b/resources/views/simulasi/senaraimarhunlel.blade.php @@ -125,19 +125,19 @@ JUMLAH KESELURUHAN - {{ number_format($total_berat, 2, '.', ',') }} - {{ number_format($total_nilaimarhun, 2, '.', ',') }} + {{ number_format($total_berat, 2, '.', ',') }} + {{ number_format($total_nilaimarhun, 2, '.', ',') }} {{--{{ number_format($total_hargaasas, 2, '.', ',') }}--}} - {{ number_format($total_pinjaman, 2, '.', ',') }} - {{ number_format($total_bakiupah, 2, '.', ',') }} - {{ number_format($total_cazlelong, 2, '.', ',') }} - {{ number_format($total_hargaasas, 2, '.', ',') }} + {{ number_format($total_pinjaman, 2, '.', ',') }} + {{ number_format($total_bakiupah, 2, '.', ',') }} + {{ number_format($total_cazlelong, 2, '.', ',') }} + {{ number_format($total_hargaasas, 2, '.', ',') }} {{--{{ number_format($total_bakiupah, 2, '.', ',') }}--}} - @if($total_baki > 0) - {{ number_format($total_baki, 2, '.', ',') }} + @if($bakilelong > 0) + {{ number_format($bakilelong, 2, '.', ',') }} @else - ({{number_format(-($total_baki), 2, '.', ',')}}) - @endif + ({{number_format(-($bakilelong), 2, '.', ',')}}) + @endif