@evershop/evershop 2.1.0 → 2.1.1

package/dist/modules/oms/pages/admin/dashboard/Bestsellers.js.map

@@ -1 +1 @@
-{"version":3,"file":"Bestsellers.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/dashboard/Bestsellers.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAoB9E,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,WAAW,EACX,OAAO,EACU;IACjB,OAAO,CACL,oBAAC,IAAI,IACH,KAAK,EAAC,cAAc,EACpB,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,GAAG,EAAE;oBACb,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC;gBACjC,CAAC;aACF;SACF;QAED,oBAAC,IAAI,CAAC,OAAO;YACX,+BAAO,SAAS,EAAC,qBAAqB;gBACpC;oBACG,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,CAC3B;wBACE,4BAAI,KAAK,EAAC,MAAM,sDAEX;wBACL,oCAAU,CACP,CACN;oBACA,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;wBAAC,OAAA,CACzB,4BAAI,GAAG,EAAE,CAAC;4BACR;gCACE,6BAAK,SAAS,EAAC,oBAAoB;oCACjC,6BAAK,SAAS,EAAC,uCAAuC;wCACpD,6BAAK,SAAS,EAAC,8DAA8D;4CAC1E,CAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,GAAG,KAAI,CACf,oBAAC,KAAK,IACJ,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAChB,GAAG,EAAE,CAAC,CAAC,IAAI,EACX,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,EAAE,GACV,CACH;4CACA,CAAC,CAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,GAAG,CAAA,IAAI,CAChB,oBAAC,kBAAkB,IAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAI,CAC9C,CACG;wCACN;4CACE,2BACE,IAAI,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE,EACrB,SAAS,EAAC,+BAA+B,IAExC,CAAC,CAAC,IAAI,CACL,CACA,CACF,CACF,CACH;4BACL,+BAAM;4BACN,gCAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAM;4BAC/B;gCAAK,CAAC,CAAC,OAAO;wCAAW,CACtB,CACN,CAAA;qBAAA,CAAC,CACI,CACF,CACK,CACV,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,UAAU;IAClB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;CAkBpB,CAAC"}
+{"version":3,"file":"Bestsellers.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/dashboard/Bestsellers.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,UAAU,EACV,WAAW,EACX,eAAe,EACf,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EACL,KAAK,EACL,QAAQ,EACR,SAAS,EACT,SAAS,EACV,MAAM,gCAAgC,CAAC;AAoBxC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,WAAW,EACX,OAAO,EACU;IACjB,OAAO,CACL,oBAAC,IAAI;QACH,oBAAC,UAAU;YACT,oBAAC,SAAS,uBAAyB;YACnC,oBAAC,eAAe,0CAAkD;YAClE,oBAAC,UAAU;gBACT,2BAAG,IAAI,EAAE,OAAO,EAAE,SAAS,EAAC,sCAAsC,wBAE9D,CACO,CACF;QACb,oBAAC,WAAW;YACV,oBAAC,KAAK;gBACJ,oBAAC,SAAS;oBACP,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,CAC3B,oBAAC,QAAQ;wBACP,oBAAC,SAAS,IAAC,KAAK,EAAC,MAAM,sDAEX;wBACZ,oBAAC,SAAS,YAAc,CACf,CACZ;oBACA,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;wBAAC,OAAA,CACzB,oBAAC,QAAQ,IAAC,GAAG,EAAE,CAAC;4BACd,oBAAC,SAAS;gCACR,6BAAK,SAAS,EAAC,oBAAoB;oCACjC,6BAAK,SAAS,EAAC,uCAAuC;wCACpD,6BAAK,SAAS,EAAC,8DAA8D;4CAC1E,CAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,GAAG,KAAI,CACf,oBAAC,KAAK,IACJ,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAChB,GAAG,EAAE,CAAC,CAAC,IAAI,EACX,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,EAAE,GACV,CACH;4CACA,CAAC,CAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,GAAG,CAAA,IAAI,CAChB,oBAAC,kBAAkB,IAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAI,CAC9C,CACG;wCACN;4CACE,2BACE,IAAI,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE,EACrB,SAAS,EAAC,+BAA+B,IAExC,CAAC,CAAC,IAAI,CACL,CACA,CACF,CACF,CACI;4BACZ,oBAAC,SAAS,OAAG;4BACb,oBAAC,SAAS,QAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAa;4BAC7C,oBAAC,SAAS;gCAAE,CAAC,CAAC,OAAO;wCAAkB,CAC9B,CACZ,CAAA;qBAAA,CAAC,CACQ,CACN,CACI,CACT,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,UAAU;IAClB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;CAkBpB,CAAC"}

package/dist/modules/oms/pages/admin/dashboard/Lifetimesales.js

@@ -1,11 +1,26 @@
-import { Card } from '@components/admin/Card';
-import { Dot } from '@components/admin/Dot.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { toast } from 'react-toastify';
 import { Cell, Pie, PieChart, ResponsiveContainer } from 'recharts';
 import './Lifetimesales.scss';
 const COLORS = ['#aee9d1', '#fed3d1', '#a4e8f2'];
+const Dot = ({ variant }) => {
+    let bgColor = 'bg-gray-400';
+    if (variant === 'info') {
+        bgColor = 'bg-blue-400';
+    }
+    else if (variant === 'success') {
+        bgColor = 'bg-green-400';
+    }
+    else if (variant === 'critical') {
+        bgColor = 'bg-red-400';
+    }
+    return React.createElement("span", { className: `w-3 h-3 rounded-full ${bgColor} inline-block` });
+};
+Dot.propTypes = {
+    variant: PropTypes.oneOf(['info', 'success', 'critical'])
+};
 export default function LifetimeSale({ api }) {
     const [data, setData] = React.useState({});
     const [fetching, setFetching] = React.useState(true);
@@ -38,19 +53,24 @@ export default function LifetimeSale({ api }) {
     }, []);
     if (fetching) {
         return (React.createElement(Card, { title: "Lifetime Sales" },
-            React.createElement(Card.Session, null,
+            React.createElement(CardHeader, null,
+                React.createElement(CardTitle, null, "Lifetime Sales")),
+            React.createElement(CardContent, null,
                 React.createElement("div", { className: "skeleton-wrapper-lifetime" },
                     React.createElement("div", { className: "skeleton" }),
                     React.createElement("div", { className: "skeleton" }),
                     React.createElement("div", { className: "skeleton" }),
                     React.createElement("div", { className: "skeleton" }))),
-            React.createElement(Card.Session, null,
+            React.createElement(CardContent, null,
                 React.createElement("div", { className: "skeleton-wrapper-lifetime" },
                     React.createElement("div", { className: "skeleton-chart" })))));
     }
     else {
         return (React.createElement(Card, { title: "Lifetime Sales" },
-            React.createElement(Card.Session, null,
+            React.createElement(CardHeader, null,
+                React.createElement(CardTitle, null, "Lifetime Sales"),
+                React.createElement(CardDescription, null, "Overview of total sales and order status over the lifetime of your")),
+            React.createElement(CardContent, null,
                 React.createElement("div", { className: "grid grid-cols-1 gap-2" },
                     React.createElement("div", { className: "flex space-x-2 items-center" },
                         React.createElement(Dot, { variant: "info" }),
@@ -72,7 +92,7 @@ export default function LifetimeSale({ api }) {
                         React.createElement("div", { className: "self-center" },
                             cancelled_percentage,
                             "% of orders cancelled")))),
-            React.createElement(Card.Session, null,
+            React.createElement(CardContent, null,
                 React.createElement("div", { style: { height: '200px' } },
                     React.createElement(ResponsiveContainer, { width: "100%", height: "100%" },
                         React.createElement(PieChart, null,

package/dist/modules/oms/pages/admin/dashboard/Lifetimesales.js.map

@@ -1 +1 @@
-{"version":3,"file":"Lifetimesales.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/dashboard/Lifetimesales.jsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Lifetimesales.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/dashboard/Lifetimesales.jsx"],"names":[],"mappings":"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"}

package/dist/modules/oms/pages/admin/dashboard/Statistic.js

@@ -1,9 +1,11 @@
-import { Card } from '@components/admin/Card';
+import { Card, CardAction, CardDescription, CardHeader, CardTitle, CardContent } from '@components/common/ui/Card.js';
 import PropTypes from 'prop-types';
 import React, { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { Area, AreaChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 import './Statistic.scss';
+import { ButtonGroup } from '@components/common/ui/ButtonGroup.js';
+import { Button } from '@components/common/ui/Button.js';
 export default function SaleStatistic({ api }) {
     const [data, setData] = useState([]);
     const [period, setPeriod] = useState('monthly');
@@ -28,25 +30,23 @@ export default function SaleStatistic({ api }) {
     }, [period]);
     if (fetching) {
         return (React.createElement(Card, { title: "Sale Statistics" },
+            React.createElement(CardHeader, null,
+                React.createElement(CardTitle, null, "Sale Statistics"),
+                React.createElement(CardDescription, null, "Overview of sales data over selected periods")),
             React.createElement("div", { className: "skeleton-wrapper-statistic" },
                 React.createElement("div", { className: "skeleton" }))));
     }
     else {
-        return (React.createElement(Card, { title: "Sale Statistics", actions: [
-                {
-                    name: 'Daily',
-                    onAction: () => setPeriod('daily')
-                },
-                {
-                    name: 'Weekly',
-                    onAction: () => setPeriod('weekly')
-                },
-                {
-                    name: 'Monthly',
-                    onAction: () => setPeriod('monthly')
-                }
-            ] },
-            React.createElement(Card.Session, null, data.length === 0 ? null : (React.createElement(ResponsiveContainer, { width: "100%", height: 300 },
+        return (React.createElement(Card, null,
+            React.createElement(CardHeader, null,
+                React.createElement(CardTitle, null, "Sale Statistics"),
+                React.createElement(CardDescription, null, "Overview of sales data over selected periods"),
+                React.createElement(CardAction, null,
+                    React.createElement(ButtonGroup, null,
+                        React.createElement(Button, { onClick: () => setPeriod('daily'), variant: 'outline' }, period === 'daily' ? (React.createElement("span", { className: "text-primary" }, "Daily")) : ('Daily')),
+                        React.createElement(Button, { onClick: () => setPeriod('weekly'), variant: 'outline' }, period === 'weekly' ? (React.createElement("span", { className: "text-primary" }, "Weekly")) : ('Weekly')),
+                        React.createElement(Button, { onClick: () => setPeriod('monthly'), variant: 'outline' }, period === 'monthly' ? (React.createElement("span", { className: "text-primary" }, "Monthly")) : ('Monthly'))))),
+            React.createElement(CardContent, null, data.length === 0 ? null : (React.createElement(ResponsiveContainer, { width: "100%", height: 300 },
                 React.createElement(AreaChart, { data: data, margin: {
                         top: 5,
                         right: 0,

package/dist/modules/oms/pages/admin/dashboard/Statistic.js.map

@@ -1 +1 @@
-{"version":3,"file":"Statistic.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/dashboard/Statistic.jsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Statistic.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/dashboard/Statistic.jsx"],"names":[],"mappings":"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"}

package/dist/modules/oms/pages/admin/orderEdit/Activities.js

@@ -1,7 +1,6 @@
 import { DateTime } from 'luxon';
 import PropTypes from 'prop-types';
 import React from 'react';
-import './Activities.scss';
 export default function Activities({ order: { activities = [] } }) {
     const dailyActivities = [];
     activities.forEach((element) => {
@@ -40,16 +39,16 @@ export default function Activities({ order: { activities = [] } }) {
             });
         }
     });
-    return (React.createElement("div", { className: "order-activities" },
-        React.createElement("h3", { className: "title" }, "Activities"),
-        React.createElement("ul", null, dailyActivities.map((group, i) => (React.createElement("li", { key: i, className: "group" },
-            React.createElement("span", null, group.date),
-            React.createElement("ul", null, group.activities.map((a, k) => (React.createElement("li", { key: k, className: "flex items-center" },
-                React.createElement("span", { className: "dot" }),
-                React.createElement("div", { className: "comment" },
-                    React.createElement("span", null, a.comment),
-                    parseInt(a.customerNotified, 10) === 1 && (React.createElement("span", { className: "customer-notified" }, "Customer was notified"))),
-                React.createElement("span", { className: "time" }, a.time)))))))))));
+    return (React.createElement("div", { className: "mt-5" },
+        React.createElement("h3", { className: "text-base font-semibold pb-5 border-b border-divider" }, "Activities"),
+        React.createElement("ul", { className: "relative py-5 mt-5 before:absolute before:content-[''] before:block before:h-full before:w-0.5 before:top-0 before:left-[0.563rem] before:bg-divider" }, dailyActivities.map((group, i) => (React.createElement("li", { key: i, className: "mt-12 first:mt-0" },
+            React.createElement("span", { className: "uppercase pl-7 text-muted-foreground text-sm" }, group.date),
+            React.createElement("ul", { className: "mt-5 space-y-4" }, group.activities.map((a, k) => (React.createElement("li", { key: k, className: "flex items-center gap-0" },
+                React.createElement("span", { className: "block w-[0.813rem] h-[0.813rem] bg-border rounded-full z-10 border-2 border-background shrink-0" }),
+                React.createElement("div", { className: "flex-1 px-6" },
+                    React.createElement("span", { className: "block text-sm" }, a.comment),
+                    parseInt(a.customerNotified, 10) === 1 && (React.createElement("span", { className: "block text-muted-foreground italic text-sm mt-1" }, "Customer was notified"))),
+                React.createElement("span", { className: "text-muted-foreground text-sm shrink-0" }, a.time)))))))))));
 }
 Activities.propTypes = {
     order: PropTypes.shape({

package/dist/modules/oms/pages/admin/orderEdit/Activities.js.map

@@ -1 +1 @@
-{"version":3,"file":"Activities.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/orderEdit/Activities.jsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Activities.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/orderEdit/Activities.jsx"],"names":[],"mappings":"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"}

package/dist/modules/oms/pages/admin/orderEdit/AddTrackingButton.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 interface AddTrackingButtonProps {
     order: {
+        noShippingRequired: boolean;
         shipment: {
             carrier: string;
             trackingNumber: string;
@@ -13,10 +14,10 @@ interface AddTrackingButtonProps {
         label: string;
     }[];
 }
-export default function AddTrackingButton({ order: { shipment }, carriers }: AddTrackingButtonProps): React.JSX.Element | null;
+export default function AddTrackingButton({ order: { noShippingRequired, shipment }, carriers }: AddTrackingButtonProps): React.JSX.Element | null;
 export declare const layout: {
     areaId: string;
     sortOrder: number;
 };
-export declare const query = "\n  query Query {\n    order(uuid: getContextValue(\"orderId\")) {\n      shipment {\n        shipmentId\n        carrier\n        trackingNumber\n        updateShipmentApi\n      }\n      createShipmentApi\n    },\n    carriers {\n      label: name\n      value: code\n    }\n  }\n";
+export declare const query = "\n  query Query {\n    order(uuid: getContextValue(\"orderId\")) {\n      noShippingRequired\n      shipment {\n        shipmentId\n        carrier\n        trackingNumber\n        updateShipmentApi\n      }\n      createShipmentApi\n    },\n    carriers {\n      label: name\n      value: code\n    }\n  }\n";
 export {};

package/dist/modules/oms/pages/admin/orderEdit/AddTrackingButton.js

@@ -1,41 +1,48 @@
-import Button from '@components/common/Button.js';
 import { Form } from '@components/common/form/Form.js';
 import { InputField } from '@components/common/form/InputField.js';
 import { SelectField } from '@components/common/form/SelectField.js';
-import { Modal } from '@components/common/modal/Modal.js';
-import { useModal } from '@components/common/modal/useModal.js';
+import { Button } from '@components/common/ui/Button.js';
+import { Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from '@components/common/ui/Dialog.js';
 import React from 'react';
 import { useForm } from 'react-hook-form';
-export default function AddTrackingButton({ order: { shipment }, carriers }) {
-    const modal = useModal();
+export default function AddTrackingButton({ order: { noShippingRequired, shipment }, carriers }) {
+    const [dialogOpen, setDialogOpen] = React.useState(false);
     const form = useForm();
-    if (!shipment) {
+    if (noShippingRequired || !shipment) {
         return null;
     }
     else {
         return (React.createElement(React.Fragment, null,
-            React.createElement(Button, { title: "Edit Tracking Info", variant: "primary", onAction: () => {
-                    modal.open();
-                } }),
-            React.createElement(Modal, { title: "Edit Tracking Information", onClose: modal.close, isOpen: modal.isOpen },
-                React.createElement(Form, { form: form, id: "editTrackingInfo", method: "PATCH", action: shipment.updateShipmentApi, submitBtn: false, onSuccess: () => {
-                        location.reload();
-                    } },
-                    React.createElement("div", { className: "grid grid-cols-2 gap-2" },
-                        React.createElement("div", null,
-                            React.createElement(InputField, { type: "text", name: "tracking_number", label: "Tracking number", placeholder: "Tracking number", defaultValue: shipment.trackingNumber || '', required: true, validation: {
-                                    required: 'Tracking number is required'
-                                } })),
-                        React.createElement("div", null,
-                            React.createElement(SelectField, { name: "carrier", label: "Carrier", defaultValue: shipment.carrier || '', required: true, options: carriers, validation: {
-                                    required: 'Carrier is required'
-                                } }))),
-                    React.createElement("div", { className: "flex justify-end" },
+            React.createElement(Dialog, { open: dialogOpen, onOpenChange: setDialogOpen },
+                React.createElement(DialogTrigger, null,
+                    React.createElement(Button, { title: "Edit Tracking Info", variant: "outline", onClick: () => {
+                            setDialogOpen(true);
+                        } }, "Edit Tracking Info")),
+                React.createElement(DialogContent, null,
+                    React.createElement(DialogHeader, null,
+                        React.createElement(DialogTitle, null, "Edit Tracking Info")),
+                    React.createElement(Form, { form: form, id: "editTrackingInfo", method: "PATCH", action: shipment.updateShipmentApi, submitBtn: false, onSuccess: () => {
+                            location.reload();
+                        } },
                         React.createElement("div", { className: "grid grid-cols-2 gap-2" },
-                            React.createElement(Button, { title: "Cancel", variant: "danger", onAction: modal.close }),
-                            React.createElement(Button, { title: "Save", variant: "primary", isLoading: form.formState.isSubmitting, onAction: async () => {
-                                    document.getElementById('editTrackingInfo').dispatchEvent(new Event('submit', { cancelable: true, bubbles: true }));
-                                } })))))));
+                            React.createElement("div", null,
+                                React.createElement(InputField, { type: "text", name: "tracking_number", label: "Tracking number", placeholder: "Tracking number", defaultValue: shipment.trackingNumber || '', required: true, validation: {
+                                        required: 'Tracking number is required'
+                                    } })),
+                            React.createElement("div", null,
+                                React.createElement(SelectField, { name: "carrier", label: "Carrier", defaultValue: shipment.carrier || '', required: true, options: carriers, validation: {
+                                        required: 'Carrier is required'
+                                    } }))),
+                        React.createElement("div", { className: "flex justify-end" },
+                            React.createElement("div", { className: "grid grid-cols-2 gap-2" }))),
+                    React.createElement(DialogFooter, null,
+                        React.createElement(DialogClose, null,
+                            React.createElement(Button, { title: "Cancel", variant: "outline", onClick: () => {
+                                    setDialogOpen(false);
+                                } }, "Cancel")),
+                        React.createElement(Button, { title: "Save", variant: "default", isLoading: form.formState.isSubmitting, onClick: async () => {
+                                document.getElementById('editTrackingInfo').dispatchEvent(new Event('submit', { cancelable: true, bubbles: true }));
+                            } }, "Save"))))));
     }
 }
 export const layout = {
@@ -45,6 +52,7 @@ export const layout = {
 export const query = `
   query Query {
     order(uuid: getContextValue("orderId")) {
+      noShippingRequired
       shipment {
         shipmentId
         carrier

package/dist/modules/oms/pages/admin/orderEdit/AddTrackingButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"AddTrackingButton.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/orderEdit/AddTrackingButton.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"AddTrackingButton.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/orderEdit/AddTrackingButton.tsx"],"names":[],"mappings":"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"}

package/dist/modules/oms/pages/admin/orderEdit/CancelButton.js

@@ -1,40 +1,40 @@
-import Button from '@components/common/Button.js';
 import { Form } from '@components/common/form/Form.js';
 import { TextareaField } from '@components/common/form/TextareaField.js';
-import { Modal } from '@components/common/modal/Modal.js';
-import { useModal } from '@components/common/modal/useModal.js';
 import RenderIfTrue from '@components/common/RenderIfTrue.js';
+import { Button } from '@components/common/ui/Button.js';
+import { Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from '@components/common/ui/Dialog.js';
 import React from 'react';
 import { useForm } from 'react-hook-form';
 import { toast } from 'react-toastify';
 export default function CancelButton({ order: { cancelApi, paymentStatus, shipmentStatus } }) {
-    const modal = useModal();
     const form = useForm();
     return (React.createElement(RenderIfTrue, { condition: paymentStatus.isCancelable !== false &&
             shipmentStatus.isCancelable !== false },
-        React.createElement(Button, { title: "Cancel Order", variant: "danger", onAction: () => {
-                modal.open();
-            } }),
-        React.createElement(Modal, { title: "Cancel Order", onClose: modal.close, isOpen: modal.isOpen },
-            React.createElement(Form, { form: form, id: "cancelReason", method: "POST", action: cancelApi, submitBtn: false, onSuccess: (response) => {
-                    if (response.error) {
-                        toast.error(response.error.message);
-                    }
-                    else {
-                        // Reload the page
-                        window.location.reload();
-                    }
-                } },
-                React.createElement("div", null,
-                    React.createElement(TextareaField, { name: "reason", label: "Reason for cancellation", placeholder: "Reason for cancellation", required: true, validation: {
-                            required: 'Reason is required'
-                        } })),
-                React.createElement("div", { className: "flex justify-end" },
-                    React.createElement("div", { className: "grid grid-cols-2 gap-2" },
-                        React.createElement(Button, { title: "Cancel", variant: "danger", onAction: modal.close }),
-                        React.createElement(Button, { title: "Submit Cancellation", variant: "primary", isLoading: form.formState.isSubmitting, onAction: async () => {
-                                document.getElementById('cancelReason').dispatchEvent(new Event('submit', { cancelable: true, bubbles: true }));
-                            } })))))));
+        React.createElement(Dialog, null,
+            React.createElement(DialogTrigger, null,
+                React.createElement(Button, { variant: "destructive" }, "Cancel Order")),
+            React.createElement(DialogContent, null,
+                React.createElement(DialogHeader, null,
+                    React.createElement(DialogTitle, null, "Cancel Order")),
+                React.createElement(Form, { form: form, id: "cancelReason", method: "POST", action: cancelApi, submitBtn: false, onSuccess: (response) => {
+                        if (response.error) {
+                            toast.error(response.error.message);
+                        }
+                        else {
+                            // Reload the page
+                            window.location.reload();
+                        }
+                    } },
+                    React.createElement("div", null,
+                        React.createElement(TextareaField, { name: "reason", label: "Reason for cancellation", placeholder: "Reason for cancellation", required: true, validation: {
+                                required: 'Reason is required'
+                            } }))),
+                React.createElement(DialogFooter, null,
+                    React.createElement(DialogClose, null,
+                        React.createElement(Button, { variant: "outline" }, "Cancel")),
+                    React.createElement(Button, { variant: "default", isLoading: form.formState.isSubmitting, onClick: async () => {
+                            document.getElementById('cancelReason').dispatchEvent(new Event('submit', { cancelable: true, bubbles: true }));
+                        } }, "Submit Cancellation"))))));
 }
 export const layout = {
     areaId: 'pageHeadingRight',

package/dist/modules/oms/pages/admin/orderEdit/CancelButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"CancelButton.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/orderEdit/CancelButton.tsx"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,YAAY,MAAM,oCAAoC,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAevC,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,KAAK,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,EACjC;IAClB,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,OAAO,CACL,oBAAC,YAAY,IACX,SAAS,EACP,aAAa,CAAC,YAAY,KAAK,KAAK;YACpC,cAAc,CAAC,YAAY,KAAK,KAAK;QAGvC,oBAAC,MAAM,IACL,KAAK,EAAC,cAAc,EACpB,OAAO,EAAC,QAAQ,EAChB,QAAQ,EAAE,GAAG,EAAE;gBACb,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,CAAC,GACD;QACF,oBAAC,KAAK,IAAC,KAAK,EAAC,cAAc,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM;YACpE,oBAAC,IAAI,IACH,IAAI,EAAE,IAAI,EACV,EAAE,EAAC,cAAc,EACjB,MAAM,EAAC,MAAM,EACb,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;oBACtB,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;wBACnB,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACtC,CAAC;yBAAM,CAAC;wBACN,kBAAkB;wBAClB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;oBAC3B,CAAC;gBACH,CAAC;gBAED;oBACE,oBAAC,aAAa,IACZ,IAAI,EAAC,QAAQ,EACb,KAAK,EAAC,yBAAyB,EAC/B,WAAW,EAAC,yBAAyB,EACrC,QAAQ,QACR,UAAU,EAAE;4BACV,QAAQ,EAAE,oBAAoB;yBAC/B,GACD,CACE;gBACN,6BAAK,SAAS,EAAC,kBAAkB;oBAC/B,6BAAK,SAAS,EAAC,wBAAwB;wBACrC,oBAAC,MAAM,IAAC,KAAK,EAAC,QAAQ,EAAC,OAAO,EAAC,QAAQ,EAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,GAAI;wBACjE,oBAAC,MAAM,IACL,KAAK,EAAC,qBAAqB,EAC3B,OAAO,EAAC,SAAS,EACjB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EACtC,QAAQ,EAAE,KAAK,IAAI,EAAE;gCAEjB,QAAQ,CAAC,cAAc,CAAC,cAAc,CACvC,CAAC,aAAa,CACb,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CACzD,CAAC;4BACJ,CAAC,GACD,CACE,CACF,CACD,CACD,CACK,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,kBAAkB;IAC1B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;CAcpB,CAAC"}
+{"version":3,"file":"CancelButton.js","sourceRoot":"","sources":["../../../../../../src/modules/oms/pages/admin/orderEdit/CancelButton.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,YAAY,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EACL,MAAM,EACN,WAAW,EACX,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAevC,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,KAAK,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,EACjC;IAClB,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,OAAO,CACL,oBAAC,YAAY,IACX,SAAS,EACP,aAAa,CAAC,YAAY,KAAK,KAAK;YACpC,cAAc,CAAC,YAAY,KAAK,KAAK;QAGvC,oBAAC,MAAM;YACL,oBAAC,aAAa;gBACZ,oBAAC,MAAM,IAAC,OAAO,EAAC,aAAa,mBAAsB,CACrC;YAChB,oBAAC,aAAa;gBACZ,oBAAC,YAAY;oBACX,oBAAC,WAAW,uBAA2B,CAC1B;gBACf,oBAAC,IAAI,IACH,IAAI,EAAE,IAAI,EACV,EAAE,EAAC,cAAc,EACjB,MAAM,EAAC,MAAM,EACb,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;wBACtB,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;4BACnB,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBACtC,CAAC;6BAAM,CAAC;4BACN,kBAAkB;4BAClB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;wBAC3B,CAAC;oBACH,CAAC;oBAED;wBACE,oBAAC,aAAa,IACZ,IAAI,EAAC,QAAQ,EACb,KAAK,EAAC,yBAAyB,EAC/B,WAAW,EAAC,yBAAyB,EACrC,QAAQ,QACR,UAAU,EAAE;gCACV,QAAQ,EAAE,oBAAoB;6BAC/B,GACD,CACE,CACD;gBACP,oBAAC,YAAY;oBACX,oBAAC,WAAW;wBACV,oBAAC,MAAM,IAAC,OAAO,EAAC,SAAS,aAAgB,CAC7B;oBACd,oBAAC,MAAM,IACL,OAAO,EAAC,SAAS,EACjB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EACtC,OAAO,EAAE,KAAK,IAAI,EAAE;4BAEhB,QAAQ,CAAC,cAAc,CAAC,cAAc,CACvC,CAAC,aAAa,CACb,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CACzD,CAAC;wBACJ,CAAC,0BAGM,CACI,CACD,CACT,CACI,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,kBAAkB;IAC1B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;CAcpB,CAAC"}

package/dist/modules/oms/pages/admin/orderEdit/Customer.d.ts

@@ -1,21 +1,48 @@
-declare function Customer({ order: { shippingAddress, billingAddress, customerFullName, customerEmail, customerUrl } }: {
+import React from 'react';
+interface CustomerProps {
     order: {
-        shippingAddress: any;
-        billingAddress: any;
-        customerFullName: any;
-        customerEmail: any;
-        customerUrl: any;
+        customerFullName: string;
+        customerEmail: string;
+        customerUrl?: string;
+        noShippingRequired: boolean;
+        shippingAddress: {
+            fullName: string;
+            city: string;
+            address1: string;
+            address2?: string;
+            postcode: string;
+            telephone: string;
+            province: {
+                code: string;
+                name: string;
+            };
+            country: {
+                code: string;
+                name: string;
+            };
+        };
+        billingAddress: {
+            fullName: string;
+            city: string;
+            address1: string;
+            address2?: string;
+            postcode: string;
+            telephone: string;
+            province: {
+                code: string;
+                name: string;
+            };
+            country: {
+                code: string;
+                name: string;
+            };
+        };
     };
-}): React.JSX.Element;
-declare namespace Customer {
-    namespace propTypes {
-        let order: any;
-    }
-}
-export default Customer;
-export namespace layout {
-    let areaId: string;
-    let sortOrder: number;
 }
-export const query: "\n  query Query {\n    order(uuid: getContextValue(\"orderId\")) {\n      customerFullName\n      customerEmail\n      customerUrl\n      shippingAddress {\n        fullName\n        city\n        address1\n        address2\n        postcode\n        telephone\n        province {\n          code\n          name\n        }\n        country {\n          code\n          name\n        }\n      }\n      billingAddress {\n        fullName\n        city\n        address1\n        address2\n        postcode\n        telephone\n        province {\n          code\n          name\n        }\n        country {\n          code\n          name\n        }\n      }\n    }\n  }\n";
-import React from 'react';
+export default function Customer({ order: { noShippingRequired, shippingAddress, billingAddress, customerFullName, customerEmail, customerUrl } }: CustomerProps): React.JSX.Element;
+export declare const layout: {
+    areaId: string;
+    sortOrder: number;
+};
+export declare const query = "\n  query Query {\n    order(uuid: getContextValue(\"orderId\")) {\n      customerFullName\n      customerEmail\n      customerUrl\n      noShippingRequired\n      shippingAddress {\n        fullName\n        city\n        address1\n        address2\n        postcode\n        telephone\n        province {\n          code\n          name\n        }\n        country {\n          code\n          name\n        }\n      }\n      billingAddress {\n        fullName\n        city\n        address1\n        address2\n        postcode\n        telephone\n        province {\n          code\n          name\n        }\n        country {\n          code\n          name\n        }\n      }\n    }\n  }\n";
+export {};

package/dist/modules/oms/pages/admin/orderEdit/Customer.js

@@ -1,61 +1,29 @@
-import { Card } from '@components/admin/Card';
-import { AddressSummary } from '@components/common/customer/address/AddressSummary';
-import PropTypes from 'prop-types';
+import { AddressSummary } from '@components/common/customer/address/AddressSummary.js';
+import { Card, CardContent, CardHeader, CardTitle } from '@components/common/ui/Card.js';
 import React from 'react';
-export default function Customer({ order: { shippingAddress, billingAddress, customerFullName, customerEmail, customerUrl } }) {
-    return (React.createElement(Card, { title: "Customer" },
-        React.createElement(Card.Session, null,
+export default function Customer({ order: { noShippingRequired, shippingAddress, billingAddress, customerFullName, customerEmail, customerUrl } }) {
+    return (React.createElement(Card, { className: "" },
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "Customer Information")),
+        React.createElement(CardContent, null,
             customerUrl && (React.createElement("a", { href: customerUrl, className: "text-interactive hover:underline block" }, customerFullName)),
             !customerUrl && React.createElement("span", null,
                 customerEmail,
                 " (Guest Checkout)")),
-        React.createElement(Card.Session, { title: "Contact information" },
+        React.createElement(CardContent, { className: "border-t border-border pt-3" },
+            React.createElement(CardTitle, { className: "mb-2" }, "Contact Information"),
             React.createElement("div", null,
                 React.createElement("a", { href: "#", className: "text-interactive hover:underline" }, customerEmail)),
-            React.createElement("div", null,
-                React.createElement("span", null, shippingAddress.telephone))),
-        React.createElement(Card.Session, { title: "Shipping Address" },
-            React.createElement(AddressSummary, { address: shippingAddress })),
-        React.createElement(Card.Session, { title: "Billing address" },
+            (shippingAddress === null || shippingAddress === void 0 ? void 0 : shippingAddress.telephone) && (React.createElement("div", null,
+                React.createElement("span", null, shippingAddress.telephone)))),
+        React.createElement(CardContent, { className: "border-t border-border pt-3" },
+            React.createElement(CardTitle, { className: "mb-2" }, "Shipping Address"),
+            !noShippingRequired && React.createElement(AddressSummary, { address: shippingAddress }),
+            noShippingRequired && (React.createElement("span", { className: "text-muted-foreground" }, 'No shipping required'))),
+        React.createElement(CardContent, { className: "border-t border-border pt-3" },
+            React.createElement(CardTitle, { className: "mb-2" }, "Billing address"),
             React.createElement(AddressSummary, { address: billingAddress }))));
 }
-Customer.propTypes = {
-    order: PropTypes.shape({
-        customerFullName: PropTypes.string.isRequired,
-        customerEmail: PropTypes.string.isRequired,
-        customerUrl: PropTypes.string,
-        shippingAddress: PropTypes.shape({
-            fullName: PropTypes.string.isRequired,
-            address1: PropTypes.string.isRequired,
-            city: PropTypes.string.isRequired,
-            postcode: PropTypes.string.isRequired,
-            telephone: PropTypes.string.isRequired,
-            province: PropTypes.shape({
-                code: PropTypes.string.isRequired,
-                name: PropTypes.string.isRequired
-            }).isRequired,
-            country: PropTypes.shape({
-                code: PropTypes.string.isRequired,
-                name: PropTypes.string.isRequired
-            }).isRequired
-        }).isRequired,
-        billingAddress: PropTypes.shape({
-            fullName: PropTypes.string.isRequired,
-            address1: PropTypes.string.isRequired,
-            city: PropTypes.string.isRequired,
-            postcode: PropTypes.string.isRequired,
-            telephone: PropTypes.string.isRequired,
-            province: PropTypes.shape({
-                code: PropTypes.string.isRequired,
-                name: PropTypes.string.isRequired
-            }).isRequired,
-            country: PropTypes.shape({
-                code: PropTypes.string.isRequired,
-                name: PropTypes.string.isRequired
-            }).isRequired
-        }).isRequired
-    }).isRequired
-};
 export const layout = {
     areaId: 'rightSide',
     sortOrder: 15
@@ -66,6 +34,7 @@ export const query = `
       customerFullName
       customerEmail
       customerUrl
+      noShippingRequired
       shippingAddress {
         fullName
         city