@licklist/design 0.58.6-dev.9 → 0.58.7

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

@@ -7,12 +7,8 @@ import {
   QUANTITY_TYPE_LIST_DTO,
   QUANTITY_TYPE_RECHARGING,
 } from "@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper";
-import {
-  ProductType,
-  PRODUCT_DEfAULT_COLORS,
-} from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
+import { ProductType } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
-import clsx from "clsx";
 import {
   FieldNamePrefixPath,
   FormValues,
@@ -39,7 +35,6 @@ import {
 } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useImages } from "@licklist/plugins/dist/hooks/Media/useImages";
-
 import {
   Image,
   IMAGE_TYPE_IMAGE,
@@ -64,7 +59,6 @@ import {
   ProductQuantityControl,
   ProductQuantityRechargingControl,
 } from "./quantity";
-import { PropertyControl } from "../../snippet";
 import { TipTapEditor } from "../../tiptap-editor";
 import { IsDeletableEvent } from "../types";
 import { FixedDurationOptions } from "./fixed-duration-fields";
@@ -104,7 +98,6 @@ export interface ProductControlValues
   offset: number;
   serviceTime: number;
   sort: number | null;
-  color?: string;
 }
 
 export interface ProductControlProps<T>
@@ -120,7 +113,6 @@ export interface ProductControlProps<T>
   productName: string;
   hasTicket?: boolean;
   categoryType?: CategoryType;
-  isOverrides?: boolean;
   zoneDuration?: number;
 }
 
@@ -136,7 +128,6 @@ export function ProductControl<T extends FormValues>({
   hasTicket,
   categoryType,
   zoneDuration,
-  isOverrides = false,
 }: ProductControlProps<T>) {
   const {
     register,
@@ -150,7 +141,7 @@ export function ProductControl<T extends FormValues>({
   } = useFormContext<T>();
 
   const { setLoading } = useContext(ProductSetLoadingContext);
-  const { t } = useTranslation(["Design", "Validation", "ProductSet"]);
+  const { t } = useTranslation(["Design", "Validation"]);
   const [expanded, setExpanded] = useState(false);
   const [initialImages, setInitialImages] = useState<Image[] | null>(null);
   // @TODO: After checking "isUnlimited" checkbox need to reset field totalQuantity
@@ -269,7 +260,7 @@ export function ProductControl<T extends FormValues>({
                 `${fieldNamePrefix}.name` as Path<T>,
                 errors
               )}
-              disabled={isLoading || isOverrides}
+              disabled={isLoading}
               placeholder={t("name")}
             />
             <Form.Control.Feedback type="invalid">
@@ -289,7 +280,7 @@ export function ProductControl<T extends FormValues>({
                   viewMode={false}
                   onUpdate={onChange}
                   content={value as string}
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               )}
               rules={{
@@ -335,7 +326,6 @@ export function ProductControl<T extends FormValues>({
             <ProductQuantityControl<T>
               isLoading={isLoading}
               fieldNamePrefix={fieldNamePrefix}
-              isOverrides={isOverrides}
               onFocus={onFocus}
             />
 
@@ -380,7 +370,7 @@ export function ProductControl<T extends FormValues>({
                 `${fieldNamePrefix}.quantitySelector` as Path<T>,
                 errors
               )}
-              disabled={isLoading || hasTicket || isOverrides}
+              disabled={isLoading || hasTicket}
             >
               {quantitySelectorList.map((selector) => (
                 <option value={selector.id} key={selector.id}>
@@ -395,14 +385,6 @@ export function ProductControl<T extends FormValues>({
               )}
             </Form.Control.Feedback>
           </Form.Group>
-
-          <PropertyControl<T>
-            item={`${fieldNamePrefix}.color` as Path<T>}
-            label={t("ProductSet:selectColor")}
-            isDisabled={isOverrides}
-            isRequired={false}
-            defaultColors={PRODUCT_DEfAULT_COLORS}
-          />
         </Col>
       </Row>
 
@@ -410,14 +392,13 @@ export function ProductControl<T extends FormValues>({
         <Row className="align-items-start duration-capacity-container">
           <ProductDurationControl
             fieldNamePrefix={fieldNamePrefix}
-            disabled={disabledDuration || isOverrides}
+            disabled={disabledDuration}
           />
 
           <Col lg={4} md={4}>
             <FormNumberInput
               fieldName={`${fieldNamePrefix}.capacity`}
               label={t("capacity")}
-              disabled={isOverrides}
               rules={{
                 min: {
                   value: 0,
@@ -445,7 +426,6 @@ export function ProductControl<T extends FormValues>({
                 fieldName={`${fieldNamePrefix}.capacity`}
                 label={t("capacity")}
                 onChange={onChangeGameCapacity}
-                disabled={isOverrides}
                 rules={{
                   min: {
                     value: 0,
@@ -461,7 +441,7 @@ export function ProductControl<T extends FormValues>({
               <FormNumberInput
                 fieldName={`${fieldNamePrefix}.duration`}
                 label={t("durationMinutes")}
-                disabled={disabledDuration || isOverrides}
+                disabled={disabledDuration}
                 rules={{
                   min: {
                     value: 0,
@@ -507,7 +487,7 @@ export function ProductControl<T extends FormValues>({
                     `${fieldNamePrefix}.termsAndConditions` as Path<T>,
                     errors
                   )}
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                   name={name}
                 />
               )}
@@ -524,14 +504,7 @@ export function ProductControl<T extends FormValues>({
           </Form.Group>
         </Col>
 
-        <Col
-          lg={4}
-          md={4}
-          className={clsx(
-            "licklist-file-upload-wrapper",
-            isOverrides && "opacity-50"
-          )}
-        >
+        <Col lg={4} md={4} className="licklist-file-upload-wrapper">
           <FileUpload
             onFilesChange={onFilesChange}
             allowedExtensions={["jpeg", "jpg", "png"]}
@@ -540,7 +513,6 @@ export function ProductControl<T extends FormValues>({
             onFileRemove={onImageRemove}
             defaultFiles={images}
             isLoading={isImageUploading}
-            disabled={isOverrides}
             withIcon
             title={t("addImage")}
           />
@@ -561,7 +533,7 @@ export function ProductControl<T extends FormValues>({
                   name={name}
                   value={Boolean(value)}
                   onChange={onChange}
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               );
             }}
@@ -596,7 +568,7 @@ export function ProductControl<T extends FormValues>({
             custom
             type="checkbox"
             name={advancedId}
-            disabled={isLoading || isOverrides}
+            disabled={isLoading}
           >
             <Form.Check.Input
               checked={expanded}
@@ -623,7 +595,7 @@ export function ProductControl<T extends FormValues>({
                     name={name}
                     value={Boolean(value)}
                     onChange={onChange}
-                    disabled={isLoading || isOverrides}
+                    disabled={isLoading}
                   />
                 )}
                 control={control}
@@ -643,7 +615,7 @@ export function ProductControl<T extends FormValues>({
                     name={name}
                     value={Boolean(value)}
                     onChange={onChange}
-                    disabled={isLoading || isOverrides}
+                    disabled={isLoading}
                   />
                 )}
                 control={control}
@@ -652,12 +624,7 @@ export function ProductControl<T extends FormValues>({
             </Form.Group>
             {[CATEGORY_TYPE_GAME, CATEGORY_TYPE_FIXED_DURATION].includes(
               categoryType
-            ) && (
-              <FixedDurationOptions
-                fieldNamePrefix={fieldNamePrefix}
-                isOverrides={isOverrides}
-              />
-            )}
+            ) && <FixedDurationOptions fieldNamePrefix={fieldNamePrefix} />}
             <Form.Group
               controlId={minSpendId}
               className="advanced-switch-container"
@@ -667,7 +634,7 @@ export function ProductControl<T extends FormValues>({
                 isRequired={false}
                 isMoreThanZero
                 allowDeposits={false}
-                isLoading={isLoading || isOverrides}
+                isLoading={isLoading}
                 fieldNamePrefix={`${fieldNamePrefix}.minSpend` as Path<T>}
               />
             </Form.Group>

package/src/product-set/product/fixed-duration-fields/FixedDurationOptions.tsx

@@ -5,13 +5,10 @@ import { FieldNamePrefixPath } from "@licklist/plugins/dist/types/services/Form/
 import { useWatch } from "react-hook-form";
 import { FormNumberInput } from "../../../static";
 
-interface FixedDurationOptionsProps<T> extends FieldNamePrefixPath<T> {
-  isOverrides?: boolean;
-}
+type FixedDurationOptionsProps<T> = FieldNamePrefixPath<T>;
 
 export const FixedDurationOptions = <T,>({
   fieldNamePrefix,
-  isOverrides,
 }: FixedDurationOptionsProps<T>) => {
   const { t } = useTranslation("Design");
 
@@ -24,7 +21,6 @@ export const FixedDurationOptions = <T,>({
           <FormNumberInput
             fieldName={`${fieldNamePrefix}.subSlots`}
             label={t("subSlotsInMin")}
-            disabled={isOverrides}
           />
         </Col>
 
@@ -32,7 +28,7 @@ export const FixedDurationOptions = <T,>({
           <FormNumberInput
             fieldName={`${fieldNamePrefix}.pause`}
             label={t("pauseInMin")}
-            disabled={!subSlotsFieldValue || isOverrides}
+            disabled={!subSlotsFieldValue}
           />
         </Col>
       </Row>
@@ -42,7 +38,6 @@ export const FixedDurationOptions = <T,>({
           <FormNumberInput
             fieldName={`${fieldNamePrefix}.offset`}
             label={t("offsetInMin")}
-            disabled={isOverrides}
           />
         </Col>
 
@@ -50,7 +45,6 @@ export const FixedDurationOptions = <T,>({
           <FormNumberInput
             fieldName={`${fieldNamePrefix}.serviceTime`}
             label={t("serviceTimeInMin")}
-            disabled={isOverrides}
           />
         </Col>
       </Row>

package/src/product-set/product/quantity/ProductQuantityControl.tsx

@@ -22,13 +22,12 @@ export interface ProductQuantityControlValues extends FormValues {
 export interface ProductQuantityControlProps<T> extends FieldNamePrefixPath<T> {
   isLoading: boolean;
   onFocus?: (e: React.SyntheticEvent) => void;
-  isOverrides?: boolean;
 }
 
 export function ProductQuantityControl<T extends FormValues>(
   props: ProductQuantityControlProps<T>
 ) {
-  const { isLoading = false, fieldNamePrefix, onFocus, isOverrides } = props;
+  const { isLoading = false, fieldNamePrefix, onFocus } = props;
   const {
     control,
     formState: { errors },
@@ -91,7 +90,7 @@ export function ProductQuantityControl<T extends FormValues>(
                   isInvalid={
                     Number(minQuantityValue) > Number(maxQuantityValue)
                   }
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               )}
               control={control}
@@ -149,7 +148,7 @@ export function ProductQuantityControl<T extends FormValues>(
                   isInvalid={
                     Number(minQuantityValue) > Number(maxQuantityValue)
                   }
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               )}
               control={control}

package/src/product-set/product-category/ProductCategoryControl.tsx

@@ -26,7 +26,6 @@ export interface ProductCategoryControlValues extends FormValues {
   name: string;
   minSubItems: number | null;
   maxSubItems: number | null;
-  overallQuantity?: number | null;
   quantityType: QuantityType;
   type: CategoryType;
   isTimeRelated: boolean;
@@ -50,7 +49,6 @@ export interface ProductCategoryControlProps extends IsDeletableEvent {
   onCategoryNameChange: (args: any) => void;
   stepIndex: number;
   productCategoryIndex: number;
-  isOverride?: boolean;
 }
 
 const categoriesWithTickets = [
@@ -65,7 +63,6 @@ export function ProductCategoryControl({
   onCategoryNameChange,
   productCategoryIndex,
   stepIndex,
-  isOverride = false,
 }: ProductCategoryControlProps) {
   const {
     control,
@@ -103,7 +100,6 @@ export function ProductCategoryControl({
   const collectUserInfoId = useId();
   const hasTicketId = useId();
   const zoneId = useId();
-  const overallCapacityId = useId();
 
   const allowDepositsId = useId();
   const remainderExpireAfterId = useId();
@@ -129,7 +125,7 @@ export function ProductCategoryControl({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [maxSubItems, fieldNamePrefix]);
 
-  const isZoneCategory =
+  const shouldShowZoneSelect =
     category.type === CATEGORY_TYPE_FIXED_DURATION ||
     category.type === CATEGORY_TYPE_GAME;
 
@@ -161,7 +157,7 @@ export function ProductCategoryControl({
               errors
             )}
             placeholder={t("name")}
-            disabled={isLoading || isOverride}
+            disabled={isLoading}
           />
           <Form.Control.Feedback type="invalid">
             {HookFormService.getErrors<ProductSetFormValues>(
@@ -187,7 +183,7 @@ export function ProductCategoryControl({
                   }))}
                   value={field.value}
                   onChange={field.onChange}
-                  disabled={isLoading || isOverride}
+                  disabled={isLoading}
                 />
               </Form.Group>
             )}
@@ -231,7 +227,7 @@ export function ProductCategoryControl({
                         `${fieldNamePrefix}.minSubItems` as const,
                         errors
                       )}
-                      disabled={isLoading || isOverride}
+                      disabled={isLoading}
                       name={name}
                     />
                   )}
@@ -303,7 +299,7 @@ export function ProductCategoryControl({
                         `${fieldNamePrefix}.maxSubItems` as const,
                         errors
                       )}
-                      disabled={isLoading || isOverride}
+                      disabled={isLoading}
                     />
                   )}
                   control={control}
@@ -330,110 +326,49 @@ export function ProductCategoryControl({
           </Col>
         </Row>
 
-        {isZoneCategory && (
-          <>
-            <Row>
-              <Col md={6} sm={6} xs={6}>
-                <Form.Group controlId={overallCapacityId}>
-                  <Form.Label>{t("Design:overallQuantity")}</Form.Label>
-                  <InputGroup hasValidation>
-                    <InputGroup.Prepend
-                      className="arrow-up-btn"
-                      onClick={() => {
-                        const currentOverallCapacity = Number(
-                          getValues(`${fieldNamePrefix}.overallQuantity`) || 0
-                        );
-                        setValue(
-                          `${fieldNamePrefix}.overallQuantity`,
-                          currentOverallCapacity + 1,
-                          { shouldValidate: true }
-                        );
-                      }}
-                    >
-                      <InputGroup.Text className="py-0 px-3">
-                        <IncrementIcon />
-                      </InputGroup.Text>
-                    </InputGroup.Prepend>
-                    <Controller
-                      control={control}
-                      name={`${fieldNamePrefix}.overallQuantity`}
-                      render={({ field }) => (
-                        <Form.Control
-                          min={0}
-                          step={1}
-                          type="number"
-                          disabled={isOverride}
-                          isInvalid={HookFormService.isInvalid<ProductSetFormValues>(
-                            `${fieldNamePrefix}.overallQuantity`,
-                            errors
-                          )}
-                          {...field}
-                        />
-                      )}
-                      rules={{
-                        min: {
-                          value: 0,
-                          message: t("Validation:fieldMinNumber", {
-                            attribute: t("overallQuantity"),
-                            min: 0,
-                          }) as string,
-                        },
-                      }}
-                    />
-                    <Form.Control.Feedback type="invalid">
-                      {HookFormService.getErrors<ProductSetFormValues>(
-                        `${fieldNamePrefix}.overallQuantity`,
+        {shouldShowZoneSelect && (
+          <Row>
+            <Col>
+              <Form.Group controlId={zoneId}>
+                <Form.Label>{t("Design:zone")}</Form.Label>
+                <Controller
+                  control={control}
+                  name={`${fieldNamePrefix}.zoneId`}
+                  render={({ field }) => (
+                    <Form.Control
+                      as="select"
+                      isInvalid={HookFormService.isInvalid<ProductSetFormValues>(
+                        `${fieldNamePrefix}.zoneId`,
                         errors
                       )}
-                    </Form.Control.Feedback>
-                  </InputGroup>
-                </Form.Group>
-              </Col>
-            </Row>
-            <Row>
-              <Col>
-                <Form.Group controlId={zoneId}>
-                  <Form.Label>{t("Design:zone")}</Form.Label>
-                  <Controller
-                    control={control}
-                    name={`${fieldNamePrefix}.zoneId`}
-                    render={({ field }) => (
-                      <Form.Control
-                        as="select"
-                        disabled={isOverride}
-                        isInvalid={HookFormService.isInvalid<ProductSetFormValues>(
-                          `${fieldNamePrefix}.zoneId`,
-                          errors
-                        )}
-                        {...field}
-                      >
-                        <option value={null}>{t("Design:choose")}</option>
-                        {zones.map((zone) => (
-                          <option key={zone.id} value={zone.id}>
-                            {zone.name}
-                          </option>
-                        ))}
-                      </Form.Control>
-                    )}
-                    rules={{
-                      required: {
-                        value: providerHasBookingManagement,
-                        message: t("Validation:fieldRequired", {
-                          attribute: t("zone"),
-                        }),
-                      },
-                    }}
-                  />
-                  <Form.Control.Feedback type="invalid">
-                    {HookFormService.getErrors<ProductSetFormValues>(
-                      `${fieldNamePrefix}.zoneId`,
-                      errors
-                    )}
-                  </Form.Control.Feedback>
-                </Form.Group>
-              </Col>
-            </Row>
-          </>
+                      {...field}
+                    >
+                      <option value={null}>{t("Design:choose")}</option>
+                      {zones.map((zone) => (
+                        <option key={zone.id} value={zone.id}>
+                          {zone.name}
+                        </option>
+                      ))}
+                    </Form.Control>
+                  )}
+                  rules={{
+                    required: {
+                      value: providerHasBookingManagement,
+                      message: t("Validation:fieldRequired", {
+                        attribute: t("zone"),
+                      }),
+                    },
+                  }}
+                />
+                <Form.Control.Feedback type="invalid">
+                  {HookFormService.getErrors<ProductSetFormValues>(
+                    `${fieldNamePrefix}.zoneId`,
+                    errors
+                  )}
+                </Form.Control.Feedback>
+              </Form.Group>
+            </Col>
+          </Row>
         )}
       </Col>
 
@@ -449,7 +384,6 @@ export function ProductCategoryControl({
             <Form.Check.Input
               checked={expanded}
               onChange={handleExpand}
-              disabled={isOverride}
               type="checkbox"
             />
             <Form.Check.Label>{t("showAdvancedOptions")}</Form.Check.Label>
@@ -518,7 +452,7 @@ export function ProductCategoryControl({
                         name={name}
                         value={Boolean(value)}
                         onChange={onChange}
-                        disabled={isLoading || isOverride}
+                        disabled={isLoading}
                       />
                     )}
                     control={control}
@@ -542,7 +476,7 @@ export function ProductCategoryControl({
                           name={name}
                           value={Boolean(value)}
                           onChange={onChange}
-                          disabled={isLoading || isOverride}
+                          disabled={isLoading}
                         />
                       )}
                       control={control}
@@ -565,7 +499,7 @@ export function ProductCategoryControl({
                       name={name}
                       value={Boolean(value)}
                       onChange={onChange}
-                      disabled={isLoading || isOverride}
+                      disabled={isLoading}
                     />
                   )}
                   control={control}
@@ -593,7 +527,7 @@ export function ProductCategoryControl({
                         `${fieldNamePrefix}.remainderExpireAfter` as const,
                         errors
                       )}
-                      disabled={isLoading || isOverride}
+                      disabled={isLoading}
                       name={name}
                     />
                   )}

package/src/provider/working-hours-input/WorkingHoursInputDescription.tsx

@@ -1,7 +1,9 @@
+import { DateTime } from "luxon";
 import React from "react";
 import { Col, Row } from "react-bootstrap";
 import { useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
+import { TIME_FORMAT } from "@licklist/core/dist/Config";
 import { WorkingHoursInputValues } from ".";
 import { useWeekdays } from "./utils";
 
@@ -23,10 +25,22 @@ export function WorkingHoursInputDescription() {
             <Row key={i}>
               <Col xs="auto">{weekdays[i]}:</Col>
               <Col>
-                {t("timeInterval", {
-                  start: weekday.start,
-                  end: weekday.end,
-                })}
+                {weekday?.end
+                  ? weekday.start
+                    ? t("timeInterval", {
+                        start: DateTime.fromISO(weekday.start).toFormat(
+                          TIME_FORMAT
+                        ),
+                        end: DateTime.fromISO(weekday.start).toFormat(
+                          TIME_FORMAT
+                        ),
+                      })
+                    : t("timeFrom", {
+                        start: DateTime.fromISO(weekday.start).toFormat(
+                          TIME_FORMAT
+                        ),
+                      })
+                  : null}
               </Col>
             </Row>
           );

package/src/recurring-date-picker-input/RecurringDatePickerInput.tsx

@@ -336,10 +336,7 @@ const useFormattedDuration = ({
   }, [start, end, byWeekDay, formatList, formatNumber]);
 };
 
-export const getDateTimeObject = (
-  date: string,
-  time: string
-): DateTime | string => {
+const getDateTimeObject = (date: string, time: string): DateTime | string => {
   const dateTime = DateTime.fromFormat(`${date} ${time}`, DATE_TIME_FORMAT);
 
   if (dateTime.isValid) {

package/src/sales/booking/results/BookingResults.stories.tsx

@@ -3,12 +3,11 @@ import { Meta } from "@storybook/react";
 import { Event } from "@licklist/core/dist/DataMapper/Provider/EventDataMapper";
 import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
 import { Product } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
+import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
 import {
-  Order,
   ORDER_SOURCE_IFRAME,
   ORDER_SOURCE_MANUAL,
-} from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
-
+} from "@licklist/core/src/DataMapper/Order/OrderDataMapper";
 import { BookingResults } from "./BookingResults";
 
 export default {