[-] FO : FixBug #PSCFV-10058 - Missing required form fields in address format

This commit is contained in:
Jerome Nadaud
2013-08-12 15:17:21 +02:00
parent de41faff80
commit 06cdeb45a5
2 changed files with 10 additions and 3 deletions
+10 -2
View File
@@ -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();