From c5dbe1f5a68fa2c24d9e56126cfe25bed81d96a8 Mon Sep 17 00:00:00 2001 From: Laure Pascal Date: Tue, 19 Sep 2023 11:12:24 +0200 Subject: [PATCH] management of double quote in actors addresses --- RFXtoRP_HsaCarrier_ActorCreated.ftl | 30 ++++++++++++++--------------- RFXtoRP_HsaCons_ActorCreated.ftl | 30 ++++++++++++++--------------- RFXtoRP_HsaSup_ActorCreated.ftl | 30 ++++++++++++++--------------- RFXtoRP_HsrDepot_ActorCreated.ftl | 30 ++++++++++++++--------------- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index 3ec3bc5..d581b2e 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -8,7 +8,7 @@ }, "Payload": { - "Name": "${carrier.carrier_designation}", + "Name": "${carrier.carrier_designation?json_string}", "ManagedStock": false, "IsCarrier": true, <#-- ***Partner ID could be added here *** --> @@ -24,26 +24,26 @@ <#-- if Reflex WMS address is structured --> <#if carrier.carrier_structured_address?? > - "Name": "${carrier.carrier_structured_address.name_or_company}", - "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO}", - "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data}", - "PostalCode" : "${carrier.carrier_structured_address.postal_code}", - "City" : "${carrier.carrier_structured_address.post_code_area_name}", - "CountryCode" : "${carrier.carrier_structured_address.country_code}", - "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code}", - "State": "${carrier.carrier_structured_address.country_designation}" + "Name": "${carrier.carrier_structured_address.name_or_company?json_string}", + "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}", + "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}", + "PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}", + "City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}", + "CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}", + "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}", + "State": "${carrier.carrier_structured_address.country_designation?json_string}" <#-- if Reflex WMS address is not structured --> <#else> - "Name": "${carrier.address.company_name}", - "StreetAddressOne" : "${carrier.address.address_1}", - "StreetAddressTwo" : "${carrier.address.address_2}", - "StreetAddressThree" : "${carrier.address.address_3}" + "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}", - "${carrier.address.other_number}" + "Phones": ["${carrier.address.telephone?json_string}", + "${carrier.address.other_number?json_string}" ], "Typology": "TYPOLOGY_CARRIER" } diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 64bee0d..8f09d9c 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -8,7 +8,7 @@ }, "Payload": { - "Name": "${actor.designation}", + "Name": "${actor.designation?json_string}", "ManagedStock": false, "IsCarrier": false, <#-- ***Partner ID could be added here *** --> @@ -24,28 +24,28 @@ <#-- if Reflex WMS is structured --> <#if actor.consignee_structured_address??> - "Name": "${actor.consignee_structured_address.name_or_company}", - "StreetAddressOne" : "${actor.consignee_structured_address.street_and_PO}", - "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data}", - "PostalCode" : "${actor.consignee_structured_address.postal_code}", - "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}" + "Name": "${actor.consignee_structured_address.name_or_company?json_string}", + "StreetAddressOne" : "${actor.consignee_structured_address.street_and_PO?json_string}", + "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}", + "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}", + "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}", + "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}", + "ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}", + "State": "${actor.consignee_structured_address.country_designation?json_string}" <#-- 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}" + "Name": "${actor.address.company_name?json_string}", + "StreetAddressOne" : "${actor.address.address_1?json_string}", + "StreetAddressTwo" : "${actor.address.address_2?json_string}", + "StreetAddressThree" : "${actor.address.address_3?json_string}" }, - "Phones": ["${actor.address.telephone}", - "${actor.address.other_number}" + "Phones": ["${actor.address.telephone?json_string}", + "${actor.address.other_number?json_string}" ], "Typology": "TYPOLOGY_UNKNOWN" } diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index 65a8315..a4e5d12 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -8,7 +8,7 @@ }, "Payload": { - "Name": "${actor.designation}", + "Name": "${actor.designation?json_string}", "ManagedStock": false, "IsCarrier": false, <#-- ***Partner ID could be added here *** --> @@ -23,26 +23,26 @@ <#-- if Reflex WMS address is structured --> <#if actor.supplier_structured_address?? > - "Name": "${actor.supplier_structured_address.name_or_company}", - "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO}", - "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data}", - "PostalCode" : "${actor.supplier_structured_address.postal_code}", - "City" : "${actor.supplier_structured_address.post_code_area_name}", - "CountryCode" : "${actor.supplier_structured_address.country_code}", - "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code}", - "State": "${actor.supplier_structured_address.country_designation}" + "Name": "${actor.supplier_structured_address.name_or_company?json_string}", + "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}", + "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}", + "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}", + "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}", + "CountryCode" : "${actor.supplier_structured_address.country_code?json_string}", + "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}", + "State": "${actor.supplier_structured_address.country_designation?json_string}" <#-- if Reflex WMS address is not structured --> <#else> - "Name": "${actor.optional_attributes.company_name}", - "StreetAddressOne" : "${actor.optional_attributes.address_1}", - "StreetAddressTwo" : "${actor.optional_attributes.address_2}", - "StreetAddressThree" : "${actor.optional_attributes.address_3}" + "Name": "${actor.optional_attributes.company_name?json_string}", + "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}", + "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}", + "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}" }, - "Phones": ["${actor.optional_attributes.telephone}", - "${actor.optional_attributes.other_number}" + "Phones": ["${actor.optional_attributes.telephone?json_string}", + "${actor.optional_attributes.other_number?json_string}" ], "Typology": "TYPOLOGY_UNKNOWN" } diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 98fef20..07adb7e 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -8,7 +8,7 @@ }, "Payload": { - "Name": "${depot.physical_depot_designation}", + "Name": "${depot.physical_depot_designation?json_string}", "ManagedStock": true, "IsCarrier": false, <#-- ***Partner ID could be added here *** --> @@ -23,26 +23,26 @@ <#-- if Reflex WMS address is structured --> <#if depot.physical_depot_structured_address?? > - "Name": "${depot.physical_depot_structured_address.name_or_company}", - "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO}", - "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data}", - "PostalCode" : "${depot.physical_depot_structured_address.postal_code}", - "City" : "${depot.physical_depot_structured_address.post_code_area_name}", - "CountryCode" : "${depot.physical_depot_structured_address.country_code}", - "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code}", - "State": "${depot.physical_depot_structured_address.country_designation}" + "Name": "${depot.physical_depot_structured_address.name_or_company?json_string}", + "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO?json_string}", + "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}", + "PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}", + "City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}", + "CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}", + "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}", + "State": "${depot.physical_depot_structured_address.country_designation?json_string}" <#-- if Reflex WMS address is not structured --> <#else> - "Name": "${depot.physical_depot_address.company_name}", - "StreetAddressOne" : "${depot.physical_depot_address.address_1}", - "StreetAddressTwo" : "${depot.physical_depot_address.address_2}", - "StreetAddressThree" : "${depot.physical_depot_address.address_3}" + "Name": "${depot.physical_depot_address.company_name?json_string}", + "StreetAddressOne" : "${depot.physical_depot_address.address_1?json_string}", + "StreetAddressTwo" : "${depot.physical_depot_address.address_2?json_string}", + "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}" }, - "Phones": ["${depot.physical_depot_address.telephone}", - "${depot.physical_depot_address.other_number}" + "Phones": ["${depot.physical_depot_address.telephone?json_string}", + "${depot.physical_depot_address.other_number?json_string}" ], "Typology": "TYPOLOGY_UNKNOWN" }