From 4c96c6b44e8a62e2b0302c71f25c453c8bb7154b Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 24 Jun 2022 20:08:19 +0800 Subject: [PATCH] fix lelong resit --- app/Http/Controllers/LelongController.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 27333a1..006cbc4 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -446,20 +446,23 @@ class LelongController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $lelong = Lelong::on($cawangan['mysql']) - ->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') + ->select('gadai.nokp','tuntutbaki.batchno','tuntutbaki.nowakil','tuntutbaki.tarikh','tuntutbaki.bakipjm','tuntutbaki.bakiupah','tuntutbaki.recno','lelong.t_lelong','tuntutbaki.norujukan','tuntutbaki.hargajual','tuntutbaki.jumlah','tuntutbaki.cajlelong','lelong.pinjaman') ->where('lelong.norujukan','=',$norujukan) ->whereNotNull('lelong.trkhtuntut') ->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(); - return response()->json($lelong,200); + $customerinfo = Customer::on('mysql7') + ->select('nama','kpbaru') + ->where('kpbaru', $lelong['nokp']) + ->orWhere('kplama', $lelong['nokp']) + ->first(); + + $arraycustomer = ['nama' => $customerinfo['nama'],'kpbaru' => $customerinfo['kpbaru'],'nokp' => $lelong['nokp'],'batchno' => $lelong['batchno'],'nowakil' => $lelong['nowakil'],'tarikh' => $lelong['tarikh'],'bakipjm' => $lelong['bakipjm'],'bakiupah' => $lelong['bakiupah'],'recno' => $lelong['recno'],'t_lelong' => $lelong['t_lelong'],'norujukan' => $lelong['norujukan'],'hargajual' => $lelong['hargajual'],'jumlah' => $lelong['jumlah'],'cajlelong' => $lelong['cajlelong'],'pinjaman' => $lelong['pinjaman']]; + + return response()->json($arraycustomer,200); } public function calculationwtd($kodcaw,Request $request)