fix aliran tunai fix penebusan

This commit is contained in:
hafifierahman
2021-02-09 11:22:56 +08:00
parent 4a89aa13d3
commit 0ee3c888d2
22 changed files with 7138 additions and 289 deletions
+5867
View File
File diff suppressed because it is too large Load Diff
+16 -11
View File
@@ -2,6 +2,11 @@
@include('modal.tambahserahan')
@include('modal.denominasimodal')
{{-- {{ dd($denominasi) }} --}}
@section('content')
<div class="container">
<div class="row justify-content-center">
@@ -19,7 +24,7 @@
<p>Baki Awal Tunai</p>
</div>
<div class="icon">
<i class="ion ion-bag"></i>
<i class="ion ion-cash"></i>
</div>
</div>
</div>
@@ -28,47 +33,47 @@
<div class="inner">
<h3>RM {{ number_format($alirantunai['tambah'],2) }}</h3>
<p>Tunai Diterima</p>
<p>Pendahuluan</p>
</div>
<div class="icon">
<i class="ion ion-stats-bars"></i>
<i class="fas fa-sign-in-alt"></i>
</div>
</div>
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
<div class="small-box bg-warning">
<div class="small-box bg-danger">
<div class="inner">
<h3>RM {{ number_format($alirantunai['kurang'],2) }}</h3>
<p>Tunai Dikeluar</p>
<p>Serahan</p>
</div>
<div class="icon">
<i class="ion ion-person-add"></i>
<i class="fas fa-sign-out-alt"></i>
</div>
</div>
</div>
</div>
<div class="row justify-content-center">
<div class="col-lg-4 col-md-6 col-sm-12">
<div class="small-box bg-danger">
<div class="small-box bg-warning">
<div class="inner">
<h3>RM {{ number_format($alirantunai['baki'],2) }}</h3>
<p>Baki Akhir Tunai</p>
</div>
<div class="icon">
<i class="ion ion-pie-graph"></i>
<i class="fas fa-cash-register"></i>
</div>
</div>
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
<div class="small-box bg-danger">
<div class="small-box bg-success">
<div class="inner">
<h3>RM {{ number_format($alirantunai['keluar'],2) }}</h3>
{{-- <h3>{{ $GT['gcount'] }}</h3> --}}
<p>Jumlah Gadaian</p>
</div>
<div class="icon">
<i class="ion ion-android-contacts"></i>
<i class="fas fa-minus-square"></i>
</div>
</div>
</div>
@@ -80,7 +85,7 @@
<p>Jumlah Penebusan</p>
</div>
<div class="icon">
<i class="ion ion-pie-graph"></i>
<i class="fas fa-plus-square"></i>
</div>
</div>
</div>
+8 -8
View File
@@ -739,14 +739,14 @@
if($("input[name='options']:checked").val() == 'belum_tebus'){
let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
if(+harini !== +tarikhgadai2){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Hapus Gadai Tidak Dibenarkan'
});
return false;
}
// if(+harini !== +tarikhgadai2){
// Swal.fire({
// icon: 'error',
// title: 'Amaran',
// text: 'Hapus Gadai Tidak Dibenarkan'
// });
// return false;
// }
}else if($("input[name='options']:checked").val() == 'sudah_tebus'){
let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
@@ -76,31 +76,31 @@
<tr>
<td>RM1</td>
<td><input type="text" name="rekodb1" class="form-control" id="rekodb1" value="{{ $denominasi['0']['bd1'] }}" readonly/></td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" value="{{ $array_reqteller['bd1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="{{ $denominasi['0']['b1'] }}" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="rekodb20" class="form-control" id="rekodb20" value="{{ $denominasi['0']['bd20'] }}" readonly/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" value="{{ $array_reqteller['bd20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="{{ $denominasi['0']['b20'] }}" readonly/> </td>
</tr>
<tr>
<td>RM5</td>
<td><input type="text" name="rekodb5" class="form-control" id="rekodb5" value="{{ $denominasi['0']['bd5'] }}" readonly/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" value="{{ $array_reqteller['bd5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="{{ $denominasi['0']['b5'] }}" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="rekodb50" class="form-control" id="rekodb50" value="{{ $denominasi['0']['bd50'] }}" readonly/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" value="{{ $array_reqteller['bd50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="{{ $denominasi['0']['b50'] }} " readonly/> </td>
</tr>
<tr>
<td>RM10</td>
<td><input type="text" name="rekodb10" class="form-control" id="rekodb10" value=" {{ $denominasi['0']['bd10'] }}" readonly/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" value="{{ $array_reqteller['bd10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value=" {{ $denominasi['0']['b10'] }}" readonly/> </td>
<td>RM100 </td> <td>
<input type="text" name="rekodb100" class="form-control" id="rekodb100" value="{{ $denominasi['0']['bd100'] }}" readonly/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" value="{{ $array_reqteller['bd100'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value=" {{ $denominasi['0']['b100'] }}" readonly/> </td>
</tr>
</table>
@@ -136,51 +136,51 @@
<td>RM0.01</td>
<td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['0']['txtsen1'] }}" readonly/></td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" value="{{ $array_reqteller['txtsen1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['0']['k01'] }}" readonly/> </td>
<td>RM1</td>
<td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['0']['txtring1'] }}" readonly/></td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" value="{{ $array_reqteller['txtring1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['0']['k1'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.05</td>
<td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['0']['txtsen5'] }}" readonly/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" value="{{ $array_reqteller['txtsen5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['0']['k05'] }}" readonly/> </td>
<td>RM5</td>
<td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['0']['txtring5'] }}" readonly/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" value="{{ $array_reqteller['txtring5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['0']['k5'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['0']['txtsen10'] }}" readonly/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" value="{{ $array_reqteller['txtsen10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen10" class="form-control" value=" {{ $denominasi['0']['k010'] }}" readonly/> </td>
<td>RM10</td>
<td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['0']['txtring10'] }}" readonly/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" value="{{ $array_reqteller['txtring10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring10" class="form-control" value=" {{ $denominasi['0']['k10'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.20</td>
<td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['0']['txtsen20'] }}" readonly/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" value="{{ $array_reqteller['txtsen20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen20" class="form-control" value=" {{ $denominasi['0']['k020'] }}" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['0']['txtring20'] }}" readonly/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" value="{{ $array_reqteller['txtring20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring20" class="form-control" value=" {{ $denominasi['0']['k20'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.50</td>
<td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['0']['txtsen50'] }}" readonly/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" value="{{ $array_reqteller['txtsen50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen50" class="form-control" value=" {{ $denominasi['0']['k050'] }}" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['0']['txtring50'] }}" readonly/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" value="{{ $array_reqteller['txtring50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring50" class="form-control" value=" {{ $denominasi['0']['k50'] }}" readonly/> </td>
</tr>
<tr>
@@ -190,7 +190,7 @@
<td></td>
<td>RM100 </td>
<td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['0']['txtring100'] }}" readonly/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" value="{{ $array_reqteller['txtring100'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['0']['k100'] }}" readonly/> </td>
</tr>
</table>
@@ -0,0 +1,142 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">{{ __('Laporan Aging Bulanan') }}</div>
<div class="card-body text-center">
<div class="row form-group">
<div class="col-md-2">
<a href="{{ route('laporan') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
</div>
<div class="col-md-10">
<h3>Laporan Aging Bulanan </h3>
</div>
</div>
<div class="row">
<div class="col-md-5">
<form action="{{ route('agingbulan.cetaklaporan') }}" target="_blank" method="post">
@csrf
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1" >Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" autocomplete="off" aria-describedby="basic-addon1">
<input type="hidden" id="num1" name="num1" value=1>
<input type="hidden" id="num2" name="num2" value=2>
<input type="hidden" id="num3" name="num3" value=3>
<input type="hidden" id="num4" name="num4" value=4>
<input type="hidden" id="num5" name="num5" value=5>
<input type="hidden" id="num6" name="num6" value=6>
<input type="hidden" id="num7" name="num7" value=7>
<input type="hidden" id="num8" name="num8" value=8>
<input type="hidden" id="num9" name="num9" value=9>
<input type="hidden" id="num10" name="num10" value=10>
<input type="hidden" id="num11" name="num11" value=11>
<input type="hidden" id="num12" name="num12" value=12>
<input type="hidden" id="num13" name="num13" value=12>
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
</div>
</form>
</div>
</div>
<div class="row">
<div class="col-md-12">
<table class="" id="myTable">
<thead>
<tr>
<th>Bil</th>
<th>Bil Gadaian</th>
<th>Jumlah Pinjaman (RM)</th>
<th>Peratusan %</th>
</tr>
</thead>
</table>
</div>
</div>
<div class="row">
<div class="col-md-12 text-right">
Bilangan Surat : <span id="bilangan_surat">3</span>
Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript">
var api_url = "<?php echo $api_url ?>";
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
var tablecustomers = $('#myTable').DataTable({
"ordering": false
});
$(document).ready( function () {
console.log('dsasa');
$('#datetimepicker1').datepicker({
format: 'dd-mm-yyyy'
});
var current = new Date();
var current_date = current.getDate();
var current_month = current.getMonth()+1;
var current_year = current.getFullYear();
var today_date = current_year + '-' +current_month+'-'+current_date;
$.ajax({
method:'get',
url: api_url + '/api/marhun/laporan/'+kodcaw+'/' + today_date,
success: function(customers){
customertable(customers);
},error: function(XMLHttpRequest, textStatus, errorThrown) {
console.log(textStatus);
}
});
});
$('#datetimepicker1').change(function(){
var input_date = this.value;
var split_date = input_date.split('-');
var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
$.ajax({
method:'get',
url: api_url + '/api/marhun/laporan/'+kodcaw+'/' + today_date,
success: function(customers){
customertable(customers);
}
});
});
function customertable(data){
var counter = 1;
tablecustomers.clear().draw();
$.each(data,function(index,customers){
tablecustomers.row.add([
counter,
customers['norujukan'],
customers['nokp'],
customers['nama'],
customers['marhun'],
customers['nota'],
customers['berat'],
customers['karat'],
customers['harga'],
customers['n_marhun'],
]).draw();
});
}
</script>
@endsection
@@ -33,7 +33,7 @@
<div class="row">
<div class="col-2">Amaun (RM)</div>
<div class="col-3"><input type="text" class="form-control" data-amaun="{{ $array_reqteller['modal'] }}" name="amt" id="amt"/></div>
<div class="col-3"><input type="text" class="form-control" value="{{ $array_reqteller['modal'] }}" readonly data-amaun="{{ $array_reqteller['modal'] }}" name="amt" id="amt"/></div>
<div class="col-2"> Nota</div>
<div class="col-4"><input type="text" class="form-control" value="P1" name="nota" id="nota" /> </div>
</div>
@@ -0,0 +1,144 @@
<!-- Modal HistoryBayaran -->
<div class="modal fade" id="denominasiModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl" role="document">
<div class="modal-content">
<div class="modal-header">
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link active" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Bundle</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="pill" href="#profile" role="tab" aria-controls="pills-cuckoo" aria-selected="false">Keping</a>
</li>
</ul>
<label class="mt-2 ml-3">Amaun Diminta:</label><input type="text" class="form-control col-3 ml-3" id="amaundiminta" placeholder="0.00" readonly>
<label class="mt-2 ml-3">Amaun Kiraan:</label><input type="text" class="form-control col-3 ml-3" id="amaunkiraan" placeholder="0.00" readonly>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="tab-content">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
<table class="table">
<tr>
<th></th>
<th>Ambilan</th>
<th>Total</th>
<th></th>
<th>Ambilan</th>
<th>Total (RM)</th>
</tr>
<tr>
<td>RM1</td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="0.00" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM5</td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="0.00" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM10</td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value="0.00" readonly/> </td>
<td>RM100 </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value="0.00" readonly/> </td>
</tr>
</table>
</div>
<div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<table class="table">
<tr>
<th></th>
<th>Ambilan</th>
<th>Total</th>
<th></th>
<th>Ambilan</th>
<th>Total (RM)</th>
</tr>
<tr>
<td>RM0.01</td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly/> </td>
<td>RM1</td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM0.05</td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly/> </td>
<td>RM5</td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly/> </td>
<td>RM10</td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM0.20</td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM0.50</td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td>RM100 </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring100" id="totalring100" class="form-control" value="0.00" readonly/> </td>
</tr>
</table>
</div>
</div>
<input type="hidden" id="jenisjenis"/>
<input type="hidden" id="kodcawangan"/>
<input type="hidden" id="tellerla"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="button" onclick="tambahdanserahanfunc()" class="btn btn-success btn-lg">Terima</button>
</div>
</div>
</div>
</div>
+109 -56
View File
@@ -293,6 +293,12 @@ var array_nm = [];
var array_marhun = [];
var array_berat = [];
//max bayaran
let jumlahasalmarhun = parseFloat("{{ $gadai['nilaimarhun'] }}");
let totalmarhun = jumlahasalmarhun;
let bayaranseparuhasal = 0;
let bilangan_marhun = Number("{{ $count }}");
bilmarhun = () => {
@@ -436,9 +442,16 @@ function tebusan()
if(tarikhgadai >= tarikhtawarruq)
{
//Separuh Bayar Tawarruq
//checked box
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
//Separuh Bayar Tawarruq
$(document).on('click', '#checkmarhun', function(e) {
var totalCheckboxes = $('input[type="checkbox"]').length;
let numbernotchecked = $("input:checkbox:not(:checked)").length;
var recno = $(this).data('recno');
var nilaimarhun = $(this).data('nm');
var marhun = $(this).data('marhun');
@@ -450,7 +463,10 @@ if(tarikhgadai >= tarikhtawarruq)
array_marhun.push(marhun);
array_berat.push(berat);
totalmarhun = totalmarhun - parseFloat(nilaimarhun);
console.log("Nilai Marhun: " + nilaimarhun);
console.log("Max Bayaran Marhun: " + totalmarhun);
console.table(array_recno);
}
else{
@@ -464,43 +480,50 @@ if(tarikhgadai >= tarikhtawarruq)
array_marhun.splice(rmmarhun);
array_berat.splice(rmberat);
console.log("Nilai Marhun: " + rmnilai);
totalmarhun = totalmarhun + parseFloat(nilaimarhun);
console.log("Nilai Marhun: " + nilaimarhun);
console.log("Max Bayaran Marhun: " + totalmarhun);
console.table(array_recno[0]);
}
$.ajax({
method:'GET',
url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan,
dataType: 'json',
data:{
"array_recno" : array_recno
},
success:function(success){
let bayarz = $('#bayaran').val(Number(success.toFixed(2)));
let bakihargajual = $('#bakihargajualan').val();
if(numbernotchecked != totalCheckboxes)
{
console.log('masuk');
$.ajax({
method:'GET',
url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan,
dataType: 'json',
data:{
"array_recno" : array_recno
},
success:function(success){
let bayarz = $('#bayaran').val(Number(success.toFixed(2)));
$('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()));
bayaranseparuhasal = Number(success.toFixed(2));
let totalbakipinjam = parseFloat($('#pinjaman').val()) - success;
$('#bakipinjaman').val(totalbakipinjam.toFixed(2));
let bakihargajual = $('#bakihargajualan').val();
}
});
$('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()));
let totalbakipinjam = parseFloat($('#pinjaman').val()) - success;
$('#bakipinjaman').val(totalbakipinjam.toFixed(2));
},error:function(xhr, textStatus, errorThrown){
console.log(xhr.responseText);
console.log(textStatus);
}
});
}
else
{
$('#perludibayar').val(parseFloat($('#jumlahupah').val()));
$('#bakipinjaman').val(0);
$('#bayaran').val(0);
}
});
//checked box
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
if (checkedOne == false) {
$('#perludibayar').val(0);
}
else
{
$('#perludibayar').val(0);
}
}
else if(tarikhgadai < tarikhtawarruq){
//Separuh Bayar Bukan Tawarruq
@@ -534,6 +557,7 @@ if(tarikhgadai >= tarikhtawarruq)
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);
@@ -663,7 +687,6 @@ $("#sltjenistebus").change(function(){
});
function bayarkey(e)
{
@@ -672,12 +695,28 @@ function bayarkey(e)
let byr = $(e).val();
let total = 0;
let pdbyr = 0;
pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val());
let totalseparuh = 0;
console.log(byr);
console.log(bayaranseparuhasal);
if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val())))
{
$('#bayaran').val(bayaranseparuhasal.toFixed(2));
}
else
{
totalseparuh = byr - parseFloat($('#jumlahupah').val());
$('#bayaran').val(totalseparuh.toFixed(2));
}
// pdbyr = parseFloat(byr);
pdbyr = $('#bayaran').val();
total = $('#pinjaman').val() - pdbyr;
// $('#perludibayar').val(pdbyr);
$('#bakipinjaman').val(total);
$('#bakipinjaman').val(total.toFixed(2));
}
}
@@ -734,6 +773,7 @@ function bayarpinjam(e)
}
let teller = "{{ Auth::user()->name }}";
function bayaransemua()
{
@@ -787,24 +827,11 @@ function bayaransemua()
"historygadaian" : historygadaian,
"marhun" : marhun,
"nowakil" : nowakil,
"jenisbayarantebus" : jenisbayarantebus
"jenisbayarantebus" : jenisbayarantebus,
"teller" : teller
},
success:function(success_data){
// $.ajax({
// method: 'put',
// datatype: 'json', ///////untuk kegunaaan aliran tunai penebusan je testing
// url: api + '/api/',
// data:{
// },
// success:function(data)
// {
// success la
// }
// });
Swal.fire({
icon: 'success',
title: 'Berjaya!',
@@ -856,13 +883,18 @@ function bayaransemua()
$.ajax({
method:'PUT',
url: api + '/api/gadai/' + kodcaw + '/norujukan/' + norujukan,
method:'get',
url: "{{ route('bayaran.ansuranstawarruq') }}",
data:{
"bayaran" : bayar
"bayaran" : bayar,
"kodcaw" : kodcaw,
"norujukan" : norujukan,
"teller" : teller
},
success:function(success_data){
console.log(success_data);
var urlroute = '{{ route("resit.ansurans", ":id") }}';
urlroute = urlroute.replace(':id', norujukan);
@@ -959,7 +991,8 @@ function bayaransemua()
"keuntungan_sebulan" : keuntungan_sebulan,
"kuantiti_marhun" : kuantiti_marhun,
"lebihan" : lebihan,
"jenisbayarantebus" : jenisbayarantebus
"jenisbayarantebus" : jenisbayarantebus,
"teller" : teller
},
success:function(success_data){
@@ -992,7 +1025,10 @@ function bayaransemua()
jenisbayarantebus = "tawarruq";
}
if($('#perludibayar').val() < $('#bayaran').val())
console.log("perlu dibayar: " + $('#perludibayar').val());
console.log("bayaran : " + (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())));
if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())))
{
Swal.fire(
'Amaran!',
@@ -1002,6 +1038,19 @@ function bayaransemua()
return false;
}
let maxbayaran = totalmarhun * 0.1;
if($('#bakipinjaman').val() < maxbayaran || $('#bakipinjaman').val() < 50)
{
Swal.fire(
'Amaran!',
`Baki margin pinjaman tidak boleh kurang 10% daripada nilai marhun \n [ RM ${totalmarhun.toFixed(2)} x 10% = RM ${maxbayaran.toFixed(2)} ]`,
'error'
)
return false;
}
//checked box
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
@@ -1016,6 +1065,8 @@ function bayaransemua()
return false;
}
alert('masuk');
return false;
var sumnilaimarhun = 0;
var sumberat = 0;
@@ -1079,7 +1130,7 @@ function bayaransemua()
var pinjamanbaru = $('#bakipinjaman').val();
var ansuran = 0;
var addpinjaman = 0;
var bakipinjaman = $('#bakipinjaman').val();
var bakipinjaman = $('#perludibayar').val();
var bakiupah = 0;
var historygadaian = "{{ $gadai['norujukan'] }}";
var marhun = "{{ $gadai['marhun'] }}";
@@ -1133,6 +1184,7 @@ function bayaransemua()
"nowakil" : nowakil,
"arrayrecno" : array_recno,
"jenisbayarantebus" : jenisbayarantebus,
"teller" : teller,
//yang baru
@@ -1275,7 +1327,8 @@ function bayaransemua()
"keuntungan_sebulan" : keuntungan_sebulan,
"noic" : noic,
"norujukan" : norujukan,
"jenisbayarantebus" : jenisbayarantebus
"jenisbayarantebus" : jenisbayarantebus,
"teller" : teller
},
success:function(success_data){
+20
View File
@@ -0,0 +1,20 @@
<div class="container">
<h1>Team A Score</h1>
<div id="team1_score"></div>
</div>
<script src="https://cdn.socket.io/socket.io-1.3.4.js"> </script>
<script>
var sock = io("{{ env('PUBLISHER_URL') }}:{{ env('BROADCAST_PORT') }}");
sock.on('action-channel-one:App\\Events\\ActionEvent', function (data){
//data.actionId and data.actionData hold the data that was broadcast
//process the data, add needed functionality here
var action = data.actionId;
var actionData = data.actionData;
if(action == "score_update" && actionData.team1_score) {
console.log(actionData.team1_score);
$("#team1_score").html(actionData.team1_score);
alert('jadi dok');
}
});
</script>