diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index b1665ae..8f3d1d5 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -47,7 +47,7 @@ class HomeController extends Controller
foreach($CustomerInfo['gadai'] as $index=>$gadai)
{
$bilangan++;
- $total += $gadai['pinjaman'];
+ $total += $gadai['bakipjm'];
if($gadai['tempoh'] >= 6)
{
diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php
index 7580401..29aa15d 100644
--- a/app/Http/Controllers/InformationController.php
+++ b/app/Http/Controllers/InformationController.php
@@ -48,11 +48,12 @@ class InformationController extends Controller
$CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
$melebihi6bulan = [];
+
if(isset($CustomerInfo['gadai']))
{
foreach($CustomerInfo['gadai'] as $index=>$gadai)
{
- if($gadai['jbg'] >= 6)
+ if($gadai['tempoh'] >= 6)
{
array_push($melebihi6bulan,$gadai);
}
diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php
index 80da34a..809bfbc 100644
--- a/resources/views/includes/home.blade.php
+++ b/resources/views/includes/home.blade.php
@@ -283,6 +283,22 @@ var hargaemastable = $('#harga_emas').DataTable({
if (typeof fasa !== 'undefined' || fasa !== null) {
if(fasa == 2){
if ($(e).is(':checked')){
+ $.notify({
+ newest_on_top: true,
+ message: "Norujukan ini dalam fasa ke 2!"
+ }, {
+ type: 'danger',
+ allow_dismiss: false,
+ placement: {
+ align: 'center',
+ from: 'bottom'
+ },
+ animate: {
+ enter: 'animate__animated animate__bounce',
+
+ exit: 'animate__animated animate__bounceOutDown'
+ }
+ });
$(e).prop('checked', false);
}
return;
@@ -310,6 +326,8 @@ var hargaemastable = $('#harga_emas').DataTable({
$('#loadertable').removeClass('d-none');
$('#formtable').addClass('d-none');
+ $('#totalsag').text(0);
+
var empat = selepastawarruqtable.columns(3).header();
$(empat).html('JBG');
selepastawarruqtable.column( 4 ).visible( true );
@@ -402,6 +420,8 @@ var hargaemastable = $('#harga_emas').DataTable({
$('#loadertable').removeClass('d-none');
$('#formtable').addClass('d-none');
+ $('#totalsag').text(0);
+
var empat = selepastawarruqtable.columns(3).header();
$(empat).html('JBG');
selepastawarruqtable.column( 4 ).visible( true );
@@ -494,6 +514,8 @@ var hargaemastable = $('#harga_emas').DataTable({
$('#loadertable').removeClass('d-none');
$('#formtable').addClass('d-none');
+ $('#totalsag').text(0);
+
var empat = selepastawarruqtable.columns(3).header();
$(empat).html('T. Lelong');
@@ -549,11 +571,14 @@ var hargaemastable = $('#harga_emas').DataTable({
}
});
+ let marh = JSON.stringify(marhun[0]);
+
selepastawarruqtable.row.add([
``,
namacawangan,
- lelong.norujukan,
- lelong.t_lelong,
+ // lelong.norujukan,
+ `${lelong.norujukan}`,
+ tarikhlelong = new Date(lelong.t_lelong).toLocaleDateString("en-GB"),
'',
'',
''