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

Merge branch 'atie' into 'main'

Browse Source 
update pindah dan tukar tarikh

See merge request online-sistem1/lelong!139
This commit is contained in:
Nur Izzati Zulkifli
2022-08-03 01:13:02 +00:00
parent a35037929d 6053c323bd
commit e05a4b4613
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+2 -4
View File
@@ -2001,8 +2001,7 @@ class LelongController extends Controller
foreach($cawanganlel as $cawlel)
{
$cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
$databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
$databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong')
->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
// dd($databid->toArray());
@@ -2162,8 +2161,7 @@ class LelongController extends Controller
foreach($cawanganlel as $cawlel)
{
$cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
$databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
$databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong')
->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
// dd($databid->toArray());
resources/views/simulasi/senaraisimulasiall.blade.php
+4 -4
View File
@@ -18,8 +18,8 @@
<th>No</th>
<th>Kali Lelong</th>
{{-- <th>Tarikh Lelong</th> --}}
<th>Fasa</th>
<th align='left'>Cawangan</th>
{{-- <th>Fasa</th>
<th align='left'>Cawangan</th> --}}
{{-- <th>Harga Asas (RM)</th> --}}
<th class="text-center">Tindakan</th>
</tr>
@@ -34,7 +34,7 @@
{{$info['info']['tarikh_lelong'] }}
</td> --}}
<td align = 'center'>
{{-- <td align = 'center'>
@foreach($info['detailsinfo'] as $info2)
{{$info2['fasa']}}<br>
@endforeach
@@ -42,7 +42,7 @@
<td align = 'left'>
@foreach($info['detailsinfo'] as $info2)
{{$info2['caw_name']}}<br>
@endforeach
@endforeach --}}
{{-- </td>
<td>{{ $info['info']['harga_emas_asas'] }}</td> --}}
<td class="text-center">