diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 045eefc0..a0d954d2 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -915,6 +915,7 @@ class MarhunController extends Controller
// dd($id);
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
->where('tangguhlelong.norujukan', 'like', "%$caw_code%")
+ ->where('tangguhlelong.lelong_id', $id)
->whereNotNull('tangguhlelong.tarikhtangguh')
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index a4c88e34..3df1d777 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -67,6 +67,7 @@ class PaymentController extends Controller
$userdetails = User::where('id', $winner['user_id'])->first();
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
+ ->where('lelongbid.kodcaw', $user->kodcaw)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
@@ -75,6 +76,7 @@ class PaymentController extends Controller
$sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
+ ->where('lelongbid.kodcaw', $user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbidder.status_payment')
->get();
@@ -82,6 +84,7 @@ class PaymentController extends Controller
$payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
+ ->where('lelongbid.kodcaw', $user->kodcaw)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->select('payment_id')->groupBy('payment_id')->get();
@@ -111,10 +114,13 @@ class PaymentController extends Controller
public function SAGBidItem($user_id, $lelong_id){
+ $user = Auth::user();
+
$SAGBidItem = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.status_bidder', 1)
->where('users.id', $user_id)
+ ->where('lelongbid.kodcaw', $user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id)
->select(
'users.id',
@@ -129,6 +135,7 @@ class PaymentController extends Controller
->where('lelongbidder.status_bidder', 1)
->where('users.id', $user_id)
->where('lelongbid.lelong_id', $lelong_id)
+ ->where('lelongbid.kodcaw', $user->kodcaw)
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php
index b02b724b..d9d039bd 100644
--- a/resources/views/account/sahsagonline.blade.php
+++ b/resources/views/account/sahsagonline.blade.php
@@ -83,7 +83,7 @@
@else
- @endif
+ @endif
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index bb161d30..ba3014fd 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -13,7 +13,7 @@
@endif
- {{ __('You are logged in!') }}
+ {{ __('Selamat Datang!') }}
@hasrole('admin')
I am a admin!
@endhasrole
@@ -27,7 +27,7 @@
I am a pengurus-cawangan!
@endhasrole
@hasrole('jurulelong')
- I am a jurulelong!
+ Saya jurulelong!
@@ -84,17 +84,19 @@
-
+
-
-
+
+
+
+
-
+
@endhasrole