reflex/reflex-wms-connector
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

Merge branch 'release/1.2' into 'main-1.2'

Browse Source 
update RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl par defaut

See merge request r-d-technique/tiers/reflex-wms-connector!306
This commit is contained in:
Nathan SOULIER
2026-07-23 09:04:00 +00:00
parent 00188449b0 a4dd0a5dec
commit 74da16c15a
5 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl
View File

@@ -1,6 +1,6 @@
"SegmentationSelections": [ "SegmentationKeys": [
] ]

29
RFXtoRP_HsrReceiptList.ftl
View File

@@ -77,18 +77,23 @@
<#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
} }
<#else> <#else>
{ <#if receipt.line_list ?? && receipt.line_list[0]??>
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> {
"apiReflexPlatformID" : "${apiReflexPlatformID}", <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
"datas" : "apiReflexPlatformID" : "${apiReflexPlatformID}",
<#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> "datas" :
}, <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
{ },
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> {
"apiReflexPlatformID" : "${apiReflexPlatformID}", <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
"datas" : "apiReflexPlatformID" : "${apiReflexPlatformID}",
<#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> "datas" :
} <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
}
<#else>
<#-- No line-->
<#stop>
</#if>
</#if> </#if>
<#else> <#else>
<#if receipt.receipt_type == "030"> <#if receipt.receipt_type == "030">

23
RFXtoRP_PlatformLogCreate.ftl
View File

@@ -1,7 +1,16 @@
<#include "HfRpConfig.ftl"> <#include "HfRpConfig.ftl">
[ [
<#assign UUID = UUID.randomUUID()> <#assign UUID = UUID.randomUUID()>
<#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)> <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")>
<#assign maxLen = 32000>
<#if strJsonBody?length gt maxLen>
<#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")?replace('"logical_key_list"\\s*:\\s*\\[[^\\]]*\\]', '"logical_key_list": []', 'r')>
</#if>
<#if strJsonBody?length gt maxLen>
<#assign safeJsonBody = "{\"truncated\": true, \"original_size\": " + strJsonBody?length + "}">
<#else>
<#assign safeJsonBody = strJsonBody>
</#if>
{ {
"Header": { "Header": {
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
@@ -17,22 +26,22 @@
<#assign severity = SeverityLevel.ERROR> <#assign severity = SeverityLevel.ERROR>
"Severity": "${severity}", "Severity": "${severity}",
"Namespace": "ReflexIntegration", "Namespace": "ReflexIntegration",
"DateTime": { "DateTime": {
"DateTime": "${aDateTime?iso_utc}", "DateTime": "${aDateTime?iso_utc}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"
}, },
"TechMessage": { "TechMessage": {
"Code": "${restResponsetMsg.status!"no Code"}", "Code": "${restResponsetMsg.status!"no Code"}",
"Label": ${strJsonBody?truncate(32000,'...')} "Label": "${safeJsonBody?json_string}"
}, },
"UserMessage": { "UserMessage": {
"Code": "${restResponsetMsg.status!"no Code"}", "Code": "${restResponsetMsg.status!"no Code"}",
"Label": ${strJsonBody?truncate(32000,'...')}, "Label": "${safeJsonBody?json_string}",
"Params": [] "Params": []
}, },
"DetailElements": [], "DetailElements": [],
"CorrelationID": "${id.correlationid!"no Correlationid"}", "CorrelationID": "${id.correlationid!"no Correlationid"}",
"ContextPayload": ${strJsonBody?truncate(32000,'...')}, "ContextPayload": "${safeJsonBody?json_string}",
"Type": "${event}", "Type": "${event}",
"Task": "${id.apiRestReflexID!"no Task"}", "Task": "${id.apiRestReflexID!"no Task"}",
"OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",

3
RPtoRFX_AppointmentEvent.ftl
View File

@@ -28,7 +28,8 @@
<#assign AddComma = false /> <#assign AddComma = false />
<#assign appointment = eventRP.data /> <#assign appointment = eventRP.data />
<#if !eventRP.commissionsUpdated!false && !eventRP.reasonUpdated!false && !eventRP.slotUpdated!false && !eventRP.carrierInformationUpdated!false> <#-- processing is stopped because the Updated event contains no relevant change to forward to the WMS. -->
<#if !(eventRP.commissionsUpdated!false) && !(eventRP.reasonUpdated!false) && !(eventRP.slotUpdated!false) && !(eventRP.carrierInformationUpdated!false)>
<#stop> <#stop>
</#if> </#if>
[ [

2
VERSION
View File

@@ -1 +1 @@
1.2.62+1 1.2.63+2