diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index bc03e26..8d20f27 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2615,13 +2615,6 @@ class KhazanahController extends Controller $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - //new glcode 2021-02-22 - $GL_Code_BayaranOnline="1000/210"; - $GL_CodeUntungSebenar="1000/213"; - $GL_CodeHutangArrahn="1000/211"; - $GL_CodeHutangAkru="2000/007"; - - $auth_user = Auth::user(); $api_url = config('api.url'); @@ -2653,70 +2646,24 @@ class KhazanahController extends Controller //Harta semasa $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruqLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - - // $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); $untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); //Tanggungan Semasa $panjar = Http::get(config('api.url').'/api/CalculationPanjarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - - // $wtd = Http::get(config('api.url').'/api/SerahBakiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - // $cajlelong = Http::get(config('api.url').'/api/cajlelongLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - // $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpulLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - // $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKiraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - // $xtra = Http::get(config('api.url').'/api/XtraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - - //TunaiDitangan Sementara Upah - // if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') - // { - // $advansurharini = Http::get(config('api.url').'/api/advansurhariniLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - // $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini); - // }else{ - // $totaltunaiditangan = $tunaiditangan; - // } - - // $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0; - // //1Stop Special Case - // if($auth_user['cawangan'] === '1STOP') - // { - // $jualan1stop = floatval(129857.00); - // $belian1stop = floatval(122446.50); - // $utgterkumpulxtra = floatval(6727.10); - // $rugilelongxtra = floatval(10079.30); - // $bakilelongxtra = floatval(123.20); - // $cajlelongxtra = floatval(25.50); - // $upahsimpanxtra = floatval(4894.40); - - // }else{ - // $upahsimpanxtra = $xtra['upahsimpan']; - // $bakilelongxtra = $xtra['bakilelong']; - // $utgterkumpulxtra = $xtra['untungrugiterkumpul']; - // $rugilelongxtra = -($xtra['kerugianlelong']); - // $peruntukanhapuskira = ($xtra['phapuskira']); - // } - - //Terkumpul - // $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpulLejer/'. $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); $Debit = []; $TotalDebit = 0; $TotalTunaiDebit = 0; $TotalTunaiKredit = 0; - $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian']; - $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan']; + $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong']; + $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong']; - // $Debit = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; - array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]); array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]); array_push($Debit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Gadai']]); @@ -2727,27 +2674,14 @@ class KhazanahController extends Controller if($panjar['bds'] > 0) array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]); if($panjar['perubatan'] > 0) array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]); if($panjar['keraian'] > 0) array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]); + if($bakilelong['rugilelong'] != 0) array_push($Debit,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); - // // if($penghutangkaki > 0) array_push($Debit,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); - // //array_push($Debit,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); - // if($bayaranpendahuluan > 0) array_push($Debit,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); - // if($rebet > 0) array_push($Debit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); - // if($imbangduga['pindahkekpkb'] > 0) array_push($Debit,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); - // if($peruntukanhapuskira > 0) array_push($Debit,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]); - // if($belian1stop > 0) array_push($Debit,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]); - - // $totalhartasemasa = 0; - // foreach($hartasemasa as $index => $hs) - // { - // $totalhartasemasa += $hs['amaun']; - // } - $TotalDebit = $TotalTunaiKredit + $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian']; + + $TotalDebit = $TotalTunaiKredit + $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong']; $Kredit = []; $TotalKredit = 0; - // // $Kredit = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong]; - array_push($Kredit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiDebit]); array_push($Kredit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Tebus']]); array_push($Kredit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Tebus']]); @@ -2757,41 +2691,10 @@ class KhazanahController extends Controller array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); array_push($Kredit,['glcode' => '5000/007','descpt' => 'Keuntungan Semasa', 'amaun' => $untungrugi]); if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); + if($bakilelong['bakilelong'] != 0) array_push($Kredit,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); - - $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan']; - // if($keuntungan > 0) array_push($Kredit,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); - // if($keuntungansebenar > 0) array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); - // if($rebet > 0) array_push($Kredit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); - // if($panjar['bds'] > 0) array_push($Kredit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]); - // if($panjar['perubatan'] > 0) array_push($Kredit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]); - // if($panjar['keraian'] > 0) array_push($Kredit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]); - // if($bakilelong['bakilelong'] != 0) array_push($Kredit,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); - // if($bakilelong['rugilelong'] != 0) array_push($Kredit,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); - // if($wtd > 0) array_push($Kredit,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]); - // if($cajlelong > 0) array_push($Kredit,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); - // if($untungrugiterkumpul > 0) array_push($Kredit,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); - // if($cajperkhidmatan > 0) array_push($Kredit,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); - // if($cajlelongxtra > 0) array_push($Kredit,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); - // if($upahsimpanxtra > 0) array_push($Kredit,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); - // if($bakilelongxtra > 0) array_push($Kredit,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); - // if($rugilelongxtra != 0) array_push($Kredit,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); - // if($utgterkumpulxtra > 0) array_push($Kredit,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]); - // if($jualan1stop > 0) array_push($Kredit,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]); - // if($hapuskira > 0) array_push($Kredit,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]); - - // $totaltanggungansemasa = 0; - // foreach($tanggungansemasa as $index => $ts) - // { - // $totaltanggungansemasa += $ts['amaun']; - // } - - // $untungrugifield = []; - // array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]); - - // $totaluntungrugi = 0; - // $totaluntungrugi = $totaltanggungansemasa + $untungrugi; - + $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong']; + return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','TotalDebit','Debit','TotalKredit','Kredit')); } diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index cc15ea7..ad42b14 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -430,7 +430,7 @@ event.preventDefault(); return false; }else{ - if(Number(data['unit_komuditi']) < 10000){ + if(Number(data['unit_komuditi']) < 50000){ Swal.fire({ icon: 'error', title: 'Unit Komoditi Berbaki Minumum', diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 9a00108..44da7f9 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -20,14 +20,14 @@ Bil - Tarikh - Baki Awal Tunai + Tarikh + C/F Keluar Masuk - Baki EOD - Baki Akhir Tunai Pendahuluan Serahan + Panjar + B/F @@ -35,14 +35,14 @@ @foreach ($petibesi as $tunai) {{ $loop->iteration }} - {{ $tunai['tarikh'] }} - {{ $tunai['bakiawal'] }} - {{ $tunai['keluar'] }} - {{ $tunai['masuk'] }} - {{ $tunai['bakieod'] }} - {{ $tunai['bakiakhir'] }} - {{ $tunai['pendahuluan'] }} - {{ $tunai['serahan'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }} + {{ number_format($tunai['bakiawal'],2) }} + {{ number_format($tunai['keluar'],2) }} + {{ number_format($tunai['masuk'],2) }} + {{ number_format($tunai['pendahuluan'],2) }} + {{ number_format($tunai['serahan'],2) }} + {{ number_format($tunai['totpanjar'],2) }} + {{ number_format($tunai['bakiakhir'],2) }} @endforeach @@ -206,7 +206,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
-

Tebusan

+

Penebusan

@@ -244,19 +244,19 @@ Bil Tarikh - Baki Awal Tunai - Tunai Diterima - Tunai Dikeluar + C/F + Pendahuluan + Serahan Gadaian - Tebusan - Baki Akhir Tunai + Penebusan + B/F @foreach ($arraytunai[$index1] as $tunai) {{ $loop->iteration }} - {{ $tunai['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }} {{ number_format($tunai['bakiawal'],2) }} {{ number_format($tunai['tambah'],2) }} {{ number_format($tunai['kurang'],2) }} @@ -287,7 +287,7 @@ @foreach($arrayaddtunai[$index1] as $at) {{ $loop->iteration }} - {{ $at['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} {{ number_format($at['tambah'],2) }} {{ number_format($at['kurang'],2) }} {{ $at['nota'] }} @@ -348,7 +348,7 @@ @foreach($arraytuntutbaki[$index1] as $tb) {{ $loop->iteration }} - {{ $tb['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} {{ number_format($tb['cajlelong'],2) }} {{ number_format($tb['jumlah'],2) }} @php if($tb['jenis'] == 'T'){ @@ -396,7 +396,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
-

Tunai Diterima

+

Pendahuluan

@@ -409,7 +409,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}
-

Tunai Dikeluar

+

Serahan

@@ -450,7 +450,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
-

Tebusan

+

Penebusan

@@ -489,19 +489,19 @@ Bil Tarikh - Baki Awal Tunai - Tunai Diterima - Tunai Dikeluar + C/F + Pendahuluan + Serahan Gadaian - Tebusan - Baki Akhir Tunai + Penebusan + B/F @foreach ($arraytunai[$index1] as $tunai) {{ $loop->iteration }} - {{ $tunai['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }} {{ number_format($tunai['bakiawal'],2) }} {{ number_format($tunai['tambah'],2) }} {{ number_format($tunai['kurang'],2) }} @@ -532,7 +532,7 @@ @foreach($arrayaddtunai[$index1] as $at) {{ $loop->iteration }} - {{ $at['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} {{ number_format($at['tambah'],2) }} {{ number_format($at['kurang'],2) }} {{ $at['nota'] }} @@ -594,7 +594,7 @@ @foreach($arraytuntutbaki[$index1] as $tb) {{ $loop->iteration }} - {{ $tb['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} {{ number_format($tb['cajlelong'],2) }} {{ number_format($tb['jumlah'],2) }} @php if($tb['jenis'] == 'T'){ diff --git a/resources/views/khazanah/khazanahserahan.blade.php b/resources/views/khazanah/khazanahserahan.blade.php index 8bc75d3..b26365a 100644 --- a/resources/views/khazanah/khazanahserahan.blade.php +++ b/resources/views/khazanah/khazanahserahan.blade.php @@ -36,7 +36,7 @@
- + Batal
@@ -338,6 +338,8 @@ function triggersubmit() { + $("#terima_transaksi").prop('disabled', true); + $('#form-pendahuluan').trigger('submit'); } diff --git a/resources/views/khazanah/laporan/datalejer_am.blade.php b/resources/views/khazanah/laporan/datalejer_am.blade.php index 64e39ba..932e121 100644 --- a/resources/views/khazanah/laporan/datalejer_am.blade.php +++ b/resources/views/khazanah/laporan/datalejer_am.blade.php @@ -6,7 +6,13 @@
-
{{ __('Data Lejer AM') }}
+
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index e13ee97..dc83920 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -35,10 +35,12 @@ Aging Pemodal
- Stok Audit Bersih + {{-- Stok Audit Bersih --}} + Stok Audit Bersih
- Stok Audit Details + {{-- Stok Audit Details --}} + Stok Audit Details
@@ -61,7 +63,7 @@ Aging Pelanggan
- Lejer Am + Lejer Am
Tuntut Baki diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 3efcaaf..4024ff6 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -155,9 +155,18 @@ var counter = 1; tablepanjar.clear().draw(); + var today = new Date(); + var dd = String(today.getDate()).padStart(2, '0'); + var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0! + var yyyy = today.getFullYear(); + + today = yyyy + '-' + mm + '-' + dd; + $.each(data,function(index,panjar){ - tablepanjar.row.add([ + if(today === panjar['tarikh']) + { + tablepanjar.row.add([ counter, panjar['tarikh'], panjar['deskripsi'], @@ -165,7 +174,20 @@ panjar['bayaran'], '' ]).draw(); - counter = counter + 1; + }else{ + tablepanjar.row.add([ + counter, + panjar['tarikh'], + panjar['deskripsi'], + panjar['kategori'], + panjar['bayaran'], + '' + ]).draw(); + } + + counter = counter + 1; + + }); @@ -198,11 +220,8 @@ if(data === 'berjaya') { - Swal.fire( - 'Deleted!', - 'Your file has been deleted.', - 'success' - ) + location.reload(); + }else{ Swal.fire( 'Tidak Berjaya!', @@ -375,7 +394,14 @@ function kiraanpanjar(datakeyin) function checkformpanjar(formdata) { - + $("#terima_transaksi_keraian").prop('disabled', true); + $("#terima_transaksi_selenggara").prop('disabled', true); + $("#terima_transaksi_belanjaam").prop('disabled', true); + $("#terima_transaksi_perubatan").prop('disabled', true); + $("#terima_transaksi_dapur").prop('disabled', true); + $("#terima_transaksi_pos").prop('disabled', true); + + // let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan; let baucer = $(formdata).find("[name='baucer']").val(); @@ -462,9 +488,18 @@ function kiraanpanjar(datakeyin) if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true) { + + return true; }else{ + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + event.preventDefault(); return; } @@ -553,6 +588,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); @@ -584,6 +626,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); $('#BelanjaamModal').on('hidden.bs.modal', function (e) { @@ -614,6 +663,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); $('#PerubatanModal').on('hidden.bs.modal', function (e) { @@ -644,6 +700,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); @@ -675,6 +738,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); // $('#denominasipanjar').on('hidden.bs.modal', function (e) { diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index d21f6f3..77aa83f 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -21,7 +21,7 @@
- + {{-- @php $date = date('yy-m-d'); @endphp --}} @@ -29,7 +29,7 @@ - + {{-- --}} @@ -39,7 +39,7 @@ - + {{-- @if($date === $gldetail['tarikh']) @else @endif --}} @endforeach @@ -168,6 +168,7 @@ function functerima() { + let amaun = $('#amaun').val(); let keterangan = $('#keterangan').val(); let jenis = $('#radiopendahuluanserahan:checked').val(); @@ -222,6 +223,9 @@ $('#pendahuluanserahanModal').modal('hide'); return true; }else{ + + $("#terima_transaksi").prop('disabled', false); + event.preventDefault(); return false; } @@ -250,6 +254,8 @@ $('#denominasiHQModal').modal('hide'); $('#pendahuluanserahanModal').modal('show'); + $("#terima_transaksi").prop('disabled', false); + $('#bundle1').val(''); $('#totalb1').val(0.00); $('#bundle5').val(''); @@ -267,6 +273,8 @@ function terimapost() { + $("#terima_transaksi").prop('disabled', true); + let amaun = $('#amaundiminta').val(); let keterangan = $('#keterangan').val(); let jenis = $('#radiopendahuluanserahan:checked').val(); @@ -333,6 +341,7 @@ $('#denominasiHQModal').modal('hide'); $('#pendahuluanserahanModal').modal('hide'); + $("#terima_transaksi").prop('disabled', false); }); } diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index bf08b1b..de0ebe8 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -199,6 +199,39 @@ function bayarantuntubaki() { + $.ajax({ + method: 'put', + url: "{{ route('lelong.tuntutbaki') }}", + data: { + "_token": "{{ csrf_token() }}", + 'batchno' : batchno, + 'jenis' : jenis, + 'norujukan' : norujukan, + 'teller' : teller, + 'bakipjm' : bakipjm, + 'bakiupah' : bakiupah, + 'cajlain' : cajlain, + 'cajlelong' : cajlelong, + 'jumlah' : jumlah, + 'nowakil' : nowakil, + 'hargajual' : hargajual + }, + success:function(data){ + let urlroute = '{{ route("resit.tuntutbaki", ":id") }}'; + urlroute = urlroute.replace(':id', norujukan); + Swal.fire( + 'Berjaya!', + 'Tuntut Baki Berjaya', + 'success' + ) .then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ route('customer_info') }}"); + }) + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', @@ -348,4 +381,4 @@ } -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/modal/panjar.blade.php b/resources/views/modal/panjar.blade.php index 651c408..e0ea373 100644 --- a/resources/views/modal/panjar.blade.php +++ b/resources/views/modal/panjar.blade.php @@ -81,7 +81,7 @@
- +
@@ -171,7 +171,7 @@
- +
@@ -262,7 +262,7 @@
- +
@@ -354,7 +354,7 @@
- +
@@ -444,7 +444,7 @@
- +
@@ -523,7 +523,7 @@
- +
diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php index aa519f0..f6a5277 100644 --- a/resources/views/modal/pendahuluanserahan.blade.php +++ b/resources/views/modal/pendahuluanserahan.blade.php @@ -45,7 +45,7 @@
- +
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 529b4d3..71e36e6 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -442,7 +442,7 @@ url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan, dataType: 'json', success:function(data){ - $('#jumlahupah').val(formatter.format(data)); + $('#jumlahupah').val(data); } }); @@ -700,8 +700,8 @@ $("#sltjenistebus").change(function(){ - var jumupah = parseFloat($('#jumlahupah').val()); - var jumupahrebet = parseFloat($('#bayaranditerima').val()); + var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,"")); + var jumupahrebet = parseFloat($('#bayaranditerima').val().replace(/[^0-9.-]+/g,"")); switch($(this).val()) { case "T": diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php index f422965..01b23c6 100644 --- a/resources/views/print/laporan_ringkasanharian.blade.php +++ b/resources/views/print/laporan_ringkasanharian.blade.php @@ -216,6 +216,7 @@ + @@ -225,6 +226,7 @@ + @@ -232,6 +234,7 @@ + @@ -239,6 +242,7 @@ +
Description Pendahuluan (RM) Serahan (RM)TindakanTindakan
{{ $gldetail['descpt'] }} {{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }} {{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }}
70% 75% 80%JUMLAH
{{ 'RM '. number_format($laporan['gadai_70'],2) }} {{ 'RM '. number_format($laporan['gadai_75'],2) }} {{ 'RM '. number_format($laporan['gadai_80'],2) }}{{ 'RM '. number_format($laporan['total_gadaian'],2) }}
2{{ 'RM '. number_format($laporan['nilaimarhun_70'],2) }} {{ 'RM '. number_format($laporan['nilaimarhun_75'],2) }} {{ 'RM '. number_format($laporan['nilaimarhun_80'],2) }}{{ 'RM '. number_format($laporan['total_nm'],2) }}
3{{ $laporan['bilangan_70'] }} {{ $laporan['bilangan_75'] }} {{ $laporan['bilangan_80'] }}{{ number_format($laporan['total_bilangan']) }}
diff --git a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php index 5a1adf5..97f8312 100644 --- a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php +++ b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php @@ -115,9 +115,9 @@

G) BAYAR BAKI LELONG

1. BAKI LELONG
-
{{ 'RM '. number_format($laporan['bayar_baki_lelong'],2) }}
+
{{ 'RM '. number_format($laporan_ringkasan['bayar_baki_lelong'],2) }}
2. RUGI LELONG
-
{{ 'RM '. number_format($laporan['bayar_rugi_lelong'],2) }}
+
{{ 'RM '. number_format($laporan_ringkasan['bayar_rugi_lelong'],2) }}
@@ -139,6 +139,7 @@ 70% 75% 80% + JUMLAH @@ -148,6 +149,7 @@ RM {{ number_format($laporan_ringkasan['gadai_70'],2) }} RM {{ number_format($laporan_ringkasan['gadai_75'],2) }} RM {{ number_format($laporan_ringkasan['gadai_80'],2) }} + RM {{ number_format($laporan_ringkasan['total_gadaian'],2) }} 2 @@ -155,6 +157,7 @@ RM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }} RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }} RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }} + RM {{ number_format($laporan_ringkasan['total_nm'],2) }} 3 @@ -162,6 +165,7 @@ {{ $laporan_ringkasan['bilangan_70'] }} {{ $laporan_ringkasan['bilangan_75'] }} {{ $laporan_ringkasan['bilangan_80'] }} + {{ number_format($laporan_ringkasan['total_bilangan']) }}