diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index fca7621..e957ae1 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -49,7 +49,8 @@ "datas" : <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl"> }, - <#if carrier_apt.status?? && carrier_apt.status.status_code=="999"> + <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl"> + <#if carrier_apt.status?? && (carrier_apt.status.status_code=="999" || carrier_apt.status.status_code=="040" || carrier_apt.status.status_code=="030")> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment> diff --git a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl new file mode 100644 index 0000000..8769708 --- /dev/null +++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl @@ -0,0 +1,9 @@ + <#-- A décommenter si besoin de les utiliser--> + <#-- Uncomment if you need to use them--> + <#--{ + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentMetaDataUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl"> + }, +--> \ No newline at end of file diff --git a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl new file mode 100644 index 0000000..81fefce --- /dev/null +++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl @@ -0,0 +1,38 @@ +<#-- + [ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> + "RefID": "${carrier_apt.appointment_reference?json_string}", + <#else> + <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> + "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", + <#else> + "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", + + + } + "Payload": { + "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", + <#--To configure--> +<#-- "MetaData": [ + { + "Key": "string", + "Value": { + "Bool": "true / false", + "Float": 3.1415, + "Int": 42, + "String": "Hello World !", + "Timestamp": { + "AuthorTimeZone": "Europe/Paris", + "DateTime": "2023-01-01T00:00:00Z" + } + } + ] + } +} +] +--> \ No newline at end of file diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index bb3c20b..1d1db08 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -79,6 +79,7 @@ <#else> "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}", + "ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}", "ProjectID": "${projectRP}", <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl"> }<#sep>, diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index eca2fd8..9407ca8 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -270,7 +270,8 @@ <#break> <#-- *********************************************** ApiRestID = appointment_put_update_ref ******************** --> - <#case "appointment_put_update_ref"> + <#case "appointment_put_update_by_ref"> + <#case "appointment_put_update_by_number"> <#switch restResponsetMsg.status!no_status> <#case no_status> [ @@ -343,7 +344,9 @@ ] <#break> - <#case "Canceled"> + <#-- *********************************************** ApiRestID = canceled ******************** --> + <#case "status_appointment_put_update_by_ref"> + <#case "status_appointment_put_update_by_number"> <#switch restResponsetMsg.status!no_status> <#case no_status> [ @@ -417,7 +420,8 @@ <#break> <#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** --> - <#case "appointment_post_physical_receipt_associations"> + <#case "appointment_post_physical_receipt_associations_by_ref"> + <#case "appointment_post_physical_receipt_associations_by_number"> <#switch restResponsetMsg.status!no_status> <#case no_status> [ diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl index cf1ae16..bed878f 100644 --- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl +++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl @@ -14,8 +14,8 @@ -<#assign activity_code = "ALI"/> -<#assign originator_code = "001"/> +<#assign activity_code = ""/> +<#assign originator_code = ""/> <#assign preparation_type_code = "010"/> <#assign requested_delivery_date_type = "010"/> <#assign consolidated_delivery_flag ="false"/> @@ -26,7 +26,7 @@ <#-- A supprimer si utilisation de la table de correspondance--> <#--To be deleted if using the correspondence table--> -<#assign load_grouping = "TEST"> +<#assign load_grouping = ""> <#-- Table de correspondance Transporteur/Code regroupement chargement, diff --git a/VERSION b/VERSION index e91986d..9441ead 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.14+1 +2.0.15+1