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

Merge branch 'lapfix' into 'new-super'

Browse Source 
fix kelulusan

See merge request online-sistem1/kaunter!175
This commit is contained in:
Afiq Zakwan Hamdan
2021-10-05 16:35:31 +00:00
parent 8566d53b37 a3a80cd0ba
commit 5f43fe1340
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
-1
View File
@@ -499,7 +499,6 @@ class KhazanahController extends Controller
$kelulusan = Http::get(config('api.url') . '/api/RekodDahLepas/' . $auth_user['cawangan'])->json();
$kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json();
dd($kelulusanmohonid);
foreach($kelulusan as $index=>$k)
{
resources/views/gadaian/edit.blade.php
+2 -2
View File
@@ -883,7 +883,7 @@
if (result.isConfirmed) {
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));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();
@@ -994,7 +994,7 @@
if (result.isConfirmed) {
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));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();
resources/views/gadaian/index.blade.php
+2 -2
View File
@@ -799,7 +799,7 @@
if (result.isConfirmed) {
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let status = errortext;
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -915,7 +915,7 @@
if (result.isConfirmed) {
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
resources/views/khazanah/rekodtelahlulus.blade.php
-1
View File
@@ -23,7 +23,6 @@
<div class="col-2">
</div>
</div>
{{ dd($kelulusanmohonid)}}
<table class='table table-striped table-hover' id='table-kelulusan' style="width:100%;">
<thead class="thead-dark">
resources/views/penebusan/index.blade.php
+9 -7
View File
@@ -164,7 +164,7 @@
</tbody>
<tr>
<td colspan="2"><b>JUMLAH</b></td>
<td id="nilai_marhun_total">RM {{ number_format($gadai['nilaimarhun'],2) }}</td>
<td id="nilai_marhun_total_fix">RM {{ number_format($gadai['nilaimarhun'],2) }}</td>
<td id="nilai_marhun_total">RM {{ number_format($nilaihargasemasa,2) }}</td>
<td id="berat_marhun_total">{{ number_format($gadai['berat'],2) }}</td>
<td colspan="3"></td>
@@ -1315,7 +1315,7 @@
}).then((result) => {
if (result.isConfirmed) {
let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla;
let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = separuhla;
// let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh";
let status = "[Tebus Separuh] Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let jumpinjam = $('#bakipinjaman').val();
@@ -1436,7 +1436,7 @@
}).then((result) => {
if (result.isConfirmed) {
let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla;
let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = separuhla;
let komen = '';
if(pinjamanbaru >= 10000)
{
@@ -1593,7 +1593,7 @@
}).then((result) => {
if (result.isConfirmed) {
let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
// let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
let status = "[Tambah Pinjaman] Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let jumpinjam = $('#hargapembiayaansemasa').val();
@@ -1714,13 +1714,14 @@
}).then((result) => {
if (result.isConfirmed) {
let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
let komen = '';
if(pinjamanbaru >= 10000)
{
komen = "[Tambah Pinjaman] Pembiayaan Melebihi RM 10,000";
}
let status = komen;
let jumpinjam = $('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
@@ -2110,12 +2111,13 @@
}).then((result) => {
if (result.isConfirmed) {
let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
let nm = parseFloat($('#nilai_marhun_total_fix').text().replace(/[^0-9.-]+/g,""));let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
let komen = '';
if(pinjamanbaru >= 10000)
{
komen = "[Auto Tawarruq] Pembiayaan Melebihi RM 10,000";
}
let status = komen;
let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";