From 2c5b0379139822f291b0eb91728854f9e1160640 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Sun, 19 Jun 2022 14:32:14 +0800
Subject: [PATCH] update error and join customer table

---
 app/Http/Controllers/NotisController.php     | 10 ++++------
 app/Http/Controllers/TamatKontController.php |  1 -
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index 9d2d7833..098053c6 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -106,11 +106,7 @@ class NotisController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan.caw_code','=',$user->kodcaw)
         ->where('cawangan_lelong.lelong_id', $lelong_id)
-        ->get();
-
-
-  
-        $lelong = Lelong::where('id', $lelongid)->get();
+        ->get(); 
 
   
 
@@ -131,7 +127,9 @@ class NotisController extends Controller
         $lelong_id = $request->lelong_id;
 
         $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-        ->join('customer','gadai.nokp','=','customer.kpbaru')
+        ->join('customer', function ($join) {
+        $join->on('gadai.nokp', '=', 'customer.kpbaru')->orOn('gadai.nokp', '=', 'customer.kplama');
+        })       
         ->where('gadai.kodcaw','=',$user->kodcaw)
         ->where('lelongbid.lelong_id', $lelong_id)
         ->get()->toArray();      
diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php
index f7fdcd70..fb333bb8 100644
--- a/app/Http/Controllers/TamatKontController.php
+++ b/app/Http/Controllers/TamatKontController.php
@@ -100,7 +100,6 @@ class TamatKontController extends Controller
                                             't_lelong',
                                             'user',
                                             't_gadais',
-                                            't_gadaisehingga',
                                             't_anggaran',
                                             'bil_lelongcaw'
                                             ));