From 06cdeb45a5f760e5c6a2b018163b51e6611055d9 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 12 Aug 2013 15:17:21 +0200 Subject: [PATCH] [-] FO : FixBug #PSCFV-10058 - Missing required form fields in address format --- controllers/front/OrderOpcController.php | 12 ++++++++++-- themes/default/order-opc-new-account.tpl | 1 - 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 2c5ff6540..290b4e66b 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -614,13 +614,21 @@ class OrderOpcControllerCore extends ParentOrderController protected function _processAddressFormat() { - $selectedCountry = (int)(Configuration::get('PS_COUNTRY_DEFAULT')); - $address_delivery = new Address((int)$this->context->cart->id_address_delivery); $address_invoice = new Address((int)$this->context->cart->id_address_invoice); $inv_adr_fields = AddressFormat::getOrderedAddressFields((int)$address_delivery->id_country, false, true); $dlv_adr_fields = AddressFormat::getOrderedAddressFields((int)$address_invoice->id_country, false, true); + $requireFormFieldsList = AddressFormat::$requireFormFieldsList; + + // Add missing require fields for a new user susbscription form + foreach ($requireFormFieldsList as $fieldName) + if (!in_array($fieldName, $dlv_adr_fields)) + $dlv_adr_fields[] = trim($fieldName); + + foreach ($requireFormFieldsList as $fieldName) + if (!in_array($fieldName, $inv_adr_fields)) + $inv_adr_fields[] = trim($fieldName); $inv_all_fields = array(); $dlv_all_fields = array(); diff --git a/themes/default/order-opc-new-account.tpl b/themes/default/order-opc-new-account.tpl index faab28386..676ee7b11 100644 --- a/themes/default/order-opc-new-account.tpl +++ b/themes/default/order-opc-new-account.tpl @@ -220,7 +220,6 @@