From ec5ce77c50b63c72877768ff72aa818fa091a55f Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 6 Jan 2022 13:25:28 +0800 Subject: [PATCH] fix skit2 --- .../Controllers/AliranTunaiController.php | 17 +--- app/Http/Controllers/BajetController.php | 6 ++ app/Http/Controllers/OnlineController.php | 6 +- app/Http/Controllers/PelangganController.php | 19 +--- app/Http/Controllers/PetiBesiController.php | 8 +- public/js/app.js | 97 ++----------------- resources/js/Logout.vue | 4 - resources/js/components/Cawangan.vue | 1 - resources/js/components/Petibesi.vue | 9 -- resources/js/components/Tunai.vue | 26 +---- resources/views/bajet/tambahbajet.blade.php | 3 + resources/views/cashflow/tunai.blade.php | 2 +- resources/views/layouts/app.blade.php | 7 +- resources/views/layouts/sidebar.blade.php | 11 +++ resources/views/petibesi/petibesi.blade.php | 2 +- routes/web.php | 2 +- 16 files changed, 41 insertions(+), 179 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 75a7a0c..9b44d59 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/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(); - $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')); + return view('cashflow.tunai',compact('api_url','auth_user')); } } diff --git a/app/Http/Controllers/BajetController.php b/app/Http/Controllers/BajetController.php index dfcc927..ccf0a23 100644 --- a/app/Http/Controllers/BajetController.php +++ b/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) diff --git a/app/Http/Controllers/OnlineController.php b/app/Http/Controllers/OnlineController.php index d740aeb..5235ec4 100644 --- a/app/Http/Controllers/OnlineController.php +++ b/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(); - $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')); + return view('online.home',compact('api_url','auth_user')); } } diff --git a/app/Http/Controllers/PelangganController.php b/app/Http/Controllers/PelangganController.php index 60148b3..9355ee4 100644 --- a/app/Http/Controllers/PelangganController.php +++ b/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(); - $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')); + return view('pelanggan.pelanggan',compact('api_url','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(); - $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')); + return view('pelanggan.blacklist',compact('api_url','auth_user')); } } diff --git a/app/Http/Controllers/PetiBesiController.php b/app/Http/Controllers/PetiBesiController.php index 8c84c54..3faa400 100644 --- a/app/Http/Controllers/PetiBesiController.php +++ b/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(); - $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')); + return view('petibesi.petibesi',compact('api_url','auth_user')); } } diff --git a/public/js/app.js b/public/js/app.js index e9a4293..81043b2 100644 --- a/public/js/app.js +++ b/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( - "div", - { - staticClass: - "bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6", - }, - [ - _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 - ), - ] + _c("pagination", { + attrs: { data: _vm.paginate }, + on: { clickEvent_: _vm.getTunai }, + }), + ], + 1 ), ] ), diff --git a/resources/js/Logout.vue b/resources/js/Logout.vue index f4c69d5..b8adf91 100644 --- a/resources/js/Logout.vue +++ b/resources/js/Logout.vue @@ -9,10 +9,6 @@ -
- -
-