KoPKB/erahn-click
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
nishaMuhd
2023-02-26 14:24:31 +08:00
parent 03f23864fc cb01a4b18b
commit 1cb1fe92d5
7 changed files with 102 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/includes/home.blade.php
+3 -3
View File
@@ -440,7 +440,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';
}
@@ -586,7 +586,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';
}
@@ -729,7 +729,7 @@ var hargaemastable = $('#harga_emas').DataTable({
var tarikhlelong = new Date(lelong.t_lelong);
tarikhblock = DateDiff(tarikhlelong,today);
if(tarikhblock.toFixed() <= 2)
if(tarikhblock.toFixed() <= 3)
{
lelongblock = 'disabled';
}
resources/views/includes/login/loginportal.blade.php
+3 -3
View File
@@ -40,9 +40,9 @@
<div class="text-center">
<button type="submit" class="btn bg-gradient-dark w-100 my-4 mb-2" onclick="loadingbtn();this.disabled=true;this.form.submit();" style="background: #4A4E59;">Log Masuk</button>
</div>
<div class="text-center mt-3" style="margin: 0% 10%;">
<!-- <div class="text-center mt-3" style="margin: 0% 10%;">
<a href="https://spare.arrahn.com.my/pembayaransegera" id="buttonspare" title="Pembayaran Pantas SPARE" style="color: #12B652; border: 1px solid #12B652;" class="btn my-4 mb-2" target="_blank">Bayaran Pantas (SPARE)</a href="#">
</div>
</div> -->
<p class="text-sm text-center">
<a href="{{ route('auth.registerfirst') }}">Pertama Kali</a>
@@ -57,4 +57,4 @@
@endsection
@endsection