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

update cajrugilelong tambah figure asal, figure ubah dan kontra

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2023-03-27 11:15:04 +08:00
parent af2997a468
commit 642cc56f49
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+10 -3
View File
@@ -7138,6 +7138,8 @@ class LelongController extends Controller
$total_hargajual = 0;
$total_cajlelnew = 0;
$total_rugilelongnew = 0;
$total_cajlelongasal = 0;
$total_bakilelongasal = 0;
$newcajlel= 0;
$newbaki = 0;
$lelongid = $request->lelongid;
@@ -7175,8 +7177,8 @@ class LelongController extends Controller
// $newbaki = 0;
}
}elseif($rugilelongnew > 0){
$newcajlel = $cajlelnew;
$newbaki = $rugilelongnew;
$newcajlel = $cajlelnew + $rugilelongnew;
$newbaki = 0.00;
}
array_push($arraymarhun,[
@@ -7189,6 +7191,8 @@ class LelongController extends Controller
'hargajual' => $cal['hargajual'],
'pinjaman' => $cal['pinjaman'],
'bakiupah' => $cal['bakiupah'],
'cajlelongasal' => $cal['cajlelong'],
'bakiasal' => $cal['baki'],
'cajlelong' => $cajlelnew,
'baki' => $rugilelongnew,
'cajlelongnew' => $newcajlel,
@@ -7199,6 +7203,8 @@ class LelongController extends Controller
$total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cajlelongasal = $total_cajlelongasal + $cal['cajlelong'];
$total_bakilelongasal = $total_bakilelongasal + $cal['baki'];
$total_cazlelong = $total_cazlelong + $cajlelnew;
$total_bakilelong = $total_bakilelong + $rugilelongnew;
$total_hargajual = $total_hargajual + $cal['hargajual'];
@@ -7240,7 +7246,8 @@ class LelongController extends Controller
'total_bakilelong',
'total_hargajual',
'total_cajlelnew',
'total_rugilelongnew','cajlelong'));
'total_rugilelongnew','cajlelong','total_cajlelongasal',
'total_bakilelongasal',));
}
public function editcajrugilelong(Request $request){
resources/views/lelong/senaraiubahrugilelongnew.blade.php
+20 -6
View File
@@ -98,14 +98,16 @@
<th>No Rujukan</th>
{{-- <th>Nama Pelanggan</th> --}}
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun Asal (RM)</th>
{{-- <th>Berat (gm)</th>
<th>Nilai Marhun Asal (RM)</th> --}}
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Asas (RM)</th>
<th>Harga Jual (RM)</th>
<th style="background-color: crimson">Caj Lelong Asal (RM)</th>
<th style="background-color: crimson">Baki/(Rugi) Asal (RM)</th>
<th style="background-color: rgb(17, 31, 94)">Caj Lelong Ubah (RM)</th>
<th style="background-color: rgb(17, 31, 94p)">Baki/(Rugi) Ubah (RM)</th>
<th style="background-color: rgb(20, 220, 20)">Caj Lelong Baru (RM)</th>
<th style="background-color: rgb(20, 220, 20)">Baki/(Rugi) Baru (RM)</th>
{{-- <th>Tindakan</th> --}}
@@ -122,14 +124,20 @@
<td align = 'left' style="white-space: nowrap;"> <input type="hidden" name="lelongbid_id[]" value="{{ $marhun['lelongbid_id']}}"><input type="hidden" name="norujukan[]" value="{{ $marhun['norujukan']}}">{{ $marhun['norujukan']}}</td>
{{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
<td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
{{-- <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td> --}}
<td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
{{-- <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td> --}}
<td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['hargajual'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['cajlelongasal'], 2, '.', ',') }}</td>
<td align = 'right'>@if($marhun['bakiasal'] > 0)
{{number_format($marhun['bakiasal'], 2, '.', ',')}}
@elseif($marhun['bakiasal'] < 0 )
({{number_format(-($marhun['bakiasal']), 2, '.', ',')}})
@endif</b></td>
@php
$rugi = 0;
$baki = 0;
@@ -171,12 +179,18 @@
<tfoot>
<tr>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
{{-- <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td> --}}
<td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_cajlelongasal, 2, '.', ',') }}</b></td>
<td align = 'right'><b><b>@if($total_bakilelongasal > 0)
{{ number_format($total_bakilelongasal, 2, '.', ',') }}
@else
({{number_format(-($total_bakilelongasal), 2, '.', ',')}})
@endif</b></td>
<td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
<td align = 'right'><b>@if($total_bakilelong > 0)
{{ number_format($total_bakilelong, 2, '.', ',') }}