diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 4106515..5c835a6 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -24,35 +24,37 @@ } } + <#else> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + <#break> + <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + <#break> + - <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", - "RefDate": { - "DateTime": "${receipt_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { - } - } - <#else> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", - "RefDate": { - "DateTime": "${receipt_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { - } - } - -] +] \ No newline at end of file