SCPN1-10956

RFXtoRP_HsaDispute_Created.ftl

@@ -83,7 +83,6 @@
                             <#stop "WMS type code not supported">
                         </#if>
                     </#if>
-                </#if>
             <#-- for Claim on anticipated receipt  -->
                 <#else>
                     <#if dispute.dispute_type_code=="020" >
@@ -96,6 +95,7 @@
                         </#if>
                     </#if>
                 </#if>
+            </#if>
 
             <#if TableReasonCode[dispute.dispute_reason_code]??>
                 "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"

RFXtoRP_HsaDispute_MessageSent.ftl

@@ -33,12 +33,12 @@
             <#else>
                 <#if dispute.dispute_reception??>
                     "Message": "${dispute.dispute_reception.reception_reference?trim?json_string}"
-                </#if>
                 <#else>
                     <#if dispute.dispute_anticipated_receipt??>
                         "Message": "${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?trim?json_string}"
                     </#if>
                 </#if>
+            </#if>
 
         }
     },