@licklist/design 0.66.0 → 0.66.1-dev.0

package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx

@@ -40,6 +40,10 @@ export const SelectEventProductSet = ({
   const productSetId = watch("productSetId");
   const editedProductSet = watch("editedProductSet");
 
+  const selectedProductSet = productSets.find(
+    (productSet) => productSet.id === productSetId
+  )?.parentMenuId;
+
   const onEditProductSet = useCallback(
     () => {
       setEditProductSetId(String(productSetId));
@@ -84,6 +88,9 @@ export const SelectEventProductSet = ({
     setValue("productSetId", value);
   };
 
+  const showOverrideProductSet =
+    !showEditProductSet && productSetId && !selectedProductSet;
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const onSubmit = (value: EditEventFormValues["editedProductSet"]) => {
     setShowEditProductSet(false);
@@ -159,7 +166,7 @@ export const SelectEventProductSet = ({
                           {t("addNewProductSet")}
                         </Button>
                       )}
-                      {!showEditProductSet && productSetId && (
+                      {showOverrideProductSet && (
                         <Button
                           variant=""
                           className="btn product-set-button "
@@ -199,14 +206,12 @@ export const SelectEventProductSet = ({
         </Form.Group>
       </div>
       {showEditProductSet && productSetId && (
-        <>
-          <EditEventProductSet
-            onSubmit={onSubmit}
-            defaultValues={
-              productSetId === editedProductSet?.id && editedProductSet
-            }
-          />
-        </>
+        <EditEventProductSet
+          onSubmit={onSubmit}
+          defaultValues={
+            productSetId === editedProductSet?.id && editedProductSet
+          }
+        />
       )}
     </>
   );

package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx

@@ -124,6 +124,8 @@ export const EditEventProductSet = ({
             companyName={selectedCompany?.title}
             fee={feeInPercent}
             isEventEditProductSet
+            isOverrides
+            workHours={undefined}
           />
           <Button
             disabled={isLoading}

package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx

@@ -63,6 +63,7 @@ const processedPaymentSummary = ({
   const total = calculateTotalPrice(order, externalPaymentDetail);
 
   const totalDiscount = calculateTotalDiscount(order.payments);
+
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,

package/src/product-set/control/DateAndRecurrenceInput.tsx

@@ -28,15 +28,13 @@ import {
   AvailableTimesControlRef,
 } from "../../zone/form/components/AvailableTimesControl";
 
-// eslint-disable-next-line max-len
-
 export interface DateAndRecurrenceInputValues {
   menuRecurrences?: Partial<ProductSetRecurrence>[];
 }
 
 interface DateAndRecurrenceInputProps {
   isEventEditProductSet?: boolean;
-  workHours?: WorkHour[];
+  workHours: WorkHour[] | undefined;
   providerHasBookingManagement: boolean;
   isLoading?: boolean;
 }
@@ -90,7 +88,7 @@ export const DateAndRecurrenceInput = ({
     clearEditState();
   });
 
-  const popoverId = useId()!;
+  const popoverId = useId();
 
   const { t } = useTranslation("Design");
 
@@ -228,6 +226,7 @@ export const DateAndRecurrenceInput = ({
                 defaultValues={editState.values}
                 onChange={handleRecurringDateChange}
                 onDelete={handleDelete}
+                workHours={workHours}
               >
                 {providerHasBookingManagement && (
                   <AvailableTimesControl

package/src/product-set/control/DateInput.tsx

@@ -5,7 +5,7 @@ import { Form, OverlayTrigger, Popover } from "react-bootstrap";
 import { useFieldArray, useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useClickAway } from "react-use";
-import { TIMEZONE, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
+import { UTC_TIMEZONE, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
 import { ProductSetRecurrence } from "@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper";
 import { DateTime } from "luxon";
 import RRule, { Frequency } from "rrule";
@@ -136,7 +136,7 @@ export const DateInput = ({
       until: (start as DateTime).toJSDate(),
       byweekday: [],
       freq: Frequency.DAILY,
-      tzid: TIMEZONE,
+      tzid: UTC_TIMEZONE,
       interval: 1,
     }).replace("RRULE:", "");
 

package/src/product-set/control/ProductSetControl.tsx

@@ -85,9 +85,10 @@ export interface ProductSetControlProps {
   fieldSets?: FieldSet[];
   showEmailTemplate?: boolean;
   showSmsTemplate?: boolean;
-  workHours?: WorkHour[];
+  workHours: WorkHour[] | undefined;
   providerHasBookingManagement?: boolean;
   isOverrides?: boolean;
+  isCreateNewOverrides?: boolean;
 }
 
 export function ProductSetControl({
@@ -104,6 +105,7 @@ export function ProductSetControl({
   workHours,
   providerHasBookingManagement = false,
   isOverrides = false,
+  isCreateNewOverrides = false,
 }: ProductSetControlProps) {
   const { t } = useTranslation(["Design", "Validation", "Notification"]);
   const {
@@ -123,6 +125,11 @@ export function ProductSetControl({
 
   const showSmsTemplateSelector = showSmsTemplate && !isOverrides;
   const showEmailTemplateSelector = showEmailTemplate && !isOverrides;
+  const showDateSelector = !isEventEditProductSet && isOverrides;
+
+  const isZoneAdded = steps.some(({ productCategories }) =>
+    productCategories.some(({ zoneId }) => zoneId)
+  );
 
   return (
     <Row
@@ -165,9 +172,9 @@ export function ProductSetControl({
           </Form.Control.Feedback>
         </Form.Group>
 
-        {isOverrides ? (
+        {showDateSelector ? (
           <DateInput
-            workHours={workHours}
+            workHours={isZoneAdded ? workHours : undefined}
             isLoading={isLoading}
             providerHasBookingManagement={providerHasBookingManagement}
           />
@@ -176,7 +183,7 @@ export function ProductSetControl({
             {isCreateAction && (
               <DateAndRecurrenceInput
                 isEventEditProductSet={isEventEditProductSet}
-                workHours={workHours}
+                workHours={isZoneAdded ? workHours : undefined}
                 isLoading={isLoading}
                 providerHasBookingManagement={providerHasBookingManagement}
               />
@@ -188,7 +195,12 @@ export function ProductSetControl({
 
         <TutorialGifCard isOverrides={isOverrides} />
 
-        <StepsControl isLoading={isLoading} isOverrides={isOverrides} />
+        <StepsControl
+          isLoading={isLoading}
+          isEventEditProductSet={isEventEditProductSet}
+          isOverrides={isOverrides}
+          isCreateNewOverrides={isCreateNewOverrides}
+        />
       </Col>
       <Col md={6} sm={12}>
         <div className="second-column">

package/src/product-set/form/ProductCategoriesControl.tsx

@@ -36,6 +36,8 @@ import { useSortableTreeFunctions } from "../hooks/useSortableTreeFunctions";
 interface ProductCategoriesControlProps extends WithIsLoading {
   stepIndex: number;
   isOverrides?: boolean;
+  isEventEditProductSet?: boolean;
+  isCreateNewOverrides?: boolean;
 }
 
 const getCategoryDefaultValue = (
@@ -67,6 +69,8 @@ export function ProductCategoriesControl({
   isLoading,
   stepIndex,
   isOverrides,
+  isEventEditProductSet,
+  isCreateNewOverrides,
 }: ProductCategoriesControlProps) {
   const { t } = useTranslation("Design");
   const {
@@ -214,6 +218,11 @@ export function ProductCategoriesControl({
             ? String(productCategory.id)
             : productCategory.uniqueId;
 
+          const isOverridesCategory = productCategory.products.some((product) =>
+            isEventEditProductSet ? !!product.id : !!product.originalProductId
+          );
+          const isNewOverridesCategory =
+            isCreateNewOverrides && !!productCategory.id;
           const onSetIsExpanded = () => {
             setIsExpanded(productCategoryId);
           };
@@ -269,7 +278,10 @@ export function ProductCategoriesControl({
                       categoryName={value}
                       stepIndex={stepIndex}
                       productCategoryIndex={index}
-                      isOverride={isOverrides}
+                      isOverride={
+                        isNewOverridesCategory ||
+                        (isOverrides && isOverridesCategory)
+                      }
                     />
                   }
                   isOverride={isOverrides}
@@ -296,6 +308,8 @@ export function ProductCategoriesControl({
                     productCategoryIndex={index}
                     categoryType={productCategory.type}
                     isOverrides={isOverrides}
+                    isEventEditProductSet={isEventEditProductSet}
+                    isCreateNewOverrides={isCreateNewOverrides}
                   />
                 </SortableTree.Item>
               )}
@@ -305,9 +319,7 @@ export function ProductCategoriesControl({
       </SortableTree>
       <CreateProductSetItem
         title={t("addCategory")}
-        isOverride={isOverrides}
         onClick={() => {
-          if (isOverrides) return;
           setIsSelectCategoryVisible(true);
         }}
       />
@@ -316,7 +328,6 @@ export function ProductCategoriesControl({
         isVisible={isSelectCategoryVisible}
         onHide={() => setIsSelectCategoryVisible(false)}
         onCategorySelect={(categoryType) => {
-          if (isOverrides) return;
           append(getCategoryDefaultValue(categoryType, fields.length));
           setShowCategoryModal(true);
           if (

package/src/product-set/form/ProductSetForm.tsx

@@ -26,12 +26,16 @@ import { checkAvailableTimesErrors, getFilteredTemplates } from "../utils";
 export interface WithIsLoading {
   isLoading: boolean;
 }
+export interface WithIdOptional {
+  id?: number;
+}
+
 export interface WithId {
   id: number;
 }
 export interface ProductSetFormValues
   extends FormValues,
-    WithId,
+    WithIdOptional,
     ProductSetControlValues {
   steps: Step[];
   isOverrides?: boolean;
@@ -53,6 +57,7 @@ export interface ProductSetFormProps
   isCreateAction?: boolean;
   isOverrides?: boolean;
   workHours?: WorkHour[];
+  isCreateNewOverrides?: boolean;
 }
 
 export function ProductSetForm({
@@ -70,6 +75,7 @@ export function ProductSetForm({
   isCreateAction,
   workHours,
   isOverrides,
+  isCreateNewOverrides,
   ...shared
 }: ProductSetFormProps) {
   const { t } = useTranslation("Design");
@@ -115,7 +121,11 @@ export function ProductSetForm({
   }, [serverErrors, setError]);
 
   useEffect(() => {
-    window.history.pushState(null, "", window.location.pathname);
+    window.history.pushState(
+      null,
+      "",
+      window.location.pathname + window.location.search
+    );
     window.addEventListener("beforeunload", onBeforeUnload);
     window.addEventListener("popstate", onPopState);
 
@@ -166,6 +176,7 @@ export function ProductSetForm({
                     workHours={workHours}
                     providerHasBookingManagement={providerHasBookingManagement}
                     isOverrides={isOverrides}
+                    isCreateNewOverrides={isCreateNewOverrides}
                   />
                   <Row>
                     <Col md={6} sm={12} />

package/src/product-set/form/ProductsControl.tsx

@@ -35,6 +35,8 @@ interface ProductsControlProps extends WithIsLoading {
   categoryType: CategoryType;
   zones?: Zone[];
   isOverrides?: boolean;
+  isEventEditProductSet?: boolean;
+  isCreateNewOverrides?: boolean;
 }
 
 const getDefaultProductValue = (sort: number): Product => ({
@@ -57,6 +59,7 @@ const getDefaultProductValue = (sort: number): Product => ({
   quantitySelector: 1,
   hasSpecialNotes: false,
   weight: 0,
+  originalProductId: null,
   type: DEFAULT_PRODUCT_TYPE,
   tierId: Number(uniqueId()),
   zoneId: null,
@@ -79,6 +82,8 @@ export function ProductsControl({
   categoryType,
   zones,
   isOverrides,
+  isEventEditProductSet,
+  isCreateNewOverrides,
 }: ProductsControlProps) {
   const { t } = useTranslation("Design");
   const form = useFormContext<ProductSetFormValues>();
@@ -203,90 +208,101 @@ export function ProductsControl({
         onDragEnd={handleDragEnd}
         sensors={[mouseSensor]}
       >
-        {fields.map((product, index) => (
-          <Controller
-            key={product._id}
-            control={control}
-            name={`${productControlFieldName}.${index}.name` as const}
-            rules={{
-              required: t("Validation:fieldRequired", {
-                attribute: t("name"),
-              }) as string,
-            }}
-            render={({ field: { value, onChange } }) => (
-              <SortableTree.Item
-                key={`product-${product._id}`}
-                id={String(product._id)}
-                isExpanded={isFirstProductAdded}
-                isInvalid={!!categoryProductErrors}
-                title={value}
-                isOverride={isOverrides}
-                badge={<Badge className="product-badge">{t("product")}</Badge>}
-                isIconInHeader={false}
-                cancelChanges={() => cancelChanges(index)}
-                edit={() => edit(index)}
-                isProduct
-                secondaryBadge={getBadgeConfig(categoryType, t(categoryType))}
-                subTitle={
-                  <div className="product-set-badges-container">
-                    <div className="product-set-subtitle-dot product-set-subtitle-product-dot" />
-                    <span>
-                      {`£${prices[index]} ${t("each")} - ${t("qty")}:${
-                        !isUnlimitedQuantities[index]
-                          ? ` ${quantities[index]}`
-                          : t(" unlimited")
-                      } ${
-                        !isUnlimitedQuantities[index]
-                          ? ` - ${t("possibleRevenue")} £${
-                              prices[index] * quantities[index]
-                            }`
-                          : ""
-                      } `}
-                    </span>
-                  </div>
-                }
-                modalLabel={t("addNewProduct")}
-                modalClass={ProductSetModalClasses.product}
-                isNewAdded={showProductModal}
-                body={
-                  <ProductControl<ProductSetFormValues>
+        {fields.map((product, index) => {
+          const isOverridesProductSet = isEventEditProductSet
+            ? !!product.id
+            : isOverrides && !!product.originalProductId;
+
+          const isNewProductOverrides = isCreateNewOverrides && !!product.id;
+
+          return (
+            <Controller
+              key={product._id}
+              control={control}
+              name={`${productControlFieldName}.${index}.name` as const}
+              rules={{
+                required: t("Validation:fieldRequired", {
+                  attribute: t("name"),
+                }) as string,
+              }}
+              render={({ field: { value, onChange } }) => (
+                <SortableTree.Item
+                  key={`product-${product._id}`}
+                  id={String(product._id)}
+                  isExpanded={isFirstProductAdded}
+                  isInvalid={!!categoryProductErrors}
+                  title={value}
+                  isOverride={isOverrides}
+                  badge={
+                    <Badge className="product-badge">{t("product")}</Badge>
+                  }
+                  isIconInHeader={false}
+                  cancelChanges={() => cancelChanges(index)}
+                  edit={() => edit(index)}
+                  secondaryBadge={getBadgeConfig(categoryType, t(categoryType))}
+                  subTitle={
+                    <div className="product-set-badges-container">
+                      <div className="product-set-subtitle-dot product-set-subtitle-product-dot" />
+                      <span>
+                        {`£${prices[index]} ${t("each")} - ${t("qty")}:${
+                          !isUnlimitedQuantities[index]
+                            ? ` ${quantities[index]}`
+                            : t(" unlimited")
+                        } ${
+                          !isUnlimitedQuantities[index]
+                            ? ` - ${t("possibleRevenue")} £${
+                                prices[index] * quantities[index]
+                              }`
+                            : ""
+                        } `}
+                      </span>
+                    </div>
+                  }
+                  modalLabel={t("addNewProduct")}
+                  modalClass={ProductSetModalClasses.product}
+                  isNewAdded={showProductModal}
+                  body={
+                    <ProductControl<ProductSetFormValues>
+                      isLoading={isLoading}
+                      quantityType={quantityType}
+                      allowDeposits={allowDeposits}
+                      hasBookingManagement={false}
+                      fieldNamePrefix={
+                        `${productControlFieldName}.${index}` as const
+                      }
+                      productName={value}
+                      onProductNameChange={onChange}
+                      hasTicket={hasTicket}
+                      categoryType={categoryType}
+                      zoneDuration={catergoryZone?.defaultDuration}
+                      isOverrides={
+                        isNewProductOverrides || isOverridesProductSet
+                      }
+                    />
+                  }
+                  onDelete={() => onProductRemove(index)}
+                  validate={() =>
+                    trigger(`${productControlFieldName}.${index}`)
+                  }
+                  saveValidField={saveValidField}
+                  // preItem={<Popover className="d-none d-sm-block" />}
+                >
+                  <SubProductsControl
                     isLoading={isLoading}
                     quantityType={quantityType}
-                    allowDeposits={allowDeposits}
-                    hasBookingManagement={false}
-                    fieldNamePrefix={
-                      `${productControlFieldName}.${index}` as const
-                    }
-                    productName={value}
-                    onProductNameChange={onChange}
-                    hasTicket={hasTicket}
-                    categoryType={categoryType}
-                    zoneDuration={catergoryZone?.defaultDuration}
-                    isOverrides={isOverrides}
+                    stepIndex={stepIndex}
+                    productCategoryIndex={productCategoryIndex}
+                    productIndex={index}
                   />
-                }
-                onDelete={() => onProductRemove(index)}
-                validate={() => trigger(`${productControlFieldName}.${index}`)}
-                saveValidField={saveValidField}
-                // preItem={<Popover className="d-none d-sm-block" />}
-              >
-                <SubProductsControl
-                  isLoading={isLoading}
-                  quantityType={quantityType}
-                  stepIndex={stepIndex}
-                  productCategoryIndex={productCategoryIndex}
-                  productIndex={index}
-                />
-              </SortableTree.Item>
-            )}
-          />
-        ))}
+                </SortableTree.Item>
+              )}
+            />
+          );
+        })}
       </SortableTree>
       <CreateProductSetItem
         title={t("addProduct")}
-        isOverride={isOverrides}
         onClick={() => {
-          if (isOverrides) return;
           append(getDefaultProductValue(fields.length));
           setShowProductModal(true);
 

package/src/product-set/form/StepsControl.tsx

@@ -19,9 +19,16 @@ import { ProductSetFormValues } from "./ProductSetForm";
 interface StepsControlProps {
   isLoading: boolean;
   isOverrides?: boolean;
+  isEventEditProductSet?: boolean;
+  isCreateNewOverrides?: boolean;
 }
 
-export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
+export function StepsControl({
+  isLoading,
+  isOverrides,
+  isEventEditProductSet,
+  isCreateNewOverrides,
+}: StepsControlProps) {
   const form = useFormContext<ProductSetFormValues>();
   const { t } = useTranslation("Design");
   const [showStepModal, setShowStepModal] = useState(false);
@@ -68,9 +75,9 @@ export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
     <>
       {fields.map((step, index) => {
         const stepFieldName = `steps.${index}` as const;
-
         const stepData = getValues(stepFieldName);
-
+        const isOverrideStep =
+          (isOverrides || isCreateNewOverrides) && !!step.id;
         return (
           <Controller
             key={`step-${step._id}`}
@@ -92,9 +99,9 @@ export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
                 modalLabel={t("addNewStep")}
                 modalClass={ProductSetModalClasses.step}
                 isNewAdded={showStepModal}
-                edit={() => !isOverrides && edit(index)}
+                edit={() => edit(index)}
                 cancelChanges={() => cancelChanges(index)}
-                isOverride={isOverrides}
+                isOverride={isOverrideStep}
                 subTitle={
                   <div className="product-set-badges-container">
                     <div className="product-set-subtitle-dot product-set-subtitle-step-dot" />
@@ -110,6 +117,7 @@ export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
                     stepIndex={index}
                     stepName={value}
                     onStepNameChange={onChange}
+                    isOverrides={isOverrideStep}
                   />
                 }
                 onDelete={() => remove(index)}
@@ -140,6 +148,8 @@ export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
                   isLoading={isLoading}
                   stepIndex={index}
                   isOverrides={isOverrides}
+                  isCreateNewOverrides={isCreateNewOverrides}
+                  isEventEditProductSet={isEventEditProductSet}
                 />
               </SortableTree.Item>
             )}
@@ -149,9 +159,7 @@ export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
 
       <CreateProductSetItem
         title={t("addStep")}
-        isOverride={isOverrides}
         onClick={() => {
-          if (isOverrides) return;
           append(getDefaultStepsValues());
           setShowStepModal(true);
           if (errors.steps?.type === HookFormService.manualErrorType) {

package/src/product-set/product/ProductControl.tsx

@@ -7,14 +7,17 @@ import {
   QUANTITY_TYPE_LIST_DTO,
   QUANTITY_TYPE_RECHARGING,
 } from "@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper";
-import { ProductType } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
+import {
+  ProductType,
+  PRODUCT_DEfAULT_COLORS,
+} from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
+import clsx from "clsx";
 import {
   FieldNamePrefixPath,
   FormValues,
 } from "@licklist/plugins/dist/types/services/Form/hook-form-service";
 import { useId } from "@react-aria/utils";
-import clsx from "clsx";
 import React, {
   ChangeEvent,
   useCallback,
@@ -36,7 +39,7 @@ import {
 } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useImages } from "@licklist/plugins/dist/hooks/Media/useImages";
-import { PRODUCT_DEfAULT_COLORS } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
+
 import {
   Image,
   IMAGE_TYPE_IMAGE,
@@ -86,6 +89,7 @@ export interface ProductControlValues
   totalQuantity: number;
   isAvailable: boolean;
   isSoldOut: boolean;
+  originalProductId: number | null;
   isUnlimited: boolean;
   isRequired: boolean;
   quantitySelector: number;
@@ -156,7 +160,6 @@ export function ProductControl<T extends FormValues>({
   );
   const capacity = watch(`${fieldNamePrefix}.capacity` as Path<T>);
   const disabledDuration = capacity === "0" || !capacity;
-
   const advancedId = useId();
   const nameId = useId();
 
@@ -410,7 +413,7 @@ export function ProductControl<T extends FormValues>({
                 `${fieldNamePrefix}.productGroupId` as Path<T>,
                 errors
               )}
-              disabled={isLoading}
+              disabled={isLoading || isOverrides}
               defaultValue=""
             >
               <option value="">{t("Design:selectProductGroup")}</option>