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

Merge branch 'atie' into 'main'

Browse Source 
update show lelong

See merge request online-sistem1/lelong!44
This commit is contained in:
Nur Izzati Zulkifli
2022-06-02 07:01:46 +00:00
parent c6acb983e4 b78bf7c56c
commit 9a0e68ba7d
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+8 -3
View File
@@ -113,12 +113,14 @@ class LelongController extends Controller
$total_upahkeuntungan2 = 0;
$total_nilaimarhun = 0;
$nilai_marhun = 0;
$totalkeuntungan = 0;
$totalkeuntungan2 = 0;
foreach($cawanganlel as $cawlel)
{
$cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
$databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->select('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')
->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')
->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
// dd($databid->toArray());
@@ -146,7 +148,7 @@ class LelongController extends Controller
$databid[$index1]['keuntungan'] = $keuntungan;
$total_upahkeuntungan = bcdiv($total_upahkeuntungan,1,1) + bcdiv($keuntungan,1,1);
$totalkeuntungan = $totalkeuntungan + $bid['bakiupah'];
if($bid['baki'] > 0)
{
@@ -214,6 +216,7 @@ class LelongController extends Controller
'n_marhun'=>$nilai_marhun,
'pinjaman'=>$pinjaman,
'upahsimpan'=>bcdiv($total_upahkeuntungan,1,1),
'bakiupah'=>$totalkeuntungan,
'hargaasas'=>$hargaasas,
'cajlelong'=>$cajlelong,
'rugilelong'=>$rugilelong,
@@ -230,6 +233,7 @@ class LelongController extends Controller
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
$total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
$totalkeuntungan2 = $totalkeuntungan2 + $totalkeuntungan;
$data = Lelong::where('lelong.id','=',$lelong_id)
@@ -266,7 +270,8 @@ class LelongController extends Controller
'keuntungan',
'total_upahkeuntungan',
'total_nilaimarhun',
'total_upahkeuntungan2'));
'total_upahkeuntungan2',
'totalkeuntungan2'));
}
public function create($id)
resources/views/lelong/showlelong.blade.php
+3 -3
View File
@@ -27,7 +27,7 @@
<td>Bilangan Lelong : {{$total_marhun}}</td>
</tr>
<tr>
<td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }}</td>
<td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
@@ -97,7 +97,7 @@
<td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
@@ -112,7 +112,7 @@
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>{{ number_format($total_upahkeuntungan2, 2, '.', ',') }}</td>
<td>{{ number_format($totalkeuntungan2, 2, '.', ',') }}</td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>