buat history and notifikasi
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@include('modal.historybayaran')
|
||||
@include('modal.wakil')
|
||||
|
||||
@section('content')
|
||||
@@ -100,6 +101,7 @@
|
||||
<th>Nilai Marhun</th>
|
||||
<th>Berat/gram</th>
|
||||
<th>Karat</th>
|
||||
<th>Harga</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -113,9 +115,17 @@
|
||||
<td>RM {{ number_format($m['n_marhun'],2) }}</td>
|
||||
<td>{{ $m['berat'] }}</td>
|
||||
<td>{{ $m['karat'] }}</td>
|
||||
<td>RM {{ $m['harga'] }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
<tr>
|
||||
<td colspan="2"><b>JUMLAH</b></td>
|
||||
<td>RM {{ number_format($gadai['nilaimarhun'],2) }}</td>
|
||||
<td>{{ number_format($gadai['berat'],2) }}</td>
|
||||
<td colspan="2"></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@@ -126,14 +136,25 @@
|
||||
<div class="col-12 form-group row">
|
||||
{{-- <div class="col-4"></div> --}}
|
||||
<div class="col-6">
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-4">
|
||||
PINJAMAN(RM)
|
||||
BAKI HARGA JUALAN(RM)
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<input type="text" id="pinjaman" value="{{ $gadai['pinjaman'] }}" class="form-control" readonly/>
|
||||
<input type="text" id="bakihargajualan" value="{{ $gadai['bakihargajualan'] }}" class="form-control" readonly/>
|
||||
</div>
|
||||
</diV>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-4">
|
||||
BAKI PEMBIAYAAN(RM)
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<input type="text" id="pinjaman" value="{{ $gadai['bakipjm'] }}" class="form-control" readonly/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="form-group row">
|
||||
@@ -144,11 +165,20 @@
|
||||
<input type="text" id="jumlahupah" class="form-control" readonly/>
|
||||
</div>
|
||||
</diV>
|
||||
|
||||
<div class="form-group row" id="divtelahdibayar">
|
||||
<div class="col-4">
|
||||
TELAH DIBAYAR(RM)
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<input type="text" id="jumlahtelahdibayar" class="form-control" readonly/>
|
||||
</div>
|
||||
</diV>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="form-group row" id="divbayaran">
|
||||
<div class="col-4">
|
||||
BAYARAN(RM)
|
||||
BAYARAN PEMBIAYAAN(RM)
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<input type="text" id="bayaran" onkeyup="bayarkey(this)" placeholder="0.00" class="form-control" disabled/>
|
||||
@@ -156,7 +186,7 @@
|
||||
</diV>
|
||||
<div class="form-group row" id="divtambahpinjaman">
|
||||
<div class="col-4">
|
||||
TAMBAH PINJAMAN(RM)
|
||||
TAMBAH PEMBIAYAAN(RM)
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<input type="text" id="tambahpinjam" onkeyup="bayarpinjam(this)" placeholder="0.00" class="form-control"/>
|
||||
@@ -168,16 +198,33 @@
|
||||
<input type="text" id="tambahpinjamsebenar" placeholder="0.00" value="{{ $maxgadai }}" class="form-control" disabled/>
|
||||
</div>
|
||||
</diV>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-6">
|
||||
<div class="form-group row" id="divtelahdibayar">
|
||||
<div class="form-group row" id="divbakipinjaman">
|
||||
<div class="col-4">
|
||||
TELAH DIBAYAR(RM)
|
||||
PEMBIAYAAN BARU(RM)
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<input type="text" id="jumlahtelahdibayar" class="form-control" readonly/>
|
||||
<input type="text" id="bakipinjaman" class="form-control" readonly/>
|
||||
</div>
|
||||
</diV>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-6">
|
||||
<div class="form-group row" id="divperludibayar">
|
||||
<div class="col-4">
|
||||
PERLU DIBAYAR(RM)
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<input type="text" id="perludibayar" class="form-control" readonly/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-6">
|
||||
|
||||
<div class="form-group row" id="divpinjamanbaru">
|
||||
<div class="col-4">
|
||||
PINJAMAN BARU(RM)
|
||||
@@ -191,14 +238,6 @@
|
||||
</diV>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="form-group row" id="divperludibayar">
|
||||
<div class="col-4">
|
||||
PERLU DIBAYAR(RM)
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<input type="text" id="perludibayar" class="form-control" readonly/>
|
||||
</div>
|
||||
</diV>
|
||||
<div class="form-group row" id="divbayaranditerima">
|
||||
<div class="col-4">
|
||||
BAYARAN DITERIMA(RM)
|
||||
@@ -207,10 +246,14 @@
|
||||
<input type="text" id="bayaranditerima" class="form-control" readonly/>
|
||||
</div>
|
||||
</diV>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-12">
|
||||
<input type="button" class="float-right btn btn-danger mr-2" value="BATAL" onclick="window.location.replace('{{ url()->previous() }}')">
|
||||
<input type="button" class="float-right btn btn-primary mr-2" value="TERIMA" onclick="bayaransemua()">
|
||||
<input type="button" class="float-left btn btn-warning mr-2" value="HISTORY" onclick="historybayaran()">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@@ -222,25 +265,32 @@
|
||||
|
||||
<script>
|
||||
|
||||
var historybayarandatatable = $('#tablehistorybayaran').DataTable({
|
||||
"ordering": false
|
||||
});
|
||||
|
||||
var api = '<?php echo $api_url ?>';
|
||||
|
||||
$('input[type="checkbox"]').hide();
|
||||
$('#divtambahpinjaman').hide();
|
||||
$('#divpinjamanbaru').hide();
|
||||
$('#divbayaranditerima').hide();
|
||||
$('#divbakipinjaman').hide();
|
||||
|
||||
var array_recno = [];
|
||||
var array_nm = [];
|
||||
var array_marhun = [];
|
||||
var array_berat = [];
|
||||
|
||||
var tarikhtawarruq = new Date("2021/12/10");
|
||||
var tarikhtawarruq = new Date("2021/01/01");
|
||||
var tarikhgadai = new Date("{{ $gadai['t_gadai'] }}");
|
||||
|
||||
|
||||
var kodcaw = "{{ $gadai['kodcaw'] }}";
|
||||
var norujukan = "{{ $gadai['norujukan'] }}";
|
||||
|
||||
var jumlahperlu = 0;
|
||||
var jumlahminima = 0;
|
||||
|
||||
|
||||
$( document ).ready(function() {
|
||||
@@ -261,7 +311,7 @@ function tebusan()
|
||||
|
||||
if(tarikhgadai >= tarikhtawarruq)
|
||||
{
|
||||
|
||||
|
||||
//Upah Tawarruq
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
@@ -281,6 +331,7 @@ function tebusan()
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$('#perludibayar').val(data);
|
||||
alert(data);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -288,6 +339,7 @@ function tebusan()
|
||||
}
|
||||
else if(tarikhgadai < tarikhtawarruq)
|
||||
{
|
||||
|
||||
//Upah Bukan Tawarruq
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
@@ -310,8 +362,6 @@ function tebusan()
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Telah dibayar
|
||||
@@ -343,17 +393,39 @@ function tebusan()
|
||||
|
||||
if(tarikhgadai >= tarikhtawarruq)
|
||||
{
|
||||
alert('separuh bayar tawarruq');
|
||||
//Separuh Bayar Tawarruq
|
||||
$(document).on('click', '#checkmarhun', function(e) {
|
||||
|
||||
var recno = $(this).data('recno');
|
||||
var nilaimarhun = $(this).data('nm');
|
||||
var marhun = $(this).data('marhun');
|
||||
var berat = $(this).data('berat');
|
||||
|
||||
if ($(this).is(':checked')) {
|
||||
array_recno.push(recno);
|
||||
array_nm.push(nilaimarhun);
|
||||
array_marhun.push(marhun);
|
||||
array_berat.push(berat);
|
||||
|
||||
console.log("Nilai Marhun: " + nilaimarhun);
|
||||
|
||||
}
|
||||
else{
|
||||
var rm = array_recno.findIndex(x => x === recno);
|
||||
var rmnilai = array_nm.findIndex(y => y == nilaimarhun);
|
||||
var rmmarhun = array_marhun.findIndex(z => z == marhun);
|
||||
var rmberat = array_berat.findIndex(a => a == berat);
|
||||
|
||||
array_recno.splice(rm);
|
||||
array_nm.splice(rmnilai);
|
||||
array_marhun.splice(rmmarhun);
|
||||
array_berat.splice(rmberat);
|
||||
|
||||
console.log("Nilai Marhun: " + rmnilai);
|
||||
|
||||
|
||||
|
||||
}
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
@@ -363,7 +435,14 @@ if(tarikhgadai >= tarikhtawarruq)
|
||||
"array_recno" : array_recno
|
||||
},
|
||||
success:function(success){
|
||||
$('#perludibayar').val(Number(success.toFixed(2)));
|
||||
alert(success);
|
||||
let bayarz = $('#bayaran').val(Number(success.toFixed(2)));
|
||||
let bakihargajual = $('#bakihargajualan').val();
|
||||
|
||||
$('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()));
|
||||
|
||||
$('#bakipinjaman').val(parseFloat($('#pinjaman').val()) - success);
|
||||
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -382,64 +461,76 @@ if(tarikhgadai >= tarikhtawarruq)
|
||||
|
||||
}
|
||||
else if(tarikhgadai < tarikhtawarruq){
|
||||
//Separuh Bayar Bukan Tawarruq
|
||||
$(document).on('click', '#checkmarhun', function(e) {
|
||||
alert('separuh belum tawarruq');
|
||||
//Separuh Bayar Bukan Tawarruq
|
||||
$(document).on('click', '#checkmarhun', function(e) {
|
||||
|
||||
//checked box
|
||||
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
|
||||
var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
|
||||
//checked box
|
||||
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
|
||||
var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
|
||||
|
||||
|
||||
//jumlah upah
|
||||
var jumupah = parseFloat($('#jumlahupah').val());
|
||||
//jumlah upah
|
||||
var jumupah = parseFloat($('#jumlahupah').val());
|
||||
|
||||
var recno = $(this).data('recno');
|
||||
var nilaimarhun = $(this).data('nm');
|
||||
var marhun = $(this).data('marhun');
|
||||
var berat = $(this).data('berat');
|
||||
var recno = $(this).data('recno');
|
||||
var nilaimarhun = $(this).data('nm');
|
||||
var marhun = $(this).data('marhun');
|
||||
var berat = $(this).data('berat');
|
||||
|
||||
if ($(this).is(':checked')) {
|
||||
array_recno.push(recno);
|
||||
array_nm.push(nilaimarhun);
|
||||
array_marhun.push(marhun);
|
||||
array_berat.push(berat);
|
||||
if ($(this).is(':checked')) {
|
||||
array_recno.push(recno);
|
||||
array_nm.push(nilaimarhun);
|
||||
array_marhun.push(marhun);
|
||||
array_berat.push(berat);
|
||||
|
||||
}
|
||||
else{
|
||||
var rm = array_recno.findIndex(x => x === recno);
|
||||
var rmnilai = array_nm.findIndex(y => y == nilaimarhun);
|
||||
var rmmarhun = array_marhun.findIndex(z => z == marhun);
|
||||
var rmberat = array_berat.findIndex(a => a == berat);
|
||||
console.log("Nilai Marhun: " + nilaimarhun);
|
||||
|
||||
array_recno.splice(rm);
|
||||
array_nm.splice(rmnilai);
|
||||
array_marhun.splice(rmmarhun);
|
||||
array_berat.splice(rmberat);
|
||||
}
|
||||
else{
|
||||
var rm = array_recno.findIndex(x => x === recno);
|
||||
var rmnilai = array_nm.findIndex(y => y == nilaimarhun);
|
||||
var rmmarhun = array_marhun.findIndex(z => z == marhun);
|
||||
var rmberat = array_berat.findIndex(a => a == berat);
|
||||
|
||||
}
|
||||
array_recno.splice(rm);
|
||||
array_nm.splice(rmnilai);
|
||||
array_marhun.splice(rmmarhun);
|
||||
array_berat.splice(rmberat);
|
||||
|
||||
if (checkedOne == false) {
|
||||
$('#perludibayar').val(jumupah);
|
||||
}
|
||||
else
|
||||
{
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
url: api + '/api/tebusseparuhbukantawarruq/' + kodcaw + '/' + norujukan,
|
||||
dataType: 'json',
|
||||
data:{
|
||||
"array_recno" : array_recno
|
||||
},
|
||||
success:function(success){
|
||||
$('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()));
|
||||
jumlahperlu = Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val());
|
||||
},
|
||||
error: function (request, status, error) {
|
||||
console.log(request.responseText);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
console.log("Nilai Marhun: " + rmnilai);
|
||||
|
||||
}
|
||||
|
||||
if (checkedOne == false) {
|
||||
$('#perludibayar').val(jumupah);
|
||||
$('#bayaran').val(jumupah);
|
||||
}
|
||||
else
|
||||
{
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
url: api + '/api/tebusseparuhbukantawarruq/' + kodcaw + '/' + norujukan,
|
||||
dataType: 'json',
|
||||
data:{
|
||||
"array_recno" : array_recno
|
||||
},
|
||||
success:function(success){
|
||||
jumlahminima = Number(success.toFixed(2));
|
||||
|
||||
$('#bayaran').val(jumlahminima);
|
||||
|
||||
$('#bakipinjaman').val($('#pinjaman').val() - jumlahminima);
|
||||
|
||||
$('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()));
|
||||
jumlahperlu = Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val());
|
||||
},
|
||||
error: function (request, status, error) {
|
||||
console.log(request.responseText);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -457,6 +548,7 @@ $("#sltjenistebus").change(function(){
|
||||
$('#divtambahpinjaman').hide();
|
||||
$('#divpinjamanbaru').hide();
|
||||
$('#divbayaranditerima').hide();
|
||||
$('#divbakipinjaman').hide();
|
||||
|
||||
$('#divtelahdibayar').show();
|
||||
$('#divbayaran').show();
|
||||
@@ -472,6 +564,7 @@ $("#sltjenistebus").change(function(){
|
||||
$('#divtambahpinjaman').hide();
|
||||
$('#divpinjamanbaru').hide();
|
||||
$('#divbayaranditerima').hide();
|
||||
$('#divbakipinjaman').hide();
|
||||
|
||||
$('#divtelahdibayar').show();
|
||||
$('#divbayaran').show();
|
||||
@@ -489,6 +582,7 @@ $("#sltjenistebus").change(function(){
|
||||
$('#divpinjamanbaru').hide();
|
||||
$('#divbayaranditerima').hide();
|
||||
|
||||
$('#divbakipinjaman').show();
|
||||
$('#divtelahdibayar').show();
|
||||
$('#divbayaran').show();
|
||||
$('#divperludibayar').show();
|
||||
@@ -505,6 +599,7 @@ $("#sltjenistebus").change(function(){
|
||||
$('#divbayaranditerima').show();
|
||||
|
||||
$('#divtelahdibayar').hide();
|
||||
$('#divbakipinjaman').hide();
|
||||
$('#divbayaran').hide();
|
||||
$('#divperludibayar').hide();
|
||||
|
||||
@@ -545,8 +640,15 @@ function bayarkey(e)
|
||||
}
|
||||
else if($('#sltjenistebus').find(":selected").val() == 'S')
|
||||
{
|
||||
|
||||
let byr = $(e).val();
|
||||
let total = 0;
|
||||
let pdbyr = 0;
|
||||
|
||||
pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val());
|
||||
total = $('#pinjaman').val() - byr;
|
||||
|
||||
$('#perludibayar').val(pdbyr);
|
||||
$('#bakipinjaman').val(total);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -637,7 +739,7 @@ function bayaransemua()
|
||||
|
||||
$.ajax({
|
||||
method:'PUT',
|
||||
url: api + '/api/gadai/' + kodcaw + '/' + norujukan,
|
||||
url: api + '/api/gadai/' + kodcaw + '/norujukan/' + norujukan,
|
||||
data:{
|
||||
"bayaran" : bayar
|
||||
},
|
||||
@@ -772,7 +874,6 @@ function bayaransemua()
|
||||
{
|
||||
if (value.match(array_marhun[i])) {
|
||||
console.log("value: " + value + " index :" + index +" marhun : " + array_marhun[i]);
|
||||
console.log('true');
|
||||
test.splice(index,1);
|
||||
countarrayerror++;
|
||||
|
||||
@@ -799,10 +900,10 @@ function bayaransemua()
|
||||
var kadarupah = "{{ $gadai['kadarupah'] }}";
|
||||
var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
|
||||
var nilai_marhun = parseFloat("{{ $gadai['nilaimarhun'] }}") - sumnilaimarhun;
|
||||
var pinjamanbaru = (parseFloat("{{ $gadai['pinjaman'] }}")) - lebihan;
|
||||
var pinjamanbaru = $('#bakipinjaman').val();
|
||||
var ansuran = 0;
|
||||
var addpinjaman = 0;
|
||||
var bakipinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#perludibayar').val());
|
||||
var bakipinjaman = parseFloat("{{ $gadai['pinjaman'] }}");
|
||||
var bakiupah = 0;
|
||||
var historygadaian = "{{ $gadai['norujukan'] }}";
|
||||
var marhun = "{{ $gadai['marhun'] }}";
|
||||
@@ -812,6 +913,15 @@ function bayaransemua()
|
||||
var marhun_detail = marhun_baru;
|
||||
var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length;
|
||||
|
||||
console.log("Pinjaman Baru Sekali Lagi: " + pinjamanbaru);
|
||||
// console.log('lebihan : ' + lebihan + ' ');
|
||||
console.log("No Pelanggan:" + nopelanggan + " " + "jenistebus:" + jenistebus + " " + "jbg:" + jbg + " " + "kadarupah:" + kadarupah + " ");
|
||||
console.log("nilai_marhun_lama:" + nilai_marhun_lama + " " + "nilai_marhun:" + nilai_marhun + " " + "pinjamanbaru:" + pinjamanbaru + " " + "bakipinjaman:" + bakipinjaman + " ");
|
||||
console.log("historygadaian:" + historygadaian + " " + "marhun:" + marhun + " " + "total_berat:" + total_berat + " " + "pinjaman:" + pinjaman + " ");
|
||||
console.log("marhun_detail: " + marhun_detail + "kuantiti_marhun: " + kuantiti_marhun);
|
||||
|
||||
|
||||
return;
|
||||
|
||||
var kadarupahbaru = 0;
|
||||
|
||||
@@ -1140,6 +1250,61 @@ function ubahwakil(e)
|
||||
$(e).attr( "onclick", "wakilfunction(this)");
|
||||
}
|
||||
|
||||
|
||||
function historybayaran()
|
||||
{
|
||||
// $.ajax({
|
||||
// method: 'get',
|
||||
// url: 'http://localhost:8000/api/listpenebusanhistory/ALS',
|
||||
// data: {
|
||||
// "norujukan" : norujukan
|
||||
// },
|
||||
// success:function(data)
|
||||
// {
|
||||
// alert(data);
|
||||
// $('#historybayaranModal').modal();
|
||||
// }
|
||||
// });
|
||||
|
||||
$.ajax({
|
||||
method: 'get',
|
||||
url: 'http://localhost:8000/api/transaction/' + norujukan,
|
||||
success: function(data)
|
||||
{
|
||||
historybayarantable(data);
|
||||
$('#historybayaranModal').modal();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
function historybayarantable(data){
|
||||
var counter = 1;
|
||||
|
||||
historybayarandatatable.clear().draw();
|
||||
$.each(data,function(index,bayaran){
|
||||
|
||||
var urlroute = '{{ route("resit.ansuran", ":id") }}';
|
||||
urlroute = urlroute.replace(':id', bayaran['id']);
|
||||
|
||||
console.log(bayaran['']);
|
||||
historybayarandatatable.row.add([
|
||||
counter,
|
||||
bayaran['created_at'],
|
||||
"RM " + bayaran['duit_masuk'],
|
||||
'<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
|
||||
// marhun_detail['marhun'],
|
||||
// 'RM ' + formatter.format(marhun_detail['n_marhun']),
|
||||
// marhun_detail['karat'],
|
||||
// formatter.format(marhun_detail['berat']),
|
||||
// marhun_detail['nota']
|
||||
]).draw();
|
||||
counter = counter + 1;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// Restricts input for the set of matched elements to the given inputFilter function.
|
||||
(function($) {
|
||||
$.fn.inputFilter = function(inputFilter) {
|
||||
|
||||
Reference in New Issue
Block a user