diff --git a/config/services.yaml b/config/services.yaml index b62024ce..c8916c9b 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -11,6 +11,7 @@ parameters: app_acl_file: 'acl.yaml' app_access_key: 'access_keys' cvu_brand_id: "%env(CVU_BRAND_ID)%" + country_code: "%env(COUNTRY_CODE)%" services: # default configuration for services in *this* file diff --git a/src/Controller/CustomerController.php b/src/Controller/CustomerController.php index d03d735a..1f3849ad 100644 --- a/src/Controller/CustomerController.php +++ b/src/Controller/CustomerController.php @@ -584,11 +584,14 @@ class CustomerController extends Controller // build vehicles array $vehicles = []; + // get country code from services.yaml + $country_code = $this->getParameter('country_code'); + foreach ($obj_rows as $cv) { $cust = $cv->getCustomer(); $vehicles[] = [ 'id' => $cv->getID(), - 'text' => $cv->getPlateNumber() . ' ' . $cust->getFirstName() . ' ' . $cust->getLastName() . ' (+63' . $cust->getPhoneMobile() . ')', + 'text' => $cv->getPlateNumber() . ' ' . $cust->getFirstName() . ' ' . $cust->getLastName() . ' (' . $country_code . $cust->getPhoneMobile() . ')', ]; } diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index d38b7e9c..2036ffe0 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -1977,6 +1977,9 @@ class JobOrderController extends Controller $translated_title = $translator->trans('jo_title_pdf'); $translated_logo = $translator->trans('image_jo_pdf'); + // get the country code from services.yaml + $country_code = $this->getParameter('country_code'); + // generate the pdf $pdf = new FPDF('P', 'mm', 'letter'); $pdf->AddPage(); @@ -2029,7 +2032,7 @@ class JobOrderController extends Controller $pdf->SetXY($col2_x, $y); $pdf->Cell($label_width, $line_height, 'Mobile Phone:'); - $pdf->MultiCell(0, $line_height, $customer && $customer->getPhoneMobile() ? '+63' . $customer->getPhoneMobile() : '', 0, 'L'); + $pdf->MultiCell(0, $line_height, $customer && $customer->getPhoneMobile() ? $country_code . $customer->getPhoneMobile() : '', 0, 'L'); // get Y after right cell $y2 = $pdf->GetY(); @@ -2046,7 +2049,7 @@ class JobOrderController extends Controller $pdf->SetXY($col2_x, $y); $pdf->Cell($label_width, $line_height, 'Landline:'); - $pdf->MultiCell(0, $line_height, $customer && $customer->getPhoneLandline() ? '+63' . $customer->getPhoneLandline() : '', 0, 'L'); + $pdf->MultiCell(0, $line_height, $customer && $customer->getPhoneLandline() ? $country_code . $customer->getPhoneLandline() : '', 0, 'L'); // get Y after right cell $y2 = $pdf->GetY(); @@ -2056,11 +2059,11 @@ class JobOrderController extends Controller $pdf->SetXY($col2_x, $y); $pdf->Cell($label_width, $line_height, 'Office Phone:'); - $pdf->MultiCell(0, $line_height, $customer && $customer->getPhoneOffice() ? '+63' . $customer->getPhoneOffice() : '', 0, 'L'); + $pdf->MultiCell(0, $line_height, $customer && $customer->getPhoneOffice() ? $country_code . $customer->getPhoneOffice() : '', 0, 'L'); $pdf->SetX($col2_x); $pdf->Cell($label_width, $line_height, 'Fax:'); - $pdf->MultiCell($val_width, $line_height, $customer && $customer->getPhoneFax() ? '+63' . $customer->getPhoneFax() : '', 0, 'L'); + $pdf->MultiCell($val_width, $line_height, $customer && $customer->getPhoneFax() ? $country_code . $customer->getPhoneFax() : '', 0, 'L'); // insert vehicle info $cv = $obj->getCustomerVehicle(); diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php index 880f0213..d9dd9b98 100644 --- a/src/Entity/Customer.php +++ b/src/Entity/Customer.php @@ -258,16 +258,16 @@ class Customer $phones = []; if (!empty($this->phone_mobile)) - $phones[] = '+63' . $this->phone_mobile; + $phones[] = $this->phone_mobile; if (!empty($this->phone_landline)) - $phones[] = '+63' . $this->phone_landline; + $phones[] = $this->phone_landline; if (!empty($this->phone_office)) - $phones[] = '+63' . $this->phone_office; + $phones[] = $this->phone_office; if (!empty($this->phone_fax)) - $phones[] = '+63' . $this->phone_fax; + $phones[] = $this->phone_fax; return $phones; } diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig index 58d35568..af85fd94 100644 --- a/templates/customer/form.html.twig +++ b/templates/customer/form.html.twig @@ -131,7 +131,7 @@ Mobile Phone