diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 8195246..27333a1 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -449,9 +449,13 @@ class LelongController extends Controller ->select('tuntutbaki.batchno','tuntutbaki.nowakil','tuntutbaki.tarikh','tuntutbaki.bakipjm','tuntutbaki.bakiupah','tuntutbaki.recno','lelong.t_lelong','tuntutbaki.norujukan','customer.nama','customer.kpbaru','tuntutbaki.hargajual','tuntutbaki.jumlah','tuntutbaki.cajlelong','lelong.pinjaman') ->where('lelong.norujukan','=',$norujukan) ->whereNotNull('lelong.trkhtuntut') - ->leftJoin('tuntutbaki', 'tuntutbaki.norujukan', '=', 'lelong.norujukan') - ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan') - ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp') + ->join('tuntutbaki', 'tuntutbaki.norujukan', '=', 'lelong.norujukan') + ->join('gadai', 'gadai.norujukan', '=', 'lelong.norujukan') + ->leftJoin('online_arrahn.customer', function($join) + { + $join->on('gadai.nokp', '=', 'customer.kpbaru'); + $join->orOn('gadai.nokp', '=', 'customer.kplama'); + }) ->orderBy('tuntutbaki.tarikh') ->first();