From 012f66578c6e079bfdea7f6e5cbcfeda850d2451 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Sat, 26 Nov 2022 22:03:55 +0800 Subject: [PATCH] update template laporan operasi --- app/Http/Controllers/LelongController.php | 86 ++++---- app/Http/Controllers/ReportController.php | 8 +- resources/views/pdf/listlelong.blade.php | 179 +++++++++-------- .../views/pdf/listlelongdetails.blade.php | 186 +++++++++--------- .../views/pdf/pdflapbrglelpembida.blade.php | 169 ++++++++-------- resources/views/pdf/pdflaplelong.blade.php | 176 ++++++++--------- .../views/pdf/pdfsenarailapbidaan.blade.php | 170 ++++++++-------- 7 files changed, 499 insertions(+), 475 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 6965b653..8d9b35df 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -4779,46 +4779,68 @@ class LelongController extends Controller $total_bakiupah = 0; $total_nilaimarhun = 0; $keuntungan = 0; - $bakilelong = 0; - $total_cazlelong = 0; - $lelonglel = Lelong::with('cawangan')->find($lelongid); - - $cawanganDetail = $lelonglel->cawangan->find($cawid); - - $marhuns = LelongBid::where('caw_id', '=', $cawid) - ->where('lelong_id', '=', $lelongid) - ->where('caw_id','=',$cawid) - ->get(); + $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') + ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid) + ->where('status_jual','=',0) + ->select( + 'lelongbid.t_lelong', + 'lelongbid.kodcaw', + 'cawangan.caw_name', + 'lelongbid.norujukan', + 'lelongbid.pinjaman', + 'lelongbid.berat', + 'lelongbid.nilaimarhun', + 'lelongbid.hargaasas', + 'lelongbid.hargajual', + 'lelongbid.t_jual', + 'lelongbid.upahsimpan', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.bakiupah', + 'lelongbid.status_jual', + 'lelongbid.jbg' + ) + ->get()->toArray(); // dd($marhuns); $arraymarhun = []; foreach ($marhuns as $index1=> $cal) { - $sumcajlelong = $cal['hargaasas'] * ($lelonglel->cajlelong/100); - $cajlelongnew = round($sumcajlelong,1,1); - $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew; - $marhuns[$index1]['cajlelong'] = $cajlelongnew; - $marhuns[$index1]['baki'] = $totalbaki; - $marhuns[$index1]['keuntungan'] = $keuntungan; + // dd($cal); + $gadai = Gadai::on($cal['kodcaw']) + ->where('norujukan','=',$cal['norujukan']) + ->first(); + // dd($gadai); + $customer = Customer::where('kpbaru','=',$gadai['nokp']) + ->orWhere('kplama','=',$gadai['nokp']) + ->first(); + // dd($customer); + // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); + $marhuns[$index1]['keuntungan'] = $keuntungan; + $marhuns[$index1]['nama'] = $customer; + + array_push($arraymarhun,[ + 'norujukan' => $cal['norujukan'], + 'tempoh' => $gadai['tempoh'], + 'nama' => $customer['nama'], + 'berat' => $cal['berat'], + 'nilaimarhun' => $cal['nilaimarhun'], + 'hargaasas' => $cal['hargaasas'], + 'hargajual' => $cal['hargajual'], + 't_jual' => $cal['t_jual'], + 'pinjaman' => $cal['pinjaman'], + 'pinjasal' => $gadai['pinjaman'], + 'bakiupah' => $cal['bakiupah'], + 'cajlelong' => $cal['cajlelong'], + 'baki' => $cal['baki'], + 'upah6bulan' => $gadai['bakiupah'] + ]); + // $total_marhun = $total_marhun + sizeof($databid); $total_berat = $total_berat + $cal['berat']; $total_pinjaman = $total_pinjaman + $cal['pinjaman']; $total_hargaasas = $total_hargaasas + $cal['hargaasas']; $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; $total_bakiupah = $total_bakiupah + $cal['bakiupah']; - $total_cazlelong = $total_cazlelong + $cajlelongnew; - - array_push($arraymarhun,[ - 'norujukan' => $cal['norujukan'], - 'tempoh' => $cal['jbg'], - 'berat' => $cal['berat'], - 'nilaimarhun' => $cal['nilaimarhun'], - 'hargaasas' => $cal['hargaasas'], - 'pinjaman' => $cal['pinjaman'], - 'bakiupah' => $cal['bakiupah'], - 'cajlelong' => $cajlelongnew, - 'baki' => $cal['baki'], - ]); - } $arrayinfo = []; @@ -4844,9 +4866,7 @@ class LelongController extends Controller 'total_upah', 'total_hargaasas', 'total_bakiupah', - 'total_nilaimarhun', - 'lelonglel', - 'total_cazlelong')); + 'total_nilaimarhun')); } public function showlelongpc(Request $request, $id) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 9d5d4cdc..d438ee53 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -93,7 +93,8 @@ class ReportController extends Controller ->find($lelong_id); $cawangan = $test->cawangan - ->where('kodcaw','=',$kodcaw); + ->where('caw_code','=',$kodcaw); + // dd($cawangan[0]['caw_name']); $lelong_bid = $test->lelongBid ->where('kodcaw','=',$kodcaw); @@ -112,7 +113,7 @@ class ReportController extends Controller - $pdf = PDF::loadView('pdf.listlelong',compact('cawangan','lelong_bid','total_hargaasas','total_berat')) + $pdf = PDF::loadView('pdf.listlelong',compact('test','cawangan','lelong_bid','total_hargaasas','total_berat')) ->setPaper('a4', 'potrait'); return $pdf->download('Senarai Barang Lelong.pdf'); @@ -937,6 +938,9 @@ class ReportController extends Controller $cawangan[$index1]['detail']=$marhuns; } + $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first(); + + return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan')); } diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index 212fec80..efcc52de 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -1,111 +1,110 @@ + #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { + border: 0px solid; + padding: 1px; + text-align: left; + + } + + #sim tr:nth-child(even){} + + #sim tr:hover {} + + #sim th { + text-align: center; + border: 0px solid; + table-layout:auto; + color: black; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + } + + * { + box-sizing: border-box; + } + + .row { + margin-right:-5px; + margin-right:-5px; + } + + .column { + float: right; + width: 100%; + padding: 5px; + } + + /* Clearfix (clear floats) */ + .row::after { + content: ""; + clear: both; + display: table; + } + + table { + border-collapse: collapse; + border-spacing: 0; + width: 200%; + border: 1px solid #ddd; + } + + td { + text-align: right; + padding: 16px; + border: 1px solid #ddd; + } + + th{ + text-align: center; + padding: 16px; + border: 1px solid #ddd; + } + + tr:nth-child(even) { + } + + - - - - + {{--
PERMODALAN KELANTAN BERHAD
--}} +
LAPORAN BARANG LELONG
 - - - -

PERMODALAN KELANTAN BERHAD

LAPORAN BARANG LELONG
- - {{-- +
-
- @foreach ($arrayinfo as $laporan) - - - + @endphp + - @foreach ($laporan['details'] as $details) - -
Batch Lelong : {{$laporan['laporan']['lelong_id']}}Tarikh Lelong : @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_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
Fasa : {{$laporan['laporan']['fasa']}}Cawangan : {{$details['caw_name']}} - @endforeach - @endforeach +
Cawangan : {{$cawangan[0]['caw_name']}}
+
--}} +
diff --git a/resources/views/pdf/listlelongdetails.blade.php b/resources/views/pdf/listlelongdetails.blade.php index c8434cd8..e666f915 100644 --- a/resources/views/pdf/listlelongdetails.blade.php +++ b/resources/views/pdf/listlelongdetails.blade.php @@ -1,106 +1,106 @@ + #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { + border: 0px solid; + padding: 1px; + text-align: left; + + } + + #sim tr:nth-child(even){} + + #sim tr:hover {} + + #sim th { + text-align: center; + border: 0px solid; + table-layout:auto; + color: black; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + } + + * { + box-sizing: border-box; + } + + .row { + margin-right:-5px; + margin-right:-5px; + } + + .column { + float: right; + width: 100%; + padding: 5px; + } + + /* Clearfix (clear floats) */ + .row::after { + content: ""; + clear: both; + display: table; + } + + table { + border-collapse: collapse; + border-spacing: 0; + width: 200%; + border: 1px solid #ddd; + } + + td { + text-align: right; + padding: 16px; + border: 1px solid #ddd; + } + + th{ + text-align: center; + padding: 16px; + border: 1px solid #ddd; + } + + tr:nth-child(even) { + } + + - - - - + {{--
PERMODALAN KELANTAN BERHAD
--}} +
LAPORAN BARANG LELONG DETAILS
 - - - - -

PERMODALAN KELANTAN BERHAD

LAPORAN BARANG LELONG Details
- - +
-
@foreach ($arrayinfo as $laporan) - - - + @endphp @foreach ($laporan['details'] as $details) - @@ -114,13 +114,13 @@ tr:nth-child(even) { - - + + - + - - + + @@ -158,10 +158,10 @@ tr:nth-child(even) { - + - - + + @endforeach diff --git a/resources/views/pdf/pdflapbrglelpembida.blade.php b/resources/views/pdf/pdflapbrglelpembida.blade.php index ef163c1e..09f6d438 100644 --- a/resources/views/pdf/pdflapbrglelpembida.blade.php +++ b/resources/views/pdf/pdflapbrglelpembida.blade.php @@ -1,109 +1,110 @@ + #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { + border: 0px solid; + padding: 1px; + text-align: left; + + } + + #sim tr:nth-child(even){} + + #sim tr:hover {} + + #sim th { + text-align: center; + border: 0px solid; + table-layout:auto; + color: black; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + } + + * { + box-sizing: border-box; + } + + .row { + margin-right:-5px; + margin-right:-5px; + } + + .column { + float: right; + width: 100%; + padding: 5px; + } + + /* Clearfix (clear floats) */ + .row::after { + content: ""; + clear: both; + display: table; + } + + table { + border-collapse: collapse; + border-spacing: 0; + width: 200%; + border: 1px solid #ddd; + } + + td { + text-align: right; + padding: 16px; + border: 1px solid #ddd; + } + + th{ + text-align: center; + padding: 16px; + border: 1px solid #ddd; + } + + tr:nth-child(even) { + } + + -
Batch Lelong : {{$laporan['laporan']['lelong_id']}}Tarikh Lelong : @php +
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
Fasa : {{$laporan['laporan']['fasa']}}Cawangan : {{$details['caw_name']}} +
Cawangan : {{$details['caw_name']}}
@endforeach @endforeach
NoNo Rujukan Jenis MarhunNo Rujukan Jenis Marhun KaratBerat(gm)Berat(gm) Harga(RM)Nilai Marhun(RM)Harga Asas(RM)Nilai Marhun(RM)Harga Asas(RM) Nota
{{ 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, '.', ',') }}
- - - + {{--
PERMODALAN KELANTAN BERHAD
--}} +
LAPORAN BARANG LELONG PEMBIDA
 - - - - -

PERMODALAN KELANTAN BERHAD

LAPORAN LELONG KESELURUHAN
- - +

- @foreach ($info as $info) +
Fasa: {{$info->fasa}}
+
Batch Lelong: {{$lelong_id}}
- - + @endphp @endforeach @foreach ($arrayinfocaw as $laporancaw) @foreach ($laporancaw['cawangan'] as $details) -
Batch Lelong: {{$lelong_id}}Tarikh Lelong: @php +
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}} Cawangan : {{$details['caw_name']}} +
Cawangan : {{$details['caw_name']}}
@endforeach @endforeach diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php index 14f7e4b8..1686d322 100644 --- a/resources/views/pdf/pdflaplelong.blade.php +++ b/resources/views/pdf/pdflaplelong.blade.php @@ -1,109 +1,109 @@ + #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { + border: 0px solid; + padding: 1px; + text-align: left; + + } + + #sim tr:nth-child(even){} + + #sim tr:hover {} + + #sim th { + text-align: center; + border: 0px solid; + table-layout:auto; + color: black; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + } + + * { + box-sizing: border-box; + } + + .row { + margin-right:-5px; + margin-right:-5px; + } + + .column { + float: right; + width: 100%; + padding: 5px; + } + + /* Clearfix (clear floats) */ + .row::after { + content: ""; + clear: both; + display: table; + } + + table { + border-collapse: collapse; + border-spacing: 0; + width: 200%; + border: 1px solid #ddd; + } + + td { + text-align: right; + padding: 16px; + border: 1px solid #ddd; + } + + th{ + text-align: center; + padding: 16px; + border: 1px solid #ddd; + } + + tr:nth-child(even) { + } + + - - - - + {{--
PERMODALAN KELANTAN BERHAD
--}} +
LAPORAN LELONG KESELURUHAN
 - - - - -

PERMODALAN KELANTAN BERHAD

LAPORAN LELONG KESELURUHAN
- - +
-
- - @foreach ($info as $info) + @foreach ($info as $info) +
Fasa: {{$info->fasa}}
+
Batch Lelong: {{$lelong_id}}
- - + @endphp @endforeach @foreach ($arrayinfocaw as $laporancaw) @foreach ($laporancaw['cawangan'] as $details) - - - + + diff --git a/resources/views/pdf/pdfsenarailapbidaan.blade.php b/resources/views/pdf/pdfsenarailapbidaan.blade.php index b5351e0b..e8e6d7f7 100644 --- a/resources/views/pdf/pdfsenarailapbidaan.blade.php +++ b/resources/views/pdf/pdfsenarailapbidaan.blade.php @@ -1,107 +1,107 @@ + #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { + border: 0px solid; + padding: 1px; + text-align: left; + + } + + #sim tr:nth-child(even){} + + #sim tr:hover {} + + #sim th { + text-align: center; + border: 0px solid; + table-layout:auto; + color: black; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + } + + * { + box-sizing: border-box; + } + + .row { + margin-right:-5px; + margin-right:-5px; + } + + .column { + float: right; + width: 100%; + padding: 5px; + } + + /* Clearfix (clear floats) */ + .row::after { + content: ""; + clear: both; + display: table; + } + + table { + border-collapse: collapse; + border-spacing: 0; + width: 200%; + border: 1px solid #ddd; + } + + td { + text-align: right; + padding: 16px; + border: 1px solid #ddd; + } + + th{ + text-align: center; + padding: 16px; + border: 1px solid #ddd; + } + + tr:nth-child(even) { + } + + -
Batch Lelong: {{$lelong_id}}Tarikh Lelong:@php +
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}}Cawangan : {{$details['caw_name']}} +
Cawangan : {{$details['caw_name']}}
@endforeach @endforeach @@ -200,8 +200,8 @@ tr:nth-child(even) {
Jumlah Baki A: {{$bakilelong}}Jumlah Baki B: {{$rugilelong}}Jumlah Baki A: {{$bakilelong}}Jumlah Baki B: {{$rugilelong}} Baki A - Baki B: RM{{number_format($total_baki, 2, '.', ',')}}
- - - + {{--
PERMODALAN KELANTAN BERHAD
--}} +
LAPORAN SENARAI BIDAAN PEMBIDA
 - - - - -

PERMODALAN KELANTAN BERHAD

LAPORAN SENARAI BIDAAN PEMBIDA
- - +
-
- @foreach ($lelongid as $info) - - + @endphp @endforeach @foreach ($arrayinfocaw as $laporancaw) @foreach ($laporancaw['cawangan'] as $details) -
Batch Lelong: {{$lelong_id}}Tarikh Lelong:@php +
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
Fasa : {{ $info->fasa}}Cawangan : {{$details['caw_name']}} +
Cawangan : {{$details['caw_name']}}
@endforeach @endforeach