diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 45749819..89a497bf 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -1062,6 +1062,7 @@ class PembidaController extends Controller { // dd($detailspayment); $detailspayment = null; + $scanserah = null; if($sag['payment_id'] != null) { $detailspayment = Payment::where('id', $sag['payment_id'])->first(); @@ -1075,7 +1076,8 @@ class PembidaController extends Controller }else { $total_payment = '0.00'; - $scanserah = 'Belum Bayar'; + //$scanserah = 'Belum Bayar'; + $scanserah = null; } } diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 1d194064..59bd13b9 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -279,15 +279,14 @@ class TangguhLelongController extends Controller { $arrayinfo = []; - $tangguh = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') - ->join('lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id') + $tangguh = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id') + ->join('cawangan','cawangan.caw_code','=','tangguhlelong.kodcaw') ->where('tangguhlelong.status','!=',4) ->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') + ->select('tangguhlelong.kodcaw','tangguhlelong.lelong_id', 'lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg') ->distinct() ->get(); - // ->toArray(); + //display only cwgn yg mohon tangguh 24.01.2023..to be continued..done foreach($tangguh as $index=>$t) { @@ -302,8 +301,6 @@ class TangguhLelongController extends Controller array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]); } - - return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo')); } @@ -911,58 +908,37 @@ class TangguhLelongController extends Controller { $arrayinfo = []; - // $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - // ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - // ->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') - // ->where('lelong.sts_lelong', 0) - // ->where('tangguhlelong.status',4) - // ->select('cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong','cawangan.caw_code') - // ->groupBy('cawangan_lelong.lelong_id') - // ->get() - // ->toArray(); - - $lelong = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') - ->join('lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id') - ->where('tangguhlelong.status',4) - ->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') + $lelong = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id') + ->join('cawangan','cawangan.caw_code','=','tangguhlelong.kodcaw') + ->where(function($query){ + $query->whereNull('tangguhlelong.status') + ->orWhere('tangguhlelong.status','=', 4); + }) + ->select('tangguhlelong.kodcaw','tangguhlelong.lelong_id', 'lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg') ->distinct() - ->orderBy('cawangan_lelong.lelong_id') - ->get() - ->toArray(); + ->get(); + //display only cwgn yg mohon tangguh 24.01.2023..to be continued ..done - $lelong= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->where('lelong.sts_lelong',0) - ->select('lelong_id','tarikh_lelong','lelong.fasa','jbg','sts_lelong') - ->distinct() - ->orderBy('lelong_id') - ->get() - ->toArray(); - // dd($lelong); - - foreach($lelong as $info) + foreach($lelong as $index=>$info) { - - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$info['lelong_id']) - ->get() - ->toArray(); - $sag = TangguhLelong::where('lelong_id', $info['lelong_id']) - // ->where('kodcaw', $info['caw_code']) - ->where('status',4) + ->where('kodcaw', $info['caw_code']) + ->where(function($query){ + $query->whereNull('tangguhlelong.status') + ->orWhere('tangguhlelong.status','=', 4); + }) ->select('norujukan') ->get() ->count(); - array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo, 'sag'=>$sag]); - // dd($arrayinfo); + $tangguh[$index]['bilsag'] = $sag; + array_push($arrayinfo,['info'=>$info, 'sag'=>$sag]); } return view('tangguhlelong.senleltlhtangguh',compact('lelong', 'arrayinfo')); } + public function operasisenlulustangguh($lelong_id, $caw_code) { $caw_code = $caw_code; @@ -970,8 +946,12 @@ class TangguhLelongController extends Controller $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); - $tangguh = TangguhLelong::where('status',4) + $tangguh = TangguhLelong::where(function($query){ + $query->whereNull('tangguhlelong.status') + ->orWhere('tangguhlelong.status','=', 4); + }) ->where('kodcaw','=',$caw_code) + ->where('lelong_id','=',$lelong_id) ->get(); // dd($tangguh); @@ -1021,4 +1001,6 @@ class TangguhLelongController extends Controller ]); } + + } diff --git a/resources/views/pembida/statusserahanbidaan.blade.php b/resources/views/pembida/statusserahanbidaan.blade.php index c6d078c7..623b1332 100644 --- a/resources/views/pembida/statusserahanbidaan.blade.php +++ b/resources/views/pembida/statusserahanbidaan.blade.php @@ -319,7 +319,7 @@ BELUM SERAH @endif @else - BELUM SELESAI + BELUM SERAH @endif
@empty diff --git a/resources/views/tangguhlelong/senaraimohontangguh.blade.php b/resources/views/tangguhlelong/senaraimohontangguh.blade.php index b1398980..c079a044 100644 --- a/resources/views/tangguhlelong/senaraimohontangguh.blade.php +++ b/resources/views/tangguhlelong/senaraimohontangguh.blade.php @@ -161,7 +161,7 @@ @if($lulus['status'] == 4) - + @endif @@ -239,7 +239,86 @@ - @endsection \ No newline at end of file diff --git a/resources/views/tangguhlelong/senaraimohontangguh2.blade.php b/resources/views/tangguhlelong/senaraimohontangguh2.blade.php new file mode 100644 index 00000000..f1313cf9 --- /dev/null +++ b/resources/views/tangguhlelong/senaraimohontangguh2.blade.php @@ -0,0 +1,377 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+
+
+
+ Senarai Permohonan Tangguh Lelong +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + + + +
+ +
+
+
+ + + + + + + + + + + + + + @forelse ($tangguh as $index1=>$mohon) + @if(empty($mohon)) + + + @else + + + + + + + + + + + @endif + @empty + + + + @endforelse + + +
NoBatch LelongTarikh LelongNo RujukanTarikh Mohon / LulusStatusTindakan
{{$loop->iteration}}{{ $mohon['lelong_id']}} + @if($mohon['status'] == 4) + + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $mohon['tdet'][0]['t_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @else + + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $mohon['tdet'][0]['t_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @endif + {{$mohon['norujukan']}}{{$mohon['ditangguh_pada']}} + @if($mohon['status'] == 0) + + @elseif($mohon['status'] == 1) + + @elseif($mohon['status'] == 2) + + @elseif($mohon['status'] == 3) + + @elseif($mohon['status'] == 4) + + @elseif($mohon['status'] == 99) + + @elseif($mohon['status'] == NULL) + + @endif + + + @if($mohon['status'] == 0) + + + @elseif($mohon['status'] == 1 || $mohon['status'] >= 4) + + @endif +
No data available in table
+
+
+ +
+
+ + + + + + + + + + + + + + @forelse ($tlhtangguh as $index1=>$lulus) + @if(empty($lulus)) + + + @else + + + + + + + + + + + @endif + @empty + + + + @endforelse + + +
NoBatch LelongTarikh LelongNo RujukanTarikh Mohon / LulusStatusTindakan
{{$loop->iteration}}{{ $lulus['lelong_id']}} + @if($lulus['status'] == 4) + + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['tlh'][0]['tarikh_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @else + + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['tlh'][0]['tarikh_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @endif + {{$lulus['norujukan']}}{{$lulus['ditangguh_pada']}} + @if($lulus['status'] == 0 && $lulus['nota'] == NULL) + + @elseif($lulus['status'] == 1) + + @elseif($lulus['status'] == 2) + + @elseif($lulus['status'] == 3) + + @elseif($lulus['status'] == 4) + + @elseif($lulus['status'] == 99) + + @elseif($lulus['status'] == NULL && $lulus['nota'] != NULL) + + @endif + + + @if($lulus['status'] == 0) + + + @elseif($lulus['status'] == 1 || $lulus['status'] >= 4) + + @endif +
No data available in table
+
+
+ +
+
+ + + + + + + + + + + + + + @forelse ($oprtangguh as $index1=>$lulus) + @if(empty($lulus)) + + + @else + + + + + + + + + + + @endif + @empty + + + + @endforelse + + +
NoBatch LelongTarikh LelongNo RujukanTarikh Mohon / LulusStatus
{{$loop->iteration}}{{ $lulus['lelong_id']}} + @if($lulus['status'] == 4) + + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['opr'][0]['tarikh_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @else + + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['opr'][0]['tarikh_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @endif + {{$lulus['norujukan']}}{{$lulus['ditangguh_pada']}} + @if($lulus['status'] == 0 && $lulus['nota'] == NULL) + + @elseif($lulus['status'] == 1) + + @elseif($lulus['status'] == 2) + + @elseif($lulus['status'] == 3) + + @elseif($lulus['status'] == 4) + + @elseif($lulus['status'] == 99) + + @elseif($lulus['status'] == NULL && $lulus['nota'] != NULL) + + @endif +
No data available in table
+
+
+
+ + +
+
+
+ + + + @endsection \ No newline at end of file diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php index 7fe8dae1..b215c859 100644 --- a/resources/views/tangguhlelong/senleltangguh.blade.php +++ b/resources/views/tangguhlelong/senleltangguh.blade.php @@ -66,7 +66,7 @@ @endif - @if($lel['sts_lelong'] == 0) + @if($lel['sts_lelong'] == 0 && $lel['bilsag'] != 0)
diff --git a/resources/views/tangguhlelong/senleltlhtangguh.blade.php b/resources/views/tangguhlelong/senleltlhtangguh.blade.php index 56dcd5bc..87d62b8e 100644 --- a/resources/views/tangguhlelong/senleltlhtangguh.blade.php +++ b/resources/views/tangguhlelong/senleltlhtangguh.blade.php @@ -43,11 +43,7 @@ echo($datez); @endphp - - @foreach($lel['detailsinfo'] as $details) - {{$details['caw_name']}}
- @endforeach - + {{$lel['info']['caw_name']}} {{$lel['sag']}} {{$lel['info']['jbg']}} @@ -61,15 +57,12 @@ @endif - - @if($lel['info']['sts_lelong'] == 0) - +
- +
- @endif @endforeach diff --git a/resources/views/tangguhlelong/senmohontangguhtelahlulus.blade.php b/resources/views/tangguhlelong/senmohontangguhtelahlulus.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/resources/views/tangguhlelong/sentangguhoperasi.blade.php b/resources/views/tangguhlelong/sentangguhoperasi.blade.php index cbc209d6..da3c7ff5 100644 --- a/resources/views/tangguhlelong/sentangguhoperasi.blade.php +++ b/resources/views/tangguhlelong/sentangguhoperasi.blade.php @@ -10,7 +10,7 @@
- Pengesahan Tangguh Lelong + Senarai Telah Tangguh Lelong
@@ -56,7 +56,9 @@ {{$sah['bid_details'][0]['berat']}} --> - @if($sah['status'] == 0) + @if($sah['status'] == NULL) + + @elseif($sah['status'] == 0) @elseif($sah['status'] == 1)