// merge 1.4 (5397)

controllers/OrderOpcController.php

@@ -120,6 +120,7 @@ class OrderOpcControllerCore extends ParentOrderController
 									$blockUserInfo = new BlockUserInfo();
 								}
 								self::$smarty->assign('isVirtualCart', self::$cart->isVirtualCart());
+								$this->processAddressFormat();
 								$this->_assignAddress();
 								// Wrapping fees
 								$wrapping_fees = (float)(Configuration::get('PS_GIFT_WRAPPING_PRICE'));
@@ -265,7 +266,9 @@ class OrderOpcControllerCore extends ParentOrderController
 	public function displayContent()
 	{
 		parent::displayContent();
-		
+	
+		$this->processAddressFormat();
+	
 		self::$smarty->display(_PS_THEME_DIR_.'errors.tpl');
 		self::$smarty->display(_PS_THEME_DIR_.'order-opc.tpl');
 	}
@@ -446,6 +449,30 @@ class OrderOpcControllerCore extends ParentOrderController
 			return self::$cart->id_carrier;
 		return 0;
 	}
+
+	protected function processAddressFormat()
+	{
+		$selectedCountry = (int)(Configuration::get('PS_COUNTRY_DEFAULT'));
+		$inv_adr_fields = AddressFormat::getOrderedAddressFields($selectedCountry);
+		$dlv_adr_fields = AddressFormat::getOrderedAddressFields($selectedCountry);
+
+		$inv_all_fields = array();
+		$dlv_all_fields = array();
+
+		foreach (array('inv','dlv') as $adr_type)
+		{
+			foreach (${$adr_type.'_adr_fields'} as $fields_line)
+				foreach(explode(' ',$fields_line) as $field_item)
+					${$adr_type.'_all_fields'}[] = trim($field_item);
+
+// DEBUG		echo('<br />processAddressFormat: inv_all_fields: ' . var_export($inv_all_fields, true)
+// DEBUG		.'<br />processAddressFormat: inv_all_fields: ' . var_export($dlv_all_fields, true));					
+
+			self::$smarty->assign($adr_type.'_adr_fields', ${$adr_type.'_adr_fields'});
+			self::$smarty->assign($adr_type.'_all_fields', ${$adr_type.'_all_fields'});
+
+		}
+	}
 }