diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php
index 37c9e1d..4135cf6 100644
--- a/resources/views/includes/bayaran/pembayaransag.blade.php
+++ b/resources/views/includes/bayaran/pembayaransag.blade.php
@@ -140,9 +140,9 @@
No |
No Rujukan |
Pembiayaan Asal |
- B. Pembiayaan |
+ Baki Pembiayaan |
Tempoh |
- Keuntungan |
+ Keuntungan Semasa |
Bayaran |
@@ -320,6 +320,8 @@
} else {
// $(this).closest('tr').find("input").val();
$(this).closest('tr').find("input").attr('readonly', false);
+ $(this).closest('tr').find(".txtbayaran").val(upah);
+ $(this).closest('tr').find(".bayaran").val(upah);
calculateall(jenis, taglel);
}
@@ -379,6 +381,18 @@
$(this).closest('tr').find('.bayaran').val(upah);
calculateall(jenis, taglel);
return false;
+ }else if(bayar < parseFloat(upah))
+ {
+ $("#bayarsbmt").prop('disabled', false);
+ Swal.fire(
+ 'Amaran!',
+ 'Bayaran tidak boleh kurang daripada upah!',
+ 'error'
+ )
+ $(this).val(upah);
+ $(this).closest('tr').find('.bayaran').val(upah);
+ calculateall(jenis, taglel);
+ return false;
}
$(this).closest('tr').find('.bayaran').val(this.value);
diff --git a/resources/views/includes/bayaran/senaraibayaransag.blade.php b/resources/views/includes/bayaran/senaraibayaransag.blade.php
index 3414e45..33db602 100644
--- a/resources/views/includes/bayaran/senaraibayaransag.blade.php
+++ b/resources/views/includes/bayaran/senaraibayaransag.blade.php
@@ -82,6 +82,8 @@
@php
$koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json();
+
+ dd($koskeuntungan);
$searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json();
$searchLelong = Http::get(config('api.url').'/api/search/lelong',[
@@ -145,10 +147,10 @@
| # |
No Rujukan |
- Pembiayaan |
- B. Pembiayaan |
- Keuntungan (6bulan) |
- Keuntungan |
+ Pembiayaan Asal |
+ Baki Pembiayaan |
+ {{-- Keuntungan (6bulan) | --}}
+ Keuntungan Semasa |
@@ -201,9 +203,9 @@
{{ number_format($bt['bakipjm'],2) }}
|
-
+ {{-- |
{{ number_format($bt['bakiupah'],2) }}
- |
+ --}}
{{ is_numeric($koskeuntungan) ? number_format($koskeuntungan,2) : $koskeuntungan }}
|
diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php
index 2746f9a..6421456 100644
--- a/resources/views/includes/home.blade.php
+++ b/resources/views/includes/home.blade.php
@@ -34,7 +34,7 @@
@@ -82,7 +82,7 @@