Merged in atie (pull request #24)

update fasa dalam pindah lelong

app/Http/Controllers/LelongController.php

@@ -2786,6 +2786,7 @@ class LelongController extends Controller
         $lelong_id = $id;
         $lelong = Lelong::where('id','=',$id)->first();
         $cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get();
+        $fasa = $lelong->fasa;
         $lelkarat = LelKarat::where('lelong_id','=',$id)->get();
         $jeniskarat = JenisKarat::all();
 
@@ -2845,7 +2846,7 @@ class LelongController extends Controller
         // dd($cawangan['caw_code']);
         $datapindah = lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')
-        ->select("lelong.id","lelong.tarikh_lelong")
+        ->select("lelong.id","lelong.tarikh_lelong",'lelong.fasa')
         ->where('cawangan.caw_code','!=', $cawangan['caw_code'])
         ->where('lelong.sts_lelong', 0)
         ->where('cawangan_lelong.lelong_id','!=', $lelong_id)
@@ -2869,7 +2870,8 @@ class LelongController extends Controller
                                                 'total_nilaimarhun',
                                                 'total_pinjaman',
                                                 'lelong_id',
-                                                'data'
+                                                'data',
+                                                'fasa'
                                                 ));
     }
 
@@ -2881,6 +2883,7 @@ class LelongController extends Controller
         $lelongidasal = $request->lelongidasal;
         $lelongidbaru = $request->lelong_id;
         // dd($lelongidasal);
+        $fasa = $request->fasa;
         $tarikhlelongbaru = LelongBid::where('lelong_id','=',$lelongidbaru)
         // ->where('kodcaw','=',$request->caw)
         ->first();
@@ -2893,6 +2896,7 @@ class LelongController extends Controller
             // dd($caw);
             foreach($caw as $index=>$cawpindah){
             $caw_pindah = CawanganLelong::where('caw_id', $cawpindah->id)
+            ->where('fasa', $fasa)
             ->where('masamula_lelong', NULL)
             ->first();
             // dd($caw_pindah);

resources/views/lelong/showpindah.blade.php

@@ -11,7 +11,7 @@
                     </a>
                     <div class="header-style-title">
                        
-                        butiran lelong (Pindah Lelong)
+                        butiran lelong (Pindah Lelong) Batch Lelong : {{$lelong_id}} / Fasa : {{$fasa}}
                     </div>
                 </div>
                 <div class="card-body">
@@ -25,6 +25,7 @@
                  <div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
                         <input type="hidden" name="type" value="User">
                         <input type="hidden" class="form-control" id="lelongidasal" name="lelongidasal" value="{{$lelong_id}}">
+                        <input type="hidden" class="form-control" id="fasa" name="fasa" value="{{$fasa}}">
 
                         <table class="table text-right table-bordered" id="simulasi" style="width:100%">
                             <thead class="bg-primary text-white">
@@ -67,7 +68,7 @@
                     <select class="js-states browser-default select2" name="lelong_id" required id="lelong_id">
                         <option value="option_select" disabled selected>SILA PILIH BATCH LELONG</option>
                         @foreach($datapindah as $data)
-                            <option value="{{ $data['id'] }}">Batch Lelong:{{ $data['id']}} / {{ $data['tarikh_lelong']}}</option>
+                            <option value="{{ $data['id'] }}">Batch Lelong:{{ $data['id']}} / {{ $data['tarikh_lelong']}} / Fasa {{ $data['fasa']}}</option>
                         @endforeach
                     </select>
                     <button type="submit" class="btn btn-success">Pindah Lelong</button>