From 665a8fcd066ab58919f84cadec3bd526c82bc0b6 Mon Sep 17 00:00:00 2001
From: fifi97 <46933637+fifi97@users.noreply.github.com>
Date: Wed, 12 Jan 2022 21:37:06 +0800
Subject: [PATCH] fix skit2

---
 app/Http/Controllers/HomeController.php       |  13 ++
 public/js/app.js                              | 188 ++++++------------
 resources/js/Akaun/Ansuran.vue                |   2 +-
 resources/js/Akaun/Gadaian.vue                |   2 +-
 resources/js/Akaun/Imbangduga.vue             |   2 +-
 resources/js/Akaun/Lejeram.vue                |   4 +-
 resources/js/Akaun/Pendahuluanserahan.vue     |   2 +-
 resources/js/Akaun/Penebusan.vue              |   2 +-
 resources/js/Akaun/Tuntutbaki.vue             |   2 +-
 resources/js/Akaun/Upah.vue                   |   2 +-
 resources/js/Online/SearchSAG.vue             |  19 +-
 resources/js/components/Analisa/Harian.vue    |  24 +--
 .../js/components/Chart/KeuntunganChart.vue   |   2 +-
 .../js/components/Chart/PembiayaanChart.vue   |   2 +-
 .../js/components/Chart/PenyelesaianChart.vue |   2 +-
 resources/views/home.blade.php                |   2 +-
 resources/views/layouts/sidebar.blade.php     |   2 +-
 resources/views/online/home.blade.php         |  36 +---
 routes/web.php                                |   4 +-
 19 files changed, 108 insertions(+), 204 deletions(-)

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 2ed969b..2866a03 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -25,6 +25,19 @@ class HomeController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
+
+    public function index()
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        if($auth_user->roles == 'admin' || $auth_user->roles == 'operasi')
+            return redirect()->route('home');
+        elseif($auth_user->roles == 'akaun')
+            return redirect()->route('akaun.home');
+        else
+            return redirect()->route('home');
+    }
     public function indexhome()
     {
         $auth_user = Auth::user();
diff --git a/public/js/app.js b/public/js/app.js
index 6b9b171..08a656b 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -18796,7 +18796,7 @@ var formatter = new Intl.NumberFormat('en-US', {
       if (inputvalue) {
         return this.axios.get(this.$hostname + '/admin/searchSAGOnline', {
           params: {
-            norujukan: inputvalue
+            billplzid: inputvalue
           }
         }).then(function (response) {
           if (response.data.length > 0) {
@@ -18815,7 +18815,6 @@ var formatter = new Intl.NumberFormat('en-US', {
       return /\d/.test(inputString);
     },
     tekanmodal: function tekanmodal(statusid) {
-      console.log('tekan');
       this.$refs.modal.showModal = true;
       this.$refs.modal.statusid = statusid;
     }
@@ -74548,7 +74547,7 @@ var render = function () {
   var _c = _vm._self._c || _h
   return _c("div", { staticClass: "container" }, [
     _c("div", { staticClass: "flex w-full" }, [
-      _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [
+      _c("div", { staticClass: "xl:w-2/3 2xl:w-1/2 p-8 mx-auto" }, [
         _c(
           "div",
           {
@@ -74696,7 +74695,7 @@ var render = function () {
   var _c = _vm._self._c || _h
   return _c("div", { staticClass: "container" }, [
     _c("div", { staticClass: "flex w-full" }, [
-      _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [
+      _c("div", { staticClass: "xl:w-2/3 2xl:w-1/2 p-8 mx-auto" }, [
         _c(
           "div",
           {
@@ -75066,7 +75065,7 @@ var render = function () {
   var _c = _vm._self._c || _h
   return _c("div", { staticClass: "container" }, [
     _c("div", { staticClass: "flex w-full" }, [
-      _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [
+      _c("div", { staticClass: "xl:w-2/3 2xl:w-1/2 p-8 mx-auto" }, [
         _c(
           "div",
           {
@@ -75379,7 +75378,7 @@ var render = function () {
   var _c = _vm._self._c || _h
   return _c("div", { staticClass: "container" }, [
     _c("div", { staticClass: "flex w-full" }, [
-      _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [
+      _c("div", { staticClass: "xl:w-2/3 2xl:w-1/2 p-8 mx-auto" }, [
         _c(
           "div",
           {
@@ -75673,7 +75672,7 @@ var render = function () {
   var _c = _vm._self._c || _h
   return _c("div", { staticClass: "container" }, [
     _c("div", { staticClass: "flex w-full" }, [
-      _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [
+      _c("div", { staticClass: "xl:w-2/3 2xl:w-1/2 p-8 mx-auto" }, [
         _c(
           "div",
           {
@@ -75942,7 +75941,7 @@ var render = function () {
   var _c = _vm._self._c || _h
   return _c("div", { staticClass: "container" }, [
     _c("div", { staticClass: "flex w-full" }, [
-      _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [
+      _c("div", { staticClass: "xl:w-2/3 2xl:w-1/2 p-8 mx-auto" }, [
         _c(
           "div",
           {
@@ -76095,7 +76094,7 @@ var render = function () {
   var _c = _vm._self._c || _h
   return _c("div", { staticClass: "container" }, [
     _c("div", { staticClass: "flex w-full" }, [
-      _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [
+      _c("div", { staticClass: "xl:w-2/3 2xl:w-1/2 p-8 mx-auto" }, [
         _c(
           "div",
           {
@@ -76248,7 +76247,7 @@ var render = function () {
   var _c = _vm._self._c || _h
   return _c("div", { staticClass: "container" }, [
     _c("div", { staticClass: "flex w-full" }, [
-      _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [
+      _c("div", { staticClass: "xl:w-2/3 2xl:w-1/2 p-8 mx-auto" }, [
         _c(
           "div",
           {
@@ -77517,7 +77516,7 @@ var render = function () {
                   {
                     staticClass: "block text-gray-500 font-medium text-sm mb-2",
                   },
-                  [_vm._v("No Rujukan")]
+                  [_vm._v("Billplz ID")]
                 ),
                 _vm._v(" "),
                 _c("div", { staticClass: "flex flex-wrap" }, [
@@ -77530,7 +77529,7 @@ var render = function () {
                         attrs: {
                           id: "frminput",
                           type: "text",
-                          placeholder: "Norujukan",
+                          placeholder: "Billplz ID",
                         },
                       }),
                     ]),
@@ -77563,57 +77562,7 @@ var render = function () {
           _c(
             "tbody",
             _vm._l(_vm.arrayCustomer, function (cust, i) {
-              return _c("tr", { key: i, staticClass: "text-center" }, [
-                _c(
-                  "td",
-                  {
-                    staticClass:
-                      "px-5 py-5 border-b border-gray-200 bg-white text-sm",
-                  },
-                  [
-                    _c("div", { staticClass: "flex items-center" }, [
-                      _c("div", { staticClass: "ml-3" }, [
-                        _c(
-                          "p",
-                          { staticClass: "text-gray-900 whitespace-no-wrap" },
-                          [
-                            _vm._v(
-                              "\n                      " +
-                                _vm._s(i + 1) +
-                                "\n                   "
-                            ),
-                          ]
-                        ),
-                      ]),
-                    ]),
-                  ]
-                ),
-                _vm._v(" "),
-                _c(
-                  "td",
-                  {
-                    staticClass:
-                      "px-5 py-5 border-b border-gray-200 bg-white text-sm",
-                  },
-                  [
-                    _c("div", { staticClass: "flex items-center" }, [
-                      _c("div", { staticClass: "ml-3" }, [
-                        _c(
-                          "p",
-                          { staticClass: "text-gray-900 whitespace-no-wrap" },
-                          [
-                            _vm._v(
-                              "\n                      " +
-                                _vm._s(cust.nokp) +
-                                "\n                   "
-                            ),
-                          ]
-                        ),
-                      ]),
-                    ]),
-                  ]
-                ),
-                _vm._v(" "),
+              return _c("tr", { key: i }, [
                 _c(
                   "td",
                   {
@@ -77654,7 +77603,7 @@ var render = function () {
                           [
                             _vm._v(
                               "\n                      " +
-                                _vm._s(cust.total_payment) +
+                                _vm._s("RM" + cust.total_payment.toFixed(2)) +
                                 "\n                   "
                             ),
                           ]
@@ -77940,24 +77889,6 @@ var staticRenderFns = [
     var _c = _vm._self._c || _h
     return _c("thead", { staticClass: "text-center" }, [
       _c("tr", [
-        _c(
-          "th",
-          {
-            staticClass:
-              "px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider",
-          },
-          [_vm._v("\n               Bil\n             ")]
-        ),
-        _vm._v(" "),
-        _c(
-          "th",
-          {
-            staticClass:
-              "px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider",
-          },
-          [_vm._v("\n               IC/Passport\n             ")]
-        ),
-        _vm._v(" "),
         _c(
           "th",
           {
@@ -78110,16 +78041,20 @@ var render = function () {
                   ]
                 ),
                 _vm._v(" "),
-                _c("div", { staticClass: "w-1/4 grid grid-rows-2" }, [
-                  _c(
-                    "span",
-                    {
-                      staticClass:
-                        "text-sm ml-2 font-bold -mt-0.5 xs:invisible",
-                    },
-                    [_vm._v("RM " + _vm._s(_vm.gadaianremaining))]
-                  ),
-                ]),
+                _c(
+                  "div",
+                  { staticClass: "xl:w-2/5 2xl:w-1/4 grid grid-rows-2" },
+                  [
+                    _c(
+                      "span",
+                      {
+                        staticClass:
+                          "text-sm ml-2 font-bold -mt-0.5 xs:invisible",
+                      },
+                      [_vm._v("RM " + _vm._s(_vm.gadaianremaining))]
+                    ),
+                  ]
+                ),
               ]),
               _vm._v(" "),
               _c("div", { staticClass: "flex pt-2 -mt-2" }, [
@@ -78129,7 +78064,7 @@ var render = function () {
                       "span",
                       {
                         staticClass:
-                          "text-sm leading-none font-bold text-gray-700 w-1/4 uppercase",
+                          "text-sm leading-none font-bold text-gray-700x xl:w-2/5 2xl:w-1/4 uppercase",
                       },
                       [_vm._v(" Harian")]
                     ),
@@ -78158,7 +78093,7 @@ var render = function () {
                       "span",
                       {
                         staticClass:
-                          "text-sm leading-none font-bold text-yellow-700 w-1/4 uppercase",
+                          "text-sm leading-none font-bold text-yellow-700 xl:w-2/5 2xl:w-1/4 uppercase",
                       },
                       [_vm._v(" Bajet")]
                     ),
@@ -78365,13 +78300,17 @@ var render = function () {
                   ]
                 ),
                 _vm._v(" "),
-                _c("div", { staticClass: "w-1/4 grid grid-rows-2" }, [
-                  _c(
-                    "span",
-                    { staticClass: "text-sm ml-2 font-bold -mt-0.5" },
-                    [_vm._v("RM " + _vm._s(_vm.tebusremaining))]
-                  ),
-                ]),
+                _c(
+                  "div",
+                  { staticClass: "xl:w-2/5 2xl:w-1/4 grid grid-rows-2" },
+                  [
+                    _c(
+                      "span",
+                      { staticClass: "text-sm ml-2 font-bold -mt-0.5" },
+                      [_vm._v("RM " + _vm._s(_vm.tebusremaining))]
+                    ),
+                  ]
+                ),
               ]),
               _vm._v(" "),
               _c("div", { staticClass: "flex pt-2 -mt-2" }, [
@@ -78381,7 +78320,7 @@ var render = function () {
                       "span",
                       {
                         staticClass:
-                          "text-sm leading-none font-bold text-gray-700 w-1/4 uppercase",
+                          "text-sm leading-none font-bold text-gray-700 xl:w-2/5 2xl:w-1/4 uppercase",
                       },
                       [_vm._v(" Harian")]
                     ),
@@ -78410,7 +78349,7 @@ var render = function () {
                       "span",
                       {
                         staticClass:
-                          "text-sm leading-none font-bold text-yellow-700 w-1/4 uppercase",
+                          "text-sm leading-none font-bold text-yellow-700 xl:w-2/5 2xl:w-1/4 uppercase",
                       },
                       [_vm._v(" Bajet")]
                     ),
@@ -78617,13 +78556,17 @@ var render = function () {
                   ]
                 ),
                 _vm._v(" "),
-                _c("div", { staticClass: "w-1/4 grid grid-rows-2" }, [
-                  _c(
-                    "span",
-                    { staticClass: "text-sm ml-2 font-bold -mt-0.5" },
-                    [_vm._v("RM " + _vm._s(_vm.keuntunganremaining))]
-                  ),
-                ]),
+                _c(
+                  "div",
+                  { staticClass: "xl:w-2/5 2xl:w-1/4 grid grid-rows-2" },
+                  [
+                    _c(
+                      "span",
+                      { staticClass: "text-sm ml-2 font-bold -mt-0.5" },
+                      [_vm._v("RM " + _vm._s(_vm.keuntunganremaining))]
+                    ),
+                  ]
+                ),
               ]),
               _vm._v(" "),
               _c("div", { staticClass: "flex pt-2 -mt-2" }, [
@@ -78633,7 +78576,7 @@ var render = function () {
                       "span",
                       {
                         staticClass:
-                          "text-sm leading-none font-bold text-gray-700 w-1/4 uppercase",
+                          "text-sm leading-none font-bold text-gray-700 xl:w-2/5 2xl:w-1/4 uppercase",
                       },
                       [_vm._v(" Harian")]
                     ),
@@ -78662,7 +78605,7 @@ var render = function () {
                       "span",
                       {
                         staticClass:
-                          "text-sm leading-none font-bold text-yellow-700 w-1/4 uppercase",
+                          "text-sm leading-none font-bold text-yellow-700 xl:w-2/5 2xl:w-1/4 uppercase",
                       },
                       [_vm._v(" Bajet")]
                     ),
@@ -79401,12 +79344,7 @@ var render = function () {
     { staticClass: "mx-auto  rounded-lg" },
     [
       _c("apexchart", {
-        attrs: {
-          width: "500",
-          type: "bar",
-          options: _vm.chartOptions,
-          series: _vm.series,
-        },
+        attrs: { type: "bar", options: _vm.chartOptions, series: _vm.series },
       }),
     ],
     1
@@ -79440,12 +79378,7 @@ var render = function () {
       "div",
       [
         _c("apexchart", {
-          attrs: {
-            width: "500",
-            type: "bar",
-            options: _vm.chartOptions,
-            series: _vm.series,
-          },
+          attrs: { type: "bar", options: _vm.chartOptions, series: _vm.series },
         }),
       ],
       1
@@ -79480,12 +79413,7 @@ var render = function () {
     { staticClass: "mx-auto  rounded-lg" },
     [
       _c("apexchart", {
-        attrs: {
-          width: "500",
-          type: "bar",
-          options: _vm.chartOptions,
-          series: _vm.series,
-        },
+        attrs: { type: "bar", options: _vm.chartOptions, series: _vm.series },
       }),
     ],
     1
diff --git a/resources/js/Akaun/Ansuran.vue b/resources/js/Akaun/Ansuran.vue
index 0271acd..9339c68 100644
--- a/resources/js/Akaun/Ansuran.vue
+++ b/resources/js/Akaun/Ansuran.vue
@@ -2,7 +2,7 @@
    <div class="container">
 
             <div class="flex w-full">
-                <div class="w-1/2 p-8 mx-auto">
+                <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
                     <div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">       
                    <router-link to="/akaunhome">
                         <i class="fas fa-backspace text-white"></i>
diff --git a/resources/js/Akaun/Gadaian.vue b/resources/js/Akaun/Gadaian.vue
index 5b992c3..0424651 100644
--- a/resources/js/Akaun/Gadaian.vue
+++ b/resources/js/Akaun/Gadaian.vue
@@ -2,7 +2,7 @@
    <div class="container">
 
             <div class="flex w-full">
-                <div class="w-1/2 p-8 mx-auto">
+                <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
                 <div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">       
                    <router-link to="/akaunhome">
                         <i class="fas fa-backspace text-white"></i>
diff --git a/resources/js/Akaun/Imbangduga.vue b/resources/js/Akaun/Imbangduga.vue
index 52e3e27..1ff98b5 100644
--- a/resources/js/Akaun/Imbangduga.vue
+++ b/resources/js/Akaun/Imbangduga.vue
@@ -3,7 +3,7 @@
         <!-- <modal ref="modal"></modal> -->
 
             <div class="flex w-full">
-                <div class="w-1/2 p-8 mx-auto">
+                <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
                     <div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">       
                    <router-link to="/akaunhome">
                         <i class="fas fa-backspace text-white"></i>
diff --git a/resources/js/Akaun/Lejeram.vue b/resources/js/Akaun/Lejeram.vue
index 8d9f0d3..c26ba30 100644
--- a/resources/js/Akaun/Lejeram.vue
+++ b/resources/js/Akaun/Lejeram.vue
@@ -2,7 +2,7 @@
     <div class="container">
 
             <div class="flex w-full">
-                <div class="w-1/2 p-8 mx-auto">
+                <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
                     <div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">       
                     <router-link to="/akaunhome">
                             <i class="fas fa-backspace text-white"></i>
@@ -56,7 +56,7 @@
                 </div>
                 <!--footer-->
                 <div class="flex items-center justify-end p-6 border-t border-solid border-blueGray-200 rounded-b">
-                                <button @click.prevent="generatepdf" class="bg-gray-500 hover:bg-gray-700 text-white font-bold py-1 px-3 border border-gray-700 rounded mr-1" :disabled="pendingStatus == 'none'">{{ (pendingStatus == 'loading') ? '' : '' }}<i class="fas fa-file-pdf mr-2"></i>Cetak</button>
+                        <button @click.prevent="generatepdf" class="bg-gray-500 hover:bg-gray-700 text-white font-bold py-1 px-3 border border-gray-700 rounded mr-1" :disabled="pendingStatus == 'none'">{{ (pendingStatus == 'loading') ? '' : '' }}<i class="fas fa-file-pdf mr-2"></i>Cetak</button>
                         <button class="bg-gray-500 hover:bg-gray-700 text-white font-bold py-1 px-3 border border-gray-700 rounded mr-1" type="button" v-on:click="toggleModal()" :disabled="pendingStatus == 'none'">
                         <i class="fas fa-window-close mr-2"></i>Tutup
                         </button>
diff --git a/resources/js/Akaun/Pendahuluanserahan.vue b/resources/js/Akaun/Pendahuluanserahan.vue
index 63ca23c..75203a1 100644
--- a/resources/js/Akaun/Pendahuluanserahan.vue
+++ b/resources/js/Akaun/Pendahuluanserahan.vue
@@ -2,7 +2,7 @@
    <div class="container">
 
             <div class="flex w-full">
-                <div class="w-1/2 p-8 mx-auto">
+                <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
                 <div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">       
                    <router-link to="/akaunhome">
                         <i class="fas fa-backspace text-white"></i>
diff --git a/resources/js/Akaun/Penebusan.vue b/resources/js/Akaun/Penebusan.vue
index 1c8f78a..38de2ba 100644
--- a/resources/js/Akaun/Penebusan.vue
+++ b/resources/js/Akaun/Penebusan.vue
@@ -3,7 +3,7 @@
 
  
             <div class="flex w-full">
-                <div class="w-1/2 p-8 mx-auto">
+                <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
                     <div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">       
                    <router-link to="/akaunhome">
                         <i class="fas fa-backspace text-white"></i>
diff --git a/resources/js/Akaun/Tuntutbaki.vue b/resources/js/Akaun/Tuntutbaki.vue
index 60f20ae..3efd1a2 100644
--- a/resources/js/Akaun/Tuntutbaki.vue
+++ b/resources/js/Akaun/Tuntutbaki.vue
@@ -2,7 +2,7 @@
    <div class="container">
 
             <div class="flex w-full">
-                <div class="w-1/2 p-8 mx-auto">
+                <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
                     <div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">       
                    <router-link to="/akaunhome">
                         <i class="fas fa-backspace text-white"></i>
diff --git a/resources/js/Akaun/Upah.vue b/resources/js/Akaun/Upah.vue
index c14c3a6..c07d496 100644
--- a/resources/js/Akaun/Upah.vue
+++ b/resources/js/Akaun/Upah.vue
@@ -2,7 +2,7 @@
    <div class="container">
 
             <div class="flex w-full">
-                <div class="w-1/2 p-8 mx-auto">
+                <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
                     <div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">       
                     <router-link to="/akaunhome">
                             <i class="fas fa-backspace text-white"></i>
diff --git a/resources/js/Online/SearchSAG.vue b/resources/js/Online/SearchSAG.vue
index 67e94f2..36575ad 100644
--- a/resources/js/Online/SearchSAG.vue
+++ b/resources/js/Online/SearchSAG.vue
@@ -6,12 +6,12 @@
       <div class="container w-full max-w-xl mx-auto mt-10 px-4 font-sans">
          <form class="bg-white w-full shadow-md rounded-lg px-8 pt-6 pb-4 mb-4" onclick="return false">
             <div class="mb-4 w-96 mx-auto">
-               <label class="block text-gray-500 font-medium text-sm mb-2">No Rujukan</label>
+               <label class="block text-gray-500 font-medium text-sm mb-2">Billplz ID</label>
                <div class="flex flex-wrap">
                   <div class="flex flex-row w-96 mx-auto">
                   
                      <div class="flex flex-col w-96">
-                        <input id="frminput" type="text" ref="btnDropdownRef" placeholder="Norujukan" class="mr-2 bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-blue-500" />
+                        <input id="frminput" type="text" ref="btnDropdownRef" placeholder="Billplz ID" class="mr-2 bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-blue-500" />
                      </div>                     
                                     
                      <button id="buttonsearch" class="px-4 py-2 bg-blue-600 rounded ml-2" v-on:click="toggleTable()"><i class="fas fa-search text-white"></i></button>
@@ -25,12 +25,12 @@
          <table class="min-w-full leading-normal">
             <thead class="text-center">
               <tr>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+                <!-- <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
                   Bil
                 </th>
                 <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
                   IC/Passport
-                </th>
+                </th> -->
                 <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
                   Nama
                 </th>
@@ -58,8 +58,8 @@
               </tr>
             </thead>
             <tbody>
-              <tr v-for="(cust,i) in arrayCustomer" :key="i" class="text-center">
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+              <tr v-for="(cust,i) in arrayCustomer" :key="i">
+                <!-- <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
                   <div class="flex items-center">
                     <div class="ml-3">
                       <p class="text-gray-900 whitespace-no-wrap" >
@@ -76,7 +76,7 @@
                       </p>
                     </div>
                   </div>
-                </td>
+                </td> -->
                 <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
                   <div class="flex items-center">
                     <div class="ml-3">
@@ -90,7 +90,7 @@
                   <div class="flex items-center">
                     <div class="ml-3">
                       <p class="text-gray-900 whitespace-no-wrap">
-                         {{ cust.total_payment }}
+                         {{ 'RM' + cust.total_payment.toFixed(2) }}
                       </p>
                     </div>
                   </div>
@@ -232,7 +232,7 @@ export default{
       {
          return this.axios.get(this.$hostname + '/admin/searchSAGOnline', {
             params: {
-               norujukan: inputvalue
+               billplzid: inputvalue
             }
             }).then(response => {
 
@@ -257,7 +257,6 @@ export default{
       return /\d/.test(inputString);
     },
     tekanmodal: function(statusid){
-      console.log('tekan')
       this.$refs.modal.showModal = true;
       this.$refs.modal.statusid = statusid;
 
diff --git a/resources/js/components/Analisa/Harian.vue b/resources/js/components/Analisa/Harian.vue
index 3ade739..8845d1c 100644
--- a/resources/js/components/Analisa/Harian.vue
+++ b/resources/js/components/Analisa/Harian.vue
@@ -13,11 +13,11 @@
             </div>
 
             <div class="flex flex-nowrap">
-            <div class="w-3/4 h-4 bg-gray-200 rounded-full">
-                <div class="bg-yellow-600 text-xs font-medium text-yellow-100 text-center p-0.5 leading-none rounded-l-full rounded-r-full" v-bind:style="{ width: (percentcumgadai > 100) ? 100 : percentcumgadai + '%'  }"> {{ this.percentcumgadai }}%</div>
-            </div>
+                <div class="w-3/4 h-4 bg-gray-200 rounded-full">
+                    <div class="bg-yellow-600 text-xs font-medium text-yellow-100 text-center p-0.5 leading-none rounded-l-full rounded-r-full" v-bind:style="{ width: (percentcumgadai > 100) ? 100 : percentcumgadai + '%'  }"> {{ this.percentcumgadai }}%</div>
+                </div>
                 
-                <div class="w-1/4 grid grid-rows-2">
+                <div class="xl:w-2/5 2xl:w-1/4 grid grid-rows-2">
                     <span class="text-sm ml-2 font-bold -mt-0.5 xs:invisible">RM {{ gadaianremaining }}</span>
                     <!-- <span class="text-xs leading-none font-bold text-gray-900 mx-auto flex place-self-center -mt-3 ml-12">remaining..  </span> -->
                 </div>
@@ -26,12 +26,12 @@
             <div class="flex pt-2 -mt-2">
                 <div class="grid grid-rows-2 ml-1 mt-2 w-1/2">
                     <div class="flex">
-                    <span class="text-sm leading-none font-bold text-gray-700 w-1/4 uppercase"> Harian</span>
+                    <span class="text-sm leading-none font-bold text-gray-700x xl:w-2/5 2xl:w-1/4 uppercase"> Harian</span>
                     <span class="text-sm leading-none font-bold text-gray-700 mr-2">:</span>
                     <span class="text-sm leading-none font-bold text-gray-700">RM {{ gadaianharian }}</span>
                     </div>
                     <div class="flex">
-                    <span class="text-sm leading-none font-bold text-yellow-700 w-1/4 uppercase"> Bajet</span>
+                    <span class="text-sm leading-none font-bold text-yellow-700 xl:w-2/5 2xl:w-1/4 uppercase"> Bajet</span>
                     <span class="text-sm leading-none font-bold text-gray-700 mr-2">:</span>
                     <span class="text-sm leading-none font-bold text-yellow-900"> RM {{ bajetgadaian }} </span>
                     </div>
@@ -79,7 +79,7 @@
                 <div class="bg-yellow-600 text-xs font-medium text-yellow-100 text-center p-0.5 leading-none rounded-l-full rounded-r-full" v-bind:style="{ width: (percentcumtebus > 100) ? 100 : percentcumtebus + '%'  }"> {{ percentcumtebus }}%</div>
             </div>
                 
-                <div class="w-1/4 grid grid-rows-2">
+                <div class="xl:w-2/5 2xl:w-1/4 grid grid-rows-2">
                     <span class="text-sm ml-2 font-bold -mt-0.5">RM {{ tebusremaining }}</span>
                     <!-- <span class="text-xs leading-none font-bold text-gray-900 mx-auto flex place-self-center -mt-3 ml-12">remaining..  </span> -->
 
@@ -92,12 +92,12 @@
                     <!-- <span class="text-sm leading-none font-bold text-gray-700"><i class="fas fa-calendar-day"></i>  RM {{ penebusanharian }}</span>
                     <span class="text-sm leading-none font-bold text-yellow-900"><i class="fas fa-chart-pie"></i>  RM {{ bajetpenebusan }} </span> -->
                     <div class="flex">
-                    <span class="text-sm leading-none font-bold text-gray-700 w-1/4 uppercase"> Harian</span>
+                    <span class="text-sm leading-none font-bold text-gray-700 xl:w-2/5 2xl:w-1/4 uppercase"> Harian</span>
                     <span class="text-sm leading-none font-bold text-gray-700 mr-2">:</span>
                     <span class="text-sm leading-none font-bold text-gray-700">RM {{ penebusanharian }}</span>
                     </div>
                     <div class="flex">
-                    <span class="text-sm leading-none font-bold text-yellow-700 w-1/4 uppercase"> Bajet</span>
+                    <span class="text-sm leading-none font-bold text-yellow-700 xl:w-2/5 2xl:w-1/4 uppercase"> Bajet</span>
                     <span class="text-sm leading-none font-bold text-gray-700 mr-2">:</span>
                     <span class="text-sm leading-none font-bold text-yellow-900"> RM {{ bajetpenebusan }} </span>
                     </div>
@@ -144,7 +144,7 @@
                 <div class="bg-yellow-600 text-xs font-medium text-yellow-100 text-center p-0.5 leading-none rounded-l-full rounded-r-full" v-bind:style="{ width: (percentcumkeuntungan > 100) ? 100 : percentcumkeuntungan + '%'  }"> {{percentcumkeuntungan}}%</div>
             </div>
                 
-                <div class="w-1/4 grid grid-rows-2">
+                <div class="xl:w-2/5 2xl:w-1/4 grid grid-rows-2">
                     <span class="text-sm ml-2 font-bold -mt-0.5">RM {{ keuntunganremaining }}</span>
                     <!-- <span class="text-xs leading-none font-bold text-gray-900 mx-auto flex place-self-center -mt-3 ml-12">remaining..  </span> -->
 
@@ -158,12 +158,12 @@
                     <!-- <span class="text-sm leading-none font-bold text-gray-700"><i class="fas fa-calendar-day"></i>  RM {{ keuntunganharian }}</span>
                     <span class="text-sm leading-none font-bold text-yellow-900"><i class="fas fa-chart-pie"></i>  RM {{ bajetkeuntungan }} </span> -->
                     <div class="flex">
-                    <span class="text-sm leading-none font-bold text-gray-700 w-1/4 uppercase"> Harian</span>
+                    <span class="text-sm leading-none font-bold text-gray-700 xl:w-2/5 2xl:w-1/4 uppercase"> Harian</span>
                     <span class="text-sm leading-none font-bold text-gray-700 mr-2">:</span>
                     <span class="text-sm leading-none font-bold text-gray-700">RM {{ keuntunganharian }}</span>
                     </div>
                     <div class="flex">
-                    <span class="text-sm leading-none font-bold text-yellow-700 w-1/4 uppercase"> Bajet</span>
+                    <span class="text-sm leading-none font-bold text-yellow-700 xl:w-2/5 2xl:w-1/4 uppercase"> Bajet</span>
                     <span class="text-sm leading-none font-bold text-gray-700 mr-2">:</span>
                     <span class="text-sm leading-none font-bold text-yellow-900"> RM {{ bajetkeuntungan }} </span>
                     </div>
diff --git a/resources/js/components/Chart/KeuntunganChart.vue b/resources/js/components/Chart/KeuntunganChart.vue
index 19db26a..2feee7b 100644
--- a/resources/js/components/Chart/KeuntunganChart.vue
+++ b/resources/js/components/Chart/KeuntunganChart.vue
@@ -6,7 +6,7 @@
               <content-placeholders-text :lines="3" />
             </content-placeholders> -->
             <apexchart 
-                width="500" type="bar" 
+                type="bar" 
                 :options="chartOptions" :series="series">
             </apexchart>  
         </div>
diff --git a/resources/js/components/Chart/PembiayaanChart.vue b/resources/js/components/Chart/PembiayaanChart.vue
index a4eb14a..567224b 100644
--- a/resources/js/components/Chart/PembiayaanChart.vue
+++ b/resources/js/components/Chart/PembiayaanChart.vue
@@ -7,7 +7,7 @@
             </content-placeholders> -->
             <div>
             <apexchart 
-                width="500" type="bar" 
+                type="bar" 
                 :options="chartOptions" :series="series">
             </apexchart>  
             </div>
diff --git a/resources/js/components/Chart/PenyelesaianChart.vue b/resources/js/components/Chart/PenyelesaianChart.vue
index 6d8eebb..0ec40ae 100644
--- a/resources/js/components/Chart/PenyelesaianChart.vue
+++ b/resources/js/components/Chart/PenyelesaianChart.vue
@@ -7,7 +7,7 @@
               <content-placeholders-text :lines="3" />
             </content-placeholders> -->
             <apexchart
-                width="500" type="bar" 
+               type="bar" 
                 :options="chartOptions" :series="series">
             </apexchart>  
         </div>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 00c400a..8b13e58 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -14,7 +14,7 @@
 
          <harian-component kodcaw="{{ Auth::user()->cawangan }}"></harian-component> 
 
-         <div class="w-full grid grid-cols-1 xl:grid-cols-2 2xl:grid-cols-3 gap-4">
+         <div class="w-full grid grid-cols-1 xl:grid-cols-3 2xl:grid-cols-3 gap-4">
             <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8  2xl:col-span-1">
                <div class="flex items-center justify-between mb-4">
                   <div class="flex-shrink-0">
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 9d18b7f..f69fc41 100644
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -188,7 +188,7 @@
         </ul>
     </div>
  
-    <div class="absolute inset-x-0 bottom-0 mb-10 items-center mx-auto flex">
+    <div class="absolute inset-x-0 bottom-0 mb-10 items-center mx-auto flex xl:hidden 2xl:flex">
         <button onclick="closeNav()" class="m-auto bg-yellow-600 hover:bg-gray-400 text-gray-800 font-bold py-2 px-8 rounded inline-flex items-center">
             <li class="flex w-full justify-between text-white cursor-pointer items-center ">
                 <div class="flex items-center">
diff --git a/resources/views/online/home.blade.php b/resources/views/online/home.blade.php
index e353740..5e859f9 100644
--- a/resources/views/online/home.blade.php
+++ b/resources/views/online/home.blade.php
@@ -14,39 +14,5 @@
 
       </div>
    </main>
-   <footer class="bg-white md:flex md:items-center md:justify-between shadow rounded-lg p-4 md:p-6 xl:p-8 my-6 mx-4">
-      <ul class="flex items-center flex-wrap mb-6 md:mb-0">
-         <li><a href="#" class="text-sm font-normal text-gray-500 hover:underline mr-4 md:mr-6">Terms and conditions</a></li>
-         <li><a href="#" class="text-sm font-normal text-gray-500 hover:underline mr-4 md:mr-6">Privacy Policy</a></li>
-         <li><a href="#" class="text-sm font-normal text-gray-500 hover:underline mr-4 md:mr-6">Licensing</a></li>
-         <li><a href="#" class="text-sm font-normal text-gray-500 hover:underline mr-4 md:mr-6">Cookie Policy</a></li>
-         <li><a href="#" class="text-sm font-normal text-gray-500 hover:underline">Contact</a></li>
-      </ul>
-      <div class="flex sm:justify-center space-x-6">
-         <a href="#" class="text-gray-500 hover:text-gray-900">
-            <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
-               <path fill-rule="evenodd" d="M22 12c0-5.523-4.477-10-10-10S2 6.477 2 12c0 4.991 3.657 9.128 8.438 9.878v-6.987h-2.54V12h2.54V9.797c0-2.506 1.492-3.89 3.777-3.89 1.094 0 2.238.195 2.238.195v2.46h-1.26c-1.243 0-1.63.771-1.63 1.562V12h2.773l-.443 2.89h-2.33v6.988C18.343 21.128 22 16.991 22 12z" clip-rule="evenodd" />
-            </svg>
-         </a>
-         <a href="#" class="text-gray-500 hover:text-gray-900">
-            <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
-               <path fill-rule="evenodd" d="M12.315 2c2.43 0 2.784.013 3.808.06 1.064.049 1.791.218 2.427.465a4.902 4.902 0 011.772 1.153 4.902 4.902 0 011.153 1.772c.247.636.416 1.363.465 2.427.048 1.067.06 1.407.06 4.123v.08c0 2.643-.012 2.987-.06 4.043-.049 1.064-.218 1.791-.465 2.427a4.902 4.902 0 01-1.153 1.772 4.902 4.902 0 01-1.772 1.153c-.636.247-1.363.416-2.427.465-1.067.048-1.407.06-4.123.06h-.08c-2.643 0-2.987-.012-4.043-.06-1.064-.049-1.791-.218-2.427-.465a4.902 4.902 0 01-1.772-1.153 4.902 4.902 0 01-1.153-1.772c-.247-.636-.416-1.363-.465-2.427-.047-1.024-.06-1.379-.06-3.808v-.63c0-2.43.013-2.784.06-3.808.049-1.064.218-1.791.465-2.427a4.902 4.902 0 011.153-1.772A4.902 4.902 0 015.45 2.525c.636-.247 1.363-.416 2.427-.465C8.901 2.013 9.256 2 11.685 2h.63zm-.081 1.802h-.468c-2.456 0-2.784.011-3.807.058-.975.045-1.504.207-1.857.344-.467.182-.8.398-1.15.748-.35.35-.566.683-.748 1.15-.137.353-.3.882-.344 1.857-.047 1.023-.058 1.351-.058 3.807v.468c0 2.456.011 2.784.058 3.807.045.975.207 1.504.344 1.857.182.466.399.8.748 1.15.35.35.683.566 1.15.748.353.137.882.3 1.857.344 1.054.048 1.37.058 4.041.058h.08c2.597 0 2.917-.01 3.96-.058.976-.045 1.505-.207 1.858-.344.466-.182.8-.398 1.15-.748.35-.35.566-.683.748-1.15.137-.353.3-.882.344-1.857.048-1.055.058-1.37.058-4.041v-.08c0-2.597-.01-2.917-.058-3.96-.045-.976-.207-1.505-.344-1.858a3.097 3.097 0 00-.748-1.15 3.098 3.098 0 00-1.15-.748c-.353-.137-.882-.3-1.857-.344-1.023-.047-1.351-.058-3.807-.058zM12 6.865a5.135 5.135 0 110 10.27 5.135 5.135 0 010-10.27zm0 1.802a3.333 3.333 0 100 6.666 3.333 3.333 0 000-6.666zm5.338-3.205a1.2 1.2 0 110 2.4 1.2 1.2 0 010-2.4z" clip-rule="evenodd" />
-            </svg>
-         </a>
-         <a href="#" class="text-gray-500 hover:text-gray-900">
-            <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
-               <path d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84" />
-            </svg>
-         </a>
-         <a href="#" class="text-gray-500 hover:text-gray-900">
-            <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
-               <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
-            </svg>
-         </a>
-         <a href="#" class="text-gray-500 hover:text-gray-900">
-            <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
-               <path fill-rule="evenodd" d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10c5.51 0 10-4.48 10-10S17.51 2 12 2zm6.605 4.61a8.502 8.502 0 011.93 5.314c-.281-.054-3.101-.629-5.943-.271-.065-.141-.12-.293-.184-.445a25.416 25.416 0 00-.564-1.236c3.145-1.28 4.577-3.124 4.761-3.362zM12 3.475c2.17 0 4.154.813 5.662 2.148-.152.216-1.443 1.941-4.48 3.08-1.399-2.57-2.95-4.675-3.189-5A8.687 8.687 0 0112 3.475zm-3.633.803a53.896 53.896 0 013.167 4.935c-3.992 1.063-7.517 1.04-7.896 1.04a8.581 8.581 0 014.729-5.975zM3.453 12.01v-.26c.37.01 4.512.065 8.775-1.215.25.477.477.965.694 1.453-.109.033-.228.065-.336.098-4.404 1.42-6.747 5.303-6.942 5.629a8.522 8.522 0 01-2.19-5.705zM12 20.547a8.482 8.482 0 01-5.239-1.8c.152-.315 1.888-3.656 6.703-5.337.022-.01.033-.01.054-.022a35.318 35.318 0 011.823 6.475 8.4 8.4 0 01-3.341.684zm4.761-1.465c-.086-.52-.542-3.015-1.659-6.084 2.679-.423 5.022.271 5.314.369a8.468 8.468 0 01-3.655 5.715z" clip-rule="evenodd" />
-            </svg>
-         </a>
-      </div>
+   @include('layouts.footer')
 @endsection
diff --git a/routes/web.php b/routes/web.php
index 8f9d6ba..bbd3d84 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -14,8 +14,6 @@ use Illuminate\Support\Facades\Route;
 */
 
 Route::get('/iframe', function () {
-    // return view('home');
-    // return redirect()->route('login');
     echo 'for iframe';
 });
 
@@ -29,7 +27,7 @@ Route::post('logout', ['as' => 'logout', 'uses' => 'App\Http\Controllers\Auth\Lo
 Route::get('login', 'App\Http\Controllers\Auth\LoginController@login')->name('login');
 Route::post('login', 'App\Http\Controllers\Auth\LoginController@authenticate');
 
-Route::get('/', [App\Http\Controllers\HomeController::class,'indexhome'])->name('home');
+Route::get('/', [App\Http\Controllers\HomeController::class,'index'])->name('index');
 Route::get('/home', [App\Http\Controllers\HomeController::class, 'indexhome'])->name('home')->middleware(['roleChecker:admin,null,operasi']);
 Route::get('/akaunhome', [App\Http\Controllers\HomeController::class, 'indexakaun'])->name('akaun.home')->middleware(['roleChecker:admin,akaun,operasi']);