Merged in izzati (pull request #10)

update query orwhere batu permata
2023-08-24 04:19:53 +00:00
parent 2465f7e7ec 41d250d984
commit 7964349ae3
1 changed files with 2 additions and 2 deletions
@@ -1394,7 +1394,8 @@ class LelongController extends Controller
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
        $lelong_data = Lelong::on($cawangan['mysql'])
        ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
-        ->where('lelong.marhun', 'like', '%PMT%')
+        ->where('gadai.marhun', 'like', "%PMT%")
+        ->OrWhere('gadai.marhun', 'like', "%batu%")
        ->whereNotNull('upah12')
        ->select('lelong.batchno','lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan','gadai.marhun')
        ->orderBy('lelong.t_lelong')
@@ -1407,7 +1408,6 @@ class LelongController extends Controller
            $lelmarhun = LelMarhun::on($cawangan['mysql'])
            ->where('norujukan',$lelongData['norujukan'])
            ->where('batch_no',$lelongData['batchno'])
-            ->Where('nota', 'like', '%PMT%')
            ->get();
            // dd($lelmarhun->norujukan);
            array_push($lelong,[