diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 038c7672..5705b8bc 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -961,13 +961,8 @@ class LelongController extends Controller } public function senaraimarhun($lelongid, $cawid){ - // $marhun = LelongBid::->get(); - $keuntungan = 0; - - $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') - // ->join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid) ->select( 'lelongbid.t_lelong', @@ -986,16 +981,6 @@ class LelongController extends Controller 'lelongbid.bakiupah', 'lelongbid.status_jual', 'lelongbid.jbg' - // 'gadai.pinjaman as pinjasal', - // 'gadai.bakipjm', - // 'gadai.bakihargajualan', - // 'gadai.upah12', - // 'gadai.ansakhir', - // 'gadai.tempoh', - // 'gadai.tempohbayar', - // 'gadai.kadarupah', - // 'gadai.nokp', - // 'gadai.bakiupah as upah6bulan' ) ->get()->toArray(); // dd($marhuns); @@ -2322,7 +2307,7 @@ class LelongController extends Controller $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') - ->join('gadai','lelongbid.norujukan','=','gadai.norujukan') + // ->join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid) ->select( 'lelongbid.t_lelong', @@ -2338,28 +2323,28 @@ class LelongController extends Controller 'lelongbid.baki', 'lelongbid.bakiupah', 'lelongbid.status_jual', - 'lelongbid.jbg', - 'gadai.bakipjm', - 'gadai.bakihargajualan', - 'gadai.upah12', - 'gadai.ansakhir', - 'gadai.tempoh', - 'gadai.tempohbayar', - 'gadai.kadarupah' + 'lelongbid.jbg' + // 'gadai.bakipjm', + // 'gadai.bakihargajualan', + // 'gadai.upah12', + // 'gadai.ansakhir', + // 'gadai.tempoh', + // 'gadai.tempohbayar', + // 'gadai.kadarupah' ) ->get()->toArray(); foreach ($marhuns as $index1=> $cal) { - $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); - $marhuns[$index1]['keuntungan'] = bcdiv($keuntungan,1,1); + // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); + // $marhuns[$index1]['keuntungan'] = bcdiv($keuntungan,1,1); - $simulasilel = Lelong::where('id',$lelongid)->get(); - $sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100); - $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1); + // $simulasilel = Lelong::where('id',$lelongid)->get(); + // $sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100); + // $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1); - $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1); - $marhuns[$index1]['baki'] = $totalbaki; + // $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1); + // $marhuns[$index1]['baki'] = $totalbaki; } $arrayinfo = []; @@ -2453,8 +2438,7 @@ class LelongController extends Controller foreach($cawanganlel as $cawlel) { $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); - $databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - ->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar') + $databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong') ->where('caw_id','=',$cawlel->caw_id) ->where('status_jual','=',0) ->where('lelong_id','=',$id)->get(); diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index 8d20435c..d498e967 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -17,17 +17,20 @@ @endif +
-
-
-

No Rujukan : {{ $lelongbid->norujukan }}

-

Tempoh : {{ $lelongbid->jbg }}

-

TESTING : {{ $lelongbid->kodcaw }}

-

Pembiayaan(RM) : {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}

-

Keuntungan(RM) : {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}

-

Baki Lelong(RM) : {{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}

-

Rugi Lelong(RM) : {{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}

-
+
+
+

No Rujukan : {{ $lelongbid->norujukan }}

+

Tempoh : {{ $lelongbid->jbg }}

+

Kod Cawangan : {{ $lelongbid->kodcaw }}

+
+
+

Pembiayaan(RM) : {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}

+

Keuntungan(RM) : {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}

+

Baki Lelong(RM) : {{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}

+

Rugi Lelong(RM) : {{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}

+