fix penebusan rekod bayaran upah serahan kemaskini

app/Http/Controllers/GadaiController.php

@@ -554,8 +554,14 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $gadai = Gadai::on($cawangan['mysql'])
-                ->where('t_gadai','=',$tarikh)
-                ->orderBy('teller')
+                ->select('Gadai.t_gadai','Gadai.norujukan','cust.nama','Gadai.nokp','Gadai.semakbarcode','Gadai.masa','Gadai.berat','Gadai.nilaimarhun','Gadai.pinjaman','Gadai.upah12','Gadai.percentpinj','cust.alamat1','Gadai.teller')
+                ->join('Customer as cust', function($join)
+                {
+                    $join->on('Gadai.nokp', '=', 'cust.kpbaru');
+                    $join->orOn('Gadai.nokp', '=', 'cust.kplama');
+                })
+                ->where('Gadai.t_gadai','=',$tarikh)
+                ->orderBy('Gadai.teller')
                 ->get();
         
         return response()->json($gadai);
@@ -2286,6 +2292,12 @@ class GadaiController extends Controller
             case 'JLI':
                 $tarikhtawarruq = '2021-06-13';
             break;
+            case '010621':
+                $tarikhtawarruq = '2021-06-15';
+            break;
+            case 'ARP':
+                $tarikhtawarruq = '2021-06-15';
+            break;
           }
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])