@licklist/design 0.50.0 → 0.50.1-dev.1

package/src/calendar/utils/index.ts

@@ -1,13 +1,22 @@
 import { DateTime, Interval } from "luxon";
 import isEqual from "lodash/isEqual";
+import { DATE_FORMAT } from "@licklist/core/dist/Config";
+import { AvailableTimes } from "../Calendar";
 
-export const isSelectedDateDisabled = (
-  selectedDate: DateTime,
-  disabledDates: DateTime[] = []
-) => {
-  return !!disabledDates.find((disabledDate) =>
-    isEqual(disabledDate.toObject(), selectedDate.toObject())
+export const isDateDisabled = (
+  date: DateTime,
+  disabledDates: DateTime[] = [],
+  availableTimes?: AvailableTimes
+): boolean => {
+  const disabledByDates = !!disabledDates.find((disabledDate) =>
+    isEqual(disabledDate.toObject(), date.toObject())
   );
+
+  const noAvailableTimes = availableTimes
+    ? !availableTimes?.[date.toFormat(DATE_FORMAT)]
+    : false;
+
+  return disabledByDates || noAvailableTimes;
 };
 
 export const getMonthCalendarDates = (initialDate: DateTime): DateTime[] => {

package/src/date-time-button/DateTimeButton.tsx

@@ -2,6 +2,7 @@ import React, { ReactElement } from "react";
 import clsx from "clsx";
 import { DateTime } from "luxon";
 import { ZoneResourcesAvailability } from "@licklist/core/dist/DataMapper/Order/ZoneResourcesAvailabilityDataMapper";
+import { has } from "lodash";
 import { AvailabilityIndicator } from "../availability-indicator";
 import { DateContent } from "./DateContent";
 
@@ -18,8 +19,9 @@ export type DateTimeButtonProps = {
   isSoldOut?: boolean;
   onSelect: (date: DateTime) => void;
   price?: string | number | ReactElement | null;
-  resources?: ZoneResourcesAvailability | null;
+  resources: ZoneResourcesAvailability | null | undefined;
   showResources?: boolean;
+  shouldCalculateResources?: boolean;
   variant: Variant;
 };
 
@@ -32,17 +34,28 @@ export const DateTimeButton = ({
   price,
   resources,
   showResources,
+  shouldCalculateResources = true,
   variant = Variant.week,
 }: DateTimeButtonProps) => {
   const isSoldOut =
     _isSoldOut ||
-    (resources && resources.bookedResources >= resources.totalResources);
+    // only consider resources if shouldCalculateResources is true
+    (shouldCalculateResources &&
+      resources &&
+      resources.bookedResources >= resources.totalResources);
 
   const isTimeVariant = variant === Variant.time;
 
   const isTimeInPast = isTimeVariant && isDateInPast(date);
 
-  const isDisabled = _isDisabled || isSoldOut || isTimeInPast;
+  const noResources =
+    shouldCalculateResources &&
+    // only consider resources if shouldCalculateResources is true
+    (!resources ||
+      !has(resources, "bookedResources") ||
+      !has(resources, "totalResources"));
+
+  const isDisabled = _isDisabled || isSoldOut || isTimeInPast || noResources;
 
   return (
     <button

package/src/events/event-card/EventCard.stories.tsx

@@ -33,6 +33,7 @@ export const Default: Story<EventCardProps> = () => {
           RuPaul's Drag Race UK to VINYL Cambridge! So get excited because
           the...`}
         date="2023-08-31T09:35:00.000+03:00"
+        productSetName="New product set"
         imageUrl={showImage ? `https://source.unsplash.com/random` : null}
         hasPermission={hasPermission}
         onPreview={() => undefined}

package/src/events/event-card/EventCard.tsx

@@ -30,6 +30,7 @@ export interface EventCardProps extends HasPermissionProp {
   onStatistic: () => void;
   titleId?: string;
   descriptionId?: string;
+  productSetName?: string;
 }
 
 export function EventCard({
@@ -43,6 +44,7 @@ export function EventCard({
   onCopy,
   onRemove,
   hasPermission = true,
+  productSetName,
   onStatistic,
   eventStatistic,
   titleId,
@@ -123,7 +125,12 @@ export function EventCard({
             ))}
         </div>
       </Card.Body>
-      <Card.Footer>
+      <Card.Footer className="flex-column">
+        {productSetName && (
+          <div className="pl-3 text-truncate">
+            {t("Design:productSet")}: {productSetName}
+          </div>
+        )}
         <div className="d-flex w-100 justify-content-between">
           <div className="d-flex">
             <button

package/src/iframe/event/event-booking-products/EventBookingProducts.tsx

@@ -27,7 +27,7 @@ export function EventBookingProducts({
             <AccordionItem
               key={productsCategory.id}
               eventKey={`${productsCategory.id}`}
-              productsCategoryId={productsCategory.id}
+              productCategoryId={productsCategory.id}
               name={productsCategory.name}
               products={productsCategory.products}
               order={order}

package/src/iframe/event/event-booking-products/components/AccordionItem/AccordionItem.tsx

@@ -24,7 +24,7 @@ interface AccordionItemProps {
   products: Product[];
   setOrder: SetOrderFn;
   order: Record<number, OrderItem>;
-  productsCategoryId: number;
+  productCategoryId: number;
 }
 
 function CustomToggle({
@@ -60,7 +60,7 @@ export function AccordionItem({
   order,
   setOrder,
   products,
-  productsCategoryId,
+  productCategoryId,
 }: AccordionItemProps) {
   return (
     <Card className="event-booking-products__card">
@@ -71,7 +71,7 @@ export function AccordionItem({
             <ProductItem
               key={product.id}
               id={product.id}
-              productsCategoryId={productsCategoryId}
+              productCategoryId={productCategoryId}
               price={product.price}
               name={product.name}
               description={product.description}
@@ -92,7 +92,7 @@ interface ProductItemProps {
   description: string;
   order: OrderItems;
   setOrder: SetOrderFn;
-  productsCategoryId: number;
+  productCategoryId: OrderItem["productCategoryId"];
 }
 
 function ProductItem({
@@ -102,7 +102,7 @@ function ProductItem({
   description,
   order,
   setOrder,
-  productsCategoryId,
+  productCategoryId,
 }: ProductItemProps) {
   const { formatNumber } = useIntl();
 
@@ -120,7 +120,7 @@ function ProductItem({
                 quantity: val,
                 name,
                 price,
-                productsCategoryId,
+                productCategoryId,
               },
             }));
           }}
@@ -132,7 +132,7 @@ function ProductItem({
                 quantity: prev[id]?.quantity - 1 || 0,
                 name,
                 price,
-                productsCategoryId,
+                productCategoryId,
               },
             }))
           }
@@ -144,7 +144,7 @@ function ProductItem({
                 quantity: prev[id]?.quantity + 1 || 1,
                 name,
                 price,
-                productsCategoryId,
+                productCategoryId,
               },
             }))
           }

package/src/iframe/event/event-card/IframeEventCard.tsx

@@ -28,6 +28,7 @@ interface IframeEventCardProps {
   shortDate: string;
   titleId?: string;
   descriptionId?: string;
+  imageClassName?: string;
 }
 
 export function IframeEventCard({
@@ -44,6 +45,7 @@ export function IframeEventCard({
   shortDate,
   titleId,
   descriptionId,
+  imageClassName,
 }: IframeEventCardProps) {
   const { formatNumber } = useIntl();
   const { t } = useTranslation("Design");
@@ -70,7 +72,7 @@ export function IframeEventCard({
     >
       {imageSrc && (
         <Card.Img
-          className="card-image"
+          className={imageClassName ?? "card-image"}
           variant="top"
           as="div"
           style={{ backgroundImage: `url("${imageSrc}")` }}

package/src/iframe/order-process/components/BookingSummary/BookingSummary.stories.tsx

@@ -147,35 +147,35 @@ export function Default() {
               quantity: 1,
               name: "cat 1 prod 1",
               price: 0,
-              productsCategoryId: 1,
+              productCategoryId: 1,
             },
             "21": {
               id: 21,
               quantity: 2,
               name: "cat 2 prod 1",
               price: 1,
-              productsCategoryId: 2,
+              productCategoryId: 2,
             },
             "31": {
               id: 31,
               quantity: 4,
               name: "cat 3 prod 1",
               price: 1,
-              productsCategoryId: 3,
+              productCategoryId: 3,
             },
             "32": {
               id: 32,
               quantity: 4,
               name: "cat 3 prod 2",
               price: 1,
-              productsCategoryId: 3,
+              productCategoryId: 3,
             },
             "41": {
               id: 41,
               quantity: 4,
               name: "cat 4 prod 1",
               price: 1,
-              productsCategoryId: 4,
+              productCategoryId: 4,
             },
           }}
           totalWithDiscount={5}

package/src/iframe/order-process/components/BookingSummary/components/ProductsByMenuStep/ProductsByMenuStep.tsx

@@ -13,7 +13,7 @@ const doesStepHaveItems = (orderItems: OrderItems, step: MenuStep): boolean => {
   const categoriesIds = step.productCategories.map((category) => category.id);
 
   const stepItems = values(orderItems).filter((item) =>
-    categoriesIds.includes(item.productsCategoryId)
+    categoriesIds.includes(item.productCategoryId)
   );
 
   return stepItems.length > 0;
@@ -23,7 +23,7 @@ const getOrderItemsForCategory = (
   orderItems: OrderItems,
   categoryId: number
 ): OrderItem[] =>
-  values(orderItems).filter((item) => item.productsCategoryId === categoryId);
+  values(orderItems).filter((item) => item.productCategoryId === categoryId);
 
 export type ProductsByMenuStepsProps = {
   orderItems: OrderItems;

package/src/iframe/order-process/components/BookingSummaryFooter/BookingSummaryFooter.tsx

@@ -1,6 +1,7 @@
 import React, { ReactNode, PropsWithChildren } from "react";
 import { useTranslation } from "react-i18next";
 import Button from "react-bootstrap/Button";
+import { Spinner } from "react-bootstrap";
 import { STEP_FORM_ID } from "../../constants";
 
 type ButtonPropsWithoutOnClick = {
@@ -18,29 +19,41 @@ type FooterProps = Partial<
     disabled?: boolean;
     buttonLabel?: ReactNode;
     showButton?: boolean;
+    isLoading: boolean;
   } & (ButtonPropsWithoutOnClick | ButtonPropsWithOnClick)
 >;
 
 export type BookingSummaryFooterProps = PropsWithChildren<FooterProps>;
 
 export const BookingSummaryFooter = ({
-  disabled = false,
+  disabled: _disabled = false,
   onClick,
   buttonLabel,
   form = STEP_FORM_ID,
   children,
   showButton = true,
+  isLoading = false,
 }: BookingSummaryFooterProps) => {
   const { t } = useTranslation("Design");
 
   const buttonProps = onClick ? { onClick } : { type: "submit", form };
 
+  const disabled = _disabled || isLoading;
+
   return (
     <div className="d-flex flex-column">
       {children}
       {showButton && (
-        <Button className="m-0 mt-3" disabled={disabled} {...buttonProps}>
-          {buttonLabel ?? t("continue")}
+        <Button
+          className="m-0 d-flex align-items-center justify-content-center mt-3"
+          disabled={disabled}
+          {...buttonProps}
+        >
+          {isLoading ? (
+            <Spinner animation="border" size="sm" role="status" />
+          ) : (
+            buttonLabel ?? t("continue")
+          )}
         </Button>
       )}
     </div>

package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx

@@ -14,7 +14,7 @@ interface FormOrderItem {
   id: number;
   name: string;
   price: number;
-  productsCategoryId: number;
+  productCategoryId: number;
   zoneId?: Zone["id"];
   deposit?: number | null;
   quantity: number;
@@ -50,7 +50,7 @@ export const ProductQuantityInput = ({
       name: product.name,
       deposit,
       price: product.price,
-      productsCategoryId: category.id,
+      productCategoryId: category.id,
       zoneId: category.zone?.id,
       quantity,
       capacity: product?.capacity,

package/src/iframe/order-process/components/utils/useCategoryVerification.ts

@@ -47,7 +47,7 @@ export const useCategoryVerification = () => {
       if (!minSubItems && !maxSubItems) return;
 
       const categoryProductsQuantity = productArray.filter(
-        (product) => product?.productsCategoryId === id
+        (product) => product?.productCategoryId === id
       ).length;
 
       if (minSubItems && categoryProductsQuantity < minSubItems) {

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

@@ -33,7 +33,7 @@ Default.args = {
         id: 348,
         quantity: 1,
         price: 3,
-        productsCategoryId: 216,
+        productCategoryId: 216,
         name: "test",
       },
       numberOfPeople: 1,

package/src/notification/email-template/control/EmailTemplateControl.tsx

@@ -201,15 +201,7 @@ export const EmailTemplateControl = React.forwardRef(
     return (
       <>
         <Row>
-          <Form.Group
-            as={Col}
-            controlId="type"
-            xs
-            sm={12}
-            md={8}
-            lg={10}
-            xl={12}
-          >
+          <Form.Group as={Col} controlId="type" sm={12}>
             <Form.Label>{t("type")}</Form.Label>
             <Form.Control
               as="select"
@@ -372,9 +364,7 @@ export const EmailTemplateControl = React.forwardRef(
                 if (option.type === OPTION_TYPE.checkbox) {
                   return (
                     <Form.Check
-                      {...register(
-                        `templateOptionValues.${option?.id}.value` as any
-                      )}
+                      {...register(`templateOptionValues.${option?.id}.value`)}
                       type="checkbox"
                       label={t(`Design:${option.name}`)}
                       id={option.name + option.id}
@@ -397,7 +387,7 @@ export const EmailTemplateControl = React.forwardRef(
                         onChange={() => {
                           setIsIncludePDF(!isIncludePDF);
                           setValue(
-                            `templateOptionValues.${option.id}.value` as any,
+                            `templateOptionValues.${option.id}.value`,
                             ""
                           );
                         }}
@@ -413,7 +403,7 @@ export const EmailTemplateControl = React.forwardRef(
                           <Form.Control
                             as="select"
                             {...register(
-                              `templateOptionValues.${option.id}.value` as any
+                              `templateOptionValues.${option.id}.value`
                             )}
                             defaultValue={option.selectedValue || ""}
                           >
@@ -442,7 +432,7 @@ export const EmailTemplateControl = React.forwardRef(
                       </Form.Label>
                       <Form.Control
                         {...register(
-                          `templateOptionValues.${option?.id}.value` as any
+                          `templateOptionValues.${option?.id}.value`
                         )}
                         type="number"
                         placeholder={t(`Design:${option.name}`)}

package/src/sales/manual-booking/summary/ManualBookingSummary.tsx

@@ -24,6 +24,7 @@ export interface ManualBookingSummaryProps {
   isFeeFetching: boolean;
   orderDate: string;
   relyOnPeopleType?: RelyOnPeopleType | null;
+  isMobileView?: boolean;
 }
 
 export const ManualBookingSummary = ({
@@ -35,6 +36,7 @@ export const ManualBookingSummary = ({
   orderDate,
   relyOnPeopleType,
   hasBookingCategory,
+  isMobileView,
 }: ManualBookingSummaryProps) => {
   const { t } = useTranslation(["Design", "Sale"]);
   const { formatNumber } = useIntl();
@@ -44,7 +46,13 @@ export const ManualBookingSummary = ({
   const date = currentDate.toFormat(DATE_TIME_MANUAL_BOOKING_FORMAT);
   const time = currentDate.toFormat(TIME_FORMAT);
   return (
-    <div className="manual-booking-summary">
+    <div
+      className={
+        isMobileView
+          ? "manual-booking-summary-mobile"
+          : "manual-booking-summary"
+      }
+    >
       <div className="receipt-title">{t("Sale:receipt")}</div>
       <div className="event-name border-summary-item">{eventName}</div>
       <div className="border-summary-item">{date}</div>

package/src/static/date-range-input/DateRangeInput.tsx

@@ -11,10 +11,13 @@ import {
   rangeDatesToStringDates,
   stringDatesToInputValue,
 } from "./utils";
+import { MOBILE_WIDTH } from "../../iframe/order-process/components/BookingSummary/types";
 
 import "react-date-range/dist/styles.css";
 import "react-date-range/dist/theme/default.css";
 
+type DateRangeDirection = "vertical" | "horizontal";
+
 type DateRangeInputProps = {
   placeholder: string;
   startDate?: string;
@@ -33,7 +36,7 @@ export const DateRangeInput = ({
   disabled,
 }: DateRangeInputProps) => {
   const { t } = useTranslation("Design");
-
+  const [direction, setDirection] = useState<DateRangeDirection>("horizontal");
   const [state, setState] = useState<Range[]>([
     {
       startDate: new Date(),
@@ -82,6 +85,24 @@ export const DateRangeInput = ({
     }
   }, [startDate, endDate]);
 
+  useEffect(() => {
+    const resizeBodyInMobile = () => {
+      if (window.innerWidth > MOBILE_WIDTH) {
+        setDirection("horizontal");
+        return;
+      }
+
+      setDirection("vertical");
+    };
+
+    resizeBodyInMobile();
+    window.addEventListener("resize", resizeBodyInMobile);
+
+    return () => {
+      window.removeEventListener("resize", resizeBodyInMobile);
+    };
+  }, []);
+
   return (
     <div>
       <OverlayTrigger
@@ -94,7 +115,7 @@ export const DateRangeInput = ({
                 moveRangeOnFirstSelection={false}
                 ranges={state}
                 months={months}
-                direction="horizontal"
+                direction={direction}
               />
               <div className="mt-3 d-flex justify-content-end">
                 <Button onClick={onReset} variant="link">

package/src/static/switch/BooleanSwitch.tsx

@@ -8,6 +8,8 @@ export interface BooleanSwitchProps {
   value?: boolean;
   disabled?: boolean;
   onChange: (value: boolean) => void;
+  firstValueTitle?: string;
+  secondValueTitle?: string;
 }
 
 export function BooleanSwitch({
@@ -15,12 +17,14 @@ export function BooleanSwitch({
   value,
   disabled,
   onChange,
+  firstValueTitle,
+  secondValueTitle,
 }: BooleanSwitchProps) {
   const { t } = useTranslation("Design");
 
   const options: SelectItem[] = [
-    { id: 1, value: t("yes") },
-    { id: 0, value: t("no") },
+    { id: 1, value: firstValueTitle ?? t("yes") },
+    { id: 0, value: secondValueTitle ?? t("no") },
   ];
 
   const handleChange = useCallback(

package/src/styles/events/EventCard.scss

@@ -7,8 +7,6 @@ $event-card-title-font-weight: $font-weight-semibold !default;
 $event-card-title-font-size: sp(5) !default;
 $event-card-title-line-height: 4 / 3 !default;
 
-$event-card-footer-height: sp(6) !default;
-
 $event-card-image-container-overflow-top: sp(3) !default;
 $event-card-image-container-overflow-x: sp(3) !default;
 $event-card-image-container-aspect-ratio: 1.6 !default;
@@ -34,7 +32,7 @@ $event-card-views-gutter: sp(3) !default;
   transition: ease-in 0.25s;
   border-radius: $event-card-border-radius;
 
-  >*+* {
+  > * + * {
     margin-top: $event-card-contents-gutter;
   }
 
@@ -54,7 +52,7 @@ $event-card-views-gutter: sp(3) !default;
         min-height: 13.75rem;
         max-height: 22rem;
       }
-  }
+    }
   }
 
   .card-title {
@@ -74,7 +72,6 @@ $event-card-views-gutter: sp(3) !default;
     border: unset;
     border-radius: unset;
     padding: 0;
-    height: $event-card-footer-height;
 
     svg {
       height: 100%;
@@ -175,4 +172,4 @@ $event-card-views-gutter: sp(3) !default;
     color: #504f4f;
     width: 1.7rem;
   }
-}
+}

package/src/styles/resources-blocking/_index.scss

@@ -106,6 +106,12 @@
     align-items: center;
     gap: 0.25rem;
     margin-bottom: 0.5rem;
+
+    @include media-breakpoint-down(sm) {
+      justify-content: center;
+      flex-wrap: wrap;
+    }
+
   }
 
   .text-input.form-group {

package/src/styles/sales/BookingFilter.scss

@@ -157,6 +157,19 @@
         margin-bottom: 0;
       }
     }
+
+    .apply-container{
+      display: flex;
+      justify-content: space-around;
+      column-gap: 2rem;
+      margin-left: 3rem;
+
+      @include media-breakpoint-down(sm) {
+        flex-direction: row;
+        margin-left: 0rem;
+        column-gap: 1rem;
+      }
+    }
   }
 
   .additional-filter-container {
@@ -164,10 +177,12 @@
 
     @include media-breakpoint-down(md) {
       flex-wrap: wrap;
+
       .date-container {
         width: 100%;
         flex: 1;
       }
+
       .btn-primary {
         margin-top: 1rem;
       }
@@ -228,6 +243,11 @@
           transform: rotate(45deg);
         }
       }
+
+      @include media-breakpoint-down(sm) {
+        flex-direction: column;
+        justify-content: flex-start;
+      }
     }
   }
-}
+}

package/src/styles/sales/BookingResults.scss

@@ -5,7 +5,7 @@
     flex-wrap: wrap;
 
     .result-card {
-      height: 14.25rem;
+      height: 14rem;
       border: 1px solid $gray-400;
       max-width: calc(50% - 0.75rem);
       flex: 0 0 calc(50% - 0.75rem);