From c2fbb75a69f2c76f44bd0646f1b7a270ad93b76a Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Tue, 15 Oct 2019 05:24:13 +0000
Subject: [PATCH] Change Delivery Instructions label to Delivery Instructions -
 CarFix Job Order No. #270

---
 src/Service/JobOrderHandler/CMBJobOrderHandler.php | 3 ++-
 templates/job-order/form.html.twig                 | 2 +-
 templates/job-order/form.pdf.html.twig             | 2 +-
 translations/cmb.messages.en.yaml                  | 1 +
 translations/messages.en.yaml                      | 1 +
 translations/resq.messages.en.yaml                 | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 73e75d84..16fb4112 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -1591,6 +1591,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         // translate the title and the logo for the pdf
         $translated_title = $translator->trans('jo_title_pdf');
         $translated_logo = $translator->trans('image_jo_pdf');
+        $translated_delivery_instructions_label = $translator->trans('delivery_instructions_label');
 
         // generate the pdf
         $pdf = new FPDF('P', 'mm', 'letter');
@@ -1822,7 +1823,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         $pdf->SetY($y);
         $pdf->Ln();
         $pdf->SetFont($font_face, 'B', $header_font_size);
-        $pdf->Cell(0, $line_height, 'Delivery Instructions');
+        $pdf->Cell(0, $line_height, $translated_delivery_instructions_label);
         $pdf->Ln();
 
         $pdf->SetFont($font_face, '', $body_font_size);
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 0e5ca9df..30391bc4 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -308,7 +308,7 @@
                                         </div>
                                         <br>
                                         <div class="col-lg-12 form-group-inner">
-                                            <label data-field="delivery_instructions">Delivery Instructions</label>
+                                            <label data-field="delivery_instructions">{% trans %}delivery_instructions_label{% endtrans %}</label>
                                             <textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
                                         </div>
 									</div>
diff --git a/templates/job-order/form.pdf.html.twig b/templates/job-order/form.pdf.html.twig
index 8d1575cb..4602b6e6 100644
--- a/templates/job-order/form.pdf.html.twig
+++ b/templates/job-order/form.pdf.html.twig
@@ -221,7 +221,7 @@
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
                                         <div class="col-lg-12 form-group-inner">
-                                            <label data-field="delivery_instructions">Delivery Instructions</label>
+                                            <label data-field="delivery_instructions">{% trans %}delivery_instructions_label{% endtrans %}</label>
                                             <textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
                                         </div>
 									</div>
diff --git a/translations/cmb.messages.en.yaml b/translations/cmb.messages.en.yaml
index 0bd71da4..eaff0b65 100644
--- a/translations/cmb.messages.en.yaml
+++ b/translations/cmb.messages.en.yaml
@@ -11,6 +11,7 @@ battery_size_tradein_other: Trade-in Other
 add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
 jo_title_pdf: Res-Q for CMB Job Order
 country_code_prefix: '+60'
+delivery_instructions_label: 'Delivery Instructions - CarFix Job Order No.'
 
 # images
 image_logo_login: /assets/images/black-text-logo-01.png
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index 0bd71da4..eaff0b65 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -11,6 +11,7 @@ battery_size_tradein_other: Trade-in Other
 add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
 jo_title_pdf: Res-Q for CMB Job Order
 country_code_prefix: '+60'
+delivery_instructions_label: 'Delivery Instructions - CarFix Job Order No.'
 
 # images
 image_logo_login: /assets/images/black-text-logo-01.png
diff --git a/translations/resq.messages.en.yaml b/translations/resq.messages.en.yaml
index 966b6fd9..4a3e0bc1 100644
--- a/translations/resq.messages.en.yaml
+++ b/translations/resq.messages.en.yaml
@@ -11,6 +11,7 @@ battery_size_tradein_other: Trade-in Other
 add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
 jo_title_pdf: Motolite Res-Q Job Order
 country_code_prefix: '+63'
+delivery_instructions_label: Delivery Instructions
 
 # images
 image_logo_login: /assets/images/logo-resq.png