diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 4bc530c4..a604bfca 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -147,6 +147,7 @@ class HomeController extends Controller //paparan pemenang lelongan harini $arrayinfomenang = []; + $listwinnermenang = []; $lelongmenang = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') ->select('lelong_id','tarikh_lelong','lelong.fasa','harga_emas_asas','jbg','cajlelong','sts_lelong') @@ -169,6 +170,7 @@ class HomeController extends Controller ->get() ->toArray(); // dd($detailsinfo); + array_push($arrayinfomenang,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); } @@ -177,6 +179,7 @@ class HomeController extends Controller //paparan untuk account $arrayinfoaccount = []; + $listwinner = []; // $dateTimedummy = date('2022-10-23'); $senarai = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') @@ -219,6 +222,7 @@ class HomeController extends Controller ->select('lelongbidder.user_id', 'payment.user_id') ->groupBy('lelongbidder.user_id', 'payment.user_id') ->get(); + // dd($listwinner); foreach($listwinner as $index=>$listwin) { @@ -229,9 +233,9 @@ class HomeController extends Controller $listwinner[$index]['nama'] = $namawinner['name']; $listwinner[$index]['caw_code'] = $details1['caw_code']; - } + } // dd($listwinner[$index]['nama']); - } + } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 005323df..e05d7383 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -194,13 +194,14 @@ class LelongController extends Controller $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); $totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - bcdiv($sumcajlelong,1,1); - if($totalbaki > 0) + if(strpos($totalbaki, '-') !== false) { - $bakilelong += $totalbaki; + $rugi = -$totalbaki; + $rugilelong += $rugi; } - else - { - $rugilelong -= $totalbaki; + else { + $baki = $totalbaki; + $bakilelong += $baki; } // dd($totalbaki); @@ -2101,6 +2102,8 @@ class LelongController extends Controller foreach($senaraisag as $data) { // dd($data['norujukan']); + // dd($datalelong[$index]['fasa']); + if($datalelong[$index]['fasa'] == 1){ //insert lelong_tebus if($data['sttebus'] == "T") { @@ -2188,17 +2191,50 @@ class LelongController extends Controller $loguser->nota = $lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ; $loguser->save(); } - - - - $date = Carbon::now()->toDateTimeString(); $lelong = Lelong::where('id','=',$lelong_id)->first(); $lelong->masakemaskini_data = $date; $lelong->save(); } + }else if($datalelong[$index]['fasa'] == 2){ + // dd($datasimulasi[$index]['fasa']); + if($data['sttebus'] == "T") + { + $lelongtebus = new LelongTebus; + $lelongtebus->tarikh = $currentdate; + $lelongtebus->kodcaw = $data['kodcaw']; + $lelongtebus->teller = $user->name; + $lelongtebus->norujukan = $data['norujukan']; + $lelongtebus->batch_no = $lelong_id; + $lelongtebus->nilaimarhun = $data['nilaimarhun']; + $lelongtebus->pinjaman = $data['pinjaman']; + $lelongtebus->upah = $data['bakiupah']; + $lelongtebus->jbg = $data['jbg']; + $lelongtebus->jenis_tebus = 'T'; + $lelongtebus->save(); + + // dd($data['norujukan']); + $updatelelong = LelongBid::where('norujukan','=',$data['norujukan'])->first(); + $updatelelong->delete(); + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $data['norujukan']; + $loguser->nota = ' LELONG TEBUS '.$lelong_id; + $loguser->save(); + + + } + $date = Carbon::now()->toDateTimeString(); + $lelong = Lelong::where('id','=',$lelong_id)->first(); + $lelong->masakemaskini_data = $date; + $lelong->save(); + } + - } } @@ -4741,6 +4777,186 @@ class LelongController extends Controller 'total_nilaimarhun','tarikhkemaskini')); } + public function showlelongdone(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(); + // dd($cawanganlel); + $lelkarat = LelKarat::where('lelong_id','=',$id)->get(); + $jeniskarat = JenisKarat::all(); + + $arraydata = []; + $arraycaw = []; + $data = []; + + + $total_berat = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + $total_upah = 0; + $total_hargaasas = 0; + $total_cazlelong = 0; + $total_rugilelong = 0; + $total_bakilelong = 0; + + $total24Kgb = 0; + $total24K = 0; + $total23k = 0; + $total22K = 0; + $total21K = 0; + $total20K = 0; + $total18Kp = 0; + $total18K = 0; + $total14Kp = 0; + $total14K = 0; + $total9K = 0; + + $keuntungan = 0; + $total_bakiupah = 0; + $total_nilaimarhun = 0; + $nilai_marhun = 0; + + $totalkeuntungan2 = 0; + + foreach ($cawanganlel as $cawlel) { + $berat = 0; + $nilai_marhun = 0; + $pinjaman = 0; + $bakiupah = 0; + $hargaasas = 0; + $cajlelong = 0; + $rugilelong = 0; + $bakilelong = 0; + $total_marhun = 0; + + $databid = LelongBid::where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->where('status_jual','=',1)->get(); + // dd($databid); + foreach ($databid as $lel_bid) { + $total_marhun += 1; + $nilai_marhun += $lel_bid->nilaimarhun; + $pinjaman += $lel_bid->pinjaman; + $bakiupah += $lel_bid->bakiupah; + $berat += $lel_bid->berat; + $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'] - $lel_bid['cajlelong']; + + if($totalbaki > 0) + { + $bakilelong += $totalbaki; + } + else + { + $rugilelong -= $totalbaki; + } + // dd($totalbaki); + + + foreach ($lel_bid->lelongBidMarhun as $lel_bid_marhun) { + if ($lel_bid_marhun->karat == "24.0Kgb") { + $total24Kgb += $lel_bid_marhun->berat; + } else if ($lel_bid_marhun->karat == "24.0K") { + $total24K += $lel_bid_marhun->berat; + } else if ($lel_bid_marhun->karat == "23.0K") { + $total23k += $lel_bid_marhun->berat; + } else if ($lel_bid_marhun->karat == "22.0K") { + $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") { + $total20K += $lel_bid_marhun->berat; + } else if ($lel_bid_marhun->karat == "18.0Kp") { + $total18Kp += $lel_bid_marhun->berat; + } else if ($lel_bid_marhun->karat == "18.0K") { + $total18K += $lel_bid_marhun->berat; + } else if ($lel_bid_marhun->karat == "14.0Kp") { + $total14Kp += $lel_bid_marhun->berat; + } else if ($lel_bid_marhun->karat == "14.0K") { + $total14K += $lel_bid_marhun->berat; + } + } + } + // dd($cawlel->cawangan); + 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, + ]); + + // $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; + $total_rugilelong += $rugilelong; + $total_bakilelong += $bakilelong; + $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.showlelongdone',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')); + } + diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 8a8f82a8..08587502 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -974,7 +974,7 @@ class SimulasiController extends Controller $total_hargaasas = 0; $arraycaw = []; - // foreach($simulasiBidByCawangan as $index => $cawangan) { + // foreach($simulasiBidByCawangan as $index => $cawangan) { // $berat = 0; // $nilai_marhun = 0; // $pinjaman = 0; @@ -1070,10 +1070,19 @@ class SimulasiController extends Controller $hargaasas += $sim_bid->hargaasas; $cajlelong += $sim_bid->cajlelong; - if ($sim_bid['baki'] > 0) { - $bakilelong += $sim_bid['baki']; - } else { - $rugilelong -= $sim_bid['baki']; + $lelongcaj = Simulasi::where('id',$id)->get(); + $sumcajlelong = $sim_bid['hargaasas'] * ($lelongcaj[0]['cajlelong']/100); + $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); + $totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - bcdiv($sumcajlelong,1,1); + + if(strpos($totalbaki, '-') !== false) + { + $rugi = -$totalbaki; + $rugilelong += $rugi; + } + else { + $baki = $totalbaki; + $bakilelong += $baki; } foreach ($sim_bid->simulasiBidMarhun as $sim_bid_marhun) { @@ -1486,6 +1495,15 @@ class SimulasiController extends Controller public function senaraimarhunlel($simulasi_id, $cawid) { + $total_berat = 0; + $total_pinjaman = 0; + $total_upah = 0; + $total_hargaasas = 0; + $total_bakiupah = 0; + $total_nilaimarhun = 0; + $total_cazlelong = 0; + $rugilelong = 0; + $bakilelong = 0; $keuntungan = 0; $marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id') @@ -1534,6 +1552,22 @@ class SimulasiController extends Controller $marhuns[$index1]['keuntungan'] = $keuntungan; $marhuns[$index1]['nama'] = $customer; + $simulasilel = Simulasi::where('id',$simulasi_id)->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); + $marhuns[$index1]['baki'] = $totalbaki; + + + + $total_berat = $total_berat + $cal['berat']; + $total_pinjaman = $total_pinjaman + $cal['pinjaman']; + $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); + + array_push($arraymarhun,[ 'norujukan' => $cal['norujukan'], 'tempoh' => $gadai['tempoh'], @@ -1549,7 +1583,12 @@ class SimulasiController extends Controller } - return view('simulasi.senaraimarhunlel',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan')); + return view('simulasi.senaraimarhunlel',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan','total_berat', + 'total_nilaimarhun', + 'total_pinjaman', + 'total_bakiupah', + 'total_hargaasas', + 'total_cazlelong')); } public function deletemarhunlel(Request $request){ @@ -1823,54 +1862,18 @@ class SimulasiController extends Controller $arraynorujukan = $marhun->pluck('norujukan')->toArray(); $datasimulasi = $marhun->get(); - // dd($datasimulasi[$index]['kodcaw']); + // dd($datasimulasi[$index]['fasa']); $senaraisag = Gadai::on($datasimulasi[$index]['kodcaw'])->whereIn('norujukan', $arraynorujukan) ->get(); + // dd($senaraisag); foreach($senaraisag as $data) { // dd($data['norujukan']); - //insert lelong_tebus - if($data['sttebus'] == "T") - { - $lelongtebus = new LelongTebus; - $lelongtebus->tarikh = $currentdate; - $lelongtebus->kodcaw = $data['kodcaw']; - $lelongtebus->teller = $user->name; - $lelongtebus->norujukan = $data['norujukan']; - $lelongtebus->batch_no = $simulasi_id; - $lelongtebus->nilaimarhun = $data['nilaimarhun']; - $lelongtebus->pinjaman = $data['pinjaman']; - $lelongtebus->upah = $data['bakiupah']; - $lelongtebus->jbg = $data['jbg']; - $lelongtebus->jenis_tebus = 'T'; - $lelongtebus->save(); - - $updategadai = Http::withOptions(['verify' => config('app.api_verify')]) - ->post(config('app.api_url').'taglel/revert',[ - 'kodcaw'=>$data['kodcaw'], - 'norujukan'=>$data['norujukan'] - ]) - ->json(); - - // dd($data['norujukan']); - $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first(); - $updatesimulasi->delete(); - //insert loguser - $loguser = new LogUser; - $loguser->user_id = $user->id; - $loguser->date = $currentdate; - $loguser->username = $user->username; - $loguser->nama_user = $user->name; - $loguser->norujukan = $data['norujukan']; - $loguser->nota = ' LELONG TEBUS '.$simulasi_id; - $loguser->save(); - - - } - else if($data['sttebus'] == ""){ - $ktlhbyr = $data['hargajualan']-$data['bakihargajualan']; - if($ktlhbyr >= $data['bakiupah']) + // dd($datasimulasi[$index]['fasa']); + if($datasimulasi[$index]['fasa'] == 1){ + //insert lelong_tebus + if($data['sttebus'] == "T") { $lelongtebus = new LelongTebus; $lelongtebus->tarikh = $currentdate; @@ -1882,7 +1885,7 @@ class SimulasiController extends Controller $lelongtebus->pinjaman = $data['pinjaman']; $lelongtebus->upah = $data['bakiupah']; $lelongtebus->jbg = $data['jbg']; - $lelongtebus->jenis_tebus = 'A'; + $lelongtebus->jenis_tebus = 'T'; $lelongtebus->save(); $updategadai = Http::withOptions(['verify' => config('app.api_verify')]) @@ -1891,7 +1894,7 @@ class SimulasiController extends Controller 'norujukan'=>$data['norujukan'] ]) ->json(); - + // dd($data['norujukan']); $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first(); $updatesimulasi->delete(); @@ -1902,25 +1905,107 @@ class SimulasiController extends Controller $loguser->username = $user->username; $loguser->nama_user = $user->name; $loguser->norujukan = $data['norujukan']; - $loguser->nota = ' KELUAR LELONG '.$simulasi_id; + $loguser->nota = ' LELONG TEBUS '.$simulasi_id; $loguser->save(); - } - else{ - //kemaskini keuntungan - $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet'); - $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan'); - $beza_keuntungan = $total_untung_asal - $total_untung_rebet; - $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; - // dd($keuntungan); - //update dalam simulasibid - $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan']) - ->where('simulasi_id', $simulasi_id) - ->first(); - $updatetempoh->jbg = $data['tempoh']; - $updatetempoh->pinjaman = $data['bakipjm']; - $updatetempoh->bakiupah = bcdiv($keuntungan,1,1); - $updatetempoh->update(); + + } + else if($data['sttebus'] == ""){ + $ktlhbyr = $data['hargajualan']-$data['bakihargajualan']; + if($ktlhbyr >= $data['bakiupah']) + { + $lelongtebus = new LelongTebus; + $lelongtebus->tarikh = $currentdate; + $lelongtebus->kodcaw = $data['kodcaw']; + $lelongtebus->teller = $user->name; + $lelongtebus->norujukan = $data['norujukan']; + $lelongtebus->batch_no = $simulasi_id; + $lelongtebus->nilaimarhun = $data['nilaimarhun']; + $lelongtebus->pinjaman = $data['pinjaman']; + $lelongtebus->upah = $data['bakiupah']; + $lelongtebus->jbg = $data['jbg']; + $lelongtebus->jenis_tebus = 'A'; + $lelongtebus->save(); + + $updategadai = Http::withOptions(['verify' => config('app.api_verify')]) + ->post(config('app.api_url').'taglel/revert',[ + 'kodcaw'=>$data['kodcaw'], + 'norujukan'=>$data['norujukan'] + ]) + ->json(); + + // dd($data['norujukan']); + $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first(); + $updatesimulasi->delete(); + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $data['norujukan']; + $loguser->nota = ' KELUAR LELONG '.$simulasi_id; + $loguser->save(); + } + else{ + //kemaskini keuntungan + $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet'); + $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan'); + $beza_keuntungan = $total_untung_asal - $total_untung_rebet; + $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + // dd($keuntungan); + //update dalam simulasibid + $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan']) + ->where('simulasi_id', $simulasi_id) + ->first(); + $updatetempoh->jbg = $data['tempoh']; + $updatetempoh->pinjaman = $data['bakipjm']; + $updatetempoh->bakiupah = bcdiv($keuntungan,1,1); + $updatetempoh->update(); + + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $data['norujukan']; + $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ; + $loguser->save(); + } + + $date = Carbon::now()->toDateTimeString(); + $simulasi = Simulasi::where('id','=',$simulasi_id)->first(); + $simulasi->masakemaskini_data = $date; + $simulasi->save(); + } + }else if($datasimulasi[$index]['fasa'] == 2){ + // dd($datasimulasi[$index]['fasa']); + if($data['sttebus'] == "T") + { + $lelongtebus = new LelongTebus; + $lelongtebus->tarikh = $currentdate; + $lelongtebus->kodcaw = $data['kodcaw']; + $lelongtebus->teller = $user->name; + $lelongtebus->norujukan = $data['norujukan']; + $lelongtebus->batch_no = $simulasi_id; + $lelongtebus->nilaimarhun = $data['nilaimarhun']; + $lelongtebus->pinjaman = $data['pinjaman']; + $lelongtebus->upah = $data['bakiupah']; + $lelongtebus->jbg = $data['jbg']; + $lelongtebus->jenis_tebus = 'T'; + $lelongtebus->save(); + + $updategadai = Http::withOptions(['verify' => config('app.api_verify')]) + ->post(config('app.api_url').'taglel/revert',[ + 'kodcaw'=>$data['kodcaw'], + 'norujukan'=>$data['norujukan'] + ]) + ->json(); + + // dd($data['norujukan']); + $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first(); + $updatesimulasi->delete(); //insert loguser $loguser = new LogUser; $loguser->user_id = $user->id; @@ -1928,18 +2013,14 @@ class SimulasiController extends Controller $loguser->username = $user->username; $loguser->nama_user = $user->name; $loguser->norujukan = $data['norujukan']; - $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ; + $loguser->nota = ' LELONG TEBUS '.$simulasi_id; $loguser->save(); } - - - - $date = Carbon::now()->toDateTimeString(); $simulasi = Simulasi::where('id','=',$simulasi_id)->first(); $simulasi->masakemaskini_data = $date; $simulasi->save(); - } + } } diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 036a28fb..46e58996 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -290,7 +290,7 @@ @foreach($lel['detailsinfo'] as $details) - {{ $details['caw_name']}} + {{ $details['caw_name']}}
@endforeach diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index cc0edf6f..4cba539a 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -86,9 +86,9 @@
  • Semakan Marhun
    • -
  • + {{--
  • Semakan Marhun -
    • + --}}
  • Laporan Scan Barcode
    • diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index c3c14e3b..5d9cb536 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -96,7 +96,7 @@ @elseif($data['laporan']['sts_lelong'] == 3) {{-- --}} - + @endif @endhasrole diff --git a/resources/views/lelong/senaraimarhunsimulasi.blade.php b/resources/views/lelong/senaraimarhunsimulasi.blade.php index 0c65a4fc..11f3f061 100644 --- a/resources/views/lelong/senaraimarhunsimulasi.blade.php +++ b/resources/views/lelong/senaraimarhunsimulasi.blade.php @@ -59,8 +59,8 @@ @php $rugilelong = 0; $bakilelong = 0; - $rugi = 0; - $baki = 0; @endphp + + @endphp @foreach ($marhuns as $index=> $marhun) {{$loop->iteration}} @@ -74,12 +74,16 @@ {{ number_format($marhun['cajlelong'], 2, '.', ',') }} {{-- {{dd($marhun['norujukan'])}} --}} @php + $rugi = 0; + $baki = 0; if(strpos($marhun['baki'], '-') !== false) { $rugi = -$marhun['baki']; + $rugilelong += $rugi; } else { $baki = $marhun['baki']; + $bakilelong += $baki; } @endphp ({{number_format($rugi, 2, '.', ',')}}) @@ -90,18 +94,9 @@ --}} - @php - if(strpos($marhun['baki'], '-') !== false) - { - $rugi = $marhun['baki']; - $rugilelong = $rugilelong - $rugi; - } - else { - $baki = $marhun['baki']; - $bakilelong = $bakilelong + $baki; - } - @endphp - @endforeach + @endforeach + + diff --git a/resources/views/lelong/showlelongdone.blade.php b/resources/views/lelong/showlelongdone.blade.php new file mode 100644 index 00000000..5e14e83f --- /dev/null +++ b/resources/views/lelong/showlelongdone.blade.php @@ -0,0 +1,430 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + +
    + + +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + {{-- {{$cawangan[0] }} --}} +
    + +
    +
    + + +@endsection diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php index 2863386e..2528603f 100644 --- a/resources/views/marhun/senaraimarhun.blade.php +++ b/resources/views/marhun/senaraimarhun.blade.php @@ -22,7 +22,7 @@ {{--

    Belum Disemak : {{ sizeof($sag) }}

    --}}

    Dalam Proses : {{ sizeof($dalamproses) }}

    Sudah Disemak : {{ sizeof($sdhdisemak) }}

    -

    Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkan) }}

    +

    Sudah Disahkan Oleh PC : {{ sizeof($sdhdisahkan) }}

    Tangguh Lelong Oleh Pengurus Cawangan

    diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php index 5db3ff29..ce8e7d1e 100644 --- a/resources/views/simulasi/senaraimarhunlel.blade.php +++ b/resources/views/simulasi/senaraimarhunlel.blade.php @@ -40,39 +40,59 @@ + @php $rugilelong = 0; + $bakilelong = 0; + + @endphp @foreach ($arraymarhun as $index=> $marhun) - - {{$loop->iteration}} - {{ $marhun['norujukan']}} - - {{ number_format($marhun['tempoh'], 2, '.', ',') }} - {{ number_format($marhun['berat'], 2, '.', ',') }} - {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} - {{ number_format($marhun['hargaasas'], 2, '.', ',') }} - {{ number_format($marhun['pinjaman'], 2, '.', ',') }} - {{ number_format($marhun['bakiupah'], 2, '.', ',') }} - {{ number_format($marhun['cajlelong'], 2, '.', ',') }} - - {{number_format($rugi, 2, '.', ',')}} - {{number_format($baki, 2, '.', ',')}} - - - - - - + + {{$loop->iteration}} + {{ $marhun['norujukan']}} + {{ $marhun['tempoh']}} + {{ $marhun['berat'] }} + {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} + {{ number_format($marhun['hargaasas'], 2, '.', ',') }} + {{ number_format($marhun['pinjaman'] , 2, '.', ',') }} + {{ number_format($marhun['bakiupah'], 2, '.', ',') }} + {{ number_format($marhun['cajlelong'], 2, '.', ',') }} + {{-- {{dd($marhun['norujukan'])}} --}} + @php + $rugi = 0; + $baki = 0; + if(strpos($marhun['baki'], '-') !== false) + { + $rugi = -$marhun['baki']; + $rugilelong += $rugi; + } + else { + $baki = $marhun['baki']; + $bakilelong += $baki; + } + @endphp + ({{number_format($rugi, 2, '.', ',')}}) + {{number_format($baki, 2, '.', ',')}} + + + + + + @endforeach + + + JUMLAH KESELURUHAN + {{ 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($rugilelong, 2, '.', ',') }}) + {{ number_format($bakilelong, 2, '.', ',') }} + + +
    diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index b5f567b3..d50de8cb 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -17,6 +17,11 @@
    -
    - +
    @@ -90,35 +94,34 @@ - - - - - - - - - + + + + + + + + + @endforeach - - - - - - - - - + + + + + + + + +
    No
    {{$index+1}} {{ $caw['cawangan'] }}{{ $caw['bil_marhun'] }}{{ number_format($caw['berat'], 2, '.', ',') }}{{ number_format($caw['n_marhun'], 2, '.', ',') }}{{ number_format($caw['pinjaman'], 2, '.', ',') }}{{ number_format($caw['upahsimpan'], 2, '.', ',') }}{{ number_format($caw['hargaasas'], 2, '.', ',') }}{{ number_format($caw['cajlelong'], 2, '.', ',') }}{{ number_format($caw['bakilelong'], 2, '.', ',') }}({{ number_format($caw['rugilelong'], 2, '.', ',') }}){{ $caw['bil_marhun'] }}{{ number_format($caw['berat'], 2, '.', ',') }}{{ number_format($caw['n_marhun'], 2, '.', ',') }}{{ number_format($caw['pinjaman'], 2, '.', ',') }}{{ number_format($caw['upahsimpan'], 2, '.', ',') }}{{ number_format($caw['hargaasas'], 2, '.', ',') }}{{ number_format($caw['cajlelong'], 2, '.', ',') }}{{ number_format($caw['bakilelong'], 2, '.', ',') }}({{ number_format($caw['rugilelong'], 2, '.', ',') }})
    JUMLAH KESELURUHAN{{ $total_marhun }}{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nilaimarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_bakiupah, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_cazlelong, 2, '.', ',') }}{{ number_format($total_bakilelong, 2, '.', ',') }}({{ number_format($total_rugilelong, 2, '.', ',') }}){{ $total_marhun }}{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nilaimarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_bakiupah, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_cazlelong, 2, '.', ',') }}{{ number_format($total_bakilelong, 2, '.', ',') }}({{ number_format($total_rugilelong, 2, '.', ',') }})
    -
    diff --git a/routes/web.php b/routes/web.php index 6550a0f1..ae7c580b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -147,7 +147,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/kemaskinidata/{lelong_id}',['as'=>'lelong.kemaskinidata','uses'=>'LelongController@kemaskinidata']); Route::post('/exportlelong',['as'=>'lelong.exportlelong','uses'=>'LelongController@exportlelong']); - + Route::get('/showlelongdone/{id}',['as'=>'lelong.showlelongdone','uses'=>'LelongController@showlelongdone']); //pindahlelong Route::get('/pindahsenarailelong',['as'=>'lelong.pindahsenarailelong','uses'=>'LelongController@pindahsenarailelong']);