diff --git a/app/Gadai.php b/app/Gadai.php
index 9c8d1c4..e5e9c60 100644
--- a/app/Gadai.php
+++ b/app/Gadai.php
@@ -21,6 +21,7 @@ class Gadai extends Model
         'nokp',
         't_gadai',
         'masa',
+        'sirig',
         'nilaimarhun',
         'berat',
         'pinjaman',
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 77179d4..111b27f 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Gadai;
+use App\Marhun;
 use App\Cawangan;
 use App\Transaction;
 use App\TransaksiKeuntungan;
@@ -21,7 +22,7 @@ class GadaiController extends Controller
     public function gadaiTransactionByCawanganAndDay($cawangan_code,$date){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$cawangan_code)->first();
 
-        $gadaiTransaction = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$date)->count();
+        $gadaiTransaction = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$date)->orderBy('sirig', 'desc')->first();
 
         return response()->json($gadaiTransaction);
     }
@@ -63,7 +64,7 @@ class GadaiController extends Controller
 
     public function create($kodcaw,Request $request)
     {
-        $current = Carbon::now()->setTimezone('Asia/Kuala_Lumpur');;
+        $current = Carbon::now();
         $current = new Carbon();
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -72,6 +73,7 @@ class GadaiController extends Controller
             'norujukan' => $request->norujukan,
             'nopelanggan' => $request->nopelanggan,
             'nokp' => $request->nokp,
+            'sirig' => $request->sirig,
             't_gadai' => $current->toDateString(),
             'masa' =>$current->toTimeString()
         ]);
@@ -80,13 +82,41 @@ class GadaiController extends Controller
 
     public function daftarGadaiMarhun($norujukan,Request $request)
     {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $t_matang = Carbon::now();
+        $t_matang = new Carbon();
+        $t_matang = $t_matang->addMonths(6)->subDays(1);
+
+        $t_kontrak = Carbon::now();
+        $t_kontrak = new Carbon();
+        $t_kontrak = $t_kontrak->addMonths(12)->subDays(1);
+
+        // dd($t_matang);
+        $margin_pinjam = $request->percentpinj *100;
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
             'nilaimarhun' => $request->nilaimarhun,
+            'berat'=> $request->berat,
             'pinjaman' => $request->pinjaman,
             'kadarupah' => $request->kadarupah,
             'marhun' => $request->marhun,
-            'percentpinj' => $request->percentpinj
+            'percentpinj' => $margin_pinjam,
+            'teller' => $request->teller,
+            'bakipjm' => $request->pinjaman,
+            'bakiupah' => $request->upah6,
+            'jbg' => 0.5,
+            't_update' => $current->toDateString(),
+            'cetak' => 0,
+            'upah12' => $request->upah12,
+            'hargajualan' => $request->hargajualan,
+            'bakihargajualan' => $request->hargajualan,
+            'tagserah' => 0,
+            't_matang' => $t_matang,
+            't_matang1' => $t_kontrak,
+            'tempoh' => 0.5,
+            'kuantiti' => $request->kuantiti_marhun
         ));
         return response()->json($gadai, 200);
     }
@@ -216,7 +246,7 @@ class GadaiController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
-        $gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$current->toDateString()],['cetak','=',1]])->get();
+        $gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$current->toDateString()],['cetak','=',1],['tagserah','=',0]])->get();
 
         return response()->json($gadai);
     }
@@ -226,4 +256,13 @@ class GadaiController extends Controller
         Gadai::findOrFail($id)->delete();
         return response('Deleted Successfully', 200);
     }
+
+    public function batalGadai($kodcaw, $norujukan){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+        Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
+        return response('Batal Berjaya', 200);
+    }
 }
diff --git a/routes/web.php b/routes/web.php
index 230dda9..a78daed 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -43,6 +43,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('gadai/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunOnline']);
     $router->put('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@daftarGadaiMarhun']);
 
+    $router->delete('gadai/batal/{kodcaw}/{norujukan}',['uses'=>'GadaiController@batalGadai']);
+
     $router->get('gadaiansemasa/{kodcaw}',['uses'=>'GadaiController@getGadaianSemasa']);
     $router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']);