Merge branch 'apiaku' into 'master'

Apiaku

See merge request online-sistem1/api_arrahn!7

app/AddTunai.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AddTunai extends Model
+{
+    protected $table = 'addtunai';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+     protected $fillable = ['tarikh','kodcaw','kodlaluan','tambah','kurang','nota'];
+
+     public $timestamps = false;
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

app/AnsRugi.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AnsRugi extends Model
+{
+    protected $table = 'ansrugi';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+		'nosiri',
+		'norujukan',
+		'nopelanggan',
+		'tarikh',
+		'bayaran',
+		'teller',
+		'nowakil',
+		'hubungan'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

app/BatalGadai.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BatalGadai extends Model
+{
+    protected $table = 'batalgadai';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'recNo','noRujukan','tellerId','namaTeller', 'tarikh', 'masa'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

app/Denominasi.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App;
+use Illuminate\Database\Eloquent\Model;
+
+class Denominasi extends Model
+{
+
+
+
+
+    protected $table = 'denominasi';
+
+
+
+}

app/HapusKira.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class HapusKira extends Model
+{
+    protected $table = 'hapuskira';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+		'RECNO',
+		'KODCAW',
+		'BATCHNO',
+		'NORUJUKAN',
+		'TARIKH',
+		'KADARUPAH',
+		'AMAUN',
+		'N_MARHUN',
+		'SEMUA',
+		'NOTA' ,
+		'PRKOD',
+		'TELLER',
+		'PELULUS',
+		'TERIMA',
+		'BAKIPJM',
+		'BAKIUPAH',
+		'KODGL'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

app/Http/Controllers/CustomerController.php

@@ -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();

app/Http/Controllers/DenominasiController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\CawanganDetail;
+use App\Cawangan;
+use App\Denominasi;
+use Illuminate\Http\Request;
+
+class DenominasiController extends Controller
+{
+
+
+   public function listdenominasi($kodcaw)
+   {
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    $data=Denominasi::on($cawangan['mysql'])->orderby('tarikh','desc')->limit(1)->get();
+    return response()->json($data);
+    
+   }
+}

app/Http/Controllers/GadaiController.php

@@ -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,7 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
+
     public function getLaporanGadai($kodcaw,$tarikh){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
@@ -326,4 +362,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);
+
+    }
+
+    
 }

app/Http/Controllers/LelongController.php

@@ -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);
+    }
 }

app/Http/Controllers/MarhunController.php

@@ -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);
+    }
 }

app/Http/Controllers/TebusController.php

@@ -9,6 +9,8 @@ use App\Transaction;
 use App\TransaksiKeuntungan;
 use App\Advansur;
 use App\Tebus;
+use App\InOutMar;
+
 use Illuminate\Http\Request;
 
 use Carbon\Carbon;
@@ -218,7 +220,7 @@ class TebusController extends Controller
                 'kodcaw'=> $kodcaw,
                 'norujukan'=> $norujukan,
                 'nopelanggan' => $request->nopelanggan,
-                'jenisbyr' => "TN",
+                'JenisByr' => "TN",
                 'jenistebus' => $request->jenistebus,
                 'glcode' => "0",
                 't_tebus' => $current->toDateString(),
@@ -237,8 +239,22 @@ class TebusController extends Controller
                 'historygadaian' => $request->historygadaian,
                 'tarikhbyrn' => $current->toDateString()
             ]);
-    
+
-        return response()->json($update_gadai, 200);
+            $create_inoutmar = InOutMar::on($cawangan['mysql'])->create([
+                'TARIKH' => $current->toDateString(),
+                'MASA' => $current->toTimeString(),
+                'NORUJUKAN' => $norujukan,
+                'NM' => $request->nilai_marhun,
+                'KPD' => "kosong",
+                'DRP' => "kosong",
+                'BLN' => $current->month,
+                'THN' => $current->year,
+                'TAG' => 0,
+                'jenisTebus' => $request->jenistebus,
+                'namaTeller' => "nama teller"
+            ]);
+
+        return response()->json($update_gadai, 201);
     }
 
     public function getLaporanTebus($kodcaw,$tarikh){
@@ -251,4 +267,47 @@ class TebusController extends Controller
         
         return response()->json($tebus);
     }
+
+        //API FARIS
+        public function listPenebusanBaru($kodcaw)
+        {
+      
+          $current = Carbon::now();
+          $current = new Carbon();
+          $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+          $gadai = Tebus::on($cawangan['mysql'])
+                      ->where([['t_tebus','=',$current->toDateString()],['tagterima','=',0]])
+                      ->get();
+      
+              return response()->json($gadai);
+      
+        }
+    
+        public function listSerahKhazanah($kodcaw)
+        {
+     
+            $current = Carbon::now();
+            $current = new Carbon();
+    
+            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    
+            $gadai = Tebus::on($cawangan['mysql'])
+            ->where([['t_tebus','=',$current->toDateString()],['tagterima','=',1]])
+            ->get();
+            return response()->json($gadai);
+    
+        }
+
+        public function tagterimaupdate($kodcaw,$norujukan)
+        {
+            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+            $update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
+                'tagterima' => 1
+            ));
+        }
+    
+        //END API FARIS
+
+    
 }

app/Http/Controllers/TunaiController.php

@@ -0,0 +1,179 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Cawangan;
+use App\Tunai;
+use App\AddTunai;
+use App\RequestTeller;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class TunaiController extends Controller
+{
+
+
+
+    public function listTunai($kodcaw)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+ 
+    
+         $tunai=Tunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()]])->get();
+         return response()->json($tunai);
+
+    }
+
+
+    public function sumBakiTunai($kodcaw)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $tunai=Tunai::on($cawangan['mysql'])->where('tarikh','=',$current->toDateString())->sum('baki');
+
+        return response()->json($tunai);
+ 
+    }
+
+    public function UpdateTunai($kodcaw, $kodlaluan, Request $request)
+    {
+
+
+        $current = Carbon::now();
+        $current = new Carbon();
+       
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $kodlaluan] ])->
+        update(array(
+             'tambah'=>$request->tambah,
+              'kurang'=>$request->kurang,
+              'baki'=>$request->bakiakhir
+        ));
+           
+        return response()->json($updatetunai, 200);
+    
+
+    }
+
+    
+
+
+    public function DaftarTunai($kodcaw, Request $request)
+    {
+
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $tunai=Tunai::on($cawangan['mysql'])->create([ 
+              
+           'tarikh' => $current->toDateString(),
+           'kodcaw'=> $request->kodcaw,
+           'kodlaluan'=>$request->teller,
+           'bakiawal'=>$request->bakiawal,
+           'masuk'=>$request->masuk,
+           'yuran'=>$request->yuran,
+           'keluar'=>$request->keluar,
+           'baki'=>$request->baki,
+           'tambah'=>$request->tambah,
+           'kurang'=>$request->kurang
+
+      ]);
+
+      return response()->json($tunai,201);
+
+    }
+
+    public function getCurrentTunai($kodcaw,$kodlaluan)
+  {
+
+    $current = Carbon::now();
+    $current = new Carbon();
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+     $tunai=Tunai::on($cawangan['mysql'])
+     ->where([['kodcaw','=',$kodcaw],['tarikh','<=',$current->toDateString()],['kodlaluan','=',$kodlaluan]])
+     ->orderBy('tarikh','desc')
+     ->first();
+     return response()->json($tunai);
+
+  }
+
+
+     ///API FARIS
+
+    
+    public function create($kodcaw,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        
+
+        $addtunai=AddTunai::on($cawangan['mysql'])->create([ 
+              
+            'tarikh' => $current->toDateString(),
+            'kodcaw'=> $request->kodcaw,
+            'kodlaluan'=>$request->KodLaluan,
+            'tambah'=>$request->tambah,
+            'kurang'=>$request->kurang,
+            'nota'=>$request->nota
+        ]);
+
+        return response()->json($addtunai,201);
+
+    }
+
+    public function getAddTunai($kodcaw,$tarikh)
+    {
+       
+        $current = Carbon::now();
+        $current = new Carbon();
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $addtunai=AddTunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$tarikh]])->get();
+        return response()->json($addtunai);
+    }
+
+    public function getRequestTeller($kodcaw,$kodlaluan)
+    {
+       
+        $current = Carbon::now();
+        $current = new Carbon();
+        
+        $requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['KodLaluan','=',$kodlaluan],['update','=',0]])->get();
+        return response()->json($requestteller);
+    }
+
+    public function createRequestTeller($kodcaw,$kodlaluan,Request $request)
+    {
+    
+        $current = Carbon::now();
+        $current = new Carbon();
+        
+        $reqteller=RequestTeller::on('mysql7')->create([ 
+              
+             'tarikh' => $current->toDateString(),
+             'kodcaw' => $kodcaw,
+             'KodLaluan'=> $kodlaluan,
+             'modal'=>$request->modal,
+             'serahan'=>$request->serahan,
+             'update' => '0'
+        ]);
+
+        return response()->json($reqteller,200);
+    }
+}
+
+

app/Http/Controllers/VaultController.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Vault;
+use App\Cawangan;
+use App\Tunai;
+use App\AddTunai;
+
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class VaultController extends Controller
+{
+
+
+ public function list($kodcaw)
+ {
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    $vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->orderby('tarikh','desc')->limit(1)->get();
+
+    return response()->json($vault);
+    
+ }
+
+ public function updateVault($kodcaw, Request $request)
+ {
+
+       
+   $current = Carbon::now();
+   $current = new Carbon();     
+   $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+   $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
+
+      'Masuk'=>$request->masuk,
+      'Keluar'=>$request->keluar,
+      'BakiAkhir'=>$request->bakiakhir,
+      'BakiEod'=>$request->bakieod
+
+   ) );
+
+   return response()->json($updateVault, 200);
+
+ }
+
+
+ public function create($kodcaw,Request $request)
+ {
+
+   
+   $current = Carbon::now();
+   $current = new Carbon();
+
+    
+   $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+   $vault=Vault::on($cawangan['mysql'])->create([ 
+              
+
+       'kodcaw'=>$request->kodcaw,
+       'tarikh'=> $current->toDateString()
+         ]);
+
+
+ }
+
+}

app/InOutMar.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class InOutMar extends Model
+{
+    protected $table = 'inoutmar';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'TARIKH',
+        'MASA',
+        'NORUJUKAN',
+        'NM',
+        'KPD',
+        'DRP',
+        'BLN',
+        'THN',
+        'TAG',
+        'jenisTebus',
+        'namaTeller'
+];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+
+    public $timestamps = false;
+
+}

app/Pembeli.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Pembeli extends Model
+{
+    protected $table = 'pembeli';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+		'nopembeli',
+		'nokp',
+		'nama',
+		'alamat1',
+		'alamat2',
+		'alamat3',
+		'alamat4',
+		'telefon',
+		'tag_syarikat'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

app/RequestTeller.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class RequestTeller extends Model
+{
+    protected $table = 'requestteller';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = ['no','KodLaluan','modal','serahan','tarikh','update','kodcaw'];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+
+    public $timestamps = false;
+
+}

app/Tunai.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Tunai extends Model
+{
+    protected $table = 'tunai';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = ['tarikh','kodcaw','kodlaluan','bakiawal','masuk','yuran','keluar','baki','tambah','kurang' ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+
+    public $timestamps = false;
+
+}

app/TuntutBaki.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TuntutBaki extends Model
+{
+    protected $table = 'tuntutbaki';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+    'RECNO',
+	'BATCHNO',
+	'JENIS',
+	'KODCAW',
+	'NORUJUKAN',
+	'TARIKH',
+	'PRKOD',
+	'TELLER',
+	'PELULUS',
+	'BAKIPJM',
+	'BAKIUPAH',
+	'CAJLAIN',
+	'CAJLELONG',
+	'KODGL',
+	'GLCODE',
+	'TERIMA',
+	'F_LULUS',
+	'JUMLAH',
+	'NOWAKIL',
+	'HARGAJUAL',
+	'gst_cl',
+	'gst_hj'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

app/Vault.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Vault extends Model
+{
+    
+    protected $table = 'vault';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+     protected $fillable = ['kodcaw',
+     'tarikh',
+     'bakiawal',
+     'keluar',
+     'masuk',
+     'bakiakhir',
+     'bakieod',
+      'pendahuluan',
+      'serahan',
+      '1sen',
+      '5sen',
+      '10sen',
+      '20sen',
+      '50sen',
+      'rm1',
+      'rm2',
+      'rm5',
+      'rm10',
+      'rm50',
+      'rm100',
+      'rm1000',
+      'totPanjar' 
+          ];
+
+ public $timestamps = false;
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

app/WTD.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class WTD extends Model
+{
+    protected $table = 'wtd';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+		'recno',
+		'tarikh',
+		'batchno',
+		'norujukan',
+		'nokp',
+		'nopelanggan',
+		't_jual',
+		'baki',
+		'kerugian',
+		'rugi',
+		'ansrugi',
+		'wtd',
+		'hargajual',
+		'pinjaman',
+		'bakiupah',
+		'cajlelong',
+		'gst_cl',
+		'norujukan2'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

routes/web.php

@@ -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']);
+    
 });