From c59cd0a8e8f481eb7b23836c10d9ebd375413924 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Mon, 22 Aug 2022 16:49:51 +0800
Subject: [PATCH] update simula fasa 2 percubaan

---
 app/Http/Controllers/SimulasiController.php             | 4 ++--
 resources/views/pembayaran/kaunterpembayaran.blade.php  | 2 +-
 resources/views/simulasi/sensimulasipercubaan.blade.php | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

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 @@
                             </td>
 
                             <td>
-                            <a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
+                            <a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Resit Pembayaran"><i class="far fa-edit"></i></a>
                             </td>
 
                            
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</p>
@@ -63,6 +65,7 @@
                 </thead>
                 <tbody>
                     @foreach($senarai as $send)
+                    @if($send['bil_lelong'] > 0)
                         <tr>
                             <td>{{ $loop->iteration}}</td>
                             <td>{{ $send['kodcaw'] }}</td>
@@ -75,6 +78,7 @@
                             <td>{{ number_format($send['total_bakipjm'] , 2) }} </td>
                             
                         </tr>
+                        @endif
                     @endforeach
                 </tbody>
             </table>