diff --git a/RFXtoRP_HsaCarrier.ftl b/RFXtoRP_HsaCarrier.ftl index a724924..870e4f5 100644 --- a/RFXtoRP_HsaCarrier.ftl +++ b/RFXtoRP_HsaCarrier.ftl @@ -18,31 +18,14 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign carrier = JsonUtil.jsonToMap(dataRfx)> - <#assign refID = RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)> - - <#assign payLoad = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${refID}"}]}' /> - <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.ActorGetByIds> - <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payLoad) /> - <#assign actorRP = JsonUtil.jsonToMap(response)> - <#if actorRP?? && actorRP.Objects?? && actorRP.Objects[0]?? && actorRP.Objects[0].ID.RefID?? > - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaCarrier_ActorUpdated.ftl"> - } - ] - <#else> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl"> } ] - <#break> <#case "D"> diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index 65876a4..3b89345 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -8,11 +8,7 @@ }, "Payload": { "Name": "${carrier.carrier_designation?json_string}", - "ManagedStock": false, "IsCarrier": true, - <#-- ***Partner ID could be added here *** --> - <#-- "PartnerID": "${}", --> - <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">, @@ -34,7 +30,6 @@ "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> <#if carrier.address??> diff --git a/RFXtoRP_HsaCarrier_ActorUpdated.ftl b/RFXtoRP_HsaCarrier_ActorUpdated.ftl deleted file mode 100644 index f6ad18c..0000000 --- a/RFXtoRP_HsaCarrier_ActorUpdated.ftl +++ /dev/null @@ -1,75 +0,0 @@ -[ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}" - }, - "Payload": { - "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?? && 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!""}", - <#if actorRP.Objects[0].Payload.CarrierServices??> - "CarrierServices" : [ - <#list actorRP.Objects[0].Payload.CarrierServices as carrierService> - { - "ID" : "${carrierService.ID!""}", - "Label" : "${carrierService.Label!""}" - }<#sep>, - - ], - - <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, - - "Address": - { - - <#-- if Reflex WMS is structured --> - <#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}", - "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.carrier_structured_address.country_code?upper_case?json_string}", - <#else> - "CountryCode" : "", - - "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> - <#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}", - "CountryCode" : "" - - - }, - <#if carrier.address?? > - "Phones": ["${carrier.address.telephone?json_string}", - "${carrier.address.other_number?json_string}" - ], - - "Typology": "TYPOLOGY_UNKNOWN" - } - } -] diff --git a/RFXtoRP_HsaCons.ftl b/RFXtoRP_HsaCons.ftl index e0fd096..86217fc 100644 --- a/RFXtoRP_HsaCons.ftl +++ b/RFXtoRP_HsaCons.ftl @@ -6,7 +6,6 @@ <#include "HfRpConfig.ftl"> <#include "ActorPrefix.ftl"> - <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -19,31 +18,15 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign actor = JsonUtil.jsonToMap(dataRfx)> - <#assign refID = RFXtoRPprefixConsignee(actor.code?trim?json_string)> - - <#assign payLoad = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${refID}"}]}' /> - <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.ActorGetByIds> - <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payLoad) /> - <#assign actorRP = JsonUtil.jsonToMap(response)> - <#if actorRP?? && actorRP.Objects?? && actorRP.Objects[0]?? && actorRP.Objects[0].ID.RefID?? > [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaCons_ActorUpdated.ftl"> - } - ] - <#else> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaCons_ActorCreated.ftl"> } ] - + <#break> <#case "D"> diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 502da80..6d65568 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -8,18 +8,12 @@ }, "Payload": { "Name": "${actor.designation?json_string}", - "ManagedStock": false, "IsCarrier": false, - <#-- ***Partner ID could be added here *** --> - <#-- "PartnerID": "${}", --> - <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, - "Address": { - <#-- if Reflex WMS is structured --> <#if actor.consignee_structured_address??> @@ -54,7 +48,7 @@ "${actor.address.other_number?json_string}" ], - "Typology": "TYPOLOGY_UNKNOWN" + "Typology": "TYPOLOGY_WAREHOUSE" } } ] diff --git a/RFXtoRP_HsaCons_ActorUpdated.ftl b/RFXtoRP_HsaCons_ActorUpdated.ftl deleted file mode 100644 index c5c4d94..0000000 --- a/RFXtoRP_HsaCons_ActorUpdated.ftl +++ /dev/null @@ -1,75 +0,0 @@ -[ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}" - }, - "Payload": { - "Name": "${actor.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?? && 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!""}", - <#if actorRP.Objects[0].Payload.CarrierServices??> - "CarrierServices" : [ - <#list actorRP.Objects[0].Payload.CarrierServices as carrierService> - { - "ID" : "${carrierService.ID!""}", - "Label" : "${carrierService.Label!""}" - }<#sep>, - - ], - - <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, - - "Address": - { - - <#-- if Reflex WMS is structured --> - <#if actor.consignee_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) /> - <#if isCountryCode> - "CountryCode" : "${actor.consignee_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}" - - <#-- if Reflex WMS is not structured --> - <#else> - <#if actor.address?? > - - "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}", - "CountryCode" : "" - - - }, - <#if actor.address?? > - "Phones": ["${actor.address.telephone?json_string}", - "${actor.address.other_number?json_string}" - ], - - "Typology": "TYPOLOGY_UNKNOWN" - } - } -] diff --git a/RFXtoRP_HsaSup.ftl b/RFXtoRP_HsaSup.ftl index 309bc71..79b07bf 100644 --- a/RFXtoRP_HsaSup.ftl +++ b/RFXtoRP_HsaSup.ftl @@ -18,31 +18,14 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign actor = JsonUtil.jsonToMap(dataRfx)> - <#assign refID = RFXtoRPprefixSupplier(actor.code?trim?json_string)> - - <#assign payLoad = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${refID}"}]}' /> - <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.ActorGetByIds> - <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payLoad) /> - <#assign actorRP = JsonUtil.jsonToMap(response)> - <#if actorRP?? && actorRP.Objects?? && actorRP.Objects[0]?? && actorRP.Objects[0].ID.RefID?? > - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaSup_ActorUpdated.ftl"> - } - ] - <#else> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaSup_ActorCreated.ftl"> } ] - <#break> <#case "D"> diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index 6c57b1f..4d04e95 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -8,10 +8,7 @@ }, "Payload": { "Name": "${actor.designation?json_string}", - "ManagedStock": false, "IsCarrier": false, - <#-- ***Partner ID could be added here *** --> - <#-- "PartnerID": "${}", --> <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">, @@ -19,7 +16,6 @@ { <#-- if Reflex WMS address is structured --> <#if actor.supplier_structured_address?? > - "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}", @@ -33,7 +29,6 @@ "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> <#if actor.optional_attributes?? > @@ -44,7 +39,6 @@ "CountryCode" : "" - }, <#if actor.optional_attributes?? > "Phones": ["${actor.optional_attributes.telephone?json_string}", diff --git a/RFXtoRP_HsaSup_ActorUpdated.ftl b/RFXtoRP_HsaSup_ActorUpdated.ftl deleted file mode 100644 index 62c2e43..0000000 --- a/RFXtoRP_HsaSup_ActorUpdated.ftl +++ /dev/null @@ -1,75 +0,0 @@ -[ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}" - }, - "Payload": { - "Name": "${actor.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?? && 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!""}", - <#if actorRP.Objects[0].Payload.CarrierServices??> - "CarrierServices" : [ - <#list actorRP.Objects[0].Payload.CarrierServices as carrierService> - { - "ID" : "${carrierService.ID!""}", - "Label" : "${carrierService.Label!""}" - }<#sep>, - - ], - - <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, - - "Address": - { - - <#-- if Reflex WMS is structured --> - <#if actor.supplier_structured_address??> - - "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.supplier_structured_address.country_code?upper_case?json_string}", - <#else> - "CountryCode" : "", - - "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.optional_attributes?? > - - "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.optional_attributes?? > - "Phones": ["${actor.optional_attributes.telephone?json_string}", - "${actor.optional_attributes.other_number?json_string}" - ], - - "Typology": "TYPOLOGY_UNKNOWN" - } - } -] diff --git a/RFXtoRP_HsrDepot.ftl b/RFXtoRP_HsrDepot.ftl index cd822b3..7e3a522 100644 --- a/RFXtoRP_HsrDepot.ftl +++ b/RFXtoRP_HsrDepot.ftl @@ -17,7 +17,7 @@ <#assign depot = JsonUtil.jsonToMap(dataRfx)> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrDepot_ActorCreated.ftl"> diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index e64bb6b..1258eb6 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -13,18 +13,13 @@ "Name": "${depot.physical_depot_designation?json_string}", "ManagedStock": true, "IsCarrier": false, - <#-- ***Partner ID could be added here *** --> - <#-- "PartnerID": "${}", --> - <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">, - "Address": { <#-- if Reflex WMS address is structured --> <#if depot.physical_depot_structured_address?? > - "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}", @@ -38,7 +33,6 @@ "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> <#if depot.physical_depot_address??>