@licklist/design 0.52.0 → 0.53.0-dev.0

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

@@ -42,18 +42,6 @@ export const CategoryProduct = ({
     return error?.message;
   }, [productsWithErrors, product.id]);
 
-  const deposit = useMemo(() => {
-    if (
-      !category.allowDeposits ||
-      !product.deposit ||
-      product?.isSoldOut ||
-      product.deposit >= product.price
-    ) {
-      return undefined;
-    }
-    return product.deposit;
-  }, [category, product]);
-
   const checkIfSoldOutProduct = () => {
     if (!soldOutProducts || product?.isSoldOut) {
       return undefined;
@@ -146,10 +134,13 @@ export const CategoryProduct = ({
             </div>
             <div className="iframe-event__product-price-wrapper">
               <span className="product-price">
-                {formatNumber(deposit ?? product.price, {
-                  style: "currency",
-                  currency: Config.Currency.GBP,
-                })}
+                {formatNumber(
+                  category.allowDeposits ? product?.deposit : product.price,
+                  {
+                    style: "currency",
+                    currency: Config.Currency.GBP,
+                  }
+                )}
               </span>
               <ProductQuantityInput
                 onChange={onChange}
@@ -162,17 +153,16 @@ export const CategoryProduct = ({
                 }}
                 category={category}
                 invalid={invalid}
-                deposit={deposit}
               />
             </div>
-            {deposit && !category?.remainderExpireAfter && (
+            {category.allowDeposits && !category?.remainderExpireAfter && (
               <div className="mt-4">
                 {t("Design:payNowAndUponArrival", {
-                  deposit: formatNumber(deposit, {
+                  deposit: formatNumber(product?.deposit, {
                     style: "currency",
                     currency: Config.Currency.GBP,
                   }),
-                  remainder: formatNumber(product.price - deposit, {
+                  remainder: formatNumber(product.price - product?.deposit, {
                     style: "currency",
                     currency: Config.Currency.GBP,
                   }),
@@ -180,14 +170,14 @@ export const CategoryProduct = ({
               </div>
             )}
 
-            {deposit && category?.remainderExpireAfter > 0 && (
+            {category.allowDeposits && category?.remainderExpireAfter > 0 && (
               <div className="mt-4">
                 {t("Design:payNowAndReminderDays", {
-                  deposit: formatNumber(deposit, {
+                  deposit: formatNumber(product?.deposit, {
                     style: "currency",
                     currency: Config.Currency.GBP,
                   }),
-                  remainder: formatNumber(product.price - deposit, {
+                  remainder: formatNumber(product.price - product?.deposit, {
                     style: "currency",
                     currency: Config.Currency.GBP,
                   }),

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

@@ -32,7 +32,7 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
     ref
   ) => {
     const handleArrowUpClick = () => {
-      if (max !== undefined && value < max) {
+      if (max !== undefined && (value || 0) < max) {
         onArrowUp(value + 1);
       }
       if (max === undefined) {

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

@@ -15,6 +15,7 @@ interface FormOrderItem {
   name: string;
   price: number;
   productCategoryId: number;
+  hasDeposit?: boolean;
   zoneId?: Zone["id"];
   deposit?: number | null;
   quantity: number;
@@ -40,19 +41,23 @@ export const ProductQuantityInput = ({
   refCallback,
   productInfo,
   invalid,
-  deposit,
 }: ProductQuantityInputProps) => {
   const { t } = useTranslation("Design");
 
   const onChange = (quantity: number | null) => {
+    let productQuantity = quantity;
+    if (product?.maxAmount && quantity > product?.maxAmount) {
+      productQuantity = product?.maxAmount;
+    }
     _onChange({
       id: product.id,
       name: product.name,
-      deposit,
+      deposit: product?.deposit,
+      hasDeposit: category.allowDeposits,
       price: product.price,
       productCategoryId: category.id,
       zoneId: category.zone?.id,
-      quantity,
+      quantity: productQuantity,
       capacity: product?.capacity,
     });
   };
@@ -99,6 +104,7 @@ export const ProductQuantityInput = ({
         clearErrors(`${product.id}` as const);
       }}
       min={0}
+      max={product?.maxAmount ? Number(product?.maxAmount) : undefined}
       placeholder="0"
       disabled={product.isSoldOut}
       value={productInfo?.quantity}

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/booking/results/components/ResultCard.tsx

@@ -12,7 +12,7 @@ import { TIME_FORMAT } from "@licklist/core/dist/Config";
 import * as Config from "@licklist/core/dist/Config";
 import { formatDateStringForEvent } from "@licklist/plugins/dist/utils/formatDate";
 import { getOrderSourceTitle } from "@licklist/plugins/dist/utils/sourceTitle";
-
+import { calculateTotalDiscount } from "../../../../iframe/payment/order-items-table/utils";
 import Icon from "../../../../static/Icon";
 
 export type ResultCardProps = {
@@ -22,8 +22,6 @@ export type ResultCardProps = {
   onCardClick?: (id: number) => void;
 };
 
-// @TODO integrate when API will be available
-// activity and staff keys
 export const ResultCard = ({
   order,
   className,
@@ -45,10 +43,14 @@ export const ResultCard = ({
     event,
     menu,
     remainingToPay,
+    payments,
   } = order;
 
+  const discount = calculateTotalDiscount(payments);
+
   const productList = products.map((product) => product.name)?.join(", ") || "";
   const activityName = event?.name || menu?.name || "";
+  const totalAmountWithDiscount = totalAmount - discount;
 
   const onClick = () => {
     if (!onCardClick) return;
@@ -108,7 +110,7 @@ export const ResultCard = ({
           )}
           <p>
             {t("paidAmount")}:{" "}
-            {formatNumber(totalAmount, {
+            {formatNumber(totalAmountWithDiscount, {
               style: "currency",
               currency: Config.Currency.GBP,
             })}

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/snippet/snippet-template/preview/Preview.tsx

@@ -208,6 +208,9 @@ export function Preview({
                           selectedDate={selectedDate}
                           setSelectedDate={setSelectedDate}
                           calendarDates={calendarDates}
+                          getDateTimeButtonProps={() => ({
+                            isDisabled: false,
+                          })}
                         />
                       </SettingButton>
                     </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

@@ -23,7 +23,7 @@ export function BooleanSwitch({
   const { t } = useTranslation("Design");
 
   const options: SelectItem[] = [
-    { id: 1, value: firstValueTitle ??  t("yes") },
+    { id: 1, value: firstValueTitle ?? t("yes") },
     { id: 0, value: secondValueTitle ?? t("no") },
   ];
 

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 {
@@ -230,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: 85%;
+    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,64 @@
   }
 }
 
+.manual-booking-summary-mobile {
+  display: none;
+
+  @include media-breakpoint-down(sm) {
+    display: block;
+    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;
@@ -437,4 +496,4 @@
       color: $blue;
     }
   }
-}
+}

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/snippet-templates/SnippetTemplateCard.scss

@@ -28,12 +28,13 @@ $snippet-template-card-button-transition: $product-set-card-transition !default;
   border: 1px solid #ccc;
   border-radius: $border-radius;
   height: 10rem;
-  width: 15rem;
+  min-width: 15rem;
   padding: 1rem;
 
   @include media-breakpoint-down(sm) {
     height: 100%;
     max-height: 10rem;
+    width: 100%;
   }
 
   p {
@@ -109,4 +110,4 @@ $snippet-template-card-button-transition: $product-set-card-transition !default;
   &:hover {
     border: 2px solid $blue;
   }
-}
+}

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;

package/src/styles/themes/bookedit/_index.scss

@@ -98,7 +98,8 @@
       color: gray("600");
 
       &.sortable {
-        &::before, &::after {
+        &::before,
+        &::after {
           opacity: 1;
         }
 
@@ -132,20 +133,20 @@
     width: 2.5rem;
     height: 2.5rem;
     background-color: transparent;
-  
+
     svg {
       margin-bottom: 2.5px;
     }
 
     &:hover {
       cursor: pointer;
-      border-radius: .5rem;
+      border-radius: 0.5rem;
       background-color: lighten($primary, 40);
     }
   }
 
   .page-item {
-    margin-left: .4rem;
+    margin-left: 0.4rem;
     min-width: 15px;
     width: 2.5rem;
     height: 2.5rem;
@@ -153,7 +154,7 @@
     .page-link {
       border: 0;
       padding: 0;
-      border-radius: .5rem;
+      border-radius: 0.5rem;
       height: 100%;
       display: flex;
       align-items: center;
@@ -162,13 +163,13 @@
       color: $black;
       font-weight: 600;
       font-size: 0.875rem;
-      
+
       &:hover {
-        border-radius: .5rem;
+        border-radius: 0.5rem;
         background-color: lighten($primary, 40);
       }
     }
-    
+
     &.active {
       .page-link {
         border: 2px solid $primary;