From 7c17a5442488fccd399aa4cb0c48e793853e9535 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 30 Nov 2022 09:09:47 +0800 Subject: [PATCH 01/11] update komen pilot 29112022 --- app/Http/Controllers/MarhunController.php | 6 ++-- resources/views/pdf/lelreport.blade.php | 7 +++-- resources/views/pdf/pdflelongreport.blade.php | 28 ++++++++++--------- 3 files changed, 23 insertions(+), 18 deletions(-) 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']}}
--}}
From af84cb3e1a2b462d8871a0423bf5ef820b8d55ea Mon Sep 17 00:00:00 2001 From: root Date: Wed, 30 Nov 2022 10:05:31 +0800 Subject: [PATCH 02/11] Fix autofocus scanmarhun, redirect to main url when reset password --- app/Http/Controllers/MarhunController.php | 2 +- resources/views/marhun/scanbarcode.blade.php | 2 +- resources/views/marhun/scanbarcodemasuk.blade.php | 2 +- resources/views/template/reset-password.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index d0e4a445..4864ba24 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -731,7 +731,7 @@ class MarhunController extends Controller ->where('kodcaw', '=', $user['kodcaw']) ->get() ->toArray(); - dd($lelongs); + //dd($lelongs); $arraycaw = []; diff --git a/resources/views/marhun/scanbarcode.blade.php b/resources/views/marhun/scanbarcode.blade.php index 26a6f3af..2e38a9f1 100644 --- a/resources/views/marhun/scanbarcode.blade.php +++ b/resources/views/marhun/scanbarcode.blade.php @@ -51,7 +51,7 @@ @csrf
Scan Barcode Marhun Yang Dibawa Keluar Dari Peti Besi
- + diff --git a/resources/views/marhun/scanbarcodemasuk.blade.php b/resources/views/marhun/scanbarcodemasuk.blade.php index 373d0c23..c70ba9d8 100644 --- a/resources/views/marhun/scanbarcodemasuk.blade.php +++ b/resources/views/marhun/scanbarcodemasuk.blade.php @@ -50,7 +50,7 @@
@csrf - +
diff --git a/resources/views/template/reset-password.blade.php b/resources/views/template/reset-password.blade.php index c63c9ed8..cfdb8d8d 100644 --- a/resources/views/template/reset-password.blade.php +++ b/resources/views/template/reset-password.blade.php @@ -61,7 +61,7 @@

- Tukar Katalaluan Anda + Tukar Katalaluan Anda

From 281e46c970027d395e177befd1952bb9901dcfda Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 30 Nov 2022 17:03:37 +0800 Subject: [PATCH 03/11] update design table laporan --- .../Controllers/ReportCawanganController.php | 8 +- app/Http/Controllers/ReportController.php | 19 +- resources/views/includes/sidebar.blade.php | 4 +- .../views/jananotis/senarainotis.blade.php | 1 - .../views/lelong/brgleldetails.blade.php | 2 +- .../lelong/lapbrglelpembidaindex.blade.php | 2 +- .../views/lelong/laplelongindex.blade.php | 4 +- .../views/lelong/laporanbidaanindex.blade.php | 4 +- .../views/lelong/lelongtebusindex.blade.php | 2 +- resources/views/lelong/showlelong.blade.php | 2 +- resources/views/marhun/ubahmarhun.blade.php | 2 +- .../views/marhun/ubahmarhuncaw.blade.php | 2 +- .../pdf/laporanbrgleldetailscaw.blade.php | 50 +-- .../views/pdf/laporanlelfullcaw.blade.php | 8 +- .../views/pdf/laporannamapembidacaw.blade.php | 4 +- resources/views/pdf/listlelong.blade.php | 221 ++++++------ .../views/pdf/listlelongdetails.blade.php | 277 ++++++++------- resources/views/pdf/listnotis.blade.php | 212 ++++++++---- .../views/pdf/pdflapbrglelpembida.blade.php | 200 ++++++----- resources/views/pdf/pdflaplelong.blade.php | 324 ++++++++++-------- resources/views/pdf/pdflelongtebus.blade.php | 77 ++++- .../views/pdf/pdfsenarailapbidaan.blade.php | 253 ++++++++------ 22 files changed, 961 insertions(+), 717 deletions(-) diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index a15d9e0e..3f36b454 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -154,7 +154,9 @@ class ReportCawanganController extends Controller $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->where('cawangan.caw_code',$user->kodcaw) ->select('lelong_id','tarikh_lelong','lelong.fasa') ->groupBy('lelong_id') ->get()->toArray(); @@ -192,9 +194,6 @@ class ReportCawanganController extends Controller ]); - - - $pdf = PDF::loadView('pdf.laporanbrgleldetailscaw',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo' ))->setPaper('a4', 'potrait'); @@ -336,6 +335,7 @@ class ReportCawanganController extends Controller foreach($laporanlelong as $index1=>$laplelong) { + $margin = ($laplelong['pinjaman']/ $laplelong['nilaimarhun'])*100; $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; @@ -344,6 +344,8 @@ class ReportCawanganController extends Controller $total_hargalelong = $total_hargalelong + $laplelong['hargabida']; $total_bakirugi = $total_bakirugi + $laplelong['baki']; $total_hargaasas = $total_hargaasas + $laplelong['hargaasas']; + + $laporanlelong[$index1]['margin']=$margin; } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index d438ee53..267b06c5 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -554,9 +554,9 @@ class ReportController extends Controller Public function lelongtebus ($lelong_id, $kodcaw){ - $total_berat = 0; - $total_hargaasas = 0; - $total_hargalelong = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + $total_upah = 0; $arrayinfocaw = []; @@ -584,16 +584,15 @@ class ReportController extends Controller ->get()->toArray(); // dd($laporantebus); - // foreach( $brglelpembida as $index1=>$totalbrglelpembida){ + foreach( $laporantebus as $index1=>$totalbrglelpembida){ - // $total_berat = $total_berat + $totalbrglelpembida['berat']; - // $total_hargaasas = $total_hargaasas + $totalbrglelpembida['hargaasas']; - // $total_hargalelong = $total_hargalelong + $totalbrglelpembida['hargabida']; - - // } + $total_nmarhun += $totalbrglelpembida['nilaimarhun']; + $total_pinjaman += $totalbrglelpembida['pinjaman']; + $total_upah += $totalbrglelpembida['upah']; + } - $pdf = PDF::loadView('pdf.pdflelongtebus',compact('lelong_id','info','laporantebus','total_berat','total_hargaasas','total_hargalelong','arrayinfocaw')) + $pdf = PDF::loadView('pdf.pdflelongtebus',compact('lelong_id','info','laporantebus','total_nmarhun','total_pinjaman','total_upah','arrayinfocaw')) ->setPaper('a4','potrait'); return $pdf->download('Laporan Barang Lelong Pembida.pdf'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 3bdea217..6646f801 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -163,7 +163,7 @@
    @@ -505,7 +505,7 @@
    diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php index 4a640664..58b48f72 100644 --- a/resources/views/jananotis/senarainotis.blade.php +++ b/resources/views/jananotis/senarainotis.blade.php @@ -44,7 +44,6 @@ {{ $loop->iteration }} {{ $notis['nokp']}} {{-- {{ $notis['nama']['nama']}} --}} - @foreach($notis['listsag'] as $item){{ $item['norujukan']}}
    @endforeach @foreach($notis['listsag'] as $item){{ $item['tempoh']}}
    @endforeach @foreach($notis['listsag'] as $item){{ number_format($item['pinjaman'], 2, '.', ',')}}
    @endforeach diff --git a/resources/views/lelong/brgleldetails.blade.php b/resources/views/lelong/brgleldetails.blade.php index c5f45340..3c2813e9 100644 --- a/resources/views/lelong/brgleldetails.blade.php +++ b/resources/views/lelong/brgleldetails.blade.php @@ -8,7 +8,7 @@
    - Butiran Laporan Barang Lelong + Butiran Barang Lelong
    diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php index 3ad4c790..1e3bdffc 100644 --- a/resources/views/lelong/lapbrglelpembidaindex.blade.php +++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php @@ -23,7 +23,7 @@
    - +
    diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php index f19b165c..0d1d542e 100644 --- a/resources/views/lelong/laplelongindex.blade.php +++ b/resources/views/lelong/laplelongindex.blade.php @@ -9,7 +9,7 @@
    - Senarai Lelong Keseluruhan + Laporan Lelongan
    @@ -22,7 +22,7 @@ -
    Bil
    +
    diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php index f2cd1a4f..a2488557 100644 --- a/resources/views/lelong/laporanbidaanindex.blade.php +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -8,7 +8,7 @@
    - Senarai Keseluruhan Pembida + Senarai Bidaan Pembida
    @@ -22,7 +22,7 @@ -
    Bil
    +
    diff --git a/resources/views/lelong/lelongtebusindex.blade.php b/resources/views/lelong/lelongtebusindex.blade.php index 1c4fd8f5..ee0beff9 100644 --- a/resources/views/lelong/lelongtebusindex.blade.php +++ b/resources/views/lelong/lelongtebusindex.blade.php @@ -19,7 +19,7 @@ -
    Bil
    +
    diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 91b2054e..33a51b19 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -194,7 +194,7 @@ @foreach ($arraycaw as $index=>$caw) - + diff --git a/resources/views/marhun/ubahmarhun.blade.php b/resources/views/marhun/ubahmarhun.blade.php index 0f29e60b..e8ee1740 100644 --- a/resources/views/marhun/ubahmarhun.blade.php +++ b/resources/views/marhun/ubahmarhun.blade.php @@ -99,7 +99,7 @@ @empty - + @endforelse diff --git a/resources/views/marhun/ubahmarhuncaw.blade.php b/resources/views/marhun/ubahmarhuncaw.blade.php index 8b5e34c2..f080646a 100644 --- a/resources/views/marhun/ubahmarhuncaw.blade.php +++ b/resources/views/marhun/ubahmarhuncaw.blade.php @@ -44,7 +44,7 @@ diff --git a/resources/views/pdf/laporanbrgleldetailscaw.blade.php b/resources/views/pdf/laporanbrgleldetailscaw.blade.php index dd7a626e..5903f0a1 100644 --- a/resources/views/pdf/laporanbrgleldetailscaw.blade.php +++ b/resources/views/pdf/laporanbrgleldetailscaw.blade.php @@ -128,47 +128,22 @@ tr:nth-child(even) {
    Bil
    {{$index+1}}{{ $caw['cawangan'] }}{{ $caw['cawangan'] }} {{ $caw['bil_marhun'] }} {{ number_format($caw['berat'], 2, '.', ',') }} {{ number_format($caw['n_marhun'], 2, '.', ',') }}
    No DataNo Data
    {{ $laporan['brg']['fasa']}} @foreach($laporan['detailsbrg'] as $details) - + {{ $details['caw_name']}}
    @endforeach
    -{{-- - -
    - - @foreach ($arrayinfo as $laporan) - - - - - @foreach ($laporan['details'] as $details) - - -
    Batch Lelong : {{$laporan['laporan']['lelong_id']}}Tarikh Lelong : @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphpFasa : {{$laporan['laporan']['fasa']}}Cawangan : {{$details['caw_name']}} - @endforeach - @endforeach -
    --}} -
    @foreach ($arrayinfo as $laporan) - - @foreach ($laporan['details'] as $details) - + @foreach ($laporan['details'] as $details) + - - {{-- + @endphp +@endforeach
    Batch Lelong: {{$laporan['laporan']['lelong_id']}}Cawangan : {{$details['caw_name']}} - @endforeach + Batch Lelong: {{$laporan['laporan']['lelong_id']}}Cawangan : {{$details['caw_name']}} + @endforeach
    Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); - @endphp
    Fasa: {{$info['fasa']}} --}} - {{-- Nama Cawangan : {{$info['caw_name']}} --}} - @endforeach -
    @@ -221,12 +196,12 @@ tr:nth-child(even) { - {{-- - {{ number_format($marhun['berat'], 2, '.', ',') }} + + {{ number_format($marhun['berat'], 2, '.', ',') }} + + {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} + {{ number_format($marhun['hargaasas'], 2, '.', ',') }} - {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} - {{ number_format($marhun['hargaasas'], 2, '.', ',') }} - --}} @endforeach @foreach ($arraycaw as $index=>$caw) @@ -234,7 +209,8 @@ tr:nth-child(even) { Jumlah Keseluruhan {{ number_format($total_berat, 2, '.', ',') }} - {{ number_format($total_harga, 2, '.', ',') }} + + {{-- {{ number_format($total_harga, 2, '.', ',') }} --}} {{ number_format($total_nmarhun, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }} diff --git a/resources/views/pdf/laporanlelfullcaw.blade.php b/resources/views/pdf/laporanlelfullcaw.blade.php index 5747456d..2389e45d 100644 --- a/resources/views/pdf/laporanlelfullcaw.blade.php +++ b/resources/views/pdf/laporanlelfullcaw.blade.php @@ -158,17 +158,17 @@ tr:nth-child(even) { - No + No No Rujukan Nilai Marhun Asal(RM) Pembiayaan(RM) + Margin(%) Keuntungan(RM) Caj Lelong(RM) Harga Lelong(RM) Baki Lelong(RM) - {{-- Rugi --}} Harga Asas(RM) - Nama Pembeli > + Nama Pembeli > @@ -179,6 +179,7 @@ tr:nth-child(even) { {{ $laporan['norujukan'] }} {{ number_format($laporan['nilaimarhun'], 2, '.', ',')}} {{ number_format($laporan['pinjaman'], 2, '.', ',')}} + {{ number_format($laporan['margin'], 2, '.', ',')}} {{ number_format($laporan['upahsimpan'], 2, '.', ',')}} {{ number_format($laporan['cajlelong'], 2, '.', ',')}} {{ number_format($laporan['hargabida'], 2, '.', ',')}} @@ -211,6 +212,7 @@ tr:nth-child(even) { Jumlah Keseluruhan {{ number_format($total_nmarhun, 2, '.', ',') }} {{ number_format($total_pembiayaan, 2, '.', ',') }} + {{ number_format($total_upahsimpan, 2, '.', ',') }} {{ number_format($total_cajlelong, 2, '.', ',') }} {{ number_format($total_hargalelong, 2,'.',',') }} diff --git a/resources/views/pdf/laporannamapembidacaw.blade.php b/resources/views/pdf/laporannamapembidacaw.blade.php index 0499b07a..6700e15c 100644 --- a/resources/views/pdf/laporannamapembidacaw.blade.php +++ b/resources/views/pdf/laporannamapembidacaw.blade.php @@ -20,7 +20,9 @@ /* border-bottom: 1px solid #ddd; */ } -#sim tr:hover {} +#sim tr { + border-bottom: 1px solid #ddd; +} #sim th { /* text-align: left; */ diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index efcc52de..1f14162d 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -1,141 +1,142 @@ +.column { + /* float: left; */ + width: 100%; + padding: 5px; +} + +/* Clearfix (clear floats) */ +.row::after { + content: ""; + clear: both; + display: table; +} + +table { + border-collapse: collapse; + border-spacing: 0; + width: 200%; + border: 0px solid #ddd; +} + +td { + /* text-align: left; */ + padding: 16px; +} + +th{ + /* text-align: left; */ + padding: 16px; + /* background-color:gainsboro; */ +} + +tr:nth-child(even) { + /* background-color: #f2f2f2; */ +} + + - {{--
    PERMODALAN KELANTAN BERHAD
    --}} -
    LAPORAN BARANG LELONG
     + + + + -

    PERMODALAN KELANTAN BERHAD

    - + + + + +
    SENARAI BARANG LELONG
    + + + +
    + + + -
    Fasa : {{$test['fasa']}}
    -
    Batch Lelong : {{$test['id']}}
    -
    Tarikh Lelong : @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $test['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp
    - - -
    Cawangan : {{$cawangan[0]['caw_name']}}
    - - - -
    Batch Lelong: {{$test['id']}}Cawangan : {{$cawangan[0]['caw_name']}}
    + Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $test['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + + {{-- Fasa: {{$info['fasa']}} --}} + {{-- Nama Cawangan : {{$info['caw_name']}} --}} + + +
    - - - - - - - + + + + + + + + @foreach ($lelong_bid as $index=> $details) - + - - - - - + + + + + @endforeach - - + + diff --git a/resources/views/pdf/listlelongdetails.blade.php b/resources/views/pdf/listlelongdetails.blade.php index e666f915..b172b053 100644 --- a/resources/views/pdf/listlelongdetails.blade.php +++ b/resources/views/pdf/listlelongdetails.blade.php @@ -1,109 +1,147 @@ +.column { + /* float: left; */ + width: 100%; + padding: 5px; +} + +/* Clearfix (clear floats) */ +.row::after { + content: ""; + clear: both; + display: table; +} + +table { + border-collapse: collapse; + border-spacing: 0; + width: 200%; + border: 0px solid #ddd; +} + +td { + /* text-align: left; */ + padding: 16px; +} + +th{ + /* text-align: left; */ + padding: 16px; + /* text-align: left; */ + table-layout:auto + color: black; + border-bottom: 1px solid #ddd; + /* background-color:gainsboro; */ +} + + +tr:nth-child(even) { + /* background-color: #f2f2f2; */ + +} + + - {{--
    PERMODALAN KELANTAN BERHAD
    --}} -
    LAPORAN BARANG LELONG DETAILS
     +
    NoNo RujukanMarhunBerat (gm)Harga Asas
    NoNo RujukanMarhunBerat (gm)Harga AsasHarga Tawaran
    {{ $loop->iteration }} {{ $details['norujukan']}}{{ $details['marhun']}}{{ number_format($details['berat'], 2, '.', ',') }}{{ number_format($details['hargaasas'], 2, '.', ',') }}
    {{ $details['marhun']}}{{ number_format($details['berat'], 2, '.', ',') }}{{ number_format($details['hargaasas'], 2, '.', ',') }}________________
    JUMLAH KESELURUHAN{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}
    + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    BUTIRAN SENARAI BARANG LELONG
    @foreach ($arrayinfo as $laporan) -
    Fasa : {{$laporan['laporan']['fasa']}}
    -
    Batch Lelong : {{$laporan['laporan']['lelong_id']}}
    -
    Tarikh Lelong : @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp
    - + @foreach ($laporan['details'] as $details)
    Cawangan : {{$details['caw_name']}}
    @endforeach + + @endforeach -
    Batch Lelong: {{$laporan['laporan']['lelong_id']}}
    Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp
    @@ -129,39 +167,39 @@ @foreach ($lelongs as $marhun) - {{ $loop->iteration }} - {{ $marhun['norujukan'] }} - @foreach ($marhun['detailmarhun'] as $item) - {{ $item['marhun'] }}
    - @endforeach - @foreach ($marhun['detailmarhun'] as $item) - {{ $item['karat'] }}
    - @endforeach - @foreach ($marhun['detailmarhun'] as $item) - {{ $item['berat'] }}
    - @endforeach - @foreach ($marhun['detailmarhun'] as $item) - {{ $item['harga'] }}
    - @endforeach - @foreach ($marhun['detailmarhun'] as $item) - {{ $item['n_marhun'] }}
    - @endforeach - @foreach ($marhun['detailmarhun'] as $item) - {{ $item['hargaasas'] }}
    - @endforeach - @foreach ($marhun['detailmarhun'] as $item) - {{ $item['nota'] }}
    - @endforeach + {{ $loop->iteration }} + {{ $marhun['norujukan'] }} + @foreach ($marhun['detailmarhun'] as $item) + {{ $item['marhun'] }}
    + @endforeach + @foreach ($marhun['detailmarhun'] as $item) + {{ $item['karat'] }}
    + @endforeach + @foreach ($marhun['detailmarhun'] as $item) + {{ $item['berat'] }}
    + @endforeach + @foreach ($marhun['detailmarhun'] as $item) + {{ $item['harga'] }}
    + @endforeach + @foreach ($marhun['detailmarhun'] as $item) + {{ number_format($item['n_marhun'], 2, '.', ',') }}
    + @endforeach + @foreach ($marhun['detailmarhun'] as $item) + {{ number_format($item['hargaasas'], 2, '.', ',') }}
    + @endforeach + @foreach ($marhun['detailmarhun'] as $item) + {{ $item['nota'] }}
    + @endforeach - + - {{ number_format($marhun['berat'], 2, '.', ',') }} + {{ number_format($marhun['berat'], 2, '.', ',') }} - {{ number_format($marhun['nmarhuns'], 2, '.', ',') }} - {{ number_format($marhun['hargaasas'], 2, '.', ',') }} + {{ number_format($marhun['nmarhuns'], 2, '.', ',') }} + {{ number_format($marhun['hargaasas'], 2, '.', ',') }} @endforeach @@ -169,10 +207,11 @@ Jumlah Keseluruhan - {{ number_format($total_berat, 2, '.', ',') }} - {{ number_format($total_harga, 2, '.', ',') }} - {{ number_format($total_nmarhun, 2, '.', ',') }} - {{ number_format($total_hargaasas, 2, '.', ',') }} + {{ number_format($total_berat, 2, '.', ',') }} + + {{-- {{ number_format($total_harga, 2, '.', ',') }} --}} + {{ number_format($total_nmarhun, 2, '.', ',') }} + {{ number_format($total_hargaasas, 2, '.', ',') }} @endforeach diff --git a/resources/views/pdf/listnotis.blade.php b/resources/views/pdf/listnotis.blade.php index 5d3d4cd4..315ca34a 100644 --- a/resources/views/pdf/listnotis.blade.php +++ b/resources/views/pdf/listnotis.blade.php @@ -1,81 +1,138 @@ - + + + +{{-- +
    {{$caw['caw_name']}}
    @@ -84,8 +141,16 @@ tr:nth-child(even) { No Tel: {{$caw['notel']}}
    No Faks: {{$caw['nofaks']}}
    -
    -
    + + --}} + +
    +
    SENARAI LELONGAN MENGIKUT PELANGGAN
    +
    + +
    Batch Lelong: {{ $lelong_id }}
    + + @@ -106,7 +171,7 @@ tr:nth-child(even) { {{-- --}} - + @@ -123,6 +188,7 @@ tr:nth-child(even) {
    {{ $notis['nokp']}}{{ $notis['nama']['nama']}}@foreach($notis['listsag'] as $item){{ $item['norujukan']}}
    @endforeach    		@foreach($notis['listsag'] as $item){{ $item['norujukan']}}
    @endforeach    		 @foreach($notis['listsag'] as $item){{ $item['tempoh']}}
    @endforeach    		 @foreach($notis['listsag'] as $item){{ number_format($item['pinjaman'], 2, '.', ',')}}
    @endforeach    		 @foreach($notis['listsag'] as $item){{ number_format($item['bakiupah'], 2, '.', ',')}}
    @endforeach
    + diff --git a/resources/views/pdf/pdflapbrglelpembida.blade.php b/resources/views/pdf/pdflapbrglelpembida.blade.php index 09f6d438..b011574a 100644 --- a/resources/views/pdf/pdflapbrglelpembida.blade.php +++ b/resources/views/pdf/pdflapbrglelpembida.blade.php @@ -1,86 +1,120 @@ +.column { + /* float: left; */ + width: 100%; + padding: 5px; +} + +/* Clearfix (clear floats) */ +.row::after { + content: ""; + clear: both; + display: table; +} + +table { + border-collapse: collapse; + border-spacing: 0; + width: 200%; + border: 0px solid #ddd; +} + +td { + /* text-align: left; */ + padding: 16px; +} + +th{ + /* text-align: left; */ + padding: 16px; + /* text-align: left; */ + table-layout:auto + color: black; + border-bottom: 1px solid #ddd; + /* background-color:gainsboro; */ +} + + +tr:nth-child(even) { + /* background-color: #f2f2f2; */ + +} + + @@ -130,12 +164,12 @@ @foreach ($brglelpembida as $laporan) {{ $loop->iteration }} - {{ $laporan['norujukan'] }} + {{ $laporan['norujukan'] }} {{ $laporan['marhun']}} {{ number_format($laporan['berat'], 2, '.', ',')}} - {{ number_format($laporan['hargaasas'], 2, '.', ',')}} - {{ number_format($laporan['hargabida'], 2, '.', ',')}} - {{$laporan['nama_bidder']}} + {{ number_format($laporan['hargaasas'], 2, '.', ',')}} + {{ number_format($laporan['hargabida'], 2, '.', ',')}} + {{$laporan['nama_bidder']}} @endforeach @@ -145,8 +179,8 @@ Jumlah Keseluruhan {{ number_format($total_berat, 2, '.', ',') }} - {{ number_format($total_hargaasas, 2, '.', ',') }} - {{ number_format($total_hargalelong, 2, '.', ',') }} + {{ number_format($total_hargaasas, 2, '.', ',') }} + {{ number_format($total_hargalelong, 2, '.', ',') }} diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php index 1686d322..465ca9e9 100644 --- a/resources/views/pdf/pdflaplelong.blade.php +++ b/resources/views/pdf/pdflaplelong.blade.php @@ -1,114 +1,156 @@ +.column { + /* float: left; */ + width: 100%; + padding: 5px; +} + +/* Clearfix (clear floats) */ +.row::after { + content: ""; + clear: both; + display: table; +} + +table { + border-collapse: collapse; + border-spacing: 0; + width: 200%; + border: 0px solid #ddd; +} + +td { + /* text-align: left; */ + padding: 16px; +} + +th{ + /* text-align: left; */ + padding: 16px; + /* text-align: left; */ + table-layout:auto + color: black; + border-bottom: 1px solid #ddd; + /* background-color:gainsboro; */ +} + + +tr:nth-child(even) { + /* background-color: #f2f2f2; */ + +} + + - {{--
    PERMODALAN KELANTAN BERHAD
    --}} -
    LAPORAN LELONG KESELURUHAN
     + + + + -

    PERMODALAN KELANTAN BERHAD

    - - - @foreach ($info as $info) -
    Fasa: {{$info->fasa}}
    -
    Batch Lelong: {{$lelong_id}}
    - -
    Tarikh Lelong:@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp
    + + - @endforeach - @foreach ($arrayinfocaw as $laporancaw) - @foreach ($laporancaw['cawangan'] as $details) -
    Cawangan : {{$details['caw_name']}}
    - @endforeach - @endforeach - - -
    LAPORAN LELONG KESELURUHAN
    + + + + + +
    + + + @foreach ($arrayinfocaw as $laporancaw) + @foreach ($laporancaw['cawangan'] as $details) + + + + {{-- +
    Batch Lelong: {{$lelong_id}}Cawangan : {{$details['caw_name']}} + @endforeach + @endforeach + @foreach ($info as $info) +
    Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp
    Fasa: {{$info['fasa']}} --}} + @endforeach + + +

    @@ -116,45 +158,48 @@ - No + ( No No Rujukan - Nilai Marhun - Pembiayaan - Margin% - Upah Simpan - Caj Lelong - Harga Lelong - Baki - Harga Asas - Nama Pembeli + Nilai Marhun Asal(RM) + Pembiayaan(RM) + Margin(%) + Keuntungan(RM) + Caj Lelong(RM) + Harga Lelong(RM) + Baki Lelong(RM) + Harga Asas(RM) + Nama Pembeli ) - + @php $total_baki = 0; @endphp @foreach ($arraydetails as $laporan) {{ $loop->iteration }} {{ $laporan['laplelong']['norujukan'] }} - {{ number_format($laporan['laplelong']['nilaimarhun'], 2, '.', ',')}} - {{ number_format($laporan['laplelong']['pinjaman'], 2, '.', ',')}} - {{ number_format($laporan['margin'], 2, '.', ',')}} - {{ number_format($laporan['laplelong']['upahsimpan'], 2, '.', ',')}} - {{ number_format($laporan['laplelong']['cajlelong'], 2, '.', ',')}} - {{ number_format($laporan['laplelong']['hargabida'], 2, '.', ',')}} - {{ number_format($laporan['laplelong']['baki'], 2, '.', ',')}} + {{ number_format($laporan['laplelong']['nilaimarhun'], 2, '.', ',')}} + {{ number_format($laporan['laplelong']['pinjaman'], 2, '.', ',')}} + {{ number_format($laporan['margin'], 2, '.', ',')}} + {{ number_format($laporan['laplelong']['upahsimpan'], 2, '.', ',')}} + {{ number_format($laporan['laplelong']['cajlelong'], 2, '.', ',')}} + {{ number_format($laporan['laplelong']['hargabida'], 2, '.', ',')}} + - {{ number_format($laporan['laplelong']['hargaasas'], 2, '.', ',')}} + @if($laporan['laplelong']['baki'] > 0) + {{number_format($laporan['laplelong']['baki'], 2, '.', ',')}} + @elseif($laporan['laplelong']['baki'] < 0 ) ({{number_format(-($laporan['laplelong']['baki']), 2, '.', ',')}}) @endif + {{ number_format($laporan['laplelong']['hargaasas'], 2, '.', ',')}} {{$laporan['laplelong']['nama_bidder']}} @@ -164,29 +209,18 @@ Jumlah Keseluruhan - {{ number_format($total_nmarhun, 2, '.', ',') }} - {{ number_format($total_pembiayaan, 2, '.', ',') }} + {{ number_format($total_nmarhun, 2, '.', ',') }} + {{ number_format($total_pembiayaan, 2, '.', ',') }} - {{ number_format($total_upahsimpan, 2, '.', ',') }} - {{ number_format($total_cajlelong, 2, '.', ',') }} - {{ number_format($total_hargalelong, 2,'.',',') }} - - - - {{number_format($total_baki, 2, '.', ',')}} - {{number_format($total_hargaasas, 2, '.', ',')}} + {{ number_format($total_upahsimpan, 2, '.', ',') }} + {{ number_format($total_cajlelong, 2, '.', ',') }} + {{ number_format($total_hargalelong, 2,'.',',') }} + @if($total_baki > 0) + {{ number_format($total_baki, 2, '.', ',') }} + @else + ({{number_format(-($total_baki), 2, '.', ',')}}) + @endif + {{number_format($total_hargaasas, 2, '.', ',')}} @@ -194,7 +228,7 @@ - + {{--










    @@ -205,7 +239,7 @@ -
    Baki A - Baki B: RM{{number_format($total_baki, 2, '.', ',')}}
    + --}} diff --git a/resources/views/pdf/pdflelongtebus.blade.php b/resources/views/pdf/pdflelongtebus.blade.php index de81a11d..72208d34 100644 --- a/resources/views/pdf/pdflelongtebus.blade.php +++ b/resources/views/pdf/pdflelongtebus.blade.php @@ -11,19 +11,54 @@ #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { border: 0px solid; padding: 1px; - text-align: left; + + /* text-align: left; */ } -#sim tr:nth-child(even){} +#sim tr:nth-child(even){ + /* border-bottom: 1px solid #ddd; */ +} #sim tr:hover {} #sim th { - text-align: left; + /* text-align: left; */ border: 0px solid; table-layout:auto; color: black; + + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; +} + + +#sim2 { + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size:10px; + border-collapse: collapse; + width: 100%; +} + +#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { + border: 0px solid; + padding: 1px; + + /* text-align: left; */ + +} + +#sim2 tr:nth-child(even){ + /* border-bottom: 1px solid #ddd; */ +} + +#sim2 tr:hover {} + +#sim2 th { + /* text-align: left; */ + border: 0px solid; + table-layout:auto; + color: black; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; } @@ -37,7 +72,7 @@ } .column { - float: left; + /* float: left; */ width: 100%; padding: 5px; } @@ -57,18 +92,24 @@ table { } td { - text-align: left; + /* text-align: left; */ padding: 16px; } th{ - text-align: left; + /* text-align: left; */ padding: 16px; - background-color:gainsboro; + /* text-align: left; */ + table-layout:auto + color: black; + border-bottom: 1px solid #ddd; + /* background-color:gainsboro; */ } + tr:nth-child(even) { - background-color: #f2f2f2; + /* background-color: #f2f2f2; */ + } @@ -117,8 +158,8 @@ tr:nth-child(even) { No - Tarikh - No Rujukan + Tarikh + No Rujukan Nilai Marhun(RM) Pinjaman(RM) Keuntungan (RM) @@ -130,11 +171,11 @@ tr:nth-child(even) { {{ $loop->iteration }} {{ $laporan['tarikh']}} - {{ $laporan['norujukan'] }} - {{ number_format($laporan['nilaimarhun'], 2, '.', ',')}} - {{ number_format($laporan['pinjaman'], 2, '.', ',')}} - {{ number_format($laporan['upah'], 2, '.', ',')}} - {{$laporan['jbg']}} + {{ $laporan['norujukan'] }} + {{ number_format($laporan['nilaimarhun'], 2, '.', ',')}} + {{ number_format($laporan['pinjaman'], 2, '.', ',')}} + {{ number_format($laporan['upah'], 2, '.', ',')}} + {{$laporan['jbg']}} @endforeach @@ -143,9 +184,9 @@ tr:nth-child(even) { Jumlah Keseluruhan - {{ number_format($total_berat, 2, '.', ',') }} - {{ number_format($total_hargaasas, 2, '.', ',') }} - {{ number_format($total_hargalelong, 2, '.', ',') }} + {{ number_format($total_nmarhun, 2, '.', ',') }} + {{ number_format($total_pinjaman, 2, '.', ',') }} + {{ number_format($total_upah, 2, '.', ',') }} diff --git a/resources/views/pdf/pdfsenarailapbidaan.blade.php b/resources/views/pdf/pdfsenarailapbidaan.blade.php index e8e6d7f7..c16e7a95 100644 --- a/resources/views/pdf/pdfsenarailapbidaan.blade.php +++ b/resources/views/pdf/pdfsenarailapbidaan.blade.php @@ -1,126 +1,171 @@ - {{--
    PERMODALAN KELANTAN BERHAD
    --}} -
    LAPORAN SENARAI BIDAAN PEMBIDA
     + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    SENARAI BIDAAN PEMBIDA
    +
    + + @foreach ($arrayinfocaw as $laporancaw) + @foreach ($laporancaw['cawangan'] as $details) + @foreach ($lelongid as $info) -
    Fasa : {{ $info->fasa}}
    -
    Batch Lelong: {{$lelong_id}}
    -
    Tarikh Lelong:@php +
    @endforeach + +
    Batch Lelong: {{$lelong_id}}Cawangan : {{$details['caw_name']}} + @endforeach + @endforeach +
    Tarikh Lelong : @php $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong ); $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); - @endphp - @endforeach - @foreach ($arrayinfocaw as $laporancaw) - @foreach ($laporancaw['cawangan'] as $details) -
    Cawangan : {{$details['caw_name']}}
    - @endforeach + @endphp
    +
    - - - - - - + + + + + + @@ -128,34 +173,38 @@ - - + - @endforeach - + {{-- - + --}}
    NoNo RujukanHarga Asas(RM)Nama PembidaHarga Bidaan(RM)Masa BidaanNoNo RujukanHarga Asas(RM)Nama PembidaHarga Bidaan(RM)Masa Bidaan
    {{ $loop->iteration }} {{ $laporan['laporan']['norujukan']}}{{ $laporan['laporan']['hargaasas']}} + {{ number_format($laporan['laporan']['hargaasas'], 2, '.', ',')}} @foreach($laporan['details'] as $details) - {{ $details['nama_bidder']}}
    + {{ $loop->iteration }}.{{ $details['nama_bidder']}}
    @endforeach     		+ @foreach($laporan['details'] as $details) - {{ $details['hargabida']}}
    + {{ number_format($details['hargabida'], 2, '.', ',')}}
    @endforeach     		- @foreach($laporan['details'] as $details) - {{ $details['masa_bidaan']}}
    - @endforeach + @foreach($laporan['details'] as $details) + @php + $myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $details['masa_bidaan'] ); + $t_lelong = $myDateTime->format('h:i:s'); + echo($t_lelong); + @endphp
    + @endforeach
    Jumlah Keseluruhan {{ number_format($total_hargaasas, 2, '.', ',') }}
    From 86e95f4fb5f755dcb2a328137d5567fed7d33af1 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 30 Nov 2022 21:37:45 +0800 Subject: [PATCH 04/11] update login page --- resources/views/auth/login.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 12559f3e..83c017f1 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -27,7 +27,7 @@

    ArrahnBid

    -

    Bida Harga Lelong Emas Anda Sekarang Secara Atas Talian

    +

    Sistem Lelongan Atas Talian

    @@ -67,9 +67,9 @@ {{ $message }} @enderror - + {{-- Sila Baca Terma Dan Syarat Terlebih Dahulu Klik Disini - + --}}
    @@ -92,7 +92,7 @@
    -

    © Sistem Lelong. All rights reserved

    +

    ArrahnBid © Permodalan Kelantan Berhad

    From 5282f467a19a29450fc7083aaaaf8b237b304fef Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 30 Nov 2022 22:51:49 +0800 Subject: [PATCH 05/11] add cetak harga emas lelong --- app/Http/Controllers/LelongController.php | 20 ++++ resources/views/lelong/showlelong.blade.php | 11 ++- resources/views/pdf/exporthargaemas.blade.php | 99 +++++++++++++++++++ routes/web.php | 2 + 4 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 resources/views/pdf/exporthargaemas.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index e69be024..83f91d69 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -5991,6 +5991,26 @@ class LelongController extends Controller } + public function exporthargaemas($lelong_id){ + + $lelong = Lelong::with(['lelKarat'])->find($lelong_id); + // dd($lelong); + $lelkarat = $lelong->lelKarat; + $tarikhkemaskini = $lelong->lelKarat[0]; + $jeniskarat = JenisKarat::all(); + $today = date('d-m-Y'); + + $pdf1 = PDF::loadView('pdf.exporthargaemas', compact('lelong_id','lelkarat','jeniskarat','tarikhkemaskini')) + ->setPaper('a4', 'potrait'); + + return $pdf1->download('Harga Emas Lelong '.$today.'.pdf'); + + + + + } + + diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 33a51b19..9eaa4164 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -265,10 +265,17 @@
    +