From 43aabbd5ee4f5bd5424936381c219e8e04ac105e Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 2 Oct 2020 10:19:06 +0000 Subject: [PATCH] Add placeholder images to pdf file. #515 --- .../110x110-qr-codes-logo-placeholder.png | Bin 0 -> 279 bytes .../images/pdf_images/120x120-qr-codes.png | Bin 0 -> 301 bytes .../275x100-century-logo-placeholder.png | Bin 0 -> 499 bytes .../275x125-century-logo-placeholder.png | Bin 0 -> 429 bytes .../275x75-century-logo-placeholder.png | Bin 0 -> 492 bytes .../275x90-century-logo-placeholder.png | Bin 0 -> 495 bytes .../JobOrderHandler/CMBJobOrderHandler.php | 41 ++++++++++++++++-- translations/cmb.messages.en.yaml | 11 +++-- translations/messages.en.yaml | 11 +++-- 9 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 public/assets/images/pdf_images/110x110-qr-codes-logo-placeholder.png create mode 100644 public/assets/images/pdf_images/120x120-qr-codes.png create mode 100644 public/assets/images/pdf_images/275x100-century-logo-placeholder.png create mode 100644 public/assets/images/pdf_images/275x125-century-logo-placeholder.png create mode 100644 public/assets/images/pdf_images/275x75-century-logo-placeholder.png create mode 100644 public/assets/images/pdf_images/275x90-century-logo-placeholder.png 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 0000000000000000000000000000000000000000..87bce404e0a22b76f2c2c2b4b136c97b2dabe682 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^c_7Tf3?xlTtxo_cl>na**E46%Oq(`s-@bi|7cZVO zXU_KR+gGhxwQ=LdqeqXfUAuPKvSph$Z=Sb%2_H~BXMsm#F#`kN5fEmas?8@26rAbl z;usRq`u6NbK1N58)`!{C&P>@oSBNv}q*&Cd+?5)FtwozUcSh$a%N(T$N*}-=vD>DHNcyNB^7U{6>59Hn7NbgO{f29`xMQW0YU4}(wTCwE&5NAo=%^9z= zzx~P<-`@Xj(Xy>mE-nl(-<-AP{hoI-OY{nFyf(cbQvG~U*V4707A*Uo6Il0+A86{I ZDbj&nQv9paRP2B}22WQ%mvv4FO#m+xb!z|s literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5bfe29c856981c309a04483fbc06dc68c2837c3f GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#Q3?xr`X+H!~asfUeu4m4inKo_O#*G^nFJ8QA z)v7sj<{UkGbo=)0`}XbIxpSwVL#Pf=C1-(0WHAE+-w_aIoT|+y4HVq!>Eaj?(faoM zMy^8!BCQW+3oK4%;_B0NEbt4o-sXL9t*eG)v`b8MP2;tFJ1*{XDA0M%-NN&8XN(e1 zGY~{@CEwJXHUCZd>JQV>m8QKqUvc$BR`8`Mzb4-gPR`6uHHw?8sPOIbmUkMpyH57H zKeTuoZTIB8BKQ0?9)?Fh-F^K?-YMK^I-}uvpZCGf)vxDn)RVivo z?|;Za;@HRU8Jgxn4lgUV9y18*dc^UgTkyh>t8Be}?ic<_Eq-|Zn=NbeqX(BBeW>xc zx25F8^w*+FK$GF%NB^e$^i5H3?zTo+JD$39EqD>z-fL6WsJ_}TtI)5w$am&55&ghV zS|%pB#a_l2i|(j>yz^-0snE%$%E3^zL%o8uxv3+oNSPV{*0jl)08mEoRx=&;O7X zv5Y0=`csjAX?f?3R~;!^&$9CU_m+*u%S9HhEZG#XW_iWoAKRy7Y&1A@V`gyI;yb6c zc&BOp;q-X-%}h=pe%{2@AhlD1tgpKJA9U{$T5GpFV3GMY-T1P+UwgF5o=tJOoLo0^ z>)z?o(D=i%37^{e~)?$hI+X3iaHi?0SA l)&G*2GikpZ6Fjv3oVA|J7_jzKzD+Pl%+uA+Wt~$(69Do2X?_wfUrh=9zlBIEGZr zd3$lA{~-sFhL7c~Opmp~zJw5m^ zdbdcm;qT8=g6;ipPJ6uiNN>LSwp8;uiRZnZ*1hSI%G$Gi-^8pfeSb3&+x|}cZsgVN z>ACD*Olon`+FO%Iq75%gUySO}>`y!GLE*EM}rc)rGL5u0n< zf3?JYdep2L8Gk=I3LS~+=JxtIbME<9Ha1}grq8Yko7Jsc4)-DhL)T}%w@$iRZVR5> P0*QLM`njxgN@xNAm07sC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..65e8c0d55af1c8affc40efc1ee2a015cb91a0dfb GIT binary patch literal 492 zcmeAS@N?(olHy`uVBq!ia0y~yU=#+jy;+!no z?|;Za;@HRU8Jgxn4lgUV9y18*dc^UgTkyh>t8Be}?ic<_Eq-|Zo2@R}QHkk?KGk^K z+fwpk`fE`opve&M!~5G?pD^?4^29K|36pMDd0km>eb=O|F0x_9=Q91)XJtuQ^ki477&Cr?euHHF$qvCDA#5*_p=Q?J& zJa0{R)J%P9d!$5>S&}0;IBUvGp*F&-^2W8-)t6p<$U*=@T<;W!kXJlaF&;P_tC5_^PYO|PBCufp1G_`El%xSb4kJf zp}#}X_U+#qethbQQ3Z)lxwX=+ipwr&O2${qR-wJya(`|rzWh9NBhZ#va-UDHdAs+{ zjwvl>s;a+gX1+8z8=tmM=Xh*gTv^_QyPp<(dOSbx@ssQC_3Y>68@FVbMahN!>9y-E f{dCb|freFix;TbpG`_vE z-~W(<#IcXxGc?UFHC_5BkSw9?TFCO}C`ZPltY)|4$}j4AFMde>Jx{Fp&@H1MH6Hi2 zl)RY!T2u*WFcdV@EBq~0TYdCi?2N6#OH#__U0QXy+V`YF*zv1Vilr_`dzmh;*f`1D z*LgGFa+4%oby=bHx$`VFS$(hCa;5%N_S)*ZvN!6=rqxE)9CuzGshGP=X=k~F<>4b8 z@1)Pq2|9JEy6c5kn~}(|Wh_%>anHWA*nQ#iV;Aqu2zPDcE_&a($#}Vl`{d`pOYiYS zdYve>^?R5v_RVIgSIT#<89(acC9I3R1ZR1rpMF}^W!|-I>6U5U$~|)}ms*_KyY7;K z_d|b=qW$|nHvITBCq@+{KECep9!&z?6r7Y@H#@ag&dbp@ZEmrtLsUoPonBEP;*t8Srx h^5i>J9I(K${>WK-DqyV*&;3~-Ax~F7mvv4FO#pt8-!K3G literal 0 HcmV?d00001 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