feat: add status field to delivery requests and shipments, and update date picker for time selection

RabbitDaCoder · RabbitDaCoder · commit 84ca766fe9c0 · 2025-09-05T08:08:04.000-06:00
diff --git a/api/app.js b/api/app.js
@@ -33,18 +33,7 @@ app.use(
       "X-Requested-With",
       "x-request-timeout",
       "X-Request-Timeout",
-      "Access-Control-Allow-Headers",
-      "Access-Control-Allow-Origin",
-      "Cache-Control",
-      "Pragma",
-      "X-HTTP-Method-Override",
-      "X-Forwarded-For",
-      "X-Real-IP",
-      "User-Agent",
-      "Referer",
     ],
-    exposedHeaders: ["Content-Length", "Content-Type"],
-    maxAge: 86400, // 24 hours
   })
 );
 
@@ -59,25 +48,6 @@ const publicLimiter = rateLimit({
 
 app.use("/api", publicLimiter);
 
-// Specific handler for deliveries preflight (must come before general options handler)
-app.options("/api/deliveries", (req, res) => {
-  res.header("Access-Control-Allow-Origin", req.headers.origin || "*");
-  res.header(
-    "Access-Control-Allow-Methods",
-    "GET,POST,PUT,DELETE,PATCH,OPTIONS"
-  );
-  res.header(
-    "Access-Control-Allow-Headers",
-    "Content-Type,Authorization,Accept,Origin,X-Requested-With,x-request-timeout,X-Request-Timeout,Access-Control-Allow-Headers,Access-Control-Allow-Origin,Cache-Control,Pragma,X-HTTP-Method-Override,X-Forwarded-For,X-Real-IP,User-Agent,Referer"
-  );
-  res.header("Access-Control-Allow-Credentials", "true");
-  res.header("Access-Control-Max-Age", "86400");
-  res.sendStatus(204); // Use 204 No Content for preflight
-});
-
-// Handle preflight requests (general fallback)
-app.options("*", cors());
-
 app.use("/api/auth", authRoutes);
 app.use("/api/deliveries", deliveryRoutes);
 app.use("/api/invoices", invoiceRoutes);
diff --git a/client/src/Admin/pages/CreateDelivery.tsx b/client/src/Admin/pages/CreateDelivery.tsx
@@ -42,6 +42,7 @@ interface DeliveryRequest {
   dateSent: string;
   deliveryDate: string;
   checkEmail: boolean;
+  status: string; // Add status field
 }
 
 interface DeliveryResponse {
@@ -76,6 +77,7 @@ interface ShipmentData {
     weight: number;
     value: number;
   }>;
+  status: string;
   deliveryFee: number;
   currency: { code: string; symbol: string; name: string };
   checkEmail: boolean;
@@ -158,6 +160,7 @@ const CreateDelivery = () => {
         ? new Date(data.deliveryDate).toISOString()
         : new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
       checkEmail: Boolean(data.checkEmail),
+      status: data.status || "Pending", // Include status from form
     };
   };
 
@@ -181,7 +184,6 @@ const CreateDelivery = () => {
         method: "POST",
         headers: {
           Authorization: `Bearer ${token}`,
-          "X-Request-Timeout": "60000", // Indicate we expect a longer processing time
         },
         data: requestData,
       });
diff --git a/client/src/components/EditShipmentForm.tsx b/client/src/components/EditShipmentForm.tsx
@@ -353,6 +353,7 @@ const EditShipmentForm: React.FC<ShipmentFormProps> = ({
               onChange={(newValue) =>
                 setFormData((prev) => ({ ...prev, pickupDate: newValue }))
               }
+              allowTimeSelection={true} // Allow both date and time selection
             />
           </div>
 
@@ -365,6 +366,7 @@ const EditShipmentForm: React.FC<ShipmentFormProps> = ({
               onChange={(newValue) =>
                 setFormData((prev) => ({ ...prev, deliveryDate: newValue }))
               }
+              allowTimeSelection={true} // Allow both date and time selection
             />
           </div>
         </div>
diff --git a/client/src/components/ShipmentForm.tsx b/client/src/components/ShipmentForm.tsx
@@ -365,6 +365,7 @@ const ShipmentForm: React.FC<ShipmentFormProps> = ({
               onChange={(newValue) =>
                 setFormData((prev) => ({ ...prev, pickupDate: newValue }))
               }
+              allowTimeSelection={false} // Date-only for pickup
             />
           </div>
 
@@ -377,6 +378,7 @@ const ShipmentForm: React.FC<ShipmentFormProps> = ({
               onChange={(newValue) =>
                 setFormData((prev) => ({ ...prev, deliveryDate: newValue }))
               }
+              allowTimeSelection={false} // Date-only for delivery
             />
           </div>
         </div>
diff --git a/client/src/components/date-time.tsx b/client/src/components/date-time.tsx
@@ -10,11 +10,13 @@ import { CalendarIcon } from "lucide-react";
 interface DatePickerDemoProps {
   value: string; // ISO string from formData
   onChange: (value: string) => void; // callback to update formData
+  allowTimeSelection?: boolean; // Make time selection optional
 }
 
 export default function DatePickerDemo({
   value,
   onChange,
+  allowTimeSelection = true, // Default to true for backward compatibility
 }: DatePickerDemoProps) {
   const today = new Date();
   const [date, setDate] = useState<Date | undefined>(
@@ -72,8 +74,16 @@ export default function DatePickerDemo({
   const handleDateSelect = (newDate: Date | undefined) => {
     if (!newDate) return;
     setDate(newDate);
-    setTime(undefined);
 
+    if (!allowTimeSelection) {
+      // If time selection is not allowed, use start of day
+      const dateOnly = new Date(newDate);
+      dateOnly.setHours(0, 0, 0, 0);
+      onChange(dateOnly.toISOString());
+      return;
+    }
+
+    setTime(undefined);
     // Reset time in formData if time was previously set
     if (value) onChange("");
   };
@@ -91,11 +101,12 @@ export default function DatePickerDemo({
             <CalendarIcon className="mr-2 h-4 w-4" />
             {date ? (
               <span className="text-zinc-900 dark:text-white">
-                {format(date, "PPP")} {time ? ` - ${time}` : ""}
+                {format(date, "PPP")}{" "}
+                {allowTimeSelection && time ? ` - ${time}` : ""}
               </span>
             ) : (
               <span className="text-zinc-500 dark:text-zinc-400">
-                Pick a date and time
+                {allowTimeSelection ? "Pick a date and time" : "Pick a date"}
               </span>
             )}
           </Button>
@@ -113,37 +124,39 @@ export default function DatePickerDemo({
             className="p-2 sm:pe-5"
             disabled={[{ before: today }]}
           />
-          <div className="relative w-full max-sm:h-48 sm:w-40">
-            <div className="absolute inset-0 py-4 max-sm:border-t border-zinc-200 dark:border-zinc-700">
-              <ScrollArea className="h-full sm:border-s border-zinc-200 dark:border-zinc-700">
-                <div className="space-y-3">
-                  <div className="flex h-5 shrink-0 items-center px-5">
-                    <p className="text-sm font-medium text-zinc-900 dark:text-white">
-                      {date ? format(date, "EEEE, d") : "Pick a date"}
-                    </p>
-                  </div>
-                  <div className="grid gap-1.5 px-5 max-sm:grid-cols-2">
-                    {timeSlots.map(({ time: timeSlot, available }) => (
-                      <Button
-                        key={timeSlot}
-                        variant={time === timeSlot ? "primary" : "outline"}
-                        size="sm"
-                        className={`w-full ${
-                          time === timeSlot
-                            ? "bg-blue-600 text-white hover:bg-blue-700"
-                            : "bg-transparent border-zinc-300 dark:border-zinc-600 text-zinc-900 dark:text-white hover:bg-zinc-100 dark:hover:bg-zinc-700"
-                        }`}
-                        onClick={() => handleTimeSelect(timeSlot)}
-                        disabled={!available}
-                      >
-                        {timeSlot}
-                      </Button>
-                    ))}
+          {allowTimeSelection && (
+            <div className="relative w-full max-sm:h-48 sm:w-40">
+              <div className="absolute inset-0 py-4 max-sm:border-t border-zinc-200 dark:border-zinc-700">
+                <ScrollArea className="h-full sm:border-s border-zinc-200 dark:border-zinc-700">
+                  <div className="space-y-3">
+                    <div className="flex h-5 shrink-0 items-center px-5">
+                      <p className="text-sm font-medium text-zinc-900 dark:text-white">
+                        {date ? format(date, "EEEE, d") : "Pick a date"}
+                      </p>
+                    </div>
+                    <div className="grid gap-1.5 px-5 max-sm:grid-cols-2">
+                      {timeSlots.map(({ time: timeSlot, available }) => (
+                        <Button
+                          key={timeSlot}
+                          variant={time === timeSlot ? "primary" : "outline"}
+                          size="sm"
+                          className={`w-full ${
+                            time === timeSlot
+                              ? "bg-blue-600 text-white hover:bg-blue-700"
+                              : "bg-transparent border-zinc-300 dark:border-zinc-600 text-zinc-900 dark:text-white hover:bg-zinc-100 dark:hover:bg-zinc-700"
+                          }`}
+                          onClick={() => handleTimeSelect(timeSlot)}
+                          disabled={!available}
+                        >
+                          {timeSlot}
+                        </Button>
+                      ))}
+                    </div>
                   </div>
-                </div>
-              </ScrollArea>
+                </ScrollArea>
+              </div>
             </div>
-          </div>
+          )}
         </div>
       </PopoverContent>
     </Popover>
diff --git a/client/src/services/api.ts b/client/src/services/api.ts
@@ -33,7 +33,7 @@ const tokenManager = {
 // --- Axios Instance ---
 export const api = axios.create({
   baseURL: BASE_URL,
-  timeout: 60000, // Increased to 60 seconds for delivery creation with PDF/email
+  timeout: 60000, // 60 seconds for delivery creation with PDF/email
   headers: {
     "Content-Type": "application/json",
     Accept: "application/json",
@@ -65,9 +65,7 @@ api.interceptors.request.use(
       config.headers?.set?.("Authorization", `Bearer ${token}`);
 
       // Or fallback for older Axios (still safe)
-      (config.headers as Record<string, string>)[
-        "Authorization"
-      ] = `Bearer ${token}`;
+      (config.headers as any)["Authorization"] = `Bearer ${token}`;
     }
     return config;
   },

Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,7 @@ const EditShipmentForm: React.FC<ShipmentFormProps> = ({`
`353`	`353`	`onChange={(newValue) =>`
`354`	`354`	`setFormData((prev) => ({ ...prev, pickupDate: newValue }))`
`355`	`355`	`}`
	`356`	`+ allowTimeSelection={true} // Allow both date and time selection`
`356`	`357`	`/>`
`357`	`358`	`</div>`
`358`	`359`
`@@ -365,6 +366,7 @@ const EditShipmentForm: React.FC<ShipmentFormProps> = ({`
`365`	`366`	`onChange={(newValue) =>`
`366`	`367`	`setFormData((prev) => ({ ...prev, deliveryDate: newValue }))`
`367`	`368`	`}`
	`369`	`+ allowTimeSelection={true} // Allow both date and time selection`
`368`	`370`	`/>`
`369`	`371`	`</div>`
`370`	`372`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,7 @@ const ShipmentForm: React.FC<ShipmentFormProps> = ({`
`365`	`365`	`onChange={(newValue) =>`
`366`	`366`	`setFormData((prev) => ({ ...prev, pickupDate: newValue }))`
`367`	`367`	`}`
	`368`	`+ allowTimeSelection={false} // Date-only for pickup`
`368`	`369`	`/>`
`369`	`370`	`</div>`
`370`	`371`
`@@ -377,6 +378,7 @@ const ShipmentForm: React.FC<ShipmentFormProps> = ({`
`377`	`378`	`onChange={(newValue) =>`
`378`	`379`	`setFormData((prev) => ({ ...prev, deliveryDate: newValue }))`
`379`	`380`	`}`
	`381`	`+ allowTimeSelection={false} // Date-only for delivery`
`380`	`382`	`/>`
`381`	`383`	`</div>`
`382`	`384`	`</div>`