diff --git a/public/assets/images/pdf_images/100x100.png b/public/assets/images/pdf_images/100x100.png new file mode 100644 index 00000000..8a1daa01 Binary files /dev/null and b/public/assets/images/pdf_images/100x100.png differ diff --git a/public/assets/images/pdf_images/90.png b/public/assets/images/pdf_images/90.png new file mode 100644 index 00000000..59769ffc Binary files /dev/null and b/public/assets/images/pdf_images/90.png differ diff --git a/public/assets/images/pdf_images/95.png b/public/assets/images/pdf_images/95.png new file mode 100644 index 00000000..46e69146 Binary files /dev/null and b/public/assets/images/pdf_images/95.png differ diff --git a/public/assets/images/pdf_images/heart_logo.png b/public/assets/images/pdf_images/heart_logo.png new file mode 100644 index 00000000..a8454480 Binary files /dev/null and b/public/assets/images/pdf_images/heart_logo.png differ diff --git a/public/assets/images/pdf_images/heart_qr.png b/public/assets/images/pdf_images/heart_qr.png new file mode 100644 index 00000000..44df477f Binary files /dev/null and b/public/assets/images/pdf_images/heart_qr.png differ diff --git a/public/assets/images/pdf_images/pdf_cmb_logo.png b/public/assets/images/pdf_images/pdf_cmb_logo.png new file mode 100644 index 00000000..f206620e Binary files /dev/null and b/public/assets/images/pdf_images/pdf_cmb_logo.png differ diff --git a/public/assets/images/pdf_images/touchngo_logo.png b/public/assets/images/pdf_images/touchngo_logo.png new file mode 100644 index 00000000..1d236467 Binary files /dev/null and b/public/assets/images/pdf_images/touchngo_logo.png differ diff --git a/public/assets/images/pdf_images/touchngo_qr.png b/public/assets/images/pdf_images/touchngo_qr.png new file mode 100644 index 00000000..3a0522c0 Binary files /dev/null and b/public/assets/images/pdf_images/touchngo_qr.png differ diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 52f10248..2a481593 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2176,6 +2176,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $col2_x = 120; $label_width = 40; $val_width = 60; + $col_qr_code = 150; // insert the logo $image_path = $proj_path . $translated_logo; @@ -2403,7 +2404,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $y = max($y1, $y2); // insert the scan to pay - $pdf->SetXY($col2_x, $y); + $pdf->SetXY($col_qr_code, $y); $pdf->SetFont($font_face, 'B'); $pdf->Cell($label_width, $line_height, $translator->trans('pdf_footer_scan_to_pay')); @@ -2424,19 +2425,19 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface // 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); + $pdf->Image($qr_logo_image_path_1, $col_qr_code, $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); + $pdf->Image($qr_logo_image_path_2, $col_qr_code + 30, $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); + $pdf->Image($qr_code_image_path_1, $col_qr_code, $y + 30); $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); + $pdf->Image($qr_code_image_path_2, $col_qr_code + 30, $y + 30); // get Y after left cell $y1 = $pdf->GetY(); diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index 6c757d14..760a95c6 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -34,11 +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_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 +image_jo_pdf_century_logo: /public/assets/images/pdf_images/pdf_cmb_logo.png +image_jo_pdf_qr_logo_1: /public/assets/images/pdf_images/touchngo_logo.png +image_jo_pdf_qr_logo_2: /public/assets/images/pdf_images/heart_logo.png +image_jo_pdf_qr_code_1: /public/assets/images/pdf_images/touchngo_qr.png +image_jo_pdf_qr_code_2: /public/assets/images/pdf_images/heart_qr.png # default point for maps default_lat: 3.084216