KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

fix skit2

Browse Source
This commit is contained in:
fifi97
2021-05-16 07:22:57 +08:00
parent e7a9a92699
commit 0f96ef1efe
12 changed files with 408 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+11 -2
View File
@@ -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);
app/Http/Controllers/LelongController.php
+6 -1
View File
@@ -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'], [
public/js/main.js
Vendored
+3 -3
View File
@@ -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
{
resources/views/khazanah/dashboard.blade.php
+2 -2
View File
@@ -150,11 +150,11 @@
<div class="card-body mx-auto">
<div class="row text-justify">
<h5 class="card-title font-weight-bold">Keuntungan : </h5>
<p class="card-text font-weight-bold">RM {{ number_format($keuntungan) }}</p>
<p class="card-text font-weight-bold">RM {{ number_format($keuntungan,2) }}</p>
</div>
<div class="row text-justify">
<h5 class="card-title font-weight-bold">Upah Simpan : </h5>
<p class="card-text font-weight-bold">RM {{ number_format($upahsimpan) }}</p>
<p class="card-text font-weight-bold">RM {{ number_format($upahsimpan,2) }}</p>
</div>
</div>
</div>
resources/views/khazanah/panjar.blade.php
+167 -37
View File
@@ -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) {
resources/views/khazanah/pendahuluanserahanmain.blade.php
+68 -3
View File
@@ -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');
resources/views/modal/denominasimodalpendahuluanserahan.blade.php
+1
View File
@@ -118,6 +118,7 @@
<td></td>
<td></td>
<td></td>
<td td style="display:none;" name="denominasi" class="denominasi"></td>
<td>RM100 </td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring100'] }}" readonly/></td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="kiraan(this)"/> </td>
resources/views/modal/panjar.blade.php
+83 -66
View File
@@ -8,7 +8,7 @@
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" novalidate onsubmit="return checkformpanjar(this);">
<form name="KeraianForm" method="post" action="{{ route('khazanah.createpanjar') }}" novalidate onsubmit="return checkformpanjar(this);">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="keraian"/>
@@ -31,60 +31,50 @@
<div class="col-4">
<label>Baucer No: </label>
</div>
<div class="col-8">
<input type="text" name="baucer" class="form-control-plaintext mb-4 baucer" readonly/>
<div class="col-8 mb-4 flex-wrap">
<input type="text" name="baucer" class="form-control-plaintext baucer" readonly/>
<span name="errorbaucer" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tarikh: </label>
</div>
<div class="col-8">
<input type="date" class="form-control mb-4" name="tarikh" required/>
<div class="invalid-feedback mb-4">
tarikh haruslah dimasukkan ke dalam ni!
</div>
<div class="col-8 mb-4 flex-wrap">
<input type="date" class="form-control" name="tarikh" required/>
<span name="errortarikh" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tuntutan Oleh: </label>
</div>
<div class="col-8">
<select name="tuntutan" class="form-control mb-4" required>
<div class="col-8 mb-4">
<select name="tuntutan" class="form-control" required>
@foreach($usercawangan as $user)
<option value="{{ $user->name }}">{{ $user->name }}</option>
@endforeach
</select>
<div class="invalid-feedback">
tarikh haruslah dimasukkan ke dalam ni!
</div>
{{-- <input type="text" class="form-control mb-4" name="tuntutan"/> --}}
<span name="errortuntutan" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tarikh Bil: </label>
</div>
<div class="col-8">
<input type="date" class="form-control was-validated mb-4" name="tarikhbil" required/>
<div class="invalid-feedback">
tarikh haruslah dimasukkan ke dalam ni!
</div>
<div class="col-8 mb-4 flex-wrap">
<input type="date" class="form-control" name="tarikhbil" required/>
<span name="errorbil" style="color:red;"></span>
</div>
<div class="col-4">
<label>Deskripsi:</label>
</div>
<div class="col-8">
<textarea row="3" name="deskripsi" class="form-control mb-4" minlength='6' maxlength='25' required> </textarea>
<div class="invalid-feedback">
tarikh haruslah dimasukkan ke dalam ni!
</div>
<div class="col-8 mb-4">
<textarea row="3" name="deskripsi" class="form-control" minlength='6' maxlength='25' required> </textarea>
<span name="errordeskripsi" style="color:red;"></span>
</div>
<div class="col-4">
<label>Bayaran (RM): </label>
</div>
<div class="col-8">
<div class="row pl-3">
<input type="text" class="form-control-plaintext col-8" name="bayaran" required readonly/>
<input type="text" class="form-control col-8" name="bayaran" required readonly/>
<button type="button" class="btn btn-primary ml-1 col-3" onclick="openupdeno();">Deno</button>
<div class="invalid-feedback">
tarikh haruslah dimasukkan ke dalam ni!
</div>
<span name="errorbayaran" style="color:red;"></span>
</div>
</div>
</div>
@@ -132,35 +122,40 @@
</div>
<div class="col-8">
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<span name="errorbaucer" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tarikh:
</div>
<div class="col-8">
<input type="date" name="tarikh" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikh" class="form-control"/>
<span name="errortarikh" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tuntutan Oleh:</label>
</div>
<div class="col-8">
<select name="tuntutan" class="form-control mb-4">
<div class="col-8 mb-4">
<select name="tuntutan" class="form-control">
@foreach($usercawangan as $user)
<option value="{{ $user->name }}">{{ $user->name }}</option>
@endforeach
</select>
<span name="errortuntutan" style="color:red;"></span>
{{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
</div>
<div class="col-4">
<label>Tarikh Bil:</label>
</div>
<div class="col-8">
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikhbil" class="form-control"/>
<span name="errorbil" style="color:red;"></span>
</div>
<div class="col-4">
<label>Deskripsi:</label>
</div>
<div class="col-8">
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<div class="col-8 mb-4">
<textarea row="3" name="deskripsi" class="form-control"> </textarea>
<span name="errordeskripsi" style="color:red;"></span>
</div>
<div class="col-4">
<label>Bayaran (RM):</label>
@@ -169,6 +164,7 @@
<div class="row pl-3">
<input type="text" name="bayaran" readonly class="form-control col-8"/>
<button type="button" class="btn btn-primary ml-1 col-3" onclick="openupdeno();">Deno</button>
<span name="errorbayaran" style="color:red;"></span>
</div>
</div>
</div>
@@ -216,35 +212,40 @@
</div>
<div class="col-8">
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<span name="errorbaucer" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tarikh:</label>
</div>
<div class="col-8">
<input type="date" name="tarikh" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikh" class="form-control"/>
<span name="errortarikh" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tuntutan Oleh:</label>
</div>
<div class="col-8">
<select name="tuntutan" class="form-control mb-4">
<div class="col-8 mb-4">
<select name="tuntutan" class="form-control">
@foreach($usercawangan as $user)
<option value="{{ $user->name }}">{{ $user->name }}</option>
@endforeach
</select>
<span name="errortuntutan" style="color:red;"></span>
{{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
</div>
<div class="col-4">
<label>Tarikh Bil:</label>
</div>
<div class="col-8">
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikhbil" class="form-control"/>
<span name="errorbil" style="color:red;"></span>
</div>
<div class="col-4">
<label>Deskripsi:</label>
</div>
<div class="col-8">
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<div class="col-8 mb-4">
<textarea row="3" name="deskripsi" class="form-control"> </textarea>
<span name="errordeskripsi" style="color:red;"></span>
</div>
<div class="col-4">
<label>Bayaran (RM):</label>
@@ -253,6 +254,7 @@
<div class="row pl-3">
<input type="text" name="bayaran" readonly class="form-control col-8"/>
<button type="button" class="btn btn-primary ml-1 col-3" onclick="openupdeno();">Deno</button>
<span name="errorbayaran" style="color:red;"></span>
</div>
</div>
</div>
@@ -302,35 +304,40 @@
</div>
<div class="col-8">
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<span name="errorbaucer" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tarikh:</label>
</div>
<div class="col-8">
<input type="date" name="tarikh" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikh" class="form-control"/>
<span name="errortarikh" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tuntutan Oleh:</label>
</div>
<div class="col-8">
<select name="tuntutan" class="form-control mb-4">
<div class="col-8 mb-4">
<select name="tuntutan" class="form-control">
@foreach($usercawangan as $user)
<option value="{{ $user->name }}">{{ $user->name }}</option>
@endforeach
</select>
<span name="errortuntutan" style="color:red;"></span>
{{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
</div>
<div class="col-4">
<label>Tarikh Bil:</label>
</div>
<div class="col-8">
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikhbil" class="form-control"/>
<span name="errorbil" style="color:red;"></span>
</div>
<div class="col-4">
<label>Deskripsi:</label>
</div>
<div class="col-8">
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<div class="col-8 mb-4">
<textarea row="3" name="deskripsi" class="form-control"> </textarea>
<span name="errordeskripsi" style="color:red;"></span>
</div>
<div class="col-4">
<label>Bayaran (RM):</label>
@@ -339,6 +346,7 @@
<div class="row pl-3">
<input type="text" name="bayaran" readonly class="form-control col-8"/>
<button type="button" class="btn btn-primary ml-1 col-3" onclick="openupdeno();">Deno</button>
<span name="errorbayaran" style="color:red;"></span>
</div>
</div>
</div>
@@ -387,36 +395,41 @@
</div>
<div class="col-8">
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<span name="errorbaucer" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tarikh:</label>
</div>
<div class="col-8">
<input type="date" name="tarikh" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikh" class="form-control"/>
<span name="errortarikh" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tuntutan Oleh:</label>
</div>
<div class="col-8">
<select name="tuntutan" class="form-control mb-4">
<div class="col-8 mb-4">
<select name="tuntutan" class="form-control">
@foreach($usercawangan as $user)
<option value="{{ $user->name }}">{{ $user->name }}</option>
@endforeach
</select>
<span name="errortuntutan" style="color:red;"></span>
{{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
</div>
<div class="col-4">
<label>Tarikh Bil:</label>
</div>
<div class="col-8">
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikhbil" class="form-control"/>
<span name="errorbil" style="color:red;"></span>
</div>
<div class="col-4">
<label>Deskripsi:</label>
</div>
<div class="col-8">
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<div class="col-8 mb-4">
<textarea row="3" name="deskripsi" class="form-control"> </textarea>
<span name="errordeskripsi" style="color:red;"></span>
</div>
<div class="col-4">
<label>Bayaran (RM):</label>
@@ -472,25 +485,29 @@
</div>
<div class="col-8">
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<span name="errorbaucer" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tarikh:</label>
</div>
<div class="col-8">
<input type="date" name="tarikh" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikh" class="form-control"/>
<span name="errortarikh" style="color:red;"></span>
</div>
<div class="col-4">
<label>Tarikh Bil:</label>
</div>
<div class="col-8">
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<div class="col-8 mb-4">
<input type="date" name="tarikhbil" class="form-control"/>
<span name="errorbil" style="color:red;"></span>
</div>
<div class="col-4">
<label>Deskripsi:</label>
</div>
<div class="col-8">
<div class="col-8 mb-4">
{{-- <input type="text" name="deskripsi" class="form-control mb-4"/> --}}
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<textarea row="3" name="deskripsi" class="form-control"> </textarea>
<span name="errordeskripsi" style="color:red;"></span>
</div>
<div class="col-4">
<label>Bayaran (RM):</label>
resources/views/modal/pendahuluanserahan.blade.php
+3
View File
@@ -13,6 +13,7 @@
<div class="text-center mx-auto">
<input type="radio" name="radwang" id="radiopendahuluanserahan" value="pendahuluan"/><label class="ml-2">Wang Pendahuluan Daripada HQ</label>
<input type="radio" name="radwang" id="radiopendahuluanserahan" value="serahan" class="ml-3"/><label class="ml-2">Wang Serahan Kepada HQ</label>
<div class="invalid-feedback">Pilih Jenis Pendahuluan-Serahan</div>
</div>
<div class="text-center mx-auto mt-4">
@@ -31,10 +32,12 @@
<div class="row">
<label class="col-2 mt-2">Keterangan</label>
<input type="text" class="form-control col-8 mt-2" name="keterangan" id="keterangan"/>
<span name="errorketerangan" style="color:red;margin-left:130px;" class="col-12 text-left"></span>
</div>
<div class="row">
<label class="col-2 mt-2">Amaun (RM)</label>
<input type="text" class="form-control col-4 mt-2" name="amaun" id="amaun" onkeypress="return validateformat(event)"/>
<span name="erroramaun" style="color:red;margin-left:130px;" class="col-12 text-left"></span>
</div>
</div>
resources/views/print/laporan_gadaian.blade.php
+1 -1
View File
@@ -261,7 +261,7 @@
<td><b>{{ number_format($totalupah12,2) }} </b></td>
</tr>
@php $counter = 1; @endphp
@php $counter = 1;$totalupah12 = 0;$totalpinjamanteller = 0;$totalnmteller = 0; @endphp
@endif
@else
<tr>
resources/views/print/laporan_marhunterkumpul.blade.php
+32 -15
View File
@@ -222,30 +222,34 @@
<th class="stylela">N.Marhun</th>
<th class="stylela">Catatan</th>
</tr>
@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
<tr>
@if($index == 0)
{{-- <td>masuk mula</td> --}}
<td>{{ $counter }}</td>
<td>{{ $item['norujukan'] }}</td>
<td>{{ $item['nokp'] }}</td>
<td>{{ $item['nama'] }}</td>
<td>{{ $item['pinjaman'] }}</td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td style="border-top:1px solid black;">{{ $item['marhun'] }}</td>
<td style="border-top:1px solid black;">{{ $item['karat'] }}</td>
<td style="border-top:1px solid black;">{{ $item['berat'] }}</td>
<td style="border-right:1px solid black;border-top:1px solid black;">{{ $item['n_marhun'] }}</td>
<td style="border-right:1px solid black;border-top:1px solid black;">{{ number_format($item['n_marhun'],2) }}</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
@if($index != sizeof($marhun) - 1)
{{-- <td>kedua</td> --}}
@if($item['norujukan'] != $marhun[$index+1]['norujukan'])
<tr>
{{-- <td>ketiga</td> --}}
<td class="stylela" colspan="6"></td>
<td class="stylela"> JUMLAH</td>
<td class="stylela" style="font-weight: bold;"> JUMLAH</td>
<td class="stylela"> {{ number_format($item['berat'],2) }}</td>
<td class="stylela" style="border-right:1px solid black;"> {{ number_format($item['n_marhun'],2) }}</td>
<td></td>
@@ -256,7 +260,7 @@
</tr>
@endif
@endif
@php $counter++; @endphp
@php $counter++; $masuk = true;@endphp
@else
@if($item['norujukan'] == $marhun[$index-1]['norujukan'])
{{-- <td>masuk 1</td> --}}
@@ -267,8 +271,8 @@
<td></td>
<td>{{ $item['marhun'] }}</td>
<td>{{ $item['karat'] }}</td>
<td>{{ $item['berat'] }}</td>
<td style="border-right:1px solid black;">{{ $item['n_marhun'] }}</td>
<td>{{ number_format($item['berat'],2) }}</td>
<td style="border-right:1px solid black;">{{ number_format($item['n_marhun'],2) }}</td>
<td></td>
<td></td>
<td></td>
@@ -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
{{-- <td>masuk2</td> --}}
<td style="border-top:1px solid black;">{{ $counter }}</td>
<td style="border-top:1px solid black;">{{ $item['norujukan'] }}</td>
<td style="border-top:1px solid black;">{{ $item['nokp'] }}</td>
<td style="border-top:1px solid black;">{{ $item['nama'] }}</td>
<td style="border-top:1px solid black;">{{ $item['pinjaman'] }}</td>
<td style="border-top:1px solid black;">{{ number_format($item['pinjaman'],2) }}</td>
<td style="border-top:1px solid black;">{{ $item['marhun'] }}</td>
<td style="border-top:1px solid black;">{{ $item['karat'] }}</td>
<td style="border-top:1px solid black;">{{ $item['berat'] }}</td>
<td style="border-right:1px solid black;border-top:1px solid black;">{{ $item['n_marhun'] }}</td>
<td style="border-top:1px solid black;">{{ number_format($item['berat'],2) }}</td>
<td style="border-right:1px solid black;border-top:1px solid black;">{{ number_format($item['n_marhun'],2) }}</td>
<td></td>
<td></td>
<td></td>
@@ -324,7 +328,7 @@
@endif
@if(($index == sizeof($marhun) - 1))
{{-- <td>kucen</td> --}}
{{-- <td>kucen2</td> --}}
<tr>
<td class="stylela" colspan="6"></td>
<td class="stylela"> JUMLAH</td>
@@ -342,6 +346,19 @@
</tr>
@endforeach
<tr>
<td colspan="4"></td>
<td></td>
<td></td>
<td><b>JUMLAH</b></td>
<td>{{ number_format($totalkeseluruhanberat,2) }}</td>
<td style="border-right:1px solid black;">{{ number_format($totalkeseluruhanmarhun,2) }}</td>
<td style="border-top:1px solid black;">
<td style="border-top:1px solid black;">
<td style="border-top:1px solid black;">
<td style="border-top:1px solid black;">
<td style="border-top:1px solid black;">
</tr>
</table>
<br>
resources/views/print/laporan_penebusan.blade.php
+31 -9
View File
@@ -213,13 +213,15 @@
<th>T Gadai</th>
<th>T Tebus</th>
<th>JBG</th>
<th>J Tebus</th>
<th width="6%;">Pembiayaan(RM)</th>
<th width="6%;">Upah/Keuntungan(RM)</th>
<th width="6%;">Bayaran(RM)</th>
<th width="6%;">Jumlah(RM)</th>
</tr>
@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'])
<tr>
@@ -231,7 +233,7 @@
<tr>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
@php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
@endif
<tr>
<td>{{ $counter }}</td>
@@ -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
</td>
<td>{{$item['t_tebus']}}</td>
<td>{{$item['jbg']}}</td>
<td>{{$item['pinjaman']}}</td>
<td>{{$item['bakiupah']}}</td>
<td>{{$item['bakipjm']}}</td>
<td>
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate);
@endphp
</td>
<td>{{ $item['jbg'] }}</td>
<td>{{$item['jenistebus']}}</td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td>{{ number_format($item['bakiupah'],2) }}</td>
<td>{{ number_format($item['bakipjm'],2) }}</td>
<td>@php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
</tr>
@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'])
<tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
<td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
</tr>
@php $counter = 0; @endphp
@php $counter = 1;$totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0;$totaljumlahteller = 0; @endphp
@endif
@else
<tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
<td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
</tr>
@endif
@endforeach
@@ -334,6 +349,13 @@
<td>{{ number_format($upahlama['total'],2) }}</td>
<td> Not Applicable </td>
</tr>
<tr>
<td> 0 </td>
<td>Baki Lelong</td>
<td> 0.00 </td>
<td> Not Applicable </td>
<td> Not Applicable </td>
</tr>
</table>