From 65d6f9651af03d8caaee6cd749f7d1301a0b60cf Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Tue, 21 Mar 2023 17:13:41 +0800
Subject: [PATCH] update function xlaku lelong

---
 app/Http/Controllers/LelongController.php | 29 +++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 365ba292..2cbea9bb 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -1236,9 +1236,12 @@ class LelongController extends Controller
         foreach($senarai as $laporan)
         {
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-            ->where('lelong_id',$laporan['lelong_id'])
+            ->join('lelongbid', 'cawangan_lelong.caw_id', '=', 'lelongbid.caw_id')
+            ->where('lelongbid.lelong_id',$laporan['lelong_id'])
+            ->where('lelongbid.status_jual',0)
             ->distinct()
-            ->orderBy('lelong_id')
+            ->orderBy('lelongbid.lelong_id')
+            ->groupBy('lelongbid.caw_id')
             ->get()
             ->toArray();
             array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
@@ -2731,7 +2734,9 @@ class LelongController extends Controller
             $caw = Cawangan::whereIn('caw_code',$request->caw)->get();
             // dd($caw);
             foreach($caw as $index=>$cawpindah){
-            $caw_pindah = CawanganLelong::where('caw_id', $cawpindah->id)->first();
+            $caw_pindah = CawanganLelong::where('caw_id', $cawpindah->id)
+            ->where('masamula_lelong', NULL)
+            ->first();
             // dd($caw_pindah);
 
             $surat = LelongBid::where('lelong_id','=',$lelongidasal)
@@ -3122,7 +3127,11 @@ class LelongController extends Controller
         $id = $request->lelong_id;
         $lelong_id = $id;
         $lelong = Lelong::where('id','=',$id)->first();
-        $cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get();
+        $cawanganlel = CawanganLelong::join('lelongbid', 'lelongbid.caw_id', '=', 'cawangan_lelong.caw_id')
+        ->where('lelongbid.lelong_id','=',$id)
+        ->where('status_jual','=',0)
+        ->groupBy('lelongbid.caw_id')
+        ->get();
         // $tarikhlelongasal = Lelong::where('lelong_id','=',$id)->first();
 
         $arraydata = [];
@@ -3134,6 +3143,7 @@ class LelongController extends Controller
         $total_nmarhun = 0;
         $total_pinjaman = 0;
         $total_nilaimarhun = 0;
+        $total_hargaasas = 0;
         $nilai_marhun = 0;
 
 
@@ -3149,6 +3159,7 @@ class LelongController extends Controller
             $packet = 0;
             $berat = 0;
             $pinjaman =0;
+            $hargaasas =0;
             $nilai_marhun = 0;
             $kali = $cawlel->kali;
 
@@ -3159,6 +3170,7 @@ class LelongController extends Controller
                 $berat = $berat + $bid['berat'];
                 $nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
                 $pinjaman =$pinjaman + $bid['pinjaman'];
+                $hargaasas =$hargaasas + $bid['hargaasas'];
             }
             array_push($arraycaw,[
                 'id_cawangan'=> $cawangan['id'],
@@ -3169,6 +3181,7 @@ class LelongController extends Controller
                 'berat'=>$berat,
                 'n_marhun'=>$nilai_marhun,
                 'pinjaman'=>$pinjaman,
+                'hargaasas'=>$hargaasas,
 
             ]);
 
@@ -3176,6 +3189,7 @@ class LelongController extends Controller
             $total_berat = $total_berat + $berat;
             $total_pinjaman = $total_pinjaman + $pinjaman;
             $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
+            $total_hargaasas = $total_hargaasas + $hargaasas;
 
             $data = Lelong::where('lelong.id','=',$lelong_id)
             ->get();
@@ -3202,6 +3216,7 @@ class LelongController extends Controller
                                                 'total_nmarhun',
                                                 'total_nilaimarhun',
                                                 'total_pinjaman',
+                                                'total_hargaasas',
                                                 'lelong_id',
                                                 'data'
                                                 ));
@@ -3321,7 +3336,11 @@ class LelongController extends Controller
             $lelkarat->harga2 = $lelongkarat->harga2;
             $lelkarat->save();
         }
-        $cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get();
+        $cawanganlel = CawanganLelong::join('lelongbid', 'lelongbid.caw_id', '=', 'cawangan_lelong.caw_id')
+        ->where('lelongbid.lelong_id','=',$id)
+        ->where('status_jual','=',0)
+        ->groupBy('lelongbid.caw_id')
+        ->get();
         foreach($cawanganlel as $caw)
         {
             $namacaw = CawanganLelong::join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')