diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 648b112a..670af09c 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -3688,7 +3688,6 @@ class LelongController extends Controller $kali = $kali; $lelong = Lelong::where('kali','=',$kali)->first(); - // dd($t_simulasi); $cawanganlel = CawanganLelong::where('kali','=',$kali)->get(); // dd($cawangansim); @@ -3757,26 +3756,28 @@ class LelongController extends Controller // dd($bid['id']); $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get(); $berat = $berat + $bid['berat']; + // $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun')); $nilai_marhun = $nilai_marhun + $bid['nilaimarhun']; $pinjaman =$pinjaman + $bid['pinjaman']; $bakiupah = $bakiupah + $bid['bakiupah']; $hargaasas = $hargaasas + $bid['hargaasas']; - $cajlelong = $cajlelong + $bid['cajlelong']; + // $cajlelong = $cajlelong + $bid['cajlelong']; - // $lelongsim = Lelong::where('id',$id)->get(); - // $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); - // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); - // $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1); + $lelongsim = Lelong::where('id',$id)->get(); + $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); + $cajlelongnew = round($sumcajlelong,1,1); + $cajlelong = $cajlelong + $cajlelongnew; + $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew; - // if($totalbaki > 0) - // { - // $bakilelong = $bakilelong + $totalbaki; - // } - // else - // { - // $rugilelong = $rugilelong - $totalbaki; - // } + if($totalbaki > 0) + { + $bakilelong = $bakilelong + $totalbaki; + } + else + { + $rugilelong = $rugilelong - $totalbaki; + } @@ -3788,7 +3789,7 @@ class LelongController extends Controller 'id_cawangan'=> $cawangan['id'], 'cawangan'=>$cawangan['caw_name'], 't_lelong'=>$lelong['tarikh_lelong'], - 't_simulasi'=>$t_lelong['tarikh_lelong'], + 't_lelong'=>$t_lelong['tarikh_lelong'], 'bil_marhun'=>sizeof($databid), 'berat'=>$berat, 'n_marhun'=>$nilai_marhun, @@ -5246,10 +5247,8 @@ class LelongController extends Controller { $kali = $request->kali; - // dd($lelong_id); - - $lelong = Lelong::where('kali','=',$kali)->first(); + $lelonglel = CawanganLelong::where('kali','=',$kali)->get(); // dd($simulasilel); // $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get(); @@ -5297,7 +5296,7 @@ class LelongController extends Controller $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id') ->where('cawangan_lelong.lelong_id','=', $lellel->lelong_id) ->where('cawangan_lelong.kali','=',$kali)->first(); - // dd($t_simulasi); + // dump($t_lelong); // dd($databid->toArray()); $packet = 0; $berat = 0; @@ -5322,8 +5321,9 @@ class LelongController extends Controller $lelongsim = Lelong::where('id',$id)->get(); $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); - $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); - $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1); + $cajlelongnew = round($sumcajlelong,1,1); + $cajlelong = $cajlelong + $cajlelongnew; + $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew; if($totalbaki > 0) { @@ -5342,7 +5342,7 @@ class LelongController extends Controller array_push($arraycaw,[ 'id_cawangan'=> $cawangan['id'], 'cawangan'=>$cawangan['caw_name'], - 't_lelong'=>$lelong['tarikh_lelong'], + 't_lelong'=>$t_lelong['tarikh_lelong'], 'bil_marhun'=>sizeof($databid), // 'jbg'=>$bid['jbg'], 'berat'=>$berat, @@ -5366,7 +5366,7 @@ class LelongController extends Controller $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun; $total_bakiupah = $total_bakiupah + $bakiupah; - + // dd($t_lelong); $data = Lelong::where('kali','=',$kali) ->first(); } diff --git a/resources/views/lelong/showlelongallsim.blade.php b/resources/views/lelong/showlelongallsim.blade.php index 74032233..7a4da1cc 100644 --- a/resources/views/lelong/showlelongallsim.blade.php +++ b/resources/views/lelong/showlelongallsim.blade.php @@ -159,7 +159,7 @@ {{$index+1}} @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_simulasi'] ); + $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); @endphp