From 93bad57a6856ca1fd7b52eb75769e2f0c56347dd Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 19 Sep 2022 14:00:36 +0800 Subject: [PATCH 1/2] update para2 --- resources/views/pdf/jananotis.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php index 5a0d4fa8..b6f3ae09 100644 --- a/resources/views/pdf/jananotis.blade.php +++ b/resources/views/pdf/jananotis.blade.php @@ -241,7 +241,7 @@ @endphp:-

- @php echo $caw['para3']; @endphp + @php echo $caw['para2']; @endphp

Notis:

Sila bawa bersama Surat Akaun Gadai (SAG) untuk sebarang urusan.
From 6c26357fa5f8cff905a60276fb3bad0d5dc3c585 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 19 Sep 2022 14:57:50 +0800 Subject: [PATCH 2/2] update kelulusan ubah marhun dari pageoperasi kpd page PC --- app/Http/Controllers/HomeController.php | 8 +- app/Http/Controllers/MarhunController.php | 18 ++- resources/views/home.blade.php | 121 +++++++++--------- .../senarailelongubahmutu.blade.php | 8 +- 4 files changed, 83 insertions(+), 72 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 6336708a..454efaa0 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -87,12 +87,13 @@ class HomeController extends Controller $arrayinfomutu = []; //HOME KELULUSAN MUTU MARHUN $lelongmutu = pengesahan::join('lelong','lelong.id','=','pengesahan.lelong_id') + ->join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan') // ->where('sts_lelong', 0) + ->where('lelongbid.kodcaw', $user->kodcaw) ->whereIn('pengesahan.status_ubah', [1,2,3,4,5]) ->where('disahkan_oleh','=', NULL) ->select('pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') // ->groupBy('pengesahan.lelong_id') - ->distinct() ->get() ->toArray(); @@ -103,6 +104,7 @@ class HomeController extends Controller foreach($lelongmutu as $infomutu) { $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan.caw_code', $user->kodcaw) ->where('lelong_id',$infomutu['lelong_id']) ->get() ->toArray(); @@ -138,9 +140,11 @@ class HomeController extends Controller public function senarailelongubahmutu() { $arrayinfo = []; + $user = Auth::user(); + // dd($user->kodcaw); $lelong = pengesahan::join('lelong','lelong.id','=','pengesahan.lelong_id') - // ->where('sts_lelong', 0) + ->whereIn('pengesahan.status_ubah', [1,2,3,4,5]) ->select('pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') // ->groupBy('pengesahan.lelong_id') diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 6476eeea..4d19ab71 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -700,11 +700,11 @@ class MarhunController extends Controller public function senarailelongubahmutu() { $arrayinfo = []; - + $lelong = pengesahan::join('lelong','lelong.id','=','pengesahan.lelong_id') // ->where('sts_lelong', 0) ->whereIn('pengesahan.status_ubah', [1,2,3,4,5]) - ->select('pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') + ->select('lelong.fasa','pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') // ->groupBy('pengesahan.lelong_id') ->distinct() @@ -725,19 +725,23 @@ class MarhunController extends Controller } public function sahubahmutu($id){ - - $mutumarhun = Pengesahan::whereNull('disahkan_oleh') + + $user = Auth::user(); + $mutumarhun = Pengesahan::join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan') + ->where('lelongbid.kodcaw', $user->kodcaw) + ->whereNull('disahkan_oleh') ->whereNull('disahkan_pada') - ->where('lelong_id', $id) + ->where('pengesahan.lelong_id', $id) ->whereIn('status_ubah', [1,2,3,4,5]) - ->selectRaw('count(*) as total, sum(status) as tstat,norujukan') - ->groupBy('norujukan') + ->selectRaw('count(*) as total, sum(status) as tstat,pengesahan.norujukan') + ->groupBy('pengesahan.norujukan') ->get() ->toArray(); foreach($mutumarhun as $index1=>$mutu) { $cawangan = LelongBid::join('cawangan', 'lelongbid.caw_id', 'cawangan.id') + ->where('lelongbid.kodcaw', $user->kodcaw) ->where('lelongbid.lelong_id', $id) ->where('lelongbid.norujukan', $mutu['norujukan']) ->select('cawangan.caw_name') diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 5e622c57..5b0c04bb 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -44,6 +44,66 @@ + @php + @empty($arrayinfomutu) + @endphp + + @if(count($arrayinfomutu)> 0) + KELULUSAN UBAH MARHUN + + + + + + + + + + + + + + + + + @foreach($arrayinfomutu as $lel) + + + + + + + + + + + + + + @endforeach + +
NoID LelongCawanganTarikh LelongHarga Emas AsasTempohCaj LelongStatus LelongPengesahanTelah Sah
{{$loop->iteration}}{{ $lel['info']['lelong_id'] }} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
+ @endforeach + 		@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp{{ number_format($lel['info']['harga_emas_asas'], 2, '.', ',')}}{{ $lel['info']['jbg'] }}{{ $lel['info']['cajlelong'] }} + @if($lel['info']['sts_lelong'] == 0) + + @endif + + + + +
+ @endif + @php + + @endphp @endhasrole @hasrole('pengurus-cawangan-khas') I am a pengurus-cawangan-khas! @@ -200,66 +260,7 @@ - @php - @empty($arrayinfomutu) - @endphp - - @if(count($arrayinfomutu)> 0) - KELULUSAN UBAH MARHUN - - - - - - - - - - - - - - - - - @foreach($arrayinfomutu as $lel) - - - - - - - - - - - - - - @endforeach - -
NoID LelongCawanganTarikh LelongHarga Emas AsasTempohCaj LelongStatus LelongPengesahanTelah Sah
{{$loop->iteration}}{{ $lel['info']['lelong_id'] }} - @foreach($lel['detailsinfo'] as $details) - {{$details['caw_name']}}
- @endforeach - 		@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']); - $datez = $myDateTime->format('d-m-Y'); - echo($datez); - - @endphp{{ number_format($lel['info']['harga_emas_asas'], 2, '.', ',')}}{{ $lel['info']['jbg'] }}{{ $lel['info']['cajlelong'] }} - @if($lel['info']['sts_lelong'] == 0) - - @endif - - - - -
- @endif - @php - - @endphp + @endhasrole @hasrole('account') diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php index 66fae227..dcf59bbf 100644 --- a/resources/views/pengesahan/senarailelongubahmutu.blade.php +++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php @@ -20,8 +20,9 @@ No ID Lelong - Cawangan + {{-- Cawangan --}} Tarikh Lelong + Fasa Harga Emas Asas Tempoh Caj Lelong @@ -35,17 +36,18 @@ {{$loop->iteration}} {{ $lel['info']['lelong_id'] }} - + {{-- @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
@endforeach - + --}} @php $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']); $datez = $myDateTime->format('d-m-Y'); echo($datez); @endphp + {{ $lel['info']['fasa'] }} {{ number_format($lel['info']['harga_emas_asas'], 2, '.', ',')}} {{ $lel['info']['jbg'] }} {{ $lel['info']['cajlelong'] }}