@licklist/design 0.58.1 → 0.58.3-dev.0

package/dist/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/dist/styles/sales/LifeTimeSales.scss

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

package/dist/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/dist/styles/sales/SourceOfSales.scss

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

package/dist/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/dist/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/dist/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;

package/dist/styles/themes/bookedit/_variables.scss

@@ -197,6 +197,7 @@ $grid-breakpoints: (
   md: 768px,
   lg: 992px,
   xl: 1200px,
+  xxl: 1500px,
 ) !default;
 
 @include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
@@ -211,6 +212,7 @@ $container-max-widths: (
   md: 720px,
   lg: 960px,
   xl: 1140px,
+  xxl: 1500px,
 ) !default;
 
 @include _assert-ascending($container-max-widths, "$container-max-widths");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.58.1",
+  "version": "0.58.3-dev.0",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -53,9 +53,9 @@
     "@fortawesome/free-brands-svg-icons": "5.15.2",
     "@fortawesome/free-solid-svg-icons": "5.15.2",
     "@fortawesome/react-fontawesome": "0.1.9",
-    "@licklist/core": "^0.20.0",
+    "@licklist/core": ">=0.22.1-dev.3 < 0.22.1",
     "@licklist/eslint-config": "0.3.4",
-    "@licklist/plugins": "^0.26.0",
+    "@licklist/plugins": ">=0.27.1-dev.0 < 0.27.1",
     "@mdx-js/react": "1.6.22",
     "@popperjs/core": "2.11.8",
     "@react-aria/utils": "3.9.0",

package/src/auth/Login/LoginComponent.tsx

@@ -1,4 +1,4 @@
-import React, { useContext, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import Row from "react-bootstrap/Row";
 import Col from "react-bootstrap/Col";
 import { Trans, useTranslation } from "react-i18next";
@@ -90,6 +90,14 @@ const LoginComponent = ({
     RouteService.redirectTo("/");
   };
 
+  useEffect(() => {
+    if (!user.profile || !auth.secrets) {
+      return;
+    }
+
+    RouteService.redirectTo("/");
+  }, [user.profile, auth.secrets]);
+
   return (
     <Router>
       <Row className="justify-content-center">

package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx

@@ -2,7 +2,6 @@ import React, { useEffect, useMemo } from "react";
 import { Button, Form } from "react-bootstrap";
 import { FormProvider, useForm } from "react-hook-form";
 import { isEqual } from "lodash";
-
 import { useParams } from "react-router-dom";
 import { useEventEditProductSetContext } from "@licklist/plugins/dist/context/event/EventEditProductSetContext";
 import { useTranslation } from "react-i18next";

package/src/events/edit-event-modal/utils/getDefaultProductSet.ts

@@ -29,22 +29,22 @@ export const getDefaultValues = (
   steps:
     productSet?.steps?.map(({ productCategories, ...step }) => ({
       ...step,
-      productCategories: productCategories?.map(
-        ({ products, ...productCategory }) => ({
+      productCategories:
+        productCategories?.map(({ products, ...productCategory }) => ({
           ...productCategory,
-          products: products?.map(({ zoneId, subProducts, ...product }) => ({
-            ...product,
-            subProducts: subProducts?.map(({ zoneId, ...subProducts }) => ({
-              ...subProducts,
+          products:
+            products?.map(({ zoneId, subProducts, ...product }) => ({
+              ...product,
+              subProducts: subProducts?.map(({ zoneId, ...subProducts }) => ({
+                ...subProducts,
+                productCategoryId: undefined,
+                zoneId,
+              })),
               productCategoryId: undefined,
-              zoneId: zoneId as number,
-            })),
-            productCategoryId: undefined,
-            zoneId: zoneId as number,
-          })),
-        })
-      ),
+              zoneId,
+            })) ?? [],
+        })) ?? [],
       venueMapSetId: step?.venueMapSet ? step?.venueMapSet?.id : null,
-    })) ?? undefined,
+    })) ?? [],
   menuRecurrences: hasNoRecurrences ? [] : productSet?.menuRecurrences ?? [],
 });

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

@@ -1,8 +1,8 @@
-import { ProductCategory } from "@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper";
 import { Currency } from "@licklist/core/dist/Config";
 import { useIntl } from "react-intl";
 import { useTranslation } from "react-i18next";
 import { OrderItems } from "@licklist/plugins/dist/types/context/Iframe/orderItems";
+import { ProductCategory } from "@licklist/plugins/dist/types/context/sale/menuSteps";
 
 interface CategoryError {
   message: string;
@@ -15,14 +15,16 @@ export const useCategoryVerification = () => {
   const { formatNumber } = useIntl();
 
   return (
-    values: OrderItems,
+    orderItems: OrderItems,
     productCategories?: ProductCategory[],
     isLastPage?: boolean
   ): CategoryError | void => {
     let errorMessage: { id?: number; message: string } | void;
-    const productArray = Object.values(values).filter(
+
+    const productArray = Object.values(orderItems).filter(
       (product) => product?.quantity > 0
     );
+
     const sumOfMinSpends = productCategories.reduce((acc, productCategory) => {
       const { products } = productCategory;
       const selectedProducts = products.filter((product) =>

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

@@ -61,7 +61,7 @@ export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
   productGroups?: SelectItem[];
   relyOnPeopleType?: RelyOnPeopleType | null;
   fieldSetId?: number;
-  steps?: Step[];
+  steps: Step[];
   emailTemplates?: TemplateItem[];
   smsTemplates?: TemplateItem[];
 }

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

@@ -33,7 +33,7 @@ export interface ProductSetFormValues
   extends FormValues,
     WithId,
     ProductSetControlValues {
-  steps?: Step[];
+  steps: Step[];
 }
 
 export interface ProductSetFormProps

package/src/report/ReportRunnerModal/ReportRunnerModal.tsx

@@ -1,4 +1,12 @@
-import { Report, ReportType } from "@licklist/core/dist/DataMapper/Report";
+import {
+  GenerateReportBody,
+  PERIOD_BY_BOOKING_DATE,
+  PERIOD_BY_CREATION_DATE,
+  PERIOD_BY_TYPES,
+  Report,
+  ReportPeriodBy,
+  ReportType,
+} from "@licklist/core/dist/DataMapper/Report";
 import { capitalize } from "lodash";
 import React from "react";
 import { Button, Form, Modal } from "react-bootstrap";
@@ -28,9 +36,11 @@ type ReportRunnerModalProps = {
   reports?: Report[] | null;
 };
 
-type FormValues = {
-  dateFrom: string;
-  dateTo: string;
+type FormValues = Pick<GenerateReportBody, "dateFrom" | "dateTo" | "periodBy">;
+
+const labelByPeriodType: Record<ReportPeriodBy, string> = {
+  [PERIOD_BY_CREATION_DATE]: "Design:reportPeriodByCreationDate",
+  [PERIOD_BY_BOOKING_DATE]: "Design:reportPeriodByBookingDate",
 };
 
 export const ReportRunnerModal = ({
@@ -126,6 +136,27 @@ export const ReportRunnerModal = ({
           </Button>
 
           <form noValidate>
+            <div className="period-by">
+              {PERIOD_BY_TYPES.map((type) => (
+                <div key={type}>
+                  <Form.Group>
+                    <Form.Check
+                      inline
+                      isInvalid={!!errors.periodBy}
+                      label={t(labelByPeriodType[type])}
+                      type="radio"
+                      id={type}
+                      value={type}
+                      {...register("periodBy")}
+                    />
+                    <Form.Control.Feedback type="invalid">
+                      {errors.periodBy?.message}
+                    </Form.Control.Feedback>
+                  </Form.Group>
+                </div>
+              ))}
+            </div>
+
             <div className="controls">
               <Form.Group controlId="from-input">
                 <Form.Label>{t("Design:from")}</Form.Label>

package/src/sales/booking/results/components/ResultCard.tsx

@@ -12,7 +12,6 @@ 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 Icon from "../../../../static/Icon";
 
 export type ResultCardProps = {
@@ -22,8 +21,6 @@ export type ResultCardProps = {
   onCardClick?: (id: number) => void;
 };
 
-// @TODO integrate when API will be available
-// activity and staff keys
 export const ResultCard = ({
   order,
   className,

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

@@ -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") },
   ];