diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 56800c77..9f312757 100644 --- a/app/Http/Controllers/LelongController.php +++ b/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); diff --git a/resources/views/lelong/showpindah.blade.php b/resources/views/lelong/showpindah.blade.php index 97c7b047..f9991088 100644 --- a/resources/views/lelong/showpindah.blade.php +++ b/resources/views/lelong/showpindah.blade.php @@ -11,7 +11,7 @@
