From e545186e8a731f95ede068e23d6ae041718845f2 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Mon, 4 Jul 2022 14:45:22 +0800
Subject: [PATCH] update fasa

---
 app/Http/Controllers/AccountController.php     | 2 +-
 app/Http/Controllers/PaymentController.php     | 2 +-
 app/Http/Controllers/PembidaController.php     | 2 +-
 app/Http/Controllers/ReportController.php      | 8 ++++----
 resources/views/account/sahsagonline.blade.php | 4 ----
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 20e719bc..7e323359 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -26,7 +26,7 @@ class AccountController extends Controller
         $arrayinfo = [];
 
         $senarai =  Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong_id','tarikh_lelong','fasa','sts_lelong')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa','sts_lelong')
         ->distinct()
         ->orderBy('lelong_id')
         ->where('lelong.sts_lelong', 3)     
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 3df1d777..7cc7f5ef 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -27,7 +27,7 @@ class PaymentController extends Controller
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
-        ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('lelong.fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->where('lelong.sts_lelong', 3)
         ->where('cawangan.caw_code', $user->kodcaw)
         ->groupBy('lelong_id')
diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index 72ae33c9..18f927e4 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -182,7 +182,7 @@ class PembidaController extends Controller
         $arrayinfo = [];
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong_id','tarikh_lelong','fasa','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->distinct()
         ->orderBy('lelong_id')
         ->where('lelong.sts_lelong', 3)     
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index cb1ff53d..f9976e2d 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -57,7 +57,7 @@ class ReportController extends Controller
         $arraydetails = [];       
 
         $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong_id','tarikh_lelong','fasa')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
         ->orderBy('lelong_id')        
         ->get()
@@ -132,7 +132,7 @@ class ReportController extends Controller
         $arraydetails = [];
         
         $brgdetails= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong_id','tarikh_lelong','fasa')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
         ->orderBy('lelong_id')
         ->get()
@@ -230,7 +230,7 @@ class ReportController extends Controller
         $arraydetails = [];
 
         $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong_id','tarikh_lelong','fasa')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
         ->orderBy('lelong_id')   
         ->get()
@@ -401,7 +401,7 @@ class ReportController extends Controller
         $arraydetails = [];
         
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
-        ->select('lelong_id','tarikh_lelong','fasa')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
         ->orderBy('lelong_id')       
         ->get()
diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php
index 16999775..d9d039bd 100644
--- a/resources/views/account/sahsagonline.blade.php
+++ b/resources/views/account/sahsagonline.blade.php
@@ -51,10 +51,6 @@
                                 @endphp</td>
                                 <td>{{ number_format($sag['hargaasas'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($sag['hargabida'], 2, '.', ',') }}</td>
-                                    echo($t_lelong);
-                                @endphp</td>
-                                <td>{{ number_format($sag['hargaasas'], 2, '.', ',')}}</td>
-                                <td>{{ number_format($sag['hargabida'], 2, '.', ',')}}</td>
                                 <td>{{ $sag['masa_bidaan'] }}</td>
                                 <td>
                                     <button class="btn btn-outline-success btn-sm" disabled><b>{{ $sag['remark'] }}</b></button>