fix gadai tebus

app/Http/Controllers/GadaiController.php

@@ -604,7 +604,43 @@ class GadaiController extends Controller
         return response()->json($array_dashboard);
     }
 
-    public function gadaiRingkasanTerkumpul($kodcaw,$tarikh){
+    public function GadaiTebusList($kodcaw,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $arrayharian = [];
+
+        $gadai = Gadai::on($cawangan['mysql'])
+        ->where('t_gadai','=',$request->tarikh)
+        ->where('sttebus','=','')
+        ->orderBy('t_gadai')
+        ->get();
+
+        $tebus = Tebus::on($cawangan['mysql'])
+        ->where('t_tebus','=',$request->tarikh)
+        ->where('jenistebus','=','T')
+        ->orderBy('t_tebus')
+        ->get();
+
+        foreach($gadai as $index=>$g)
+        {
+            array_push($arrayharian,$g);
+        }
+
+        foreach($tebus as $index1=>$t)
+        {
+            array_push($arrayharian,$t);
+        }
+
+        return response()->json($arrayharian,200);
+
+    }
+
+    public function gadaiRingkasanTerkumpul($kodcaw,Request $request){
 
         $current = Carbon::now();
         $current = new Carbon();
@@ -615,69 +651,77 @@ class GadaiController extends Controller
 
         $gadai = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
-                ->where('t_gadai','<=',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('t_gadai','<=',$request->tarikh)
+                ->where('sttebus','=','')
                 // ->whereYear('t_gadai','=',$current->year)
                 ->orderBy('t_gadai','desc')
                 ->get();
        
 
-        $tebus = Gadai::on($cawangan['mysql'])
+        // $tebus = Gadai::on($cawangan['mysql'])
+        // ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
+        // ->where('t_gadai','<=',$request->tarikh)
+        // ->where('sttebus','=','T')
+        // // ->whereYear('t_gadai','=',$current->year)
+        // ->orderBy('t_gadai','desc')
+        // ->get();
+
+        $tebus = Tebus::on($cawangan['mysql'])
         ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
-        ->where('t_gadai','<=',$tarikh)
-        ->where('sttebus','=','T')
+        ->where('t_tebus','<=',$request->tarikh)
+        ->where('jenistebus','=','T')
         // ->whereYear('t_gadai','=',$current->year)
-        ->orderBy('t_gadai','desc')
+        ->orderBy('t_tebus','desc')
         ->get();
 
         $lelong = Gadai::on($cawangan['mysql'])
         ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
-        ->where('t_gadai','<=',$tarikh)
+        ->where('t_gadai','<=',$request->tarikh)
         ->where('sttebus','=','L')
         // ->whereYear('t_gadai','=',$current->year)
         ->orderBy('t_gadai','desc')
         ->get();
 
         $lelongrugi = Gadai::on($cawangan['mysql'])
-        ->where('t_gadai','<=',$tarikh)
+        ->where('t_gadai','<=',$request->tarikh)
         ->where('sttebus','=','L')
         ->where('baki', 'like', '-%')
         ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
         ->sum('baki');
 
         $lelongbaki = Gadai::on($cawangan['mysql'])
-        ->where('t_gadai','<=',$tarikh)
+        ->where('t_gadai','<=',$request->tarikh)
         ->where('sttebus','=','L')
         ->where('baki', 'not like', '-%')
         ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
         ->sum('baki');
 
         $cajlelong = Lelong::on($cawangan['mysql'])
-        ->where('t_jual','<=',$tarikh)
+        ->where('t_jual','<=',$request->tarikh)
         ->sum('cajlelong');
 
 
         $lelongupahsimpan = Lelong::on($cawangan['mysql'])
-        ->where('t_jual','<=',$tarikh)
+        ->where('t_jual','<=',$request->tarikh)
         ->sum('bakiupah');
 
         $terimarugilelong = AnsRugi::on($cawangan['mysql'])
-        ->where('tarikh','<=',$tarikh)
+        ->where('tarikh','<=',$request->tarikh)
         ->sum('bayaran');
 
         $bayarlebihanlelong = TuntutBaki::on($cawangan['mysql'])
-        ->where('tarikh','<=',$tarikh)
+        ->where('tarikh','<=',$request->tarikh)
         ->sum('jumlah');
 
         $hapuskira = HapusKira::on($cawangan['mysql'])
         ->selectRaw('COUNT(*) AS bilangan, SUM(gadai.nilaimarhun) as jumlahmarhun, SUM(gadai.pinjaman) as jumlahpinjaman')
-        ->where('hapuskira.Tarikh','<=',$tarikh)
+        ->where('hapuskira.Tarikh','<=',$request->tarikh)
         ->rightJoin('gadai', 'gadai.norujukan', '=', 'hapuskira.norujukan')
         ->get();
 
         $advansur = Tebus::on($cawangan['mysql'])
         ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
-        ->where('t_tebus','<=',$tarikh)
+        ->where('t_tebus','<=',$request->tarikh)
         ->where('jenistebus','=','A')
         ->get();
 
@@ -688,78 +732,85 @@ class GadaiController extends Controller
         return response()->json($array_terkumpul);
     }
 
-    public function gadaiRingkasanHarian($kodcaw,$tarikh){
+    public function gadaiRingkasanHarian($kodcaw,Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $array_harian = [];
 
         $gadai = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
-                ->where('t_gadai','=',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('t_gadai','=',$request->tarikh)
+                ->where('sttebus','=','')
                 ->orderBy('t_gadai')
                 ->get();
 
-        $tebus = Gadai::on($cawangan['mysql'])
+        // $tebus = Gadai::on($cawangan['mysql'])
+        // ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
+        // ->where('t_gadai','=',$request->tarikh)
+        // ->where('sttebus','=','T')
+        // ->orderBy('t_gadai')
+        // ->get();
+
+        $tebus = Tebus::on($cawangan['mysql'])
         ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
-        ->where('t_gadai','=',$tarikh)
-        ->where('sttebus','=','T')
-        ->orderBy('t_gadai')
+        ->where('t_tebus','=',$request->tarikh)
+        ->where('jenistebus','=','T')
+        ->orderBy('t_tebus')
         ->get();
 
         $lelong = Gadai::on($cawangan['mysql'])
         ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
-        ->where('t_gadai','=',$tarikh)
+        ->where('t_gadai','=',$request->tarikh)
         ->where('sttebus','=','L')
         ->orderBy('t_gadai')
         ->get();
 
         $lelongrugi = Gadai::on($cawangan['mysql'])
-        ->where('t_gadai','=',$tarikh)
+        ->where('t_gadai','=',$request->tarikh)
         ->where('sttebus','=','L')
         ->where('baki', 'like', '-%')
         ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
         ->sum('baki');
 
         $lelongbaki = Gadai::on($cawangan['mysql'])
-        ->where('t_gadai','=',$tarikh)
+        ->where('t_gadai','=',$request->tarikh)
         ->where('sttebus','=','L')
         ->where('baki', 'not like', '-%')
         ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
         ->sum('baki');
 
         $cajlelong = Lelong::on($cawangan['mysql'])
-        ->where('t_jual','=',$tarikh)
+        ->where('t_jual','=',$request->tarikh)
         ->sum('cajlelong');
 
 
         $lelongupahsimpan = Lelong::on($cawangan['mysql'])
-        ->where('t_jual','=',$tarikh)
+        ->where('t_jual','=',$request->tarikh)
         ->sum('bakiupah');
 
         $terimarugilelong = AnsRugi::on($cawangan['mysql'])
-        ->where('tarikh','=',$tarikh)
+        ->where('tarikh','=',$request->tarikh)
         ->sum('bayaran');
 
         $bayarlebihanlelong = TuntutBaki::on($cawangan['mysql'])
-        ->where('tarikh','=',$tarikh)
+        ->where('tarikh','=',$request->tarikh)
         ->sum('jumlah');
 
         $wtd = WTD::on($cawangan['mysql'])
         ->selectRaw('COUNT(*) AS bilangan, SUM(gadai.nilaimarhun) as jumlahmarhun, SUM(wtd.pinjaman) as jumlahpinjaman')
-        ->where('wtd.tarikh','=',$tarikh)
+        ->where('wtd.tarikh','=',$request->tarikh)
         ->rightJoin('gadai', 'gadai.norujukan', '=', 'wtd.norujukan')
         ->get();
 
         $hapuskira = HapusKira::on($cawangan['mysql'])
         ->selectRaw('COUNT(*) AS bilangan, SUM(gadai.nilaimarhun) as jumlahmarhun, SUM(gadai.pinjaman) as jumlahpinjaman')
-        ->where('hapuskira.Tarikh','=',$tarikh)
+        ->where('hapuskira.Tarikh','=',$request->tarikh)
         ->rightJoin('gadai', 'gadai.norujukan', '=', 'hapuskira.norujukan')
         ->get();
 
         $advansur = Tebus::on($cawangan['mysql'])
         ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
-        ->where('t_tebus','=',$tarikh)
+        ->where('t_tebus','=',$request->tarikh)
         ->where('jenistebus','=','A')
         ->get();
 

routes/web.php

@@ -49,8 +49,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('gadai/norujukan/cetak/{kodcaw}/{norujukan}',['uses'=>'GadaiController@cetakSAG']);
     $router->put('gadai/norujukan/serah/{kodcaw}/{norujukan}',['uses'=>'GadaiController@serahMarhun']);
     $router->get('batalgadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanBatalGadai']); //laporan batalgadai
-    $router->get('gadai/laporan/ringkasan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); //ringkasan terkumpul
-    $router->get('gadai/laporan/ringkasanharian/{kodcaw}/{tarikh}',['uses'=>'GadaiController@gadaiRingkasanHarian']); //ringkasan harian
+    $router->get('gadai/laporan/ringkasan/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); //ringkasan terkumpul
+    $router->get('gadai/laporan/ringkasanharian/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanHarian']); //ringkasan harian
+    $router->get('gadaitebus/listharini/{kodcaw}',['uses'=>'GadaiController@GadaiTebusList']);
 
     $router->get('gadai/serah_marhun/khazanah/{kodcaw}',['uses'=>'GadaiController@serahMarhunKhazanah']);
     $router->get('gadai/serah_marhun/khazanah/petibesi/{kodcaw}',['uses'=>'GadaiController@serahPetiBesi']);