diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index cf56420b..b5351319 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -1569,7 +1569,7 @@ class SimulasiController extends Controller ->where('tagpalsu','=',0) ->where('tagpalsu2','=',0) ->where('taglel','=',0) - ->where('lelong_tawarruq','=',1) + // ->where('lelong_tawarruq','=',1) ->whereNotNull('upah12'); $cawangan_simulasi = CawanganSimulasi::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count(); @@ -1687,7 +1687,7 @@ class SimulasiController extends Controller ->get(); - dd($senarai); + // dd($senarai); $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('keuntungan_rebet'); $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('bayaran_keuntungan'); diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index 80221154..d1b40f46 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -54,7 +54,7 @@ - + diff --git a/resources/views/simulasi/sensimulasipercubaan.blade.php b/resources/views/simulasi/sensimulasipercubaan.blade.php index 429543eb..6b2167fc 100644 --- a/resources/views/simulasi/sensimulasipercubaan.blade.php +++ b/resources/views/simulasi/sensimulasipercubaan.blade.php @@ -32,7 +32,9 @@ }else{ $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong2 ); $tarikhlelong = $myDateTime->modify('-12 month')->format('d-m-Y'); - $t_gadai1 = $myDateTime->modify('-12 month')->format('Y-m-d'); + // $t_gadai1 = $myDateTime->modify('-12 month')->format('Y-m-d'); + $t_gadai1 = $myDateTime->format('Y-m-d'); + echo($tarikhlelong); } @endphp

@@ -63,6 +65,7 @@ @foreach($senarai as $send) + @if($send['bil_lelong'] > 0) {{ $loop->iteration}} {{ $send['kodcaw'] }} @@ -75,6 +78,7 @@ {{ number_format($send['total_bakipjm'] , 2) }} + @endif @endforeach