From a7493994ecc96a09f03208f589f42308f0edc6e5 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 6 Jun 2021 10:09:52 +0800 Subject: [PATCH 1/9] fix laporan lagi --- app/Http/Controllers/KhazanahController.php | 115 +++++++- public/js/main.js | 4 +- .../views/khazanah/laporan/ansuran.blade.php | 1 + .../khazanah/laporan/ansuranupah.blade.php | 112 +++++++ .../views/khazanah/laporan/index.blade.php | 4 +- .../laporan/ringkasanterkumpul.blade.php | 70 +++++ .../views/khazanah/laporan/upah.blade.php | 214 ++++++++++++++ .../views/print/laporan_gadaian.blade.php | 39 +-- .../views/print/laporan_penebusan.blade.php | 55 ++-- .../laporan_ringkasanterkumpulv2.blade.php | 188 ++++++++++++ resources/views/print/laporan_upah.blade.php | 273 ++++++++++++++++++ routes/web.php | 6 +- 12 files changed, 1025 insertions(+), 56 deletions(-) create mode 100644 resources/views/khazanah/laporan/ansuranupah.blade.php create mode 100644 resources/views/khazanah/laporan/ringkasanterkumpul.blade.php create mode 100644 resources/views/khazanah/laporan/upah.blade.php create mode 100644 resources/views/print/laporan_ringkasanterkumpulv2.blade.php create mode 100644 resources/views/print/laporan_upah.blade.php diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index c606223..eead57b 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3192,6 +3192,15 @@ class KhazanahController extends Controller return view('khazanah.laporan.ringkasanharian',compact('cawangan_info','api_url')); } + public function laporanRingkasanTerkumpul(){ + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + return view('khazanah.laporan.ringkasanterkumpul',compact('cawangan_info','api_url')); + } + public function cetakLaporanRingkasanHarian(Request $request){ $api_url = config('api.url'); @@ -3271,6 +3280,30 @@ class KhazanahController extends Controller return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan','totalbilkawalanstok','totalpinjkawalanstok')); } + // public function cetakLaporanRingkasanTerkumpul(Request $request){ + // // dd($request); + // $api_url = config('api.url'); + // $auth_user = Auth::user(); + // $current = Carbon::now(); + // $current = new Carbon(); + // $tarikh_cetak = $current->toDateString(); + // if($request->datetimepicker1 == null){ + // $tebus_date = $current->toDateString(); + // }else{ + // $split_date = explode('-',$request->datetimepicker1); + // $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + // } + // $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); + // $marhun = $marhun[0]; + + // $keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan']; + + // $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + // $cawangan_detail=$cawangan[0]; + // // dd($gadai); + // return view('print.laporan_ringkasanterkumpul', compact('keseluruhanupahsimpan','marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url')); + // } + public function cetakLaporanRingkasanTerkumpul(Request $request){ // dd($request); $api_url = config('api.url'); @@ -3278,21 +3311,31 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - if($request->datetimepicker1 == null){ - $tebus_date = $current->toDateString(); - }else{ - $split_date = explode('-',$request->datetimepicker1); - $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); - $marhun = $marhun[0]; - $keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan']; + if($request->datemula == null){ + $mula_date = '2017-01-01'; + }else{ + $split_date = explode('-', $request->datemula); + $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + if($request->datehingga == null){ + $hingga_date = $current->toDateString(); + }else{ + $split_date = explode('-', $request->datehingga); + $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + $laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/harian',[ + 'kodcaw' => $auth_user['cawangan'], + 'mula' => $mula_date, + 'akhir' => $hingga_date + ])->json(); $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; // dd($gadai); - return view('print.laporan_ringkasanterkumpul', compact('keseluruhanupahsimpan','marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url')); + return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','hingga_date','api_url')); } public function laporanKawalanStok(){ @@ -4517,4 +4560,56 @@ class KhazanahController extends Controller return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url')); } + public function PemilihanAnsUpah() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + + return view('khazanah.laporan.ansuranupah', compact('cawangan_info','api_url')); + } + + public function LaporanUpah() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + + return view('khazanah.laporan.upah', compact('cawangan_info','api_url')); + } + + public function cetaklaporan_Upah(Request $request) + { + $api_url = config('api.url'); + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + if($request->datemula == null){ + $mula_date = '2017-01-01'; + }else{ + $split_date = explode('-', $request->datemula); + $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + if($request->datehingga == null){ + $hingga_date = $current->toDateString(); + }else{ + $split_date = explode('-', $request->datehingga); + $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + $advansur = Http::get(config('api.url'). '/api/AnsuranByRangeTarikh/' . $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); + + $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + return view('print.laporan_upah', compact('advansur','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); + } + } diff --git a/public/js/main.js b/public/js/main.js index d422400..8137f25 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -227,7 +227,7 @@ function kiraan(datakeyin) $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2))); break; case 'sen10': - amountkiraan += (valkey * 0.05); + amountkiraan += (valkey * 0.10); $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2))); break; case 'sen20': @@ -335,7 +335,7 @@ function kiraanpanjar(datakeyin) $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2))); break; case 'sen10': - amountkiraan += (valkey * 0.05); + amountkiraan += (valkey * 0.10); $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2))); break; case 'sen20': diff --git a/resources/views/khazanah/laporan/ansuran.blade.php b/resources/views/khazanah/laporan/ansuran.blade.php index a2f478e..c96df2a 100644 --- a/resources/views/khazanah/laporan/ansuran.blade.php +++ b/resources/views/khazanah/laporan/ansuran.blade.php @@ -9,6 +9,7 @@
  1. Home
  2. Laporan
    3. +
  3. Ansuran & Upah
  4. Ansuran
diff --git a/resources/views/khazanah/laporan/ansuranupah.blade.php b/resources/views/khazanah/laporan/ansuranupah.blade.php new file mode 100644 index 0000000..a50bc9b --- /dev/null +++ b/resources/views/khazanah/laporan/ansuranupah.blade.php @@ -0,0 +1,112 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+ + +
+ +
+
+
+ Ansuran +
+
+
+
+ Upah +
+
+
+
+
+
+
+
+ + + +@endsection diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index 959af9b..f7f3e5a 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -26,7 +26,7 @@ Pelanggan Baru
- Ringkasan Terkumpul + Ringkasan Terkumpul
Aging Bulan @@ -70,7 +70,7 @@
- Ansuran + Ansuran & Upah
Stok Audit diff --git a/resources/views/khazanah/laporan/ringkasanterkumpul.blade.php b/resources/views/khazanah/laporan/ringkasanterkumpul.blade.php new file mode 100644 index 0000000..29e492d --- /dev/null +++ b/resources/views/khazanah/laporan/ringkasanterkumpul.blade.php @@ -0,0 +1,70 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ @csrf +
+
+ Mula +
+ + +
+ Hingga +
+ + + + +
+
+
+
+ +
+
+
+
+
+ +@endsection + diff --git a/resources/views/khazanah/laporan/upah.blade.php b/resources/views/khazanah/laporan/upah.blade.php new file mode 100644 index 0000000..2600868 --- /dev/null +++ b/resources/views/khazanah/laporan/upah.blade.php @@ -0,0 +1,214 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ @csrf +
+
+ Mula +
+ + +
+ Hingga +
+ + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
BilTarikhNo RujukanTellerPinjamanJBGUpah Dibayar
TOTAL
+
+
+ +
+
+
+
+
+ +@endsection + diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index c59f39d..94f43e7 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -214,9 +214,9 @@ Keuntungan Peratus (%) - @php $counter = 1; $totalpinjaman = 0; @endphp + @php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0;@endphp @foreach($gadai as $index=>$item) - @php $totalpinjaman += $item['pinjaman'] @endphp + @php $totalpinjaman += $item['pinjaman']; $totalberat += $item['berat']; $totalnm += $item['nilaimarhun']; $totalupah += $item['upah12']; @endphp @if($index > 0) @if($item['teller'] != $gadai[$index - 1]['teller']) @@ -275,8 +275,25 @@ @endif @endforeach +

+ + + + + + + + + + + + + + + +
Berat (g/m)Nilai Marhun (RM)Pembiayaan (RM)Upah/Keuntungan (RM)
JUMLAH KESELURUHAN{{ number_format($totalberat,2) }}{{ number_format($totalnm,2) }}{{ number_format($totalpinjaman,2) }}{{ number_format($totalupah,2) }}
-
JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}
+{{--
JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}
--}}

@@ -298,22 +315,6 @@ -

Laporan Transaksi Gadaian

-
- - - - - - - - - - - - -
BilJenisPenebusan(RM)
0 Rugi Lelong 0.00
- diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 442e8cb..cadd708 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -219,9 +219,9 @@ Bayaran(RM) Jumlah(RM) - @php $counter = 1; $totalbayaran = 0;@endphp + @php $counter = 1; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp @foreach($tebus as $index=>$item) - @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp + @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah'];@endphp @if($index > 0) @if($item['teller'] != $tebus[$index - 1]['teller']) @@ -296,24 +296,19 @@ @endforeach -
JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}
- -
-
- +

+
- - - - - + + + + - - - - - + + + +
.................................................................. .................................................................. Pembiayaan (RM)Upah/Keuntungan (RM)Jumlah (RM)
DI SEMAK DI SAHKAN JUMLAH KESELURUHAN{{ number_format($totalpinjaman,2) }}{{ number_format($totalupah,2) }}{{ number_format($totalbayaran,2) }}
@@ -349,12 +344,26 @@ {{ number_format($upahlama['total'],2) }} Not Applicable + + +{{--
JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}
--}} + +
+
+ - - - - - + + + + + + + + + + + +
0 Baki Lelong 0.00 Not Applicable Not Applicable .................................................................. ..................................................................
DI SEMAK DI SAHKAN
@@ -363,3 +372,5 @@ + + diff --git a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php new file mode 100644 index 0000000..4dda355 --- /dev/null +++ b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + +

+

Tarikh Mula: {{ $hingga_date }} Tarikh Hingga : {{ $tarikh_cetak }} Tarikh Cetak : {{ $tarikh_cetak }}

+ +
+
+
+
+

A) LAPORAN TERKUMPUL

+
+
1. PEMBIAYAAN
+
+
2. PENEBUSAN
+
+
3. ANSURAN PEMBIAYAAN
+
+
4. BAYARAN ONLINE
+
RM 0.00
+
5. KEUNTUNGAN
+
+
6. KEUNTUNGAN ONLINE
+
RM 0.00
+
+
+
+
+
+

B) BIL TRANSAKSI

+
+
1. PEMBIAYAAN
+
+
2. PENEBUSAN
+
+
3. ANSURAN PEMBIAYAAN
+
+
4. BAYARAN ONLINE
+
+
5. PELANGGAN BARU
+
+
+
+
+ +
+
+
+
+

F) LELONG

+
+
1. LELONG HARI INI
+
+
2. BAKI
+
+
3. RUGI
+
+
4. CAJ LELONG
+
+
5. BIL
+
+
+
+
+
+
+

G) BAYAR BAKI LELONG

+
+
RM
+
+
+
+
+ +
+
+
+
+

H) PERATUSAN PEMBIAYAAN

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MARGIN70%75%80%
1PEMBIAYAAN
2NILAI MARHUN
3BILANGAN
+
+
+
+
+

+
+
+
+
DISEMAK
+
+
+
................................................
+
+
+
+
+
DISAHKAN
+
+
+
................................................
+
+
+
\ No newline at end of file diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php new file mode 100644 index 0000000..397a3e5 --- /dev/null +++ b/resources/views/print/laporan_upah.blade.php @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + {{-- --}} + {{-- --}} + + + + + + {{-- + + + + + + + --}} + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LAPORAN UPAH
TARIKH CETAK: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp +
MULA:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp HINGGA:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp
+ +
+ + + + + + + + + + + @php $counter = 1; $totalbayaran = 0;@endphp + @foreach($advansur as $index=>$item) + @php $totalbayaran += $item['upahDibayar']; @endphp + + + + + + + + + + @php $counter++; @endphp + @endforeach +
BilTarikhNo RujukanTellerPinjamanJBGUpah Dibayar
{{ $counter }}{{ $item['tarikh'] }}{{ $item['norujukan'] }}{{ $item['teller'] }}{{ $item['pinjaman'] }}{{$item['jbg']}}{{$item['upahDibayar']}}
+ +
JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}
+ +
+
+ + + + + + + + + + + + + + + + + + + +
.................................................................. .................................................................. ..................................................................
Disediakan Disemak Disahkan
+ + + + + + diff --git a/routes/web.php b/routes/web.php index fbc9f25..e76aad2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -133,7 +133,7 @@ Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahC Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah'); Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah'); Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah'); -Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah'); +Route::get('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah'); Route::get('/penebusankhazanah/{norujukan}',['as'=>'penebusan.khazanah','uses' => 'PenebusanController@PenebusanKhazanah'])->middleware('auth','khazanah'); Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah'); @@ -181,6 +181,9 @@ Route::put('/simpantuntutbaki',['as'=>'lelong.tuntutbaki','uses'=>'LelongControl //Laporan Baru Route::get('/laporan/lelongan',['as'=>'laporan.lelongan','uses'=>'KhazanahController@laporanLelongan'])->middleware('auth','khazanah'); Route::post('laporan/lelongan/cetak',['as'=>'lelongan.laporancetak','uses'=>'KhazanahController@cetaklaporanLelongan'])->middleware('auth','khazanah'); +Route::get('/laporan/homepage/ansuranupah',['as'=>'homepage.ansuranupah','uses'=>'KhazanahController@PemilihanAnsUpah'])->middleware('auth','khazanah'); +Route::get('/laporan/upah',['as'=>'laporan.upah','uses'=>'KhazanahController@LaporanUpah'])->middleware('auth','khazanah'); +Route::post('laporan/upah/cetak',['as'=>'upah.laporancetak','uses'=>'KhazanahController@cetaklaporan_Upah'])->middleware('auth','khazanah'); Route::get('/laporan/ansuran',['as'=>'laporan.ansuran','uses'=>'KhazanahController@laporanAnsuran'])->middleware('auth','khazanah'); Route::post('laporan/ansuran/cetak',['as'=>'ansuran.laporancetak','uses'=>'KhazanahController@cetakLaporanAnsuran'])->middleware('auth','khazanah'); Route::get('/laporan/pelangganbaru',['as'=>'laporan.pelangganbaru','uses'=>'KhazanahController@laporanPelangganBaru'])->middleware('auth','khazanah'); @@ -199,6 +202,7 @@ Route::get('/laporan/marhunterkumpul',['as'=>'laporan.marhunterkumpul','uses'=>' Route::post('laporan/marhunterkumpul/cetak',['as'=>'marhunterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanMarhunTerkumpul'])->middleware('auth','khazanah'); Route::get('laporan/ringkasanharian/',['as'=>'laporan.ringkasanharian','uses'=>'KhazanahController@laporanRingkasanHarian'])->middleware('auth','khazanah'); Route::get('laporan/ringkasanharian/cetak',['as'=>'ringkasanharian.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanHarian'])->middleware('auth','khazanah'); +Route::get('laporan/ringkasanterkumpul/',['as'=>'laporan.ringkasanterkumpul','uses'=>'KhazanahController@laporanRingkasanTerkumpul'])->middleware('auth','khazanah'); Route::get('laporan/ringkasanterkumpul/cetak',['as'=>'ringkasanterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanTerkumpul'])->middleware('auth','khazanah'); Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah'); Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah'); From c78e125a6f62b79ac953d318faa7b2f3fd535da5 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 6 Jun 2021 13:57:30 +0800 Subject: [PATCH 2/9] fix laporan di ofis --- app/Http/Controllers/KhazanahController.php | 6 ++++-- .../views/print/laporan_ringkasanterkumpulv2.blade.php | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index eead57b..2dc0ae9 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3326,16 +3326,18 @@ class KhazanahController extends Controller $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - $laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/harian',[ + $laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/terkumpul',[ 'kodcaw' => $auth_user['cawangan'], 'mula' => $mula_date, 'akhir' => $hingga_date ])->json(); + dd($laporan_ringkasan); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; // dd($gadai); - return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','hingga_date','api_url')); + return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } public function laporanKawalanStok(){ diff --git a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php index 4dda355..a8e86ba 100644 --- a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php +++ b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php @@ -50,8 +50,8 @@

-

Tarikh Mula: {{ $hingga_date }} Tarikh Hingga : {{ $tarikh_cetak }} Tarikh Cetak : {{ $tarikh_cetak }}

- +

Tarikh Mula: {{ $mula_date }} Tarikh Hingga : {{ $hingga_date }} Tarikh Cetak : {{ $tarikh_cetak }}

+{{ dd($laporan_ringkasan) }}
From c0b1bfa09e5b434cd1abe54f22dd4f9972526392 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Mon, 7 Jun 2021 19:48:38 +0800 Subject: [PATCH 3/9] fix penebusan & gadaian range --- app/Http/Controllers/KhazanahController.php | 70 ++++++++--- .../views/khazanah/laporan/gadaian.blade.php | 91 +++++++++++++-- .../khazanah/laporan/penebusan.blade.php | 109 +++++++++++++++--- .../views/print/laporan_gadaian.blade.php | 14 ++- .../views/print/laporan_penebusan.blade.php | 14 ++- .../laporan_ringkasanterkumpulv2.blade.php | 48 ++++---- 6 files changed, 273 insertions(+), 73 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 2dc0ae9..5a3d6e7 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2770,17 +2770,38 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - if($request->datetimepicker1 == null){ - $gadai_date = $current->toDateString(); + + // dd($request->all()); + + if($request->datemula == null){ + $split_date = explode('-', $request->datehingga); + $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + }else{ - $split_date = explode('-',$request->datetimepicker1); - $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + $split_date = explode('-', $request->datemula); + $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json(); + + if($request->datehingga == null){ + $hingga_date = $request->datemula; + }else{ + $split_date = explode('-', $request->datehingga); + $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + if($request->datemula == null && $request->datehingga == null) + { + $mula_date = $current->toDateString(); + $hingga_date = $current->toDateString(); + } + + // $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json(); + $gadai = Http::get(config('api.url'). '/api/gadailaporanRange/'. $auth_user['cawangan'],['mula' => $mula_date, 'akhir' => $hingga_date])->json(); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; // dd($gadai); - return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','gadai_date','api_url')); + return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } public function laporanPenebusan(){ @@ -2797,20 +2818,37 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - if($request->datetimepicker1 == null){ - $tebus_date = $current->toDateString(); + + if($request->datemula == null){ + $split_date = explode('-', $request->datehingga); + $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + }else{ - $split_date = explode('-',$request->datetimepicker1); - $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + $split_date = explode('-', $request->datemula); + $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json(); - $tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); - $upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); + + if($request->datehingga == null){ + $hingga_date = $request->datemula; + }else{ + $split_date = explode('-', $request->datehingga); + $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + if($request->datemula == null && $request->datehingga == null) + { + $mula_date = $current->toDateString(); + $hingga_date = $current->toDateString(); + } + + $tebus = Http::get(config('api.url'). '/api/tebuslaporanRange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); + $tebuspengasingan = Http::get(config('api.url'). '/api/tebuslaporanjenistawarruqrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); + $upahlama = Http::get(config('api.url'). '/api/advansurdetailsrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; // dd($gadai); - return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama')); + return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama')); } public function laporanLelongan(){ @@ -3332,11 +3370,11 @@ class KhazanahController extends Controller 'akhir' => $hingga_date ])->json(); - dd($laporan_ringkasan); + $laporan_ringkasan = $laporan_ringkasan[0]; $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - // dd($gadai); + return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } diff --git a/resources/views/khazanah/laporan/gadaian.blade.php b/resources/views/khazanah/laporan/gadaian.blade.php index 8ec11b6..db00c4a 100644 --- a/resources/views/khazanah/laporan/gadaian.blade.php +++ b/resources/views/khazanah/laporan/gadaian.blade.php @@ -21,14 +21,21 @@
-
+
@csrf
-
- Tarikh +
+ Mula
- + + +
+ Hingga +
+ + +
@@ -78,7 +85,10 @@ "ordering": false }); $(document).ready( function () { - $('#datetimepicker1').datepicker({ + $('#datemula').datepicker({ + format: 'dd-mm-yyyy' + }); + $('#datehingga').datepicker({ format: 'dd-mm-yyyy' }); var current = new Date(); @@ -88,22 +98,81 @@ var today_date = current_year + '-' +current_month+'-'+current_date; $.ajax({ method:'get', - url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date, + url: api_url + '/api/gadailaporanRange/'+kodcaw, + data:{'mula' : today_date, 'akhir' : today_date }, success: function(gadai){ + console.log(gadai); gadaitable(gadai); } }); }); - $('#datetimepicker1').change(function(){ + $('#datemula').change(function(){ + //mula var input_date = this.value; var split_date = input_date.split('-'); - var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + var mula = mula_date; + + //current time + var hinggainput = $('#datehingga').val(); + + if(hinggainput != '') + { + var input_date = hinggainput; + var split_date = input_date.split('-'); + var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + var hingga = hingga_date; + + }else{ + + var hingga = mula_date; + } + $.ajax({ method:'get', - url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date, - success: function(gadai){ - gadaitable(gadai); + url: api_url + '/api/gadailaporanRange/' + kodcaw, + data:{'mula' : mula, 'akhir' : hingga }, + success: function(panjar){ + gadaitable(panjar); + } + }); + }); + + $('#datehingga').change(function(){ + var input_date = this.value; + var split_date = input_date.split('-'); + var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + var hingga = hingga_date; + + //current time + var mulainput = $('#datemula').val(); + + if(mulainput != '') + { + var input_date = mulainput; + var split_date = input_date.split('-'); + var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + var mula = mula_date; + + }else{ + + + var dulu_date = hingga_date; + + var mula = dulu_date; + } + + $.ajax({ + method:'get', + url: api_url + '/api/gadailaporanRange/' + kodcaw, + data:{'mula' : mula, 'akhir' : hingga }, + success: function(panjar){ + gadaitable(panjar); } }); }); diff --git a/resources/views/khazanah/laporan/penebusan.blade.php b/resources/views/khazanah/laporan/penebusan.blade.php index 5e3534a..e8303aa 100644 --- a/resources/views/khazanah/laporan/penebusan.blade.php +++ b/resources/views/khazanah/laporan/penebusan.blade.php @@ -21,14 +21,21 @@
-
+
@csrf
-
- Tarikh +
+ Mula
- + + +
+ Hingga +
+ + +
@@ -76,7 +83,10 @@ "ordering": true }); $(document).ready( function () { - $('#datetimepicker1').datepicker({ + $('#datemula').datepicker({ + format: 'dd-mm-yyyy' + }); + $('#datehingga').datepicker({ format: 'dd-mm-yyyy' }); var current = new Date(); @@ -86,28 +96,99 @@ var today_date = current_year + '-' +current_month+'-'+current_date; $.ajax({ method:'get', - url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date, + url: api_url + '/api/tebuslaporanRange/' + kodcaw, + data:{'mula' : today_date, 'akhir' : today_date }, success: function(tebus){ tebustable(tebus); } }); }); - $('#datetimepicker1').change(function(){ + // $('#datetimepicker1').change(function(){ + // var input_date = this.value; + // var split_date = input_date.split('-'); + // var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + // $.ajax({ + // method:'get', + // url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date, + // success: function(tebus){ + // tebustable(tebus); + // } + // }); + // $('#pinjamantotal').text('0.00'); + // $('#keuntungantotal').text('0.00'); + // $('#bayarantotal').text('0.00'); + + // }); + + $('#datemula').change(function(){ + //mula var input_date = this.value; var split_date = input_date.split('-'); - var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + var mula = mula_date; + + //current time + var hinggainput = $('#datehingga').val(); + + if(hinggainput != '') + { + var input_date = hinggainput; + var split_date = input_date.split('-'); + var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + var hingga = hingga_date; + + }else{ + + var hingga = mula_date; + } + $.ajax({ method:'get', - url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date, - success: function(tebus){ - tebustable(tebus); + url: api_url + '/api/tebuslaporanRange/' + kodcaw, + data:{'mula' : mula, 'akhir' : hingga }, + success: function(panjar){ + tebustable(panjar); } }); - $('#pinjamantotal').text('0.00'); - $('#keuntungantotal').text('0.00'); - $('#bayarantotal').text('0.00'); + }); + $('#datehingga').change(function(){ + var input_date = this.value; + var split_date = input_date.split('-'); + var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + var hingga = hingga_date; + + //current time + var mulainput = $('#datemula').val(); + + if(mulainput != '') + { + var input_date = mulainput; + var split_date = input_date.split('-'); + var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + var mula = mula_date; + + }else{ + + + var dulu_date = hingga_date; + + var mula = dulu_date; + } + + $.ajax({ + method:'get', + url: api_url + '/api/gadailaporanRange/' + kodcaw, + data:{'mula' : mula, 'akhir' : hingga }, + success: function(panjar){ + tebustable(panjar); + } + }); }); diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 94f43e7..4e63035 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -174,20 +174,26 @@ - Tarikh: + Tarikh Mula: @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date); + $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp + Tarikh Hingga: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @endphp - - Tarikh Cetak @php $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @endphp + + diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index cadd708..c080ede 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -186,16 +186,22 @@ - TARIKH + Tarikh Mula: @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date); + $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp + + + Tarikh Hingga: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @endphp - - diff --git a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php index a8e86ba..f294468 100644 --- a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php +++ b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php @@ -51,7 +51,7 @@

Tarikh Mula: {{ $mula_date }} Tarikh Hingga : {{ $hingga_date }} Tarikh Cetak : {{ $tarikh_cetak }}

-{{ dd($laporan_ringkasan) }} +
@@ -59,15 +59,15 @@

A) LAPORAN TERKUMPUL

1. PEMBIAYAAN
-
+
RM {{ number_format($laporan_ringkasan['total_gadai'],2) }}
2. PENEBUSAN
-
+
RM {{ number_format($laporan_ringkasan['total_tebus'],2) }}
3. ANSURAN PEMBIAYAAN
-
+
RM {{ number_format($laporan_ringkasan['total_ansuran'],2) }}
4. BAYARAN ONLINE
RM 0.00
5. KEUNTUNGAN
-
+
RM {{ number_format($laporan_ringkasan['total_keuntungan'],2) }}
6. KEUNTUNGAN ONLINE
RM 0.00
@@ -78,15 +78,15 @@

B) BIL TRANSAKSI

1. PEMBIAYAAN
-
+
{{ $laporan_ringkasan['bilangan_gadai'] }}
2. PENEBUSAN
-
+
{{ $laporan_ringkasan['bilangan_tebus'] }}
3. ANSURAN PEMBIAYAAN
-
+
{{ $laporan_ringkasan['bilangan_ansuran'] }}
4. BAYARAN ONLINE
-
+
0
5. PELANGGAN BARU
-
+
{{ $laporan_ringkasan['bilangan_customer_baru'] }}
@@ -98,15 +98,15 @@

F) LELONG

1. LELONG HARI INI
-
+
RM {{ number_format($laporan_ringkasan['jumlah_lelong'],2) }}
2. BAKI
-
+
RM {{ number_format($laporan_ringkasan['baki_lelong'],2) }}
3. RUGI
-
+
RM {{ number_format($laporan_ringkasan['rugi_lelong'],2) }}
4. CAJ LELONG
-
+
RM {{ number_format($laporan_ringkasan['cas_lelong'],2) }}
5. BIL
-
+
{{ $laporan_ringkasan['bilangan_lelong'] }}
@@ -143,23 +143,23 @@ 1 PEMBIAYAAN - - - + RM {{ number_format($laporan_ringkasan['gadai_70'],2) }} + RM {{ number_format($laporan_ringkasan['gadai_75'],2) }} + RM {{ number_format($laporan_ringkasan['gadai_80'],2) }} 2 NILAI MARHUN - - - + RM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }} + RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }} + RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }} 3 BILANGAN - - - + {{ $laporan_ringkasan['bilangan_70'] }} + {{ $laporan_ringkasan['bilangan_75'] }} + {{ $laporan_ringkasan['bilangan_80'] }} From 613249590950d70f1dbca3cd37b733e7486e53b1 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Tue, 8 Jun 2021 10:26:28 +0800 Subject: [PATCH 4/9] fix dashboard tpi xsiap lagi --- app/Http/Controllers/KhazanahController.php | 47 ++++++++++++++++++++ resources/views/khazanah/dashboard.blade.php | 22 ++++++++- routes/web.php | 1 + 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 5a3d6e7..df11c45 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -193,6 +193,53 @@ class KhazanahController extends Controller return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','getVault','keseluruhanupahharian','upahsimpan','keuntungan')); } + public function changedatedashboard(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + //Hari Ini + $ringkasanharian = Http::get(config('api.url'). '/api/gadai/laporan/ringkasanharian/'. $auth_user['cawangan'],['tarikh' => $request->tarikh])->json(); + $ringkasanharian = $ringkasanharian[0]; + + $keseluruhanupahharian = $ringkasanharian['lelongupahsimpan'] + $ringkasanharian['tebus'][0]['upahsimpan'] + $ringkasanharian['advansur'][0]['upahsimpan']; + + //Upah Terkumpul + $upahsimpan = Http::get(config('api.url'). '/api/KeuntunganSebenar/'. $auth_user['cawangan'],['tarikh' => $request->tarikh])->json(); + $keuntungan = Http::get(config('api.url'). '/api/UntungRugiCalculation/'. $auth_user['cawangan'],['tarikh' => $request->tarikh])->json(); + + //Peti Besi Cawangan + $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); + + if(sizeof($getVault) == 0) + { + $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); + $getVault = $peti_besi_terkini['bakiakhir']; + + }else{ + $getVault = $getVault[0]['bakiakhir']; + } + + //Check Komuditi + $komuditicheck = Http::get( config('api.url').'/api/komuditi/checkdate',['tarikh' => $request->tarikh])->json(); + + //Dashboardall + $dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json(); + + //Marhun Terkumpul + $marhun = Http::get(config('api.url'). '/api/marhunterkumpul/laporan/'. $auth_user['cawangan'] .'/'. $request->tarikh)->json(); + + $totalmarhun = 0; + + foreach($marhun as $index=>$m) + { + $totalmarhun += $m['n_marhun']; + } + + dd($totalmarhun,$dashboard); + //return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','getVault','keseluruhanupahharian','upahsimpan','keuntungan')); + } + public function alirantunai() { $auth_user = Auth::user(); diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 46c23a3..1ab4eb0 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -25,8 +25,9 @@
- - +
+ +
{{-- First Column --}} @@ -258,6 +259,23 @@ var tablecapaian = $('#table-capaian').DataTable({ "scrollX": true }); + + $('#dashboarddate').datepicker({ + format: 'dd-mm-yyyy' + }); + + $('#dashboarddate').change(function(){ + + $.ajax({ + method:'get', + url: "{{ route('khazanah.dashboarddate') }}", + data:{'kodcaw' : kodcaw,'tarikh' : date }, + success: function(panjar){ + gadaitable(panjar); + } + }); + + }); diff --git a/routes/web.php b/routes/web.php index e76aad2..b731a31 100644 --- a/routes/web.php +++ b/routes/web.php @@ -150,6 +150,7 @@ Route::post('/kemaskinipendahuluan', ['as' =>'khazanah.kemaskiniPendahuluan','us Route::post('/kemaskiniserahan',['as'=>'khazanah.KemaskiniSerahan','uses'=>'KhazanahController@KemaskiniSerahan'])->middleware('auth','khazanah'); Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahController@kakitangan'])->middleware('auth','khazanah'); Route::get('/dashboard',['as'=>'khazanah.dashboard','uses'=>'KhazanahController@dashboard'])->middleware('auth','khazanah'); +Route::get('/dashboarddate',['as'=>'khazanah.dashboarddate','uses'=>'KhazanahController@changedatedashboard'])->middleware('auth','khazanah'); Route::get('/capaian',['as'=>'khazanah.capaian','uses'=>'KhazanahController@capaian'])->middleware('auth','khazanah'); Route::get('/alirantunai',['as'=>'khazanah.alirantunai','uses'=>'KhazanahController@alirantunai'])->middleware('auth','khazanah'); Route::get('/pelangganan',['as'=>'khazanah.pelangganan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah'); From 7da837b13ef59074a1e4294e9d9eb40d42970ac8 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 8 Jun 2021 14:17:53 +0800 Subject: [PATCH 5/9] fix upah skit2 --- resources/views/print/laporan_upah.blade.php | 45 ++++++++++++++++---- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php index 397a3e5..ddf3776 100644 --- a/resources/views/print/laporan_upah.blade.php +++ b/resources/views/print/laporan_upah.blade.php @@ -225,26 +225,55 @@ JBG Upah Dibayar - @php $counter = 1; $totalbayaran = 0;@endphp + @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp @foreach($advansur as $index=>$item) - @php $totalbayaran += $item['upahDibayar']; @endphp + @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman'];$totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp {{ $counter }} {{ $item['tarikh'] }} {{ $item['norujukan'] }} {{ $item['teller'] }} - {{ $item['pinjaman'] }} - {{$item['jbg']}} - {{$item['upahDibayar']}} + {{ number_format($item['pinjaman'],2) }} + {{ $item['jbg'] }} + {{ number_format($item['upahDibayar'],2) }} @php $counter++; @endphp + @if($index+1 < sizeof($advansur)) + @if($item['teller'] != $advansur[$index + 1]['teller']) + + {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ number_format($totalpembiayaanteller,2) }} + + {{ number_format($totalbayaranteller,2) }} + + @php $counter = 0;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp + @endif +@else + + {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ number_format($totalpembiayaanteller,2) }} + + {{ number_format($totalbayaranteller,2) }} + +@endif @endforeach - -
JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}
+

+ + + + + + + + + + + +
Pembiayaan (RM)Upah Dibayar (RM)
JUMLAH KESELURUHAN{{ number_format($totalpembiayaan,2) }}{{ number_format($totalbayaran,2) }}

-
+


From 01a616eab06375c5b04cb69dd3c183d3fd08a586 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Wed, 9 Jun 2021 10:40:24 +0800 Subject: [PATCH 6/9] fix laporan upah skit --- resources/views/print/laporan_upah.blade.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php index ddf3776..cfb975b 100644 --- a/resources/views/print/laporan_upah.blade.php +++ b/resources/views/print/laporan_upah.blade.php @@ -228,6 +228,21 @@ @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp @foreach($advansur as $index=>$item) @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman'];$totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp + @if($index > 0) + @if($item['teller'] != $advansur[$index - 1]['teller']) + + + + @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp + @endif + @else + + + + @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp + + @endif + @@ -246,7 +261,7 @@ - @php $counter = 0;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp + @php @endphp @endif @else From 962238b2f742a42bb8c061e042060affe39fb211 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 9 Jun 2021 17:02:19 +0800 Subject: [PATCH 7/9] fix skit2 --- .../views/homepage/penilai/home.blade.php | 24 +++++++++++++++++++ resources/views/lelongan/index.blade.php | 10 ++++---- resources/views/penebusan/index.blade.php | 3 ++- .../views/print/resittebussebelum.blade.php | 4 ++-- 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index f5fc33d..c43e623 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -170,6 +170,7 @@
+
Teller : {{ $item['teller'] }}
Teller : {{ $item['teller'] }}
{{ $counter }} {{ $item['tarikh'] }} {{ number_format($totalbayaranteller,2) }}
@@ -288,6 +289,29 @@ location.reload(); }); + function checkallfunction(){ + let totalmarhun = 0; + + if(this.checked) { + // Iterate each checkbox + $(':checkbox').each(function() { + let marhun = Number($(this).data("marhun")); + totalmarhun += marhun; + this.checked = true; + }); + $("#btn-serah").prop('disabled', false); + $('#marhunpilih').val(formatter.format(totalmarhun.toFixed(2))); + } else { + $(':checkbox').each(function() { + let marhun = Number($(this).data("marhun")); + totalmarhun -= marhun; + this.checked = false; + }); + $('#marhunpilih').val(0); + $("#btn-serah").prop('disabled', true); + } + } + function checkallfunc(){ let totalmarhun = 0; diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index bf08b1b..302fb3b 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -54,11 +54,11 @@
- +
- +
@@ -239,17 +239,19 @@ let api = "{{ config('api.url') }}"; let nowakil = 0; let jenis = ''; + let mohon = ''; if($("input[name='radlelong']:checked").val() == 'baki') { jenis = 'T'; - let mohon = "Tuntut Baki Lelongan"; + mohon = "Tuntut Baki Lelongan"; }else{ jenis = 'B'; - let mohon = "Bayar Baki Lelongan"; + mohon = "Bayar Baki Lelongan"; } + let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val(); let cajlain = 0.00; let cajlelong = $('#cajlelong').val(); let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,""); diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 120258e..380c22f 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -2234,6 +2234,7 @@ sumberat += parseFloat(value); }); + var jenistebus = $('#sltjenistebus').find(":selected").val(); var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var jbg = "{{ $gadai['tempoh'] }}"; var kadarupah = "{{ $gadai['kadarupah'] }}"; @@ -2273,7 +2274,7 @@ //yang lama "norujukan" : norujukan, "nopelanggan" : nopelanggan, - "jenistebus" : jenisbayarantebus, + "jenistebus" : jenistebus, "jbg" : jbg, "kadarupah" : kadarupah, "nilai_marhun" : nilai_marhun_lama, diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php index 71b07fb..886915b 100644 --- a/resources/views/print/resittebussebelum.blade.php +++ b/resources/views/print/resittebussebelum.blade.php @@ -414,7 +414,7 @@ hr.new5 { - + @@ -506,7 +506,7 @@ hr.new5 { - + From 6c8cfae82d8fdba4d34166ddec295c58dae5bca2 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 14 Jun 2021 15:55:24 +0800 Subject: [PATCH 8/9] khazanah --- app/Http/Controllers/KhazanahController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 4dd0c5c..6421595 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -4197,6 +4197,7 @@ class KhazanahController extends Controller $upahsimpanxtra = $xtra['upahsimpan']; $bakilelongxtra = $xtra['bakilelong']; $utgterkumpulxtra = $xtra['untungrugiterkumpul']; + $rugilelongxtra = -($xtra['kerugianlelong']); } //Terkumpul @@ -4244,7 +4245,7 @@ class KhazanahController extends Controller if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); - if($rugilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); + if($rugilelongxtra != 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]); if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]); if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]); From afd76521a2cf5eb9ebcc7fc92efdf1cdaf67bc01 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 20 Jun 2021 11:28:58 +0800 Subject: [PATCH 9/9] fix penebusan upah --- app/Http/Controllers/KhazanahController.php | 224 +---- app/Http/Controllers/LelongController.php | 324 ++++++- resources/views/aliran_tunai/index.blade.php | 52 +- resources/views/customers/info.blade.php | 36 + resources/views/khazanah/dashboard.blade.php | 4 +- .../views/khazanah/laporan/gadaian.blade.php | 100 +- .../khazanah/laporan/penebusan.blade.php | 203 ++-- resources/views/modal/historytebus.blade.php | 18 + .../views/print/laporan_gadaian.blade.php | 17 +- .../views/print/laporan_lejer_am.blade.php | 892 +++++++++--------- .../views/print/laporan_penebusan.blade.php | 35 +- 11 files changed, 999 insertions(+), 906 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 6421595..105678b 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2817,38 +2817,17 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - - // dd($request->all()); - - if($request->datemula == null){ - $split_date = explode('-', $request->datehingga); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - + if($request->datetarikh == null){ + $gadai_date = $current->toDateString(); }else{ - $split_date = explode('-', $request->datemula); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + $split_date = explode('-',$request->datetarikh); + $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - - if($request->datehingga == null){ - $hingga_date = $request->datemula; - }else{ - $split_date = explode('-', $request->datehingga); - $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - - if($request->datemula == null && $request->datehingga == null) - { - $mula_date = $current->toDateString(); - $hingga_date = $current->toDateString(); - } - - // $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json(); - $gadai = Http::get(config('api.url'). '/api/gadailaporanRange/'. $auth_user['cawangan'],['mula' => $mula_date, 'akhir' => $hingga_date])->json(); - + $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json(); $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - // dd($gadai); - return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); + + return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','gadai_date','api_url')); } public function laporanPenebusan(){ @@ -2859,43 +2838,27 @@ class KhazanahController extends Controller } public function cetakLaporanPenebusan(Request $request){ - // dd($request); - $api_url = config('api.url'); - $auth_user = Auth::user(); - $current = Carbon::now(); - $current = new Carbon(); - $tarikh_cetak = $current->toDateString(); - - if($request->datemula == null){ - $split_date = explode('-', $request->datehingga); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - - }else{ - $split_date = explode('-', $request->datemula); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - - if($request->datehingga == null){ - $hingga_date = $request->datemula; - }else{ - $split_date = explode('-', $request->datehingga); - $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - - if($request->datemula == null && $request->datehingga == null) - { - $mula_date = $current->toDateString(); - $hingga_date = $current->toDateString(); - } - - $tebus = Http::get(config('api.url'). '/api/tebuslaporanRange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); - $tebuspengasingan = Http::get(config('api.url'). '/api/tebuslaporanjenistawarruqrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); - $upahlama = Http::get(config('api.url'). '/api/advansurdetailsrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); - - $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); - $cawangan_detail=$cawangan[0]; - // dd($gadai); - return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama')); + // dd($request); + $api_url = config('api.url'); + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + if($request->datetarikh == null){ + $tebus_date = $current->toDateString(); + }else{ + $split_date = explode('-',$request->datetarikh); + $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json(); + $tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); + $upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); + + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + // dd($gadai); + return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama')); + } public function laporanLelongan(){ @@ -4321,134 +4284,7 @@ class KhazanahController extends Controller //KIRAAN UNTUK LEJER_AM BAYARAN ONLINE & TRANSAKSI BAYARAN UPAH - $getProduct=Http::get(config('api.url').'/api/getProduct/'.$auth_user['cawangan'])->json(); - $glcode=$getProduct[0]['glcode']; - $kodGL=$getProduct[0]['kodgl']; - $glcode_UP=$getProduct[0]['glcode_up']; - - $get_GLCode=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$kodGL])->json(); - - $keterangan=$get_GLCode[0]['descpt']; - $acctype=$get_GLCode[0]['acttype']; - - $total_bayaranOnline=0.0; - - - // $getTotalBayaranOnline=Http::get(config('api.url').'/api/ansuranByrOnline/'.$auth_user['cawangan'])->json(); - // if(sizeof($getTotalBayaranOnline)!=0) - // { - - // $total_bayaranOnline=$getTotalBayaranOnline[0]['cash_in']; - - // } - // else - // { - - // } - - //START UNTUK GLEJER - - //carian_GLejer untuk Bayaran Online (Update Bayaran) - $getBayarOnline_GL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - $keteranganBayaranOnlie=$getBayarOnline_GL[0]['descpt']; //keterangan glcode - $actypeBayaranOnline=$getBayarOnline_GL[0]['acttype']; //keterangan acctype - - $get_current_GLejer_Details_BayaranOnline=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - if(sizeof($get_current_GLejer_Details_BayaranOnline)==0) - { //start kalau xdak data - $jumlah=0.0; - - $getGLedjer=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - - if(sizeof($getGLedjer)==0) - { - $jumlah=0.0; - } - else - { - - //$glejer=$getGLedjer[0]; - $jumlahSemalam=$getGLedjer[0]['jumlah']; - - $hariIniSemalam=$getGLedjer[0]['hariini']; - $jumlah=$jumlahSemalam+$hariIniSemalam; - - - } - - - - $jumlahBulan_ini=0.0; - $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - - if( sizeof($get_GlejerBulan_Tahun)==0) - { - $jumlahBulan_ini=0.0; - } - else - { - $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; - $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; - }//end bulan tahun - $Jumlah_TahunIni=0.0; - $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - if(sizeof($get_Glejer_Tahun)==0) - { - $Jumlah_TahunIni=0.0; - } - else - { - - - $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; - $Jumlah_TahunIni=$jumlah-$JumTahunIni; - - } - - $HariIni=0.0; - $kelmarin=$jumlah-$HariIni; - //insert glejer untuk current date /hari ini - $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - - 'kodcaw' =>$auth_user['cawangan'], - 'glcode' =>$GL_Code_BayaranOnline, - 'descpt' =>$keteranganBayaranOnlie, - 'debit'=>0.0, - 'kredit'=>0.0, - 'hariini'=>$HariIni, - 'kelmarin'=>$kelmarin, - 'jumlah'=>$jumlah, - 'bulanini'=>$jumlahBulan_ini, - 'tahunini'=>$Jumlah_TahunIni, - 'acttype'=> $actypeBayaranOnline - - ]); - - } - else - { - - $get_lejer=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$glcode])->json(); - - if(sizeof($get_lejer)>0) - { - $hariIni=$get_lejer[0]['hariini']; - $jumlah=$get_lejer[0]['kelmarin']; - $kredit=$get_lejer[0]['kredit']; - $debit=$get_lejer[0]['debit']; - $recno=$get_lejer[0]['recno']; - $kredit=$kredit+ $total_bayaranOnline; - $Hari_Ini=$debit-$kredit; - $Kelmarin=$jumlah-$Hari_Ini; - $updateGlejer=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno, - 'debit'=>$debit, - 'kredit'=>$kredit, - 'hariini'=>$Hari_Ini, - 'kelmarin'=>$Kelmarin, - ]); - - } + $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(); @@ -4456,7 +4292,7 @@ class KhazanahController extends Controller $debit=Http::get(config('api.url').'/api/glejer/sumDebit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json(); $kredit=Http::get(config('api.url').'/api/glejer/sumKredit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json(); $data=Http::get(config('api.url').'/api/glejer/getdata/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json(); - } + //return view('print.laporan_imbanduga',compact('tarikh_imbangan','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); return view( 'print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','data','debit','kredit')); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index bcf260a..47f0aa5 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -60,6 +60,61 @@ class LelongController extends Controller } + // public function transaksituntutbaki(Request $request){ + + // $auth_user = Auth::user(); + + // $tuntutbaki = Http::post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [ + // 'batchno' => $request->batchno, + // 'jenis' => $request->jenis, + // 'norujukan' => $request->norujukan, + // 'teller' => $request->teller, + // 'bakipjm' => $request->bakipjm, + // 'bakiupah' => $request->bakiupah, + // 'cajlain' => $request->cajlain, + // 'cajlelong' => $request->cajlelong, + // 'jumlah' => $request->jumlah, + // 'nowakil' => $request->nowakil, + // 'hargajual' => $request->hargajual + // ])->json(); + + // $updatetuntutbaki = Http::put( config('api.url').'/api/tuntutbakiupdate/' . $auth_user['cawangan'] . '/' . $request->norujukan); + + // $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json(); + + // $keluar = $getTunai2['keluar']; + // $baki = $getTunai2['baki']; + // $masuk = $getTunai2['masuk']; + // $bakiawal = $getTunai2['bakiawal']; + // $pendahuluan = $getTunai2['tambah']; + // $serahan = $getTunai2['kurang']; + + // $bakiakhir = $baki; + + // if($request->jenis == 'T'){ + // $bakiakhir -= $request->jumlah; + // } + // else + // { + // $bakiakhir += -($request->jumlah); + // } + + // //masuk dalam tunai aliran + // $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ + // 'kodlaluan' => $request->teller, + // 'keluar' => $keluar, + // 'masuk' => $masuk, + // 'bakiakhir' => $bakiakhir + // ]); + + // if($updatetuntutbaki) + // { + // return response('Berjaya'); + // }else{ + // return response('Gagal'); + // } + // } + public function transaksituntutbaki(Request $request){ $auth_user = Auth::user(); @@ -90,15 +145,280 @@ class LelongController extends Controller $serahan = $getTunai2['kurang']; $bakiakhir = $baki; + $jumlah_byr=$request->jumlah; - if($request->jenis == 'T'){ + if($request->jenis == 'T') + { $bakiakhir -= $request->jumlah; + + + + $KOD_TUNAI='1000/010'; + $BAKI_LELONG='7000/090'; + + $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); + $hariIni_Tunai=$get_lejerTunai[0]['hariini']; + $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; + $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; + $kredit_Tunai=$get_lejerTunai[0]['kredit']; + $debit_Tunai=$get_lejerTunai[0]['debit']; + $recno_Tunai=$get_lejerTunai[0]['recno']; + + + $kredit_Tunai=$kredit_Tunai+$jumlah_byr; + $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; + $updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariIni_Tunai, + 'kelmarin' =>$kelmarin_Tunai, + + ]); + + + $get_KOD_BL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + + $gl_cdetails_bl= $get_KOD_BL[0]; + $keterangan_bl= $get_KOD_BL[0]['descpt']; //keterangan glcode + $actype_bl= $get_KOD_BL[0]['acttype']; + + + $get_current_GLejer_Baki_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + + if(sizeof($get_current_GLejer_Baki_Lelong)==0) + { + $jumlah_bl=0.0; + + $getGLedjer_bl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + if(sizeof($getGLedjer_bl_Semalam)==0) + { + $jumlah_bl=0.0; + } + else + { + + $jumlahSemalam_bl=$getGLedjer_bl_Semalam[0]['jumlah']; + + $hariIniSemalam_bl=$getGLedjer_bl_Semalam[0]['hariini']; + $jumlah_bl=$jumlahSemalam_bl+$hariIniSemalam_bl; + + } + $jumlahBulan_ini_bl=0.0; + $get_GlejerBulan_Tahun_bl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + if( sizeof($get_GlejerBulan_Tahun_bl)==0) + { + $jumlahBulan_ini_bl=0.0; + } + else + { + + $jumlahBulan_ini_bl=$get_GlejerBulan_Tahun_bl[0]['jumlah']; + $jumlahBulan_ini_bl=$jumlah_bl-$jumlahBulan_ini_bl; + + } + + + $Jumlah_TahunIni_bl=0.0; + $get_Glejer_Tahun_bl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + + if(sizeof($get_Glejer_Tahun_bl)==0) + { + $Jumlah_TahunIni_bl=0.0; + } + else + { + $JumTahunIni_bl=$get_Glejer_Tahun_bl[0]['jumlah']; + $Jumlah_TahunIni_bl=$jumlah_bl-$JumTahunIni_bl; + + } + + + $HariIni_bl=0.0; + $kelmarin_bl=$jumlah_bl-$HariIni_bl; + $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ + + 'kodcaw'=>$auth_user['cawangan'], + 'glcode'=>$BAKI_LELONG, + 'descpt'=>$keterangan_bl, + 'debit'=>$jumlah_byr, + 'kredit'=>0.0, + 'hariini'=>$HariIni_bl, + 'kelmarin'=>$kelmarin_bl, + 'jumlah'=>$jumlah_bl, + 'bulanini'=>$jumlahBulan_ini_bl, + 'tahunini'=>$Jumlah_TahunIni_bl, + 'acttype'=> $actype_bl + + ]); + + + } + else + { + + $hariIni_BL=$get_current_GLejer_Baki_Lelong[0]['hariini']; + $kelmarin_BL=$get_current_GLejer_Baki_Lelong[0]['kelmarin']; + $jumlah_BL= $get_current_GLejer_Baki_Lelong[0]['jumlah']; + $kredit_BL=$get_current_GLejer_Baki_Lelong[0]['kredit']; + $debit_BL= $get_current_GLejer_Baki_Lelong[0]['debit']; + $recno_BL=$get_current_GLejer_Baki_Lelong[0]['recno']; + + $debit_BL=$debit_BL+$jumlah_byr; + $hariIni_Tunai=$debit_BL-$kredit_BL; + $kelmarin_BL=$jumlah_BL-$hariIni_BL; + + $updateGlejer_BL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_BL, + 'debit'=>$debit_BL, + 'kredit'=>$kredit_BL, + 'hariini'=>$hariIni_BL, + 'kelmarin' =>$kelmarin_BL, + + ]); + + } + + + } else { $bakiakhir += -($request->jumlah); - } + + $KOD_TUNAI='1000/010'; + $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); + $hariIni_Tunai=$get_lejerTunai[0]['hariini']; + $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; + $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; + $kredit_Tunai=$get_lejerTunai[0]['kredit']; + $debit_Tunai=$get_lejerTunai[0]['debit']; + $recno_Tunai=$get_lejerTunai[0]['recno']; + + + $debit_Tunai=$debit_Tunai+$jumlah_byr; + $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; + $updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariIni_Tunai, + 'kelmarin' =>$kelmarin_Tunai, + + ]); + + + + $RUGI_LELONG='3000/020'; + + $get_KOD_RL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + + $gl_cdetails_rl= $get_KOD_RL[0]; + $keterangan_rl= $get_KOD_RL[0]['descpt']; //keterangan glcode + $actype_rl= $get_KOD_RL[0]['acttype']; + + + $get_current_GLejer_Rugi_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + + if(sizeof($get_current_GLejer_Rugi_Lelong)==0) + { + $jumlah_rl=0.0; + + $getGLedjer_rl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + if(sizeof($getGLedjer_rl_Semalam)==0) + { + $jumlah_rl=0.0; + } + else + { + + $jumlahSemalam_rl=$getGLedjer_rl_Semalam[0]['jumlah']; + + $hariIniSemalam_rl=$getGLedjer_rl_Semalam[0]['hariini']; + $jumlah_rl=$jumlahSemalam_rl+$hariIniSemalam_rl; + + } + $jumlahBulan_ini_rl=0.0; + $get_GlejerBulan_Tahun_rl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + if( sizeof($get_GlejerBulan_Tahun_rl)==0) + { + $jumlahBulan_ini_rl=0.0; + } + else + { + + $jumlahBulan_ini_rl=$get_GlejerBulan_Tahun_rl[0]['jumlah']; + $jumlahBulan_ini_rl=$jumlah_rl-$jumlahBulan_ini_rl; + + } + + + $Jumlah_TahunIni_rl=0.0; + $get_Glejer_Tahun_rl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + + if(sizeof($get_Glejer_Tahun_rl)==0) + { + $Jumlah_TahunIni_rl=0.0; + } + else + { + $JumTahunIni_rl=$get_Glejer_Tahun_rl[0]['jumlah']; + $Jumlah_TahunIni_rl=$jumlah_rl-$JumTahunIni_rl; + + } + + + $HariIni_rl=0.0; + $kelmarin_rl=$jumlah_rl-$HariIni_rl; + $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ + + 'kodcaw'=>$auth_user['cawangan'], + 'glcode'=>$RUGI_LELONG, + 'descpt'=>$keterangan_rl, + 'debit'=>0.0, + 'kredit'=>$jumlah_byr, + 'hariini'=>$HariIni_rl, + 'kelmarin'=>$kelmarin_rl, + 'jumlah'=>$jumlah_rl, + 'bulanini'=>$jumlahBulan_ini_rl, + 'tahunini'=>$Jumlah_TahunIni_rl, + 'acttype'=> $actype_rl + + ]); + + + } + else + { + + $hariIni_RL=$get_current_GLejer_Rugi_Lelong[0]['hariini']; + $kelmarin_RL=$get_current_GLejer_Rugi_Lelong[0]['kelmarin']; + $jumlah_RL= $get_current_GLejer_Rugi_Lelong[0]['jumlah']; + $kredit_RL=$get_current_GLejer_Rugi_Lelong[0]['kredit']; + $debit_RL= $get_current_GLejer_Rugi_Lelong[0]['debit']; + $recno_RL=$get_current_GLejer_Rugi_Lelong[0]['recno']; + + $kredit_RL=$kredit_RL+$jumlah_byr; + $hariIni_Tunai=$debit_RL-$kredit_RL; + $kelmarin_BL=$jumlah_RL-$hariIni_RL; + + $updateGlejer_RL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_RL, + 'debit'=>$debit_RL, + 'kredit'=>$kredit_RL, + 'hariini'=>$hariIni_RL, + 'kelmarin' =>$kelmarin_RL, + + ]); + + } + + + + } //masuk dalam tunai aliran $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ 'kodlaluan' => $request->teller, diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index acddf57..021c54b 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -116,7 +116,7 @@
- +
@@ -292,6 +292,56 @@ var tele = "{{ $auth_user['name'] }}"; + function serahankemaskini(data) + { + + $.ajax({ + type: 'get', + url: "{{ route('periksa.alirantunai') }}", + success: function(balasbalik){ + if(balasbalik == 'sama') + { + openuptambahdanserah(data); + }else{ + + $.ajax({ + type: 'get', + url: "{{ route('kemaskini.alirantunai') }}", + data: { "bakiakhir" : balasbalik['bakisemasa'], + "pendahuluan" : balasbalik['pendahuluan'], + "serahan" : balasbalik['serahan'], + "gadaian" : balasbalik['gadaian'], + "penebusan" : balasbalik['penebusan'] + }, + success: function(balas){ + if(balas == 'berjaya') + { + Swal.fire({ + icon: 'success', + title: 'Berjaya', + text: 'Kemaskini Berjaya!', + closeOnClickOutside: false + }).then(function() { + location.reload(); + }); + + }else{ + Swal.fire({ + icon: 'danger', + title: 'Tidak Berjaya', + text: 'Kemaskini tidak berjaya!', + closeOnClickOutside: false + }).then(function() { + location.reload(); + }); + } + } + }); + } + } + }); + } + function periksaalirantunai() { diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 9876021..cc15ea7 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -470,6 +470,10 @@ "ordering": false }); + var bayaranupah = $('#tablehistoryupah').DataTable({ + "ordering": false + }); + const formatter = new Intl.NumberFormat('en-US', { minimumFractionDigits: 2 }); @@ -821,6 +825,13 @@ rekodasal(gadai); } }); + $.ajax({ + method:'get', + url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid, + success:function(ansuran){ + rekodansuran(ansuran); + } + }); } }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let histid = $('input[name="sudahtebus"]:checked').val(); @@ -858,6 +869,13 @@ rekodasal(gadai); } }); + $.ajax({ + method:'get', + url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid, + success:function(ansuran){ + rekodansuran(ansuran); + } + }); } } } @@ -868,6 +886,24 @@ $('#nilaimarhunmodal').text('RM ' + formatter.format(gadaian[0][0]['nilaimarhun'])); } + function rekodansuran(data){ + var counter = 1; + + bayaranupah.clear().draw(); + $.each(data,function(index,bayaran){ + + var urlroute = '{{ route("resit.advansur", ":id") }}'; + urlroute = urlroute.replace(':id', bayaran['norujukan']); + bayaranupah.row.add([ + counter, + bayaran['tarikh'], + "RM " + bayaran['upahDibayar'], + 'Cetak' + ]).draw(); + counter = counter + 1; + }); + } + function historybayarantable(data){ var counter = 1; diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 1ab4eb0..314c8bf 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -25,9 +25,9 @@
-
+ {{--
-
+
--}}
{{-- First Column --}} diff --git a/resources/views/khazanah/laporan/gadaian.blade.php b/resources/views/khazanah/laporan/gadaian.blade.php index 928f37f..61f1da9 100644 --- a/resources/views/khazanah/laporan/gadaian.blade.php +++ b/resources/views/khazanah/laporan/gadaian.blade.php @@ -21,21 +21,14 @@
-
+
@csrf
-
- Mula +
+ Tarikh
- - -
- Hingga -
- - - +
@@ -85,10 +78,7 @@ "ordering": false }); $(document).ready( function () { - $('#datemula').datepicker({ - format: 'dd-mm-yyyy' - }); - $('#datehingga').datepicker({ + $('#datetarikh').datepicker({ format: 'dd-mm-yyyy' }); var current = new Date(); @@ -98,81 +88,22 @@ var today_date = current_year + '-' +current_month+'-'+current_date; $.ajax({ method:'get', - url: api_url + '/api/gadailaporanRange/'+kodcaw, - data:{'mula' : today_date, 'akhir' : today_date }, + url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date, success: function(gadai){ - console.log(gadai); gadaitable(gadai); } }); }); - $('#datemula').change(function(){ - //mula + $('#datetarikh').change(function(){ var input_date = this.value; var split_date = input_date.split('-'); - var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var mula = mula_date; - - //current time - var hinggainput = $('#datehingga').val(); - - if(hinggainput != '') - { - var input_date = hinggainput; - var split_date = input_date.split('-'); - var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var hingga = hingga_date; - - }else{ - - var hingga = mula_date; - } - + var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; $.ajax({ method:'get', - url: api_url + '/api/gadailaporanRange/' + kodcaw, - data:{'mula' : mula, 'akhir' : hingga }, - success: function(panjar){ - gadaitable(panjar); - } - }); - }); - - $('#datehingga').change(function(){ - var input_date = this.value; - var split_date = input_date.split('-'); - var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var hingga = hingga_date; - - //current time - var mulainput = $('#datemula').val(); - - if(mulainput != '') - { - var input_date = mulainput; - var split_date = input_date.split('-'); - var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var mula = mula_date; - - }else{ - - - var dulu_date = hingga_date; - - var mula = dulu_date; - } - - $.ajax({ - method:'get', - url: api_url + '/api/gadailaporanRange/' + kodcaw, - data:{'mula' : mula, 'akhir' : hingga }, - success: function(panjar){ - gadaitable(panjar); + url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date, + success: function(gadai){ + gadaitable(gadai); } }); }); @@ -190,17 +121,13 @@ tablegadai.clear().draw(); $.each(data,function(index,gadai){ - $.ajax({ - method:'get', - url:api_url + '/api/customers/' + gadai['nokp'], - success:function(customer){ total_pinjaman += Number(gadai['pinjaman']); total_upah12 += Number(gadai['upah12']); total_nm += Number(gadai['nilaimarhun']); total_berat += Number(gadai['berat']); tablegadai.row.add([ counter, - customer['nama'], + gadai['nama'], gadai['nokp'], gadai['norujukan'], formatter.format(gadai['pinjaman']), @@ -213,11 +140,8 @@ $('#nmtotal').text(formatter.format(total_nm.toFixed(2))); $('#berattotal').text(formatter.format(total_berat.toFixed(2))); counter = counter + 1; - } - }); }); } @endsection - diff --git a/resources/views/khazanah/laporan/penebusan.blade.php b/resources/views/khazanah/laporan/penebusan.blade.php index 7c8cbf5..79e3f74 100644 --- a/resources/views/khazanah/laporan/penebusan.blade.php +++ b/resources/views/khazanah/laporan/penebusan.blade.php @@ -21,21 +21,15 @@
-
+
@csrf
-
- Mula +
+ Tarikh
- - -
- Hingga -
- - - + +
@@ -47,17 +41,16 @@
- + - - + @@ -83,115 +76,41 @@ "ordering": true }); $(document).ready( function () { - $('#datemula').datepicker({ - format: 'dd-mm-yyyy' - }); - $('#datehingga').datepicker({ + $('#datetarikh').datepicker({ format: 'dd-mm-yyyy' }); + var current = new Date(); var current_date = current.getDate(); var current_month = current.getMonth()+1; var current_year = current.getFullYear(); - var today_date = current_year + '-' +current_month+'-'+current_date; + var today_date = current_year + '-' + current_month + '-' + current_date; $.ajax({ method:'get', - url: api_url + '/api/tebuslaporanRange/' + kodcaw, - data:{'mula' : today_date, 'akhir' : today_date }, + url: api_url + '/api/tebus/laporan/' +kodcaw+ '/' + today_date, success: function(tebus){ tebustable(tebus); } }); }); - // $('#datetimepicker1').change(function(){ - // var input_date = this.value; - // var split_date = input_date.split('-'); - // var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - // $.ajax({ - // method:'get', - // url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date, - // success: function(tebus){ - // tebustable(tebus); - // } - // }); - // $('#pinjamantotal').text('0.00'); - // $('#keuntungantotal').text('0.00'); - // $('#bayarantotal').text('0.00'); - - // }); - - $('#datemula').change(function(){ - //mula + $('#datetarikh').change(function(){ var input_date = this.value; var split_date = input_date.split('-'); - var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var mula = mula_date; - - //current time - var hinggainput = $('#datehingga').val(); - - if(hinggainput != '') - { - var input_date = hinggainput; - var split_date = input_date.split('-'); - var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var hingga = hingga_date; - - }else{ - - var hingga = mula_date; - } - + var today_date = split_date[2] + '-' + split_date[1] + '-' + split_date[0]; $.ajax({ method:'get', - url: api_url + '/api/tebuslaporanRange/' + kodcaw, - data:{'mula' : mula, 'akhir' : hingga }, - success: function(panjar){ - tebustable(panjar); + url: api_url + '/api/tebus/laporan/' + kodcaw + '/' + today_date, + success: function(tebus){ + tebustable(tebus); } }); + $('#pinjamantotal').text('0.00'); + $('#keuntungantotal').text('0.00'); + $('#bayarantotal').text('0.00'); + }); - $('#datehingga').change(function(){ - var input_date = this.value; - var split_date = input_date.split('-'); - var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var hingga = hingga_date; - - //current time - var mulainput = $('#datemula').val(); - - if(mulainput != '') - { - var input_date = mulainput; - var split_date = input_date.split('-'); - var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var mula = mula_date; - - }else{ - - - var dulu_date = hingga_date; - - var mula = dulu_date; - } - - $.ajax({ - method:'get', - url: api_url + '/api/gadailaporanRange/' + kodcaw, - data:{'mula' : mula, 'akhir' : hingga }, - success: function(panjar){ - tebustable(panjar); - } - }); - }); - - const formatter = new Intl.NumberFormat('en-US', { minimumFractionDigits: 2 }); @@ -201,40 +120,62 @@ var total_pinjaman = 0; var total_keuntungan = 0; var total_bayaran = 0; + + console.log(data); tabletebus.clear().draw(); $.each(data,function(index,tebus){ - $.ajax({ - url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'], - method:'get', - success:function(gadai){ - $.ajax({ - url:api_url + '/api/customers/' + gadai[0][0]['nokp'], - method:'get', - success:function(customer){ - total_pinjaman += parseFloat(tebus['pinjaman']); - total_keuntungan += parseFloat(tebus['bakiupah']); - total_bayaran += parseFloat(tebus['bakipjm']); - tabletebus.row.add([ - counter, - customer['nama'], - gadai[0][0]['nokp'], - tebus['norujukan'], - tebus['t_tebus'], - formatter.format(tebus['pinjaman']), - formatter.format(tebus['bakiupah']), - formatter.format(tebus['bakipjm']) - ]).draw(); - counter = counter + 1; - $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2))); - $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2))); - $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2))); - - } - }); - } - }); + total_pinjaman += parseFloat(tebus['pinjaman']); + total_keuntungan += parseFloat(tebus['bakiupah']); + total_bayaran += parseFloat(tebus['bakipjm']); + tabletebus.row.add([ + counter, + tebus['nama'], + tebus['nokp'], + tebus['norujukan'], + formatter.format(tebus['pinjaman']), + formatter.format(tebus['bakiupah']), + formatter.format(tebus['bakipjm']) + ]).draw(); + counter = counter + 1; + $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2))); + $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2))); + $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2))); }); + + + // $.each(data,function(index,tebus){ + // $.ajax({ + // url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'], + // method:'get', + // success:function(gadai){ + // $.ajax({ + // url:api_url + '/api/customers/' + gadai[0][0]['nokp'], + // method:'get', + // success:function(customer){ + // total_pinjaman += parseFloat(tebus['pinjaman']); + // total_keuntungan += parseFloat(tebus['bakiupah']); + // total_bayaran += parseFloat(tebus['bakipjm']); + // tabletebus.row.add([ + // counter, + // customer['nama'], + // gadai[0][0]['nokp'], + // tebus['norujukan'], + // tebus['t_tebus'], + // formatter.format(tebus['pinjaman']), + // formatter.format(tebus['bakiupah']), + // formatter.format(tebus['bakipjm']) + // ]).draw(); + // counter = counter + 1; + // $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2))); + // $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2))); + // $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2))); + + // } + // }); + // } + // }); + // }); // console.log('Total Pinjam : ' + total_pinjaman); // $('#jumlah_pinjaman').text('RM '+ total_pinjaman); diff --git a/resources/views/modal/historytebus.blade.php b/resources/views/modal/historytebus.blade.php index 0de2db9..d1c0d8e 100644 --- a/resources/views/modal/historytebus.blade.php +++ b/resources/views/modal/historytebus.blade.php @@ -24,6 +24,9 @@
  • Bayaran
    • +
  • + Upah +
  • Rekod
    • @@ -44,6 +47,21 @@
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['jbg'] }} No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['jbg'] }} No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
    BilNamaNama No K/P No RujukanTarikh Tebus Pembiayaan (RM) Keuntungan (RM) Bayaran (RM)
    TOTALTOTAL
    +
    +
    + + + + + + + + + + + +
    BilTarikhUpahAction
    +
    diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 79cb00c..addd58a 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -174,15 +174,9 @@ - + - - @@ -241,12 +235,9 @@ - + diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php index 6ead757..ef6bc18 100644 --- a/resources/views/print/laporan_lejer_am.blade.php +++ b/resources/views/print/laporan_lejer_am.blade.php @@ -1,452 +1,454 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Tarikh Mula: Tarikh: @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) - @endphp Tarikh Hingga: @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); + $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @endphp{{ $counter }} {{$item['norujukan']}} - @php - $customer_detail = Http::get($api_url . '/api/customers/' . $item['nokp'])->json(); - echo $customer_detail['nama']; - @endphp + {{ $item['nama'] }} {{$customer_detail['alamat1']}}{{ $item['alamat1'] }} {{ $item['nokp'] }} {{ $item['masa'] }} {{ number_format($item['berat'],2) }}
    - - - - - - - - - - - - - - - - - -
    -
    - - - -
    LEJER AM
    -
    - - - - - - - - - -
    TARIKH DARI {{$tarikh_mula}} HINGGA {{$tarikh_akhir}}
    - -
    - - + #header td, #customers th { + + padding:4px; + font-size:10px; + } + + #header tr:nth-child(even){background-color: #ffffff;} + + #header tr:hover {background-color: #ddd;} + + #header th { + padding-top: 12px; + padding-bottom: 12px; + text-align: left; + padding:4px; + color:black; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    - - -@foreach($data as $index=>$var) - - - - -@if($var['hariini'] >0 ) - + + + + + + + + + + + + + + + +
    +
    + + + +
    LEJER AM
    +
    + + + + + + + + + +
    TARIKH DARI {{$tarikh_mula}} HINGGA {{$tarikh_akhir}}
    + +
    + + + + + + @foreach($data as $index=>$var) + + + + + @if($var['totalharini'] >0 ) + + @else + -@else - - - @endif - - -@endforeach - - - - + + @endif + + @endforeach - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    KOD GL KETERANGAN DEBIT KREDITJUMLAH
    {{ $var['glcode']}}{{$var['descpt']}} {{$var['total_debit']}} {{$var['total_kredit']}} {{ + + $var['totalharini'] + }} + + + + + + + ( {{ number_format(abs($var['totalharini']),2)}} ) - - - -( {{ number_format(abs($var['hariini']),2)}} ) - - - -
    JUMLAH: @foreach($debit as $db=>$vr) {{ number_format($vr['totalDebit'],2)}} @endforeach - - @foreach($kredit as $db=>$vr) {{ number_format($vr['totalKredit'],2)}} @endforeach - - -@foreach($kredit as $db=>$vr) -@foreach($debit as $db2=>$vr2) - -{{ number_format($vr['totalKredit'] -$vr2['totalDebit'] ,2) }} -@endforeach +
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    DISEMAK DISAHKAN
    .................................................................................................................
    \ No newline at end of file + + + JUMLAH: @foreach($debit as $db=>$vr) {{ number_format($vr['totalDebit'],2)}} @endforeach + + @foreach($kredit as $db=>$vr) {{ number_format($vr['totalKredit'],2)}} @endforeach + + + + @foreach($kredit as $db=>$vr) + @foreach($debit as $db2=>$vr2) + + {{ number_format($vr['totalKredit'] -$vr2['totalDebit'] ,2) }} + @endforeach + @endforeach + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    DISEMAK DISAHKAN
    .................................................................................................................
    \ No newline at end of file diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 0f84d0e..0fcc15a 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -145,12 +145,6 @@ - - - - - - {{-- --}} @@ -186,26 +180,14 @@ - + - - - - - - - @@ -244,18 +226,11 @@ {{ $counter }} {{ $item['norujukan'] }} - - @php - $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json(); - $customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json(); - - echo $customer_detail['nama']; - @endphp - - {{$gadai_detail[0][0]['nokp']}} + {{ $item['nama'] }} + {{ $item['nokp'] }} @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail[0][0]['t_gadai']); + $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_gadai']); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate); @endphp