From d7ee12afcaa0232de62e1775a49a610a88e21d0e Mon Sep 17 00:00:00 2001
From: nishaMuhd <nurulnisha84@gmail.com>
Date: Tue, 8 Nov 2022 10:46:43 +0800
Subject: [PATCH] pembetulan filter utk tangguh

---
 app/Http/Controllers/TangguhLelongController.php       | 10 +++++++---
 .../views/tangguhlelong/senarailelongtangguh.blade.php |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index 8f1acd73..6e5268ab 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -553,14 +553,18 @@ class TangguhLelongController extends Controller
                 $bidmarhun['percents'] = round(($bidmarhun->pinjaman / $bidmarhun->nmarhuns * 100),2);
 
                 $history = TangguhLelong::where('lelongbid_id',$bidmarhun->id)
-                ->first();
-                //dd($bidmarhun->id);                
+                ->first();               
  
                 if($history)
                 {
                     return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Maaf No Rujukan Telah Wujud Dalam Senarai Mohon Tangguh');
                     
-                } else {
+                } elseif($bidmarhun->fasa == 2) 
+                {
+                    //block tangguh sekiranya telah masuk fasa 2
+                    return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Maaf No Rujukan Telah Berada Dalam Fasa 2');
+       
+                }else {
                     $tangguhlelong = new TangguhLelong(); //pastikan hanya 1 kali insert utk lelong_id & norujukan yg sama
                     $tangguhlelong->kodcaw = $bidmarhun->kodcaw;
                     $tangguhlelong->lelong_id = $request->lelong_id;
diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php
index fe53877b..b88c3edb 100644
--- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php
+++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php
@@ -58,7 +58,7 @@
                                 @endif
                             </td>
                             <td> 
-                                @if($lel['info']['sts_lelong'] == 0 && $lel['info']['tarikh_lelong'] < $currentdate)
+                                @if($lel['info']['sts_lelong'] == 0 && $lel['info']['tarikh_lelong'] > $currentdate)
                                 {{-- @foreach($lel['detailsinfo'] as $details) --}}
                                 <a  href="{{ route('tangguhlelong.carian', $lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Carian" style="margin-right:40px"><i class="fas fa-search"></i></a>
                                 <!-- <a  href="{{ route('tangguhlelong.listtangguh', [$lel['info']['lelong_id'], $details['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Tangguh" style="margin-right:40px"><i class="fas fa-list"></i></a> -->