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 @@ Caj Lelong Keseluruhan: RM{{ number_format($total_cazlelong, 2, '.', ',') }} Baki Lelong Keseluruhan: RM{{ number_format($total_bakilelong, 2, '.', ',') }} Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }} --}} +
Batch Lelong : {{$lelong_id}}
Tarikh Lelong :@php $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] ); $datez = $myDateTime->format('d-m-Y'); echo($datez); - @endphp -
+ @endphp + + +
Harga Emas Lelong 916: RM {{ $data['harga_emas_asas']}}
Tempoh: {{ $data['jbg']}}
diff --git a/resources/views/pdf/pdflelongreport.blade.php b/resources/views/pdf/pdflelongreport.blade.php index 8735b522..ec58baa7 100644 --- a/resources/views/pdf/pdflelongreport.blade.php +++ b/resources/views/pdf/pdflelongreport.blade.php @@ -19,7 +19,7 @@ #sim tr:hover {} - #sim th { + #sim2 th { text-align: center; border: 0px solid; table-layout:auto; @@ -68,6 +68,13 @@ tr:nth-child(even) { } + + .font{ + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size:12px; + } + + @@ -92,6 +99,8 @@ color: black; text-align: center; line-height: 1.5cm; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size:15px; } /** Define the footer rules **/ @@ -117,30 +126,23 @@
@foreach($datacaw as $data) -
LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}
+
LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}
@endforeach
- {{-- - @foreach ($arrayinfo as $laporan) - - - - --}} +
Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); $datez = $myDateTime->format('d-m-Y'); echo($datez); - @endphp + @endphp
- @endforeach - - -
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']}}
--}}