diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 259f2057..d746b047 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -55,7 +55,7 @@ class LelongController extends Controller $arrayinfo = []; $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('fasa','lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); @@ -1422,7 +1422,7 @@ class LelongController extends Controller $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1); - + //dd($sumcajlelong); if($totalbaki > 0) { $bakilelong = $bakilelong + $totalbaki; @@ -1495,7 +1495,7 @@ class LelongController extends Controller 'rugilelong'=>$rugilelong, 'bakilelong'=>$bakilelong, ]); - + //dd($bakilelong); $total_upahkeuntungan2 = $total_upahkeuntungan2 + $total_upahkeuntungan; $total_marhun = $total_marhun + sizeof($databid); $total_berat = $total_berat + $berat; @@ -1507,6 +1507,7 @@ class LelongController extends Controller $total_bakilelong = $total_bakilelong + $bakilelong; $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun; $totalkeuntungan2 = $totalkeuntungan2 + $totalkeuntungan; + $data = Lelong::where('lelong.id','=',$lelong_id) diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 5643daf6..c39fb06a 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -82,7 +82,7 @@ class SimulasiController extends Controller ->where('taglel','=',0) ->where('lelong_tawarruq','=',1) ->select('kodcaw','norujukan','t_lelong','tempoh','kadarupah','upahSim','ansuran','nilaimarhun','pinjaman','bakiupah','cajlain', - 'berat','marhun','percentpinj') + 'berat','marhun','percentpinj','bakipjm') ->get(); } else if($request->fasa == '2'){ @@ -92,7 +92,7 @@ class SimulasiController extends Controller ->where('tagpalsu2','=',0) ->where('taglel','=',0) ->select('kodcaw','norujukan','t_lelong','tempoh','kadarupah','upahSim','ansuran','nilaimarhun','pinjaman','bakiupah','cajlain', - 'berat','marhun','percentpinj') + 'berat','marhun','percentpinj','bakipjm') ->get(); } @@ -158,7 +158,7 @@ class SimulasiController extends Controller "upahsimpan" => $data->upahSim, "ansuran" => $data->ansuran, "nilaimarhun" => $data->nilaimarhun, - "pinjaman" => $data->pinjaman, + "pinjaman" => $data->bakipjm, "bakiupah" => $data->bakiupah, "cajlain" => $data->cajlain, "cajlelong" => 0.00, diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index af6053fe..d5a81fb5 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -18,6 +18,7 @@