diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index aa9ae615..005323df 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -129,8 +129,181 @@ class LelongController extends Controller return view('lelong.exportData', compact('lelongbycaw', 'lelong')); } - public function show(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(); + $lelkarat = LelKarat::where('lelong_id','=',$id)->get(); + $jeniskarat = JenisKarat::all(); + + $arraydata = []; + $arraycaw = []; + $data = []; + + $total_marhun = 0; + $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; + foreach ($cawlel->lelongBid 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'] - bcdiv($sumcajlelong,1,1); + + 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; + } + } + } + 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.showlelong',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')); + } + + public function show2(Request $request, $id) { $lelong_id = $id; $lelong = Lelong::where('id','=',$id)->first(); @@ -1032,6 +1205,7 @@ class LelongController extends Controller $total_bakiupah = 0; $total_nilaimarhun = 0; $keuntungan = 0; + // dd($cawid); $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid) ->select( diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index aca84e66..8a8f82a8 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -873,7 +873,7 @@ class SimulasiController extends Controller } - + array_push($arraycaw,[ 'id_cawangan'=> $cawangan['id'], 'cawangan'=>$cawangan['caw_name'], @@ -1101,7 +1101,7 @@ class SimulasiController extends Controller } } array_push($arraycaw, [ - 'id_cawangan' => $caw['id'], + 'id_cawangan' => $caw['caw_id'], 'cawangan' => $caw->cawangan->caw_name, 't_lelong' => $simulasi['tarikh_lelong'], 'bil_marhun' => sizeof($caw->simulasiBid), @@ -1620,7 +1620,7 @@ class SimulasiController extends Controller ->where('lelong_tawarruq','=',1) ->whereNotNull('upah12'); - $cawangan_simulasi = CawanganSimulasi::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count(); + $cawangan_simulasi = CawanganLelong::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count(); if($cawangan_simulasi == 0){ $bil_lelong = $getsurat->count('norujukan'); $total_bil_lelong += $bil_lelong; @@ -1655,7 +1655,7 @@ class SimulasiController extends Controller // ->where('lelong_tawarruq','=',1) ->whereNotNull('upah12'); - $cawangan_simulasi = CawanganSimulasi::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count(); + $cawangan_simulasi = CawanganLelong::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count(); if($cawangan_simulasi == 0){ $bil_lelong = $getsurat->count('norujukan'); $total_bil_lelong += $bil_lelong; diff --git a/app/Models/Cawangan.php b/app/Models/Cawangan.php index 85a6aa61..8f5b1035 100644 --- a/app/Models/Cawangan.php +++ b/app/Models/Cawangan.php @@ -30,4 +30,13 @@ class Cawangan extends Model 'para2', 'para3', ]; + public function lelongBid() + { + return $this->hasMany(LelongBid::class, 'caw_id', 'caw_id'); + } + + public function cawangan() + { + return $this->hasOne(Cawangan::class, 'id'); + } } diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php index 1f42d1ee..5a0f5b2f 100644 --- a/app/Models/LelongBid.php +++ b/app/Models/LelongBid.php @@ -51,4 +51,14 @@ class LelongBid extends Model public function fileMarhunMain() { return $this->hasOne(FileMarhun::class, 'lelongbidmarhun_id'); } + + public function lelongBidMarhun() + { + return $this->hasMany(LelongBidMarhun::class, 'lelongbid_id', 'id'); + } + + public function statusLelongBidMarhun() + { + return $this->hasMany(LelongBidMarhun::class, 'lelongbid_id', 'id')->take(1); + } } diff --git a/resources/views/lelong/senaraimarhunsimulasi.blade.php b/resources/views/lelong/senaraimarhunsimulasi.blade.php index f212aa19..0c65a4fc 100644 --- a/resources/views/lelong/senaraimarhunsimulasi.blade.php +++ b/resources/views/lelong/senaraimarhunsimulasi.blade.php @@ -76,13 +76,13 @@ @php if(strpos($marhun['baki'], '-') !== false) { - $rugi = $marhun['baki']; + $rugi = -$marhun['baki']; } else { $baki = $marhun['baki']; } @endphp - {{number_format($rugi, 2, '.', ',')}} + ({{number_format($rugi, 2, '.', ',')}}) {{number_format($baki, 2, '.', ',')}} {{-- diff --git a/resources/views/pdf/lelreport.blade.php b/resources/views/pdf/lelreport.blade.php index 44dfa112..44d2f681 100644 --- a/resources/views/pdf/lelreport.blade.php +++ b/resources/views/pdf/lelreport.blade.php @@ -153,15 +153,15 @@ th, td { 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, '.', ',') }})