fix: filter order list (#602)

* fix filter * remove console log Co-authored-by: Hildegard Lydia <[email protected]>
debionetwork · Dec 9, 2022 · 2cb3274 · 2cb3274
1 parent 0c7939a
commit 2cb3274
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/components/OrderList.vue b/src/components/OrderList.vue
@@ -104,13 +104,13 @@ export default {
       this.isLoading = true
       try {
         const orderList = []
-        const listStatus = ["Refunded", "Fulfilled"]
         
         const orders = await this.dispatch(getOrdersData, this.pair.address, this.page, this.pageSize, keyword)
         for (let order of orders.data) {
           const dna = await queryDnaSamples(this.api, order._source.dna_sample_tracking_id)
 
           if (this.isDashboard && dna?.status === "Rejected") continue
+          if (!this.isDashboard && dna?.status === "ResultReady") continue
 
           const dnaTestResult = await queryDnaTestResults(this.api, order._source.dna_sample_tracking_id)
           const data = {
@@ -126,12 +126,7 @@ export default {
               })
             }
           }
-          
-          if (this.isDashboard) {
-            if (!listStatus.includes(data._source.status)) orderList.push(data)
-          } else {
-            if (listStatus.includes(data._source.status)) orderList.push(data)
-          }
+          orderList.push(data)
         }
 
         this.orders = orderList