diff --git a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl index 5ef9252..43307e6 100644 --- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl @@ -112,15 +112,12 @@ "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}", "PartnerAppID": "${partnerApplicationRP}", - "OrganisationID": "${organisationRP}", - <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl"> + "OrganisationID": "${organisationRP}" }<#sep>, ], - "ProjectID" : "${projectRP}", - <#include "RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl"> - }], - <#include "RFXtoRP_HsrCarrierApt_TotalQuantities.ftl"> + "ProjectID" : "${projectRP}" + }] }, <#else> "Loading" : @@ -130,13 +127,10 @@ "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ProjectID": "${projectRP}", "PartnerAppID": "${partnerApplicationRP}", - "OrganisationID": "${organisationRP}", - <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl"> + "OrganisationID": "${organisationRP}" }], - "ProjectID" : "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", - <#include "RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl"> - }], - <#include "RFXtoRP_HsrCarrierApt_TotalQuantities.ftl"> + "ProjectID" : "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" + }] }, <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> "Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}", diff --git a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl index 7085a3e..c1dc1bb 100644 --- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl @@ -108,15 +108,12 @@ "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}", "PartnerAppID": "${partnerApplicationRP}", - "OrganisationID": "${organisationRP}", - <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl"> + "OrganisationID": "${organisationRP}" }<#sep>, ], - "ProjectID" : "${projectRP}", - <#include "RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl"> - }], - <#include "RFXtoRP_HsrCarrierApt_TotalQuantities.ftl"> + "ProjectID" : "${projectRP}" + }] }, <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> diff --git a/RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl b/RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl deleted file mode 100644 index 6c84c6f..0000000 --- a/RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl +++ /dev/null @@ -1,5 +0,0 @@ -"ProjectQuantities": [ - - ] - - diff --git a/RFXtoRP_HsrCarrierApt_Quantities.ftl b/RFXtoRP_HsrCarrierApt_Quantities.ftl deleted file mode 100644 index 22b0ec5..0000000 --- a/RFXtoRP_HsrCarrierApt_Quantities.ftl +++ /dev/null @@ -1,5 +0,0 @@ -"Quantities": [ - - ] - - diff --git a/RFXtoRP_HsrCarrierApt_TotalQuantities.ftl b/RFXtoRP_HsrCarrierApt_TotalQuantities.ftl deleted file mode 100644 index 61bfaac..0000000 --- a/RFXtoRP_HsrCarrierApt_TotalQuantities.ftl +++ /dev/null @@ -1,5 +0,0 @@ -"TotalQuantities": [ - - ] - -