diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php
index 857d36e..5a3ab8c 100644
--- a/resources/views/includes/home.blade.php
+++ b/resources/views/includes/home.blade.php
@@ -94,7 +94,7 @@
{{ $bilangan }}
-
+
@@ -112,7 +112,7 @@
{{ $sixmonths }}
-
+
@@ -130,7 +130,7 @@
{{ $bilanganlelong }}
-
+
@@ -169,10 +169,10 @@
| # |
- Cawangan |
No Rujukan |
- JBG |
Keuntungan |
+ Cawangan |
+ JBG |
T Lanjut |
{{-- Status | --}}
@@ -344,7 +344,7 @@ var hargaemastable = $('#harga_emas').DataTable({
$('#totalsag').text(0);
var empat = selepastawarruqtable.columns(3).header();
- $(empat).html('JBG');
+ //$(empat).html('JBG');
selepastawarruqtable.column( 4 ).visible( true );
selepastawarruqtable.column( 5 ).visible( true );
// selepastawarruqtable.column( 6 ).visible( true );
@@ -417,7 +417,7 @@ var hargaemastable = $('#harga_emas').DataTable({
var today = new Date();
var tarikhlelong = new Date(response.t_lelong);
tarikhblock = DateDiff(tarikhlelong,today);
- if(tarikhblock.toFixed() <= 2)
+ if(tarikhblock.toFixed() <= 3)
{
lelongblock = 'disabled';
}
@@ -466,10 +466,10 @@ var hargaemastable = $('#harga_emas').DataTable({
selepastawarruqtable.row.add([
``,
- namacawangan,
- `${ps.norujukan}`,
- ps.tempoh,
+ `${ps.norujukan}`,
formatter.format(ps.keuntungan),
+ namacawangan,
+ ps.tempoh,
t_matang,
// statementlelong
]).draw();
@@ -486,7 +486,7 @@ var hargaemastable = $('#harga_emas').DataTable({
$('#totalsag').text(0);
var empat = selepastawarruqtable.columns(3).header();
- $(empat).html('JBG');
+ // $(empat).html('JBG');
selepastawarruqtable.column( 4 ).visible( true );
selepastawarruqtable.column( 5 ).visible( true );
// selepastawarruqtable.column( 6 ).visible( true );
@@ -558,7 +558,7 @@ var hargaemastable = $('#harga_emas').DataTable({
var today = new Date();
var tarikhlelong = new Date(response.t_lelong);
tarikhblock = DateDiff(tarikhlelong,today);
- if(tarikhblock.toFixed() <= 2)
+ if(tarikhblock.toFixed() <= 3)
{
lelongblock = 'disabled';
}
@@ -616,10 +616,10 @@ var hargaemastable = $('#harga_emas').DataTable({
selepastawarruqtable.row.add([
``,
- namacawangan,
- `${ps.norujukan}`,
- ps.tempoh,
+ `${ps.norujukan}`,
formatter.format(ps.keuntungan),
+ namacawangan,
+ ps.tempoh,
t_matang
// statementlelong
]).draw();
@@ -629,18 +629,21 @@ var hargaemastable = $('#harga_emas').DataTable({
}
function lelongan(e){
-
$('#loadertable').removeClass('d-none');
$('#formtable').addClass('d-none');
$('#totalsag').text(0);
var empat = selepastawarruqtable.columns(3).header();
+ var tiga = selepastawarruqtable.columns(2).header();
+ $(empat).html('T Lelong');
+ $(tiga).html('Cawangan');
+ // selepastawarruqtable.column( 3 ).visible( true );
- $(empat).html('T. Lelong');
+ //selepastawarruqtable.column( 2 ).visible( false );
selepastawarruqtable.column( 4 ).visible( false );
- selepastawarruqtable.column( 5 ).visible( false );
- // selepastawarruqtable.column( 6 ).visible( false );
+ selepastawarruqtable.column( 5 ).visible( false );
+ //console.log('hi');
let datalelong = [];
$.ajax({
@@ -694,8 +697,9 @@ var hargaemastable = $('#harga_emas').DataTable({
var today = new Date();
var tarikhlelong = new Date(lelong.t_lelong);
+
tarikhblock = DateDiff(tarikhlelong,today);
- if(tarikhblock.toFixed() <= 2)
+ if(tarikhblock.toFixed() <= 3)
{
lelongblock = 'disabled';
}
@@ -736,9 +740,8 @@ var hargaemastable = $('#harga_emas').DataTable({
selepastawarruqtable.row.add([
``,
+ `${lelong.norujukan}`,
namacawangan,
- // lelong.norujukan,
- `${lelong.norujukan}`,
tarikhlelong = new Date(lelong.t_lelong).toLocaleDateString("en-GB"),
'',
'',
@@ -750,7 +753,6 @@ var hargaemastable = $('#harga_emas').DataTable({
}
-
function bayaranfunc(e,api){
let norujukan = $(e).data('norujukan');
@@ -812,7 +814,13 @@ var hargaemastable = $('#harga_emas').DataTable({
}
},
false);
- }
+ }
+
+ $(".buttontekan").click(function() {
+ $('html,body').animate({
+ scrollTop: $("#formtable").offset().top},
+ 'slow');
+ });