diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index 4b01f7a..b78e0f9 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -493,7 +493,7 @@ class AliranTunaiController extends Controller
if(number_format($penebusanbarcodescanned,2) !== number_format($masuk,2))
$errorpenebusan = true;
- if(number_format(round($bakisemasa,1),2) !== number_format(round($baki,1),2))
+ if(number_format(round($bakisemasa,2),2) !== number_format(round($baki,2),2))
$errorbaki = true;
if(number_format($totalpendahuluan,2) != number_format($pendahuluan,2))
diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php
index d7f1f83..7160a24 100644
--- a/resources/views/khazanah/info.blade.php
+++ b/resources/views/khazanah/info.blade.php
@@ -540,7 +540,7 @@
var urlroute = '{{ route("lelongan", ":id") }}';
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
tablelelong.row.add([
- counter,
+ '',
'' + gadai_detail['norujukan'] + '',
gadai_detail['t_lelong'],
gadai_detail['trkhtuntut'],
@@ -697,12 +697,18 @@
var koddaerah = $(e).data('koddaerah');
var noruj = $(e).data('histid');
- console.log(kodnegeri);
-
if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '')
{
- if($("input[name='options']:checked").val() == 'belum_tebus'){
- let histid = $('input[name="belum"]:checked').val();
+ if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
+
+ let histid = '';
+ if($("input[name='options']:checked").val() == 'belum_tebus'){
+ histid = $('input[name="belum"]:checked').val();
+ }
+ else{
+ histid = $('input[name="lelong"]:checked').val();
+ }
+
if(histid == null){
Swal.fire({
icon: 'error',
@@ -728,7 +734,15 @@
function saghilangfunc()
{
if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
- let histid = $('input[name="belum"]:checked').val();
+
+ let histid = '';
+ if($("input[name='options']:checked").val() == 'belum_tebus'){
+ histid = $('input[name="belum"]:checked').val();
+ }
+ else{
+ histid = $('input[name="lelong"]:checked').val();
+ }
+
if(histid == null){
Swal.fire({
icon: 'error',
@@ -744,7 +758,7 @@
{
var count = Object.keys(data).length;
-
+ console.log(histid);
if(count > 0)
{
Swal.fire({
@@ -778,7 +792,7 @@
title: 'Amaran',
text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
});
- }
+ }
// }else if($("input[name='options']:checked").val() == 'lelong'){