diff --git a/src/pages/nearle/dispatch/Dispatch.js b/src/pages/nearle/dispatch/Dispatch.js index 774b763..f2828e2 100644 --- a/src/pages/nearle/dispatch/Dispatch.js +++ b/src/pages/nearle/dispatch/Dispatch.js @@ -2694,7 +2694,7 @@ const Dispatch = ({ )} - {(o.actualkms != null || (!isDelivered && o.riderkms != null) || estMeters !== null) && ( + {(o.actualkms != null || o.riderkms != null || estMeters !== null) && (
{o.actualkms != null && o.actualkms !== '' && (
@@ -2703,7 +2703,7 @@ const Dispatch = ({ {o.actualkms} km
)} - {!isDelivered && o.riderkms != null && o.riderkms !== '' && ( + {o.riderkms != null && o.riderkms !== '' && (
Rider diff --git a/src/pages/nearle/reports/orderSummary.js b/src/pages/nearle/reports/orderSummary.js index 451ab79..11edc8d 100644 --- a/src/pages/nearle/reports/orderSummary.js +++ b/src/pages/nearle/reports/orderSummary.js @@ -757,7 +757,7 @@ export default function OrdersReport() { Kms - Amount + Actual KMs Action - - + + - } isMoney /> + } + /> @@ -992,7 +996,6 @@ export default function OrdersReport() { Skipped Delivered Kms - Charges @@ -1061,14 +1064,11 @@ export default function OrdersReport() { } /> - - } isMoney /> - )) ) : ( - + @@ -1157,11 +1157,7 @@ export default function OrdersReport() { {totalDeliCancel} - - - {formatNumberToRupees(total)} - - + )} diff --git a/src/pages/nearle/reports/ordersDetails.js b/src/pages/nearle/reports/ordersDetails.js index 57146ad..f3e9f2b 100644 --- a/src/pages/nearle/reports/ordersDetails.js +++ b/src/pages/nearle/reports/ordersDetails.js @@ -329,8 +329,7 @@ export default function OrdersDetails() { { key: 'picked', label: 'Picked', group: 'Lifecycle', defaultVisible: true, minWidth: 90 }, { key: 'delivered', label: 'Delivered', group: 'Lifecycle', defaultVisible: true, minWidth: 90 }, { key: 'cancelled', label: 'Cancelled', group: 'Lifecycle', defaultVisible: false, minWidth: 90 }, - { key: 'kms', label: 'Kms', group: 'Metrics', defaultVisible: true, width: 70, align: 'center' }, - { key: 'charges', label: 'Charges', group: 'Metrics', defaultVisible: true, width: 100, align: 'right' } + { key: 'kms', label: 'Kms', group: 'Metrics', defaultVisible: true, width: 70, align: 'center' } ]; const COLUMN_GROUPS = ['Core', 'Lifecycle', 'Metrics']; const COLUMN_DEFAULTS = ALL_COLUMNS.reduce((acc, c) => ({ ...acc, [c.key]: c.defaultVisible }), {}); @@ -1090,7 +1089,6 @@ export default function OrdersDetails() { {isVisible('delivered') && Delivered} {isVisible('cancelled') && Cancelled} {isVisible('kms') && Kms} - {isVisible('charges') && Charges} @@ -1315,21 +1313,6 @@ export default function OrdersDetails() { )} - {/* Charges */} - {isVisible('charges') && ( - - } - isMoney - /> - - )} ))} diff --git a/src/pages/nearle/reports/ridersummary.js b/src/pages/nearle/reports/ridersummary.js index 9edc4d1..7abf007 100644 --- a/src/pages/nearle/reports/ridersummary.js +++ b/src/pages/nearle/reports/ridersummary.js @@ -167,7 +167,6 @@ export default function RidersSummary() { const [enddate, setEnddate] = useState(dayjs().format('YYYY-MM-DD')); const [open, setOpen] = useState(false); const [datestatus, setDatestatus] = useState('Today'); - const [total, settotal] = useState(0); const [tenantData, setTenantData] = useState([]); const [openRow, setOpenRow] = useState(null); const [searchword, setSearchword] = useState(''); @@ -206,15 +205,6 @@ export default function RidersSummary() { queryFn: fetchRidersSummary }); - // ============================================= || calculate totals || ============================================= - useEffect(() => { - if (!rows) return; - let calculatedTotal = 0; - rows.forEach((row) => { - calculatedTotal += Number(row.Deliveryamt || row.deliveryamt || 0); - }); - settotal(calculatedTotal); - }, [rows]); // ============================================= || fetchTenantSummary (per rider) || ============================================= const fetchTenantSummary = async (riderUserid) => { @@ -611,7 +601,6 @@ export default function RidersSummary() { Delivered Kms COD / PLA - Charges Action @@ -621,7 +610,7 @@ export default function RidersSummary() { filteredRows.length === 0 && Array.from({ length: 10 }).map((_, idx) => ( - {Array.from({ length: 16 }).map((__, ci) => ( + {Array.from({ length: 15 }).map((__, ci) => ( @@ -631,7 +620,7 @@ export default function RidersSummary() { {!isLoadingReports && filteredRows.length === 0 && ( - + - - - - } isMoney /> - - - - - + @@ -860,7 +841,6 @@ export default function RidersSummary() { Cancelled Kms COD / PLA - Amount @@ -921,14 +901,11 @@ export default function RidersSummary() { - - } isMoney /> - )) ) : ( - + @@ -954,40 +931,6 @@ export default function RidersSummary() { - - - {/* ===================== || Footer total strip || ===================== */} - {filteredRows.length > 0 && ( - - - Total Amount ยท {formatNumberToRupees(total)} - - - )} {/* ============================================= || Date Filter Dialog || ============================================= */}