filter by cawangan dlm PC

app/Http/Controllers/HomeController.php

@@ -36,7 +36,7 @@ class HomeController extends Controller
         $arrayinfo = [];
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('lelong.fasa','cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong')
         ->where('tarikh_lelong', $dateTime)
         ->groupBy('lelong_id')
         ->get()

app/Http/Controllers/MarhunController.php

@@ -59,21 +59,28 @@ class MarhunController extends Controller
         ->get();
         // dd($sag);
 
-        $sdhdisemak = LelongBid::where('lelong_id', $lelong_id)
+        $sdhdisemak = LelongBid::select('id','norujukan')
+        ->where('lelong_id', $lelong_id)
         ->where('caw_id', $caw->id)
         ->where('status_semak', 1)
+        ->distinct()
         ->get();
 
-        $dalamproses = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
+        $dalamproses = Pengesahan::select('pengesahan.norujukan')
+        ->join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
         ->where('pengesahan.lelong_id', $lelong_id)
         ->where('caw_id','=', $caw->id)
         ->whereNull('pengesahan.disahkan_oleh')
+        ->distinct()
         ->get();
        
-        $sdhdisahkan = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
+        $sdhdisahkan = Pengesahan::select('pengesahan.norujukan')
+        ->join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
         ->where('pengesahan.lelong_id', $lelong_id)
+        ->where('caw_id','=', $caw->id)
         ->whereNotNull('pengesahan.disahkan_oleh')
         ->where('lelongbid.status_semak', 1)
+        ->distinct()
         ->get();
 
         foreach($lelongbid as $index1=>$bid)
@@ -759,7 +766,10 @@ class MarhunController extends Controller
                 $tangguhlelong->tarikhtangguh = $currentdate;
                 $tangguhlelong->ditangguh_oleh = $user->id;
                 $tangguhlelong->ditangguh_pada = $currentdate;
-                $tangguhlelong->nota = $request->nota;
+                if($request->nota == NULL){
+                $tangguhlelong->nota = 'Tiada';}
+                else{
+                $tangguhlelong->nota = $request->nota;}
                 $tangguhlelong->save();
 
                 $updategadai = Gadai::where('norujukan','=',$request->norujukan)->first();

app/Http/Controllers/TangguhLelongController.php

@@ -29,20 +29,27 @@ class TangguhLelongController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
         ->where('cawangan.caw_code', $user->kodcaw)
         ->where('sts_lelong', 0)
-        ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
-        ->groupBy('lelong_id')
+        ->select('lelong_id','cawangan.caw_code','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->distinct()
         ->get()
         ->toArray();
 
         foreach($lelong as $info)
         {
 
-            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-            ->where('lelong_id',$info['lelong_id'])
+            // $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            // ->where('lelong_id',$info['lelong_id'])
+
+            $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual')
+            ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->join('lelongbid','lelongbid.kodcaw','=','cawangan.caw_code')
+            ->where('cawangan_lelong.lelong_id', $info['lelong_id'])
+            ->where('cawangan.caw_code', $user->kodcaw)
+            ->distinct()
             ->get()
             ->toArray();
             array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
-            // dd($arrayinfo);
+            // dd($detailsinfo);
 
         }
 

resources/views/pengesahan/senarailelong.blade.php

@@ -30,7 +30,11 @@
                         <tr>
                             <td>{{$loop->iteration}}</td>
                             <td>{{ $lel['detail']['id']}}</td>
-                            <td>{{ $lel['detail']['tarikh_lelong']}}</td>
+                            <td>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                            @endphp</td>
                             <td align = 'left '>
 
                                 @foreach($lel['detailsinfo'] as $details)