KoPKB/erahn-click
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix skit2

Browse Source
This commit is contained in:
hafifierahman
2021-10-08 01:01:39 +08:00
parent 226cad3816
commit 6c27a477a5
4 changed files with 85 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/argon/js/main.js
Vendored
+3
View File
@@ -0,0 +1,3 @@
function loadingbtn(){
console.log('asdsasa');
}
resources/views/dashboard.blade.php
+4 -4
View File
@@ -31,7 +31,7 @@
<div class="col-xl-2 col-sm-12">
<div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
<a href="{{ route('semaksag') }}"><div class="card mb-4 mb-xl-0 mt-2 bg-primary">
<a href="{{ route('semaksag') }}" onclick="loadingbtn();"><div class="card mb-4 mb-xl-0 mt-2 bg-primary">
<div class="card-body text-center">
<div class="col-auto">
@@ -49,7 +49,7 @@
<div class="col-xl-2 col-sm-12">
<div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
<a href="{{ route('pembayaransag') }}"><div class="card mb-sm-0 mb-4 mb-xl-0 ml-sm-0 mt-2 bg-primary">
<a href="{{ route('pembayaransag') }}" onclick="loadingbtn();"><div class="card mb-sm-0 mb-4 mb-xl-0 ml-sm-0 mt-2 bg-primary">
<div class="card-body text-center">
<div class="col-auto">
<div class="icon icon-shape text-white rounded-circle shadow">
@@ -66,7 +66,7 @@
<div class="col-xl-2 col-sm-12">
<div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
<a href="#" onclick="onclicktebus();"><div class="card mb-sm-0 mb-5 bg-primary mt-2">
<a href="#" onclick="onclicktebus();loadingbtn();"><div class="card mb-sm-0 mb-5 bg-primary mt-2">
<div class="card-body text-center">
<div class="col-auto">
<div class="icon icon-shape bg-yellow text-white rounded-circle shadow">
@@ -84,7 +84,7 @@
<div class="col-xl-2 col-sm-12">
<div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
<a href="{{ route('analisa.index') }}"><div class="card bg-primary mt-2">
<a href="{{ route('analisa.index') }}" onclick="loadingbtn();"><div class="card bg-primary mt-2">
<div class="card-body text-center">
<div class="col-auto">
<div class="icon icon-shape text-white rounded-circle shadow">
resources/views/layouts/app.blade.php
+2
View File
@@ -31,6 +31,7 @@
<script src="//cdn.jsdelivr.net/npm/sweetalert2@11"></script>
<script type="text/javascript" src="{{ asset('argon') }}/js/main.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.25/b-1.7.1/b-html5-1.7.1/b-print-1.7.1/r-2.2.9/sp-1.3.0/datatables.min.js"></script>
@@ -41,6 +42,7 @@
<script src="{{ asset('argon') }}/js/bootstrap-notify.js"></script>
<style>
div.checker span {
background-image: url("assets/global/plugins/uniform/images/sprite.png");
}
resources/views/pembayaran/checkout.blade.php
+76 -28
View File
@@ -61,6 +61,7 @@
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="tabs-icons-text-1" role="tabpanel" aria-labelledby="tabs-icons-text-1-tab">
<div class="table-responsive table-striped text-center">
<table class="table align-items-center table-flush" id="belum_tawarruq">
<thead class="thead-light">
@@ -101,13 +102,13 @@
{{ number_format($koskeuntungan,2) }}
</td>
<td>
<select name="sltbayaran" class="form-control mb-2">
<option disabled>Pilih Bayaran</option>
<select name="sltbayaran" class="form-control mb-2" data-upah="{{ $koskeuntungan }}" data-jenis="arrahn">
<option selected disabled>Pilih Bayaran</option>
<option value="fixed">Amaun Tetap</option>
<option value="otheramount">Amaun Lain</option>
</select>
<input type="text" data-bakipjm="{{ $bayar['bakipjm'] }}" data-upah="{{ $koskeuntungan }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="arrahn" name="txtbayaranarrahn" disabled class="form-control"/>
<input type="text" data-pinjaman="{{ $bayar['pinjaman'] }}" data-upah="{{ $koskeuntungan }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="arrahn" name="txtbayaranarrahn" readonly class="form-control txtbayaran"/>
<input type="hidden" name="txtbayaranhidden[]" class="bayaran"/>
<input type="hidden" name="txtnorujukanhidden[]" value="{{ $bayar['norujukan'] }}"/>
@@ -160,7 +161,15 @@
{{ $upahtawarruq }}
</td>
<td>
<input type="text" data-bakipjm="{{ $bayar['bakipjm'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="tawarruq" name="txtbayarantawarruq" placeholder="{{ $upahtawarruq }}" class="form-control"/>
<select name="sltbayaran" class="form-control mb-2" data-upah="{{ $upahtawarruq }}" data-jenis="tawarruq">
<option selected disabled>Pilih Bayaran</option>
<option value="fixed">Amaun Tetap</option>
<option value="otheramount">Amaun Lain</option>
</select>
<input type="text" data-bakipjm="{{ $bayar['bakipjm'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="tawarruq" name="txtbayarantawarruq" readonly class="form-control txtbayaran"/>
<input type="hidden" name="txtbayaranhidden[]" class="bayaran"/>
<input type="hidden" name="txtnorujukanhidden[]" value="{{ $bayar['norujukan'] }}"/>
<input type="hidden" name="txtkodcawhidden[]" value="{{ $bayar['kodcaw'] }}"/>
@@ -220,7 +229,7 @@
<hr/>
<div class="row mb--4 font-weight-light">
{{-- <div class="row mb--4 font-weight-light">
<div class="col-7">
<label class="text-dark ml-4">Keuntungan</label>
</div>
@@ -229,7 +238,7 @@
<span>RM <span id="spankeuntungan">0.00</span></span>
</div>
</div>
<hr/>
<hr/> --}}
<div class="row pb-4 font-weight-light">
@@ -244,11 +253,13 @@
</div>
</div>
<div class="d-flex justify-content-end col-12 mt-3 align-self-end">
<button type="submit" id="bayarsbmt" class="btn btn-primary" onclick="loader()">Bayar</button>
</div>
</div>
<div class="d-flex justify-content-end col-12 mt-3">
<button type="submit" id="bayarsbmt" class="btn btn-primary">Bayar</button>
</div>
</div>
</form>
@@ -292,21 +303,37 @@
let total = 0;
$("input[name=txtbayaran]").change(function(e){
$("select[name=sltbayaran]").change(function(e)
{
let selected = $('option:selected',this).attr('value');
let jenis = $(this).data('jenis');
let upah = $(this).data('upah');
if(selected === 'fixed')
{
$(this).closest('tr').find("input").attr('readonly',true);
$(this).closest('tr').find(".txtbayaran").val(upah);
$(this).closest('tr').find(".bayaran").val(upah);
calculateall(jenis);
}else{
// $(this).closest('tr').find("input").val();
$(this).closest('tr').find("input").attr('readonly',false);
calculateall(jenis);
}
});
$("input[name=txtbayaranarrahn]").change(function(e){
let upah = $(this).data('upah');
let bakipinjam = $(this).data('bakipjm');
let pinjaman = $(this).data('pinjaman');
let jenis = $(this).data('jenis');
let nm = $(this).data('nm');
// let hiddenbayaran = $('.bayaran').val('sadas');
let bayar = Number(this.value);
let errorlebih = (nm * 0.01);
let errorlebih = nm - (nm * 0.01);
console.log(errorlebih);
if(bayar < parseFloat(errorlebih)){
if(bayar > parseFloat(errorlebih)){
$("#bayarsbmt").prop('disabled', false);
Swal.fire(
'Amaran!',
@@ -314,20 +341,42 @@
'error'
)
$(this).val(upah);
$(this).closest('tr').find('.bayaran').val(upah);
$(this).closest('tr').find('input[name=txtbayaranhidden]').val(upah);
calculateall(jenis);
return false;
}
$(this).closest('tr').find('.bayaran').val(this.value);
$(this).closest('tr').find('input[name=txtbayaranhidden]').val(this.value);
calculateall(jenis);
// total = total + bayar;
// $('#spanbayaran').text(formatter.format(total));
// $('#spanjumlah').text(formatter.format(total));
});
$("input[name=txtbayarantawarruq]").change(function(e){
let upah = $(this).data('upah');
let bakipinjam = $(this).data('bakipjm');
let jenis = $(this).data('jenis');
let nm = $(this).data('nm');
let bayar = Number(this.value);
let errorlebih = (bakipinjam - (nm * 0.01));
if(bayar > parseFloat(errorlebih)){
$("#bayarsbmt").prop('disabled', false);
Swal.fire(
'Amaran!',
'Bayaran tidak boleh melebihi 10% nilai marhun!',
'error'
)
$(this).val(upah);
$(this).closest('tr').find('input[name=txtbayaranhidden]').val(upah);
calculateall(jenis);
return false;
}
$(this).closest('tr').find('input[name=txtbayaranhidden]').val(this.value);
calculateall(jenis);
});
function calculateall(jenis)
{
@@ -338,24 +387,23 @@
$('#belum_tawarruq').find('input[name=txtbayaranarrahn]').each(function() {
sumarrahn += parseFloat(this.value) || 0;
});
$('#selepas_tawarruq').find('input[name=txtbayarantawarruq]').each(function() {
sumtawarruq += parseFloat(this.value) || 0;
});
sum = sumarrahn + sumtawarruq;
$("#spanbayaranarrahn").text(sumarrahn.toFixed(2));
$("#spanbayarantawarruq").text(sumtawarruq.toFixed(2));
$('#spanjumlah').text(formatter.format(sum));
}
</script>
@endsection
{{--
@push('js')
<script src="{{ asset('argon') }}/vendor/chart.js/dist/Chart.min.js"></script>
<script src="{{ asset('argon') }}/vendor/chart.js/dist/Chart.extension.js"></script>
@endpush
@endpush --}}