From 0d93ae085ac1d05f27214cc5ecb305c35ba95fa3 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 28 Nov 2022 12:14:26 +0800 Subject: [PATCH 1/2] update senleltangguh --- .../Controllers/TangguhLelongController.php | 10 ++++++---- .../tangguhlelong/senactionoperasi.blade.php | 19 +++++++++++++------ .../tangguhlelong/senleltangguh.blade.php | 4 +++- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index fba19143..eeee2f25 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -286,10 +286,10 @@ class TangguhLelongController extends Controller ->where('lelong.sts_lelong',0) ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg') ->distinct() - ->get() - ->toArray(); + ->get(); + // ->toArray(); - foreach($tangguh as $t) + foreach($tangguh as $index=>$t) { $sag = TangguhLelong::where('lelong_id', $t['lelong_id']) ->where('kodcaw', $t['caw_code']) @@ -298,12 +298,13 @@ class TangguhLelongController extends Controller ->get() ->count(); + $tangguh[$index]['bilsag'] = $sag; array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]); } - return view('tangguhlelong.senleltangguh',compact('tangguh','sag')); + return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo')); } @@ -726,6 +727,7 @@ class TangguhLelongController extends Controller $tangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw) ->get(); + // dd($tangguh); foreach($tangguh as $index1=>$t) { diff --git a/resources/views/tangguhlelong/senactionoperasi.blade.php b/resources/views/tangguhlelong/senactionoperasi.blade.php index f4f79507..eec663dc 100644 --- a/resources/views/tangguhlelong/senactionoperasi.blade.php +++ b/resources/views/tangguhlelong/senactionoperasi.blade.php @@ -3,11 +3,18 @@ @section('content')
-
-

Senarai Permohonan Tangguh Lelong

- +
+
+
+ + + +
+ Senarai Permohonan Tangguh Lelong + +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -15,7 +22,7 @@ @endif
- +
diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php index a481fc35..7fe8dae1 100644 --- a/resources/views/tangguhlelong/senleltangguh.blade.php +++ b/resources/views/tangguhlelong/senleltangguh.blade.php @@ -49,7 +49,9 @@ {{$lel['caw_name']}}
- +
No {{$sag}} + {{$lel['bilsag']}} + {{$lel['jbg']}} From 9afab6580785644e000658bbec0ad3fd75b444ae Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 28 Nov 2022 15:51:36 +0800 Subject: [PATCH 2/2] update tukar tarikh lelong --- app/Http/Controllers/LelongController.php | 45 +++++++++---------- .../views/lelong/showtukartarikh.blade.php | 4 +- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c31956aa..e69be024 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -2588,7 +2588,7 @@ class LelongController extends Controller $tarikhlelongbaru = $request->tarikhlelongbaru; // dd($tarikhlelongbaru); $lelongidasal = $request->lelongidasal; - $lelongidbaru = $request->lelongidbaru; + // $lelongidbaru = $request->lelongidbaru; // dd($request->caw); $lelkarat = LelKarat::where('lelong_id','=',$lelongidasal)->get(); @@ -2601,26 +2601,26 @@ class LelongController extends Controller // dd($cawanganasal); // dd( $lelongidbaru); - $lelongnew = new Lelong(); - $lelongnew->tarikh_lelong = $tarikhlelongbaru; - $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas; - $lelongnew->jbg = $lelongasal->jbg; - $lelongnew->cajlelong = $lelongasal->cajlelong; - $lelongnew->fasa = $lelongasal->fasa; - $lelongnew->kali = $lelongasal->kali; - $lelongnew->save(); + // $lelongnew = new Lelong(); + // $lelongnew->tarikh_lelong = $tarikhlelongbaru; + // $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas; + // $lelongnew->jbg = $lelongasal->jbg; + // $lelongnew->cajlelong = $lelongasal->cajlelong; + // $lelongnew->fasa = $lelongasal->fasa; + // $lelongnew->kali = $lelongasal->kali; + // $lelongnew->save(); - foreach($lelkarat as $lelongKarat) - { - $lelkarat = new LelKarat; - $lelkarat->lelong_id = $lelongnew->id; - $lelkarat->karat = $lelongKarat->karat; - $lelkarat->keterangan = $lelongKarat->keterangan; - $lelkarat->harga = $lelongKarat->harga; - $lelkarat->harga2 = $lelongKarat->harga2; - $lelkarat->save(); - } + // foreach($lelkarat as $lelongKarat) + // { + // $lelkarat = new LelKarat; + // $lelkarat->lelong_id = $lelongnew->id; + // $lelkarat->karat = $lelongKarat->karat; + // $lelkarat->keterangan = $lelongKarat->keterangan; + // $lelkarat->harga = $lelongKarat->harga; + // $lelkarat->harga2 = $lelongKarat->harga2; + // $lelkarat->save(); + // } //tukartarikh ID lelong @@ -2635,10 +2635,8 @@ class LelongController extends Controller // dd($cawtukartarikh->caw_id); - $caw_tukartarikh = CawanganLelong::where('caw_id', $cawtukartarikh->id) - ->where('lelong_id', $request->lelongidasal)->first(); - // dd($caw_tukartarikh); - $caw_tukartarikh->lelong_id = $request->lelongidbaru; + $caw_tukartarikh = Lelong::where('id', $request->lelongidasal)->first(); + $caw_tukartarikh->tarikh_lelong = $tarikhlelongbaru; $caw_tukartarikh->update(); $surat = LelongBid::where('lelong_id','=',$lelongidasal) @@ -2654,7 +2652,6 @@ class LelongController extends Controller { // dd($request->lelongidbaru); $caw_pindahsag = LelongBid::where('norujukan', $data->norujukan)->first(); - $caw_pindahsag->lelong_id = $request->lelongidbaru; $caw_pindahsag->t_lelong = $tarikhlelongbaru; $caw_pindahsag->update(); } diff --git a/resources/views/lelong/showtukartarikh.blade.php b/resources/views/lelong/showtukartarikh.blade.php index f26ba272..2721e49e 100644 --- a/resources/views/lelong/showtukartarikh.blade.php +++ b/resources/views/lelong/showtukartarikh.blade.php @@ -85,13 +85,13 @@ -
+ {{--
-
+
--}}