fix penebusan & gadaian range

app/Http/Controllers/GadaiController.php

@@ -561,6 +561,20 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
+    public function getLaporanGadaiRange($kodcaw,Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $gadai = Gadai::on($cawangan['mysql'])
+                ->where('t_gadai','>=',$request->mula)
+                ->where('t_gadai','<=',$request->akhir)
+                ->orderBy('t_gadai','asc')
+                ->orderBy('sirig','asc')
+                ->get();
+        
+        return response()->json($gadai);
+    }
+
     public function getLaporanBatalGadai($kodcaw,$tarikh){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 

app/Http/Controllers/LaporanController.php

@@ -244,8 +244,8 @@ class LaporanController extends Controller
 
         $gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir]]);
         
-        $tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','>=',$request->akhir]]);
-        $ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]);
+        $tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]);
+        $ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]);
 
 
         //a

app/Http/Controllers/TebusController.php

@@ -501,6 +501,19 @@ class TebusController extends Controller
         return response()->json($tebus);
     }
 
+    public function getLaporanTebusRange($kodcaw,Request $request){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tebus = Tebus::on($cawangan['mysql'])
+                ->where('t_tebus','>=',$request->mula)
+                ->where('t_tebus','<=',$request->akhir)
+                ->orderBy('t_tebus','asc')
+                ->orderBy('sirit','asc')
+                ->get();
+        
+        return response()->json($tebus);
+    }
+
     public function getLaporanTebusPengasingan($kodcaw,Request $request){
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -529,6 +542,36 @@ class TebusController extends Controller
         return response()->json($array_penebusan);
     }
 
+    public function getLaporanTebusPengasinganRange($kodcaw,Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tebusarrahn = Tebus::on($cawangan['mysql'])
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->where('t_tebus','>=',$request->mula)
+                ->where('t_tebus','<=',$request->akhir)
+                ->whereNull('hargajualan');
+
+        $totalpenebusanarrahn = $tebusarrahn->sum('tebus.pinjaman');
+        $bilpenebusanarrahn = $tebusarrahn->count();
+        $totalkeuntunganarrahn = $tebusarrahn->sum('tebus.bakiupah');
+
+        $tebustawarruq = Tebus::on($cawangan['mysql'])
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->where('t_tebus','>=',$request->mula)
+                ->where('t_tebus','<=',$request->akhir)
+                ->whereNotNull('hargajualan');
+
+        $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
+        $bilpenebusantawarruq = $tebustawarruq->count();
+        $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
+        $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
+
+        $array_penebusan = ['bilarrahn' => $bilpenebusanarrahn, 'totalarrahn' => $totalpenebusanarrahn, 'keuntunganarrahn' => $totalkeuntunganarrahn,  'biltawarruq' => $bilpenebusantawarruq, 'totaltawarruq' => $totalpenebusantawarruq,'totalrebate' => $totalrebatetawarruq,'keuntungantawarruq' => $totalkeuntungantawarruq];
+
+        return response()->json($array_penebusan);
+    }
+
     public function listPenebusanBaru($kodcaw){
     
         $current = Carbon::now();
@@ -736,6 +779,24 @@ class TebusController extends Controller
         return response()->json($arrayadvansur,200);
     }
 
+    public function advansurdetailsRange($kodcaw,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+        ->where('tarikh','>=',$request->mula)->where('tarikh','<=',$request->akhir);
+
+        $countadvansur = $listadvansur->count();
+        $totaladvansur = $listadvansur->sum('upahdibayar');
+
+        $arrayadvansur = ['bil' => $countadvansur, 'total' => $totaladvansur];
+
+        return response()->json($arrayadvansur,200);
+    }
+
     public function getAdvansurByKodlaluan($kodcaw,Request $request)
     {
         $current = Carbon::now();

routes/web.php

@@ -73,6 +73,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('gadaiansemasa/{kodcaw}',['uses'=>'GadaiController@getGadaianSemasa']);
     $router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']);
     $router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']);
+    $router->get('gadailaporanRange/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRange']); //Range Date
+
 
     $router->get('gadai/customers/{ic}/outstandingsemasa/{kodcaw}',['uses'=>'GadaiController@outstandingSemasaCustomer']);
     $router->put('gadai/updatehistory/{kodcaw}/{norujukan}',['uses'=>'GadaiController@updateHistoryGadai']);
@@ -92,7 +94,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('tebusbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusNotTawarruq']);
     $router->get('upahbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahNotTawarruq']);
     $router->get('tebus/laporan/{kodcaw}/{tarikh}',['uses'=>'TebusController@getLaporanTebus']);
+    $router->get('tebuslaporanRange/{kodcaw}',['uses'=>'TebusController@getLaporanTebusRange']);
     $router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']);
+    $router->get('tebuslaporanjenistawarruqrange/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasinganRange']);
+
     //Maintenance API TEBUS
     // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
     $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);
@@ -200,6 +205,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
     $router->get('advansurharini/{kodcaw}',['uses'=>'TebusController@advansurharini']);
     $router->get('advansurdetails/{kodcaw}',['uses'=>'TebusController@advansurdetails']);
+    $router->get('advansurdetailsrange/{kodcaw}',['uses'=>'TebusController@advansurdetailsRange']);
     $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
     $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']);