Modifs FTL 2211231443

This commit is contained in:
Laurie MONTANT 2023-11-22 14:43:53 +01:00
parent 0485a637af
commit 6b4f7e2ccc
4 changed files with 21 additions and 18 deletions

View File

@ -22,7 +22,7 @@
"Address": "Address":
{ {
<#-- if Reflex WMS address is structured --> <#-- if Reflex WMS address is structured -->
<#if carrier.carrier_structured_address?? > <#if carrier.carrier_structured_address?? >
"Name": "${carrier.carrier_structured_address.name_or_company?json_string}", "Name": "${carrier.carrier_structured_address.name_or_company?json_string}",
"StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}", "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}",
@ -35,16 +35,19 @@
<#-- if Reflex WMS address is not structured --> <#-- if Reflex WMS address is not structured -->
<#else> <#else>
"Name": "${carrier.address.company_name?json_string}", <#if carrier.address??>
"StreetAddressOne" : "${carrier.address.address_1?json_string}", "Name": "${carrier.address.company_name?json_string}",
"StreetAddressTwo" : "${carrier.address.address_2?json_string}", "StreetAddressOne" : "${carrier.address.address_1?json_string}",
"StreetAddressThree" : "${carrier.address.address_3?json_string}" "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
"StreetAddressThree" : "${carrier.address.address_3?json_string}"
</#if>
</#if> </#if>
}, },
<#if carrier.address??>
"Phones": ["${carrier.address.telephone?json_string}", "Phones": ["${carrier.address.telephone?json_string}",
"${carrier.address.other_number?json_string}" "${carrier.address.other_number?json_string}"
], ],
</#if>
"Typology": "TYPOLOGY_CARRIER" "Typology": "TYPOLOGY_CARRIER"
} }
} }

View File

@ -43,7 +43,7 @@
"ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}", "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
"Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}", "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
"Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code}", "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code}",
"ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference}", "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
<#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0> <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0>
"OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}", "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}",
</#if> </#if>

View File

@ -32,22 +32,22 @@
<#else> <#else>
"Actor": "Actor":
{ {
"Name" : "${preparation_order.address.name_or_company_name!""}", "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
"Address" : "Address" :
{ {
"City" : "${preparation_order.address.post_code_area_name!""}", "City" : "${preparation_order.address.post_code_area_name?json_string!""}",
"CountryCode" : "${preparation_order.address.iso_country_code!""}", "CountryCode" : "${preparation_order.address.iso_country_code!""}",
"PostalCode" : "${preparation_order.address.postal_code!""}", "PostalCode" : "${preparation_order.address.postal_code!""}",
"StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box!""}", "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}",
"StreetAddressTwo" : "${preparation_order.address.additional_address_data_1!""}", "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}",
"StreetAddressThree" : "${preparation_order.address.additional_address_data_2!""}" "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
} }
}, },
"Contact" : "Contact" :
{ {
"FirstName" : "${preparation_order.address.first_name!""}", "FirstName" : "${preparation_order.address.first_name?json_string!""}",
"LastName" : "${preparation_order.address.last_name!""}", "LastName" : "${preparation_order.address.last_name?json_string!""}",
"Emails" : ["${preparation_order.address.mail_address!""}"], "Emails" : ["${preparation_order.address.mail_address?json_string!""}"],
"Phones" : ["${preparation_order.address.mobile_phone_number!""}","${preparation_order.address.land_line_phone_number!""}", "${preparation_order.address.fax_number!""}" ] "Phones" : ["${preparation_order.address.mobile_phone_number!""}","${preparation_order.address.land_line_phone_number!""}", "${preparation_order.address.fax_number!""}" ]
} }

View File

@ -35,8 +35,8 @@
}, },
<#if executionflow.ShipTo.ActorID == ""> <#if executionflow.ShipTo.ActorID == "">
"address": { "address": {
"first_name": "${executionflow.ShipTo.Contact.FirstName!""}", "first_name": "${executionflow.ShipTo.Contact.FirstName?json_string!""}",
"last_name" :"${executionflow.ShipTo.Contact.Lastname!""}", "last_name" :"${executionflow.ShipTo.Contact.Lastname?json_string!""}",
"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}", "mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}", "mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne?json_string!""}", "street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne?json_string!""}",