+ );
+}
+
+ControlXDatePicker.propTypes = {
+ value: PropTypes.oneOfType([
+ PropTypes.string,
+ PropTypes.shape({
+ from: PropTypes.string,
+ to: PropTypes.string,
+ }),
+ ]),
+ onChange: PropTypes.func.isRequired,
+ range: PropTypes.bool,
+ maxDate: PropTypes.string,
+ className: PropTypes.string,
+ align: PropTypes.oneOf(['left', 'right']),
+};
diff --git a/src/components/doormile/RtoDialogs.jsx b/src/components/doormile/RtoDialogs.jsx
index 84a7db5..272e5ab 100644
--- a/src/components/doormile/RtoDialogs.jsx
+++ b/src/components/doormile/RtoDialogs.jsx
@@ -1,31 +1,89 @@
import React, { useEffect, useState } from 'react';
+import dayjs from 'dayjs';
import { PackageCheck, RotateCcw, Undo2 } from 'lucide-react';
import { Alert, Button, Field, Modal, Textarea } from '@/components/ds';
import { inputVariants } from '@/components/ui/input';
import { RTO_REASONS } from '@/api/doormile/endpoints';
import { useCancelRto, useCompleteRto, useInitiateRto } from '@/lib/doormileHooks';
+import { isPerishableCategory } from '@/lib/clientOnboarding';
/**
* Reverse logistics (RTO) dialogs, shared by Deliveries, Returns and
* Exceptions. Plan: docs/reverse-logistics-plan.md.
*
- * A return can start while the parcel is in a rider's hands or at a base; the
- * backend refuses anything else (delivered, cancelled, already returning) and
- * its message is shown in the dialog. Every action needs the CONSIGNMENT id —
- * a booking that has not been picked up has no parcel to return yet.
+ * A return can start:
+ * 1. While the parcel is in transit or at a base (in-transit RTO).
+ * 2. Within a 7-day post-delivery window (Amazon-style customer return).
+ * After 7 days from delivery, the return capability is automatically expired/hidden.
+ *
+ * Food items, meat items, and fresh produce CANNOT be returned.
+ * Products like steel, electronics, and clothing CAN be returned.
*/
-/** Delivery-list statuses (queries.js) a return can be started from. */
+/** Delivery-list statuses (queries.js) an in-transit return can be started from. */
export const RTO_STARTABLE = ['picked', 'active', 'skipped'];
-/** What a row may do, from its delivery-list status. */
+/** Amazon-style return window in days for delivered parcels */
+export const RETURN_WINDOW_DAYS = 7;
+
+/** Returns the age of delivery in days (fractional) */
+export function getDeliveryAgeDays(deliveredAt) {
+ if (!deliveredAt) return null;
+ const d = dayjs(deliveredAt);
+ if (!d.isValid()) return null;
+ const diffHours = dayjs().diff(d, 'hour', true);
+ return Math.max(0, diffHours / 24);
+}
+
+/** What a row may do, from its delivery-list status and category. */
export function rtoActionsFor(row) {
const status = String(row?.orderstatus || '').toLowerCase();
const hasParcel = row?.consignmentid != null && row?.consignmentid !== '';
- return {
- canStart: hasParcel && RTO_STARTABLE.includes(status),
- canResolve: hasParcel && status === 'rto',
- };
+ if (!hasParcel) {
+ return { canStart: false, canResolve: false, windowExpired: false, isPostDelivery: false };
+ }
+
+ // 1. Food items, meat items, and fresh produce do NOT have return options.
+ // Durable products like steel, electronics, clothing, etc. DO have return options.
+ const category = row?.deliverycategory || row?.itemcategory || row?.tenantcategory;
+ const isPerishable =
+ isPerishableCategory(category) ||
+ row?.reverselogisticsenabled === false ||
+ (Array.isArray(row?.parcels) &&
+ row.parcels.some((p) => isPerishableCategory(p?.itemcategory || p?.itemdescription)));
+
+ if (isPerishable) {
+ return { canStart: false, canResolve: false, windowExpired: false, isPostDelivery: false, isPerishable: true };
+ }
+
+ // Active / in-transit RTO (for returnable goods)
+ if (RTO_STARTABLE.includes(status)) {
+ return { canStart: true, canResolve: false, windowExpired: false, isPostDelivery: false };
+ }
+
+ // Active return being processed
+ if (status === 'rto') {
+ return { canStart: false, canResolve: true, windowExpired: false, isPostDelivery: false };
+ }
+
+ // Delivered: Amazon 7-day post-delivery reverse logistics window
+ if (status === 'delivered') {
+ const deliveryTimestamp = row?.deliveredat || row?.deliverydate || row?.updatedat || row?.assigntime;
+ const ageDays = getDeliveryAgeDays(deliveryTimestamp);
+ // If delivery timestamp is available, enforce age <= 7 days (168 hours).
+ // If ageDays > 7 days, the window is expired -> hide the return icon!
+ const isEligible = ageDays != null ? ageDays <= RETURN_WINDOW_DAYS : true;
+ const daysLeft = ageDays != null ? Math.max(0, Math.ceil(RETURN_WINDOW_DAYS - ageDays)) : RETURN_WINDOW_DAYS;
+ return {
+ canStart: isEligible,
+ canResolve: false,
+ windowExpired: !isEligible,
+ daysRemaining: daysLeft,
+ isPostDelivery: true,
+ };
+ }
+
+ return { canStart: false, canResolve: false, windowExpired: false, isPostDelivery: false };
}
const errorText = (err, fallback) => err?.response?.data?.message || err?.message || fallback;
@@ -34,13 +92,16 @@ const errorText = (err, fallback) => err?.response?.data?.message || err?.messag
const subtitleFor = (row) =>
row ? row.label || `Order ${row.orderid ?? row.trackingno ?? row.consignmentid}` : undefined;
-/** Start a return to sender. `row` needs `consignmentid` and an order label. */
+/** Start a return to sender or customer return. `row` needs `consignmentid` and an order label. */
export function StartRtoModal({ row, onClose }) {
const start = useInitiateRto();
const [reason, setReason] = useState('');
const [note, setNote] = useState('');
const [error, setError] = useState('');
+ const isPostDelivery = String(row?.orderstatus || '').toLowerCase() === 'delivered';
+ const actions = rtoActionsFor(row);
+
// `row.defaultReason` pre-selects a reason (e.g. from an exception's type).
useEffect(() => {
setReason(row?.defaultReason || '');
@@ -70,17 +131,17 @@ export function StartRtoModal({ row, onClose }) {
!open && onClose()}
- title="Return to sender"
+ title={isPostDelivery ? "Customer return" : "Return to sender"}
description={subtitleFor(row)}
icon={Undo2}
busy={start.isPending}
footer={
<>
}
@@ -91,7 +152,9 @@ export function StartRtoModal({ row, onClose }) {
)}
- The parcel goes back to the sender's pickup point instead of being delivered. The rider is notified.
+ {isPostDelivery
+ ? `Initiate a customer return for this delivered order (within 7-day return window: ${actions.daysRemaining} days remaining). The parcel will be scheduled for return.`
+ : "The parcel goes back to the sender's pickup point instead of being delivered. The rider is notified."}