From e6c60a8d83a001f1dec1b11093a619b35688349e Mon Sep 17 00:00:00 2001 From: aiman Date: Sun, 12 Oct 2025 12:11:53 +0800 Subject: [PATCH 1/4] Update Laporan Aliran Tunai Teller --- .../Controllers/AliranTunaiController.php | 4 + .../laporan/laporanalirantunai.blade.php | 499 ++++++++++-------- 2 files changed, 296 insertions(+), 207 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 32acd64..81bc716 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -621,6 +621,10 @@ class AliranTunaiController extends Controller $teller = $auth_user['name']; + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/lelong/harini/'.$auth_user['cawangan'])->json(); + + $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller'.$auth_user['cawangan'])->json(); + return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller')); } diff --git a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php index c977e37..84e06b2 100644 --- a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php +++ b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php @@ -1,211 +1,296 @@ - - - - - - -
SULIT DAN PERSENDIRIAN
- - - - - - - - - - - - - - - - - - - - -
PENYATA ALIRAN TUNAI : {{ $teller }}
- -
-
-

Baki Awal

- RM {{ number_format($alirantunai['bakiawal'], 2) }} -
- -
-

Pendahuluan

- RM {{ number_format($alirantunai['tambah'], 2) }} -
- -
-

Penyelesaian Pem.

- RM {{ number_format($alirantunai['masuk'], 2) }} -
-
- -
-
-

Baki Tunai Semasa

- RM {{ number_format($alirantunai['baki'], 2) }} -
- -
-

Serahan

- RM {{ number_format($alirantunai['kurang'], 2) }} -
- -
-

Pembiayaan

- RM {{ number_format($alirantunai['keluar'], 2) }} -
-
- - -
KEMASUKAN TUNAI
-
- - - - - - - - - @php $totaltambah = 0; $totalkurang = 0; @endphp - @foreach($addtunai as $index=>$ad) - @php $totaltambah += $ad['tambah']; $totalkurang += $ad['kurang']; @endphp - - - - - - - @endforeach - - - - - - -
TARIKHDEBIT (RM)KREDIT (RM)NOTA
{{ $ad['tarikh'] }}{{ number_format($ad['tambah'],2) }}{{ number_format($ad['kurang'],2) }}{{ $ad['nota'] }}
JUMLAH{{ number_format($totaltambah,2) }}{{ number_format($totalkurang,2) }}
- - - - - - \ No newline at end of file From 1114aadbefb296fcba8d9296d31dd5905e904234 Mon Sep 17 00:00:00 2001 From: aiman Date: Tue, 14 Oct 2025 15:51:40 +0800 Subject: [PATCH 2/4] Enable datepicker, new route for laporan aliran tunai teller --- .../Controllers/AliranTunaiController.php | 75 ++++++++++++++++--- resources/views/aliran_tunai/index.blade.php | 11 +-- .../laporan/laporanalirantunai.blade.php | 38 ++++------ .../khazanah/laporan/alirantunai.blade.php | 63 ++++++++++++++++ routes/web.php | 4 + 5 files changed, 149 insertions(+), 42 deletions(-) create mode 100644 resources/views/khazanah/laporan/alirantunai.blade.php diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 81bc716..70c92d6 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -2,12 +2,14 @@ namespace App\Http\Controllers; +use App\User; +use App\Cawangan; +use Carbon\Carbon; use Illuminate\Http\Request; use App\Services\CustomerService; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; -use Carbon\Carbon; +use Illuminate\Support\Facades\Http; +use Illuminate\Support\Facades\Session; class AliranTunaiController extends Controller @@ -599,7 +601,7 @@ class AliranTunaiController extends Controller return response($updateTunai); } - public function LaporanAliranTunai($teller) + public function LaporanAliranTunai($teller, Request $request) { $auth_user = Auth::user(); $api_url = config('api.url'); @@ -611,8 +613,6 @@ class AliranTunaiController extends Controller $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - $tarikh_cetak = $current->toDateString(); - $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $alirantunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json(); @@ -621,11 +621,66 @@ class AliranTunaiController extends Controller $teller = $auth_user['name']; - $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/lelong/harini/'.$auth_user['cawangan'])->json(); - - $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller'.$auth_user['cawangan'])->json(); + $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[ + 'tarikh' => $request->datetimepicker1 + ])->json(); - return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller')); + return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller', 'bakiLelong')); + } + + public function laporanAliranTunaiTeller() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + return view('khazanah.laporan.alirantunai', compact('api_url', 'cawangan_info')); + } + + public function cetakLaporanAliranTunaiTeller(Request $request) + { + $api_url = config('api_url'); + $auth_user = Auth::user(); + + $current = Carbon::now(); + $current = new Carbon(); + + $tarikh_cetak = $current->toDateString(); + if($request->datetimepicker1 == null){ + $tarikh = $current->toDateString(); + }else{ + $split_date = explode('-',$request->datetimepicker1); + $tarikh = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + $addtunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getAddTunai/' . $auth_user['cawangan'] . '/kodlaluan/',['kodlaluan' => $auth_user['name']])->json(); + + $teller = $auth_user['name']; + + $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[ + 'tarikh' => $tarikh_cetak + ])->json(); + + $tunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getTunaiByTarikh/',[ + 'kodlaluan' => $auth_user['name'], + 'kodcaw' => $auth_user['cawangan'], + 'tarikh' => $tarikh + ])->json(); + + if(!$tunai) + { + return redirect()->back()->with('errormessage', 'Tiada data pada tarikh tersebut.'); + } + + $jumlahTambah = $tunai['tambah'] + $tunai['masuk'] + $bakiLelong['rugi_lelong']; + $jumlahTolak = $tunai['kurang'] + $tunai['keluar'] + $bakiLelong['baki_lelong']; + + return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','tunai','teller', 'bakiLelong', 'jumlahTambah', 'jumlahTolak')); } public function LaporanTunaiTeller(Request $request){ diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index d1ebd87..9459d54 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -558,15 +558,12 @@ function cetaklaporanalirantunai() { - let teller = "{{ Auth::user()->name }}"; - - let urlroute = '{{ route("laporan.alirantunai", ":id") }}'; - urlroute = urlroute.replace(':id', teller); - - window.open(urlroute, '_blank'); - + let urlroute = '{{ route("laporan.alirantunai") }}'; + + window.location.href = urlroute; } + function cetakserahankeseluruhan() { let urlroute = '{{ route("laporan.serahanteller") }}'; diff --git a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php index 84e06b2..24ae663 100644 --- a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php +++ b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php @@ -174,7 +174,7 @@ TARIKH - {{ $alirantunai['tarikh'] }} + {{ $tunai['tarikh'] }} @@ -194,76 +194,64 @@ Baki Awal : - RM {{ number_format($alirantunai['bakiawal'],2) }} + RM {{ number_format($tunai['bakiawal'],2) }} TAMBAH - Pendahuluan Kepada Teller + Pendahuluan : - RM {{ number_format($alirantunai['tambah'],2) }} + RM {{ number_format($tunai['tambah'],2) }} Pen. Pembiayaan / Keuntungan : - RM {{ number_format($alirantunai['masuk'],2) }} + RM {{ number_format($tunai['masuk'],2) }} Kerugian Baki Lelong : - {{-- RM {{ number_format($petibesi['totpanjar'],2) }} --}} + RM {{ number_format($bakiLelong['rugi_lelong'],2) }} Jumlah : - {{-- RM {{ number_format($petibesi['totpanjar'],2) }} --}} + RM {{ number_format($jumlahTambah,2) }} TOLAK - Serahan Daripada Teller + Serahan : - {{-- RM {{ number_format($petibesi['masuk'],2) }} --}} + RM {{ number_format($tunai['kurang'],2) }} Pembiayaan : - RM {{ number_format($alirantunai['keluar'],2) }} + RM {{ number_format($tunai['keluar'],2) }} Baki Lelong : - {{-- RM {{ number_format($petibesi['pendahuluan'],2) }} --}} + RM {{ number_format($bakiLelong['baki_lelong'],2) }} Jumlah : - {{-- RM {{ number_format($petibesi['pendahuluan'],2) }} --}} + RM {{ number_format($jumlahTolak,2) }} BAKI AKHIR - - Baki Akhir - : - {{-- RM {{ number_format($petibesi['bakiakhir'],2) }} --}} - Baki Akhir Teller : - RM 0.00 - - - - - Baki Dibawa Kedepan - : - {{-- RM {{ number_format($petibesi['bakieod'],2) }} --}} + RM {{ number_format($tunai['bakiawal'] +$jumlahTambah + $jumlahTolak,2) }} diff --git a/resources/views/khazanah/laporan/alirantunai.blade.php b/resources/views/khazanah/laporan/alirantunai.blade.php new file mode 100644 index 0000000..4d89333 --- /dev/null +++ b/resources/views/khazanah/laporan/alirantunai.blade.php @@ -0,0 +1,63 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+ + + @if(session()->has('errormessage')) +
+ {{ session()->get('errormessage') }} +
+ @endif + +
+
+
+
+
+
+
+
+
+
+ @csrf +
+
+ Tarikh +
+ + +
+
+
+
+
+
+
+
+
+ +@endsection + diff --git a/routes/web.php b/routes/web.php index 0fdef70..f3114bc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -112,6 +112,10 @@ Route::get('/firstwakil',['as'=>'wakil.first','uses'=>'PenebusanController@getfi Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history'])->middleware('auth','teller'); Route::get('/history/khazanah',['as'=>'gadai.history.khazanah','uses'=>'GadaianController@history'])->middleware('auth','khazanah'); +//Laporan Aliran Tunai Teller +Route::get('/laporan/alirantunai', ['as' => 'laporan.alirantunai', 'uses'=> 'AliranTunaiController@laporanAliranTunaiTeller'])->middleware('auth','teller'); +Route::post('laporan/alirantunai/cetak', ['as' => 'alirantunai.laporancetak', 'uses' => 'AliranTunaiController@cetakLaporanAliranTunaiTeller'])->middleware('auth', 'teller'); + //Kemaskini Upah Route::get('/kemaskiniupah',['as'=>'kemaskini.upah','uses'=>'AliranTunaiController@kemaskiniupah'])->middleware('auth','teller'); From 1d903a70ba99e06d85a0263275190e2948eceb17 Mon Sep 17 00:00:00 2001 From: aiman Date: Tue, 14 Oct 2025 16:40:20 +0800 Subject: [PATCH 3/4] Adjust the tarikh for laporan aliran tunai --- app/Http/Controllers/AliranTunaiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 70c92d6..6de64fc 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -663,7 +663,7 @@ class AliranTunaiController extends Controller $teller = $auth_user['name']; $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[ - 'tarikh' => $tarikh_cetak + 'tarikh' => $tarikh ])->json(); $tunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getTunaiByTarikh/',[ From 1720537632fba7c0a01ef3f0ff26d5bf706da42d Mon Sep 17 00:00:00 2001 From: aiman Date: Wed, 15 Oct 2025 14:52:08 +0800 Subject: [PATCH 4/4] Filter bakiLelong with kodlaluan and re-adjust the laporan aliran tunai teller --- .../Controllers/AliranTunaiController.php | 3 +- .../laporan/laporanalirantunai.blade.php | 66 +++++++++++-------- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 6de64fc..06b0820 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -663,7 +663,8 @@ class AliranTunaiController extends Controller $teller = $auth_user['name']; $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[ - 'tarikh' => $tarikh + 'tarikh' => $tarikh, + 'kodlaluan' => $auth_user['name'] ])->json(); $tunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getTunaiByTarikh/',[ diff --git a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php index 24ae663..2334ec2 100644 --- a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php +++ b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php @@ -160,29 +160,38 @@ - - - - - + + + + + + - - - - - - - - - + +
LAPORAN ALIRAN TUNAI TELLER (arOS v3) Tarikh Cetak: - @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) - @endphp + + LAPORAN ALIRAN TUNAI TELLER
TARIKH: + @php + $tarikhTeller = DateTime::createFromFormat('Y-m-d', $tunai['tarikh']); + echo $tarikhTeller->format('d-m-Y'); + @endphp +
TARIKH{{ $tunai['tarikh'] }} - TARIKH CETAK: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo $formattedweddingdate; + @endphp +
@@ -245,13 +254,18 @@ RM {{ number_format($jumlahTolak,2) }} + BAKI AKHIR - BAKI AKHIR - - - Baki Akhir Teller - : - RM {{ number_format($tunai['bakiawal'] +$jumlahTambah + $jumlahTolak,2) }} + + BAKI AKHIR TELLER: RM {{ number_format($tunai['bakiawal'] + $jumlahTambah - $jumlahTolak,2) }} +