diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 4a98824..2e216fd 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -30,7 +30,7 @@ > [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved> + <#assign apiReflexPlatformID = ApiReflexPlatformID.MovementCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl"> diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 4a65641..0e42d08 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -20,7 +20,11 @@ "Goods": { "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}", + <#if (priority_date!="") && (priority_date?starts_with("00")== false) > "PriorityDate": "${priority_date}", + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", + <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> diff --git a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl index 81560f3..c61e73b 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl @@ -16,8 +16,8 @@ "Codes": [ <#list lv.id_list as id> { - "Key": "${id.logistical_variant_ID_type_code?json_string!""}", - "Value": "${id.logistical_variant_ID_code?json_string!""}" + "Key": "${(id.logistical_variant_ID_type_code!"")?json_string}", + "Value": "${(id.logistical_variant_ID_code!"")?json_string}" }<#sep>, ], diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index 6ef16c0..a8ce5c9 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -39,8 +39,8 @@ "Codes": [ <#list logistical_variant.id_list as id> { - "Key": "${id.logistical_variant_ID_type_code?json_string!""}", - "Value": "${id.logistical_variant_ID_code?json_string!""}" + "Key": "${(id.logistical_variant_ID_type_code!"")?json_string}", + "Value": "${(id.logistical_variant_ID_code!"")?json_string}" }<#sep>, ], diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 1fcc404..c6ad759 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -22,7 +22,7 @@ "Payload": { "Information" :{ <#if despatched_ipg.carton_number != "000000000000000000"> - "ContainerType": "${despatched_ipg.carton_type_code}" + "ContainerType": "${despatched_ipg.carton_type_code?json_string}" <#if preparation_line.despatched_cartons_list?? > <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton> , diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index d1f4107..1de6b02 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -52,23 +52,23 @@ <#else> "Actor": { - "Name" : "${preparation_order.address.name_or_company_name?json_string!""}", + "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", "Address" : { - "City" : "${preparation_order.address.post_code_area_name?json_string!""}", + "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?json_string!""}", - "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}", - "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}" + "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?json_string!""}", - "LastName" : "${preparation_order.address.last_name?json_string!""}", - "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)}, - "Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ] + "FirstName" : "${(preparation_order.address.first_name!"")?json_string}", + "LastName" : "${(preparation_order.address.last_name!"")?json_string}", + "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, + "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] } }, diff --git a/RFXtoRP_PrepOrder_ShipFromAcked.ftl b/RFXtoRP_PrepOrder_ShipFromAcked.ftl index 6a4ab2c..cf47d44 100644 --- a/RFXtoRP_PrepOrder_ShipFromAcked.ftl +++ b/RFXtoRP_PrepOrder_ShipFromAcked.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${id.refid}" + "RefID": "${id.refid?json_string}" }, "Payload": { diff --git a/RFXtoRP_Receipt_ShipToAcked.ftl b/RFXtoRP_Receipt_ShipToAcked.ftl index ae00aae..a094aeb 100644 --- a/RFXtoRP_Receipt_ShipToAcked.ftl +++ b/RFXtoRP_Receipt_ShipToAcked.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${id.refid}" + "RefID": "${id.refid?json_string}" }, "Payload": { diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 3d272fb..a33d6d5 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -15,7 +15,7 @@ { - "id" : {"refid" : "${executionflow.OrderID}"}, + "id" : {"refid" : "${executionflow.OrderID?json_string}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders", "method" : "POST", "uri_substitutions": { @@ -25,7 +25,7 @@ }, "payload" : { - "originator_reference": "${executionflow.OrderID}", + "originator_reference": "${executionflow.OrderID?json_string}", "preparation_type_code": "${preparation_type_code}", "end_consignee_code": "${actorID}", <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> @@ -44,31 +44,33 @@ "apt_with_end_consignee": "${apt_with_end_consignee_flag}", "apt_with_intermediate": "false", "load_grouping": "${load_grouping}" - }, + } <#if actorID == defaultactor > + , "address": { "type_code": "${typecode}", "title_code" : "${titlecode}", "contact_type_code" : "${contacttypecode}", "address_type_code" : "${adresstypecode}", - "first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}", - "last_name" :"${executionflow.ShipTo.Contact.LastName!""?json_string}", - "name_or_company_name" : "${executionflow.ShipTo.Contact.FirstName!""?json_string} ${executionflow.ShipTo.Contact.LastName!""?json_string}", + "first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}", + "last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}", + "name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}", <#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!=""> "mail_address": "${executionflow.ShipTo.Contact.Emails[0]}", <#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!=""> "mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}", - "street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}", - "additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}", - "additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}", - "postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}", - "post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}", - "iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}" - }, + "street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}", + "additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}", + "additional_address_data_2": "${(executionflow.ShipTo.Actor.Address.StreetAddressThree!"")?json_string}", + "postal_code": "${(executionflow.ShipTo.Actor.Address.PostalCode!"")?json_string}", + "post_code_area_name" : "${(executionflow.ShipTo.Actor.Address.City!"")?json_string}", + "iso_country_code": "${(executionflow.ShipTo.Actor.Address.CountryCode!"")?json_string}" + } <#if executionflow.Lines??> + , "line_list": [ <#list executionflow.Lines as line> <#-- ******* line MetaData and Segmentationkeys to maps ******** --> @@ -100,7 +102,8 @@ } <#sep>, + ] - ] + } } diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 5cf790e..80eafaa 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -1,7 +1,7 @@ <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl"> { - "id" : {"refid" : "${executionflow.OrderID}"}, + "id" : {"refid" : "${executionflow.OrderID?json_string}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts", "method" : "POST", "uri_substitutions": { @@ -11,7 +11,7 @@ }, "payload" : { - "receipt_reference": "${executionflow.OrderID}", + "receipt_reference": "${executionflow.OrderID?json_string}", "receipt_type": "${receipt_type}", "receipt_reason_code": "${receipt_reason_code}", "work_mode_code" : "${work_mode_code}", @@ -25,9 +25,10 @@ "carrier_appointment_made": "false", "receipt_in_cross_docking": "false", - "dock_occupation_duration": 1, + "dock_occupation_duration": 1 <#if executionflow.Lines??> + , "line_list": [ <#list executionflow.Lines as line> @@ -61,7 +62,6 @@ }<#sep>, ] - - + } } diff --git a/VERSION b/VERSION index a540dea..48ebb5d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.16+5 +1.2.17+2