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

Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop

Browse Source
This commit is contained in:
Laurie MONTANT 2025-12-11 15:49:27 +01:00
commit 108d29b5b3
7 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RFXtoRP_HsrCarrierApt_CarrierInformation.ftl Normal file
View File

@ -0,0 +1,3 @@
"CarrierInformation": [
]

5
RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl Normal file
View File

@ -0,0 +1,5 @@
"MetaData": [
]

5
RFXtoRP_HsrCarrierApt_Quantities.ftl Normal file
View File

@ -0,0 +1,5 @@
"Quantities": [
]

6
RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl Normal file
View File

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

22
RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
View File

@ -66,12 +66,9 @@
"Value": "${carrier_apt.planned_carrier?json_string}" "Value": "${carrier_apt.planned_carrier?json_string}"
} }
], ],
"SegmentationSelections":[ <#-- intégrer les SK par la suite --> <#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
{ "SegmentationID":"Securise", <#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">,
"SegmentationValueID":"yes"}, <#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
{ "SegmentationID":"Secteur",
"SegmentationValueID":"frais"}
],
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)> <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
"Commissions": [ "Commissions": [
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt> <#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
@ -83,11 +80,7 @@
"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}", "OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
</#if> </#if>
"ProjectID": "${projectRP}", "ProjectID": "${projectRP}",
"Quantities": [ <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
{
"UnitID": "PAL", <#-- à changer -->
"Value": 1 <#-- à changer -->
}
] ]
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
@ -97,12 +90,7 @@
{ {
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"ProjectID": "${projectRP}", "ProjectID": "${projectRP}",
"Quantities": [ <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
{
"UnitID": "PAL", <#-- à changer -->
"Value": 1 <#-- à changer -->
}
]
} }
], ],
"Reason": "no commission", <#-- à changer --> "Reason": "no commission", <#-- à changer -->

7
RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
View File

@ -51,12 +51,7 @@
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}", "OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
"ProjectID": "${projectRP}", "ProjectID": "${projectRP}",
"Quantities": [ <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
{
"UnitID": "PAL", <#-- à changer -->
"Value": 1 <#-- à changer -->
}
]
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
], ],

8
RFXtoRP_RestResponse.ftl
View File

@ -269,8 +269,8 @@
] ]
</#switch> </#switch>
<#break> <#break>
<#-- *********************************************** ApiRestID = appointment_put_update ******************** --> <#-- *********************************************** ApiRestID = appointment_put_update_ref ******************** -->
<#case "appointment_put_update"> <#case "appointment_put_update_ref">
<#switch restResponsetMsg.status!no_status> <#switch restResponsetMsg.status!no_status>
<#case no_status> <#case no_status>
[ [
@ -416,8 +416,8 @@
] ]
</#switch> </#switch>
<#break> <#break>
<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_association ******************** --> <#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** -->
<#case "appointment_post_physical_receipt_association"> <#case "appointment_post_physical_receipt_associations">
<#switch restResponsetMsg.status!no_status> <#switch restResponsetMsg.status!no_status>
<#case no_status> <#case no_status>
[ [