Release 2.0.1+2

Modif typologie

See merge request r-d-technique/tiers/reflex-wms-connector!101

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/
+
+

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">
          }
        ]
-  </#if>
   <#break>
 
     <#case "D">

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 @@
           </#if>
 			    "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??>

RFXtoRP_HsaCarrier_ActorUpdated.ftl

@@ -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}",
-      </#if>
-      "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}",
-      </#if>
-      "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>,</#sep>
-         </#list>
-      ],
-      </#if>
-    <#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" : "",
-          </#if>
-			  "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>
-        </#if>
-       },
-    <#if  carrier.address?? >
-      "Phones": ["${carrier.address.telephone?json_string}",
-               "${carrier.address.other_number?json_string}"
-              ],
-    </#if>
-    "Typology": "TYPOLOGY_UNKNOWN"
-      }
-  }
-]

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">
          }
        ]
-      </#if>
+
       <#break>
 
       <#case "D">

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??>
 

RFXtoRP_HsaCons_ActorUpdated.ftl

@@ -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}",
-      </#if>
-      "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}",
-      </#if>
-     "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>,</#sep>
-         </#list>
-      ],
-      </#if>
-    <#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" : "",
-          </#if>
-			  "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>
-        </#if>
-       },
-    <#if  actor.address?? >
-      "Phones": ["${actor.address.telephone?json_string}",
-               "${actor.address.other_number?json_string}"
-              ],
-    </#if>
-    "Typology": "TYPOLOGY_UNKNOWN"
-      }
-  }
-]

RFXtoRP_HsaDispute.ftl

@@ -17,20 +17,27 @@
       <#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?trim?json_string!="")>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
               "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>
+              </#if>
             <#else>
-              <#stop>
+              <#stop "Reference is empty">
+            </#if>
           </#if>
        ]
   <#break>

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":"",
             </#if>
@@ -42,27 +42,33 @@
             <#-- 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_contractor_reference?trim?json_string}",
-                    <#if TableReasonCode[dispute.dispute_reason_code]??>
-                        "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
-                    <#else>
-                        <#stop "preparation order list is empty" >
-                    </#if>
-                </#if>
+                "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" >
-                    "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_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 "Type not supported" >
+                        <#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>
+                            <#stop "WMS type code not supported">
+                        </#if>
                     </#if>
                 </#if>
             </#if>
+
+            <#if TableReasonCode[dispute.dispute_reason_code]??>
+                "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"
+            <#else>
+                <#stop "Claim reason code not supported" >
+            </#if>
         }
     }
 ]
 
 
 
+

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}",
         </#if>
         "LineID": "${reflexMvtStockInterface.receipt_line_number}",
         "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",

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}"

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}"

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}"

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}"

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}"

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">
          }
        ]
-    </#if>
       <#break>
 
       <#case "D">

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 @@
           </#if>
 			    "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>
         </#if>
-
          },
       <#if actor.optional_attributes?? >
         "Phones": ["${actor.optional_attributes.telephone?json_string}",

RFXtoRP_HsaSup_ActorUpdated.ftl

@@ -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}",
-      </#if>
-      "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}",
-      </#if>
-      "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>,</#sep>
-         </#list>
-      ],
-      </#if>
-    <#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" : "",
-          </#if>
-			  "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>
-        </#if>
-       },
-    <#if  actor.optional_attributes?? >
-      "Phones": ["${actor.optional_attributes.telephone?json_string}",
-               "${actor.optional_attributes.other_number?json_string}"
-              ],
-    </#if>
-    "Typology": "TYPOLOGY_UNKNOWN"
-      }
-  }
-]

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">

RFXtoRP_HsrDepot_ActorCreated.ftl

@@ -11,20 +11,12 @@
     },
     "Payload": {
       "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 +30,6 @@
           </#if>
 			    "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??>
@@ -55,7 +46,7 @@
                   "${depot.physical_depot_address.other_number?json_string}"
                   ],
         </#if>
-       "Typology": "TYPOLOGY_UNKNOWN"
+       "Typology": "TYPOLOGY_WAREHOUSE"
        }
   }
 ]

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">
                }
             </#if>
 
@@ -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">
-                  }
-               </#if>
+               <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+               ,
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
+               }
+            </#if>
 
             </#if>
                </#list>

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": {

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 >

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.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 >

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) />
     {
@@ -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>

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -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 >
-    ,
-    </#if>
-    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    {
-      "Header": {
-      "ProjectID": "${projectRP}"
-      },
-      "ID":{
-      "RefID": "${OrderOriginReference}"
-      },
-    "Payload":{
-      "Carrier": {
-        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
-      }
-    }
-    }
-  </#if>
-  </#list>
-  <#assign refIDHmap_local ={}>
-]

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}"

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -4,12 +4,12 @@
 [
   {
   <#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}"
     },
     "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,43 @@
         },
        "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" : "",
-                 </#if>
-                 "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.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}" ]
+                  }
+            </#if>
           </#if>
          },
-
+        "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 +106,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 = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_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}"
+              </#if>
              }
          }
     }

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>

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}"

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -4,12 +4,12 @@
 [
   {
   <#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}"
     },
     "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":

RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl

@@ -1,13 +1,13 @@
 <#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": {
       "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}"

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}"

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": {
+    }
+  }
+]

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>
+
+      <#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",
+                </#if>
+              </#if>
+              <#-- 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>,</#sep>
+          </#list>
+         ],
+      </#if>
+
+         "RequestedMilestones" :
+         {
+             "RequestedDeliveryDateTime" :
+             {
+                "DateTime": "${receipt_datetime}",
+               "AuthorTimeZone": "${time_zone_rfx}"
+             }
+         }
+    }
+  }
+]

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": {
+    }
+  }
+]

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": {}
+
+  }
+]

RFXtoRP_RfxConfigurationRp.ftl

@@ -25,8 +25,8 @@
 
 
 
-<#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"UTC"}<#noparse>"></#noparse>
-<#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+00:00"}<#noparse>"></#noparse>
+<#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"Europe/Paris"}<#noparse>"></#noparse>
+<#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+01:00"}<#noparse>"></#noparse>
 
 
 <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project>

RPtoRFX_PrepOrder.ftl

@@ -17,7 +17,7 @@
 </#if>
 
 {
-	"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": {

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": {
@@ -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"
 		 		}

ReflexUtils.ftl

@@ -9,11 +9,6 @@
   <#return dateutc?datetime.iso?iso_nz(locale)>
 </#function>
 
-<#function RfxDateTimetoUTCWithTimezone rfxdatetime timezone>
-    <#setting time_zone=timezone>
-    <#return (rfxdatetime?datetime.iso?iso_utc)>
-</#function>
-
 <#-- --------------------------------------------------------------------------------------- -->
 <#-- Split email reflex into json array string                                               -->
 <#--  Example : splitemail "john.doe@hardis-group.com,;         name@hardis-group.com"       -->

VERSION

@@ -1 +1 @@
-1.3.0-SNAPSHOT
+2.0.1+2