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

Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into kaunter

Browse Source
This commit is contained in:
afiq
2021-10-02 19:33:17 +08:00
parent dd9d0274dc 15f230a972
commit b9d96bc608
19 changed files with 1047 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/gadaian/edit.blade.php
+19 -8
View File
@@ -358,6 +358,8 @@
var kadarupah = 0;
var jumlah_marhun = 0;
var jumlah_nilai_marhun = 0;
var pinjaman_pelulus = 0;
var pinjaman_teller = 0;
function marhuntable(data){
var counter = 1;
var count = 0;
@@ -419,8 +421,7 @@
method:'GET',
url: api_url + '/api/maxpinjaman',
success:function(data){
var pinjaman_pelulus = 0;
var pinjaman_teller = 0;
$.each(data,function(index,pinjaman){
if(pinjaman['user_type'] == 'teller'){
pinjaman_teller = Number(pinjaman['max']);
@@ -863,7 +864,7 @@
var errortext = "Tetapan margin melebihi 75% untuk Operasi!";
}
if(pinjaman >= 10000){
var errortext = "Pinjaman Melebihi 10000";
var errortext = "Pinjaman Melebihi 10,000";
}
swalWithBootstrapButtons.fire({
@@ -879,7 +880,8 @@
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "|";
// let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "|";
let status = errortext;
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -902,7 +904,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
@@ -974,7 +980,7 @@
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Daripada Khazanah?',
text: "Tetapan margin melebihi 70% untuk Khazanah!",
text: "Tetapan margin melebihi" + pinjaman_teller + "% untuk Khazanah!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Hantar',
@@ -985,7 +991,8 @@
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "|";
// let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "|";
let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -1008,7 +1015,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
resources/views/gadaian/index.blade.php
+17 -9
View File
@@ -347,6 +347,8 @@
var kadarupah = 0;
var jumlah_marhun = 0;
var jumlah_nilai_marhun = 0;
var pinjaman_pelulus = 0;
var pinjaman_teller = 0;
function marhuntable(data){
var counter = 1;
total_nilai_marhun = 0;
@@ -395,8 +397,6 @@
method:'GET',
url: api_url + '/api/maxpinjaman',
success:function(data){
var pinjaman_pelulus = 0;
var pinjaman_teller = 0;
$.each(data,function(index,pinjaman){
if(pinjaman['user_type'] == 'teller'){
pinjaman_teller = Number(pinjaman['max']);
@@ -781,10 +781,10 @@
});
if(pinjaman > Number(pembiyaan_max_pelulus)){
var errortext = "Tetapan margin melebihi 75% untuk Operasi!";
var errortext = "Tetapan margin melebihi " + pinjaman_pelulus + "% untuk Operasi!";
}
if(pinjaman >= 10000){
var errortext = "Pinjaman Melebihi 10000";
var errortext = "Pinjaman Melebihi 10,000";
}
swalWithBootstrapButtons.fire({
@@ -800,7 +800,7 @@
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "|";
let status = errortext;
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -823,7 +823,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
@@ -901,7 +905,7 @@
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah',
text: "Tetapan margin melebihi 70% untuk Khazanah!",
text: "Tetapan margin melebihi " + pinjaman_teller + "% untuk Khazanah!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Hantar',
@@ -912,7 +916,7 @@
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "|";
let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -936,7 +940,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},