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

fix conflict

Browse Source
This commit is contained in:
afiq
2021-06-20 15:49:05 +08:00
parent afd76521a2 4be155da22
commit d3c6abca03
5 changed files with 119 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/penebusan/index.blade.php
+5 -5
View File
@@ -1367,7 +1367,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh";
}
let jumpinjam = $('#bakipinjaman').val();
let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -1641,7 +1641,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
}
let jumpinjam = $('#hargapembiayaansemasa').val();
let jumpinjam = $('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -1985,7 +1985,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
}
let jumpinjam = $('#bakipinjaman').val();
let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -2234,7 +2234,7 @@
sumberat += parseFloat(value);
});
var jenistebus = $('#sltjenistebus').find(":selected").val();
var jenistebus = $('#sltjenistebus').find(":selected").val();
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jbg = "{{ $gadai['tempoh'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }}";
@@ -2639,4 +2639,4 @@ function pembatalanbalik()
</script>
@endsection
@endsection