From 6b4f7e2ccc4f7fd898738323b87dce69d8e684d2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 14:43:53 +0100 Subject: [PATCH] Modifs FTL 2211231443 --- RFXtoRP_HsaCarrier_ActorCreated.ftl | 17 ++++++++++------- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 16 ++++++++-------- RPtoRFX_PrepOrder.ftl | 4 ++-- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index d581b2e..fd16db5 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -22,7 +22,7 @@ "Address": { <#-- 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}", "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}", @@ -35,16 +35,19 @@ <#-- if Reflex WMS address is not structured --> <#else> - "Name": "${carrier.address.company_name?json_string}", - "StreetAddressOne" : "${carrier.address.address_1?json_string}", - "StreetAddressTwo" : "${carrier.address.address_2?json_string}", - "StreetAddressThree" : "${carrier.address.address_3?json_string}" + <#if carrier.address??> + "Name": "${carrier.address.company_name?json_string}", + "StreetAddressOne" : "${carrier.address.address_1?json_string}", + "StreetAddressTwo" : "${carrier.address.address_2?json_string}", + "StreetAddressThree" : "${carrier.address.address_3?json_string}" + }, - - "Phones": ["${carrier.address.telephone?json_string}", + <#if carrier.address??> + "Phones": ["${carrier.address.telephone?json_string}", "${carrier.address.other_number?json_string}" ], + "Typology": "TYPOLOGY_CARRIER" } } diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 1735316..754b2d2 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -43,7 +43,7 @@ "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}", "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}", "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> "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}", diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 44022e4..8ccf98a 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -32,22 +32,22 @@ <#else> "Actor": { - "Name" : "${preparation_order.address.name_or_company_name!""}", + "Name" : "${preparation_order.address.name_or_company_name?json_string!""}", "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!""}", "PostalCode" : "${preparation_order.address.postal_code!""}", - "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box!""}", - "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1!""}", - "StreetAddressThree" : "${preparation_order.address.additional_address_data_2!""}" + "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}", + "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}", + "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}" } }, "Contact" : { - "FirstName" : "${preparation_order.address.first_name!""}", - "LastName" : "${preparation_order.address.last_name!""}", - "Emails" : ["${preparation_order.address.mail_address!""}"], + "FirstName" : "${preparation_order.address.first_name?json_string!""}", + "LastName" : "${preparation_order.address.last_name?json_string!""}", + "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!""}" ] } diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index f55bfbb..735abba 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -35,8 +35,8 @@ }, <#if executionflow.ShipTo.ActorID == ""> "address": { - "first_name": "${executionflow.ShipTo.Contact.FirstName!""}", - "last_name" :"${executionflow.ShipTo.Contact.Lastname!""}", + "first_name": "${executionflow.ShipTo.Contact.FirstName?json_string!""}", + "last_name" :"${executionflow.ShipTo.Contact.Lastname?json_string!""}", "mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}", "mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}", "street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne?json_string!""}",