diff --git a/public/assets/images/pdf_images/110x110-qr-codes-logo-placeholder.png b/public/assets/images/pdf_images/110x110-qr-codes-logo-placeholder.png new file mode 100644 index 00000000..87bce404 Binary files /dev/null and b/public/assets/images/pdf_images/110x110-qr-codes-logo-placeholder.png differ diff --git a/public/assets/images/pdf_images/120x120-qr-codes.png b/public/assets/images/pdf_images/120x120-qr-codes.png new file mode 100644 index 00000000..5bfe29c8 Binary files /dev/null and b/public/assets/images/pdf_images/120x120-qr-codes.png differ diff --git a/public/assets/images/pdf_images/275x100-century-logo-placeholder.png b/public/assets/images/pdf_images/275x100-century-logo-placeholder.png new file mode 100644 index 00000000..75562fe5 Binary files /dev/null and b/public/assets/images/pdf_images/275x100-century-logo-placeholder.png differ diff --git a/public/assets/images/pdf_images/275x125-century-logo-placeholder.png b/public/assets/images/pdf_images/275x125-century-logo-placeholder.png new file mode 100644 index 00000000..1cd10c4f Binary files /dev/null and b/public/assets/images/pdf_images/275x125-century-logo-placeholder.png differ diff --git a/public/assets/images/pdf_images/275x75-century-logo-placeholder.png b/public/assets/images/pdf_images/275x75-century-logo-placeholder.png new file mode 100644 index 00000000..65e8c0d5 Binary files /dev/null and b/public/assets/images/pdf_images/275x75-century-logo-placeholder.png differ diff --git a/public/assets/images/pdf_images/275x90-century-logo-placeholder.png b/public/assets/images/pdf_images/275x90-century-logo-placeholder.png new file mode 100644 index 00000000..46c88337 Binary files /dev/null and b/public/assets/images/pdf_images/275x90-century-logo-placeholder.png differ diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 3456d97f..52f10248 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2172,6 +2172,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $header_font_size = 9; $jo_font_size = 16; $col1_x = $margin; + $col_extra_x = 85; $col2_x = 120; $label_width = 40; $val_width = 60; @@ -2180,9 +2181,17 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $image_path = $proj_path . $translated_logo; $pdf->Image($image_path, $col1_x, 10); + $y = $pdf->GetY(); + + // insert number + $pdf->Ln($line_height); + $pdf->SetFont($font_face, 'B', $body_font_size); + $pdf->SetX($col_extra_x); + $pdf->Cell($label_width, $jo_line_height, '1800-22-8837'); + // insert JO number $pdf->SetFont($font_face, 'B', $jo_font_size); - $pdf->SetX($col2_x); + $pdf->SetXY($col2_x, $y); $pdf->Cell($label_width, $jo_line_height, 'JO NO:'); $pdf->SetTextColor(9, 65, 150); $pdf->Cell(0, $jo_line_height, $obj->getID()); @@ -2190,7 +2199,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $pdf->Ln(); // insert date - $pdf->setX($col2_x); + $pdf->SetX($col2_x); $str_date_create = $obj->getDateCreate()->format('d/m/y'); $pdf->SetFont($font_face, 'B', $jo_font_size); $pdf->SetTextColor(0, 0, 0); @@ -2199,7 +2208,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $pdf->Cell(0, $jo_line_height, $str_date_create); // insert company name - $pdf->Ln($line_height * 4); + $pdf->Ln($line_height * 2); $pdf->SetFont($font_face, 'B', $body_font_size); $pdf->SetTextColor(0, 0, 0); $pdf->SetX($col1_x); @@ -2407,6 +2416,28 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $pdf->SetXY($col1_x, $y); $pdf->Ln($line_height); + + // get Y after left cell + $y1 = $pdf->GetY(); + + $y = max($y1, $y2); + + // insert qr logos + $qr_logo_image_path_1 = $proj_path . $translator->trans('image_jo_pdf_qr_logo_1');; + $pdf->Image($qr_logo_image_path_1, $col2_x, $y, 25); + + $qr_logo_image_path_2 = $proj_path . $translator->trans('image_jo_pdf_qr_logo_2');; + $pdf->Image($qr_logo_image_path_2, $col2_x + 40, $y, 25); + + $y2 = $pdf->GetY(); + + // insert qr codes + $qr_code_image_path_1 = $proj_path . $translator->trans('image_jo_pdf_qr_code_1');; + $pdf->Image($qr_code_image_path_1, $col2_x, $y + 30, 25); + + $qr_code_image_path_2 = $proj_path . $translator->trans('image_jo_pdf_qr_code_2');; + $pdf->Image($qr_code_image_path_2, $col2_x + 40, $y + 30, 25); + // get Y after left cell $y1 = $pdf->GetY(); @@ -2426,7 +2457,9 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $pdf->Ln(); $pdf->Cell($label_width, $line_height, $translator->trans('pdf_footer_warranty_private_label')); $pdf->Ln(); - $pdf->Cell($label_width, $line_height, $translator->trans('pdf_footer_warranty_private_text')); + $pdf->Cell($label_width, $line_height, $translator->trans('pdf_footer_warranty_private_text_1')); + $pdf->Ln(); + $pdf->Cell($label_width, $line_height, $translator->trans('pdf_footer_warranty_private_text_2')); $pdf->Ln(); $pdf->Cell($label_width, $line_height, $translator->trans('pdf_footer_warranty_commercial_label')); $pdf->Ln(); diff --git a/translations/cmb.messages.en.yaml b/translations/cmb.messages.en.yaml index 1da85db5..6c757d14 100644 --- a/translations/cmb.messages.en.yaml +++ b/translations/cmb.messages.en.yaml @@ -22,8 +22,8 @@ pdf_footer_company_name: Entity Logistic Sdn Bhd pdf_footer_bank: 'Malayan Banking: 512307611410' pdf_footer_return_policy: Goods Sold are not returnable or exchangeable pdf_footer_warranty_private_label: 'Petrol vehicles / private use : -' -pdf_footer_warranty_private_text: 'Warranty 12 months + 6 months extended or 25,000 km (whichever - comes first) and on selected models' +pdf_footer_warranty_private_text_1: 'Warranty 12 months + 6 months extended or 25,000 km (whichever' +pdf_footer_warranty_private_text_2: 'comes first) and on selected models' pdf_footer_warranty_commercial_label: 'Diesel vehicles / commercial use : -' pdf_footer_warranty_commercial_text: 'Warranty 6 months extended or 20,000 km (whichever comes first)' pdf_footer_document: 'THIS IS A COMPUTER GENERATED DOCUMENT - NO SIGNATURE REQUIRED' @@ -34,8 +34,11 @@ icon_login: /assets/images/battery-assist-bm-logo-32x32.png icon_base_32x32: /assets/images/black-text-logo-01-32x32.png icon_base_16x16: /assets/images/black-text-logo-01-16x16.png image_dashboard: /assets/images/century_logo.png -image_jo_pdf_battery_assist_logo: /public/assets/images/battery-assist-bm-logo-edited.png -image_jo_pdf_century_logo: /public/assets/images/black-text-logo-01-115x115.png +image_jo_pdf_century_logo: /public/assets/images/pdf_images/275x75-century-logo-placeholder.png +image_jo_pdf_qr_logo_1: /public/assets/images/pdf_images/110x110-qr-codes-logo-placeholder.png +image_jo_pdf_qr_logo_2: /public/assets/images/pdf_images/110x110-qr-codes-logo-placeholder.png +image_jo_pdf_qr_code_1: /public/assets/images/pdf_images/120x120-qr-codes.png +image_jo_pdf_qr_code_2: /public/assets/images/pdf_images/120x120-qr-codes.png # default point for maps default_lat: 3.084216 diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index 1da85db5..6c757d14 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -22,8 +22,8 @@ pdf_footer_company_name: Entity Logistic Sdn Bhd pdf_footer_bank: 'Malayan Banking: 512307611410' pdf_footer_return_policy: Goods Sold are not returnable or exchangeable pdf_footer_warranty_private_label: 'Petrol vehicles / private use : -' -pdf_footer_warranty_private_text: 'Warranty 12 months + 6 months extended or 25,000 km (whichever - comes first) and on selected models' +pdf_footer_warranty_private_text_1: 'Warranty 12 months + 6 months extended or 25,000 km (whichever' +pdf_footer_warranty_private_text_2: 'comes first) and on selected models' pdf_footer_warranty_commercial_label: 'Diesel vehicles / commercial use : -' pdf_footer_warranty_commercial_text: 'Warranty 6 months extended or 20,000 km (whichever comes first)' pdf_footer_document: 'THIS IS A COMPUTER GENERATED DOCUMENT - NO SIGNATURE REQUIRED' @@ -34,8 +34,11 @@ icon_login: /assets/images/battery-assist-bm-logo-32x32.png icon_base_32x32: /assets/images/black-text-logo-01-32x32.png icon_base_16x16: /assets/images/black-text-logo-01-16x16.png image_dashboard: /assets/images/century_logo.png -image_jo_pdf_battery_assist_logo: /public/assets/images/battery-assist-bm-logo-edited.png -image_jo_pdf_century_logo: /public/assets/images/black-text-logo-01-115x115.png +image_jo_pdf_century_logo: /public/assets/images/pdf_images/275x75-century-logo-placeholder.png +image_jo_pdf_qr_logo_1: /public/assets/images/pdf_images/110x110-qr-codes-logo-placeholder.png +image_jo_pdf_qr_logo_2: /public/assets/images/pdf_images/110x110-qr-codes-logo-placeholder.png +image_jo_pdf_qr_code_1: /public/assets/images/pdf_images/120x120-qr-codes.png +image_jo_pdf_qr_code_2: /public/assets/images/pdf_images/120x120-qr-codes.png # default point for maps default_lat: 3.084216