diff --git a/app/Console/Commands/resetRoleDaily.php b/app/Console/Commands/resetRoleDaily.php
new file mode 100644
index 0000000..2b027f8
--- /dev/null
+++ b/app/Console/Commands/resetRoleDaily.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\User;
+use Illuminate\Console\Command;
+
+class resetRoleDaily extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'reset:dailyrole';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Reset Daily Role';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $all_user = User::get();
+        foreach($all_user as $index=>$user_kaunter){
+            User::where('id','=',$user_kaunter['id'])->update(['role_harian'=>null]);
+        }
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 69914e9..01b3eaf 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        //
+        Commands\resetRoleDaily::class,
     ];
 
     /**
@@ -24,7 +24,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')->hourly();
+        $schedule->command('reset:dailyrole')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:00');
     }
 
     /**
diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php
index c789278..2816419 100644
--- a/app/Http/Controllers/PenebusanController.php
+++ b/app/Http/Controllers/PenebusanController.php
@@ -205,111 +205,119 @@ class PenebusanController extends Controller
         ////////////////////////
        /// UPDATE TEBUS API////
        ///////////////////////
-       $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
-        'nopelanggan' => $request->nopelanggan,
-        'jenistebus' => $request->jenistebus,
-        'jbg' => $request->jbg,
-        'kadarupah' => $request->kadarupah,
-        'nilai_marhun' => $request->nilai_marhun,
-        'pinjaman' => $request->pinjaman_lama,
-        'ansuran' => $request->ansuran,
-        'nowakil' => $request->nowakil,
-        'addpinjaman'=> $request->addpinjaman,
-        'bakipinjaman' => $request->bakipinjaman,
-        'bakiupah' => $request->bakiupah,
-        'historygadaian' => $request->historygadaian,
-        'marhun' => $request->marhun,
-        'jenisbayarantebus' => $request->jenisbayarantebus,
-        'teller' => $request->teller
-    ])->json();
+        $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
+            'nopelanggan' => $request->nopelanggan,
+            'jenistebus' => $request->jenistebus,
+            'jbg' => $request->jbg,
+            'kadarupah' => $request->kadarupah,
+            'nilai_marhun' => $request->nilai_marhun,
+            'pinjaman' => $request->pinjaman_lama,
+            'ansuran' => $request->ansuran,
+            'nowakil' => $request->nowakil,
+            'addpinjaman'=> $request->addpinjaman,
+            'bakipinjaman' => $request->bakipinjaman,
+            'bakiupah' => $request->bakiupah,
+            'historygadaian' => $request->historygadaian,
+            'marhun' => $request->marhun,
+            'jenisbayarantebus' => $request->jenisbayarantebus,
+            'teller' => $request->teller
+        ])->json();
 
         //////////////////////
-       /// MAKING NEW SAG////
-       /////////////////////
-       $gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
-       if($gadai_transaction){
-           $new_sirig = $gadai_transaction['sirig'] + 1;
-           
-       }else{
-           $new_sirig = 1;
-       }
+        /// MAKING NEW SAG////
+        /////////////////////
 
-       $new_transaction = sprintf("%04d",$new_sirig);
-       $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+        $gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+        if($gadai_transaction){
+            $new_sirig = $gadai_transaction['sirig'] + 1;
+            
+        }else{
+            $new_sirig = 1;
+        }
 
-       $gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
-           'norujukan' => $norujukanbaru,
-           'nopelanggan' => $request->nopelanggan,
-           'nokp' => $request->noic,
-           'sirig' => $new_sirig
-       ]);
+        $new_transaction = sprintf("%04d",$new_sirig);
+        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+        $gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+            'norujukan' => $norujukanbaru,
+            'nopelanggan' => $request->nopelanggan,
+            'nokp' => $request->noic,
+            'sirig' => $new_sirig
+        ]);
 
        
        //////////////////////
       ////Update SAG BARU///
       /////////////////////
 
-       $total_nilai_marhun = $request->nilai_marhun;
-       $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
-       $kadarupah = $request->kadarkeuntungan * 100;
-       $keuntungan6bulan = $request->keuntungan_6bln;
-       $keuntungan12bulan = $request->keuntungan_sebulan*12;
-       $hargajualan = $request->pinjaman + $keuntungan12bulan;
+        $keuntungan_sebln = $request->keuntungan_sebulan;
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
+        $total_nilai_marhun = $request->nilai_marhun;
+        $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
+        $kadarupah = $request->kadarkeuntungan * 100;
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
+        $hargajualan = $request->pinjaman + $keuntungan12bulan;
 
 
-       $gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
-           'kodcaw' => $auth_user['cawangan'],
-           'nilaimarhun' => round($total_nilai_marhun, 2),
-           'berat' => round($request->total_berat, 2),
-           'pinjaman' => round($request->pinjaman, 2),
-           'kadarupah' => round($kadarupah, 2),
-           'marhun' => $request->marhun,
-           'percentpinj' => $margin_pinjaman,
-           'teller'=> $auth_user['name'],
-           'upah6' => $keuntungan6bulan,
-           'upah12' => $keuntungan12bulan,
-           'hargajualan' => $hargajualan,
-           'kuantiti_marhun' => $request->kuantiti_marhun
-       ])->json();
+        $gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'kodcaw' => $auth_user['cawangan'],
+            'nilaimarhun' => round($total_nilai_marhun, 2),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun
+        ])->json();
+
+        $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $norujukanbaru,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
 
         ////////////////////////////
-       ////Update History Gadaian///
-       ////////////////////////////
+        ////Update History Gadaian///
+        ////////////////////////////
 
-       $updatehistorygadaian = Http::put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
-        'historygadaian' => $request->norujukan
+        $updatehistorygadaian = Http::put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'historygadaian' => $request->norujukan
         ])->json();
 
 
         ///////////////////////////
-       /// MARHUN UPDATE TABLE////
-       //////////////////////////
+        /// MARHUN UPDATE TABLE////
+        //////////////////////////
 
 
-       $arraymarhunbaru = [];
+        $arraymarhunbaru = [];
 
-       $marhunsediada = Http::get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+        $marhunsediada = Http::get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
 
-       $marhunyangdiambil = $marhunsediada[0];
-       foreach($marhunyangdiambil as $index=>$marhunloop)
-       {
-            array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $marhunloop['harga'], "n_marhun" => $marhunloop['n_marhun']]);
-       }
-
-       foreach($arraymarhunbaru as $array1)
+        $marhunyangdiambil = $marhunsediada[0];
+        foreach($marhunyangdiambil as $index=>$marhunloop)
         {
-            $updatemarhun = Http::post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
-            'norujukan' => $norujukanbaru,
-            'marhun' => $array1['marhun'],
-            'nota' => $array1['nota'],
-            'karat' => $array1['karat'],
-            'berat_emas' => $array1['berat'],
-            'harga' => $array1['harga'],
-            'nilai_marhun' => $array1['n_marhun']
-        ])->json();
-   
+            array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $marhunloop['harga'], "n_marhun" => $marhunloop['n_marhun']]);
         }
 
+        foreach($arraymarhunbaru as $array1){
+            $updatemarhun = Http::post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+                'norujukan' => $norujukanbaru,
+                'marhun' => $array1['marhun'],
+                'nota' => $array1['nota'],
+                'karat' => $array1['karat'],
+                'berat_emas' => $array1['berat'],
+                'harga' => $array1['harga'],
+                'nilai_marhun' => $array1['n_marhun']
+            ])->json();
+        }
     }
 
 
@@ -371,12 +379,14 @@ class PenebusanController extends Controller
         //////////////////////
        ////Update SAG BARU///
        /////////////////////
+        $keuntungan_sebln = $request->keuntungan_sebulan;
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
 
         $total_nilai_marhun = $request->total_nilai_marhun;
         $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
         $kadarupah = $request->kadarkeuntungan * 100;
-        $keuntungan6bulan = $request->keuntungan_6bln;
-        $keuntungan12bulan = $request->keuntungan_sebulan*12;
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
         $hargajualan = $request->pinjaman + $keuntungan12bulan;
 
 
@@ -395,12 +405,19 @@ class PenebusanController extends Controller
             'kuantiti_marhun' => $request->kuantiti_marhun
         ])->json();
 
+        $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $norujukanbaru,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
+
         ////////////////////////////
        ////Update History Gadaian///
        ////////////////////////////
 
         $updatehistorygadaian = Http::put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
-        'historygadaian' => $request->norujukan
+            'historygadaian' => $request->norujukan
         ])->json();
     
         ///////////////////////////
@@ -417,23 +434,23 @@ class PenebusanController extends Controller
        $marhunyangdiambil = $marhunsediada[0];
        foreach($marhunyangdiambil as $index=>$marhunloop)
        {
-                if(!in_array($marhunloop['recno'], $arraydiola))
-               {
-                    array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $marhunloop['harga'], "n_marhun" => $marhunloop['n_marhun']]);
-               }
+            if(!in_array($marhunloop['recno'], $arraydiola))
+            {
+                array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $marhunloop['harga'], "n_marhun" => $marhunloop['n_marhun']]);
+            }
        }
 
        foreach($arraymarhunbaru as $array1)
         {
             $updatemarhun = Http::post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
-            'norujukan' => $norujukanbaru,
-            'marhun' => $array1['marhun'],
-            'nota' => $array1['nota'],
-            'karat' => $array1['karat'],
-            'berat_emas' => $array1['berat'],
-            'harga' => $array1['harga'],
-            'nilai_marhun' => $array1['n_marhun']
-        ])->json();
+                'norujukan' => $norujukanbaru,
+                'marhun' => $array1['marhun'],
+                'nota' => $array1['nota'],
+                'karat' => $array1['karat'],
+                'berat_emas' => $array1['berat'],
+                'harga' => $array1['harga'],
+                'nilai_marhun' => $array1['n_marhun']
+            ])->json();
    
         }
 
@@ -449,7 +466,6 @@ class PenebusanController extends Controller
     {
         $auth_user = Auth::user();
 
-        
         $getfirstwakil = Http::get(config('api.url') . '/api/getwakil/'. $auth_user['cawangan'])->json();
 
         if(sizeof($getfirstwakil) != 0)
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index fbcdee2..8a6a245 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -778,8 +778,7 @@ let teller = "{{ Auth::user()->name }}";
 function bayaransemua()
 {
     
-    if($('#sltjenistebus').find(":selected").val() == 'T')
-    {
+    if($('#sltjenistebus').find(":selected").val() == 'T'){
         let jenisbayarantebus = '';
         if(tarikhgadai < tarikhtawarruq)
         {
@@ -849,9 +848,7 @@ function bayaransemua()
         //End File//
         ///////////
     
-    }
-    else if($('#sltjenistebus').find(":selected").val() == 'A')
-    {
+    }else if($('#sltjenistebus').find(":selected").val() == 'A'){
         let jenisbayarantebus = '';
         let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
@@ -1013,9 +1010,7 @@ function bayaransemua()
         //End File//
         ////////////
 
-    }
-    else if($('#sltjenistebus').find(":selected").val() == 'S')
-    {
+    }else if($('#sltjenistebus').find(":selected").val() == 'S'){
         let jenisbayarantebus = '';
         if(tarikhgadai < tarikhtawarruq)
         {
@@ -1030,11 +1025,7 @@ function bayaransemua()
 
         if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())))
         {
-            Swal.fire(
-            'Amaran!',
-            'Jumlah bayaran kurang daripada jumlah yang perlu dibayar!',
-            'error'
-            )
+            Swal.fire('Amaran!','Jumlah bayaran kurang daripada jumlah yang perlu dibayar!','error');
             return false;
         }