From 4a083e10636c8d766b801d6e7b60867c5a32f85f Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Wed, 19 Jun 2024 11:53:44 +0800 Subject: [PATCH 1/3] added akrubulananpecahan dan imbangduga range untuk tallykan --- .../AdminSettings/BalanceSheetsController.php | 43 +++ app/Http/Controllers/HomeController.php | 11 + app/Providers/RouteServiceProvider.php | 5 + resources/js/Akaun/AkruBulanPecahan.vue | 101 +++++ resources/js/Akaun/Home.vue | 5 + resources/js/ImbangDuga/index.vue | 165 ++++++++ resources/js/app.js | 3 + resources/js/routes.js | 1 + .../akaun/laporan_akrubulan_pecahan.blade.php | 354 ++++++++++++++++++ resources/views/imbangduga/index.blade.php | 17 + resources/views/indexTetapanAdmin.blade.php | 42 +++ resources/views/layouts/sidebar.blade.php | 78 ++-- routes/admin_settings.php | 10 + 13 files changed, 804 insertions(+), 31 deletions(-) create mode 100644 app/Http/Controllers/AdminSettings/BalanceSheetsController.php create mode 100644 resources/js/Akaun/AkruBulanPecahan.vue create mode 100644 resources/js/ImbangDuga/index.vue create mode 100644 resources/views/akaun/laporan_akrubulan_pecahan.blade.php create mode 100644 resources/views/imbangduga/index.blade.php create mode 100644 resources/views/indexTetapanAdmin.blade.php create mode 100644 routes/admin_settings.php diff --git a/app/Http/Controllers/AdminSettings/BalanceSheetsController.php b/app/Http/Controllers/AdminSettings/BalanceSheetsController.php new file mode 100644 index 0000000..8eb6877 --- /dev/null +++ b/app/Http/Controllers/AdminSettings/BalanceSheetsController.php @@ -0,0 +1,43 @@ +toDateString(); + // } + + // return $date_string; + // }; + + // $request->hostname = config('api.url'); + + // $data = Http::get($request->hostname . '/api/reports/ansuran', [ + // 'startDate' => $getReportDate($request->startDate), + // 'endDate' => $getReportDate($request->endDate), + // ])->json(); + + // $summary_ansuran_by_cawangan = $data['summary_ansuran_by_cawangan']; + // $summary_ansuran = $data['summary_ansuran']; + + // $startDate = $getReportDate($request->startDate); + // $endDate = $getReportDate($request->endDate); + + // return view('reports.ansuran.index', compact('summary_ansuran_by_cawangan', 'summary_ansuran', 'startDate', 'endDate')); + } +} diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 65dfbe3..0938740 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -65,6 +65,17 @@ class HomeController extends Controller return view('indexOverallReport'); } + public function indexTetapanAdmin() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $harini = Carbon::now(); + $harini = new Carbon; + + return view('indexTetapanAdmin'); + } + public function indexakaun() { $auth_user = Auth::user(); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index e2ceefb..46a6e60 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -48,6 +48,11 @@ class RouteServiceProvider extends ServiceProvider ->prefix('reports') ->group(base_path('routes/reports.php')); + Route::middleware('web') + ->namespace($this->namespace) + ->prefix('adminsettings') + ->group(base_path('routes/admin_settings.php')); + Route::middleware('web') ->namespace($this->namespace) ->group(base_path('routes/web.php')); diff --git a/resources/js/Akaun/AkruBulanPecahan.vue b/resources/js/Akaun/AkruBulanPecahan.vue new file mode 100644 index 0000000..e2ed112 --- /dev/null +++ b/resources/js/Akaun/AkruBulanPecahan.vue @@ -0,0 +1,101 @@ + + + diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index e2b3b62..987dd8b 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -145,6 +145,11 @@

Akru Bulanan

+
+ +

Akru Bulanan Pecahan

+
+

Serah Marhun Gadai

diff --git a/resources/js/ImbangDuga/index.vue b/resources/js/ImbangDuga/index.vue new file mode 100644 index 0000000..42d259f --- /dev/null +++ b/resources/js/ImbangDuga/index.vue @@ -0,0 +1,165 @@ + + + \ No newline at end of file diff --git a/resources/js/app.js b/resources/js/app.js index 9a57294..b7436e0 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -260,6 +260,9 @@ Vue.component('tetapan-component', require('./Tetapan/index.vue').default) Vue.component('pengguna-component', require('./Pengguna/index.vue').default) Vue.component('margin-component', require('./Tetapan/margin.vue').default) +//ImbangDuga +Vue.component('imbangduga-component', require('./ImbangDuga/index.vue').default) + diff --git a/resources/js/routes.js b/resources/js/routes.js index 728f033..4677e17 100644 --- a/resources/js/routes.js +++ b/resources/js/routes.js @@ -22,6 +22,7 @@ import StokAuditBackdate from './Akaun/StokAuditBackdate' import Aging from './Akaun/Aging' import PetiBesi from './Akaun/PetiBesi' import AkruBulan from './Akaun/AkruBulan' +import AkruBulanPecahan from './Akaun/AkruBulanPecahan.vue' import Prestasi from './Akaun/Prestasi' import SerahGadai from './Akaun/SerahGadai' import SerahTebus from './Akaun/SerahTebus' diff --git a/resources/views/akaun/laporan_akrubulan_pecahan.blade.php b/resources/views/akaun/laporan_akrubulan_pecahan.blade.php new file mode 100644 index 0000000..3ce3b1b --- /dev/null +++ b/resources/views/akaun/laporan_akrubulan_pecahan.blade.php @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LAPORAN AKRU BULANAN PECAHAN +
TAHUN JANAAN:{{ $year }} +
+ +
+
+

PAPARAN 1%

+ + + + + + + + + + + + + + + + + + + @php + $totaljan = 0;$totalfeb = 0;$totalmac = 0;$totalapr = 0;$totalmei = 0;$totaljun = 0;$totaljul = 0; + $totalogo = 0;$totalsep = 0;$totalokt = 0;$totalnov = 0;$totaldis = 0; + @endphp + @foreach($akrubulan as $index=>$akru) + + + @php + $totalcawangan = 0; + @endphp + @foreach($akru['onepercent'] as $index2=>$ak) + @if(isset( $akru['onepercent'] )) + @php + $totalcawangan += $ak; + ($index2 == 0) ? $totaljan += $ak : $totaljan += 0; + ($index2 == 1) ? $totalfeb += $ak : $totalfeb += 0; + ($index2 == 2) ? $totalmac += $ak : $totalmac += 0; + ($index2 == 3) ? $totalapr += $ak : $totalapr += 0; + ($index2 == 4) ? $totalmei += $ak : $totalmei += 0; + ($index2 == 5) ? $totaljun += $ak : $totaljun += 0; + ($index2 == 6) ? $totaljul += $ak : $totaljul += 0; + ($index2 == 7) ? $totalogo += $ak : $totalogo += 0; + ($index2 == 8) ? $totalsep += $ak : $totalsep += 0; + ($index2 == 9) ? $totalokt += $ak : $totalokt += 0; + ($index2 == 10) ? $totalnov += $ak : $totalnov += 0; + ($index2 == 11) ? $totaldis += $ak : $totaldis += 0; + + @endphp + + @else + + @endif + @endforeach + + + @endforeach + + + + + + + + + + + + + + + @php + $totalonepersen = $totaljan + $totalfeb + $totalmac + $totalapr + $totalmei + $totaljun + $totaljul + $totalogo + $totalsep + $totalokt + $totalnov + $totaldis; + @endphp + + +
CAWANGANJANUARIFEBRUARIMACAPRILMEIJUNJULAIOGOSSEPTEMBEROKTOBERNOVEMBERDISEMBERJUMLAH
{{ $index }}{{ number_format($ak,2) }}0.00{{ number_format($totalcawangan,2) }}
JUMLAH{{ number_format($totaljan,2) }}{{ number_format($totalfeb,2) }}{{ number_format($totalmac,2) }}{{ number_format($totalapr,2) }}{{ number_format($totalmei,2) }}{{ number_format($totaljun,2) }}{{ number_format($totaljul,2) }}{{ number_format($totalogo,2) }}{{ number_format($totalsep,2) }}{{ number_format($totalokt,2) }}{{ number_format($totalnov,2) }}{{ number_format($totaldis,2) }}{{ number_format($totalonepersen,2) }}
+
+

+ +
+

PAPARAN UJRAH

+ + + + + + + + + + + + + + + + + + + @php + $totaljan = 0;$totalfeb = 0;$totalmac = 0;$totalapr = 0;$totalmei = 0;$totaljun = 0;$totaljul = 0; + $totalogo = 0;$totalsep = 0;$totalokt = 0;$totalnov = 0;$totaldis = 0; + @endphp + @foreach($akrubulan as $index=>$akru) + + + @php + $totalcawangan = 0; + @endphp + @foreach($akru['ujrah'] as $index2=>$ak) + @if(isset( $akru['ujrah'] )) + @php + $totalcawangan += $ak; + ($index2 == 0) ? $totaljan += $ak : $totaljan += 0; + ($index2 == 1) ? $totalfeb += $ak : $totalfeb += 0; + ($index2 == 2) ? $totalmac += $ak : $totalmac += 0; + ($index2 == 3) ? $totalapr += $ak : $totalapr += 0; + ($index2 == 4) ? $totalmei += $ak : $totalmei += 0; + ($index2 == 5) ? $totaljun += $ak : $totaljun += 0; + ($index2 == 6) ? $totaljul += $ak : $totaljul += 0; + ($index2 == 7) ? $totalogo += $ak : $totalogo += 0; + ($index2 == 8) ? $totalsep += $ak : $totalsep += 0; + ($index2 == 9) ? $totalokt += $ak : $totalokt += 0; + ($index2 == 10) ? $totalnov += $ak : $totalnov += 0; + ($index2 == 11) ? $totaldis += $ak : $totaldis += 0; + + @endphp + + @else + + @endif + @endforeach + + + @endforeach + + + + + + + + + + + + + + + @php + $totalonepersen = $totaljan + $totalfeb + $totalmac + $totalapr + $totalmei + $totaljun + $totaljul + $totalogo + $totalsep + $totalokt + $totalnov + $totaldis; + @endphp + + +
CAWANGANJANUARIFEBRUARIMACAPRILMEIJUNJULAIOGOSSEPTEMBEROKTOBERNOVEMBERDISEMBERJUMLAH
{{ $index }}{{ number_format($ak,2) }}0.00{{ number_format($totalcawangan,2) }}
JUMLAH{{ number_format($totaljan,2) }}{{ number_format($totalfeb,2) }}{{ number_format($totalmac,2) }}{{ number_format($totalapr,2) }}{{ number_format($totalmei,2) }}{{ number_format($totaljun,2) }}{{ number_format($totaljul,2) }}{{ number_format($totalogo,2) }}{{ number_format($totalsep,2) }}{{ number_format($totalokt,2) }}{{ number_format($totalnov,2) }}{{ number_format($totaldis,2) }}{{ number_format($totalonepersen,2) }}
+
+ + +
+
+ + + + + + + + + + + + + + + +
.................................................................. ..................................................................
DI SEMAK DI SAHKAN
+ + + + + + + \ No newline at end of file diff --git a/resources/views/imbangduga/index.blade.php b/resources/views/imbangduga/index.blade.php new file mode 100644 index 0000000..c4e4c1c --- /dev/null +++ b/resources/views/imbangduga/index.blade.php @@ -0,0 +1,17 @@ +@extends('layouts.app') +@section('content') + +
+
+ +
+ + test + +
+
+ @include('layouts.footer') + +
+ +@endsection \ No newline at end of file diff --git a/resources/views/indexTetapanAdmin.blade.php b/resources/views/indexTetapanAdmin.blade.php new file mode 100644 index 0000000..4f8a6fb --- /dev/null +++ b/resources/views/indexTetapanAdmin.blade.php @@ -0,0 +1,42 @@ +@extends('layouts.app') + +@section('content') + +
+
+ +
+ + + + + + +
+
+ @include('layouts.footer') + @endsection diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index cceaa4c..b8eaa8a 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -11,7 +11,7 @@

- {{-- Muhammad Hafifie --}} + {{-- Muhammad Hafifie --}}

Menu Utama


@@ -33,7 +33,7 @@ - Dashboard + Dashboard
@@ -48,7 +48,7 @@ - Tunai + Tunai @@ -64,7 +64,23 @@ - Peti Besi + Peti Besi + + + + + +
  • +
    + + + + + Tetapan
  • @@ -79,7 +95,7 @@ d="M1.5 1a.5.5 0 0 0-.5.5v3a.5.5 0 0 1-1 0v-3A1.5 1.5 0 0 1 1.5 0h3a.5.5 0 0 1 0 1h-3zM11 .5a.5.5 0 0 1 .5-.5h3A1.5 1.5 0 0 1 16 1.5v3a.5.5 0 0 1-1 0v-3a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 1-.5-.5zM.5 11a.5.5 0 0 1 .5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 1 0 1h-3A1.5 1.5 0 0 1 0 14.5v-3a.5.5 0 0 1 .5-.5zm15 0a.5.5 0 0 1 .5.5v3a1.5 1.5 0 0 1-1.5 1.5h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 1 .5-.5z" /> - Pelanggan + Pelanggan @@ -93,7 +109,7 @@ - Online + Online @@ -108,7 +124,7 @@ - Laporan + Laporan @@ -120,7 +136,7 @@ - Poskod + Poskod @@ -133,7 +149,7 @@ - Permissions + Permissions --}} @@ -154,7 +170,7 @@ - Dashboard + Dashboard @@ -168,7 +184,7 @@ - Bajet + Bajet @@ -182,7 +198,7 @@ - Blacklist + Blacklist @@ -199,7 +215,7 @@ - Lelong + Lelong @@ -213,7 +229,7 @@ - WTD + WTD @@ -229,7 +245,7 @@ d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" /> - Tetapan + Tetapan --}} @@ -245,7 +261,7 @@ d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" /> - Tetapan + Tetapan @@ -260,7 +276,7 @@ - Kelulusan + Kelulusan --}} @@ -275,7 +291,7 @@ - Laporan + Laporan @@ -289,7 +305,7 @@ - Laporan Keseluruhan + Laporan Keseluruhan @@ -302,7 +318,7 @@ - Permohonan + Permohonan --}} @@ -318,7 +334,7 @@ - Audit + Audit @@ -332,7 +348,7 @@ - Laporan + Laporan @@ -346,7 +362,7 @@ - Permohonan + Permohonan --}} @@ -370,7 +386,7 @@ - Dashboard + Dashboard @@ -386,7 +402,7 @@ - Laporan + Laporan @@ -411,7 +427,7 @@ - Dashboard + Dashboard @@ -427,7 +443,7 @@ d="M1.5 1a.5.5 0 0 0-.5.5v3a.5.5 0 0 1-1 0v-3A1.5 1.5 0 0 1 1.5 0h3a.5.5 0 0 1 0 1h-3zM11 .5a.5.5 0 0 1 .5-.5h3A1.5 1.5 0 0 1 16 1.5v3a.5.5 0 0 1-1 0v-3a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 1-.5-.5zM.5 11a.5.5 0 0 1 .5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 1 0 1h-3A1.5 1.5 0 0 1 0 14.5v-3a.5.5 0 0 1 .5-.5zm15 0a.5.5 0 0 1 .5.5v3a1.5 1.5 0 0 1-1.5 1.5h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 1 .5-.5z" /> - Pelanggan + Pelanggan @@ -443,7 +459,7 @@ - Laporan + Laporan @@ -466,7 +482,7 @@ - Pengguna + Pengguna @@ -479,7 +495,7 @@ - Arkib + Arkib @@ -492,7 +508,7 @@
  • - Close + Close
  • diff --git a/routes/admin_settings.php b/routes/admin_settings.php new file mode 100644 index 0000000..808d922 --- /dev/null +++ b/routes/admin_settings.php @@ -0,0 +1,10 @@ +group(function () { + Route::get('', [App\Http\Controllers\HomeController::class, 'indexTetapanAdmin'])->name('tetapanaros'); + Route::get('imbangduga', [BalanceSheetsController::class, 'index'])->name('imbangduga'); +}); From c436433765f122072fb46eb4db5687b7b00bf593 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Jun 2024 10:52:13 +0800 Subject: [PATCH 2/3] imbangduga --- resources/js/ImbangDuga/index.vue | 517 +++++++++++++----- .../js/components/util/ImbangdugaModal.vue | 92 ++++ resources/views/imbangduga/index.blade.php | 2 +- resources/views/layouts/sidebar.blade.php | 12 +- 4 files changed, 471 insertions(+), 152 deletions(-) create mode 100644 resources/js/components/util/ImbangdugaModal.vue diff --git a/resources/js/ImbangDuga/index.vue b/resources/js/ImbangDuga/index.vue index 42d259f..e39edeb 100644 --- a/resources/js/ImbangDuga/index.vue +++ b/resources/js/ImbangDuga/index.vue @@ -1,165 +1,392 @@ \ No newline at end of file + }).then(response => { + + if(response.data === 'sama') + { + this.showLoader = false; + this.$toast("Nilai Tunai sama dengan nilai tunai"); + + }else{ + this.Imban = response.data; + this.showLoader = false; + this.$refs.modal.showModal = true; + this.$refs.modal.tarikh= tarikh; + this.$refs.modal.kod = kodcaw; + this.$refs.modal.kod = kodcaw; + this.$refs.modal.kod = kodcaw; + this.$refs.modal.kod = kodcaw; + this.$refs.modal.kod = kodcaw; + this.$refs.modal.pageNumber = this.currentPage; + } + }); + }, + + getImbangDuga(pageNumber) { + this.axios.get(this.$hostname + "/api/reports/getBalanceSheetsList", { + params: { + kodcaw: kodcawteller, + mula: tarikhmula, + hingga: tarikhhingga, + page: pageNumber, + }, + + }).then(response => { + console.log(response) + }); + + }, + formatterfunction(value) { + return formatter.format(value); + }, + } + diff --git a/resources/js/components/util/ImbangdugaModal.vue b/resources/js/components/util/ImbangdugaModal.vue new file mode 100644 index 0000000..53edcfc --- /dev/null +++ b/resources/js/components/util/ImbangdugaModal.vue @@ -0,0 +1,92 @@ + + + \ No newline at end of file diff --git a/resources/views/imbangduga/index.blade.php b/resources/views/imbangduga/index.blade.php index c4e4c1c..5cb7968 100644 --- a/resources/views/imbangduga/index.blade.php +++ b/resources/views/imbangduga/index.blade.php @@ -6,7 +6,7 @@
    - test +
    diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index b8eaa8a..ab0daaf 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -74,12 +74,12 @@
  • - - - + class="bi bi-gear" viewBox="0 0 16 16"> + + + Tetapan
  • From 5d37a2d10073751a904b7b3f83f56d42a73ec502 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Sun, 7 Jul 2024 23:45:51 +0800 Subject: [PATCH 3/3] added akru bulanan pecahan --- app/Http/Controllers/AkaunController.php | 20 + resources/js/Akaun/Home.vue | 2 +- resources/js/ImbangDuga/index.vue | 675 ++++++++---------- resources/js/ImbangDuga/result.vue | 101 +++ .../js/components/util/ImbangdugaModal.vue | 305 +++++--- resources/js/routes.js | 2 +- resources/views/layouts/sidebar.blade.php | 4 +- routes/web.php | 1 + 8 files changed, 650 insertions(+), 460 deletions(-) create mode 100644 resources/js/ImbangDuga/result.vue diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index 14fd073..3b57432 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -1585,5 +1585,25 @@ class AkaunController extends Controller } + public function cetak_akrubulanpecahan(Request $request){ + $auth_user = Auth::user(); + + $year = $request->year; + + $akrubulan = Http::get(config('api.url').'/api/reports/getaccrualincome/all',['kodcaw' => 'KB2','year' => $request->year])->json(); + + if(isset($request->jenis)) + { + if($request->jenis == 'pdf') + { + $pdf = PDF::loadView('akaun.laporan_akrubulan_pecahan',compact('akrubulan','year'))->setPaper('a4', 'potrait'); + return $pdf->download('laporan_akrubulanpecahan' . $year . '.pdf'); + }else{ + return view('akaun.laporan_akrubulan_pecahan',compact('akrubulan','year')); + } + } + + } + } diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index 987dd8b..bb2eddf 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -146,7 +146,7 @@
    - +

    Akru Bulanan Pecahan

    diff --git a/resources/js/ImbangDuga/index.vue b/resources/js/ImbangDuga/index.vue index e39edeb..4a0b5e7 100644 --- a/resources/js/ImbangDuga/index.vue +++ b/resources/js/ImbangDuga/index.vue @@ -1,392 +1,323 @@ diff --git a/resources/js/ImbangDuga/result.vue b/resources/js/ImbangDuga/result.vue new file mode 100644 index 0000000..9a51ba1 --- /dev/null +++ b/resources/js/ImbangDuga/result.vue @@ -0,0 +1,101 @@ + + + + diff --git a/resources/js/components/util/ImbangdugaModal.vue b/resources/js/components/util/ImbangdugaModal.vue index 53edcfc..750cdef 100644 --- a/resources/js/components/util/ImbangdugaModal.vue +++ b/resources/js/components/util/ImbangdugaModal.vue @@ -1,92 +1,229 @@ \ No newline at end of file + }, +}; + + diff --git a/resources/js/routes.js b/resources/js/routes.js index 4677e17..2fa647c 100644 --- a/resources/js/routes.js +++ b/resources/js/routes.js @@ -63,7 +63,6 @@ import UpahSimpanPage from './Audit/UpahSimpan' - Vue.use(VueRouter) export default new VueRouter({ @@ -92,6 +91,7 @@ export default new VueRouter({ { path: '/akaunhome/PetiBesi', component: PetiBesi }, { path: '/akaunhome/prestasi', component: Prestasi }, { path: '/akaunhome/akrubulan', component: AkruBulan }, + { path: '/akaunhome/akrubulanpecahan', component: AkruBulanPecahan }, { path: '/akaunhome/serahgadai', component: SerahGadai }, { path: '/akaunhome/serahtebus', component: SerahTebus }, { path: '/akaunhome/online', component: Online }, diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index ab0daaf..1d3c43b 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -69,7 +69,7 @@ -
  • @@ -83,7 +83,7 @@ Tetapan
  • -
    + --}} diff --git a/routes/web.php b/routes/web.php index 583326d..23f58cc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -111,6 +111,7 @@ Route::get('/akaunhome/cetakaging',['as'=>'cetak.aging','uses'=>'App\Http\Contro Route::get('/akaunhome/cetakpetibesi',['as'=>'cetak.petibesi','uses'=>'App\Http\Controllers\AkaunController@cetakPetiBesi'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/prestasi',['as'=>'cetak.prestasi','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanPrestasi'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/cetakakrubulan',['as'=>'cetak.akrubulan','uses'=>'App\Http\Controllers\AkaunController@cetak_akru_bulanan'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); +Route::get('/akaunhome/cetakakrubulanpecahan',['as'=>'cetak.akrubulan_pecahan','uses'=>'App\Http\Controllers\AkaunController@cetak_akrubulanpecahan'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/cetakserahgadai',['as'=>'cetak.serahgadai','uses'=>'App\Http\Controllers\AkaunController@cetak_serahgadai'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/cetakserahtebus',['as'=>'cetak.serahtebus','uses'=>'App\Http\Controllers\AkaunController@cetak_serahtebus'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/cetakonline',['as'=>'cetak.online','uses'=>'App\Http\Controllers\AkaunController@cetak_laporan_online'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']);