Release 2.0.8+4

SCPN1-9437 to release 2.0

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

RFXtoRP_HsaItm.ftl

@@ -18,15 +18,10 @@
       <#assign item = JsonUtil.jsonToMap(dataRfx)>
        [
          {
-           <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :
             <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
-        <#else>
-          <#--  "no LV for the item"-->
-          <#stop>
-        </#if>
          }
        ]
       <#break>

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -21,15 +21,17 @@
       },
 
       <#-- Item metadata inclusion -->
-      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,
+      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">
 
       <#-- Item Photo URI could be added here -->
       <#if item.url?? && item.url!="">
-        "PhotoURI": "${item.url?json_string}",
+      ,
+        "PhotoURI": "${item.url?json_string}"
       </#if>
 
     <#-- Loop for the Logistical Variants - LV -->
-        <#if item.logistical_variant_list??>
+        <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
+        ,
           "LogisticVariants": [
 
            <#list item.logistical_variant_list as logistical_variant>

RFXtoRP_HsrPrepa.ftl

@@ -51,8 +51,7 @@
                <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) 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]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-                  <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                   ,
                   {
                   <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -53,8 +53,10 @@
     "Payload": {
       <#if despatched_ipg.carton_number != "000000000000000000">
       "HandlingunitID": "${despatched_ipg.carton_number}"
+      <#assign hd_numberHmap += {despatched_ipg.carton_number,despatched_ipg.carton_number}>
       <#else>
       "HandlingunitID": "${despatched_ipg.hd_number}"
+      <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
       </#if>
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
     ,

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -38,8 +38,8 @@
           <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee=="true">
             "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}"
           <#else>
-            <#if preparation_order.preparation_type_code == "030">
+            <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.transfer_intermediate_consignee=="false" && preparation_order.transfer_physical_depot_code?? && preparation_order.transfer_physical_depot_code!="">
-              "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}"
+              "ActorID": "${RFXtoRPprefixDepot(preparation_order.transfer_physical_depot_code?json_string)}"
             <#else>
               <#if preparation_order.address.address_type_code == "" &&
               preparation_order.address.name_or_company_name == "" &&

RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl

@@ -29,7 +29,6 @@
         <#else>
           "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
         </#if>
-        "OrderID":"${receipt.receipt_reference?trim?json_string}",
         <#-- Header Metadata inclusion -->
         <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
         "ShipFrom":

VERSION

@@ -1 +1 @@
-2.0.8+1
+2.0.8+4