diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 175e2a7..901be2e 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -125,13 +125,13 @@ class MarhunController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $marhun = Marhun::on($cawangan['mysql']) - ->select('Marhun.norujukan','Gadai.sttebus','Gadai.pinjaman','Gadai.nokp','Customer.nama','Marhun.marhun','Marhun.nota','Marhun.berat','Marhun.karat','Marhun.harga','Marhun.n_marhun','Marhun.t_gadai') - ->rightJoin('Gadai', 'Gadai.norujukan', '=', 'Marhun.norujukan') - ->rightJoin('Customer', 'Customer.kpbaru', '=', 'Gadai.nokp') - ->where('Marhun.t_gadai','<=',$tarikh) - ->whereYear('Marhun.t_gadai','=',$current->year) - ->where('Gadai.sttebus','=','') - ->orderBy('Marhun.norujukan') + ->select('marhun.norujukan','gadai.sttebus','gadai.pinjaman','gadai.nokp','Customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai') + ->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan') + ->rightJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp') + ->where('marhun.t_gadai','<=',$tarikh) + ->whereYear('marhun.t_gadai','=',$current->year) + ->where('gadai.sttebus','=','') + ->orderBy('marhun.norujukan') ->get(); return response()->json($marhun);