rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Replace pdf filler images with the real ones #515

Browse source
This commit is contained in:
Kendrick Chan 2020-10-04 22:41:28 +08:00
parent 43aabbd5ee
commit 694fccfbad
10 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/assets/images/pdf_images/100x100.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 255 B

BIN
public/assets/images/pdf_images/90.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 276 B

BIN
public/assets/images/pdf_images/95.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 258 B

BIN
public/assets/images/pdf_images/heart_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
public/assets/images/pdf_images/heart_qr.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
public/assets/images/pdf_images/pdf_cmb_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
public/assets/images/pdf_images/touchngo_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
public/assets/images/pdf_images/touchngo_qr.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

11
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -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();

10
translations/messages.en.yaml
View file

@ -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