From 863944aa05fb3fa65077717c3a8b419fc358149d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 4 Sep 2022 01:50:11 +0800 Subject: [PATCH] fix lelong --- resources/views/includes/home.blade.php | 73 ++++++++++++++++++- .../views/pembayaran/senaraibayaran.blade.php | 17 +++-- 2 files changed, 81 insertions(+), 9 deletions(-) diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php index f58353d..bb43745 100644 --- a/resources/views/includes/home.blade.php +++ b/resources/views/includes/home.blade.php @@ -321,6 +321,11 @@ var hargaemastable = $('#harga_emas').DataTable({ return false; } + function DateDiff(date1, date2) { + var datediff = date1.getTime() - date2.getTime(); //store the getTime diff - or + + return (datediff / (24*60*60*1000)); //Convert values to -/+ days and return value + } + async function filterpembiayaanaktif(){ $('#loadertable').removeClass('d-none'); @@ -385,6 +390,32 @@ var hargaemastable = $('#harga_emas').DataTable({ } }); + var lelongblock = ''; + + $.ajax({ + url: api_url + '/api/search/lelong', + method: 'get', + async:false, + dataType: "json", + data: { + kodcaw: ps.kodcaw, + norujukan: ps.norujukan + }, + success: function(response) { + if(Object.keys(response).length != 0) + { + var today = new Date(); + var tarikhlelong = new Date(response.t_lelong); + tarikhblock = DateDiff(tarikhlelong,today); + if(tarikhblock.toFixed() <= 2) + { + lelongblock = 'disabled'; + } + } + + } + }); + let marh = JSON.stringify(marhun[0]); var t_matang = new Date(ps.t_matang); @@ -402,7 +433,7 @@ var hargaemastable = $('#harga_emas').DataTable({ // } selepastawarruqtable.row.add([ - ``, + ``, namacawangan, `${ps.norujukan}`, ps.tempoh, @@ -479,6 +510,32 @@ var hargaemastable = $('#harga_emas').DataTable({ } }); + var lelongblock = ''; + + $.ajax({ + url: api_url + '/api/search/lelong', + method: 'get', + async:false, + dataType: "json", + data: { + kodcaw: ps.kodcaw, + norujukan: ps.norujukan + }, + success: function(response) { + if(Object.keys(response).length != 0) + { + var today = new Date(); + var tarikhlelong = new Date(response.t_lelong); + tarikhblock = DateDiff(tarikhlelong,today); + if(tarikhblock.toFixed() <= 2) + { + lelongblock = 'disabled'; + } + } + + } + }); + let marh = JSON.stringify(marhun[0]); @@ -496,7 +553,7 @@ var hargaemastable = $('#harga_emas').DataTable({ // } selepastawarruqtable.row.add([ - ``, + ``, namacawangan, `${ps.norujukan}`, ps.tempoh, @@ -571,10 +628,20 @@ var hargaemastable = $('#harga_emas').DataTable({ } }); + var lelongblock = ''; + + var today = new Date(); + var tarikhlelong = new Date(lelong.t_lelong); + tarikhblock = DateDiff(tarikhlelong,today); + if(tarikhblock.toFixed() <= 2) + { + lelongblock = 'disabled'; + } + let marh = JSON.stringify(marhun[0]); selepastawarruqtable.row.add([ - ``, + ``, namacawangan, // lelong.norujukan, `${lelong.norujukan}`, diff --git a/resources/views/pembayaran/senaraibayaran.blade.php b/resources/views/pembayaran/senaraibayaran.blade.php index 52eb733..9cbaa00 100644 --- a/resources/views/pembayaran/senaraibayaran.blade.php +++ b/resources/views/pembayaran/senaraibayaran.blade.php @@ -175,17 +175,22 @@ 'norujukan' => $bt['norujukan'] ])->json(); + dd($searchLelong); + if($searchLelong){ $t_lelong = Carbon\Carbon::parse($searchLelong['t_lelong'].' 00:00:00'); $tarikhini = Carbon\Carbon::parse($tarikh_hari_ini.' 00:00:00'); $diff=date_diff($tarikhini,$t_lelong); $diff = (int)$diff->format("%R%a"); - if($diff <= 2){ // 'messageamaran'=>'Rekod Gadaian Dalam Proses Lelong, Sila Hadir ke Cawangan.' - }elseif($searchLelong['t_jual'] != null && $searchLelong['hargajual'] != 0.00){ + dd($diff); + $lelongblock = false; + if($diff <= 2){ + // 'messageamaran'=>'Rekod Gadaian Dalam Proses Lelong, Sila Hadir ke Cawangan.' + $lelongblock = true; + }elseif($searchLelong['t_jual'] != null && $searchLelong['hargajual'] != 0.00){ // 'messageamaran'=>'Rekod Gadaian Telah Dilelong.' - - } - } + } + } $koskeuntungan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/upahtawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json(); $keuntungan_1bln = $bt['pinjaman'] * ($bt['kadarupah'] / 100); @@ -217,7 +222,7 @@ {{ number_format($koskeuntungan,2) }} - + {{-- --}}