@evershop/evershop 2.1.0 → 2.1.2

package/dist/modules/paypal/pages/frontStore/checkout/Paypal.js

@@ -1,3 +1,4 @@
+import { Button } from '@components/common/ui/Button.js';
 import { useCheckout, useCheckoutDispatch } from '@components/frontStore/checkout/CheckoutContext.js';
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React, { useEffect } from 'react';
@@ -40,20 +41,25 @@ export default function PaypalMethod({ createOrderAPI, setting: { paypalDisplayN
     }, [orderPlaced, checkoutSuccessUrl, orderId]);
     useEffect(() => {
         registerPaymentComponent('paypal', {
-            nameRenderer: () => (React.createElement("div", { className: "flex items-center justify-between" },
+            nameRenderer: () => (React.createElement("div", { className: "flex items-center justify-between w-full" },
                 React.createElement("span", null, paypalDisplayName),
                 React.createElement(PaypalLogo, null))),
-            formRenderer: () => (React.createElement("div", { className: "flex justify-center text-gray-500" },
-                React.createElement("div", { className: "w-2/3 text-center p-5" }, _('You will be redirected to PayPal for payment processing.')))),
+            formRenderer: () => (React.createElement("div", { className: "flex justify-center text-muted-foreground" },
+                React.createElement("div", { className: "w-2/3 text-center py-3" }, _('You will be redirected to PayPal for payment processing.')))),
             checkoutButtonRenderer: () => {
                 const { checkout } = useCheckoutDispatch();
                 const { loadingStates, orderPlaced } = useCheckout();
                 const handleClick = async (e) => {
-                    e.preventDefault();
-                    await checkout();
+                    try {
+                        e.preventDefault();
+                        await checkout();
+                    }
+                    catch (error) {
+                        toast.error(error.message || _('Failed to place order. Please try again.'));
+                    }
                 };
                 const isDisabled = loadingStates.placingOrder || orderPlaced;
-                return (React.createElement("button", { type: "button", onClick: handleClick, disabled: isDisabled, className: "w-full text-white py-4 px-6 rounded-lg font-semibold text-lg shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 transition-colors duration-200 disabled:opacity-50 disabled:cursor-not-allowed", style: {
+                return (React.createElement(Button, { variant: 'default', size: 'xl', type: "button", onClick: handleClick, disabled: isDisabled, className: "w-full text-white py-4 px-6 rounded-lg font-semibold text-lg shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 transition-colors duration-200 disabled:opacity-50 disabled:cursor-not-allowed", style: {
                         backgroundColor: isDisabled ? '#0070ba80' : '#0070ba'
                     }, onMouseEnter: (e) => {
                         if (!isDisabled) {
@@ -84,7 +90,7 @@ export default function PaypalMethod({ createOrderAPI, setting: { paypalDisplayN
     return null;
 }
 export const layout = {
-    areaId: 'checkoutForm',
+    areaId: 'checkoutFormAfter',
     sortOrder: 10
 };
 export const query = `

package/dist/modules/paypal/pages/frontStore/checkout/Paypal.js.map

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

package/dist/modules/promotion/api/couponRemove/removeCoupon.d.ts

@@ -1,2 +1,4 @@
-declare function _default(request: any, response: any, next: any): Promise<void>;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse, next: any) => Promise<void>;
 export default _default;

package/dist/modules/promotion/api/couponRemove/removeCoupon.js

@@ -1,10 +1,15 @@
-import { translate } from '../../../../lib/locale/index.js';
+import { translate } from '../../../../lib/locale/translate/translate.js';
 import { INTERNAL_SERVER_ERROR, INVALID_PAYLOAD, OK } from '../../../../lib/util/httpStatus.js';
 import { getCartByUUID } from '../../../checkout/services/getCartByUUID.js';
 import { saveCart } from '../../../checkout/services/saveCart.js';
 export default async (request, response, next) => {
     try {
-        const { cart_id, coupon } = request.params;
+        const coupon = Array.isArray(request.params.coupon)
+            ? request.params.coupon[0]
+            : request.params.coupon;
+        const cart_id = Array.isArray(request.params.cart_id)
+            ? request.params.cart_id[0]
+            : request.params.cart_id;
         const cart = await getCartByUUID(cart_id);
         if (!cart) {
             response.status(INVALID_PAYLOAD);

package/dist/modules/promotion/api/couponRemove/removeCoupon.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeCoupon.js","sourceRoot":"","sources":["../../../../../src/modules/promotion/api/couponRemove/removeCoupon.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,EAAE,EACH,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAElE,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,OAAO,EAAE,SAAS,CAAC,cAAc,CAAC;oBAClC,MAAM,EAAE,eAAe;iBACxB;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,MAAM,EAAE,CAAC;YACtC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC;oBAC3C,MAAM,EAAE,eAAe;iBACxB;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnC,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpB,QAAQ,CAAC,KAAK,GAAG;YACf,IAAI,EAAE;gBACJ,MAAM;aACP;SACF,CAAC;QACF,IAAI,EAAE,CAAC;IACT,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC;YAC1C,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,MAAM,EAAE,qBAAqB;aAC9B;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"removeCoupon.js","sourceRoot":"","sources":["../../../../../src/modules/promotion/api/couponRemove/removeCoupon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,EAAE,EACH,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAElE,eAAe,KAAK,EAClB,OAAwB,EACxB,QAA0B,EAC1B,IAAI,EACJ,EAAE;IACF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;YACjD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YAC1B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;YACnD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,OAAO,EAAE,SAAS,CAAC,cAAc,CAAC;oBAClC,MAAM,EAAE,eAAe;iBACxB;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,MAAM,EAAE,CAAC;YACtC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC;oBAC3C,MAAM,EAAE,eAAe;iBACxB;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnC,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpB,QAAQ,CAAC,KAAK,GAAG;YACf,IAAI,EAAE;gBACJ,MAAM;aACP;SACF,CAAC;QACF,IAAI,EAAE,CAAC;IACT,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC;YAC1C,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,MAAM,EAAE,qBAAqB;aAC9B;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/promotion/api/createCoupon/createCoupon[finish].d.ts

@@ -1,2 +1,2 @@
-declare function _default(request: any, response: any): Promise<any>;
+declare function _default(request: any, response: any): Promise<import("../../../../types/db/index.js").CouponRow>;
 export default _default;

package/dist/modules/promotion/api/updateCoupon/updateCoupon[finish].d.ts

@@ -1,2 +1,2 @@
-declare function _default(request: any, response: any): Promise<any>;
+declare function _default(request: any, response: any): Promise<import("../../../../types/db/index.js").CouponRow>;
 export default _default;

package/dist/modules/promotion/pages/admin/all/CouponMenuGroup.js

@@ -1,5 +1,5 @@
 import { NavigationItemGroup } from '@components/admin/NavigationItemGroup.js';
-import { GiftIcon } from '@heroicons/react/24/solid';
+import { GiftIcon } from 'lucide-react';
 import React from 'react';
 export default function CatalogMenuGroup({ couponGrid }) {
     return (React.createElement(NavigationItemGroup, { id: "couponMenuGroup", name: "Promotion", items: [

package/dist/modules/promotion/pages/admin/all/CouponMenuGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"CouponMenuGroup.js","sourceRoot":"","sources":["../../../../../../src/modules/promotion/pages/admin/all/CouponMenuGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EAAE,UAAU,EAAwB;IAC3E,OAAO,CACL,oBAAC,mBAAmB,IAClB,EAAE,EAAC,iBAAiB,EACpB,IAAI,EAAC,WAAW,EAChB,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,UAAU;gBACf,KAAK,EAAE,SAAS;aACjB;SACF,GACD,CACH,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}
+{"version":3,"file":"CouponMenuGroup.js","sourceRoot":"","sources":["../../../../../../src/modules/promotion/pages/admin/all/CouponMenuGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EAAE,UAAU,EAAwB;IAC3E,OAAO,CACL,oBAAC,mBAAmB,IAClB,EAAE,EAAC,iBAAiB,EACpB,IAAI,EAAC,WAAW,EAChB,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,UAAU;gBACf,KAAK,EAAE,SAAS;aACjB;SACF,GACD,CACH,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}

package/dist/modules/promotion/pages/admin/all/NewCouponQuickLink.js

@@ -1,5 +1,5 @@
 import { NavigationItem } from '@components/admin/NavigationItem.js';
-import { GiftIcon } from '@heroicons/react/24/solid';
+import { GiftIcon } from 'lucide-react';
 import React from 'react';
 export default function NewProductQuickLink({ couponNew }) {
     return React.createElement(NavigationItem, { Icon: GiftIcon, title: "New Coupon", url: couponNew });

package/dist/modules/promotion/pages/admin/all/NewCouponQuickLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"NewCouponQuickLink.js","sourceRoot":"","sources":["../../../../../../src/modules/promotion/pages/admin/all/NewCouponQuickLink.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,SAAS,EACe;IACxB,OAAO,oBAAC,cAAc,IAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAC,YAAY,EAAC,GAAG,EAAE,SAAS,GAAI,CAAC;AAC/E,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,YAAY;IACpB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}
+{"version":3,"file":"NewCouponQuickLink.js","sourceRoot":"","sources":["../../../../../../src/modules/promotion/pages/admin/all/NewCouponQuickLink.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,SAAS,EACe;IACxB,OAAO,oBAAC,cAAc,IAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAC,YAAY,EAAC,GAAG,EAAE,SAAS,GAAI,CAAC;AAC/E,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,YAAY;IACpB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}

package/dist/modules/promotion/pages/admin/couponEdit/CouponEditForm.js

@@ -1,25 +1,37 @@
-import { Card } from '@components/admin/Card.js';
 import { FormButtons } from '@components/admin/FormButtons.js';
 import Area from '@components/common/Area.js';
 import { Form } from '@components/common/form/Form.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
 import React from 'react';
 export default function CouponEditForm({ action, gridUrl }) {
     return (React.createElement(Form, { method: "PATCH", action: action, submitBtn: false, id: "couponEditForm" },
         React.createElement("div", { className: "grid grid-cols-1 gap-5" },
-            React.createElement(Card, { title: "General" },
-                React.createElement(Card.Session, null,
+            React.createElement(Card, null,
+                React.createElement(CardHeader, null,
+                    React.createElement(CardTitle, null, "General Information"),
+                    React.createElement(CardDescription, null, "The general information about the coupon.")),
+                React.createElement(CardContent, null,
                     React.createElement(Area, { id: "couponEditGeneral", noOuter: true }))),
-            React.createElement(Card, { title: "Discount Type" },
-                React.createElement(Card.Session, null,
+            React.createElement(Card, null,
+                React.createElement(CardHeader, null,
+                    React.createElement(CardTitle, null, "Discount Type"),
+                    React.createElement(CardDescription, null, "The type of discount applied by the coupon.")),
+                React.createElement(CardContent, null,
                     React.createElement(Area, { id: "couponEditDiscountType", noOuter: true }))),
             React.createElement("div", { className: "grid grid-cols-3 gap-x-5 grid-flow-row " },
                 React.createElement("div", { className: "col-span-2 grid grid-cols-1 gap-5 auto-rows-max" },
-                    React.createElement(Card, { title: "Order conditions" },
-                        React.createElement(Card.Session, null,
+                    React.createElement(Card, null,
+                        React.createElement(CardHeader, null,
+                            React.createElement(CardTitle, null, "Order conditions"),
+                            React.createElement(CardDescription, null, "The conditions related to the order for the coupon to be applied.")),
+                        React.createElement(CardContent, null,
                             React.createElement(Area, { id: "couponEditLeft", noOuter: true, className: "col-8" })))),
                 React.createElement("div", { className: "col-span-1 grid grid-cols-1 gap-5 auto-rows-max" },
-                    React.createElement(Card, { title: "Customer conditions" },
-                        React.createElement(Card.Session, null,
+                    React.createElement(Card, null,
+                        React.createElement(CardHeader, null,
+                            React.createElement(CardTitle, null, "Customer conditions"),
+                            React.createElement(CardDescription, null, "The conditions related to the customer for the coupon to be applied.")),
+                        React.createElement(CardContent, null,
                             React.createElement(Area, { id: "couponEditRight", className: "col-4", noOuter: true })))))),
         React.createElement(FormButtons, { cancelUrl: gridUrl, formId: "couponEditForm" })));
 }

package/dist/modules/promotion/pages/admin/couponEdit/CouponEditForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"CouponEditForm.js","sourceRoot":"","sources":["../../../../../../src/modules/promotion/pages/admin/couponEdit/CouponEditForm.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,MAAM,EACN,OAAO,EACa;IACpB,OAAO,CACL,oBAAC,IAAI,IAAC,MAAM,EAAC,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAC,gBAAgB;QACxE,6BAAK,SAAS,EAAC,wBAAwB;YACrC,oBAAC,IAAI,IAAC,KAAK,EAAC,SAAS;gBACnB,oBAAC,IAAI,CAAC,OAAO;oBACX,oBAAC,IAAI,IAAC,EAAE,EAAC,mBAAmB,EAAC,OAAO,SAAG,CAC1B,CACV;YACP,oBAAC,IAAI,IAAC,KAAK,EAAC,eAAe;gBACzB,oBAAC,IAAI,CAAC,OAAO;oBACX,oBAAC,IAAI,IAAC,EAAE,EAAC,wBAAwB,EAAC,OAAO,SAAG,CAC/B,CACV;YACP,6BAAK,SAAS,EAAC,yCAAyC;gBACtD,6BAAK,SAAS,EAAC,iDAAiD;oBAC9D,oBAAC,IAAI,IAAC,KAAK,EAAC,kBAAkB;wBAC5B,oBAAC,IAAI,CAAC,OAAO;4BACX,oBAAC,IAAI,IAAC,EAAE,EAAC,gBAAgB,EAAC,OAAO,QAAC,SAAS,EAAC,OAAO,GAAG,CACzC,CACV,CACH;gBACN,6BAAK,SAAS,EAAC,iDAAiD;oBAC9D,oBAAC,IAAI,IAAC,KAAK,EAAC,qBAAqB;wBAC/B,oBAAC,IAAI,CAAC,OAAO;4BACX,oBAAC,IAAI,IAAC,EAAE,EAAC,iBAAiB,EAAC,SAAS,EAAC,OAAO,EAAC,OAAO,SAAG,CAC1C,CACV,CACH,CACF,CACF;QACN,oBAAC,WAAW,IAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAC,gBAAgB,GAAG,CACtD,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;CAKpB,CAAC"}
+{"version":3,"file":"CouponEditForm.js","sourceRoot":"","sources":["../../../../../../src/modules/promotion/pages/admin/couponEdit/CouponEditForm.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EACL,IAAI,EACJ,WAAW,EACX,eAAe,EACf,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,MAAM,EACN,OAAO,EACa;IACpB,OAAO,CACL,oBAAC,IAAI,IAAC,MAAM,EAAC,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAC,gBAAgB;QACxE,6BAAK,SAAS,EAAC,wBAAwB;YACrC,oBAAC,IAAI;gBACH,oBAAC,UAAU;oBACT,oBAAC,SAAS,8BAAgC;oBAC1C,oBAAC,eAAe,oDAEE,CACP;gBACb,oBAAC,WAAW;oBACV,oBAAC,IAAI,IAAC,EAAE,EAAC,mBAAmB,EAAC,OAAO,SAAG,CAC3B,CACT;YACP,oBAAC,IAAI;gBACH,oBAAC,UAAU;oBACT,oBAAC,SAAS,wBAA0B;oBACpC,oBAAC,eAAe,sDAEE,CACP;gBACb,oBAAC,WAAW;oBACV,oBAAC,IAAI,IAAC,EAAE,EAAC,wBAAwB,EAAC,OAAO,SAAG,CAChC,CACT;YACP,6BAAK,SAAS,EAAC,yCAAyC;gBACtD,6BAAK,SAAS,EAAC,iDAAiD;oBAC9D,oBAAC,IAAI;wBACH,oBAAC,UAAU;4BACT,oBAAC,SAAS,2BAA6B;4BACvC,oBAAC,eAAe,4EAGE,CACP;wBACb,oBAAC,WAAW;4BACV,oBAAC,IAAI,IAAC,EAAE,EAAC,gBAAgB,EAAC,OAAO,QAAC,SAAS,EAAC,OAAO,GAAG,CAC1C,CACT,CACH;gBACN,6BAAK,SAAS,EAAC,iDAAiD;oBAC9D,oBAAC,IAAI;wBACH,oBAAC,UAAU;4BACT,oBAAC,SAAS,8BAAgC;4BAC1C,oBAAC,eAAe,+EAGE,CACP;wBACb,oBAAC,WAAW;4BACV,oBAAC,IAAI,IAAC,EAAE,EAAC,iBAAiB,EAAC,SAAS,EAAC,OAAO,EAAC,OAAO,SAAG,CAC3C,CACT,CACH,CACF,CACF;QACN,oBAAC,WAAW,IAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAC,gBAAgB,GAAG,CACtD,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;CAKpB,CAAC"}

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/CustomerCondition.js

@@ -12,7 +12,7 @@ const customStyles = {
 export default function CustomerCondition({ coupon, groups: { items: customerGroups } }) {
     const condition = coupon === null || coupon === void 0 ? void 0 : coupon.userCondition;
     const selectedGroups = (condition === null || condition === void 0 ? void 0 : condition.groups) || [];
-    return (React.createElement(Area, { id: "couponCustomerCondition", coreComponents: [
+    return (React.createElement(Area, { id: "couponCustomerCondition", className: "space-y-3", coreComponents: [
             {
                 component: {
                     default: () => (React.createElement(ReactSelectField, { label: "Customer groups", name: "user_condition.groups", options: customerGroups.map((group) => ({
@@ -36,7 +36,7 @@ export default function CustomerCondition({ coupon, groups: { items: customerGro
             },
             {
                 component: {
-                    default: (React.createElement(NumberField, { label: "Customer's purchase", placeholder: "Enter purchased amount", defaultValue: (condition === null || condition === void 0 ? void 0 : condition.purchased) || 0, name: "user_condition.purchased", min: 0, helperText: "Minimum purchased amount. This only applies to registered customers." }))
+                    default: (React.createElement(NumberField, { label: "Customer's purchase", placeholder: "Enter purchased amount", defaultValue: parseInt(condition === null || condition === void 0 ? void 0 : condition.purchased) || 0, name: "user_condition.purchased", min: 0, helperText: "Minimum purchased amount. This only applies to registered customers." }))
                 },
                 sortOrder: 30,
                 id: 'couponCustomerConditionPurchased'

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/CustomerCondition.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomerCondition.js","sourceRoot":"","sources":["../../../../../../src/modules/promotion/pages/admin/couponEdit+couponNew/CustomerCondition.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,sDAAsD,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,MAAM,YAAY,GAAG;IACnB,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACxB,GAAG,QAAQ;QACX,MAAM,EAAE,IAAI;KACb,CAAC;CACH,CAAC;AAYF,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,MAAM,EACN,MAAM,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,EACV;IACvB,MAAM,SAAS,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC;IACxC,MAAM,cAAc,GAAG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,KAAI,EAAE,CAAC;IAE/C,OAAO,CACL,oBAAC,IAAI,IACH,EAAE,EAAC,yBAAyB,EAC5B,cAAc,EAAE;YACd;gBACE,SAAS,EAAE;oBACT,OAAO,EAAE,GAAG,EAAE,CAAC,CACb,oBAAC,gBAAgB,IACf,KAAK,EAAC,iBAAiB,EACvB,IAAI,EAAC,uBAAuB,EAC5B,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;4BACtC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE;4BAC7B,KAAK,EAAE,KAAK,CAAC,IAAI;yBAClB,CAAC,CAAC,EACH,mBAAmB,QACnB,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,YAAY,GACpB,CACH;iBACF;gBACD,KAAK,EAAE,EAAE;gBACT,SAAS,EAAE,EAAE;gBACb,EAAE,EAAE,8BAA8B;aACnC;YACD;gBACE,SAAS,EAAE;oBACT,OAAO,EAAE,CACP,oBAAC,yBAAyB,IACxB,IAAI,EAAC,uBAAuB,EAC5B,KAAK,EAAC,iBAAiB,EACvB,WAAW,EAAC,uBAAuB,EACnC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,KAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;4BACjD,KAAK,EAAE,KAAe;4BACtB,KAAK,EAAE,KAAe;yBACvB,CAAC,CAAC,EACH,YAAY,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,KAAI,EAAE,GACrC,CACH;iBACF;gBACD,SAAS,EAAE,EAAE;gBACb,EAAE,EAAE,8BAA8B;aACnC;YACD;gBACE,SAAS,EAAE;oBACT,OAAO,EAAE,CACP,oBAAC,WAAW,IACV,KAAK,EAAC,qBAAqB,EAC3B,WAAW,EAAC,wBAAwB,EACpC,YAAY,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,KAAI,CAAC,EACvC,IAAI,EAAC,0BAA0B,EAC/B,GAAG,EAAE,CAAC,EACN,UAAU,EAAC,sEAAsE,GACjF,CACH;iBACF;gBACD,SAAS,EAAE,EAAE;gBACb,EAAE,EAAE,kCAAkC;aACvC;SACF,GACD,CACH,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,iBAAiB;IACzB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;CAgBpB,CAAC"}
+{"version":3,"file":"CustomerCondition.js","sourceRoot":"","sources":["../../../../../../src/modules/promotion/pages/admin/couponEdit+couponNew/CustomerCondition.tsx"],"names":[],"mappings":"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"}

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/General.js

@@ -8,7 +8,7 @@ import { get } from '../../../../../lib/util/get.js';
 import { Setting } from './components/Setting.js';
 import './General.scss';
 export default function General({ coupon }) {
-    return (React.createElement(Area, { id: "couponFormGeneral", coreComponents: [
+    return (React.createElement(Area, { id: "couponFormGeneral", className: "space-y-3", coreComponents: [
             {
                 component: {
                     default: (React.createElement(InputField, { name: "coupon", label: "Coupon Code", defaultValue: (coupon === null || coupon === void 0 ? void 0 : coupon.coupon) || '', placeholder: "Enter coupon code", required: true, validation: {

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/General.js.map

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

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/General.scss

@@ -1,7 +1,10 @@
-.page-heading {
-  max-width: 62.5rem;
-}
-.main-content-inner {
-  max-width: 62.5rem;
-  margin: 1.875rem auto;
+body.couponEdit,
+body.couponNew {
+  .main-content-inner {
+    max-width: 62.5rem;
+    margin: 1.875rem auto;
+  }
+  .page-heading {
+    max-width: 62.5rem;
+  }
 }

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/components/AttributeGroupConditionValueSelector.js

@@ -1,19 +1,15 @@
 import { AttributeGroupSelector } from '@components/admin/AttributeGroupSelector.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, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@components/common/ui/Dialog.js';
 import React from 'react';
 export const AttributeGroupConditionValueSelector = ({ selectedValues, updateCondition, isMulti }) => {
+    const [dialogOpen, setDialogOpen] = React.useState(false);
     const skus = Array.isArray(selectedValues) ? selectedValues : [];
     const selectedIds = React.useRef(skus || []);
-    const modal = useModal({
-        onAfterClose: () => {
-            updateCondition(selectedIds.current);
-        }
-    });
     const onSelect = (id) => {
         if (!isMulti) {
             selectedIds.current = [id];
-            modal.close();
+            setDialogOpen(false);
         }
         else {
             const prev = selectedIds.current;
@@ -26,26 +22,29 @@ export const AttributeGroupConditionValueSelector = ({ selectedValues, updateCon
         const prev = selectedIds.current;
         selectedIds.current = prev.filter((s) => s !== id);
     };
-    return (React.createElement("div", null,
-        React.createElement("a", { href: "#", className: "text-interactive hover:underline", onClick: (e) => {
-                e.preventDefault();
-                modal.open();
-            } },
-            selectedIds.current.map((id, index) => (React.createElement("span", { key: id },
-                index === 0 && React.createElement("span", { className: "italic" },
-                    "\u2018",
-                    id,
-                    "\u2019"),
-                index === 1 && (React.createElement("span", null,
-                    " and ",
-                    selectedIds.current.length - 1,
-                    " more"))))),
-            selectedIds.current.length === 0 && (React.createElement("span", null, "Choose Attribute Groups"))),
-        React.createElement(Modal, { title: "Select Attribute Groups", onClose: modal.close, isOpen: modal.isOpen },
-            React.createElement("div", { className: "overflow-auto", style: { maxHeight: '60vh' } },
-                React.createElement(AttributeGroupSelector, { onSelect: onSelect, onUnSelect: onUnSelect, selectedAttributeGroups: selectedIds.current.map((id) => ({
-                        attributeGroupId: id,
-                        uuid: undefined
-                    })) })))));
+    return (React.createElement(Dialog, { open: dialogOpen, onOpenChange: (open) => setDialogOpen(open), onOpenChangeComplete: (open) => {
+            if (!open) {
+                updateCondition(selectedIds.current);
+            }
+        } },
+        React.createElement(DialogTrigger, null,
+            React.createElement(Button, { variant: 'link' },
+                selectedIds.current.map((id, index) => (React.createElement("span", { key: id },
+                    index === 0 && (React.createElement("span", { className: "italic" },
+                        "\u2018",
+                        id,
+                        "\u2019")),
+                    index === 1 && (React.createElement("span", null,
+                        " and ",
+                        selectedIds.current.length - 1,
+                        " more"))))),
+                selectedIds.current.length === 0 && (React.createElement("span", null, "Choose Attribute Groups")))),
+        React.createElement(DialogContent, { className: 'max-w-[60vw]' },
+            React.createElement(DialogHeader, null,
+                React.createElement(DialogTitle, null, "Choose Attribute Groups")),
+            React.createElement(AttributeGroupSelector, { onSelect: onSelect, onUnSelect: onUnSelect, selectedAttributeGroups: selectedIds.current.map((id) => ({
+                    attributeGroupId: id,
+                    uuid: undefined
+                })) }))));
 };
 //# sourceMappingURL=AttributeGroupConditionValueSelector.js.map

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/components/AttributeGroupConditionValueSelector.js.map

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

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/components/BuyXGetY.js

@@ -1,27 +1,26 @@
 import { ProductSelector } from '@components/admin/ProductSelector.js';
 import { NumberField } from '@components/common/form/NumberField.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, DialogContent, DialogHeader, DialogTrigger, DialogTitle } from '@components/common/ui/Dialog.js';
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@components/common/ui/Table.js';
 import React, { useEffect } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 const SkuSelector = ({ product, updateProduct }) => {
-    const modal = useModal();
     const onSelect = (sku) => {
         updateProduct({
             ...product,
             sku
         });
-        modal.close();
     };
-    return (React.createElement("div", null,
-        React.createElement("a", { href: "#", className: "text-interactive hover:underline", onClick: (e) => {
-                e.preventDefault();
-                modal.open();
-            } }, product.sku ? (React.createElement("span", { className: "italic" },
-            "\u2018",
-            product.sku,
-            "\u2019")) : (React.createElement("span", null, "Choose SKU"))),
-        React.createElement(Modal, { title: "Select SKU", onClose: modal.close, isOpen: modal.isOpen },
+    return (React.createElement(Dialog, null,
+        React.createElement(DialogTrigger, null,
+            React.createElement(Button, { variant: 'link' }, product.sku ? (React.createElement("span", { className: "italic" },
+                "\u2018",
+                product.sku,
+                "\u2019")) : (React.createElement("span", null, "Choose SKU")))),
+        React.createElement(DialogContent, { className: 'max-w-[80vw]' },
+            React.createElement(DialogHeader, null,
+                React.createElement(DialogTitle, null, "Choose Product SKU")),
             React.createElement(ProductSelector, { selectedProducts: [product].map((p) => ({
                     sku: p.sku,
                     uuid: undefined,
@@ -54,46 +53,46 @@ const BuyXGetYList = ({ requireProducts }) => {
         };
     }, []);
     return (React.createElement("div", null,
-        React.createElement("table", { className: "table table-bordered" },
-            React.createElement("thead", null,
-                React.createElement("tr", null,
-                    React.createElement("th", null,
+        React.createElement(Table, null,
+            React.createElement(TableHeader, null,
+                React.createElement(TableRow, null,
+                    React.createElement(TableHead, null,
                         React.createElement("span", null, "Sku")),
-                    React.createElement("th", null,
+                    React.createElement(TableHead, null,
                         React.createElement("span", null, "X")),
-                    React.createElement("th", null,
+                    React.createElement(TableHead, null,
                         React.createElement("span", null, "Y")),
-                    React.createElement("th", null,
+                    React.createElement(TableHead, null,
                         React.createElement("span", null, "Max of Y")),
-                    React.createElement("th", null,
+                    React.createElement(TableHead, null,
                         React.createElement("span", null, "Discount percent")),
-                    React.createElement("th", null, " "))),
-            React.createElement("tbody", null, fields.map((p, i) => (React.createElement("tr", { key: p.id },
-                React.createElement("td", null,
+                    React.createElement(TableHead, null, " "))),
+            React.createElement(TableBody, null, fields.map((p, i) => (React.createElement(TableRow, { key: p.id },
+                React.createElement(TableCell, null,
                     React.createElement(SkuSelector, { product: p, updateProduct: (product) => {
                             update(i, {
                                 ...p,
                                 sku: product.sku
                             });
                         } })),
-                React.createElement("td", null,
+                React.createElement(TableCell, null,
                     React.createElement(NumberField, { name: `buyx_gety.${i}.buy_qty`, defaultValue: p.buyQty, placeholder: "Buy qty", required: true, validation: {
                             required: 'Buy qty is required'
                         } })),
-                React.createElement("td", null,
+                React.createElement(TableCell, null,
                     React.createElement(NumberField, { name: `buyx_gety.${i}.get_qty`, defaultValue: p.getQty, placeholder: "Get qty", required: true, validation: {
                             required: 'Get qty is required'
                         } })),
-                React.createElement("td", null,
+                React.createElement(TableCell, null,
                     React.createElement(NumberField, { name: `buyx_gety.${i}.max_y`, defaultValue: p.maxY, placeholder: "Max of Y", required: true, validation: {
                             required: 'Max of Y is required'
                         } })),
-                React.createElement("td", null,
+                React.createElement(TableCell, null,
                     React.createElement(NumberField, { name: `buyx_gety.${i}.discount`, defaultValue: p.discount, placeholder: "Discount percent", required: true, validation: {
                             required: 'Discount percent is required'
                         }, unit: "%" })),
-                React.createElement("td", null,
-                    React.createElement("a", { className: "text-critical", href: "#", onClick: (e) => {
+                React.createElement(TableCell, null,
+                    React.createElement("a", { className: "text-destructive", href: "#", onClick: (e) => {
                             e.preventDefault();
                             remove(i);
                         } },

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/components/BuyXGetY.js.map

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

package/dist/modules/promotion/pages/admin/couponEdit+couponNew/components/CategoryConditionValueSelector.js

@@ -1,18 +1,14 @@
 import { CategorySelector } from '@components/admin/CategorySelector.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, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@components/common/ui/Dialog.js';
 import React from 'react';
 export const CategoryConditionValueSelector = ({ selectedValues, updateCondition, isMulti }) => {
+    const [dialogOpen, setDialogOpen] = React.useState(false);
     const selectedIds = React.useRef(Array.isArray(selectedValues) ? selectedValues.map(Number) : []);
-    const modal = useModal({
-        onAfterClose: () => {
-            updateCondition(selectedIds.current);
-        }
-    });
     const onSelect = (id) => {
         if (!isMulti) {
             selectedIds.current = [id];
-            modal.close();
+            setDialogOpen(false);
         }
         else {
             const prev = selectedIds.current;
@@ -25,26 +21,29 @@ export const CategoryConditionValueSelector = ({ selectedValues, updateCondition
         const prev = selectedIds.current;
         selectedIds.current = prev.filter((s) => s !== id);
     };
-    return (React.createElement("div", null,
-        React.createElement("a", { href: "#", className: "text-interactive hover:underline", onClick: (e) => {
-                e.preventDefault();
-                modal.open();
-            } },
-            selectedIds.current.map((id, index) => (React.createElement("span", { key: id },
-                index === 0 && React.createElement("span", { className: "italic" },
-                    "\u2018",
-                    id,
-                    "\u2019"),
-                index === 1 && (React.createElement("span", null,
-                    " and ",
-                    selectedIds.current.length - 1,
-                    " more"))))),
-            selectedIds.current.length === 0 && React.createElement("span", null, "Choose Categories")),
-        React.createElement(Modal, { title: "Select Categories", onClose: modal.close, isOpen: modal.isOpen },
-            React.createElement("div", { className: "overflow-auto", style: { maxHeight: '60vh' } },
-                React.createElement(CategorySelector, { onSelect: onSelect, onUnSelect: onUnSelect, selectedCategories: selectedIds.current.map((id) => ({
-                        categoryId: id,
-                        uuid: undefined
-                    })) })))));
+    return (React.createElement(Dialog, { open: dialogOpen, onOpenChange: (open) => setDialogOpen(open), onOpenChangeComplete: (open) => {
+            if (!open) {
+                updateCondition(selectedIds.current);
+            }
+        } },
+        React.createElement(DialogTrigger, null,
+            React.createElement(Button, { variant: 'link' },
+                selectedIds.current.map((id, index) => (React.createElement("span", { key: id },
+                    index === 0 && (React.createElement("span", { className: "italic" },
+                        "\u2018",
+                        id,
+                        "\u2019")),
+                    index === 1 && (React.createElement("span", null,
+                        " and ",
+                        selectedIds.current.length - 1,
+                        " more"))))),
+                selectedIds.current.length === 0 && React.createElement("span", null, "Choose Categories"))),
+        React.createElement(DialogContent, { className: 'max-w-[60vw]' },
+            React.createElement(DialogHeader, null,
+                React.createElement(DialogTitle, null, "Choose Categories")),
+            React.createElement(CategorySelector, { onSelect: onSelect, onUnSelect: onUnSelect, selectedCategories: selectedIds.current.map((id) => ({
+                    categoryId: id,
+                    uuid: undefined
+                })) }))));
 };
 //# sourceMappingURL=CategoryConditionValueSelector.js.map