diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 691f083a..d0e4a445 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -1680,14 +1680,14 @@ class MarhunController extends Controller $senaraiScanKeluar = ScanSemak::where('kodcaw', '=', $caw->caw_code) ->where('lelong_id', $lelong_id) ->whereNull('terima_marhun') - ->orderBy('id', 'desc') + ->orderBy('norujukan', 'asc') ->get(); $sedangDinilai = ScanSemak::where('kodcaw', '=', $caw->caw_code) ->whereNotNull('terima_marhun') ->whereNull('serah_marhun') ->where('lelong_id', $lelong_id) - ->orderBy('id', 'desc') + ->orderBy('norujukan', 'asc') ->get(); foreach ($sedangDinilai as $key => $dinilai) { $sdhdisemak = LelongBid::where('lelongbid.lelong_id', $lelong_id) @@ -1702,7 +1702,7 @@ class MarhunController extends Controller $sudahSerah = ScanSemak::where('kodcaw', '=', $caw->caw_code) ->whereNotNull('serah_marhun') ->where('lelong_id', $lelong_id) - ->orderBy('id', 'desc') + ->orderBy('norujukan', 'asc') ->get(); diff --git a/resources/views/pdf/lelreport.blade.php b/resources/views/pdf/lelreport.blade.php index 598ecdfd..b0ccd868 100644 --- a/resources/views/pdf/lelreport.blade.php +++ b/resources/views/pdf/lelreport.blade.php @@ -105,12 +105,15 @@
| Batch Lelong: {{ $laporan['laporan']['lelong_id']}} | -Fasa Lelong: {{ $laporan['laporan']['fasa']}} | -Tarikh Lelong : @php
+ Batch Lelong: {{ $laporan['laporan']['lelong_id']}}
+ {{-- | Fasa Lelong: {{ $laporan['laporan']['fasa']}} | --}} +