Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn into apiaku

app/Http/Controllers/GadaiController.php

@@ -7,6 +7,7 @@ use App\Marhun;
 use App\Cawangan;
 use App\Transaction;
 use App\TransaksiKeuntungan;
+use App\TransactionOnline;
 use App\batalGadai;
 use App\TuntutBaki;
 use App\AnsRugi;
@@ -55,6 +56,16 @@ class GadaiController extends Controller
         return response()->json($gadai_all);
     }
 
+    public function searchGadaiOnline(Request $request){
+
+        $transaction_online = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','PAID'],['update_status',0]])->first();
+        if($transaction_online){
+            return response()->json(true);
+        }else{
+            return response()->json(false);
+        }
+    }
+
     public function showOneGadaiMobile($noic){
         $cawangan_all = Cawangan::on('mysql7')->get();
         $gadai_all = [];

app/Http/Controllers/TunaiController.php

@@ -340,6 +340,27 @@ class TunaiController extends Controller
 
         return response()->json($reqteller,200);
     }
+
+    public function getTunaiSemalam($kodcaw)
+    {
+        $current = new Carbon();
+        $current = Carbon::now();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $getdate = Tunai::on($cawangan['mysql'])
+            ->select('tarikh')
+            ->where('tarikh', '<', $current->toDateString())
+            ->orderBy('recno','desc')
+            ->first();
+
+        $tunai=Tunai::on($cawangan['mysql'])
+            ->where([['kodcaw','=',$kodcaw],['tarikh','=', $getdate['tarikh']],['baki','<>',0]])
+            ->GroupBy('kodlaluan')
+            ->get();
+        
+        return response()->json($tunai);
+    }
 }