KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 21062022

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2022-06-21 08:28:07 +08:00
parent af03ce430b
commit 68d471d365
7 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+9 -9
View File
@@ -1477,13 +1477,13 @@ class LelongController extends Controller
if($count == 1)
{
$sumhargabida = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id')
->where('lelongbidder.user_id','=',$bidder->user_id)
->where('lelongbid.lelong_id','=',$lelong_id)
->where('lelongbid.caw_id','=',$cawid)
->where('lelongbidder.hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )
->raw("SUM(hargabida) as hargabida")
->get();
// $sumhargabida = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id')
// ->where('lelongbidder.user_id','=',$bidder->user_id)
// ->where('lelongbid.lelong_id','=',$lelong_id)
// ->where('lelongbid.caw_id','=',$cawid)
// ->where('lelongbidder.hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )
// ->raw("SUM(hargabida) as hargabida")
// ->get();
// dd($bidder->user_id);
// dd($bidder->id);
$pemenang = LelongBidder::where('id','=',$bidder->id)->first();
@@ -1526,8 +1526,8 @@ class LelongController extends Controller
$resit->lelong_id = $lelong_id;
$resit->reference_no = $reference_no;
$resit->billplz_id = '';
$resit->total_payment = $sumhargabida->sum('hargabida');
dd($sumhargabida->sum('hargabida'));
$resit->total_payment = 0.00;
//dd($sumhargabida->sum('hargabida'));
$resit->resit_type = 2; // 1 = fee , 2 = bid
$resit->save();
}
app/Http/Controllers/TangguhLelongController.php
+4 -1
View File
@@ -285,18 +285,21 @@ class TangguhLelongController extends Controller
->whereNull('pengesahan.disahkan_pada')
->whereNull('tangguhlelong.tarikhtangguh')
->get();
// dd($pengesahan);
foreach($pengesahan as $index1=>$sah)
{
$lelongbid = LelongBid::where('id', $sah->lelongbid_id)
->where('norujukan', $sah->norujukan)
->where('kodcaw', $caw_code)
// ->where('kodcaw', $caw_code)
->get();
// dd($sah->norujukan);
$pengesahan[$index1]['bid_details'] = $lelongbid;
$pengesahan[$index1]['nota'] = $sah->nota;
}
// dd($pengesahan);
return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code'));
}
resources/views/lelong/showlelong.blade.php
+1 -1
View File
@@ -369,7 +369,7 @@
"orderable": false
}
],
order: [[1, 'asc']],
order: [[0, 'asc']],
// "ordering": false,
"searching":false,
"info": false,
resources/views/pengesahan/senaraitangguhlelong.blade.php
+4 -2
View File
@@ -18,8 +18,9 @@
<tr>
<th>Bil</th>
<th>Tarikh Tangguh</th>
<th>ID Lelong</th>
<th>No Rujukan</th>
<th>Remark</th>
<th>Nota</th>
<th class="text-center">Action</th>
</tr>
</thead>
@@ -28,8 +29,9 @@
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tangguhlel->tarikhtangguh }}</td>
<td>{{ $tangguhlel->lelong_id }}</td>
<td>{{ $tangguhlel->norujukan }}</td>
<td>{{ $tangguhlel->nota }}</td>
<td align = 'left'>{{ $tangguhlel->nota }}</td>
<td>
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>
resources/views/tangguhlelong/senarailelongtangguh.blade.php
+5 -5
View File
@@ -19,12 +19,12 @@
<th>Lelong ID</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<!-- <th>Cawangan</th> -->
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Tempoh</th>
<th>Caj Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
@@ -38,11 +38,11 @@
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td align = 'left'>
<!-- <td align = 'left'>
@foreach($lel['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
</td> -->
<td>{{$lel['info']['harga_emas_asas']}}</td>
<td>{{$lel['info']['jbg']}}</td>
<td>{{$lel['info']['cajlelong']}}</td>
resources/views/tangguhlelong/senleltangguh.blade.php
+1 -1
View File
@@ -20,7 +20,7 @@
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Tempoh</th>
<th>Caj Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
resources/views/tangguhlelong/sensahpc.blade.php
+10 -5
View File
@@ -21,13 +21,13 @@
<th>No</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th>JBG</th>
<th>Tempoh</th>
<th>Marhun</th>
<th>Nilai Marhun (RM)</th>
<th>N.Marhun (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Berat</th>
<th>Remark</th>
<th class="text-center">Action</th>
<th>Nota</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
@@ -36,7 +36,12 @@
@foreach ($pengesahan as $sah)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$sah['bid_details'][0]['t_lelong']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $sah['bid_details'][0]['t_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<!-- <td>{{$sah['bid_details'][0]['t_lelong']}}</td> -->
<td>{{$sah['norujukan']}}</td>
<td>{{$sah['bid_details'][0]['jbg']}}</td>
<td>{{$sah['bid_details'][0]['marhun']}}</td>