add remainingAmount to refund rs when refund amount is 0 (#220)

bcgov · Feb 9, 2024 · 8a16daf · 8a16daf
1 parent ee34afa
commit 8a16daf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/components/ViewRoutingSlip/RoutingSlipInfo.vue b/src/components/ViewRoutingSlip/RoutingSlipInfo.vue
@@ -57,12 +57,12 @@
                 >
               </v-col>
             </v-row>
-            <v-row v-if="routingSlipDetails.refundAmount">
+            <v-row v-if="showRefundAmount">
               <v-col class="col-6 col-sm-3 font-weight-bold">
                 Refund Amount
               </v-col>
               <v-col class="col-6 col-sm-9">
-                {{ routingSlipDetails.refundAmount }}
+                {{ routingSlipDetails.refundAmount || routingSlipDetails.remainingAmount }}
               </v-col>
             </v-row>
 
@@ -172,6 +172,7 @@ import can from '@/directives/can'
       isRoutingSlipAChild,
       statusChange,
       showAddress,
+      showRefundAmount,
       refundRequestForm,
       refundRequestDetails,
       errorMessage,
@@ -195,6 +196,7 @@ import can from '@/directives/can'
       isRoutingSlipAChild,
       statusChange,
       showAddress,
+      showRefundAmount,
       refundRequestForm,
       refundRequestDetails,
       errorMessage,

diff --git a/src/composables/ViewRoutingSlip/useRoutingSlipInfo.ts b/src/composables/ViewRoutingSlip/useRoutingSlipInfo.ts
@@ -82,6 +82,12 @@ export default function useRoutingSlipInfo (props) {
     )
   })
 
+  const showRefundAmount = computed(() => {
+    return (
+      isRefundProcess(currentStatus?.value)
+    )
+  })
+
   const showAddressEditMode = computed(() => {
     // need show address as editable also as view
     return isAddressEditable.value
@@ -274,6 +280,7 @@ export default function useRoutingSlipInfo (props) {
     isRoutingSlipAChild,
     statusChange,
     showAddress,
+    showRefundAmount,
     refundRequestForm,
     refundRequestDetails,
     errorMessage,