fixed conflict

2020-12-28 18:36:00 +08:00
parent 2c94b69319
commit 52e91a2050
6 changed files with 615 additions and 0 deletions
@@ -119,6 +119,18 @@ class CustomerController extends Controller
        return response()->json($gadai);
    }

+    public function getLaporanCustomers($kodcaw, $tarikh)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $gadai = Customer::on($cawangan['mysql'])
+                ->where('tarikhdaftar','=',$tarikh)
+                ->orderBy('tarikhdaftar', 'desc')
+                ->get();
+        
+        return response()->json($gadai);
+    }
+
    public function create($kodcaw,Request $request){
        $current = Carbon::now();
        $current = new Carbon();
@@ -7,8 +7,19 @@ use App\Marhun;
 use App\Cawangan;
 use App\Transaction;
 use App\TransaksiKeuntungan;
+use App\batalGadai;
+use App\TuntutBaki;
+use App\AnsRugi;
+use App\Lelong;
+use App\WTD;
+use App\HapusKira;
+use App\Tebus;
+
 use Illuminate\Http\Request;

+
+use DB;
+
 use Carbon\Carbon;

 class GadaiController extends Controller
@@ -54,6 +65,16 @@ class GadaiController extends Controller
        return response()->json($gadai_all);
    }

+    public function showOneGadaiByCawanganOnly($kodcaw,$tarikh){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $gadai = Gadai::on($cawangan['mysql'])
+                    ->where([['sttebus','=',''],['t_gadai','<=',$tarikh]])
+                    ->orWhere([['sttebus','<>',''],['t_update','>',$tarikh],['t_gadai','<=',$tarikh]])
+                    ->get();
+
+        return response()->json($gadai);
+    }
+
    public function showOneGadaibyRujukanAndCawangan($kodcaw,$norujukan)
    {
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -289,6 +310,20 @@ class GadaiController extends Controller
        return response()->json($gadai);
    }

+    
+    public function barcodeScanTebus($kodcaw,$norujukan)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
+        $namaTeller=$gadai['tellernew'];
+
+        $update_gadai=Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)-> update(array(
+            'semakbarcode'=>'Tebus','tellernew'=>$namaTeller));
+
+        return response()->json($update_gadai,200);
+    }
+
+
    public function barcodeScan($kodcaw,$norujukan){
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

@@ -316,6 +351,42 @@ class GadaiController extends Controller
        return response()->json($gadai);
    }

+    //API FARIS
+    public function listPenebusanBaru($kodcaw)
+    {
+  
+      $current = Carbon::now();
+      $current = new Carbon();
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $gadai = Gadai::on($cawangan['mysql'])
+                  ->where([
+                      ['t_update','=',$current->toDateString()],
+                      ['cetak','=',1],['tagserah','=',1],
+                      ['semakbarcode','=','Lulus']
+                      ])
+                  ->get();
+  
+          return response()->json($gadai);
+  
+    }
+
+    public function listSerahKhazanah($kodcaw)
+    {
+ 
+        $current = Carbon::now();
+        $current = new Carbon();
+
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+     $gadai = Gadai::on($cawangan['mysql'])->where([['cetak','=',1],['tagserah','=',1],['semakbarcode','=','Tebus'],['t_update','=',$current->toDateString()]])->get();
+    return response()->json($gadai);
+
+
+    }
+
+    //END API FARIS
+
    public function getLaporanGadai($kodcaw,$tarikh){
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

@@ -326,4 +397,438 @@ class GadaiController extends Controller
        
        return response()->json($gadai);
    }
+
+    public function getLaporanBatalGadai($kodcaw,$tarikh){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $gadai = batalGadai::on($cawangan['mysql'])
+                ->where('tarikh','=',$tarikh)
+                ->orderBy('tarikh','desc')
+                ->get();
+        
+        return response()->json($gadai);
+    }
+
+    public function gadaiRingkasanTerkumpul($kodcaw,$tarikh){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $array_terkumpul = [];
+
+        $gadai = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
+                ->where('t_gadai','<=',$tarikh)
+                // ->where('sttebus','=','')
+                ->orderBy('t_gadai','desc')
+                ->get();
+
+        $tebus = Gadai::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','desc')
+        ->get();
+
+        $lelong = Gadai::on($cawangan['mysql'])
+        ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
+        ->where('t_gadai','<=',$tarikh)
+        ->where('sttebus','=','L')
+        ->orderBy('t_gadai','desc')
+        ->get();
+
+        $lelongrugi = Gadai::on($cawangan['mysql'])
+        ->where('t_gadai','<=',$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('sttebus','=','L')
+        ->where('baki', 'not like', '-%')
+        ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
+        ->sum('baki');
+
+        $cajlelong = Lelong::on($cawangan['mysql'])
+        ->where('t_jual','<=',$tarikh)
+        ->sum('cajlelong');
+
+
+        $lelongupahsimpan = Lelong::on($cawangan['mysql'])
+        ->where('t_jual','<=',$tarikh)
+        ->sum('bakiupah');
+
+        $terimarugilelong = AnsRugi::on($cawangan['mysql'])
+        ->where('tarikh','<=',$tarikh)
+        ->sum('bayaran');
+
+        $bayarlebihanlelong = TuntutBaki::on($cawangan['mysql'])
+        ->where('TARIKH','<=',$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)
+        ->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('jenistebus','=','A')
+        ->get();
+
+   
+
+        array_push($array_terkumpul,["gadai" => $gadai,"tebus" => $tebus, "lelong" => $lelong,"lelongbaki" => $lelongbaki,"lelongrugi" => $lelongrugi,"bayarlebihanlelong" => $bayarlebihanlelong, "terimarugilelong" => $terimarugilelong, "cajlelong" => $cajlelong, "lelongupahsimpan" => $lelongupahsimpan,"hapuskira" => $hapuskira,"advansur" => $advansur]);
+        
+        return response()->json($array_terkumpul);
+    }
+
+    public function gadaiRingkasanHarian($kodcaw,$tarikh){
+        $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','=','')
+                ->orderBy('t_gadai')
+                ->get();
+
+        $tebus = Gadai::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')
+        ->get();
+
+        $lelong = Gadai::on($cawangan['mysql'])
+        ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
+        ->where('t_gadai','=',$tarikh)
+        ->where('sttebus','=','L')
+        ->orderBy('t_gadai')
+        ->get();
+
+        $lelongrugi = Gadai::on($cawangan['mysql'])
+        ->where('t_gadai','=',$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('sttebus','=','L')
+        ->where('baki', 'not like', '-%')
+        ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
+        ->sum('baki');
+
+        $cajlelong = Lelong::on($cawangan['mysql'])
+        ->where('t_jual','=',$tarikh)
+        ->sum('cajlelong');
+
+
+        $lelongupahsimpan = Lelong::on($cawangan['mysql'])
+        ->where('t_jual','=',$tarikh)
+        ->sum('bakiupah');
+
+        $terimarugilelong = AnsRugi::on($cawangan['mysql'])
+        ->where('tarikh','=',$tarikh)
+        ->sum('bayaran');
+
+        $bayarlebihanlelong = TuntutBaki::on($cawangan['mysql'])
+        ->where('TARIKH','=',$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)
+        ->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)
+        ->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('jenistebus','=','A')
+        ->get();
+
+        array_push($array_harian,["gadai" => $gadai,"tebus" => $tebus, "lelong" => $lelong,"lelongbaki" => $lelongbaki,"lelongrugi" => $lelongrugi,"bayarlebihanlelong" => $bayarlebihanlelong, "terimarugilelong" => $terimarugilelong, "cajlelong" => $cajlelong, "lelongupahsimpan" => $lelongupahsimpan, "wtd" => $wtd,"hapuskira" => $hapuskira,"advansur" => $advansur]);
+        
+        return response()->json($array_harian);
+    }
+
+    public function getLaporanAnsuran($kodcaw,$tarikh){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $gadai = Tebus::on($cawangan['mysql'])
+                ->where('jenistebus','=',"A")
+                ->where('t_tebus','=',$tarikh)
+                ->orderBy('t_tebus')
+                ->get();
+        
+        return response()->json($gadai);
+    }
+
+    public function getLaporanKawalanStok($kodcaw,$tarikh)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $array_kawalanstok = [];
+
+        ////////////
+        ///GADAI////
+        ///////////
+
+        $gadai1 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','<',$tarikh)
+                // ->where('sttebus','=','')
+                ->where('nilaimarhun','>=',1)
+                ->where('nilaimarhun','<=',400.99)
+                ->orderBy('t_gadai')
+                ->get();                
+
+        $gadai2 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','<',$tarikh)
+                // ->where('sttebus','=','')
+                ->where('nilaimarhun','>=',401)
+                ->where('nilaimarhun','<=',2000.99)
+                ->orderBy('t_gadai')
+                ->get();     
+
+        $gadai3 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','<',$tarikh)
+                // ->where('sttebus','=','')
+                ->where('nilaimarhun','>=',2001)
+                ->where('nilaimarhun','<=',1000000)
+                ->orderBy('t_gadai')
+                ->get();    
+
+
+        $gadaiini1 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','=',$tarikh)
+                // ->where('sttebus','=','')
+                ->where('nilaimarhun','>=',1)
+                ->where('nilaimarhun','<=',400.99)
+                ->orderBy('t_gadai')
+                ->get();                
+
+        $gadaiini2 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','=',$tarikh)
+                // ->where('sttebus','=','')
+                ->where('nilaimarhun','>=',401)
+                ->where('nilaimarhun','<=',2000.99)
+                ->orderBy('t_gadai')
+                ->get();     
+
+        $gadaiini3 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','=',$tarikh)
+                // ->where('sttebus','=','')
+                ->where('nilaimarhun','>=',2001)
+                ->where('nilaimarhun','<=',1000000)
+                ->orderBy('t_gadai')
+                ->get();    
+                
+        
+        ////////////
+        ///TEBUS////
+        ///////////
+
+        $tebus1 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','<',$tarikh)
+                ->where('sttebus','=','T')
+                ->where('nilaimarhun','>=',1)
+                ->where('nilaimarhun','<=',400.99)
+                ->orderBy('t_gadai')
+                ->get();                
+
+        $tebus2 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','<',$tarikh)
+                ->where('sttebus','=','T')
+                ->where('nilaimarhun','>=',401)
+                ->where('nilaimarhun','<=',2000.99)
+                ->orderBy('t_gadai')
+                ->get();     
+
+        $tebus3 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','<',$tarikh)
+                ->where('sttebus','=','T')
+                ->where('nilaimarhun','>=',2001)
+                ->where('nilaimarhun','<=',1000000)
+                ->orderBy('t_gadai')
+                ->get();    
+
+        $tebusini1 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','=',$tarikh)
+                ->where('sttebus','=','T')
+                ->where('nilaimarhun','>=',1)
+                ->where('nilaimarhun','<=',400.99)
+                ->orderBy('t_gadai')
+                ->get();                
+
+        $tebusini2 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','=',$tarikh)
+                ->where('sttebus','=','T')
+                ->where('nilaimarhun','>=',401)
+                ->where('nilaimarhun','<=',2000.99)
+                ->orderBy('t_gadai')
+                ->get();     
+
+        $tebusini3 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','=',$tarikh)
+                ->where('sttebus','=','T')
+                ->where('nilaimarhun','>=',2001)
+                ->where('nilaimarhun','<=',1000000)
+                ->orderBy('t_gadai')
+                ->get();    
+
+
+        //////////////
+        ///LELONG/////
+        /////////////
+
+
+        $lelong1 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','<',$tarikh)
+                ->where('sttebus','=','L')
+                ->where('nilaimarhun','>=',1)
+                ->where('nilaimarhun','<=',400.99)
+                ->orderBy('t_gadai')
+                ->get();                
+
+        $lelong2 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','<',$tarikh)
+                ->where('sttebus','=','L')
+                ->where('nilaimarhun','>=',401)
+                ->where('nilaimarhun','<=',2000.99)
+                ->orderBy('t_gadai')
+                ->get();     
+
+        $lelong3 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','<',$tarikh)
+                ->where('sttebus','=','L')
+                ->where('nilaimarhun','>=',2001)
+                ->where('nilaimarhun','<=',1000000)
+                ->orderBy('t_gadai')
+                ->get();    
+
+        $lelongini1 = Gadai::on($cawangan['mysql'])
+            ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+            ->where('t_gadai','=',$tarikh)
+            ->where('sttebus','=','L')
+            ->where('nilaimarhun','>=',1)
+            ->where('nilaimarhun','<=',400.99)
+            ->orderBy('t_gadai')
+            ->get();                
+
+        $lelongini2 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','=',$tarikh)
+                ->where('sttebus','=','L')
+                ->where('nilaimarhun','>=',401)
+                ->where('nilaimarhun','<=',2000.99)
+                ->orderBy('t_gadai')
+                ->get();     
+
+        $lelongini3 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->where('t_gadai','=',$tarikh)
+                ->where('sttebus','=','L')
+                ->where('nilaimarhun','>=',2001)
+                ->where('nilaimarhun','<=',1000000)
+                ->orderBy('t_gadai')
+                ->get();   
+
+        //////////////////
+        ///HAPUS KIRA/////
+        //////////////////
+
+
+
+                // $hapuskira = HapusKira::on($cawangan['mysql'])
+                // ->selectRaw('COUNT(*) AS bilangan, SUM(gadai.nilaimarhun) as jumlahmarhun, SUM(gadai.pinjaman) as jumlahpinjaman')
+                // ->where('hapuskira.Tarikh','=',$tarikh)
+                // ->rightJoin('gadai', 'gadai.norujukan', '=', 'hapuskira.norujukan')
+                // ->get();
+
+        $hapuskira1 = HapusKira::on($cawangan['mysql'])
+                ->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
+                ->where('TARIKH','<',$tarikh)
+                ->where('N_MARHUN','>=',1)
+                ->where('N_MARHUN','<=',400.99)
+                ->orderBy('TARIKH')
+                ->get();                
+
+        $hapuskira2 = HapusKira::on($cawangan['mysql'])
+                ->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
+                ->where('TARIKH','<',$tarikh)
+                ->where('N_MARHUN','>=',401)
+                ->where('N_MARHUN','<=',2000.99)
+                ->orderBy('TARIKH')
+                ->get();     
+
+        $hapuskira3 = HapusKira::on($cawangan['mysql'])
+                ->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
+                ->where('TARIKH','<',$tarikh)
+                ->where('N_MARHUN','>=',2001)
+                ->where('N_MARHUN','<=',1000000)
+                ->orderBy('TARIKH')
+                ->get();   
+                
+        $hapuskiraini1 = HapusKira::on($cawangan['mysql'])
+                ->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
+                ->where('TARIKH','=',$tarikh)
+                ->where('N_MARHUN','>=',1)
+                ->where('N_MARHUN','<=',400.99)
+                ->orderBy('TARIKH')
+                ->get();                
+
+        $hapuskiraini2 = HapusKira::on($cawangan['mysql'])
+                ->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
+                ->where('TARIKH','=',$tarikh)
+                ->where('N_MARHUN','>=',401)
+                ->where('N_MARHUN','<=',2000.99)
+                ->orderBy('TARIKH')
+                ->get();     
+
+        $hapuskiraini3 = HapusKira::on($cawangan['mysql'])
+                ->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
+                ->where('TARIKH','=',$tarikh)
+                ->where('N_MARHUN','>=',2001)
+                ->where('N_MARHUN','<=',1000000)
+                ->orderBy('TARIKH')
+                ->get();  
+
+
+        array_push($array_kawalanstok,["gadai1" => $gadai1, "gadai2" => $gadai2, "gadai3" => $gadai3,"gadaiini1" => $gadaiini1, "gadaiini2" => $gadaiini2, "gadaiini3" => $gadaiini3]);
+        array_push($array_kawalanstok,["tebus1" => $tebus1, "tebus2" => $tebus2, "tebus3" => $tebus3,"tebusini1" => $tebusini1, "tebusini2" => $tebusini2, "tebusini3" => $tebusini3]);
+        array_push($array_kawalanstok,["lelong1" => $lelong1, "lelong2" => $lelong2, "lelong3" => $lelong3,"lelongini1" => $lelongini1, "lelongini2" => $lelongini2, "lelongini3" => $lelongini3]);
+        array_push($array_kawalanstok,["hapuskira1" => $hapuskira1, "hapuskira2" => $hapuskira2, "hapuskira3" => $hapuskira3,"hapuskiraini1" => $hapuskiraini1, "hapuskiraini2" => $hapuskiraini2, "hapuskiraini3" => $hapuskiraini3]);
+        return response()->json($array_kawalanstok);
+
+    }
+
+    
 }
@@ -113,4 +113,18 @@ class LelongController extends Controller
        Lelong::findOrFail($id)->delete();
        return response('Deleted Successfully', 200);
    }
+
+
+    public function getLaporanLelongan($kodcaw,$tarikh){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $lelong = Lelong::on($cawangan['mysql'])
+                ->where('t_lelong','=',$tarikh)
+                ->whereNotNull('t_jual')
+                ->leftJoin('pembeli', 'pembeli.nopembeli', '=', 'Lelong.nopembeli')
+                ->orderBy('t_lelong')
+                ->get();
+
+        return response()->json($lelong);
+    }
 }
@@ -78,4 +78,33 @@ class MarhunController extends Controller
        Marhun::findOrFail($id)->delete();
        return response('Deleted Successfully', 200);
    }
+
+    public function getLaporanMarhunHarian($kodcaw,$tarikh){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $marhun = Marhun::on($cawangan['mysql'])
+                ->select('Marhun.norujukan','Gadai.nokp','Customer.nama','Marhun.marhun','Marhun.nota','Marhun.berat','Marhun.karat','Marhun.harga','Marhun.n_marhun','Marhun.t_gadai')
+                ->rightJoin('Gadai', 'Gadai.norujukan', '=', 'Marhun.norujukan')
+                ->rightJoin('Customer', 'Customer.kpbaru', '=', 'Gadai.nokp') 
+                ->where('Marhun.t_gadai','=',$tarikh)
+                ->orderBy('Marhun.t_gadai')
+                ->get();
+        
+        return response()->json($marhun);
+    }
+
+    public function getLaporanMarhunTerkumpul($kodcaw,$tarikh){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $marhun = Marhun::on($cawangan['mysql'])
+                ->select('Marhun.norujukan','Gadai.sttebus','Gadai.pinjaman','Gadai.nokp','Customer.nama','Marhun.marhun','Marhun.nota','Marhun.berat','Marhun.karat','Marhun.harga','Marhun.n_marhun','Marhun.t_gadai')
+                ->rightJoin('Gadai', 'Gadai.norujukan', '=', 'Marhun.norujukan')
+                ->rightJoin('Customer', 'Customer.kpbaru', '=', 'Gadai.nokp') 
+                ->where('Marhun.t_gadai','<=',$tarikh)
+                ->where('Gadai.sttebus','=','')
+                ->orderBy('Marhun.norujukan')
+                ->get();
+        
+        return response()->json($marhun);
+    }
 }
@@ -251,4 +251,6 @@ class TebusController extends Controller
        
        return response()->json($tebus);
    }
+
+    
 }
@@ -28,12 +28,14 @@ $router->group(['prefix'=>'api'], function () use ($router){
    $router->post('customers/{kodcaw}',['uses'=>'CustomerController@create']);
    $router->delete('customers/{kodcaw}/{nokp}', ['uses' => 'CustomerController@delete']);
    $router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
+    $router->get('customers/laporan/{kodcaw}/{tarikh}',['uses'=>'CustomerController@getLaporanCustomers']);

    $router->get('customers/latest/{kodcaw}',['uses'=>'CustomerController@getLatestCustomer']);

    //Gadai API
    $router->get('gadai',['uses'=>'GadaiController@showAllGadais']);
    $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadai']);
+    $router->get('gadai/cawangan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@showOneGadaiByCawanganOnly']); //stokaudit
    $router->get('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@showOneGadaiByNorujukan']);
    $router->get('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@showOneGadaibyRujukanAndCawangan']);
    $router->post('gadai/{kodcaw}',['uses'=>'GadaiController@create']);
@@ -44,6 +46,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
    $router->put('gadai/norujukan/komuditi/{kodcaw}/{norujukan}',['uses'=>'GadaiController@pembelianKomuditi']);
    $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/serah_marhun/khazanah/{kodcaw}',['uses'=>'GadaiController@serahMarhunKhazanah']);
    $router->get('gadai/serah_marhun/khazanah/petibesi/{kodcaw}',['uses'=>'GadaiController@serahPetiBesi']);
@@ -56,6 +61,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
    $router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']);
    $router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']);

+
    //Tebus API
    $router->get('tebustawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusTawarruq']);
    $router->get('upahtawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahTawarruq']);
@@ -68,6 +74,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
    // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
    $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);

+    //API FARIS
+    $router->put('tebus/serah_marhun_teller/{kodcaw}/{norujukan}',['uses'=>'GadaiController@barcodescanTebus']);
+    // $router->get('tebus_serahan/{kodcaw}',['uses'=>'TebusController@SerahMarhunTeller']);
+
    //Lelong API
    $router->get('lelong',['uses'=>'LelongController@showAllLelongs']);
    $router->get('lelong/cawangan/{kodcaw}',['uses'=>'LelongController@showAllLelongByCawangan']);
@@ -76,12 +86,17 @@ $router->group(['prefix'=>'api'], function () use ($router){
    $router->put('lelong/{id}', ['uses' => 'LelongController@update']);
    $router->get('bakilelong/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelong']);
    $router->get('bilangandilelong/{noic}',['uses'=>'LelongController@BilAkanDilelong']);
+    $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanLelong']); //laporan lelong
+

    //Marhun API
    $router->get('marhun',['uses'=>'MarhunController@showAllMarhuns']);
    $router->get('marhun/{norujukan}',['uses'=>'MarhunController@showOneMarhun']);
    $router->post('marhun/{kodcaw}',['uses'=>'MarhunController@create']);
    $router->put('marhun/{id}', ['uses' => 'MarhunController@update']);
+    $router->get('marhun/laporan/{kodcaw}/{tarikh}',['uses'=>'MarhunController@getLaporanMarhunHarian']);
+    $router->get('marhunterkumpul/laporan/{kodcaw}/{tarikh}',['uses'=>'MarhunController@getLaporanMarhunTerkumpul']);
+    
    

    $router->get('jemas',['uses'=>'MarhunController@getAllJemas']);
@@ -134,4 +149,42 @@ $router->group(['prefix'=>'api'], function () use ($router){
    $router->get('online/transaction',['uses'=>'TransactionOnlineController@getLatestNosiri']);
    $router->post('online/transaction',['uses'=>'TransactionOnlineController@create']);
    $router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']);
+    
+
+    //ANSURAN API
+    $router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
+
+    //LAPORAN API
+    $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
+    $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
+
+
+    //API FARIS
+    $router->get('VaultController/{kodcaw}',['uses'=>'VaultController@list']);
+    $router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']);
+    $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']);
+    $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
+    $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
+    $router->put('updateTunai/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunai']);
+    $router->get('getLatestBaki/{kodcaw}',['uses'=>'TunaiController@sumBakiTunai']);
+
+    $router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
+    
+
+    $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
+    $router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']);
+
+    $router->get('DenominasiController/{kodcaw}',['uses'=>'DenominasiController@listdenominasi']);
+
+    $router->get('GetCurrentTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getCurrentTunai']);
+
+
+    //API REQUEST TELLER
+    $router->post('requestTeller/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@createRequestTeller']);
+    $router->get('requestTeller/get/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@getRequestTeller']);
+    // getRequestTeller
+
+    //update tag inoutmar
+    $router->put('updatetagterima/{kodcaw}/{norujukan}',['uses'=>'TebusController@tagterimaupdate']);
+    
 });