@infuro/cms-core 1.0.63 → 1.0.65

package/dist/admin.cjs

@@ -895,7 +895,7 @@ var init_admin_config_context = __esm({
 var CMS_VERSION;
 var init_cms_version = __esm({
   "src/lib/cms-version.ts"() {
-    CMS_VERSION = "1.0.63" ;
+    CMS_VERSION = "1.0.65" ;
   }
 });
 function useCatalogCategories(enabled = true) {
@@ -16352,99 +16352,140 @@ var init_order_notification_bindings_shared = __esm({
       "refundAmount",
       "invoiceNumber",
       "invoiceAttachment",
-      "orderDetails"
+      "orderDetails",
+      "assigneeName",
+      "assigneePhone",
+      "timeSlot",
+      "serviceDate",
+      "taskDescription",
+      "customerAddress"
     ];
     __name(useNotificationVariables, "useNotificationVariables");
     ORDER_NOTIFICATION_EVENT_TRIGGERS = [
       {
-        key: "order_pending",
-        label: "Order Pending",
-        description: "When an order is created and pending confirmation or payment"
+        key: "order_placed",
+        label: "Order placed",
+        description: "Fires when a new order is created (storefront checkout or admin)."
       },
       {
-        key: "order_processing",
-        label: "Order Processing",
-        description: "When an order is assigned and starts processing"
+        key: "order_pending",
+        label: "Order pending",
+        description: "Fires when an order is in pending status (awaiting payment or review)."
       },
       {
-        key: "order_completed",
-        label: "Order Completed",
-        description: "When an order is verified with OTP and completed"
+        key: "order_assigned",
+        label: "Order assigned (Customer)",
+        description: "Fires when a teammate is assigned to the order (notifies customer with assignee details and scheduled time slot)."
       },
       {
-        key: "order_placed",
-        label: "Order Placed / Confirmed",
-        description: "When a new order is created or confirmed"
+        key: "order_assigned_assignee",
+        label: "Task assigned (Assignee)",
+        description: "Fires when a task is assigned to a teammate (notifies assignee with task description and customer details)."
       },
       {
         key: "order_cancelled",
-        label: "Order Cancelled",
-        description: "When an order is cancelled"
+        label: "Order cancelled",
+        description: "Fires when an order is cancelled (includes refund amount when applicable)."
+      },
+      {
+        key: "order_processing",
+        label: "Order processing",
+        description: "Fires when an order status changes to processing."
       },
       {
         key: "payment_success",
-        label: "Payment Success",
-        description: "When order payment status is paid"
+        label: "Payment success",
+        description: "Fires when order is placed and payment status is paid."
+      },
+      {
+        key: "order_completed",
+        label: "Order completed",
+        description: "Fires when an order status changes to completed / fulfilled."
       },
       {
         key: "payment_failed",
-        label: "Payment Failed",
-        description: "When payment status is unpaid or failed"
+        label: "Payment failed",
+        description: "Fires when payment status is pending, unpaid, or failed, or when order is cancelled without payment."
       },
       {
         key: "payment_refund_initiated",
-        label: "Payment Refund Initiated",
-        description: "When refund is initiated for cancelled order"
+        label: "Payment refund initiated",
+        description: "Fires when order is cancelled and its payment status is paid (refund initiated)."
       }
     ];
     EMAIL_TRIGGER_DEFAULTS = {
-      order_pending: {
-        subject: "Your order {{orderNumber}} is pending",
-        subjectPlaceholder: "e.g. Your order {{orderNumber}} is pending",
+      order_placed: {
+        subject: "Your order {{orderNumber}} is confirmed",
+        subjectPlaceholder: "e.g. Your order {{orderNumber}} is confirmed",
         body: `Hi {{customerName}},
 
-Thank you for your order {{orderNumber}}! It is currently pending confirmation.
-
-Order Total: {{total}} {{currency}}
+Thank you for your order! Your order {{orderNumber}} for {{total}} {{currency}} has been confirmed.
 
 Order Details:
-{{orderDetails}}`,
-        bodyPlaceholder: "Hi {{customerName}},\n\nYour order {{orderNumber}} is pending."
-      },
-      order_processing: {
-        subject: "Your order {{orderNumber}} is now processing",
-        subjectPlaceholder: "e.g. Your order {{orderNumber}} is now processing",
-        body: `Hi {{customerName}},
+{{orderDetails}}
 
-Your order {{orderNumber}} is now being processed by our team.
+Your Tax Invoice PDF is attached to this email for your records.
 
-Vendor: {{vendorName}}`,
-        bodyPlaceholder: "Hi {{customerName}},\n\nYour order {{orderNumber}} is processing."
+Thank you!`,
+        bodyPlaceholder: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} is confirmed.\n\nThank you!"
       },
-      order_completed: {
-        subject: "Your order {{orderNumber}} has been completed",
-        subjectPlaceholder: "e.g. Your order {{orderNumber}} has been completed",
+      order_pending: {
+        subject: "Your order {{orderNumber}} is Pending",
+        subjectPlaceholder: "e.g. Your order {{orderNumber}} is Pending",
         body: `Hi {{customerName}},
 
-Your order {{orderNumber}} has been successfully completed! Thank you for choosing us.
+Your order {{orderNumber}} for {{total}} {{currency}} is currently pending.
 
-Invoice: {{invoiceNumber}}`,
-        bodyPlaceholder: "Hi {{customerName}},\n\nYour order {{orderNumber}} is completed."
+Order Details:
+{{orderDetails}}
+
+We will update you as soon as your order status changes.
+
+Thank you!`,
+        bodyPlaceholder: "Hi {{customerName}},\n\nYour order {{orderNumber}} is pending."
       },
-      order_placed: {
-        subject: "Your order {{orderNumber}} is confirmed",
-        subjectPlaceholder: "e.g. Your order {{orderNumber}} is confirmed",
+      order_assigned: {
+        subject: "Your service expert has been assigned for order {{orderNumber}}",
+        subjectPlaceholder: "e.g. Your service expert has been assigned for order {{orderNumber}}",
         body: `Hi {{customerName}},
 
-Thank you for your order! Your order {{orderNumber}} for {{total}} {{currency}} has been confirmed.
+A service expert has been assigned to your order {{orderNumber}}.
+
+Assignee Details:
+\u2022 Name: {{assigneeName}}
+\u2022 Phone: {{assigneePhone}}
+
+Your expert will reach you by your scheduled time slot:
+\u2022 Date: {{serviceDate}}
+\u2022 Slot: {{timeSlot}}
 
 Order Details:
 {{orderDetails}}
 
-Your Tax Invoice PDF is attached to this email for your records.
-
 Thank you!`,
-        bodyPlaceholder: "Hi {{customerName}},\n\nYour order {{orderNumber}} for {{total}} {{currency}} is confirmed.\n\nThank you!"
+        bodyPlaceholder: "Hi {{customerName}},\n\nAn expert has been assigned for order {{orderNumber}}."
+      },
+      order_assigned_assignee: {
+        subject: "New task assigned: Order {{orderNumber}}",
+        subjectPlaceholder: "e.g. New task assigned: Order {{orderNumber}}",
+        body: `Hi {{assigneeName}},
+
+A new task has been assigned to you for order {{orderNumber}}.
+
+Task Details:
+{{taskDescription}}
+
+Customer Details:
+\u2022 Name: {{customerName}}
+\u2022 Phone: {{customerPhone}}
+\u2022 Address: {{customerAddress}}
+
+Schedule:
+\u2022 Date: {{serviceDate}}
+\u2022 Slot: {{timeSlot}}
+
+Please arrive promptly within the scheduled time slot.`,
+        bodyPlaceholder: "Hi {{assigneeName}},\n\nA new task {{orderNumber}} has been assigned to you."
       },
       order_cancelled: {
         subject: "Your order {{orderNumber}} has been cancelled",
@@ -16460,6 +16501,21 @@ If you have any questions, please contact us.
 Thank you!`,
         bodyPlaceholder: "Hi {{customerName}},\n\nYour order {{orderNumber}} has been cancelled.\n\nIf a refund is due, it will be returned to your original payment method."
       },
+      order_processing: {
+        subject: "Your order {{orderNumber}} is now Processing",
+        subjectPlaceholder: "e.g. Your order {{orderNumber}} is now Processing",
+        body: `Hi {{customerName}},
+
+Your order {{orderNumber}} for {{total}} {{currency}} is currently being processed.
+
+Order Details:
+{{orderDetails}}
+
+We will notify you once it is completed.
+
+Thank you!`,
+        bodyPlaceholder: "Hi {{customerName}},\n\nYour order {{orderNumber}} is processing."
+      },
       payment_success: {
         subject: "Payment Successful for Order {{orderNumber}}",
         subjectPlaceholder: "e.g. Payment Successful for Order {{orderNumber}}",
@@ -16473,6 +16529,19 @@ Order Details:
 Thank you!`,
         bodyPlaceholder: "Hi {{customerName}},\n\nPayment for order {{orderNumber}} was successful.\n\nThank you!"
       },
+      order_completed: {
+        subject: "Your order {{orderNumber}} is Completed",
+        subjectPlaceholder: "e.g. Your order {{orderNumber}} is Completed",
+        body: `Hi {{customerName}},
+
+Your order {{orderNumber}} for {{total}} {{currency}} has been completed.
+
+Order Details:
+{{orderDetails}}
+
+Thank you for choosing us!`,
+        bodyPlaceholder: "Hi {{customerName}},\n\nYour order {{orderNumber}} is completed."
+      },
       payment_failed: {
         subject: "Payment Failed for Order {{orderNumber}}",
         subjectPlaceholder: "e.g. Payment Failed for Order {{orderNumber}}",
@@ -17405,7 +17474,13 @@ var init_emailTriggersBindingsPage = __esm({
       refundAmount: "Refund amount (refund triggers)",
       invoiceNumber: "Generated invoice number",
       invoiceAttachment: "Include this variable to attach Tax Invoice PDF to email",
-      orderDetails: "Formatted item details summary"
+      orderDetails: "Formatted item details summary",
+      assigneeName: "Name of assigned teammate / technician",
+      assigneePhone: "Phone number of assigned teammate",
+      timeSlot: "Scheduled service slot / arrival window",
+      serviceDate: "Scheduled service / booking date",
+      taskDescription: "Task summary / service details for assignee",
+      customerAddress: "Full service or delivery address"
     };
     __name(EmailTriggerBindings, "EmailTriggerBindings");
     __name(TriggerEmailEditor, "TriggerEmailEditor");
@@ -17712,7 +17787,13 @@ var init_pushTriggersBindingsPage = __esm({
       refundAmount: "Refund amount (refund triggers)",
       invoiceNumber: "Generated invoice number",
       invoiceAttachment: "Include this variable to attach Tax Invoice PDF to email",
-      orderDetails: "Formatted item details summary"
+      orderDetails: "Formatted item details summary",
+      assigneeName: "Name of assigned teammate / technician",
+      assigneePhone: "Phone number of assigned teammate",
+      timeSlot: "Scheduled service slot / arrival window",
+      serviceDate: "Scheduled service / booking date",
+      taskDescription: "Task summary / service details for assignee",
+      customerAddress: "Full service or delivery address"
     };
     __name(PushTriggerBindings, "PushTriggerBindings");
   }
@@ -20879,14 +20960,14 @@ function PluginSettingsPanel({ descriptor, onSaved }) {
       placeholder: "e.g. crm@example.com"
     }), /* @__PURE__ */ React.createElement("p", {
       className: "text-xs text-gray-500 dark:text-gray-400"
-    }, "Layout below merges with Branding and Store settings. Upload a logo here (or in Settings \u2192 Store \u2192 Company Logo) \u2014 email uses that image in the header. Prefer a publicly reachable URL in production."), /* @__PURE__ */ React.createElement("div", {
+    }, "Email header/footer use ", /* @__PURE__ */ React.createElement("strong", null, "Settings \u2192 Store \u2192 Invoice Header & Store Details"), " (logo, company name, email, phone, address). Social links and disclaimer below are email-only extras."), /* @__PURE__ */ React.createElement("div", {
       className: "space-y-1"
     }, /* @__PURE__ */ React.createElement(ImageOrUrlField, {
-      label: "Email logo (upload or URL)",
+      label: "Email logo override (optional)",
       value: logoUrl,
       onChange: setLogoUrl,
       previewVariant: "logo",
-      placeholder: "Upload image or paste https://\u2026",
+      placeholder: "Leave empty to use Store company logo",
       inputClassName: "h-8 text-sm w-full rounded-md border border-input bg-background px-3"
     })), /* @__PURE__ */ React.createElement("div", {
       className: "space-y-1"
@@ -24616,7 +24697,8 @@ function OrderDetailPage({ orderId }) {
   __name(handleRepostToErp, "handleRepostToErp");
   async function handleStartProcessing() {
     if (!order || startingProcessing) return;
-    if (!order.assignedUserId && !order.assignedUser) {
+    const currentAssigneeId = order.assignedUserId ?? order.assignedUser?.id ?? null;
+    if (!currentAssigneeId) {
       sonner.toast.info("Please assign a teammate before starting order processing.");
       handleOpenAssignModal();
       return;
@@ -24629,7 +24711,8 @@ function OrderDetailPage({ orderId }) {
           "Content-Type": "application/json"
         },
         body: JSON.stringify({
-          status: "processing"
+          status: "processing",
+          assignedUserId: currentAssigneeId
         })
       });
       const data = await res.json().catch(() => ({}));
@@ -24668,13 +24751,9 @@ function OrderDetailPage({ orderId }) {
     if (!order) return;
     setSavingAssignee(true);
     try {
-      const isConfirmedOrPending = order.status === "confirmed" || order.status === "pending";
       const bodyPayload = {
         assignedUserId: selectedAssigneeId
       };
-      if (selectedAssigneeId && isConfirmedOrPending) {
-        bodyPayload.status = "processing";
-      }
       const res = await fetch(`/api/orders/${orderId}`, {
         method: "PUT",
         headers: {
@@ -24690,7 +24769,7 @@ function OrderDetailPage({ orderId }) {
       const updated = await fetch(`/api/orders/${orderId}`);
       if (updated.ok) setOrder(await updated.json());
       setAssignModalOpen(false);
-      sonner.toast.success(selectedAssigneeId && isConfirmedOrPending ? "Order assigned and moved to processing" : selectedAssigneeId ? "Order assigned successfully" : "Assignee removed");
+      sonner.toast.success(selectedAssigneeId ? "Order assigned successfully" : "Assignee removed");
     } catch {
       sonner.toast.error("Failed to update assignee");
     } finally {
@@ -26110,6 +26189,7 @@ function OrderPlacementPage({ editOrderId }) {
   const [orderDate, setOrderDate] = React27.useState(() => (/* @__PURE__ */ new Date()).toISOString().slice(0, 10));
   const [bookingDate, setBookingDate] = React27.useState("");
   const [slot, setSlot] = React27.useState("");
+  const [slotOptions, setSlotOptions] = React27.useState([]);
   const [orderMetadata, setOrderMetadata] = React27.useState({});
   const [loadingOrder, setLoadingOrder] = React27.useState(Boolean(editOrderId));
   const [orderLoadError, setOrderLoadError] = React27.useState(null);
@@ -26146,6 +26226,33 @@ function OrderPlacementPage({ editOrderId }) {
     billingAddress,
     sameAsBilling
   ]);
+  React27.useEffect(() => {
+    let cancelled = false;
+    void (async () => {
+      try {
+        const res = await fetch("/api/admin/serviceable-areas", {
+          credentials: "include"
+        });
+        if (!res.ok || cancelled) return;
+        const json = await res.json();
+        const cfg = json?.config;
+        const times = Array.isArray(cfg?.slots) ? cfg.slots : [];
+        const extras = cfg?.serviceSlots && typeof cfg.serviceSlots === "object" ? Object.values(cfg.serviceSlots).flat() : [];
+        const combined = [
+          ...times,
+          ...extras
+        ].map((s) => String(s ?? "").trim()).filter(Boolean);
+        const unique = Array.from(new Set(combined));
+        if (!cancelled && unique.length > 0) {
+          setSlotOptions(unique);
+        }
+      } catch {
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, []);
   React27.useEffect(() => {
     if (editOrderId) return;
     fetch("/api/settings/store").then((r) => r.ok ? r.json() : {}).then((data) => {
@@ -26996,6 +27103,9 @@ function OrderPlacementPage({ editOrderId }) {
         payload.accountCustomerId = selectedCustomerId;
       }
       if (coupons.length > 0) payload.discountId = coupons[0].discountId;
+      if (!editOrderId && orderDate) {
+        payload.createdAt = `${orderDate}T06:30:00.000Z`;
+      }
       const url = editOrderId ? `/api/orders/${editOrderId}` : "/api/orders";
       const method = editOrderId ? "PUT" : "POST";
       const res = await fetch(url, {
@@ -27421,10 +27531,18 @@ function OrderPlacementPage({ editOrderId }) {
     htmlFor: "service-slot"
   }, "Slot"), /* @__PURE__ */ React.createElement(Input, {
     id: "service-slot",
+    list: "admin-booking-slot-options",
     value: slot,
     onChange: /* @__PURE__ */ __name((e) => setSlot(e.target.value), "onChange"),
-    placeholder: "e.g. 10:00 AM - 01:00 PM"
-  })), /* @__PURE__ */ React.createElement("div", {
+    placeholder: "Pick or type, e.g. 11:00 AM"
+  }), /* @__PURE__ */ React.createElement("datalist", {
+    id: "admin-booking-slot-options"
+  }, slotOptions.map((t) => /* @__PURE__ */ React.createElement("option", {
+    key: t,
+    value: t
+  }))), /* @__PURE__ */ React.createElement("p", {
+    className: "text-[11px] text-gray-500"
+  }, "Select a configured slot or type a custom time.")), /* @__PURE__ */ React.createElement("div", {
     className: "space-y-2 sm:col-span-1"
   }, /* @__PURE__ */ React.createElement(Label3, {
     htmlFor: "service-date"