From a7bf18f25d580e9ebe0cc5b249a42604a993b90b Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 7 Jan 2025 17:40:55 +0100 Subject: [PATCH] SCPN1-8043 --- RFXtoRP_HsaCarrier.ftl | 2 +- RFXtoRP_HsaCarrier_ActorUpdated.ftl | 31 +++++++++++--------- RFXtoRP_HsaCons_ActorUpdated.ftl | 9 ++++-- RFXtoRP_HsaSup.ftl | 4 +-- RFXtoRP_HsaSup_ActorUpdated.ftl | 45 ++++++++++++++++------------- 5 files changed, 53 insertions(+), 38 deletions(-) diff --git a/RFXtoRP_HsaCarrier.ftl b/RFXtoRP_HsaCarrier.ftl index 48d63a2..a724924 100644 --- a/RFXtoRP_HsaCarrier.ftl +++ b/RFXtoRP_HsaCarrier.ftl @@ -18,7 +18,7 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign carrier = JsonUtil.jsonToMap(dataRfx)> - <#assign refID = RFXtoRPprefixConsignee(carrier.carrier_code?trim?json_string)> + <#assign refID = RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)> <#assign payLoad = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${refID}"}]}' /> <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.ActorGetByIds> diff --git a/RFXtoRP_HsaCarrier_ActorUpdated.ftl b/RFXtoRP_HsaCarrier_ActorUpdated.ftl index 74b93ac..fa06416 100644 --- a/RFXtoRP_HsaCarrier_ActorUpdated.ftl +++ b/RFXtoRP_HsaCarrier_ActorUpdated.ftl @@ -4,17 +4,22 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${RFXtoRPprefixConsignee(carrier.code?trim?json_string)}" + "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}" }, "Payload": { - "Name": "${carrier.designation?json_string}", + "Name": "${carrier.carrier_designation?json_string}", "PartnerID" : "${actorRP.Objects[0].Payload.PartnerID!""?json_string}", "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c}, "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c}, "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c}, + <#if actorRP.Objects[0].Payload.IsShipFromConnected> + "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}", + "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c}, + <#if actorRP.Objects[0].Payload.IsShipToConnected> + "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}", + "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}", - <#-- DOTO CarrierServices ID Label --> <#if actorRP.Objects[0].Payload.CarrierServices??> "CarrierServices" : [ <#list actorRP.Objects[0].Payload.CarrierServices as carrierService> @@ -31,21 +36,21 @@ { <#-- if Reflex WMS is structured --> - <#if carrier.consignee_structured_address??> + <#if carrier.carrier_structured_address??> - "Name": "${carrier.consignee_structured_address.name_or_company?json_string}", - "StreetAddressOne" : "${carrier.consignee_structured_address.street_and_PO?json_string}", - "StreetAddressTwo" : "${carrier.consignee_structured_address.additionnal_data?json_string}", - "PostalCode" : "${carrier.consignee_structured_address.postal_code?json_string}", - "City" : "${carrier.consignee_structured_address.post_code_area_name?json_string}", - <#assign isCountryCode = JsonUtil.isCountryCode(carrier.consignee_structured_address.country_code?upper_case) /> + "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}", + <#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code?upper_case) /> <#if isCountryCode> - "CountryCode" : "${carrier.consignee_structured_address.country_code?upper_case?json_string}", + "CountryCode" : "${carrier.carrier_structured_address.country_code?upper_case?json_string}", <#else> "CountryCode" : "", - "ProvinceCode": "${carrier.consignee_structured_address.territorial_div_code?json_string}", - "State": "${carrier.consignee_structured_address.country_designation?json_string}" + "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}", + "State": "${carrier.carrier_structured_address.country_designation?json_string}" <#-- if Reflex WMS is not structured --> <#else> diff --git a/RFXtoRP_HsaCons_ActorUpdated.ftl b/RFXtoRP_HsaCons_ActorUpdated.ftl index e89a7c6..c5c4d94 100644 --- a/RFXtoRP_HsaCons_ActorUpdated.ftl +++ b/RFXtoRP_HsaCons_ActorUpdated.ftl @@ -12,9 +12,14 @@ "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c}, "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c}, "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c}, + <#if actorRP.Objects[0].Payload.IsShipFromConnected?? && actorRP.Objects[0].Payload.IsShipFromConnected> + "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}", + "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c}, - "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}", - <#-- DOTO CarrierServices ID Label --> + <#if actorRP.Objects[0].Payload.IsShipToConnected?? && actorRP.Objects[0].Payload.IsShipToConnected> + "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}", + + "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}", <#if actorRP.Objects[0].Payload.CarrierServices??> "CarrierServices" : [ <#list actorRP.Objects[0].Payload.CarrierServices as carrierService> diff --git a/RFXtoRP_HsaSup.ftl b/RFXtoRP_HsaSup.ftl index 98f9474..5ee9c2c 100644 --- a/RFXtoRP_HsaSup.ftl +++ b/RFXtoRP_HsaSup.ftl @@ -18,7 +18,7 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign actor = JsonUtil.jsonToMap(dataRfx)> - <#assign refID = RFXtoRPprefixConsignee(actor.code?trim?json_string)> + <#assign refID = RFXtoRPprefixSupplier(actor.code?trim?json_string)> <#assign payLoad = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${refID}"}]}' /> <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.ActorGetByIds> @@ -30,7 +30,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsaCons_ActorUpdated.ftl"> + <#include "RFXtoRP_HsaSup_ActorCreated.ftl"> } ] <#else> diff --git a/RFXtoRP_HsaSup_ActorUpdated.ftl b/RFXtoRP_HsaSup_ActorUpdated.ftl index e89a7c6..62c2e43 100644 --- a/RFXtoRP_HsaSup_ActorUpdated.ftl +++ b/RFXtoRP_HsaSup_ActorUpdated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}" + "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}" }, "Payload": { "Name": "${actor.designation?json_string}", @@ -12,9 +12,14 @@ "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c}, "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c}, "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c}, + <#if actorRP.Objects[0].Payload.IsShipFromConnected?? && actorRP.Objects[0].Payload.IsShipFromConnected> + "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}", + "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c}, + <#if actorRP.Objects[0].Payload.IsShipToConnected?? && actorRP.Objects[0].Payload.IsShipToConnected> + "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}", + "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}", - <#-- DOTO CarrierServices ID Label --> <#if actorRP.Objects[0].Payload.CarrierServices??> "CarrierServices" : [ <#list actorRP.Objects[0].Payload.CarrierServices as carrierService> @@ -31,37 +36,37 @@ { <#-- if Reflex WMS is structured --> - <#if actor.consignee_structured_address??> + <#if actor.supplier_structured_address??> - "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}", - <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) /> + "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}", + <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) /> <#if isCountryCode> - "CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}", + "CountryCode" : "${actor.supplier_structured_address.country_code?upper_case?json_string}", <#else> "CountryCode" : "", - "ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}", - "State": "${actor.consignee_structured_address.country_designation?json_string}" + "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}", + "State": "${actor.supplier_structured_address.country_designation?json_string}" <#-- if Reflex WMS is not structured --> <#else> - <#if actor.address?? > + <#if actor.optional_attributes?? > - "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}", + "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}", "CountryCode" : "" }, - <#if actor.address?? > - "Phones": ["${actor.address.telephone?json_string}", - "${actor.address.other_number?json_string}" + <#if actor.optional_attributes?? > + "Phones": ["${actor.optional_attributes.telephone?json_string}", + "${actor.optional_attributes.other_number?json_string}" ], "Typology": "TYPOLOGY_UNKNOWN"