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

Merge branch 'ujrah_master' of https://bitbucket.org/arrahn-pkb/kaunter into izzati-ujrah

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2023-11-27 15:37:38 +08:00
parent 2aa4afe22b 37288c31b9
commit f4791cf1e9
3 changed files with 203 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PenebusanController.php
+5 -3
View File
@@ -465,9 +465,10 @@ class PenebusanController extends Controller
$karatbaru = str_replace('.','-',$marhunloop['karat']);
$hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
$nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
$harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga'];
$nilaimarhun = (floatval($harga) * floatval($marhunloop['berat']));
array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
}
foreach($arraymarhunbaru as $array1){
@@ -478,7 +479,8 @@ class PenebusanController extends Controller
'karat' => $array1['karat'],
'berat_emas' => $array1['berat'],
'harga' => $array1['harga'],
'nilai_marhun' => $array1['n_marhun']
'nilai_marhun' => $array1['n_marhun'],
'jenisAT' => $request->jenisAT
])->json();
}
resources/views/customers/info.blade.php
+1 -1
View File
@@ -1156,7 +1156,7 @@
});
$('#myTable td').click( function () {
alert('dasdsa');
// alert('dasdsa');
});
$("input[name='options']").click(function(){
resources/views/penebusan/index.blade.php
+197 -21
View File
@@ -330,6 +330,34 @@
</div>
</div>
</div>
@if($percent_hargaemassemasa > 80)
<div class="col-6 divlebihanmargin">
<div class="form-group row">
<div class="col-4">
<b>BAYARAN LEBIHAN MARGIN</b>
</div>
@php
$pembiayaanbaru = $nilaihargasemasa * (80/100);
$bayaranlebihan = $bakipjm - $pembiayaanbaru;
@endphp
<div class="col-8 input-group mb-3">
<input type="text" value="{{ number_format($bayaranlebihan,2)}}" class="form-control" aria-describedby="txtlebihanmargin" readonly/>
<div class="input-group-append">
<span class="input-group-text" id="txtlebihanmargin">{{ round($percent_hargaemassemasa - 80,2) }}</span>
</div>
</div>
</div>
</div>
<div class="col-6 justify-content-end divlebihanmargin">
<button type="button" class="btn btn-primary" onclick="funcexcuse()">Excuse</button>
</div>
@endif
<div class="col-6 mx-auto" id="divjenisAT">
<span class="text-warning h2">Harga Lama</span>
</div>
<div class="col-6" id="divbayaranditerima">
<div class="form-group row">
<div class="col-4">
@@ -373,6 +401,7 @@
var api = '<?php echo $api_url ?>';
let nw = 0;
let jenisAT = 'none';
$('input[type="checkbox"]').hide();
$('#divtambahpinjaman').hide();
@@ -384,6 +413,8 @@
$('#divbayarantawarruq').hide();
$('#divbayaran').hide();
$("#divbayaranminima").hide();
$('.divlebihanmargin').hide();
$('#divjenisAT').hide();
var array_recno = [];
@@ -465,7 +496,7 @@
});
function tebusan(){
if(hargajualan != '' ){
if(hargajualan != '' ){
let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}";
let maxgadaipembiayaanbaru = "{{ $maxgadaipemb = ($nilaihargasemasa * 0.7) - $gadai['bakipjm'] }}";
@@ -759,6 +790,9 @@
$('#divbayarantawarruq').hide();
$('#divbayaran').hide();
$("#divbayaranminima").hide();
$('.divlebihanmargin').hide();
$('#divjenisAT').hide();
$('#divtelahdibayar').show();
$('#divperludibayar').show();
@@ -787,6 +821,8 @@
$('#divbayaran').show();
$('#divperludibayar').hide();
$("#divbayaranminima").hide();
$('.divlebihanmargin').hide();
$('#divjenisAT').hide();
$('#bayaran').val(formatter.format(jumupah));
@@ -813,6 +849,8 @@
$('#divbayaran').show();
$('#divperludibayar').show();
$("#divbayaranminima").hide();
$('.divlebihanmargin').hide();
$('#divjenisAT').hide();
$('#perludibayar').val(formatter.format(jumupahrebet));
break;
@@ -834,6 +872,8 @@
$('#divperludibayar').hide();
$('#divbayarantawarruq').hide();
$("#divbayaranminima").hide();
$('.divlebihanmargin').hide();
$('#divjenisAT').hide();
$("#bayaran").prop("disabled", false);
$("#bayaran").val(0);
@@ -867,11 +907,18 @@
$('#divbayarantawarruq').hide();
$('#divtelahdibayar').hide();
$('#divbayaran').hide();
$('.divlebihanmargin').hide();
$('#divjenisAT').hide();
$('#divperludibayar').show();
$('#minimabayaran').val(formatter.format(minimum_bayaran));
$('#perludibayar').val(formatter.format(jumupah));
break;
case "AT":
let percenthargasemasa = parseFloat('{{ number_format($percent_hargaemassemasa,2) }}');
let jumlebmargin = parseFloat('{{ ($percent_hargaemassemasa > 80) ? $bayaranlebihan : 0 }}');
let totalbayaran = (percenthargasemasa > 80) ? (jumlebmargin + jumupah) : jumupah;
$("#terima_transaksi").prop('disabled', false);
$('input[type="checkbox"]').hide();
@@ -888,13 +935,15 @@
$("#bayarantawarruq").prop("readonly", false);
$("#bayaran").val(0);
$('#divperludibayartawarruq').show();
$('.divlebihanmargin').show();
$('#divbakipinjaman').hide();
$('#divtelahdibayar').hide();
$('#divbayaran').hide();
$('#divperludibayar').hide();
$('#perludibayartawarruq').val(formatter.format(jumupah));
$('#basic-addon2').text(percenthargasemasa);
$('#perludibayartawarruq').val(formatter.format(totalbayaran));
break;
@@ -2034,7 +2083,7 @@
var pinjaman_baru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
var marginsemasa = pinjaman_baru/nmsemasa * 100;
var marginsemasa = (jenisAT == 'hargalama') ? pinjaman_baru/nm * 100 : pinjaman_baru/nmsemasa * 100;
$.ajax({
method:'get',
@@ -2068,12 +2117,12 @@
return false;
}
if(marginsemasa > 80)
{
$("#terima_transaksi").prop('disabled', false);
Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error');
return false;
}
// if(marginsemasa > 80)
// {
// $("#terima_transaksi").prop('disabled', false);
// Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error');
// return false;
// }
if(marginsemasa > 75 && marginsemasa <= 80){
@@ -2318,16 +2367,18 @@
return false;
}else if(marginsemasa > 80){
$("#terima_transaksi").prop('disabled', false);
Swal.fire(
'Amaran!',
'Pinjaman Haruslah Dalam Lingkungan 80%!',
'error'
)
return false;
// $("#terima_transaksi").prop('disabled', false);
// Swal.fire(
// 'Amaran!',
// 'Pinjaman Haruslah Dalam Lingkungan 80%!',
// 'error'
// )
// return false;
}
gadaiautotawarruq();
gadaiautotawarruq(jenisAT);
}
}
}
@@ -2374,12 +2425,14 @@
// kadarupahbaru = 1.70/100;
// }
let nilaibaru = (jenisAT == 'hargalama') ? nilai_marhun_lama : nilai_marhun;
$.ajax({
method:'GET',
url: api + '/api/kadarujrah',
async:false,
data:{
'nilaimarhun' : nilai_marhun
'nilaimarhun' : nilaibaru
},
success:function(data){
kadarupahbaru = data;
@@ -2389,7 +2442,8 @@
// var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
// var keuntungan_6bln = keuntungan_sebulan * 6;
// console.log(nilaibaru,noic,pinjamanbaru,kadarupahbaru,total_berat,marhun,kuantiti_marhun,perludibayar,jenisAT);
// return;
$.ajax({
method:"GET",
url: "{{ route('tebus.autotawarruq') }}",
@@ -2415,7 +2469,7 @@
//yang baru
"noic" : noic,
"total_nilai_marhun" : nilai_marhun,
"total_nilai_marhun" : nilaibaru,
"pinjaman" : pinjamanbaru,
"kadarkeuntungan" : kadarupahbaru,
// "keuntungan_6bln" : keuntungan_6bln,
@@ -2423,7 +2477,7 @@
"total_berat" : total_berat,
"marhun_detail" : marhun,
"kuantiti_marhun" : kuantiti_marhun,
"jenisAT" : jenisAT,
"totalbayaran" : perludibayar,
},
@@ -3038,6 +3092,128 @@ function pembatalanbalik()
});
}
function funcexcuse(){
var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
let percentasal = parseFloat('{{ number_format($percent_asal,2) }}');
jenisAT = 'hargalama';
$('#basic-addon2').text(percentasal);
$('.divlebihanmargin').hide();
$('#divjenisAT').show();
$('#perludibayartawarruq').val(formatter.format(jumupah));
// gadaiautotawarruq(jenisAT);
return;
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger'
},
buttonsStyling: false
});
var errortext = "[Auto Tawarruq] Menggunakan Harga Lama & Margin Lama";
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Operasi',
text: errortext,
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
if (result.isConfirmed) {
let norujukan = '{{ $gadai["norujukan"] }}';
let nm = parseFloat($('#nilai_marhun_total').text().replace(/[^0-9.-]+/g,""));
let ber = parseFloat($('#berat_marhun_total').text());
let marg = parseFloat($('#basic-addon2').text());
let status = errortext;
let jumpinjam = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
let teller = "{{ Auth::user()->name }}";
Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
icon: 'info',
width: 600,
padding: '3em',
background: '#fffff',
showCancelButton: false,
showConfirmButton: false,
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false
})
let siricreated = 0;
$.ajax({
method:'post',
url: "{{ route('operasi.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
success:function(data){
siricreated = data;
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
});
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan',
text: `Komen : ${data.komen}`
}).then(function(){
$(func).attr("onSubmit","return true;");
$(func).submit();
return true;
});
}
else if(data.kelulusan == 'batal')
{
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
$("#terima_gadai").prop('disabled', false);
return false;
});
}
}
});
}
});
return false;
}
// Restricts input for the set of matched elements to the given inputFilter function.
(function($) {