@evershop/evershop 2.1.0 → 2.1.1

package/dist/modules/oms/pages/admin/orderEdit/items/Name.js

@@ -1,12 +1,14 @@
+import { TableCell } from '@components/common/ui/Table.js';
 import React from 'react';
 import { ItemVariantOptions } from './ItemVariantOptions.js';
 export function Name({ name, productSku, productUrl, variantOptions = [] }) {
-    return (React.createElement("td", null,
-        React.createElement("div", { className: "product-column" },
+    const truncatedName = name.length > 30 ? `${name.substring(0, 30)}...` : name;
+    return (React.createElement(TableCell, { className: "w-auto min-w-0" },
+        React.createElement("div", { className: "product-column overflow-hidden" },
             React.createElement("div", null,
                 React.createElement("span", { className: "font-semibold" },
-                    React.createElement("a", { href: productUrl }, name))),
-            React.createElement("div", { className: "text-gray-500" },
+                    React.createElement("a", { href: productUrl, title: name }, truncatedName))),
+            React.createElement("div", { className: "text-muted-foreground" },
                 React.createElement("span", { className: "font-semibold" }, "SKU: "),
                 React.createElement("span", null, productSku)),
             React.createElement(ItemVariantOptions, { options: variantOptions }))));

package/dist/modules/oms/pages/admin/orderEdit/items/Name.js.map

@@ -1 +1 @@
-{"version":3,"file":"Name.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/items/Name.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAY7D,MAAM,UAAU,IAAI,CAAC,EACnB,IAAI,EACJ,UAAU,EACV,UAAU,EACV,cAAc,GAAG,EAAE,EACT;IACV,OAAO,CACL;QACE,6BAAK,SAAS,EAAC,gBAAgB;YAC7B;gBACE,8BAAM,SAAS,EAAC,eAAe;oBAC7B,2BAAG,IAAI,EAAE,UAAU,IAAG,IAAI,CAAK,CAC1B,CACH;YACN,6BAAK,SAAS,EAAC,eAAe;gBAC5B,8BAAM,SAAS,EAAC,eAAe,YAAa;gBAC5C,kCAAO,UAAU,CAAQ,CACrB;YACN,oBAAC,kBAAkB,IAAC,OAAO,EAAE,cAAc,GAAI,CAC3C,CACH,CACN,CAAC;AACJ,CAAC"}
+{"version":3,"file":"Name.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/items/Name.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAY7D,MAAM,UAAU,IAAI,CAAC,EACnB,IAAI,EACJ,UAAU,EACV,UAAU,EACV,cAAc,GAAG,EAAE,EACT;IACV,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9E,OAAO,CACL,oBAAC,SAAS,IAAC,SAAS,EAAC,gBAAgB;QACnC,6BAAK,SAAS,EAAC,gCAAgC;YAC7C;gBACE,8BAAM,SAAS,EAAC,eAAe;oBAC7B,2BAAG,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,IAC7B,aAAa,CACZ,CACC,CACH;YACN,6BAAK,SAAS,EAAC,uBAAuB;gBACpC,8BAAM,SAAS,EAAC,eAAe,YAAa;gBAC5C,kCAAO,UAAU,CAAQ,CACrB;YACN,oBAAC,kBAAkB,IAAC,OAAO,EAAE,cAAc,GAAI,CAC3C,CACI,CACb,CAAC;AACJ,CAAC"}

package/dist/modules/oms/pages/admin/orderEdit/items/Price.js

@@ -1,6 +1,7 @@
+import { TableCell } from '@components/common/ui/Table.js';
 import React from 'react';
 export function Price({ price, qty }) {
-    return (React.createElement("td", null,
+    return (React.createElement(TableCell, { className: "w-32 whitespace-nowrap" },
         React.createElement("div", { className: "product-price" },
             React.createElement("span", null,
                 price,

package/dist/modules/oms/pages/admin/orderEdit/items/Price.js.map

@@ -1 +1 @@
-{"version":3,"file":"Price.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/items/Price.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,KAAK,CAAC,EAAE,KAAK,EAAE,GAAG,EAAc;IAC9C,OAAO,CACL;QACE,6BAAK,SAAS,EAAC,eAAe;YAC5B;gBACG,KAAK;;gBAAK,GAAG,CACT,CACH,CACH,CACN,CAAC;AACJ,CAAC"}
+{"version":3,"file":"Price.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/items/Price.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,KAAK,CAAC,EAAE,KAAK,EAAE,GAAG,EAAc;IAC9C,OAAO,CACL,oBAAC,SAAS,IAAC,SAAS,EAAC,wBAAwB;QAC3C,6BAAK,SAAS,EAAC,eAAe;YAC5B;gBACG,KAAK;;gBAAK,GAAG,CACT,CACH,CACI,CACb,CAAC;AACJ,CAAC"}

package/dist/modules/oms/pages/admin/orderEdit/items/Thumbnail.js

@@ -1,11 +1,12 @@
+import { TableCell } from '@components/common/ui/Table.js';
 import React from 'react';
 export function Thumbnail({ imageUrl, qty }) {
-    return (React.createElement("td", null,
-        React.createElement("div", { className: "product-thumbnail" },
-            React.createElement("div", { className: "thumbnail" },
-                imageUrl && React.createElement("img", { src: imageUrl, alt: "" }),
-                !imageUrl && (React.createElement("svg", { style: { width: '2rem' }, fill: "currentcolor", viewBox: "0 0 20 20", focusable: "false", "aria-hidden": "true" },
+    return (React.createElement(TableCell, { className: "w-20" },
+        React.createElement("div", { className: "relative w-12 h-12 flex justify-center border border-divider rounded-[3px] p-0.5 box-border" },
+            React.createElement("div", { className: "self-center text-border" },
+                imageUrl && (React.createElement("img", { src: imageUrl, alt: "", className: "max-w-full h-auto" })),
+                !imageUrl && (React.createElement("svg", { className: "w-8", fill: "currentcolor", viewBox: "0 0 20 20", focusable: "false", "aria-hidden": "true" },
                     React.createElement("path", { fillRule: "evenodd", d: "M6 11h8V9H6v2zm0 4h8v-2H6v2zm0-8h4V5H6v2zm6-5H5.5A1.5 1.5 0 0 0 4 3.5v13A1.5 1.5 0 0 0 5.5 18h9a1.5 1.5 0 0 0 1.5-1.5V6l-4-4z" })))),
-            React.createElement("span", { className: "qty" }, qty))));
+            React.createElement("span", { className: "block w-5 h-5 text-xs absolute -top-[0.8rem] -right-[0.8rem] bg-divider rounded-full text-center leading-tight pt-0.5" }, qty))));
 }
 //# sourceMappingURL=Thumbnail.js.map

package/dist/modules/oms/pages/admin/orderEdit/items/Thumbnail.js.map

@@ -1 +1 @@
-{"version":3,"file":"Thumbnail.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/items/Thumbnail.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,SAAS,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAkB;IACzD,OAAO,CACL;QACE,6BAAK,SAAS,EAAC,mBAAmB;YAChC,6BAAK,SAAS,EAAC,WAAW;gBACvB,QAAQ,IAAI,6BAAK,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAC,EAAE,GAAG;gBACzC,CAAC,QAAQ,IAAI,CACZ,6BACE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EACxB,IAAI,EAAC,cAAc,EACnB,OAAO,EAAC,WAAW,EACnB,SAAS,EAAC,OAAO,iBACL,MAAM;oBAElB,8BACE,QAAQ,EAAC,SAAS,EAClB,CAAC,EAAC,+HAA+H,GACjI,CACE,CACP,CACG;YACN,8BAAM,SAAS,EAAC,KAAK,IAAE,GAAG,CAAQ,CAC9B,CACH,CACN,CAAC;AACJ,CAAC"}
+{"version":3,"file":"Thumbnail.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/items/Thumbnail.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,SAAS,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAkB;IACzD,OAAO,CACL,oBAAC,SAAS,IAAC,SAAS,EAAC,MAAM;QACzB,6BAAK,SAAS,EAAC,6FAA6F;YAC1G,6BAAK,SAAS,EAAC,yBAAyB;gBACrC,QAAQ,IAAI,CACX,6BAAK,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAC,EAAE,EAAC,SAAS,EAAC,mBAAmB,GAAG,CAC5D;gBACA,CAAC,QAAQ,IAAI,CACZ,6BACE,SAAS,EAAC,KAAK,EACf,IAAI,EAAC,cAAc,EACnB,OAAO,EAAC,WAAW,EACnB,SAAS,EAAC,OAAO,iBACL,MAAM;oBAElB,8BACE,QAAQ,EAAC,SAAS,EAClB,CAAC,EAAC,+HAA+H,GACjI,CACE,CACP,CACG;YACN,8BAAM,SAAS,EAAC,uHAAuH,IACpI,GAAG,CACC,CACH,CACI,CACb,CAAC;AACJ,CAAC"}

package/dist/modules/oms/pages/admin/orderEdit/payment/Discount.js

@@ -1,10 +1,10 @@
 import React from 'react';
 export function Discount({ discount, code }) {
-    return (React.createElement("div", { className: "summary-row" },
-        React.createElement("span", null, "Discount"),
-        React.createElement("div", null,
-            React.createElement("div", null, code),
-            React.createElement("div", null, discount))));
+    return (React.createElement("div", { className: "flex items-start justify-between gap-4" },
+        React.createElement("span", { className: "text-sm text-muted-foreground min-w-[8.75rem]" }, "Discount"),
+        React.createElement("div", { className: "flex-1 flex items-start justify-between gap-2" },
+            React.createElement("div", { className: "text-sm text-muted-foreground" }, code),
+            React.createElement("div", { className: "font-semibold text-sm text-green-600 dark:text-green-400" }, discount))));
 }
 Discount.defaultProps = {
     code: undefined,

package/dist/modules/oms/pages/admin/orderEdit/payment/Discount.js.map

@@ -1 +1 @@
-{"version":3,"file":"Discount.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/Discount.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAiB;IACxD,OAAO,CACL,6BAAK,SAAS,EAAC,aAAa;QAC1B,6CAAqB;QACrB;YACE,iCAAM,IAAI,CAAO;YACjB,iCAAM,QAAQ,CAAO,CACjB,CACF,CACP,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,YAAY,GAAG;IACtB,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,CAAC;CACZ,CAAC"}
+{"version":3,"file":"Discount.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/Discount.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAiB;IACxD,OAAO,CACL,6BAAK,SAAS,EAAC,wCAAwC;QACrD,8BAAM,SAAS,EAAC,+CAA+C,eAExD;QACP,6BAAK,SAAS,EAAC,+CAA+C;YAC5D,6BAAK,SAAS,EAAC,+BAA+B,IAAE,IAAI,CAAO;YAC3D,6BAAK,SAAS,EAAC,0DAA0D,IACtE,QAAQ,CACL,CACF,CACF,CACP,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,YAAY,GAAG;IACtB,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,CAAC;CACZ,CAAC"}

package/dist/modules/oms/pages/admin/orderEdit/payment/Shipping.js

@@ -1,9 +1,9 @@
 import React from 'react';
 export function Shipping({ method, cost }) {
-    return (React.createElement("div", { className: "summary-row" },
-        React.createElement("span", null, "Shipping"),
-        React.createElement("div", null,
-            React.createElement("div", null, method),
-            React.createElement("div", null, cost))));
+    return (React.createElement("div", { className: "flex items-start justify-between gap-4" },
+        React.createElement("span", { className: "text-sm text-muted-foreground min-w-[8.75rem]" }, "Shipping"),
+        React.createElement("div", { className: "flex-1 flex items-start justify-between gap-2" },
+            React.createElement("div", { className: "text-sm text-muted-foreground" }, method),
+            React.createElement("div", { className: "font-semibold text-sm" }, cost))));
 }
 //# sourceMappingURL=Shipping.js.map

package/dist/modules/oms/pages/admin/orderEdit/payment/Shipping.js.map

@@ -1 +1 @@
-{"version":3,"file":"Shipping.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/Shipping.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAiB;IACtD,OAAO,CACL,6BAAK,SAAS,EAAC,aAAa;QAC1B,6CAAqB;QACrB;YACE,iCAAM,MAAM,CAAO;YACnB,iCAAM,IAAI,CAAO,CACb,CACF,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"Shipping.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/Shipping.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAiB;IACtD,OAAO,CACL,6BAAK,SAAS,EAAC,wCAAwC;QACrD,8BAAM,SAAS,EAAC,+CAA+C,eAExD;QACP,6BAAK,SAAS,EAAC,+CAA+C;YAC5D,6BAAK,SAAS,EAAC,+BAA+B,IAAE,MAAM,CAAO;YAC7D,6BAAK,SAAS,EAAC,uBAAuB,IAAE,IAAI,CAAO,CAC/C,CACF,CACP,CAAC;AACJ,CAAC"}

package/dist/modules/oms/pages/admin/orderEdit/payment/SubTotal.js

@@ -1,11 +1,11 @@
 import React from 'react';
 export function SubTotal({ count, total }) {
-    return (React.createElement("div", { className: "summary-row" },
-        React.createElement("span", null, "Subtotal"),
-        React.createElement("div", null,
-            React.createElement("div", null,
+    return (React.createElement("div", { className: "flex items-start justify-between gap-4" },
+        React.createElement("span", { className: "text-sm text-muted-foreground min-w-[8.75rem]" }, "Subtotal"),
+        React.createElement("div", { className: "flex-1 flex items-start justify-between gap-2" },
+            React.createElement("div", { className: "text-sm text-muted-foreground" },
                 count,
                 " items"),
-            React.createElement("div", null, total))));
+            React.createElement("div", { className: "font-semibold text-sm" }, total))));
 }
 //# sourceMappingURL=SubTotal.js.map

package/dist/modules/oms/pages/admin/orderEdit/payment/SubTotal.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubTotal.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/SubTotal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAiB;IACtD,OAAO,CACL,6BAAK,SAAS,EAAC,aAAa;QAC1B,6CAAqB;QACrB;YACE;gBAAM,KAAK;yBAAa;YACxB,iCAAM,KAAK,CAAO,CACd,CACF,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"SubTotal.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/SubTotal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAiB;IACtD,OAAO,CACL,6BAAK,SAAS,EAAC,wCAAwC;QACrD,8BAAM,SAAS,EAAC,+CAA+C,eAExD;QACP,6BAAK,SAAS,EAAC,+CAA+C;YAC5D,6BAAK,SAAS,EAAC,+BAA+B;gBAAE,KAAK;yBAAa;YAClE,6BAAK,SAAS,EAAC,uBAAuB,IAAE,KAAK,CAAO,CAChD,CACF,CACP,CAAC;AACJ,CAAC"}

package/dist/modules/oms/pages/admin/orderEdit/payment/Tax.js

@@ -1,10 +1,10 @@
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React from 'react';
 export function Tax({ taxClass, amount }) {
-    return (React.createElement("div", { className: "summary-row" },
-        React.createElement("span", null, _('Tax')),
-        React.createElement("div", null,
-            React.createElement("div", null, taxClass),
-            React.createElement("div", null, amount))));
+    return (React.createElement("div", { className: "flex items-start justify-between gap-4" },
+        React.createElement("span", { className: "text-sm text-muted-foreground min-w-[8.75rem]" }, _('Tax')),
+        React.createElement("div", { className: "flex-1 flex items-start justify-between gap-2" },
+            React.createElement("div", { className: "text-sm text-muted-foreground" }, taxClass),
+            React.createElement("div", { className: "font-semibold text-sm" }, amount))));
 }
 //# sourceMappingURL=Tax.js.map

package/dist/modules/oms/pages/admin/orderEdit/payment/Tax.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tax.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/Tax.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,2CAA2C,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAY;IAChD,OAAO,CACL,6BAAK,SAAS,EAAC,aAAa;QAC1B,kCAAO,CAAC,CAAC,KAAK,CAAC,CAAQ;QACvB;YACE,iCAAM,QAAQ,CAAO;YACrB,iCAAM,MAAM,CAAO,CACf,CACF,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"Tax.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/Tax.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,2CAA2C,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAY;IAChD,OAAO,CACL,6BAAK,SAAS,EAAC,wCAAwC;QACrD,8BAAM,SAAS,EAAC,+CAA+C,IAC5D,CAAC,CAAC,KAAK,CAAC,CACJ;QACP,6BAAK,SAAS,EAAC,+CAA+C;YAC5D,6BAAK,SAAS,EAAC,+BAA+B,IAAE,QAAQ,CAAO;YAC/D,6BAAK,SAAS,EAAC,uBAAuB,IAAE,MAAM,CAAO,CACjD,CACF,CACP,CAAC;AACJ,CAAC"}

package/dist/modules/oms/pages/admin/orderEdit/payment/Total.js

@@ -1,9 +1,9 @@
 import React from 'react';
 export function Total({ total }) {
-    return (React.createElement("div", { className: "summary-row" },
-        React.createElement("span", null, "Total"),
-        React.createElement("div", null,
+    return (React.createElement("div", { className: "flex items-start justify-between gap-4 pt-3 border-t border-border" },
+        React.createElement("span", { className: "text-base font-semibold min-w-[8.75rem]" }, "Total"),
+        React.createElement("div", { className: "flex-1 flex items-start justify-between gap-2" },
             React.createElement("span", null),
-            React.createElement("div", null, total))));
+            React.createElement("div", { className: "text-base font-bold" }, total))));
 }
 //# sourceMappingURL=Total.js.map

package/dist/modules/oms/pages/admin/orderEdit/payment/Total.js.map

@@ -1 +1 @@
-{"version":3,"file":"Total.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/Total.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,UAAU,KAAK,CAAC,EAAE,KAAK,EAAc;IACzC,OAAO,CACL,6BAAK,SAAS,EAAC,aAAa;QAC1B,0CAAkB;QAClB;YACE,iCAAQ;YACR,iCAAM,KAAK,CAAO,CACd,CACF,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"Total.js","sourceRoot":"","sources":["../../../../../../../src/modules/oms/pages/admin/orderEdit/payment/Total.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,UAAU,KAAK,CAAC,EAAE,KAAK,EAAc;IACzC,OAAO,CACL,6BAAK,SAAS,EAAC,oEAAoE;QACjF,8BAAM,SAAS,EAAC,yCAAyC,YAAa;QACtE,6BAAK,SAAS,EAAC,+CAA+C;YAC5D,iCAAQ;YACR,6BAAK,SAAS,EAAC,qBAAqB,IAAE,KAAK,CAAO,CAC9C,CACF,CACP,CAAC;AACJ,CAAC"}

package/dist/modules/oms/pages/admin/orderGrid/Grid.d.ts

@@ -19,6 +19,6 @@ export namespace layout {
     let areaId: string;
     let sortOrder: number;
 }
-export const query: "\n  query Query($filters: [FilterInput]) {\n    orders (filters: $filters) {\n      items {\n        orderId\n        uuid\n        orderNumber\n        createdAt {\n          value\n          text\n        }\n        customerEmail\n        shipmentStatus {\n          name\n          code\n          badge\n          progress\n        }\n        paymentStatus {\n          name\n          code\n          badge\n          progress\n        }\n        grandTotal {\n          value\n          text\n        }\n        editUrl\n        createShipmentApi\n      }\n      total\n      currentFilters {\n        key\n        operation\n        value\n      }\n    }\n    paymentStatusList {\n      code\n      name\n    }\n    shipmentStatusList {\n      code\n      name\n    }\n  }\n";
+export const query: "\n  query Query($filters: [FilterInput]) {\n    orders (filters: $filters) {\n      items {\n        orderId\n        uuid\n        orderNumber\n        createdAt {\n          value\n          text\n        }\n        customerEmail\n        shipmentStatus {\n          name\n          code\n          badge\n        }\n        paymentStatus {\n          name\n          code\n          badge\n        }\n        grandTotal {\n          value\n          text\n        }\n        editUrl\n        createShipmentApi\n      }\n      total\n      currentFilters {\n        key\n        operation\n        value\n      }\n    }\n    paymentStatusList {\n      code\n      name\n    }\n    shipmentStatusList {\n      code\n      name\n    }\n  }\n";
 export const variables: "\n{\n  filters: getContextValue('filtersFromUrl')\n}";
 import React from 'react';

package/dist/modules/oms/pages/admin/orderGrid/Grid.js

@@ -1,11 +1,15 @@
-import { Card } from '@components/admin/Card';
-import { Filter } from '@components/admin/grid/Filter';
+import { GridPagination } from '@components/admin/grid/GridPagination';
 import { SortableHeader } from '@components/admin/grid/header/Sortable';
-import { Pagination } from '@components/admin/grid/Pagination';
 import Area from '@components/common/Area';
 import { Form } from '@components/common/form/Form.js';
 import { InputField } from '@components/common/form/InputField.js';
 import { useAlertContext } from '@components/common/modal/Alert';
+import { Button } from '@components/common/ui/Button.js';
+import { ButtonGroup } from '@components/common/ui/ButtonGroup.js';
+import { Card, CardContent, CardHeader, CardAction } from '@components/common/ui/Card.js';
+import { Checkbox } from '@components/common/ui/Checkbox.js';
+import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectTrigger, SelectValue } from '@components/common/ui/Select.js';
+import { Table, TableHead, TableHeader, TableRow, TableBody, TableCell } from '@components/common/ui/Table.js';
 import axios from 'axios';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
@@ -31,37 +35,31 @@ function Actions({ orders = [], selectedIds = [] }) {
             onAction: () => {
                 openAlert({
                     heading: `Fullfill ${selectedIds.length} orders`,
-                    content: (React.createElement("div", { className: "form-field mb-0" },
-                        React.createElement("input", { type: "checkbox", name: "notify_customer", label: "Send notification to the customer", onChange: () => { } }))),
+                    content: (React.createElement("div", { className: "form-field mb-0" }, "Are you sure you want to mark the selected orders as shipped?")),
                     primaryAction: {
                         title: 'Cancel',
                         onAction: closeAlert,
-                        variant: 'default'
+                        variant: 'secondary'
                     },
                     secondaryAction: {
                         title: 'Mark as shipped',
                         onAction: async () => {
                             await fullFillOrders();
                         },
-                        variant: 'primary',
+                        variant: 'default',
                         isLoading
                     }
                 });
             }
         }
     ];
-    return (React.createElement("tr", null,
+    return (React.createElement(TableRow, null,
         selectedIds.length === 0 && null,
-        selectedIds.length > 0 && (React.createElement("td", { style: { borderTop: 0 }, colSpan: "100" },
-            React.createElement("div", { className: "inline-flex border border-divider rounded justify-items-start" },
-                React.createElement("a", { href: "#", className: "font-semibold pt-2 pb-2 pl-4 pr-4" },
-                    selectedIds.length,
-                    " selected"),
-                actions.map((action, i) => (React.createElement("a", { key: i, href: "#", onClick: (e) => {
-                        e.preventDefault();
-                        action.onAction();
-                    }, className: "font-semibold pt-2 pb-2 pl-4 pr-4 block border-l border-divider self-center" },
-                    React.createElement("span", null, action.name)))))))));
+        selectedIds.length > 0 && (React.createElement(TableCell, { style: { borderTop: 0 }, colSpan: "100" },
+            React.createElement(ButtonGroup, null, actions.map((action, i) => (React.createElement(Button, { key: i, variant: 'outline', onClick: (e) => {
+                    e.preventDefault();
+                    action.onAction();
+                } }, action.name))))))));
 }
 Actions.propTypes = {
     selectedIds: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -79,7 +77,8 @@ export default function OrderGrid({ orders: { items: orders, total, currentFilte
         : 20;
     const [selectedRows, setSelectedRows] = useState([]);
     return (React.createElement(Card, null,
-        React.createElement(Card.Session, { title: React.createElement(Form, { submitBtn: false, id: "orderGridFilter" },
+        React.createElement(CardHeader, { className: "flex justify-between" },
+            React.createElement(Form, { submitBtn: false, id: "orderGridFilter" },
                 React.createElement("div", { className: "flex gap-5 justify-center items-center" },
                     React.createElement(Area, { id: "orderGridFilter", noOuter: true, coreComponents: [
                             {
@@ -107,152 +106,153 @@ export default function OrderGrid({ orders: { items: orders, total, currentFilte
                             },
                             {
                                 component: {
-                                    default: () => (React.createElement(Filter, { options: paymentStatusList.map((status) => ({
-                                            label: status.name,
-                                            value: status.code,
-                                            onSelect: () => {
+                                    default: () => (React.createElement(React.Fragment, null,
+                                        React.createElement(Select, { value: currentFilters.find((f) => f.key === 'payment_status')
+                                                ? currentFilters.find((f) => f.key === 'payment_status').value
+                                                : undefined, onValueChange: (value) => {
                                                 const url = new URL(document.location);
-                                                url.searchParams.set('payment_status', status.code);
+                                                url.searchParams.set('payment_status', value);
                                                 window.location.href = url;
-                                            }
-                                        })), selectedOption: currentFilters.find((f) => f.key === 'payment_status')
-                                            ? currentFilters.find((f) => f.key === 'payment_status').value
-                                            : undefined, title: "Payment status" }))
+                                            } },
+                                            React.createElement(SelectTrigger, null,
+                                                React.createElement(SelectValue, null, "Payment Status")),
+                                            React.createElement(SelectContent, null,
+                                                React.createElement(SelectGroup, null,
+                                                    React.createElement(SelectLabel, null, "Payment Status"),
+                                                    paymentStatusList.map((status, index) => (React.createElement(SelectItem, { key: index, value: status.code }, status.name))))))))
                                 },
                                 sortOrder: 10
                             },
                             {
                                 component: {
-                                    default: () => (React.createElement(Filter, { options: shipmentStatusList.map((status) => ({
-                                            label: status.name,
-                                            value: status.code,
-                                            onSelect: () => {
-                                                const url = new URL(document.location);
-                                                url.searchParams.set('shipment_status', status.code);
-                                                window.location.href = url;
-                                            }
-                                        })), selectedOption: currentFilters.find((f) => f.key === 'shipment_status')
+                                    default: () => (React.createElement(Select, { value: currentFilters.find((f) => f.key === 'shipment_status')
                                             ? currentFilters.find((f) => f.key === 'shipment_status').value
-                                            : undefined, title: "Shipment status" }))
+                                            : undefined, onValueChange: (value) => {
+                                            const url = new URL(document.location);
+                                            url.searchParams.set('shipment_status', value);
+                                            window.location.href = url;
+                                        } },
+                                        React.createElement(SelectTrigger, null,
+                                            React.createElement(SelectValue, null, "Shipment Status")),
+                                        React.createElement(SelectContent, null,
+                                            React.createElement(SelectGroup, null,
+                                                React.createElement(SelectLabel, null, "Shipment Status"),
+                                                shipmentStatusList.map((status, index) => (React.createElement(SelectItem, { key: index, value: status.code }, status.name)))))))
                                 },
                                 sortOrder: 15
                             }
-                        ], currentFilters: currentFilters }))), actions: [
-                {
-                    variant: 'interactive',
-                    name: 'Clear filter',
-                    onAction: () => {
-                        // Just get the url and remove all query params
+                        ], currentFilters: currentFilters }))),
+            React.createElement(CardAction, null,
+                React.createElement(Button, { variant: "link", className: 'hover:cursor-pointer', onClick: () => {
                         const url = new URL(document.location);
                         url.search = '';
                         window.location.href = url.href;
-                    }
-                }
-            ] }),
-        React.createElement("table", { className: "listing sticky" },
-            React.createElement("thead", null,
-                React.createElement("tr", null,
-                    React.createElement("th", { className: "align-bottom" },
-                        React.createElement("div", { className: "form-field mb-0" },
-                            React.createElement("input", { type: "checkbox", onChange: (e) => {
-                                    if (e.target.checked) {
-                                        setSelectedRows(orders.map((o) => o.uuid));
-                                    }
-                                    else {
-                                        setSelectedRows([]);
-                                    }
-                                } }))),
-                    React.createElement(Area, { className: "", id: "orderGridHeader", noOuter: true, coreComponents: [
-                            {
-                                component: {
-                                    default: () => (React.createElement(SortableHeader, { title: "Order Number", name: "number", currentFilters: currentFilters }))
+                    } }, "Clear Filters"))),
+        React.createElement(CardContent, null,
+            React.createElement(Table, null,
+                React.createElement(TableHeader, null,
+                    React.createElement(TableRow, null,
+                        React.createElement(TableHead, null,
+                            React.createElement("div", { className: "form-field mb-0" },
+                                React.createElement(Checkbox, { onCheckedChange: (checked) => {
+                                        if (checked) {
+                                            setSelectedRows(orders.map((o) => o.uuid));
+                                        }
+                                        else {
+                                            setSelectedRows([]);
+                                        }
+                                    } }))),
+                        React.createElement(Area, { className: "", id: "orderGridHeader", noOuter: true, coreComponents: [
+                                {
+                                    component: {
+                                        default: () => (React.createElement(SortableHeader, { title: "Order Number", name: "number", currentFilters: currentFilters }))
+                                    },
+                                    sortOrder: 5
                                 },
-                                sortOrder: 5
-                            },
-                            {
-                                component: {
-                                    default: () => (React.createElement(SortableHeader, { title: "Date", name: "created_at", currentFilters: currentFilters }))
+                                {
+                                    component: {
+                                        default: () => (React.createElement(SortableHeader, { title: "Date", name: "created_at", currentFilters: currentFilters }))
+                                    },
+                                    sortOrder: 10
                                 },
-                                sortOrder: 10
-                            },
-                            {
-                                component: {
-                                    default: () => (React.createElement(SortableHeader, { title: "Customer Email", name: "email", currentFilters: currentFilters }))
+                                {
+                                    component: {
+                                        default: () => (React.createElement(SortableHeader, { title: "Customer Email", name: "email", currentFilters: currentFilters }))
+                                    },
+                                    sortOrder: 15
                                 },
-                                sortOrder: 15
-                            },
-                            {
-                                component: {
-                                    default: () => (React.createElement(SortableHeader, { title: "Shipment Status", name: "shipment_status", currentFilters: currentFilters }))
+                                {
+                                    component: {
+                                        default: () => (React.createElement(SortableHeader, { title: "Shipment Status", name: "shipment_status", currentFilters: currentFilters }))
+                                    },
+                                    sortOrder: 20
                                 },
-                                sortOrder: 20
-                            },
-                            {
-                                component: {
-                                    default: () => (React.createElement(SortableHeader, { title: "Payment Status", name: "payment_status", currentFilters: currentFilters }))
+                                {
+                                    component: {
+                                        default: () => (React.createElement(SortableHeader, { title: "Payment Status", name: "payment_status", currentFilters: currentFilters }))
+                                    },
+                                    sortOrder: 25
                                 },
-                                sortOrder: 25
-                            },
-                            {
-                                component: {
-                                    default: () => (React.createElement(SortableHeader, { title: "Total", name: "total", currentFilters: currentFilters }))
+                                {
+                                    component: {
+                                        default: () => (React.createElement(SortableHeader, { title: "Total", name: "total", currentFilters: currentFilters }))
+                                    },
+                                    sortOrder: 30
+                                }
+                            ] }))),
+                React.createElement(TableBody, null,
+                    React.createElement(Actions, { orders: orders, selectedIds: selectedRows, setSelectedRows: setSelectedRows }),
+                    orders.map((o) => (React.createElement(TableRow, { key: o.orderId },
+                        React.createElement(TableCell, null,
+                            React.createElement("div", { className: "form-field mb-0" },
+                                React.createElement(Checkbox, { checked: selectedRows.includes(o.uuid), onCheckedChange: (checked) => {
+                                        if (checked) {
+                                            setSelectedRows(selectedRows.concat([o.uuid]));
+                                        }
+                                        else {
+                                            setSelectedRows(selectedRows.filter((row) => row !== o.uuid));
+                                        }
+                                    } }))),
+                        React.createElement(Area, { className: "", id: "orderGridRow", row: o, noOuter: true, coreComponents: [
+                                {
+                                    component: {
+                                        default: () => (React.createElement(OrderNumber, { number: o.orderNumber, editUrl: o.editUrl }))
+                                    },
+                                    sortOrder: 5
                                 },
-                                sortOrder: 30
-                            }
-                        ] }))),
-            React.createElement("tbody", null,
-                React.createElement(Actions, { orders: orders, selectedIds: selectedRows, setSelectedRows: setSelectedRows }),
-                orders.map((o) => (React.createElement("tr", { key: o.orderId },
-                    React.createElement("td", null,
-                        React.createElement("div", { className: "form-field mb-0" },
-                            React.createElement("input", { type: "checkbox", checked: selectedRows.includes(o.uuid), onChange: (e) => {
-                                    if (e.target.checked) {
-                                        setSelectedRows(selectedRows.concat([o.uuid]));
-                                    }
-                                    else {
-                                        setSelectedRows(selectedRows.filter((row) => row !== o.uuid));
-                                    }
-                                } }))),
-                    React.createElement(Area, { className: "", id: "orderGridRow", row: o, noOuter: true, coreComponents: [
-                            {
-                                component: {
-                                    default: () => (React.createElement(OrderNumber, { number: o.orderNumber, editUrl: o.editUrl }))
+                                {
+                                    component: {
+                                        default: () => React.createElement(TableCell, null, o.createdAt.text)
+                                    },
+                                    sortOrder: 10
                                 },
-                                sortOrder: 5
-                            },
-                            {
-                                component: {
-                                    default: () => React.createElement("td", null, o.createdAt.text)
+                                {
+                                    component: {
+                                        default: ({ areaProps }) => (React.createElement(TableCell, null, o.customerEmail))
+                                    },
+                                    sortOrder: 15
                                 },
-                                sortOrder: 10
-                            },
-                            {
-                                component: {
-                                    default: ({ areaProps }) => React.createElement("td", null, o.customerEmail)
+                                {
+                                    component: {
+                                        default: () => (React.createElement(ShipmentStatus, { status: o.shipmentStatus }))
+                                    },
+                                    sortOrder: 20
                                 },
-                                sortOrder: 15
-                            },
-                            {
-                                component: {
-                                    default: () => (React.createElement(ShipmentStatus, { status: o.shipmentStatus }))
-                                },
-                                sortOrder: 20
-                            },
-                            {
-                                component: {
-                                    default: () => React.createElement(PaymentStatus, { status: o.paymentStatus })
-                                },
-                                sortOrder: 25
-                            },
-                            {
-                                component: {
-                                    default: () => React.createElement("td", null, o.grandTotal.text)
+                                {
+                                    component: {
+                                        default: () => (React.createElement(PaymentStatus, { status: o.paymentStatus }))
+                                    },
+                                    sortOrder: 25
                                 },
-                                sortOrder: 30
-                            }
-                        ] })))))),
-        orders.length === 0 && (React.createElement("div", { className: "flex w-full justify-center" }, "There is no order to display")),
-        React.createElement(Pagination, { total: total, limit: limit, page: page })));
+                                {
+                                    component: {
+                                        default: () => (React.createElement(TableCell, null, o.grandTotal.text))
+                                    },
+                                    sortOrder: 30
+                                }
+                            ] })))))),
+            orders.length === 0 && (React.createElement("div", { className: "flex w-full justify-center" }, "There is no order to display")),
+            React.createElement(GridPagination, { total: total, limit: limit, page: page }))));
 }
 OrderGrid.propTypes = {
     orders: PropTypes.shape({
@@ -268,14 +268,12 @@ OrderGrid.propTypes = {
             shipmentStatus: PropTypes.shape({
                 name: PropTypes.string.isRequired,
                 code: PropTypes.string.isRequired,
-                badge: PropTypes.string.isRequired,
-                progress: PropTypes.string.isRequired
+                badge: PropTypes.string.isRequired
             }).isRequired,
             paymentStatus: PropTypes.shape({
                 name: PropTypes.string.isRequired,
                 code: PropTypes.string.isRequired,
-                badge: PropTypes.string.isRequired,
-                progress: PropTypes.string.isRequired
+                badge: PropTypes.string.isRequired
             }).isRequired,
             grandTotal: PropTypes.shape({
                 value: PropTypes.number.isRequired,
@@ -320,13 +318,11 @@ export const query = `
           name
           code
           badge
-          progress
         }
         paymentStatus {
           name
           code
           badge
-          progress
         }
         grandTotal {
           value