From 0f96ef1efea37a47021637c9ddd7b11703150b95 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 16 May 2021 07:22:57 +0800 Subject: [PATCH] fix skit2 --- .../Controllers/AliranTunaiController.php | 13 +- app/Http/Controllers/LelongController.php | 7 +- public/js/main.js | 6 +- resources/views/khazanah/dashboard.blade.php | 4 +- resources/views/khazanah/panjar.blade.php | 204 ++++++++++++++---- .../khazanah/pendahuluanserahanmain.blade.php | 71 +++++- ...enominasimodalpendahuluanserahan.blade.php | 1 + resources/views/modal/panjar.blade.php | 149 +++++++------ .../views/modal/pendahuluanserahan.blade.php | 3 + .../views/print/laporan_gadaian.blade.php | 2 +- .../print/laporan_marhunterkumpul.blade.php | 47 ++-- .../views/print/laporan_penebusan.blade.php | 40 +++- 12 files changed, 408 insertions(+), 139 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 65c86a1..12a57bb 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -1502,14 +1502,23 @@ class AliranTunaiController extends Controller } $totaltuntutbaki = 0; + $bakilelong = 0; + $rugilelong = 0; foreach($tuntutbaki as $index1=>$tb) { + if($tb['jenis'] == 'T') + { + $bakilelong += $tb['jumlah']; + }else{ + $rugilelong += -($tb['jumlah']); + } + $totaltuntutbaki += $tb['jumlah']; } $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama); - $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama); - $gadaian = floatval($totalgadai); + $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama) + $rugilelong; + $gadaian = floatval($totalgadai) + $bakilelong; $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 9f64533..530f5a1 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -91,10 +91,15 @@ class LelongController extends Controller $bakiakhir = $baki; - if($request->jenis == 'T') + if($request->jenis == 'T'){ $bakiakhir -= $request->jumlah; + $keluar += $request->jumlah; + } else + { $bakiakhir += -($request->jumlah); + $masuk += -($request->jumlah); + } //masuk dalam tunai aliran $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ diff --git a/public/js/main.js b/public/js/main.js index 7403408..d422400 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -273,9 +273,8 @@ function kiraanpanjar(datakeyin) var amount = 0; let amountkiraan = 0; - var validate = parseFloat($('#amaundiminta').val()); + var validate = parseFloat($(datakeyin).data('amaun')); - console.log(validate); $.each(arrayambilan, function( index, arr ){ if(arr[0] == idkey) { @@ -286,13 +285,14 @@ function kiraanpanjar(datakeyin) amount += arr[1]; }); - if(amount > validate) + if(Number(valkey) > Number(validate)) { Swal.fire({ icon: 'error', title: 'Amaran', text: 'Jumlah denominasi melebihi kadar' }); + $(datakeyin).val(''); } else { diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 4d34971..46c23a3 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -150,11 +150,11 @@
Keuntungan :
-

RM {{ number_format($keuntungan) }}

+

RM {{ number_format($keuntungan,2) }}

Upah Simpan :
-

RM {{ number_format($upahsimpan) }}

+

RM {{ number_format($upahsimpan,2) }}

diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 190d327..67b0b5e 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -208,52 +208,81 @@ function checkformpanjar(formdata) { + + // let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan; - // let dapur = $('#DapurModal').hasClass('in'); //-- check dapur only for tuntutan; - - // //Variable Initialize - // let baucer = $(formdata).find("[name='baucer']").val(); - // let tarikh = $(formdata).find("[name='tarikh']").val(); + let baucer = $(formdata).find("[name='baucer']").val(); + let tarikh = $(formdata).find("[name='tarikh']").val(); // let tuntutan = $(formdata).find("[name='tuntutan']").val(); - // let tarikhbil = $(formdata).find("[name='tarikhbil']").val(); - // let deskripsi = $(formdata).find("[name='deskripsi']").val(); - // let bayaran = $(formdata).find("[name='bayaran']").val(); + let tarikhbil = $(formdata).find("[name='bil']").val(); + let deskripsi = $(formdata).find("[name='deskripsi']").val(); + let bayaran = $(formdata).find("[name='bayaran']").val(); - // var validation = Array.prototype.filter.call(formdata, function(form) { - // if (form.checkValidity() === false) { - // event.preventDefault(); - // event.stopPropagation(); - // } - // form.classList.add('is-invalid'); - // }); - // if(!tarikh) - // { - // console.log('tarikh xleh'); - // } + let booltarikh = false;let booltuntutan = false; let booltarikhbil = false; let booldeskripsi = false; let boolbayaran = false; - // if(!tarikhbil) - // { - // console.log('tarikh xde'); - // } + if(!tarikh) + { + $(formdata).find("[name='errortarikh']").show(); + $(formdata).find("[name='errortarikh']").text("*Isikan tarikh dalam input!"); + $(formdata).find("[name='tarikh']").addClass('is-invalid'); + $(formdata).find("[name='tarikh']").parent().removeClass("mb-4"); - // if(dapur === false) - // { - // if(!tuntutan) - // console.log('tututan xde'); - // } + booltarikh = true; + } - // if(deskripsi === '' || deskripsi === null) - // { - // console.log('deskripsi xde'); - // } + if(!tarikhbil) + { + $(formdata).find("[name='errorbil']").show(); + $(formdata).find("[name='errorbil']").text("*Isikan tarikh bil dalam input!"); + $(formdata).find("[name='tarikhbil']").addClass('is-invalid'); + $(formdata).find("[name='tarikhbil']").parent().removeClass("mb-4"); + + booltarikhbil = true; + + } + + if(!$.trim(deskripsi)) + { + $(formdata).find("[name='errordeskripsi']").show(); + $(formdata).find("[name='errordeskripsi']").text("*Isikan tarikh deskripsi dalam input!"); + $(formdata).find("[name='deskripsi']").addClass('is-invalid'); + $(formdata).find("[name='deskripsi']").parent().removeClass("mb-4"); + + booldeskripsi = true; + } + + if(!bayaran) + { + $(formdata).find("[name='errorbayaran']").show(); + $(formdata).find("[name='errorbayaran']").text("*Isikan bayaran dalam input!"); + $(formdata).find("[name='bayaran']").addClass('is-invalid'); + $(formdata).find("[name='bayaran']").parent().removeClass("mb-4"); + + boolbayaran = true; + + } + + let errorbaucer = $(formdata).find("[name='errorbaucer']").text(); + let errortarikh = $(formdata).find("[name='errortarikh']").text(); + let errortuntutan = $(formdata).find("[name='errortuntutan']").text(); + let errortarikhbil = $(formdata).find("[name='errorbil']").text(); + let errordeskripsi = $(formdata).find("[name='errordeskripsi']").text(); + let errorbayaran = $(formdata).find("[name='errorbayaran']").text(); - // if(bayaran === null || bayaran === '') - // { - // console.log('bayaran xde'); - // } - // return false; + if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true) + { + event.preventDefault(); + return; + }else{ + return true; + } + + event.preventDefault(); + return; + + } function openupdeno() @@ -314,6 +343,27 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); + }); $('#SelenggaraModal').on('hidden.bs.modal', function (e) { @@ -324,6 +374,26 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); }); $('#BelanjaamModal').on('hidden.bs.modal', function (e) { @@ -334,6 +404,26 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); }); $('#PerubatanModal').on('hidden.bs.modal', function (e) { @@ -344,6 +434,26 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); }); @@ -355,6 +465,26 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); }); // $('#denominasipanjar').on('hidden.bs.modal', function (e) { diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index 951cc09..4d6230a 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -150,12 +150,77 @@ let dtacct = $('#dtacct').val(); let ktacct = $('#ktacct').val(); - $('#amaundiminta').val(amaun); + let boolamaun = false;let boolketerangan = false;let booljenis = false; + if(!amaun) + { + $("[name='erroramaun']").show(); + $("[name='erroramaun']").text("*Isikan amaun dalam input!"); + $("[name='amaun']").addClass('is-invalid'); - $('#denominasiHQModal').modal('show'); - $('#pendahuluanserahanModal').modal('hide'); + boolamaun = true; + }else{ + $("[name='erroramaun']").hide(); + $("[name='amaun']").removeClass('is-invalid'); + + boolamaun = false; + } + + if(!keterangan) + { + $("[name='errorketerangan']").show(); + $("[name='errorketerangan']").text("*Isikan keterangan dalam input!"); + $("[name='keterangan']").addClass('is-invalid'); + + boolketerangan = true; + }else{ + $("[name='errorketerangan']").hide(); + $("[name='keterangan']").removeClass('is-invalid'); + + boolketerangan = false; + } + + if(!jenis) + { + $(".invalid-feedback").show(); + + booljenis = true; + }else{ + $(".invalid-feedback").hide(); + + booljenis = false; + } + + if(boolamaun === false && boolketerangan === false && booljenis === false) + { + console.log('masuk'); + $('#amaundiminta').val(amaun); + $('#denominasiHQModal').modal('show'); + $('#pendahuluanserahanModal').modal('hide'); + return true; + }else{ + event.preventDefault(); + return false; + } + + } + $('#pendahuluanserahanModal').on('hidden.bs.modal', function (e) { + + $(this).find("[name='erroramaun']").hide(); + $(this).find("[name='amaun']").removeClass('is-invalid'); + // $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errorketerangan']").hide(); + $(this).find("[name='keterangan']").removeClass('is-invalid'); + // $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find(".invalid-feedback").hide(); + // $(this).find("[name='errorradio']").removeClass('is-invalid'); + // $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + }); + function funcbatal() { $('#denominasiHQModal').modal('hide'); diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php index 2c9179d..c5f5b76 100644 --- a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php +++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php @@ -118,6 +118,7 @@ + RM100 diff --git a/resources/views/modal/panjar.blade.php b/resources/views/modal/panjar.blade.php index 8621ce9..73ac7aa 100644 --- a/resources/views/modal/panjar.blade.php +++ b/resources/views/modal/panjar.blade.php @@ -8,7 +8,7 @@ -
+ @csrf
@@ -31,60 +31,50 @@
-
- +
+ +
-
- -
- tarikh haruslah dimasukkan ke dalam ni! -
+
+ +
-
- @foreach($usercawangan as $user) @endforeach -
- tarikh haruslah dimasukkan ke dalam ni! -
- {{-- --}} +
-
- -
- tarikh haruslah dimasukkan ke dalam ni! -
+
+ +
-
- -
- tarikh haruslah dimasukkan ke dalam ni! -
+
+ +
- + -
- tarikh haruslah dimasukkan ke dalam ni! -
+
@@ -132,35 +122,40 @@
+
-
- +
+ +
-
- @foreach($usercawangan as $user) @endforeach + {{-- --}}
-
- +
+ +
-
- +
+ +
@@ -169,6 +164,7 @@
+
@@ -216,35 +212,40 @@
+
-
- +
+ +
-
- @foreach($usercawangan as $user) @endforeach + {{-- --}}
-
- +
+ +
-
- +
+ +
@@ -253,6 +254,7 @@
+
@@ -302,35 +304,40 @@
+
-
- +
+ +
-
- @foreach($usercawangan as $user) @endforeach + {{-- --}}
-
- +
+ +
-
- +
+ +
@@ -339,6 +346,7 @@
+
@@ -387,36 +395,41 @@
+
-
- +
+ +
-
- @foreach($usercawangan as $user) @endforeach + {{-- --}}
-
- +
+ +
-
- +
+ +
@@ -472,25 +485,29 @@
+
-
- +
+ +
-
- +
+ +
-
+
{{-- --}} - + +
diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php index a3c84af..aa519f0 100644 --- a/resources/views/modal/pendahuluanserahan.blade.php +++ b/resources/views/modal/pendahuluanserahan.blade.php @@ -13,6 +13,7 @@
+
Pilih Jenis Pendahuluan-Serahan
@@ -31,10 +32,12 @@
+
+
diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 031a6b8..579693b 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -261,7 +261,7 @@ {{ number_format($totalupah12,2) }} - @php $counter = 1; @endphp + @php $counter = 1;$totalupah12 = 0;$totalpinjamanteller = 0;$totalnmteller = 0; @endphp @endif @else diff --git a/resources/views/print/laporan_marhunterkumpul.blade.php b/resources/views/print/laporan_marhunterkumpul.blade.php index 6d5fb6b..19eb078 100644 --- a/resources/views/print/laporan_marhunterkumpul.blade.php +++ b/resources/views/print/laporan_marhunterkumpul.blade.php @@ -222,30 +222,34 @@ N.Marhun Catatan - @php $counter = 1;$totalberat = 0;$totalnm = 0;$masuk = false;$pertama = true;@endphp + @php $counter = 1;$totalberat = 0;$totalnm = 0;$masuk = false;$pertama = true;$totalkeseluruhanmarhun = 0;$totalkeseluruhanpinjaman = 0;$totalkeseluruhanberat = 0;@endphp @foreach($marhun as $index=>$item) + @php $totalkeseluruhanmarhun += floatval($item['n_marhun']);$totalkeseluruhanberat += floatval($item['berat']); @endphp @if($index == 0) + {{-- masuk mula --}} {{ $counter }} {{ $item['norujukan'] }} {{ $item['nokp'] }} {{ $item['nama'] }} - {{ $item['pinjaman'] }} + {{ number_format($item['pinjaman'],2) }} {{ $item['marhun'] }} {{ $item['karat'] }} {{ $item['berat'] }} - {{ $item['n_marhun'] }} + {{ number_format($item['n_marhun'],2) }} @if($index != sizeof($marhun) - 1) + {{-- kedua --}} @if($item['norujukan'] != $marhun[$index+1]['norujukan']) + {{-- ketiga --}} - JUMLAH + JUMLAH {{ number_format($item['berat'],2) }} {{ number_format($item['n_marhun'],2) }} @@ -256,7 +260,7 @@ @endif @endif - @php $counter++; @endphp + @php $counter++; $masuk = true;@endphp @else @if($item['norujukan'] == $marhun[$index-1]['norujukan']) {{-- masuk 1 --}} @@ -267,8 +271,8 @@ {{ $item['marhun'] }} {{ $item['karat'] }} - {{ $item['berat'] }} - {{ $item['n_marhun'] }} + {{ number_format($item['berat'],2) }} + {{ number_format($item['n_marhun'],2) }} @@ -280,21 +284,21 @@ @endphp @else - @php - $totalberat += floatval($item['berat']); - $totalnm += floatval($item['n_marhun']); - @endphp + @php + $totalberat += floatval($item['berat']); + $totalnm += floatval($item['n_marhun']); + @endphp {{-- masuk2 --}} {{ $counter }} {{ $item['norujukan'] }} {{ $item['nokp'] }} {{ $item['nama'] }} - {{ $item['pinjaman'] }} + {{ number_format($item['pinjaman'],2) }} {{ $item['marhun'] }} {{ $item['karat'] }} - {{ $item['berat'] }} - {{ $item['n_marhun'] }} + {{ number_format($item['berat'],2) }} + {{ number_format($item['n_marhun'],2) }} @@ -324,7 +328,7 @@ @endif @if(($index == sizeof($marhun) - 1)) - {{-- kucen --}} + {{-- kucen2 --}} JUMLAH @@ -342,6 +346,19 @@ @endforeach + + + + + JUMLAH + {{ number_format($totalkeseluruhanberat,2) }} + {{ number_format($totalkeseluruhanmarhun,2) }} + + + + + +
diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 0a0a048..442e8cb 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -213,13 +213,15 @@ T Gadai T Tebus JBG + J Tebus Pembiayaan(RM) Upah/Keuntungan(RM) Bayaran(RM) + Jumlah(RM) @php $counter = 1; $totalbayaran = 0;@endphp @foreach($tebus as $index=>$item) - @php $totalbayaran += $item['bakipjm'] @endphp + @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp @if($index > 0) @if($item['teller'] != $tebus[$index - 1]['teller']) @@ -231,7 +233,7 @@ Teller : {{ $item['teller'] }} - @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp + @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp @endif {{ $counter }} @@ -249,33 +251,46 @@ @php $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail[0][0]['t_gadai']); $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) + echo($formattedweddingdate); @endphp - {{$item['t_tebus']}} - {{$item['jbg']}} - {{$item['pinjaman']}} - {{$item['bakiupah']}} - {{$item['bakipjm']}} + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp + + {{ $item['jbg'] }} + {{$item['jenistebus']}} + {{ number_format($item['pinjaman'],2) }} + {{ number_format($item['bakiupah'],2) }} + {{ number_format($item['bakipjm'],2) }} + @php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp @php $counter++; @endphp @php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp + @php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp @if($index+1 < sizeof($tebus)) @if($item['teller'] != $tebus[$index + 1]['teller']) {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ number_format($totalpinjamanteller,2) }} {{ number_format($totalupahteller,2) }} {{ number_format($totalbayaranteller,2) }} + {{ number_format($totaljumlahteller,2) }} - @php $counter = 0; @endphp + @php $counter = 1;$totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0;$totaljumlahteller = 0; @endphp @endif @else {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ number_format($totalpinjamanteller,2) }} {{ number_format($totalupahteller,2) }} {{ number_format($totalbayaranteller,2) }} + {{ number_format($totaljumlahteller,2) }} @endif @endforeach @@ -334,6 +349,13 @@ {{ number_format($upahlama['total'],2) }} Not Applicable + + 0 + Baki Lelong + 0.00 + Not Applicable + Not Applicable +