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:21:02 +08:00
parent 85b0e62d7f
commit 03f23864fc
2 changed files with 66 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/InformationController.php
+13
View File
@@ -74,6 +74,19 @@ class InformationController extends Controller
if(isset($CustomerInfo['lelong']))
{
$lelong += $CustomerInfo['lelong'];
if(isset($CustomerInfo['lelong'])){
if(sizeof($CustomerInfo['lelong']) > 0){
foreach($CustomerInfo['lelong'] as $index=>$lel){
// $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lel['norujukan']])->json();
$array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('http://lelong.test/api/portalApi/',['norujukan' => $lel['norujukan']]);
if($array_lelong['lelong'] !== null){
$CustomerInfo['lelong'][$index] = collect($lel)->merge($array_lelong['lelong'])->toArray();
}
}
$lelong = collect($lelong)->merge($CustomerInfo['lelong']);
$lelong = $lelong->toArray();
}
}
resources/views/includes/home.blade.php
+53 -9
View File
@@ -144,15 +144,34 @@
<div id="loadertable" class="loadertable mt-4"></div>
<div id="lelong" style="margin-bottom: 15px; display:none;" class="">
<i class="text-danger" style="font-size:12px;">1. Sekiranya Lelongan Anda Dalam Tempoh Kontrak Lanjutan (Mencapai 12 Bulan), Urusan Penebusan Hanya Dibenarkan Di Kaunter Cawangan Selewatnya-lewatnya 3 Hari Sebelum Tarikh Lelong.</i><br>
<i class="text-danger" style="font-size:12px;">2. Transaksi Pembayaran Hanya Dibenarkan Selewat-lewatnya 3 Hari Sebelum Lelongan.</i><br>
<i class="text-danger" style="font-size:12px;">(Contoh: Tarikh Lelong: 21-02-2023, Pembayaran/Penebusan Hanya dibenarkan Sehingga Tarikh 18-02-2023 Sahaja)</i>
</div>
<div id="gadai" style="margin-bottom: 15px; display:none;">
<i class="text-danger" style="font-size:12px;">1. Sekiranya Tempoh Gadaian Adalah 12 Bulan Ke Atas, Sila Buat Pembayaran/Penebusan Di Kaunter Cawangan.</i><br>
<i class="text-danger" style="font-size:12px;">2. Maksima bagi transaksi pembayaran ialah 3 SAG sahaja pada satu masa.</i><br>
<i class="text-danger" style="font-size:12px;">3. Sila 'Tick' Pada Kotak Yang Hendak Dibayar.</i>
</div>
<form method="post" id="formtable" class="d-none" action="{{ route('payment.action') }}" onsubmit="return validateform()">
@csrf
<div class="card shadow">
<div class="card-body">
<div style="margin-bottom: 15px;">
<!--<div id="open" style="margin-bottom: 15px;">
<i class="text-danger" style="font-size:12px;">Maksima 3 No Rujukan Sahaja Dibenarkan Dalam Satu Transaksi Pembayaran.</i><br>
<i class="text-danger" style="font-size:12px;">Sila 'Tick' Pada Kotak Yang Hendak Dibayar.</i>
</div>
</div> -->
<!-- <div style="margin-bottom: 15px;">
<i class="text-danger" style="font-size:12px;">Maksima 3 No Rujukan Sahaja Dibenarkan Dalam Satu Transaksi Pembayaran.</i><br>
<i class="text-danger" style="font-size:12px;">Sila 'Tick' Pada Kotak Yang Hendak Dibayar.</i>
</div> -->
@if (\Session::has('error'))
<script>
@@ -172,7 +191,7 @@
<th>No Rujukan</th>
<th>Keuntungan</th>
<th>Cawangan</th>
<th>JBG</th>
<th>Tempoh</th>
<th>T Lanjut</th>
{{-- <th>Status</th> --}}
</tr>
@@ -340,11 +359,15 @@ var hargaemastable = $('#harga_emas').DataTable({
$('#loadertable').removeClass('d-none');
$('#formtable').addClass('d-none');
document.getElementById('gadai').style.display = "block";
document.getElementById('lelong').style.display = "none";
$('#totalsag').text(0);
var empat = selepastawarruqtable.columns(3).header();
var tiga = selepastawarruqtable.columns(2).header();
//$(empat).html('JBG');
$(tiga).html('Keuntungan');
$(empat).html('Cawangan');
selepastawarruqtable.column( 4 ).visible( true );
selepastawarruqtable.column( 5 ).visible( true );
// selepastawarruqtable.column( 6 ).visible( true );
@@ -417,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() <= 3)
if(tarikhblock.toFixed() <= 2)
{
lelongblock = 'disabled';
}
@@ -482,11 +505,16 @@ var hargaemastable = $('#harga_emas').DataTable({
$('#loadertable').removeClass('d-none');
$('#formtable').addClass('d-none');
document.getElementById('gadai').style.display = "block";
document.getElementById('lelong').style.display = "none";
$('#totalsag').text(0);
var empat = selepastawarruqtable.columns(3).header();
// $(empat).html('JBG');
var tiga = selepastawarruqtable.columns(2).header();
//$(empat).html('JBG');
$(tiga).html('Keuntungan');
$(empat).html('Cawangan');
selepastawarruqtable.column( 4 ).visible( true );
selepastawarruqtable.column( 5 ).visible( true );
// selepastawarruqtable.column( 6 ).visible( true );
@@ -558,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() <= 3)
if(tarikhblock.toFixed() <= 2)
{
lelongblock = 'disabled';
}
@@ -631,7 +659,8 @@ var hargaemastable = $('#harga_emas').DataTable({
function lelongan(e){
$('#loadertable').removeClass('d-none');
$('#formtable').addClass('d-none');
document.getElementById('lelong').style.display = "block";
document.getElementById('gadai').style.display = "none";
$('#totalsag').text(0);
var empat = selepastawarruqtable.columns(3).header();
@@ -652,6 +681,7 @@ var hargaemastable = $('#harga_emas').DataTable({
async: false,
dataType: "json",
success: function(data) {
console.log(data);
for(i in data){
datalelong.push(data[i]);
}
@@ -699,7 +729,7 @@ var hargaemastable = $('#harga_emas').DataTable({
var tarikhlelong = new Date(lelong.t_lelong);
tarikhblock = DateDiff(tarikhlelong,today);
if(tarikhblock.toFixed() <= 3)
if(tarikhblock.toFixed() <= 2)
{
lelongblock = 'disabled';
}
@@ -820,8 +850,22 @@ var hargaemastable = $('#harga_emas').DataTable({
$('html,body').animate({
scrollTop: $("#formtable").offset().top},
'slow');
});
// $('.divaktif').click(function() {
// $('#gadai').toggle('slow', function() {
// // Animation complete.
// });
// });
// $('.divlelong').click(function() {
// $('#lelong').toggle('slow', function() {
// // Animation complete.
// });
// });
</script>
<!-- <script>
$(function() {