diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 7528eddd..35a404fe 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -399,6 +399,7 @@ class MarhunController extends Controller $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id') ->where('lelong.id', $id) ->whereNull('disahkan_oleh') + ->where('pengesahan.status_ubah', [1,2,3,4,5]) ->selectRaw('count(*) as total, sum(status) as tstat,norujukan') ->groupBy('pengesahan.norujukan') ->get()->toArray(); @@ -653,10 +654,22 @@ class MarhunController extends Controller public function senarailelong() { - $lelong = Lelong::where('sts_lelong', 0) - ->get(); + $arrayinfo = []; - return view('pengesahan.senarailelong',compact('lelong')); + $lelong = Lelong::where('sts_lelong', 0) + ->get()->toArray(); + + foreach($lelong as $details) + { + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id', $details['id']) + ->get() + ->toArray(); + + array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); + } + + return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo')); } public function senaraitangguhlelong($id) @@ -679,14 +692,41 @@ class MarhunController extends Controller ) ->get(); + foreach($tangguhlelong as $index1=>$tanguhlel) + { + $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') + ->where('lelong_id', $id) + ->first(); + + $tangguhlelong[$index1]['details'] = $tanguhlel; + $tangguhlelong[$index1]['nama_caw'] = $getkodcaw; + } + return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id')); } public function lelbidmarhun($id, $norujukan, $tangguhlelong_id) { - $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id') - ->where('tangguhlelong.lelong_id', $id) - ->where('tangguhlelong.norujukan', $norujukan) + $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') + ->where('gadaimarhun.norujukan', $norujukan) + ->where('tangguhlelong.id', $tangguhlelong_id) + ->select('tangguhlelong.id as tangguhlelong_id', + 'tangguhlelong.lelong_id', + 'tangguhlelong.lelongbid_id', + 'tangguhlelong.norujukan', + 'tangguhlelong.pinjaman', + 'tangguhlelong.tarikhtangguh', + 'tangguhlelong.nota as tangguh_nota', + 'tangguhlelong.pinjaman', + 'gadaimarhun.id as gadaimarhun_id', + 'gadaimarhun.bil', + 'gadaimarhun.marhun', + 'gadaimarhun.nota as gadai_nota', + 'gadaimarhun.karat', + 'gadaimarhun.berat', + 'gadaimarhun.harga', + 'gadaimarhun.n_marhun' + ) ->get(); return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan')); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 87ec1faa..76431cac 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -92,6 +92,7 @@ class TangguhLelongController extends Controller } $getic[$index1]['user_details'] = $getnorujukan; + // dd($getic[$index1]['user_details']); } $lelong_id = $request->lelong_id; @@ -109,14 +110,14 @@ class TangguhLelongController extends Controller $currentdate = $currentdate->toDateTimeString(); $lelbidmarhun = $request->checkboxdata; + // dd($lelbidmarhun); $lelong = Lelong::where('id', $request->lelong_id)->get()->toArray(); foreach($lelbidmarhun as $bidmarhun) { - // dd($bidmarhun); $lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') - ->where('lelongbidmarhun.id', $bidmarhun) + ->where('lelongbid.id', $bidmarhun) ->select('lelongbidmarhun.id as lelongbidmarhun_id', 'lelongbidmarhun.bil', 'lelongbidmarhun.marhun', @@ -152,10 +153,11 @@ class TangguhLelongController extends Controller 'lelongbid.marhun', ) ->get()->toArray(); + // dd($lelongbidmarhun); $pengesahan = new Pengesahan(); $pengesahan->lelong_id = $request->lelong_id; - $pengesahan->lelongbid_id = $lelongbidmarhun[0]['lelongbid_id']; + $pengesahan->lelongbid_id = $bidmarhun; $pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id']; $pengesahan->norujukan = $lelongbidmarhun[0]['norujukan']; $pengesahan->diminta_oleh = $user->id; @@ -285,7 +287,7 @@ class TangguhLelongController extends Controller $tangguhlelong = new TangguhLelong(); $tangguhlelong->lelong_id = $request->lelong_id; - $tangguhlelong->lelongbid_id = $lelongbidmarhun[0]['lelongbid_id']; + $tangguhlelong->lelongbid_id = $bidmarhun; $tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan']; $tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman']; $tangguhlelong->tarikhtangguh = $currentdate; diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php index e2f30a38..4db10ef4 100644 --- a/resources/views/tangguhlelong/searchbyic.blade.php +++ b/resources/views/tangguhlelong/searchbyic.blade.php @@ -11,10 +11,10 @@ @endif -
+ @csrf - +
@@ -48,10 +48,10 @@
No
- @@ -101,7 +101,7 @@ } - var tabletangguhlelong = $('#tangguhlelong').DataTable( { + var tabletangguhlel = $('#tangguhlel').DataTable( { "columnDefs": [ { "targets": 0, diff --git a/resources/views/tangguhlelong/sensahpc.blade.php b/resources/views/tangguhlelong/sensahpc.blade.php index fb6ff618..ab9b2f11 100644 --- a/resources/views/tangguhlelong/sensahpc.blade.php +++ b/resources/views/tangguhlelong/sensahpc.blade.php @@ -25,12 +25,13 @@ Narhun Nilai Marhun (RM) Pembiayaan (RM) - Berat + Berat Action + @foreach ($pengesahan as $sah) {{$loop->iteration}} @@ -51,8 +52,8 @@ - @@ -138,7 +139,7 @@ // $("#formtangguhlelong").submit(); // } // } - ] + // ] }); $('.addsim').tooltip();