fix skit2

app/Http/Controllers/AliranTunaiController.php

@@ -200,21 +200,6 @@ class AliranTunaiController extends Controller
         $api_url = config('api.url');
         $auth_user = Auth::user();
 
-        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        return view('cashflow.tunai',compact('api_url','auth_user'));
-        $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-        $cawangan_detail=$cawangan[0];
-
-        $teller = Http::get( config('api.url') .'/api/get/tellerwork/'. $auth_user['cawangan'])->json();
-
-        $arraytunai = array();
-
-        foreach($teller as $index1 => $ls)
-        {
-            $tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls['kodlaluan']])->json();
-
-            array_push($arraytunai,$tunaipast);
-        }
-
-        return view('cashflow.tunai',compact('api_url','cawangan_info','auth_user','arraytunai','teller'));
     }
 }

app/Http/Controllers/BajetController.php

@@ -22,6 +22,12 @@ class BajetController extends Controller
 
     public function checkTambah(Request $request){
 
+        $validated = $request->validate([
+            'year' => 'required',
+            'jenisbajet' => 'required',
+            'bajet.*' => 'required'
+        ]);
+
         $bajet = Http::get(config('api.url').'/admin/checkBajet',['kodcaw' => Auth::user()->cawangan, 'year' => $request->year, 'jenisbajet' => $request->jenisbajet])->json();
 
         if(sizeof($bajet) > 0)

app/Http/Controllers/OnlineController.php

@@ -15,10 +15,6 @@ class OnlineController extends Controller
         $api_url = config('api.url');
         $auth_user = Auth::user();
 
-        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        return view('online.home',compact('api_url','auth_user'));
-        $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-        $cawangan_detail=$cawangan[0];
-
-        return view('online.home',compact('api_url','cawangan_info','auth_user'));
     }
 }

app/Http/Controllers/PelangganController.php

@@ -15,11 +15,7 @@ class PelangganController extends Controller
         $api_url = config('api.url');
         $auth_user = Auth::user();
 
-        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        return view('pelanggan.pelanggan',compact('api_url','auth_user'));
-        $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-        $cawangan_detail=$cawangan[0];
-
-        return view('pelanggan.pelanggan',compact('api_url','cawangan_info','auth_user'));
     }
 
     public function DetailsPelanggan($id)
@@ -27,13 +23,9 @@ class PelangganController extends Controller
         $api_url = config('api.url');
         $auth_user = Auth::user();
 
-        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-        $cawangan_detail=$cawangan[0];
-
         $customer_info = Http::get(config('api.url') . '/admin/Customers/'. $id)->json();
 
-        return view('pelanggan.detailspelanggan',compact('api_url','cawangan_info','auth_user','customer_info'));
+        return view('pelanggan.detailspelanggan',compact('api_url','auth_user','customer_info'));
     }
 
     public function DetailsBlacklist()
@@ -41,11 +33,6 @@ class PelangganController extends Controller
         $api_url = config('api.url');
         $auth_user = Auth::user();
 
-        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        return view('pelanggan.blacklist',compact('api_url','auth_user'));
-        $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-        $cawangan_detail=$cawangan[0];
-
-
-        return view('pelanggan.blacklist',compact('api_url','cawangan_info','auth_user'));
     }
 }

app/Http/Controllers/PetiBesiController.php

@@ -140,12 +140,6 @@ class PetiBesiController extends Controller
         $api_url = config('api.url');
         $auth_user = Auth::user();
 
-        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        return view('petibesi.petibesi',compact('api_url','auth_user'));
-        $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-        $cawangan_detail=$cawangan[0];
-
-        $petibesi = Http::get(config('api.url') . '/api/VaultController/all/'. $auth_user['cawangan'])->json();
-
-        return view('petibesi.petibesi',compact('api_url','cawangan_info','auth_user','petibesi'));
     }
 }

public/js/app.js

@@ -18161,10 +18161,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-//
-//
-//
-//
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
   props: {
     csrftoken: String,
@@ -19055,7 +19051,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
   props: {
-    status: String,
     roles: String,
     route: String,
     akaun: String
@@ -19860,14 +19855,6 @@ var formatter = new Intl.NumberFormat('en-US', {
     modal: _util_PetiBesiModal_vue__WEBPACK_IMPORTED_MODULE_1__["default"],
     pagination: _pagination_vue__WEBPACK_IMPORTED_MODULE_2__["default"]
   },
-  props: {
-    petibesi: {
-      type: Array
-    },
-    kodcaw: {
-      type: String
-    }
-  },
   data: function data() {
     return {
       index: 0,
@@ -20441,18 +20428,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 
 
 
@@ -20466,17 +20441,6 @@ var formatter = new Intl.NumberFormat('en-US', {
     modal: _util_Modal_vue__WEBPACK_IMPORTED_MODULE_1__["default"],
     pagination: _pagination_vue__WEBPACK_IMPORTED_MODULE_2__["default"]
   },
-  props: {
-    // items: {
-    // 	type: Array
-    // },
-    arraytunai: {
-      type: Array
-    } // kodcaw:{
-    //   type:String
-    // }
-
-  },
   data: function data() {
     return {
       index: 0,
@@ -76202,20 +76166,6 @@ var render = function () {
         [_c("i", { staticClass: "fas fa-sign-out-alt" })]
       ),
     ]),
-    _vm._v(" "),
-    _c(
-      "form",
-      {
-        staticClass: "d-none",
-        attrs: { id: "logout-form", action: "logout", method: "POST" },
-      },
-      [
-        _c("input", {
-          attrs: { type: "hidden", name: "_token" },
-          domProps: { value: this.$props.csrftoken },
-        }),
-      ]
-    ),
   ])
 }
 var staticRenderFns = []
@@ -79540,47 +79490,12 @@ var render = function () {
                 ),
               ]),
               _vm._v(" "),
-              _c(
+              _c("pagination", {
-                "div",
+                attrs: { data: _vm.paginate },
-                {
+                on: { clickEvent_: _vm.getTunai },
-                  staticClass:
+              }),
-                    "bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6",
+            ],
-                },
+            1
-                [
-                  _c(
-                    "div",
-                    { staticClass: "flex-1 flex justify-between sm:hidden" },
-                    [
-                      _c(
-                        "a",
-                        {
-                          staticClass:
-                            "relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50",
-                          attrs: { href: "#" },
-                        },
-                        [_vm._v("\n        Previous\n      ")]
-                      ),
-                      _vm._v(" "),
-                      _c(
-                        "a",
-                        {
-                          staticClass:
-                            "ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50",
-                          attrs: { href: "#" },
-                        },
-                        [_vm._v("\n        Next\n      ")]
-                      ),
-                    ]
-                  ),
-                  _vm._v(" "),
-                  _c("pagination", {
-                    attrs: { data: _vm.paginate },
-                    on: { clickEvent_: _vm.getTunai },
-                  }),
-                ],
-                1
-              ),
-            ]
           ),
         ]
       ),

resources/js/Logout.vue

@@ -9,10 +9,6 @@
             </button>
         </div>
 
-    <form id="logout-form" action="logout"  method="POST" class="d-none">
-       <input type="hidden" name="_token" :value="this.$props.csrftoken" />
-    </form> 
-
     </div>
 </template>
 <script>

resources/js/components/Cawangan.vue

@@ -20,7 +20,6 @@
 
  export default {
         props: {
-        status: String,
         roles: String,
         route:String,
         akaun:String

resources/js/components/Petibesi.vue

@@ -160,15 +160,6 @@ export default {
     pagination
 
 	},
-	props: {
-			petibesi: {
-			type: Array
-		},
-    kodcaw:{
-      type:String
-    }
-	},
-
 	data() {
 		return {
 			index: 0,

resources/js/components/Tunai.vue

@@ -151,21 +151,9 @@
               </tr>
             </tbody>
           </table>
-		  <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+
-    <div class="flex-1 flex justify-between sm:hidden">
-      <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50">
-        Previous
-      </a>
-      <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50">
-        Next
-      </a>
-    </div>
     <pagination :data="paginate" @clickEvent_="getTunai"></pagination>
 
-  </div>
-				<!-- <h1 v-text="active.kodlaluan" />
-
-				<p v-text="active.kodlaluan" /> -->
 			</article>
 		</transition>
 	</div>
@@ -187,18 +175,6 @@ export default {
     modal,
     pagination
 	},
-	props: {
-		// items: {
-		// 	type: Array
-		// },
-    arraytunai: {
-			type: Array
-		},
-    // kodcaw:{
-    //   type:String
-    // }
-	},
-
 	data() {
 		return {
 			index: 0,

resources/views/bajet/tambahbajet.blade.php

@@ -11,6 +11,9 @@
 
          <div class="bg-white mx-auto shadow rounded-lg p-4 sm:p-6 xl:p-8 w-1/2  2xl:col-span-1">
          
+            @if ($errors->any())
+               <small class="text-red-500">*Sila pastikan semua petak diisi dengan betul!</small>
+            @endif
             
             <h2 class="text-2xl mx-auto font-semibold leading-normal mt-0 mb-2 text-blueGray-800">
                TAMBAH BAJET

resources/views/cashflow/tunai.blade.php

@@ -10,7 +10,7 @@
 
         <div class="pt-6 px-4">
         <breadcrumb :items="[{ 'title' : 'Tunai', 'icon' : 'fas fa-money-bill-wave' }]"></breadcrumb>
-        <tunai-component kodcaw="{{ Auth::user()->cawangan }}" :items="{{ json_encode($teller) }}" :arraytunai="{{ json_encode($arraytunai) }}"></tunai-component>
+        <tunai-component kodcaw="{{ Auth::user()->cawangan }}"></tunai-component>
 
        
         </div>

resources/views/layouts/app.blade.php

@@ -126,7 +126,7 @@
                   
                   @auth
                     <clock-component></clock-component>
-                    <cawangan-component status={{ Auth::user()->cawangan  }} roles={{ Auth::user()->roles }} route={{ (Route::is('home') || Route::is('akaun.home')) ? 'ada' : 'tiada' }} akaun={{ (Route::is('akaun.home') ? 'yes' : 'no')}}></cawangan-component>
+                    <cawangan-component  roles={{ Auth::user()->roles }} route={{ (Route::is('home') || Route::is('akaun.home')) ? 'ada' : 'tiada' }} akaun={{ (Route::is('akaun.home') ? 'yes' : 'no')}}></cawangan-component>
                   @endauth
 
                   <div class="flex items-center">
@@ -151,7 +151,10 @@
 
                          <logout-component csrftoken="{{ csrf_token() }}" :route={{ json_encode(route('logout')) }}></logout-component>
 
-                                       
+                         <form id="logout-form" action="logout"  method="POST" class="d-none">
+                            {{-- <input type="hidden" name="_token" :value="this.$props.csrftoken" /> --}}
+                            @csrf
+                         </form> 
                 @endguest
                   </div>
                </div>

resources/views/layouts/sidebar.blade.php

@@ -133,6 +133,17 @@
                 </li>
             </a>
 
+
+            <a href="{{ route('akaun.home') }}" class="rounded mb-2 mr-2 {{ Route::is('akaun.home') || Route::is('akaun.home.*')  ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
+                <li class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
+                    <div class="flex items-center">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
+                        </svg>
+                        <span class="text-sm ml-2 text-lg">Laporan</span>
+                    </div>
+                </li>
+            </a>
             @endif
             
 

resources/views/petibesi/petibesi.blade.php

@@ -6,7 +6,7 @@
 
         <div class="pt-6 px-4">
         <breadcrumb :items="[{ 'title' : 'Peti Besi', 'icon' : 'fas fa-toolbox' }]"></breadcrumb>
-        <petibesi-component kodcaw="{{ Auth::user()->cawangan }}" :petibesi="{{ json_encode($petibesi) }}"></petibesi-component>
+        <petibesi-component kodcaw="{{ Auth::user()->cawangan }}"></petibesi-component>
         </div>
     </main>
     @include('layouts.footer')

routes/web.php

@@ -29,7 +29,7 @@ Route::get('login', 'App\Http\Controllers\Auth\LoginController@login')->name('lo
 Route::post('login', 'App\Http\Controllers\Auth\LoginController@authenticate');
 
 Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home')->middleware(['roleChecker:admin,null,operasi']);
-Route::get('/akaunhome', [App\Http\Controllers\HomeController::class, 'indexakaun'])->name('akaun.home')->middleware(['roleChecker:null,akaun,null']);
+Route::get('/akaunhome', [App\Http\Controllers\HomeController::class, 'indexakaun'])->name('akaun.home')->middleware(['roleChecker:null,akaun,operasi']);
 
 //Tunai
 Route::get('alirantunai',['as'=>'alirantunai','uses'=>'App\Http\Controllers\AliranTunaiController@AdminAliranTunai'])->middleware(['roleChecker:admin,null,null']);