@licklist/design 0.49.0 → 0.50.0-dev.0

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/product-set/product/ProductControl.tsx

@@ -140,9 +140,7 @@ export function ProductControl<T extends FormValues>({
     clearErrors,
   } = useFormContext<T>();
 
-  const { setLoading, providerHasBookingManagement } = useContext(
-    ProductSetLoadingContext
-  );
+  const { setLoading } = useContext(ProductSetLoadingContext);
   const { t } = useTranslation(["Design", "Validation"]);
   const [expanded, setExpanded] = useState(false);
   const [initialImages, setInitialImages] = useState<Image[] | null>(null);
@@ -394,7 +392,6 @@ export function ProductControl<T extends FormValues>({
         <Row className="align-items-start duration-capacity-container">
           <ProductDurationControl
             fieldNamePrefix={fieldNamePrefix}
-            providerHasBookingManagement={providerHasBookingManagement}
             disabled={disabledDuration}
           />
 

package/src/product-set/product/duration/ProductDurationControl.tsx

@@ -8,13 +8,11 @@ import { useTranslation } from "react-i18next";
 import { ReactComponent as IncrementIcon } from "../../../assets/dashboard/increment.svg";
 
 export interface ProductDurationControlProps<T> extends FieldNamePrefixPath<T> {
-  providerHasBookingManagement: boolean;
   disabled: boolean;
 }
 
 export const ProductDurationControl = <T,>({
   fieldNamePrefix,
-  providerHasBookingManagement,
   disabled,
 }: ProductDurationControlProps<T>) => {
   const { t } = useTranslation("Design");
@@ -59,18 +57,21 @@ export const ProductDurationControl = <T,>({
       control={control}
       name={fieldName}
       rules={{
-        required: {
-          value: Boolean(providerHasBookingManagement),
-          message: t("Validation:fieldRequired", {
-            attribute: t("duration"),
-          }),
-        },
         min: {
-          value: 1,
+          value: 0,
           message: t("Validation:fieldMinNumber", {
             attribute: t("duration"),
+            min: 0,
           }),
         },
+        validate: (val) => {
+          if (!disabled && (!val || val < 1)) {
+            return t("Validation:fieldRequired", {
+              attribute: t("duration"),
+            }) as string;
+          }
+          return true;
+        },
       }}
       render={({ field }) => (
         <>

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/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);

package/src/styles/sales/BookingTabs.scss

@@ -1,24 +1,49 @@
 .booking-tabs-pane {
   display: flex;
   flex-direction: row;
+  justify-content: space-between;
   align-items: center;
   height: 2.75rem;
   background-color: $white;
 
   .booking-tabs {
     svg {
-      g > rect:first-child {
-        fill: $white; 
+      g>rect:first-child {
+        fill: $white;
       }
     }
-    
+
     .active {
       svg {
-        g > rect:first-child {
-          fill: $blue; 
+        g>rect:first-child {
+          fill: $blue;
         }
       }
     }
+
+    @include media-breakpoint-down(sm) {
+      width: 4rem;
+    }
+  }
+
+  .content {
+    display: flex;
+    justify-content: space-between;
+    width: 90%;
+    flex-direction: row;
+
+    @include media-breakpoint-down(sm) {
+      display: flex;
+      flex-direction: column;
+      align-items: start;
+      height: 4rem;
+    }
+
+    .booking {
+      @include media-breakpoint-down(sm) {
+        height: 13rem;
+      }
+    }
   }
 
   .separator {
@@ -29,6 +54,12 @@
   .children {
     flex: 1;
     margin-left: 1rem;
+
+    @include media-breakpoint-down(sm) {
+      display: flex;
+      flex-direction: column;
+      align-items: start;
+    }
   }
 
   .buttons {
@@ -61,6 +92,33 @@
         border-radius: 0.625rem;
         margin-right: 0.5rem;
       }
+      @include media-breakpoint-down(sm) {
+        width: 12.5rem;
+      }
+  
+    }
+
+    @include media-breakpoint-down(sm) {
+      display: flex;
+      flex-direction: column;
+      align-items: start;
+      gap: .5rem;
+      margin-top: .5rem;
+      white-space: nowrap;
+    }
+  }
+
+  @include media-breakpoint-down(sm) {
+    display: flex;
+    align-items: start;
+    gap: 1rem;
+    margin-top: 1rem;
+    height: 100%;
+  }
+
+  .booking {
+    @include media-breakpoint-down(sm) {
+      height: 13rem;
     }
   }
 }

package/src/styles/sales/LifeTimeSales.scss

@@ -33,6 +33,7 @@
   }
 
   @include media-breakpoint-down(sm) {
+    height: 12rem;
     &__value {
       line-height: 1rem;
       font-size: 2rem;

package/src/styles/sales/ManualBooking.scss

@@ -361,10 +361,11 @@
   width: inherit;
 
   @include media-breakpoint-down(sm) {
-    padding: 0 0.5rem;
-    padding-top: 2rem;
+    display: none;
   }
 
+
+
   .form-control {
     margin-bottom: 1.5rem;
   }
@@ -411,6 +412,59 @@
   }
 }
 
+.manual-booking-summary-mobile {
+  padding: 0 1.5rem;
+  padding-top: 2rem;
+  height: max-content;
+  margin-bottom: 1.5rem;
+  width: inherit;
+
+  .form-control {
+    margin-bottom: .5rem;
+  }
+  .receipt-title {
+    font-size: 1.125rem;
+    font-weight: 600;
+    padding-bottom: 0.4rem;
+    margin-bottom: 1rem;
+    border-bottom: 2px solid $gray-400;
+  }
+  .event-name {
+    font-size: 0.94rem;
+    font-weight: 600;
+  }
+
+  .border-summary-item {
+    padding-bottom: 0.9rem;
+    margin-bottom: 1%;
+    border-bottom: 2px solid $gray-100;
+    flex-wrap: wrap;
+  }
+
+  .total-container {
+    display: flex;
+    justify-content: space-between;
+    font-size: 1rem;
+    font-weight: 600;
+
+    @include media-breakpoint-down(lg) {
+      flex-wrap: wrap;
+    }
+    .total-amount {
+      padding-left: 1rem;
+      @include media-breakpoint-down(lg) {
+        padding-left: 0;
+      }
+    }
+  }
+
+  .summary-item-container {
+    .border-summary-item:nth-last-child(2) {
+      border-bottom: 2px solid $gray-400;
+    }
+  }
+}
+
 .menu-list-manual-booking {
   display: flex;
   align-items: center;

package/src/styles/sales/SourceOfSales.scss

@@ -13,6 +13,9 @@
 
   &__pie-chart {
     height: 100%;
+    @include media-breakpoint-down(sm) {
+      height: 12rem;
+    }
   }
 
   .colors-0 {

package/src/styles/static/Switch.scss

@@ -27,6 +27,7 @@ $btn-switch-option-padding-y: calc(#{$btn-padding-y} - #{sp(1)}) !default;
       border-radius: $btn-switch-option-border-radius;
       margin: 0;
       padding: $btn-switch-option-padding-y $btn-switch-option-padding-x;
+      min-width: 4.25rem;
 
       &:hover,
       &:active,

package/src/styles/static/Tabs.scss

@@ -11,6 +11,12 @@ $tab-nav-link-active-border-bottom: 1px solid $tab-nav-link-active-color !defaul
   margin-left: -1.25rem;
   border-bottom: 1px solid $nav-tabs-border-color;
 
+  @include media-breakpoint-down(sm) {
+    display: flex;
+    flex-direction: column;
+    white-space: nowrap;
+  }
+
   .nav-link {
     color: $tab-nav-link-color;
     background-color: transparent;