diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index bd211143..8c0fcbb7 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -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){ diff --git a/resources/views/lelong/senaraiubahrugilelongnew.blade.php b/resources/views/lelong/senaraiubahrugilelongnew.blade.php index 572580eb..f085a3ed 100644 --- a/resources/views/lelong/senaraiubahrugilelongnew.blade.php +++ b/resources/views/lelong/senaraiubahrugilelongnew.blade.php @@ -98,14 +98,16 @@ No Rujukan {{-- Nama Pelanggan --}} Tempoh - Berat (gm) - Nilai Marhun Asal (RM) + {{-- Berat (gm) + Nilai Marhun Asal (RM) --}} Pembiayaan (RM) Keuntungan (RM) Harga Asas (RM) Harga Jual (RM) Caj Lelong Asal (RM) Baki/(Rugi) Asal (RM) + Caj Lelong Ubah (RM) + Baki/(Rugi) Ubah (RM) Caj Lelong Baru (RM) Baki/(Rugi) Baru (RM) {{-- Tindakan --}} @@ -122,14 +124,20 @@ {{ $marhun['norujukan']}} {{-- {{ $marhun['nama']['nama']}} --}} {{ number_format($marhun['tempoh'], 2, '.', ',') }} - {{ number_format($marhun['berat'], 2, '.', ',') }} - {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} + {{-- {{ number_format($marhun['berat'], 2, '.', ',') }} + {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} --}} {{ number_format($marhun['pinjaman'], 2, '.', ',') }} {{ number_format($marhun['bakiupah'], 2, '.', ',') }} {{-- {{ number_format($marhun['cajlelong'], 2, '.', ',') }} --}} {{ number_format($marhun['hargaasas'], 2, '.', ',') }} {{ number_format($marhun['hargajual'], 2, '.', ',') }} + {{ number_format($marhun['cajlelongasal'], 2, '.', ',') }} + @if($marhun['bakiasal'] > 0) + {{number_format($marhun['bakiasal'], 2, '.', ',')}} + @elseif($marhun['bakiasal'] < 0 ) + ({{number_format(-($marhun['bakiasal']), 2, '.', ',')}}) + @endif @php $rugi = 0; $baki = 0; @@ -171,12 +179,18 @@ JUMLAH KESELURUHAN - {{ number_format($total_berat, 2, '.', ',') }} - {{ number_format($total_nilaimarhun, 2, '.', ',') }} + {{-- {{ number_format($total_berat, 2, '.', ',') }} + {{ number_format($total_nilaimarhun, 2, '.', ',') }} --}} {{ number_format($total_pinjaman, 2, '.', ',') }} {{ number_format($total_bakiupah, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }} {{ number_format($total_hargajual, 2, '.', ',') }} + {{ number_format($total_cajlelongasal, 2, '.', ',') }} + @if($total_bakilelongasal > 0) + {{ number_format($total_bakilelongasal, 2, '.', ',') }} + @else + ({{number_format(-($total_bakilelongasal), 2, '.', ',')}}) + @endif {{ number_format($total_cazlelong, 2, '.', ',') }} @if($total_bakilelong > 0) {{ number_format($total_bakilelong, 2, '.', ',') }}