From ba13f7cf5907201e0132d7486de9ad35618c9146 Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Mon, 3 Mar 2025 11:01:03 +0000 Subject: [PATCH 01/38] add version 2.0 support --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9d7c109..61bc4c6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.0-SNAPSHOT +2.1.0-SNAPSHOT From 9380d39bb65bc4dcf46c80f711e187721b2f3159 Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 4 Mar 2025 14:28:12 +0100 Subject: [PATCH 02/38] SCPN1-8401 (syntaxe error in RXftoRP-HsrPro_ExecutionflowDetected.ftl) --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 9157f57..ee97306 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -4,7 +4,7 @@ [ { <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.planned_final_delivery_start_datetime,time_zone_rfx) /> - <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezoneWithTimezone(preparation_order.creation_datetime,time_zone_rfx) /> + <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) /> "Header": { "ProjectID": "${projectRP}" }, From 2681a4dc2477fbf33e73e1d28dad708968855c94 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 6 Mar 2025 16:13:36 +0100 Subject: [PATCH 03/38] SCPN1-8401 (syntaxe error in RXftoRP-HsrReceiptList_ExecutionflowDetected.ftl et RXftoRP-HsrReceiptList_ExecutionflowReceiptComplet.ftl) --- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index d00662c..be2fc6a 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -4,7 +4,7 @@ [ { <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) /> - <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezoneWithTimezone(receipt.creation_datetime,time_zone_rfx) /> + <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> "Header": { "ProjectID": "${projectRP}" }, diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index e92a2a5..91390fb 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezoneWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> [ { "Header": { From dbffc01a700a465b2daa92dd972968d6adfecdcc Mon Sep 17 00:00:00 2001 From: frea Date: Fri, 7 Mar 2025 14:16:54 +0100 Subject: [PATCH 04/38] SCPN1-8401 (cherry picked from commit 0cec20a8aa91ce5d958a9d6087d4778f86f2c5fd) --- RFXtoRP_RfxConfigurationRp.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_RfxConfigurationRp.ftl b/RFXtoRP_RfxConfigurationRp.ftl index d89dac8..1b19bf7 100644 --- a/RFXtoRP_RfxConfigurationRp.ftl +++ b/RFXtoRP_RfxConfigurationRp.ftl @@ -25,8 +25,8 @@ -<#noparse><#assign time_zone_rfx = "${file.author_time_zone!"UTC"}<#noparse>"> -<#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+00:00"}<#noparse>"> +<#noparse><#assign time_zone_rfx = "${file.author_time_zone!"Europe/Paris"}<#noparse>"> +<#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+01:00"}<#noparse>"> <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project> From 7ae70dae923e4dff5c9d91fe21f8bfce745bd328 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 11 Mar 2025 16:19:35 +0100 Subject: [PATCH 05/38] Ajout OrderID --- RFXtoRP_HsaDispute_Created.ftl | 31 ++++-- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 6 +- ...RP_HsaProStatus_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 2 +- RFXtoRP_HsaProStatus_TransportStarted.ftl | 2 +- RFXtoRP_HsrPrepa.ftl | 26 ++--- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 +- ...oRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 27 ++--- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 29 ------ RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 99 ++++++++++--------- RFXtoRP_HsrReceiptList.ftl | 30 +++++- ..._HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- ...P_HsrReceiptList_ExecutionflowDetected.ftl | 3 +- ...eiptList_ExecutionflowReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- ...ptList_TransfertExecutionflowCancelled.ftl | 20 ++++ ...iptList_TransfertExecutionflowDetected.ftl | 94 ++++++++++++++++++ ...TransfertExecutionflowReceiptCompleted.ftl | 19 ++++ ...srReceiptList_TransfertReceiptExpected.ftl | 21 ++++ 22 files changed, 293 insertions(+), 132 deletions(-) delete mode 100644 RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl create mode 100644 RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl create mode 100644 RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl create mode 100644 RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl create mode 100644 RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index fb66661..56db75f 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -8,7 +8,7 @@ }, "ID": { <#if dispute.dispute_preparation??> - <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" <#else> <#stop "preparation order list is empty" > @@ -21,7 +21,7 @@ }, "Payload": { <#if dispute.dispute_reference?? && dispute.dispute_reference!=""> - "Title":"${dispute.dispute_reference?trim?json_string}", + "Title":"${dispute.dispute_reference?json_string}", <#else> "Title":"", @@ -43,21 +43,34 @@ <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> - "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" + "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" <#else> - <#stop "preparation order list is empty" > + <#stop> + <#else> + <#stop> <#else> <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > - "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" + <#if dispute.dispute_reception.reception_type_code=="030"> + "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop> + <#else> - <#stop "Type not supported" > + "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop> + + <#else> + <#stop> } diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 8ab1721..66509ac 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -21,7 +21,7 @@ "Goods": { "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}", - <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) > + <#if (priority_date!="") && (priority_date?starts_with("00")== false) > "PriorityDate": "${priority_date}", <#else> "PriorityDate": "1970-01-01T00:00:00Z", @@ -32,9 +32,11 @@ }, <#if reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", + "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}", + "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", + "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index db1899a..aad3d9f 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 04c48ae..b9d23cb 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 04c48ae..b9d23cb 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 04c48ae..b9d23cb 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 04c48ae..b9d23cb 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 5bbd320..f79d691 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -40,12 +40,6 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl"> } @@ -54,7 +48,7 @@ <#assign hd_numberHmapHUadded ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> - <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> + <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) /> <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))> <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> , @@ -80,15 +74,15 @@ <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> } <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )> - <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}> - , - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl"> - } - + <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}> + , + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl"> + } + diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 112037e..cc3b1dc 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -15,7 +15,7 @@ "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${OrderOriginReference}" + "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}" }, "Payload":{ "Carrier": { diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 8aed82c..4589e88 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -77,19 +77,19 @@ "ItemID": "${preparation_line.item_code?trim?json_string}", "LVBranchID": "${preparation_line.item_lv_code?json_string}", - <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)> - <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc /> - "PriorityDate": "${priority_date}", - <#else> - <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)> - <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc /> + <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)> + <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${priority_date}", + <#else> + <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)> + <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${priority_date}", + <#else> + <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)> + <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", - <#else> - <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)> - <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc /> - "PriorityDate": "${priority_date}", - <#else> - <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)> + <#else> + <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)> <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#else> @@ -112,7 +112,8 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", + "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", + "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}", <#if (preparation_line.pro_originator_reference_line_number!0) != 0> "LineID": "${preparation_line.pro_originator_reference_line_number}", <#else> diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl deleted file mode 100644 index 96a5905..0000000 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ /dev/null @@ -1,29 +0,0 @@ -<#include "HfRpConfig.ftl"> -<#include "ReflexUtils.ftl"> -<#include "ActorPrefix.ftl"> -[ - <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> - <#if !refIDHmap_local[OrderOriginReference]?? > - <#if refIDHmap_local?size != 0 > - , - - <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}> - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID":{ - "RefID": "${OrderOriginReference}" - }, - "Payload":{ - "Carrier": { - "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" - } - } - } - - - <#assign refIDHmap_local ={}> -] \ No newline at end of file diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index b518fa7..6bf75d8 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?trim?json_string}", + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index ee97306..fd17993 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -9,7 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?trim?json_string}", + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${pro_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -31,54 +31,53 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if - <#-- preparation_order.address.type_code == "" && - preparation_order.address.title_code == "" && - preparation_order.address.first_name == "" && - preparation_order.address.last_name == "" && - preparation_order.address.mail_address == "" && - preparation_order.address.contact_type_code == "" && - preparation_order.address.mobile_phone_number == "" && - preparation_order.address.land_line_phone_number == "" && - preparation_order.address.fax_number == "" && --> - preparation_order.address.address_type_code == "" && - preparation_order.address.name_or_company_name == "" && - preparation_order.address.additional_address_data_1 == "" && - preparation_order.address.additional_address_data_2 == "" && - preparation_order.address.post_code_area_name == "" && - preparation_order.address.territorial_division_code == "" && - preparation_order.address.postal_code == "" && - preparation_order.address.iso_country_code == ""> - "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" + <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> + "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}" <#else> - "Actor": - { - "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", - "Address" : - { - "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", - <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) /> - <#if isCountryCode> - "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}", - <#else> - "CountryCode" : "", - - "PostalCode" : "${(preparation_order.address.postal_code!"")?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}" ] - } + <#if + <#-- preparation_order.address.type_code == "" && + preparation_order.address.title_code == "" && + preparation_order.address.first_name == "" && + preparation_order.address.last_name == "" && + preparation_order.address.mail_address == "" && + preparation_order.address.contact_type_code == "" && + preparation_order.address.mobile_phone_number == "" && + preparation_order.address.land_line_phone_number == "" && + preparation_order.address.fax_number == "" && --> + preparation_order.address.address_type_code == "" && + preparation_order.address.name_or_company_name == "" && + preparation_order.address.additional_address_data_1 == "" && + preparation_order.address.additional_address_data_2 == "" && + preparation_order.address.post_code_area_name == "" && + preparation_order.address.territorial_division_code == "" && + preparation_order.address.postal_code == "" && + preparation_order.address.iso_country_code == ""> + "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" + <#else> + "Actor": + { + "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", + "Address" : + { + "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}" + } + }, + "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}" ] + } + }, - + "OrderID":"${preparation_order.originator_reference?trim?json_string}", <#if preparation_order.line_list??> "Lines" : [ <#list preparation_order.line_list as preparation_order_line > @@ -117,8 +116,14 @@ { "RequestedDeliveryDateTime" : { + <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00"> + <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.intermediate_delivery_start_datetime,time_zone_offset_rfx) /> + "DateTime": "${intermediate_delivery_start_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + <#else> "DateTime": "${planned_final_delivery_start_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + "AuthorTimeZone": "${time_zone_rfx}" + } } } diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 18279c7..872af00 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -17,7 +17,22 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> <#if receipt.receipt_reference ?? && receipt.receipt_reference!=""> <#if receipt.receipt_type = "030"> - <#stop "ignored message because receipt type = transfert"> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> + + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> + + } + ] <#else> [ { @@ -46,16 +61,21 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - <#if receipt.receipt_confirmed == "true" > + <#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true" > { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> + } + <#else> + <#if receipt.receipt_confirmed == "true"> + { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> } - <#else> - <#if receipt.receipt_type = "030"> - <#stop "ignored message because receipt type = transfert"> <#else> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index e262117..3483c30 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index be2fc6a..8374b42 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,7 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -33,6 +33,7 @@ "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" }, "ShipToAcked": true, + "OrderID":"${receipt.receipt_reference?trim?json_string}", <#if receipt.carrier_informations.carrier_code != ""> "Carrier": diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 91390fb..33e2a0f 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 23cf130..8490938 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl new file mode 100644 index 0000000..e262117 --- /dev/null +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -0,0 +1,20 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) /> + +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } +] diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl new file mode 100644 index 0000000..e908b8e --- /dev/null +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -0,0 +1,94 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> +[ + { + <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) /> + <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + "CreationDateTime": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + }, + "OrderID":"${receipt.receipt_reference?trim?json_string}", + <#-- Header Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, + + "ShipFrom": + { + "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}" + }, + "ShipTo" : + { + "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" + }, + "ShipToAcked": true, + + <#if receipt.carrier_informations.carrier_code != ""> + "Carrier": + { + "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" + }, + + + <#if receipt.line_list??> + "Lines" : [ + <#list receipt.line_list as line> + { + "LineID": "${line.receipt_line_number}", + <#-- Line Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">, + "RequestedContent": + { + "Goods": + { + "ItemID": "${line.item_code?trim?json_string!"0"}", + "LVBranchID": "${line.item_lv_code?json_string!"0"}", + <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)> + <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${line_without_detail_priority_date}", + <#else> + <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)> + <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${line_detail_priority_date}", + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", + + + <#-- Segmentation Keys inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl"> + }, + "Quantity" : + { + "LVID": "${quantity_in_base_lv_RP_Cst}", + "Value": "${line.order_quantity_in_lv!0}" + } + } + + } + <#sep>, + + ], + + + "RequestedMilestones" : + { + "RequestedDeliveryDateTime" : + { + "DateTime": "${receipt_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + } + } + } +] diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl new file mode 100644 index 0000000..2335174 --- /dev/null +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -0,0 +1,19 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } +] diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl new file mode 100644 index 0000000..ad59e3c --- /dev/null +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -0,0 +1,21 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> + +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + + "Payload": {} + + } +] From 80965f39270dcdf1305757dfdcf07a496f448c1c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 12 Mar 2025 10:14:55 +0100 Subject: [PATCH 06/38] UTC --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index fd17993..8144675 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -34,17 +34,7 @@ <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}" <#else> - <#if - <#-- preparation_order.address.type_code == "" && - preparation_order.address.title_code == "" && - preparation_order.address.first_name == "" && - preparation_order.address.last_name == "" && - preparation_order.address.mail_address == "" && - preparation_order.address.contact_type_code == "" && - preparation_order.address.mobile_phone_number == "" && - preparation_order.address.land_line_phone_number == "" && - preparation_order.address.fax_number == "" && --> - preparation_order.address.address_type_code == "" && + <#if preparation_order.address.address_type_code == "" && preparation_order.address.name_or_company_name == "" && preparation_order.address.additional_address_data_1 == "" && preparation_order.address.additional_address_data_2 == "" && @@ -117,7 +107,7 @@ "RequestedDeliveryDateTime" : { <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00"> - <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.intermediate_delivery_start_datetime,time_zone_offset_rfx) /> + <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_rfx) /> "DateTime": "${intermediate_delivery_start_datetime}", "AuthorTimeZone": "${time_zone_rfx}" <#else> From 596394863581bf2ad87a33641dfb96a5a5f0eb61 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 12 Mar 2025 15:05:01 +0100 Subject: [PATCH 07/38] update URL in readme.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d20fd83..6606269 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Reflex Platform Core FTLs - + These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API. - -You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/howto/reflex-wms-connector/ - +You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/ + + From f76d63230345edd3060e458234cef2207efaac76 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 10:20:22 +0100 Subject: [PATCH 08/38] claim --- RFXtoRP_HsaDispute_Created.ftl | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 56db75f..b188585 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -47,31 +47,35 @@ <#if TableReasonCode[dispute.dispute_reason_code]??> "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" <#else> - <#stop> + <#stop "Reason code not supported"> <#else> - <#stop> + <#stop "Preparation order list is empty"> <#else> <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > - <#if dispute.dispute_reception.reception_type_code=="030"> - "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" + <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!=""> + <#if dispute.dispute_reception.reception_type_code=="030"> + "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop "Reason code not supported"> + <#else> - <#stop> + "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop "Reason code not supported"> + <#else> - "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" - <#else> - <#stop> - + <#stop "Reference reception is empty"> - <#else> - <#stop> + <#else> + <#stop "Type not supported"> } } From b168b169313b706d4dd6b205d817e4e3bd8899f5 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 11:28:34 +0100 Subject: [PATCH 09/38] claim --- RFXtoRP_HsaDispute_Created.ftl | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index b188585..65d686c 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -44,11 +44,6 @@ <#if dispute.dispute_type_code=="050" > <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" - <#else> - <#stop "Reason code not supported"> - <#else> <#stop "Preparation order list is empty"> @@ -57,21 +52,11 @@ <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!=""> <#if dispute.dispute_reception.reception_type_code=="030"> "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" - <#else> - <#stop "Reason code not supported"> - <#else> "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" - <#else> - <#stop "Reason code not supported"> - + <#else> + <#stop "Reference reception is empty"> - <#else> - <#stop "Reference reception is empty"> <#else> @@ -79,7 +64,4 @@ } } -] - - - +] \ No newline at end of file From da75ead70f71e735d0853d295269ea17179b15fa Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 11:32:04 +0100 Subject: [PATCH 10/38] claim --- RFXtoRP_HsaDispute_Created.ftl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 65d686c..2f98a3c 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -62,6 +62,16 @@ <#else> <#stop "Type not supported"> + + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop "Claim reason code not supported" > + } } -] \ No newline at end of file +] + + + + From 7b4dfe0288d1ede5f9a90b688c2a03e4ec084ad3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 11:39:29 +0100 Subject: [PATCH 11/38] claim --- RFXtoRP_HsaDispute_Created.ftl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 2f98a3c..30b170a 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -53,9 +53,11 @@ <#if dispute.dispute_reception.reception_type_code=="030"> "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", <#else> - "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - <#else> - <#stop "Reference reception is empty"> + <#if dispute.dispute_reception.reception_type_code=="070"> + "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#else> + <#stop "Reference reception is empty"> + From 337b011d4e0cea2af2dc186575958782b2c665b8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 11:47:09 +0100 Subject: [PATCH 12/38] claim --- RFXtoRP_HsaDispute_Created.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 30b170a..6fbbd24 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -58,11 +58,11 @@ <#else> <#stop "Reference reception is empty"> + <#else> + <#stop "Type not supported"> - <#else> - <#stop "Type not supported"> <#if TableReasonCode[dispute.dispute_reason_code]??> From a045b37b7b274349824362c0884bb3cad3758bb9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 11:51:44 +0100 Subject: [PATCH 13/38] claim --- RFXtoRP_HsaDispute_Created.ftl | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 6fbbd24..efd82d9 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -48,18 +48,14 @@ <#stop "Preparation order list is empty"> <#else> - <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > - <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!=""> - <#if dispute.dispute_reception.reception_type_code=="030"> - "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#if (dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030") && dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="" > + <#if dispute.dispute_reception.reception_type_code=="030"> + "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#else> + <#if dispute.dispute_reception.reception_type_code=="070"> + "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", <#else> - <#if dispute.dispute_reception.reception_type_code=="070"> - "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - <#else> - <#stop "Reference reception is empty"> - - <#else> - <#stop "Type not supported"> + <#stop "Reference reception is empty or type not supported"> From ff25781b84bd5dd7ddf39f71ae716f345532a929 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 15:07:49 +0100 Subject: [PATCH 14/38] claim --- RFXtoRP_HsaDispute.ftl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 18ea1ec..d551da9 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -22,15 +22,18 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaDispute_Created.ftl"> - }, + } + <#if TableReasonCode[dispute.dispute_reason_code]??> + , { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaDispute_MessageSent.ftl"> } - <#else> - <#stop> + <#else> + <#stop> + ] <#break> From 9d99c0c65ec9b156f4c8218493e66341ae4a689f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 19 Mar 2025 10:44:16 +0100 Subject: [PATCH 15/38] displayID --- RFXtoRP_HsaDispute_Created.ftl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index efd82d9..431b6bd 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -44,6 +44,7 @@ <#if dispute.dispute_type_code=="050" > <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", <#else> <#stop "Preparation order list is empty"> @@ -51,9 +52,11 @@ <#if (dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030") && dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="" > <#if dispute.dispute_reception.reception_type_code=="030"> "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#if dispute.dispute_reception.reception_type_code=="070"> "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#stop "Reference reception is empty or type not supported"> From 4115d9ec5f1c078d8ca17e498595e6bf97c00188 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 19 Mar 2025 10:52:07 +0100 Subject: [PATCH 16/38] SCPN1-8483 (cherry picked from commit 8ee7527ba4e01017073183ec99a8db8b0fc625c0) --- ReflexUtils.ftl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index 7bc33f6..afa299e 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -9,11 +9,6 @@ <#return dateutc?datetime.iso?iso_nz(locale)> -<#function RfxDateTimetoUTCWithTimezone rfxdatetime timezone> - <#setting time_zone=timezone> - <#return (rfxdatetime?datetime.iso?iso_utc)> - - <#-- --------------------------------------------------------------------------------------- --> <#-- Split email reflex into json array string --> <#-- Example : splitemail "john.doe@hardis-group.com,; name@hardis-group.com" --> From f14616784abf0881877f9d8d3237677cdb50d3e0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 19 Mar 2025 15:06:59 +0100 Subject: [PATCH 17/38] modifs --- RFXtoRP_HsaDispute.ftl | 2 ++ RFXtoRP_HsaDispute_Created.ftl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index d551da9..a1a71c8 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -17,6 +17,7 @@ <#assign dispute = JsonUtil.jsonToMap(dataRfx)> [ <#if dispute.dispute_closed == true > + <#if (dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="")> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -34,6 +35,7 @@ <#else> <#stop> + ] <#break> diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 431b6bd..91c2b6e 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -52,7 +52,7 @@ <#if (dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030") && dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="" > <#if dispute.dispute_reception.reception_type_code=="030"> "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#if dispute.dispute_reception.reception_type_code=="070"> "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", From 546d46fc421163324b21e372d1cef8cdc1a72425 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 19 Mar 2025 15:11:14 +0100 Subject: [PATCH 18/38] modifs --- RFXtoRP_HsaDispute.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index a1a71c8..1add95b 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -35,6 +35,8 @@ <#else> <#stop> + <#else> + <#stop "Reference is empty"> ] From 9e16ebae85c3d7fbfaba174c1f9fa59ed64924b2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 19 Mar 2025 16:54:47 +0100 Subject: [PATCH 19/38] claim --- RFXtoRP_HsaDispute.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 1add95b..74f81d9 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -17,7 +17,7 @@ <#assign dispute = JsonUtil.jsonToMap(dataRfx)> [ <#if dispute.dispute_closed == true > - <#if (dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="")> + <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="")> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", From c5afde166a1f1837878f1312b4a9b88d52fb3ded Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 19 Mar 2025 17:50:55 +0100 Subject: [PATCH 20/38] =?UTF-8?q?SCPN1-8401=20la=20correction=20a=20=C3=A9?= =?UTF-8?q?t=C3=A9=20perdue...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index f79d691..09c9015 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -48,7 +48,7 @@ <#assign hd_numberHmapHUadded ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> - <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) /> + <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))> <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> , From 546891463b9d5140c660e96090d0dddf1f2a32eb Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 20 Mar 2025 17:09:16 +0100 Subject: [PATCH 21/38] modifs claim --- RFXtoRP_HsaDispute.ftl | 2 +- RFXtoRP_HsaDispute_Created.ftl | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 74f81d9..9c4e3b3 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -17,7 +17,7 @@ <#assign dispute = JsonUtil.jsonToMap(dataRfx)> [ <#if dispute.dispute_closed == true > - <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="")> + <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0)> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 91c2b6e..9b7bafa 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -42,24 +42,18 @@ <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > - <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> - "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", - "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", - <#else> - <#stop "Preparation order list is empty"> - + "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", <#else> - <#if (dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030") && dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="" > - <#if dispute.dispute_reception.reception_type_code=="030"> - "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#if dispute.dispute_reception.reception_type_code=="030"> + "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", + <#else> + <#if dispute.dispute_reception.reception_type_code=="070"> + "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> - <#if dispute.dispute_reception.reception_type_code=="070"> - "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", - <#else> - <#stop "Reference reception is empty or type not supported"> - + <#stop "Reference reception is empty or type not supported"> From 02e8dc2566e1d504b95004d4b480b5519aa8f1d3 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 20 Mar 2025 17:09:41 +0100 Subject: [PATCH 22/38] SCPN1-8474 --- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index 7a6abd1..b7cb7a8 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l ->l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#if !refIDHmap_local[despatched_ipg.hd_number]?? > <#if refIDHmap_local?size != 0 > From 969560a0d1b61b710c44fb8c6273835236aaabee Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 20 Mar 2025 17:21:20 +0100 Subject: [PATCH 23/38] modifs claim --- RFXtoRP_HsaDispute.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 9c4e3b3..2f01db4 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -17,7 +17,7 @@ <#assign dispute = JsonUtil.jsonToMap(dataRfx)> [ <#if dispute.dispute_closed == true > - <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0)> + <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 53c400be4995877955366c54c8ca67d664f77fac Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 20 Mar 2025 17:28:57 +0100 Subject: [PATCH 24/38] SCPN1-8474 --- RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index 4b7da84..c15dc98 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3> <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> <#if !refIDHmap[despatched_ipg3.carton_number]?? > <#if refIDHmap?size != 0 > diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index b7cb7a8..5fe5ad8 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l ->l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#if !refIDHmap_local[despatched_ipg.hd_number]?? > <#if refIDHmap_local?size != 0 > diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 4589e88..99511e5 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -2,7 +2,7 @@ <#include "HfRpConfig.ftl"> <#include "ActorPrefix.ftl"> [ - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> { From 9b4506912ccaa85c561eca2cef6e8476702c6b50 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 20 Mar 2025 17:44:33 +0100 Subject: [PATCH 25/38] modifs actor --- RFXtoRP_HsaCarrier.ftl | 19 +------- RFXtoRP_HsaCarrier_ActorCreated.ftl | 5 -- RFXtoRP_HsaCarrier_ActorUpdated.ftl | 75 ----------------------------- RFXtoRP_HsaCons.ftl | 21 +------- RFXtoRP_HsaCons_ActorCreated.ftl | 8 +-- RFXtoRP_HsaCons_ActorUpdated.ftl | 75 ----------------------------- RFXtoRP_HsaSup.ftl | 19 +------- RFXtoRP_HsaSup_ActorCreated.ftl | 6 --- RFXtoRP_HsaSup_ActorUpdated.ftl | 75 ----------------------------- RFXtoRP_HsrDepot.ftl | 2 +- RFXtoRP_HsrDepot_ActorCreated.ftl | 6 --- 11 files changed, 6 insertions(+), 305 deletions(-) delete mode 100644 RFXtoRP_HsaCarrier_ActorUpdated.ftl delete mode 100644 RFXtoRP_HsaCons_ActorUpdated.ftl delete mode 100644 RFXtoRP_HsaSup_ActorUpdated.ftl 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??> From cdc4ab6c3cca3b3d1cde21e0d5ee2603cac9e026 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 20 Mar 2025 17:52:49 +0100 Subject: [PATCH 26/38] claim --- RFXtoRP_HsaDispute.ftl | 2 +- RFXtoRP_HsaDispute_Created.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 2f01db4..db1758f 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -36,7 +36,7 @@ <#stop> <#else> - <#stop "Reference is empty"> + <#stop > ] diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 9b7bafa..6b8db74 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -53,7 +53,7 @@ "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> - <#stop "Reference reception is empty or type not supported"> + <#stop "WMS type code not supported"> From c3e584c43b0a619327cd046e39452b1e298dcee6 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 21 Mar 2025 11:22:43 +0100 Subject: [PATCH 27/38] claim reference empty --- RFXtoRP_HsaDispute.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index db1758f..2f01db4 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -36,7 +36,7 @@ <#stop> <#else> - <#stop > + <#stop "Reference is empty"> ] From 5397b211b45e80da6cd0a21c18bd72aa12d76ee1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 21 Mar 2025 11:31:45 +0100 Subject: [PATCH 28/38] depot actor --- RFXtoRP_HsrDepot_ActorCreated.ftl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 1258eb6..2c2478c 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -11,11 +11,8 @@ }, "Payload": { "Name": "${depot.physical_depot_designation?json_string}", - "ManagedStock": true, "IsCarrier": false, - <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">, - "Address": { <#-- if Reflex WMS address is structured --> @@ -49,7 +46,7 @@ "${depot.physical_depot_address.other_number?json_string}" ], - "Typology": "TYPOLOGY_UNKNOWN" + "Typology": "TYPOLOGY_WAREHOUSE" } } ] From 24564d199e7bcc8f45f88d903d1949ef501e0865 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 21 Mar 2025 17:09:37 +0100 Subject: [PATCH 29/38] claim --- RFXtoRP_HsaDispute_Created.ftl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 6b8db74..56984fe 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -45,15 +45,17 @@ "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", <#else> - <#if dispute.dispute_reception.reception_type_code=="030"> - "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", - <#else> - <#if dispute.dispute_reception.reception_type_code=="070"> - "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" > + <#if dispute.dispute_reception.reception_type_code=="030"> + "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> - <#stop "WMS type code not supported"> + <#if dispute.dispute_reception.reception_type_code=="010"> + "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", + <#else> + <#stop "WMS type code not supported"> + From f31be2092e0626bbb25e4a1b121534b13d11ed0e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 21 Mar 2025 17:19:13 +0100 Subject: [PATCH 30/38] modifs --- RFXtoRP_HsaDispute_Created.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 56984fe..bee9ae3 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -50,7 +50,7 @@ "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> - <#if dispute.dispute_reception.reception_type_code=="010"> + <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" > "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> From d5efde68a9124aced227ffeadbd6773acfef7867 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 24 Mar 2025 15:59:20 +0100 Subject: [PATCH 31/38] modifs recipt --- RPtoRFX_Receipt.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 763cf12..905c3bb 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -52,7 +52,6 @@ "batch_1": "${batch_1?json_string!""}", "optional_attributes": { <#--"held_for_check": "false", - "held _for_repacking": "false", "hold_code": "false", --> "hold_for_specific_code": "false" } From 40d767406a0ad6bd3ce65dd72dc6360448650387 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 27 Mar 2025 15:21:59 +0100 Subject: [PATCH 32/38] change executuionflow.Order.ID to eventRP.refid --- RPtoRFX_PrepOrder.ftl | 2 +- RPtoRFX_Receipt.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 0debca9..c80da8c 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -17,7 +17,7 @@ { - "id" : {"refid" : "${executionflow.OrderID?json_string}"}, + "id" : {"refid" : "${eventRP.refid?json_string}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders", "method" : "POST", "uri_substitutions": { diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 905c3bb..cd271c9 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -3,7 +3,7 @@ <#include "HfRpConfig.ftl"> { - "id" : {"refid" : "${executionflow.OrderID?json_string}"}, + "id" : {"refid" : "${eventRP.refid?json_string}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts", "method" : "POST", "uri_substitutions": { From 3aee512fa108070c41dc6b47203743bc1dbd0c67 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 7 Apr 2025 13:46:35 +0200 Subject: [PATCH 33/38] adjsut version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 61bc4c6..9d7c109 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0-SNAPSHOT +1.3.0-SNAPSHOT From 11ab7068cdb2dc950c690477baf36f70b474ac3c Mon Sep 17 00:00:00 2001 From: Vincent LEMAITRE Date: Tue, 8 Apr 2025 07:57:49 +0000 Subject: [PATCH 34/38] New Major version 2.y.z --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9d7c109..6753471 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.0-SNAPSHOT +2.0.0-SNAPSHOT From e2a8404311918a8f73fef577f1835a0a9e83d977 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 8 Apr 2025 10:00:03 +0200 Subject: [PATCH 35/38] Release 2.0.0+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6753471..ed9e503 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0-SNAPSHOT +2.0.0+1 From 80736c4a30c0fcced9ccfa24f1eae25b8691df51 Mon Sep 17 00:00:00 2001 From: freat Date: Fri, 11 Apr 2025 15:46:56 +0200 Subject: [PATCH 36/38] Release 2.0.1+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ed9e503..783afda 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0+1 +2.0.1+1 From c4f2161edb5416fcd36704a7ba1bcdffc90efaae Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 15 Apr 2025 14:29:22 +0200 Subject: [PATCH 37/38] Modif typologie (cherry picked from commit a1c4b8a4ac83c4d3e2d4a7d36578593622fddc16) --- RFXtoRP_HsaCons_ActorCreated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 6d65568..832adc5 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -48,7 +48,7 @@ "${actor.address.other_number?json_string}" ], - "Typology": "TYPOLOGY_WAREHOUSE" + "Typology": "TYPOLOGY_UNKNOWN" } } ] From 2752e5b26e2a2a3e832b8559052175607495d19a Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 15 Apr 2025 18:28:42 +0200 Subject: [PATCH 38/38] Release 2.0.1+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 783afda..ca58425 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.1+1 +2.0.1+2