structured adress on actors

RFXtoRP_HsaCons_ActorCreated.ftl

@@ -17,9 +17,13 @@
     <#--
     <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
     -->
+                 
+    "Address":
+        {
+
+        <#-- if Reflex WMS is structured    -->
+        <#if actor.consignee_structured_address??>
 
-      "Address":
-         {
         "Name": "${actor.consignee_structured_address.name_or_company}",
         "StreetAddressOne" : "${actor.consignee_structured_address.street_and_PO}",
         "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data}", 
@@ -27,12 +31,23 @@
         "City" : "${actor.consignee_structured_address.post_code_area_name}",
         "CountryCode" : "${actor.consignee_structured_address.country_code}",
 			  "ProvinceCode": "${actor.consignee_structured_address.territorial_div_code}",
-			  "State": "${actor.consignee_structured_address.country_designation}"         
-         },
-      "Phones": ["${actor.address.telephone}", 
-                 "${actor.address.other_number}"
-                ],  
-      "Typology": "TYPOLOGY_UNKNOWN"
+			  "State": "${actor.consignee_structured_address.country_designation}"
+
+        <#-- if Reflex WMS is not structured    -->
+        <#else> 
+
+        "Name": "${actor.address.company_name}",
+        "StreetAddressOne" : "${actor.address.address_1}",
+        "StreetAddressTwo" : "${actor.address.address_2}",
+        "StreetAddressThree" : "${actor.address.address_3}",        
+         
+        </#if> 
+       },  
+      
+    "Phones": ["${actor.address.telephone}", 
+               "${actor.address.other_number}"
+              ],  
+    "Typology": "TYPOLOGY_UNKNOWN"
       }
   }
 ]