@licklist/design 0.59.0-dev.8 → 0.59.0

package/src/iframe/page/components/PageBody/hooks/useResizePageBody.ts

@@ -16,7 +16,7 @@ import {
   PAGE_LEFT_BLOCK_CONTAINER_ID,
   PAGE_LEFT_BLOCK_MAP_DEFAULT_SIZE,
   PAGE_CALENDAR_SELECT_WRAPPER,
-  PAGE_BODY_WITH_SCROLL,
+  PAYMENT_LINK_PAGE_BODY,
 } from "../constants";
 import { ChangeRightBlockHeightEvent } from "../types";
 
@@ -52,10 +52,10 @@ export const useResizePageBody = () => {
       ? calenderWrapper.clientHeight
       : 0;
 
-    const paymentLinkPageBody = document.getElementById(PAGE_BODY_WITH_SCROLL);
+    const paymentLinkPageBody = document.getElementById(PAYMENT_LINK_PAGE_BODY);
     if (paymentLinkPageBody) {
       paymentLinkPageBody.scroll({
-        top: -height,
+        top: -rightBlockHeight,
         behavior: "smooth",
       });
     }

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

@@ -63,7 +63,7 @@ const processedPaymentSummary = ({
   const total = calculateTotalPrice(order, externalPaymentDetail);
 
   const totalDiscount = calculateTotalDiscount(order.payments);
-
+  const totalWithDiscount = total - Number(totalDiscount);
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,
@@ -74,7 +74,7 @@ const processedPaymentSummary = ({
   if (totalDiscount) {
     summaryItems.push({
       translateKey: AMOUNT_WITH_DISCOUNT,
-      price: order.totalToPayAmount,
+      price: totalWithDiscount < 0 ? 0 : totalWithDiscount,
     });
   }
 
@@ -84,17 +84,17 @@ const processedPaymentSummary = ({
 
   summaryItems.push({
     translateKey: TOTAL_PAID,
-    price: order.paidAmount,
+    price: totalWithDiscount <= 0 ? 0 : order.totalAmount,
   });
-  if (order.totalToPayAmount <= 0) {
+  if (totalWithDiscount <= 0) {
     return summaryItems;
   }
   summaryItems = [...summaryItems, ...externalPaymentDetail];
 
-  if (order.remainingToPay) {
+  if (totalWithDiscount > order.totalAmount) {
     summaryItems.push({
       translateKey: REMAINING_TO_PAY,
-      price: order.remainingToPay,
+      price: totalWithDiscount - order.totalAmount,
     });
   }
   return summaryItems;

package/src/iframe/payment/payment-page/PaymentPage.tsx

@@ -16,7 +16,7 @@ import { PaymentTimer } from "./PaymentTimer";
 import { Page, PageBody } from "../../page";
 import { BookingSummary } from "../../order-process";
 import { cartSumByOrderProducts } from "../../order-process/components/BookingSummary/utils";
-import { PAGE_BODY_WITH_SCROLL } from "../../page/components/PageBody/constants";
+import { PAYMENT_LINK_PAGE_BODY } from "../../page/components/PageBody/constants";
 
 export interface PaymentMetadata {
   total: number;
@@ -126,7 +126,7 @@ export const PaymentPage = ({
         onCloseButtonClick={isIframePayment ? onGoBack : undefined}
       /> */}
       <PageBody
-        id={PAGE_BODY_WITH_SCROLL}
+        id={PAYMENT_LINK_PAGE_BODY}
         leftBlock={
           <PageBody.LeftBlock>
             <div className="d-flex align-items-center mb-5">

package/src/iframe/ryft/RyftPaymentForm.tsx

@@ -12,8 +12,6 @@ import {
   RYFT_STATUS_PENDING_ACTION,
   AttemptPaymentResponse,
 } from "@licklist/plugins/dist/hooks/Ryft/useRyftPayment";
-import { ProviderPaymentSettings } from "@licklist/core/dist/DataMapper/Setting/ProviderPaymentSettingsDataMapper";
-
 import { BlockLoader, ButtonLoader } from "../../static";
 import { injectComponentsInRyftForm } from "./utils/ryft-form";
 
@@ -42,13 +40,11 @@ export interface RyftPaymentFormProps {
   ) => Promise<void>;
   onSubmit: () => Promise<AttemptPaymentResponse>;
   resetReferrer?: () => void;
-  providerPaymentSettings?: ProviderPaymentSettings;
 }
 
 export const RyftPaymentForm = ({
   accountId,
   isCreateLoading,
-  providerPaymentSettings,
   initRyft,
   resetReferrer,
   onSubmit,
@@ -123,26 +119,13 @@ export const RyftPaymentForm = ({
   };
 
   useEffect(
-    () => {
-      if (
-        !formRef.current?.childNodes?.length ||
-        formRef.current?.childNodes?.length < 3 ||
-        !accountId.data?.account_id
-      ) {
-        return;
-      }
-      injectComponentsInRyftForm({
-        t,
-        additionalPaymentMethodsEnabled:
-          providerPaymentSettings?.additionalPaymentMethodsEnabled,
-      });
-    },
+    () => injectComponentsInRyftForm({ t }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [formRef.current?.childNodes?.length]
   );
 
   useEffect(() => {
-    if (!accountId.data?.account_id || accountId.isError) return;
+    if (!accountId.data || accountId.isError) return;
 
     initRyft(
       () => {
@@ -156,7 +139,7 @@ export const RyftPaymentForm = ({
     );
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [accountId.data?.account_id]);
+  }, [accountId.data]);
 
   if (accountId.isLoading || accountId.isFetching || isCreateLoading)
     return (

package/src/iframe/ryft/utils/ryft-form.ts

@@ -2,18 +2,17 @@ import { TFunction } from "react-i18next";
 
 export const injectComponentsInRyftForm = ({
   t,
-  additionalPaymentMethodsEnabled,
 }: {
   t: TFunction<string[]>;
-  additionalPaymentMethodsEnabled?: boolean;
 }) => {
   const cardContainer = document.getElementById("ryft-pay-iframe");
+  const oldCardDividerContainer = document.getElementById(
+    "card-title-container"
+  );
 
-  if (!cardContainer) {
+  if (!cardContainer || oldCardDividerContainer) {
     return;
   }
-  // Removing of the old title container
-  document.getElementById("card-title-container")?.remove();
 
   const cardTitle = document.createElement("div");
   const cardText = document.createElement("div");
@@ -27,14 +26,10 @@ export const injectComponentsInRyftForm = ({
 
   const payGrid = document.getElementById("ryft-pay-grid");
 
-  if (!payGrid || !additionalPaymentMethodsEnabled) {
+  if (!payGrid) {
     return;
   }
 
-  // Removing of the old mobile  title container  and divider container
-  document.getElementById("mobile-pay-title")?.remove();
-  document.getElementById("mobile-pay-divider-container")?.remove();
-
   // Adding title and divider for apple and google pay button
   const mobilePayTitle = document.createElement("div");
   const dividerText = document.createElement("div");
@@ -42,7 +37,6 @@ export const injectComponentsInRyftForm = ({
   const container = document.createElement("div");
   mobilePayTitle.className = "mobile-pay-title";
   mobilePayTitle.innerText = t("Design:expressCheckoutWith");
-  mobilePayTitle.id = "mobile-pay-title";
   dividerText.id = "mobile-pay-divider-text";
   dividerText.innerText = "or";
   divider.id = "mobile-pay-divider";

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

@@ -36,7 +36,7 @@ export interface DateAndRecurrenceInputValues {
 
 interface DateAndRecurrenceInputProps {
   isEventEditProductSet?: boolean;
-  workHours: WorkHour[] | undefined;
+  workHours?: WorkHour[];
   providerHasBookingManagement: boolean;
   isLoading?: boolean;
 }
@@ -90,7 +90,7 @@ export const DateAndRecurrenceInput = ({
     clearEditState();
   });
 
-  const popoverId = useId();
+  const popoverId = useId()!;
 
   const { t } = useTranslation("Design");
 
@@ -228,7 +228,6 @@ export const DateAndRecurrenceInput = ({
                 defaultValues={editState.values}
                 onChange={handleRecurringDateChange}
                 onDelete={handleDelete}
-                workHours={workHours}
               >
                 {providerHasBookingManagement && (
                   <AvailableTimesControl

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

@@ -5,8 +5,9 @@ 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 { TIMEZONE } from "@licklist/core/dist/Config/Date";
 import { ProductSetRecurrence } from "@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper";
+import { TIME_FORMAT } from "@licklist/core/dist/Config/Date";
 import { DateTime } from "luxon";
 import RRule, { Frequency } from "rrule";
 import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
@@ -26,6 +27,7 @@ import {
 import { ProductSetRecurrenceOverridesControl } from "./ProductSetRecurrenceOverridesControl";
 import { MAX_QUANTITY_RECURRENCE_DATE_IN_OVERRIDE } from "../product/constants";
 
+
 export interface DateAndRecurrenceInputValues {
   menuRecurrences?: Partial<ProductSetRecurrence>[];
 }
@@ -57,7 +59,7 @@ export const DateInput = ({
     control,
     keyName: "_id",
   });
-  const [availableTimes, setAvailableTimes] = useState<string[]>([]);
+
   const [isDatePopoverVisible, setIsDatePopoverVisible] = useState(false);
   const availableTimesFormRef = useRef<AvailableTimesControlRef>();
   const [editState, setEditState] = useState<{
@@ -92,7 +94,6 @@ export const DateInput = ({
     // Hotfix for an issue with Popover close & open actions
     setTimeout(() => {
       setEditState({ index, values: next });
-      setAvailableTimes(next.availableTimes || []);
       setIsDatePopoverVisible(() => true);
     }, 100);
   };
@@ -220,7 +221,7 @@ export const DateInput = ({
                     workHours={workHours}
                     isLoading={isLoading}
                     ref={availableTimesFormRef}
-                    defaultValues={availableTimes}
+                    defaultValues={[]}
                     errorMessage={
                       errors?.menuRecurrences?.[`${editState?.index}`]
                         ?.availableTimes?.message

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

@@ -85,7 +85,7 @@ export interface ProductSetControlProps {
   fieldSets?: FieldSet[];
   showEmailTemplate?: boolean;
   showSmsTemplate?: boolean;
-  workHours: WorkHour[] | undefined;
+  workHours?: WorkHour[];
   providerHasBookingManagement?: boolean;
   isOverrides?: boolean;
 }

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

@@ -307,7 +307,7 @@ export function ProductCategoriesControl({
         title={t("addCategory")}
         isOverride={isOverrides}
         onClick={() => {
-          if (isOverrides) return;
+           if (isOverrides) return;
           setIsSelectCategoryVisible(true);
         }}
       />

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

@@ -26,16 +26,12 @@ 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,
-    WithIdOptional,
+    WithId,
     ProductSetControlValues {
   steps: Step[];
   isOverrides?: boolean;

package/src/product-set/hooks/useSortableTreeFunctions.ts

@@ -24,10 +24,8 @@ export const useSortableTreeFunctions = ({
   const cancelChanges = (index: number) => {
     if (isOverrides) return;
     if (!previousValue) {
-      // eslint-disable-next-line consistent-return
       return remove(index);
     }
-    // eslint-disable-next-line consistent-return
     return setValue(`${fieldName}.${index}` as const, previousValue);
   };
 

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

@@ -7,17 +7,14 @@ 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,
 } from "@licklist/plugins/dist/types/services/Form/hook-form-service";
 import { useId } from "@react-aria/utils";
+import clsx from "clsx";
 import React, {
   ChangeEvent,
   useCallback,
@@ -39,7 +36,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,
@@ -149,7 +146,7 @@ export function ProductControl<T extends FormValues>({
     clearErrors,
   } = useFormContext<T>();
 
-  const { setLoading, productGroupList } = useContext(ProductSetLoadingContext);
+  const { setLoading } = useContext(ProductSetLoadingContext);
   const { t } = useTranslation(["Design", "Validation", "ProductSet"]);
   const [expanded, setExpanded] = useState(false);
   const [initialImages, setInitialImages] = useState<Image[] | null>(null);
@@ -162,8 +159,8 @@ export function ProductControl<T extends FormValues>({
 
   const advancedId = useId();
   const nameId = useId();
-
-  const productGroupId = useId();
+  // @TODO: no need for v1 release
+  // const productGroupId = useId();
   const descriptionId = useId();
   const termsAndConditionsId = useId();
   const isAvailableId = useId();
@@ -403,35 +400,6 @@ export function ProductControl<T extends FormValues>({
             isRequired={false}
             defaultColors={PRODUCT_DEfAULT_COLORS}
           />
-
-          <Form.Group controlId={productGroupId}>
-            <Form.Label>{t("productGroup")}</Form.Label>
-            <Form.Control
-              as="select"
-              {...register(`${fieldNamePrefix}.productGroupId` as Path<T>)}
-              isInvalid={HookFormService.isInvalid<T>(
-                `${fieldNamePrefix}.productGroupId` as Path<T>,
-                errors
-              )}
-              disabled={isLoading}
-              defaultValue=""
-            >
-              <option value="">{t("Design:selectProductGroup")}</option>
-              {productGroupList.map((productGroup) => {
-                return (
-                  <option value={productGroup.id} key={productGroup.id}>
-                    {productGroup.value}
-                  </option>
-                );
-              })}
-            </Form.Control>
-            <Form.Control.Feedback type="invalid">
-              {HookFormService.getErrors<T>(
-                `${fieldNamePrefix}.productGroupId` as Path<T>,
-                errors
-              )}
-            </Form.Control.Feedback>
-          </Form.Group>
         </Col>
       </Row>
 
@@ -704,6 +672,38 @@ export function ProductControl<T extends FormValues>({
         </Collapse>
 
         <Row>
+          {/* @TODO: no need for v1 release
+            <Col xs={12} sm={6}>
+              <Form.Group controlId={productGroupId}>
+                <Form.Label>{t("productGroup")}</Form.Label>
+                <Form.Control
+                  as="select"
+                  {...register(`${fieldNamePrefix}.productGroupId` as Path<T>)}
+                  isInvalid={HookFormService.isInvalid<T>(
+                    `${fieldNamePrefix}.productGroupId` as Path<T>,
+                    errors
+                  )}
+                  disabled={isLoading}
+                  defaultValue=""
+                >
+                  <option value="">{t("Design:selectProductGroup")}</option>
+                  {productGroupList.map((productGroup) => {
+                    return (
+                      <option value={productGroup.id} key={productGroup.id}>
+                        {productGroup.value}
+                      </option>
+                    );
+                  })}
+                </Form.Control>
+                <Form.Control.Feedback type="invalid">
+                  {HookFormService.getErrors<T>(
+                    `${fieldNamePrefix}.productGroupId` as Path<T>,
+                    errors
+                  )}
+                </Form.Control.Feedback>
+              </Form.Group>
+            </Col> */}
+
           <Col xs={12}>
             {hasBookingManagement && (
               <ProductBookingManagementControl<T>

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

@@ -5,6 +5,8 @@ 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;
 }

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;
@@ -103,7 +102,6 @@ export function ProductCategoryControl({
   const collectUserInfoId = useId();
   const hasTicketId = useId();
   const zoneId = useId();
-  const overallQuantityId = useId();
 
   const allowDepositsId = useId();
   const remainderExpireAfterId = useId();
@@ -129,7 +127,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;
 
@@ -329,111 +327,51 @@ export function ProductCategoryControl({
             </Form.Group>
           </Col>
         </Row>
-        <Row>
-          <Col md={6} sm={6} xs={6}>
-            <Form.Group controlId={overallQuantityId}>
-              <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>
+
+        {shouldShowZoneSelect && (
+          <Row>
+            <Col>
+              <Form.Group controlId={zoneId}>
+                <Form.Label>{t("Design:zone")}</Form.Label>
                 <Controller
                   control={control}
-                  name={`${fieldNamePrefix}.overallQuantity`}
+                  name={`${fieldNamePrefix}.zoneId`}
                   render={({ field }) => (
                     <Form.Control
-                      min={0}
-                      step={1}
-                      type="number"
+                      as="select"
                       disabled={isOverride}
                       isInvalid={HookFormService.isInvalid<ProductSetFormValues>(
-                        `${fieldNamePrefix}.overallQuantity`,
+                        `${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={{
-                    min: {
-                      value: 0,
-                      message: t("Validation:fieldMinNumber", {
-                        attribute: t("overallQuantity"),
-                        min: 0,
-                      }) as string,
+                    required: {
+                      value: providerHasBookingManagement,
+                      message: t("Validation:fieldRequired", {
+                        attribute: t("zone"),
+                      }),
                     },
                   }}
                 />
                 <Form.Control.Feedback type="invalid">
                   {HookFormService.getErrors<ProductSetFormValues>(
-                    `${fieldNamePrefix}.overallQuantity`,
+                    `${fieldNamePrefix}.zoneId`,
                     errors
                   )}
                 </Form.Control.Feedback>
-              </InputGroup>
-            </Form.Group>
-          </Col>
-        </Row>
-
-        {isZoneCategory && (
-          <>
-            <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>
-          </>
+              </Form.Group>
+            </Col>
+          </Row>
         )}
       </Col>
 

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/RecurrenceAndFrequencyInput.tsx

@@ -72,6 +72,7 @@ function RecurrenceAndFrequencyInput({
             </Form.Control.Feedback>
           </Form.Group>
         </Col>
+
       </Row>
 
       <Row>