From 771a2b3356a5cc98f6e9a16e6e9788155d3c8938 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 6 May 2021 11:46:57 +0800 Subject: [PATCH 1/5] fix tambah pinjam --- resources/views/penebusan/index.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 6339641..ca0b6ac 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -1949,8 +1949,9 @@ var ansuran = 0; var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val().replace(/[^0-9.-]+/g,"")); var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val().replace(/[^0-9.-]+/g,"")); - var bakipinjaman = maxpinjaman - parseFloat($('#tambahpinjam').val()); + // var bakipinjaman = maxpinjaman - parseFloat($('#tambahpinjam').val()); var bakiupah = $('#bayaranditerima').val().replace(/[^0-9.-]+/g,""); + var bakipinjaman = parseFloat(pinjaman_lama) + parseFloat(bakiupah); var historygadaian = "{{ $gadai['norujukan'] }}"; var marhun = "{{ $gadai['marhun'] }}"; var total_berat = parseFloat("{{ $gadai['berat'] }}"); From 27da6901fb2ef400fb261cbfac2d2087ccc58fbc Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Thu, 6 May 2021 12:04:54 +0800 Subject: [PATCH 2/5] from server --- app/Http/Controllers/KhazanahController.php | 2 +- resources/views/homepage/khazanah/home.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 4586746..0a17687 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3701,4 +3701,4 @@ class KhazanahController extends Controller return response('Berjaya'); } -} \ No newline at end of file +} diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index bb554a6..9769bbe 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -174,7 +174,7 @@
- Pelanggan + Pelanggan
Laporan From 2542ad3ef33bd2022499cfe0c461456fff512bf4 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 6 May 2021 14:01:49 +0800 Subject: [PATCH 3/5] fix aliran tunai --- .../Controllers/AliranTunaiController.php | 10 +-- app/Http/Controllers/GadaianController.php | 4 + app/Http/Controllers/PenebusanController.php | 8 ++ resources/views/gadaian/index.blade.php | 53 ----------- resources/views/penebusan/index.blade.php | 89 ++++++++----------- 5 files changed, 52 insertions(+), 112 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 62ee3fd..9f1bea6 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -1174,14 +1174,14 @@ class AliranTunaiController extends Controller return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur')); } - public function alirantunaiGadai(Request $request){ + public function alirantunaiGadai(Request $request,$teller){ $auth_user = Auth::user(); - $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan)->json(); + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan_gadai)->json(); $gadai_detail = $gadai[0]; - $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json(); + $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $teller])->json(); $keluar = $getTunai2['keluar']; $baki = $getTunai2['baki']; @@ -1199,8 +1199,8 @@ class AliranTunaiController extends Controller //masuk dalam tunai aliran - $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ - 'kodlaluan' => $request->teller, + $updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ + 'kodlaluan' => $teller, 'keluar' => $keluar, 'masuk' => $masuk, 'bakiakhir' => $bakiakhir diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index d9fd936..7d9bf97 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -12,6 +12,7 @@ use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; use Carbon\Carbon; +use App\Http\Controllers\AliranTunaiController; class GadaianController extends Controller { @@ -19,6 +20,7 @@ class GadaianController extends Controller { $this->middleware('auth'); $this->customerService = New CustomerService(); + $this->AliranTunaiController = New AliranTunaiController(); } public function index(Request $request){ @@ -179,6 +181,8 @@ class GadaianController extends Controller 'teller' => $auth_user['name'] ]); + $this->AliranTunaiController->alirantunaiGadai($request,$auth_user['name']); + $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); return redirect()->route('customer_info'); diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index bad830c..da38505 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; +use App\Http\Controllers\AliranTunaiController; use Carbon\Carbon; @@ -13,6 +14,8 @@ class PenebusanController extends Controller public function __construct() { $this->middleware('auth'); + $this->AliranTunaiController = New AliranTunaiController(); + } public function index($norujukan){ @@ -659,6 +662,9 @@ class PenebusanController extends Controller 'nilai_marhun' => $array1['n_marhun'] ])->json(); } + + $this->AliranTunaiController->alirantunaiTebus($request); + } @@ -800,6 +806,8 @@ class PenebusanController extends Controller } + $this->AliranTunaiController->alirantunaiTebus($request); + return response()->json($updatemarhun,200); diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 220133f..8f2e6d1 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -854,24 +854,6 @@ text: `Komen : ${data.komen}` }).then(function(){ - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.gadai') }}", - async:false, - data:{ - 'norujukan' : norujukan, - 'teller' : teller, - 'pinjaman' : pinjaman, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - $(func).attr("onSubmit","return true;"); $(func).submit(); return true; @@ -989,23 +971,6 @@ title: 'Telah Disahkan' }).then(function(){ - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.gadai') }}", - async:false, - data:{ - 'norujukan' : norujukan, - 'teller' : teller, - 'pinjaman' : pinjaman, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); $(func).attr("onSubmit","return true;"); $(func).submit(); @@ -1050,24 +1015,6 @@ text: 'Gadaian Berjaya Disimpan' }); - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.gadai') }}", - async:false, - data:{ - 'norujukan' : norujukan, - 'teller' : teller, - 'pinjaman' : pinjaman, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - $(func).attr("onSubmit","return true;"); $(func).submit(); return true; diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index ca0b6ac..cdc7a04 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -948,33 +948,45 @@ }, success:function(success_data){ - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.tebus') }}", - async:false, - data:{ - 'norujukan' : norujukan, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); + + if(success_data == 1) + { + $.ajax({ + method: 'put', + url: "{{ route('alirantunai.tebus') }}", + async:false, + data:{ + 'norujukan' : norujukan, + "_token": "{{ csrf_token() }}" + }, + success:function(data){ + console.log(data); + }, error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); - Swal.fire({ - icon: 'success', - title: 'Berjaya!', - text: 'Penebusan Berjaya', - }).then(function() { - window.open(urlroute, '_blank'); - window.location.replace("{{ route('customer_info') }}"); - }) + Swal.fire({ + icon: 'success', + title: 'Berjaya!', + text: 'Penebusan Berjaya', + }).then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ route('customer_info') }}"); + }) + } + else{ + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'norujukan Sudah Ditebus Di Dalam Table Gadai!', + }); + } } }); + ///////////// //End File// /////////// @@ -1899,21 +1911,6 @@ }, success:function(success_data){ - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.tebus') }}", - async:false, - data:{ - 'norujukan' : norujukan, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - var urlroute = '{{ route("resit.tebusseparuh", ":id") }}'; urlroute = urlroute.replace(':id', norujukan); Swal.fire( @@ -2004,22 +2001,6 @@ var urlroute = '{{ route("resit.tambahpinjam", ":id") }}'; urlroute = urlroute.replace(':id', norujukan); - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.tebus') }}", - async:false, - data:{ - 'norujukan' : norujukan, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - Swal.fire( 'Berjaya!', 'Tambah Pinjaman Berjaya!', From fed37463aad63eff17bc2726d3a363eee26ee3da Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Fri, 7 May 2021 17:08:41 +0800 Subject: [PATCH 4/5] fix skit2 laporan --- app/Http/Controllers/KhazanahController.php | 50 ++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 0a17687..f3828ee 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3363,7 +3363,7 @@ class KhazanahController extends Controller $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); //TunaiDitangan Sementara Upah - if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') + if($tarikh_imbangan2 > '2021-04-22' && $tarikh_imbangan2 < '2021-05-05' && $cawangan_detail['kodcaw'] == 'KB2') { $advansurharini = Http::get(config('api.url').'/api/advansurharini/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini); @@ -3377,17 +3377,17 @@ class KhazanahController extends Controller $hartasemasa = []; // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; - array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]); - array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); - array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); - array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); - array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); - array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); - array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); - array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); - array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); - array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); - array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); + if($totaltunaiditangan > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]); + if($pembiayaantawarruq > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); + if($penghutangkaki > 0) array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); + //array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); + if($keuntungan > 0) array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); + if($bayaranpendahuluan > 0) array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); + if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); + if($imbangduga['serahan'] > 0) array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); + if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); + if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); + if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); $totalhartasemasa = 0; foreach($hartasemasa as $index => $hs) @@ -3399,19 +3399,19 @@ class KhazanahController extends Controller // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong]; - array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); - array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); - array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); - array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); - array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]); - array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]); - array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]); - array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); - array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); - array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]); - array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); - array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); - array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); + if($keuntungan > 0) array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); + if($keuntungansebenar > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); + if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); + if($imbangduga['pendahuluan'] > 0) array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); + if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]); + if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]); + if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]); + if($bakilelong['bakilelong'] != 0) array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); + if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); + if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]); + if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); + if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); + if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); $totaltanggungansemasa = 0; foreach($tanggungansemasa as $index => $ts) From fae96770e4d26ce053087e5b77ad2ae857a1dd7a Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 9 May 2021 04:52:06 +0800 Subject: [PATCH 5/5] kemaskini aliran tunai button --- .../Controllers/AliranTunaiController.php | 120 ++++++++++++++- resources/views/aliran_tunai/index.blade.php | 139 ++++++++++++------ routes/web.php | 4 + 3 files changed, 214 insertions(+), 49 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 9f1bea6..18c7541 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -103,6 +103,8 @@ class AliranTunaiController extends Controller $gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json(); + $addtunai = Http::get(config('api.url') . '/api/getAddTunai/' . $auth_user['cawangan'] . '/kodlaluan/',['kodlaluan' => $auth_user['name']])->json(); + $tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'])->json(); $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json(); @@ -1171,7 +1173,7 @@ class AliranTunaiController extends Controller //************************ END LEJER AM********************************** - return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur')); + return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur','addtunai')); } public function alirantunaiGadai(Request $request,$teller){ @@ -1408,6 +1410,122 @@ class AliranTunaiController extends Controller return view('aliran_tunai.laporan.laporanserahan',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','array_requestteller')); } + public function periksaAliranTunai(Request $request) + { + $auth_user = Auth::user(); + + $current = Carbon::now(); + $current = new Carbon(); + + $alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json(); + + $keluar = $alirantunai['keluar']; + $baki = $alirantunai['baki']; + $masuk = $alirantunai['masuk']; + $bakiawal = $alirantunai['bakiawal']; + $pendahuluan = $alirantunai['tambah']; + $serahan = $alirantunai['kurang']; + + $addtunai = Http::get(config('api.url') . '/api/getAddTunai/' . $auth_user['cawangan'] . '/kodlaluan/',['kodlaluan' => $auth_user['name']])->json(); + + // $current->toDateString() + $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json(); + $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json(); + $ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json(); + + $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json(); + $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json(); + + $totalserahan = 0; + $totalpendahuluan = 0; + foreach($addtunai as $index1=>$at) + { + if($at['tambah'] > 0) + { + $totalpendahuluan += $at['tambah']; + } + + if($at['kurang'] > 0) + { + $totalserahan += $at['kurang']; + } + } + + $totalgadai = 0; + foreach($gadai as $index1=>$gad) + { + $totalgadai += $gad['pinjaman']; + } + + $totaltebus = 0; + foreach($tebus as $index1=>$teb) + { + $totaltebus += $teb['bakipjm']; + } + + $totalansuran = 0; + foreach($ansuran as $index1=>$ans) + { + $totalansuran += $ans['duit_masuk']; + } + + $totalupahlama = 0; + foreach($advansur as $index1=>$upahlama) + { + $totalupahlama += $upahlama['upahDiBayar']; + } + + $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama); + $gadaian = floatval($totalgadai); + + $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)); + + $errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false; + + if(number_format($penebusan,2) !== number_format($masuk,2)) + $errorpenebusan = true; + + if(number_format($bakisemasa,2) !== number_format($baki,2)) + $errorbaki = true; + + if(number_format($totalpendahuluan,2) != number_format($pendahuluan,2)) + $errorpendahuluan = true; + + if(number_format($totalserahan,2) != number_format($serahan,2)) + $errorserahan = true; + + if(number_format($gadaian,2) != number_format($keluar,2)) + $errorgadaian = true; + + if($errorpendahuluan === false && $errorserahan === false && $errorgadaian === false && $errorpenebusan === false && $errorbaki === false) + { + return response('sama'); + }else{ + $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($penebusan,2), 'gadaian' => round($gadaian,2), 'bakisemasa' => round($bakisemasa,2)]; + return response()->json($arraykemaskini); + } + } + + public function kemaskiniAliranTunai(Request $request) + { + $auth_user = Auth::user(); + + + $updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ + 'kodlaluan' => $auth_user['name'], + 'keluar'=> $request->gadaian, + 'masuk'=> $request->penebusan, + 'bakiakhir'=> $request->bakiakhir + ]); + + if($updateTunai->status() == 200) + { + return response('berjaya'); + }else{ + return response('gagal'); + } + } + public function kemaskiniupah(Request $request) { $auth_user = Auth::user(); diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index e9bf5a9..3ff3301 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -124,7 +124,7 @@
- {{-- --}} +