diff --git a/app/Http/Controllers/TacController.php b/app/Http/Controllers/TacController.php
index 36f522c..7881c5c 100644
--- a/app/Http/Controllers/TacController.php
+++ b/app/Http/Controllers/TacController.php
@@ -30,11 +30,12 @@ class TacController extends Controller
     public function requestKadPengenalan(Request $request){
         
         $currentDateTime = Carbon::now();
+
         $expiretac = tacportal::where('icno',$request->icno)
                     ->whereDate('created_at','=',$currentDateTime)
                     ->whereDate('expired_at','=',$currentDateTime)
-                    ->whereTime('expired_at','>=',$currentDateTime->toDateTimeString())
-                    ->where('created_at','<=',$currentDateTime->toDateTimeString())
+                    ->whereTime('expired_at','>=',$currentDateTime->toTimeString())
+                    ->whereTime('created_at','<=',$currentDateTime->toTimeString())
                     ->latest()
                     ->first();
 
@@ -69,7 +70,7 @@ class TacController extends Controller
         
 
         $currentDateTime = Carbon::now();
-        $expired_at = Carbon::now()->addMinutes(15);
+        $expired_at = Carbon::now()->addMinutes(5);
 
         $tac_token = $this->randum_number(6,2,false);
 
@@ -83,21 +84,21 @@ class TacController extends Controller
         $tac->save();
 
 
-        // $mobileno = '6' . $customer['notelefon'];
-        $mobileno = '601114884900';
+        $mobileno = '6' . $customer['notelefon'];
+        // $mobileno = '601114884900';
         $messages = 'AR-RAHN PKB PORTAL : TAC: ' . $tac_token . ' ' . $currentDateTime . '. AR-RAHN CARELINE CENTRE 1300-22-4343';
 
-        // $status = Http::get('http://gateway.onewaysms.com.my:10001/api.aspx',[
-        //     'apiusername' => 'APIUK330HDAFO',
-        //     'apipassword' => 'APIUK330HDAFOUK330',
-        //     'senderid' => 'INFO',
-        //     'mobileno' => $mobileno,
-        //     'message'=> $messages,
-        //     'languagetype'=> 1
-        // ]);
+        $status = Http::get('http://gateway.onewaysms.com.my:10001/api.aspx',[
+            'apiusername' => 'APIUK330HDAFO',
+            'apipassword' => 'APIUK330HDAFOUK330',
+            'senderid' => 'INFO',
+            'mobileno' => $mobileno,
+            'message'=> $messages,
+            'languagetype'=> 1
+        ]);
 
-        // return response($status);
-        return response(1);
+        return response($status);
+        // return response(1);
     }
 
     private function randum_number($len = 6,$dup = 1, $sort = false){
diff --git a/resources/views/auth/pertama-kali/firsttime2.blade.php b/resources/views/auth/pertama-kali/firsttime2.blade.php
index 2842c28..2b73a66 100644
--- a/resources/views/auth/pertama-kali/firsttime2.blade.php
+++ b/resources/views/auth/pertama-kali/firsttime2.blade.php
@@ -404,7 +404,7 @@
                                 $.notify({
                                 icon: 'fas fa-exclamation-triangle fa-2x',
                                 newest_on_top: true,
-                                message: "<strong style='font-size:15px;text-align:center;margin-left:100px; color: #ffff'>anda telah meminta tac kurang daripada 15minit!</strong>"
+                                message: "<strong style='font-size:15px;text-align:center;margin-left:100px; color: #ffff'>anda telah meminta tac kurang daripada 5 minit!</strong>"
                                 }, {
                                     type: 'warning',
                                     allow_dismiss: false,
@@ -450,8 +450,26 @@
                                 $("#divsahkan").removeClass('d-none');
                                 $('#backphone').text(data['notelefon']);
 
+                                $.notify({
+                                icon: 'fas fa-2x fa-exclamation-triangle',
+                                newest_on_top: true,
+                                message: "<strong style='font-size:15px;text-align:center;margin-left:100px; color: #ffff'>Permohonan TAC telah dihantar melalui SMS!</strong>"
+                                }, {
+                                    type: 'success',
+                                    allow_dismiss: false,
+                                    placement: {
+                                        align: 'center',
+                                        from: 'bottom'
+                                    },
+                                    animate: {
+                                        enter: 'animate__animated animate__bounce',
+
+                                        exit: 'animate__animated animate__bounceOutDown'
+                                    }
+                                });
+
                             }else{
-                                console.log(data);
+                                // console.log(data);
                             }
                         }
                     });
@@ -469,7 +487,6 @@
             var otp_icno = $('#login-icno').val();
             var boolotp = false;
             var boolicno = false;
-
             if (otp_verify == null || otp_verify == '') {
                 // $('#errorotp').text('Sila Isi Nombor OTP!');
                 // $('#spanotp').addClass('visible');
@@ -505,7 +522,6 @@
                     method: 'GET',
                     success: function(data) {
 
-                        console.log(data.status);
                         if (data.status == 1) {
                             
                                     $('input[name="name"]').val(data.customerinfo.nama);
@@ -535,9 +551,9 @@
                                     });
                         } else {
                             $.notify({
-                                icon: 'fas fa-exclamation-triangle',
+                                icon: 'fas fa-2x fa-exclamation-triangle',
                                 newest_on_top: true,
-                                message: "<strong style='font-size:15px;text-align:center;margin-left:100px; color: #ffff'>Pelanggan tidak membuat sebarang login!</strong>"
+                                message: "<strong style='font-size:15px;text-align:center;margin-left:100px; color: #ffff'>TAC anda salah sila periksa balik!</strong>"
                             }, {
                                 type: 'danger',
                                 allow_dismiss: false,
@@ -556,6 +572,24 @@
                     }
                 });
 
+            }else{
+                $.notify({
+                    icon: 'fas fa-2x fa-exclamation-triangle',
+                    newest_on_top: true,
+                    message: "<strong style='font-size:15px;text-align:center;margin-left:100px; color: #ffff'>Sila masukkan ruang yang disediakan!</strong>"
+                }, {
+                    type: 'danger',
+                    allow_dismiss: false,
+                    placement: {
+                        align: 'center',
+                        from: 'bottom'
+                    },
+                    animate: {
+                        enter: 'animate__animated animate__bounce',
+
+                        exit: 'animate__animated animate__bounceOutDown'
+                    }
+                });
             }
 
         }
diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php
index 7e66251..a2f1b5a 100644
--- a/resources/views/includes/home.blade.php
+++ b/resources/views/includes/home.blade.php
@@ -1,6 +1,5 @@
 @extends ('layouts.indexfirst')
 @section('content')
-@include('modal.marhun')
 
 <style>
     .loader {
@@ -42,6 +41,8 @@
 
 <title>Home | Portal Pelanggan</title>
 
+@include('modal.marhun')
+
 @error('chkboxsag')
 <script>
     $.notify({
@@ -194,6 +195,10 @@
 <script>
     var api_url = "{{  $api_url }}";
 
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
+
 var hargaemastable = $('#harga_emas').DataTable({
         "bLengthChange": false,
         "bFilter": false,
@@ -265,9 +270,7 @@ var hargaemastable = $('#harga_emas').DataTable({
                 },
                 success: function(marhun_ajax) {
                     bil_count++;
-                    $("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] + "</td><td>" + marhun['berat'] + "</td><td>" + marhun['karat'] + "</td><td>RM " + marhun['n_marhun'].toLocaleString(undefined, {
-                        minimumFractionDigits: 2
-                    }) + "</td><td>" + marhun['nota'] + "</td></tr>");
+                    $("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] + "</td><td>" + marhun['berat'] + "</td><td>" + marhun['karat'] + "</td><td>RM " + formatter.format(marhun['n_marhun']) + "</td><td>" + marhun['nota'] + "</td></tr>");
                 }
             });
         });
@@ -276,7 +279,16 @@ var hargaemastable = $('#harga_emas').DataTable({
 
     function tickfunc(e){
         var count = parseInt($('#totalsag').text());
-        console.log(count);
+        var fasa = $(e).data('fasa');
+        if (typeof fasa !== 'undefined' || fasa !== null) {
+            if(fasa == 2)
+            {
+                console.log(fasa);
+
+                return;
+            }
+        }
+
         if ($(e).is(':checked')) {
             var total = count + 1;
 
@@ -293,7 +305,7 @@ var hargaemastable = $('#harga_emas').DataTable({
         return false;
     }
 
-    function filterpembiayaanaktif(){
+    async function filterpembiayaanaktif(){
 
         $('#loadertable').removeClass('d-none');
         $('#formtable').addClass('d-none');
@@ -376,7 +388,7 @@ var hargaemastable = $('#harga_emas').DataTable({
                 namacawangan,
                 `<a href="#" onclick="linktargetfunc(this)" class="linktarget" data-toggle="modal" data-nm="${ps.nilaimarhun}" data-berat="${ps.berat}" data-upah12="${ps.upah12}" data-pjmnum="${ps.pinjaman}" data-bakipjm="${ps.bakipjm}" data-lelong="${ps.taglel}" data-marhun='${marh}' data-pinjaman="${ps.pinjaman}" data-norujukan="${ps.norujukan}" data-hargajualan="${ps.hargajualan}" data-kodcaw="${ps.kodcaw}" data-target="#marhunModal"><span class="name mb-0 text-sm">${ps.norujukan}</span></a>`,
                 ps.tempoh,
-                ps.keuntungan1bulan,
+                ps.keuntungan,
                 t_matang,
                 statementlelong
             ]).draw();
@@ -468,7 +480,7 @@ var hargaemastable = $('#harga_emas').DataTable({
                 namacawangan,
                 `<a href="#" onclick="linktargetfunc(this)" class="linktarget" data-toggle="modal" data-nm="${ps.nilaimarhun}" data-berat="${ps.berat}" data-upah12="${ps.upah12}" data-pjmnum="${ps.pinjaman}" data-bakipjm="${ps.bakipjm}" data-lelong="${ps.taglel}" data-marhun='${marh}' data-pinjaman="${ps.pinjaman}" data-norujukan="${ps.norujukan}" data-hargajualan="${ps.hargajualan}" data-kodcaw="${ps.kodcaw}" data-target="#marhunModal"><span class="name mb-0 text-sm">${ps.norujukan}</span></a>`,
                 ps.tempoh,
-                ps.keuntungan1bulan,
+                ps.keuntungan,
                 t_matang,
                 statementlelong
             ]).draw();
@@ -509,7 +521,7 @@ var hargaemastable = $('#harga_emas').DataTable({
         selepastawarruqtable.clear().draw();
 
         selepastawarruqtable.row.add([
-            `<input type="checkbox" onclick="tickfunc(this)" name="chkboxsag[]" value="${ps.norujukan}" id="sag-${counter}" data-norujukan="${ps.norujukan}" />`,
+            `<input type="checkbox" onclick="tickfunc(this)" name="chkboxsag[]" value="${ps.norujukan}" data-fasa="${ps.fasa}" id="sag-${counter}" data-norujukan="${ps.norujukan}" />`,
             namacawangan,   
             ps.norujukan,
             ps.t_lelong,
@@ -531,13 +543,11 @@ var hargaemastable = $('#harga_emas').DataTable({
         let berat = $(e).data('berat');
         let nm = $(e).data('nm');
 
-        $('#pembiayaan').text('RM ' + pinjaman);
-        $('#bpembiayaan').text('RM ' + bakipjm);
-        $('#nm').text('RM ' + nm);
+        $('#pembiayaan').text('RM ' + formatter.format(pinjaman));
+        $('#bpembiayaan').text('RM ' + formatter.format(bakipjm));
+        $('#nm').text('RM ' + formatter.format(nm));
         $('#berat').text(berat + 'g');
-        $('#koskeun').text('RM ' + upah12);
-
-
+        $('#koskeun').text('RM ' + formatter.format(upah12));
 
         $.ajax({
             method: 'get',
@@ -562,89 +572,17 @@ var hargaemastable = $('#harga_emas').DataTable({
                     counter,
                     // date.toLocaleDateString(), 
                     '<a target="_blank" href='+ urlroute + '>'+date.toLocaleDateString()+'</a>',
-                    "RM " + bayaran['duit_masuk'],
+                    "RM " + formatter.format(bayaran['duit_masuk']),
                 ]).draw();
                 counter = counter + 1;
         });
     }
 
-    // $("input[type='checkbox'][name='chkboxsag[]']").click(function() {
-    //     var count = parseInt($('#totalsag').text());
-    //     console.log(count);
-    //     if ($(this).is(':checked')) {
-    //         var total = count + 1;
-
-    //         if (total <= 3) {
-    //             $('#totalsag').text(total);
-    //         } else {
-    //             $(this).prop('checked', false);
-    //         }
-    //     } else {
-    //         var total = count - 1;
-    //         $('#totalsag').text(total);
-    //     }
-
-    //     return false;
-    // });
-
 
     function validateform() {
         return true;
     }
 
-    $('.linktarget').off('click', 'tr');
-    
-    $('.linktarget').on('click', function(event) {
-        console.log(event);
-        var arraymarhun = $(this).data('marhun');
-        var norujukan = $(this).data('norujukan');
-        var kodcaw = $(this).data('kodcaw');
-        var hargajualan = $(this).data('hargajualan');
-        var pinjaman = $(this).data('pinjaman');
-        var bakipjm = $(this).data('bakipjm');
-        var lelong = $(this).data('lelong');
-        var pjmnum = $(this).data('pjmnum');
-
-        bayaranfunc(this,api_url);
-
-        $('#pemb').text('RM ' + pjmnum);
-        $('#bpemb').text('RM ' + bakipjm);
-
-        if(lelong === 1)
-        {
-            $('#statuslelong').text('Akan Dilelong');
-        }else{
-            $('#statuslelong').text('-');
-        }
-
-
-
-        $('#norujukan_modal').val(norujukan);
-        $('#pinjaman_modal').val(pinjaman);
-        $('#tablemarhun').empty();
-        var bil_count = 0;
-        $.each(arraymarhun, function(index, marhun) {
-            $.each(marhun, function(index2, marhun_detail) {
-
-                var marhun_name;
-                $.ajax({
-                    method: 'GET',
-                    url: api_url + '/api/jemas/nama_marhun',
-                    dataType: 'json',
-                    data: {
-                        marhun: marhun_detail['marhun']
-                    },
-                    success: function(marhun_ajax) {
-                        bil_count++;
-                        $("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] + "</td><td>" + marhun_detail['berat'] + "</td><td>" + marhun_detail['karat'] + "</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined, {
-                            minimumFractionDigits: 2
-                        }) + "</td><td>" + marhun_detail['nota'] + "</td></tr>");
-                    }
-                });
-            });
-        });
-
-    });
 
     if (document.addEventListener) {
         window.addEventListener('pageshow', function(event) {
diff --git a/resources/views/modal/marhun.blade.php b/resources/views/modal/marhun.blade.php
index 5e1a80f..7bec5eb 100644
--- a/resources/views/modal/marhun.blade.php
+++ b/resources/views/modal/marhun.blade.php
@@ -81,17 +81,19 @@
                               <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>N. Marhun: <span id="nm"></span></b></div></div>
                             </div>
                 
-                            <div class="col-4">
+                            {{-- <div class="col-4">
                               <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>T.Matang: <span id="berat"></span></b></div></div>
+                            </div> --}}
+                            <div class="col-4">
                             </div>
                 
                             <div class="col-4">
                               <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Keuntungan: <span id="koskeun"></span></b></div></div>
                             </div>
 
-                            <div class="col-4">
+                            {{-- <div class="col-4">
                               <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>T.Lanjut: <span id="berat"></span></b></div></div>
-                            </div>
+                            </div> --}}
                           </div>
                 
                           <div style="overflow-x: auto;">