From a38ff4f9604c1c89c9e3e6668bb4574388777054 Mon Sep 17 00:00:00 2001 From: Malai Raja Date: Wed, 13 Dec 2023 18:58:52 +0530 Subject: [PATCH] 13122023 --- src/pages/nearle/orders/orders.js | 46 +++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js index e28c7e0..16c72e0 100644 --- a/src/pages/nearle/orders/orders.js +++ b/src/pages/nearle/orders/orders.js @@ -189,7 +189,7 @@ import { id: 'sno', disablePadding: true, label: 'S NO', - + }, { id: 'tenantname', @@ -631,7 +631,7 @@ import { {row.orderid} - {dayjs(row.deliverydate).utc().format('MM/DD/YYYY')} + {dayjs(row.deliverydate).utc().format('DD/MM/YYYY')} + { e.stopPropagation(); setOrderheaderid(row.orderheaderid) @@ -790,7 +791,8 @@ import { {/* */} @@ -1443,7 +1445,7 @@ import { } else if (tabstatus === 'Pending') { if (searchword) { - let arr = orderarrcreated.filter((val) => { + let arr = orderarruncovered.filter((val) => { return (val.orderid.toLowerCase().includes(searchword.toLowerCase()) || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) @@ -1457,7 +1459,7 @@ import { console.log(arr) setRows([...arr]) } else { - setRows([...orderarrcreated]) + setRows([...orderarruncovered]) } } else if (tabstatus === 'Cancelled') { @@ -1465,11 +1467,11 @@ import { let arr = orderarrcancelled.filter((val) => { return (val.orderid.toLowerCase().includes(searchword.toLowerCase()) - || val.eventname.toLowerCase().includes(searchword.toLowerCase()) - || val.customername.toLowerCase().includes(searchword.toLowerCase()) - || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase()) - || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) - || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase()) + || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) + || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) + || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) + || val.customername.toLowerCase().includes(searchword.toLowerCase()) + || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase()) ) }) @@ -1574,7 +1576,27 @@ import { setRows([...orderarrpicked]) } - } + }else if (tabstatus === 'Created') { + if (searchword) { + let arr = orderarrcreated.filter((val) => { + + return (val.orderid.toLowerCase().includes(searchword.toLowerCase()) + || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) + || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) + || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) + || val.customername.toLowerCase().includes(searchword.toLowerCase()) + || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase()) + + ) + }) + console.log(arr) + setRows([...arr]) + } + else { + setRows([...orderarrcreated]) + } + + } }, [orderarr, searchword])