Release 1.2.37+2

SCPN1-8597

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

RFXtoRP_HsaCarrier.ftl

@@ -2,9 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -18,22 +15,6 @@
        <#-- *********************************************** 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>
@@ -42,7 +23,6 @@
               <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">
          }
        ]
-  </#if>
   <#break>
 
     <#case "D">

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

RFXtoRP_HsaCarrier_ActorDeleted.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

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

@@ -2,10 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
-
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -19,22 +15,6 @@
        <#-- *********************************************** 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>
@@ -43,7 +23,6 @@
           <#include "RFXtoRP_HsaCons_ActorCreated.ftl">
          }
        ]
-      </#if>
       <#break>
 
       <#case "D">

RFXtoRP_HsaCons_ActorCreated.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

RFXtoRP_HsaCons_ActorDeleted.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

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

@@ -39,30 +39,29 @@
                 </#if>
                 "Value": "${dispute.dispute_amount}"
              },
-            <#-- 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>
             <#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]}"
                 <#else>
                     <#stop "Type not supported" >
                 </#if>
             </#if>
+             <#-- To configure -->
+            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
+
+            <#if TableReasonCode[dispute.dispute_reason_code]??>
+                "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}"
+            <#else>
+                <#stop "Claim reason code not supported" >
             </#if>
+
+
         }
     }
 ]
-
-
-

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -54,7 +54,7 @@
         "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
         "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
         <#if reflexMvtStockInterface.ipg_move_type == "520" >
-          "Reason": " Direct Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
+          "Reason": " Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
         <#else>
           "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
         </#if>

RFXtoRP_HsaSup.ftl

@@ -2,9 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -18,22 +15,6 @@
        <#-- *********************************************** 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>
@@ -42,7 +23,6 @@
           <#include "RFXtoRP_HsaSup_ActorCreated.ftl">
          }
        ]
-    </#if>
       <#break>
 
       <#case "D">

RFXtoRP_HsaSup_ActorCreated.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

RFXtoRP_HsaSup_ActorDeleted.ftl

@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

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

@@ -6,7 +6,6 @@
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
-<#include "RFX_PartnerAPP_Settings.ftl">
 
 <#assign aDateTime = .now>
 
@@ -55,7 +54,7 @@
             <#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) />
-            <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+            <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
                <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                ,
                {
@@ -79,7 +78,7 @@
                "datas" :
                <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
                }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]??>
                <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                ,
                {

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -1,7 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
-<#include "RFX_PartnerAPP_Settings.ftl">
 [
 <#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
   {
@@ -9,20 +8,6 @@
     "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#switch trackingNumberSource>
-        <#case 1>
-          <#if despatched_ipg.consignment_unit_id!="">
-			      "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-          </#if>
-        <#break>
-        <#case 2>
-          <#if despatched_ipg.carton_number != "000000000000000000">
-              "RefID":"${despatched_ipg.carton_number}",
-            <#else>
-              "RefID":"${despatched_ipg.hd_number}",
-          </#if>
-        <#break>
-        <#case 3>
       <#if despatched_ipg.consignment_unit_id!="">
 			  "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
       <#else>
@@ -32,18 +17,6 @@
           "RefID":"${despatched_ipg.hd_number}",
         </#if>
       </#if>
-        <#break>
-        <#default>
-          <#if despatched_ipg.consignment_unit_id!="">
-            "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-          <#else>
-            <#if despatched_ipg.carton_number != "000000000000000000">
-              "RefID":"${despatched_ipg.carton_number}",
-            <#else>
-              "RefID":"${despatched_ipg.hd_number}",
-            </#if>
-          </#if>
-        </#switch>
 
       "RefDate": {
               "DateTime": "${dispatched_datetime4}",

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

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

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

RFXtoRP_RfxConfigurationRp.ftl

@@ -25,8 +25,8 @@
 
 
 
-<#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"UTC"}<#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!"+00:00"}<#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>

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
+1.2.37+2