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 @@