@licklist/design 0.44.485 → 0.44.486-dev.1

package/src/recurring-date-picker-input/RecurrenceIntervalAndFrequencyInput.tsx

@@ -1,25 +1,35 @@
-import React from "react";
+import React, { useEffect } from "react";
+import { DateTime } from "luxon";
 import { Col, Form, Row } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
 import { useFormContext } from "react-hook-form";
+import { DATE_FORMAT, TIME_FORMAT } from "@licklist/core/dist/Config";
 import { RecurringDatePickerInputValues } from "./RecurringDatePickerInput";
 
 interface RecurrenceIntervalAndFrequencyInputProps {
   disabled?: boolean;
   minDate?: string;
+  startDateLabel?: string;
+  startTimeLabel?: string;
+  endDateLabel?: string;
+  endTimeLabel?: string;
 }
 
 function RecurrenceIntervalAndFrequencyInput({
   disabled = false,
   minDate,
+  startDateLabel,
+  startTimeLabel,
+  endDateLabel,
+  endTimeLabel,
 }: RecurrenceIntervalAndFrequencyInputProps) {
   const { t } = useTranslation(["Design", "Notification", "App"]);
 
   const {
     getValues,
-    setValue,
     formState: { errors },
     register,
+    trigger,
   } = useFormContext<RecurringDatePickerInputValues>();
 
   const startDate = getValues("startDate");
@@ -27,21 +37,31 @@ function RecurrenceIntervalAndFrequencyInput({
   const startTime = getValues("startTime");
   const endTime = getValues("endTime");
 
+  useEffect(() => {
+    if (!startDate || !endDate) {
+      return;
+    }
+    trigger(`endDate`);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [startDate]);
+
+  useEffect(() => {
+    trigger("endTime");
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [startTime]);
+
   return (
     <>
-      <Row className="align-items-center">
+      <Row>
         <Col xs={12} sm={6}>
           <Form.Group>
-            <Form.Label>{t("Design:fromDate")}</Form.Label>
+            <Form.Label>{startDateLabel ?? t("Design:fromDate")}</Form.Label>
             <Form.Control
               type="date"
               {...register("startDate", { required: true })}
               defaultValue={startDate}
               className={startDate && "date-input-with-value"}
               disabled={disabled}
-              onChange={({ target: { value } }) => {
-                setValue("startDate", value);
-              }}
               min={minDate}
               isInvalid={Boolean(errors.startDate)}
             />
@@ -53,16 +73,32 @@ function RecurrenceIntervalAndFrequencyInput({
 
         <Col xs={12} sm={6}>
           <Form.Group>
-            <Form.Label>{t("Design:toDate")}</Form.Label>
+            <Form.Label>{endDateLabel ?? t("Design:toDate")}</Form.Label>
             <Form.Control
               type="date"
-              {...register("endDate", { required: true })}
+              {...register("endDate", {
+                required: true,
+                validate: (date) => {
+                  if (!startDate || !date) {
+                    return true;
+                  }
+                  const currentStartDate = DateTime.fromFormat(
+                    startDate,
+                    DATE_FORMAT
+                  );
+                  const currentEndDate = DateTime.fromFormat(date, DATE_FORMAT);
+                  return currentEndDate.diff(currentStartDate, ["days"]).days >=
+                    0
+                    ? true
+                    : `${t(`Validation:fieldLaterDate`, {
+                        attribute: t("Design:endDateSmall"),
+                        min: t("Design:startDateSmall"),
+                      })}`;
+                },
+              })}
               defaultValue={endDate}
               className={endDate && "date-input-with-value"}
               disabled={disabled}
-              onChange={({ target: { value } }) => {
-                setValue("endDate", value);
-              }}
               min={startDate || undefined}
               isInvalid={Boolean(errors.endDate)}
             />
@@ -76,16 +112,15 @@ function RecurrenceIntervalAndFrequencyInput({
       <Row className="align-items-center">
         <Col xs={12} sm={6}>
           <Form.Group>
-            <Form.Label>{t("Design:availableFrom")}</Form.Label>
+            <Form.Label>
+              {startTimeLabel ?? t("Design:availableFrom")}
+            </Form.Label>
             <Form.Control
               type="time"
               {...register("startTime", { required: false })}
               placeholder="hh:mm"
               defaultValue={startTime}
               disabled={disabled}
-              onChange={({ target: { value } }) => {
-                setValue("startTime", `${value}:00`);
-              }}
               isInvalid={Boolean(errors.startTime)}
             />
           </Form.Group>
@@ -93,18 +128,38 @@ function RecurrenceIntervalAndFrequencyInput({
 
         <Col xs={12} sm={6}>
           <Form.Group>
-            <Form.Label>{t("Design:availableTo")}</Form.Label>
+            <Form.Label>{endTimeLabel ?? t("Design:availableTo")}</Form.Label>
             <Form.Control
               type="time"
-              {...register("endTime", { required: false })}
+              {...register("endTime", {
+                required: false,
+                validate: (time) => {
+                  if (!startTime || !time) {
+                    return true;
+                  }
+                  const currentStartTime = DateTime.fromFormat(
+                    startTime,
+                    TIME_FORMAT
+                  );
+                  const currentEndTime = DateTime.fromFormat(time, TIME_FORMAT);
+
+                  return currentEndTime.diff(currentStartTime, ["minutes"])
+                    .minutes > 0
+                    ? true
+                    : `${t(`Validation:fieldLaterDate`, {
+                        attribute: t("Design:endTimeSmall"),
+                        min: t("Design:startTimeSmall"),
+                      })}`;
+                },
+              })}
               placeholder="hh:mm"
               defaultValue={endTime}
               disabled={disabled}
-              onChange={({ target: { value } }) => {
-                setValue("endTime", `${value}:59`);
-              }}
               isInvalid={Boolean(errors.endTime)}
             />
+            <Form.Control.Feedback type="invalid">
+              {errors.endTime?.message}
+            </Form.Control.Feedback>
           </Form.Group>
         </Col>
       </Row>

package/src/recurring-date-picker-input/RecurringDatePickerInput.tsx

@@ -166,6 +166,7 @@ export function RecurringDatePickerInput({
   return (
     <FormProvider {...form}>
       <Form
+        noValidate
         onSubmit={(event) => {
           // prevents parent form submitting
           event.preventDefault();

package/src/sales/booking/index.ts

@@ -1,3 +1 @@
-export * from "./tabs";
-export * from "./filter";
 export * from "./results";

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

@@ -3,7 +3,7 @@ import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { DateTime } from "luxon";
 import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
-import { formatDateStringToOrdinalFormatWithPrefix } from "@licklist/core/dist/Services/Date";
+import { formatDateStringForEvent } from "@licklist/plugins/dist/utils/formatDate";
 import Icon from "../../../../static/Icon";
 
 export type ResultCardProps = {
@@ -55,7 +55,7 @@ export const ResultCard = ({
             {t("status")}: {t(status)}
           </p>
           <p>
-            {t("date")}: {formatDateStringToOrdinalFormatWithPrefix(startDate)}
+            {t("date")}: {formatDateStringForEvent(startDate)}
           </p>
           <p>
             {t("time")}: {DateTime.fromISO(startDate).toFormat("hh:MM")}

package/src/sales/booking/results/constants.ts

@@ -3,4 +3,5 @@ export const BACKGROUND_COLOR_CLASSNAMES = [
   "random-color-yellow",
   "random-color-green",
   "random-color-pink",
+  "random-color-violet",
 ];

package/src/sales/booking/results/index.ts

@@ -1,2 +1,3 @@
 export { BookingResults } from "./BookingResults";
+export * from "./constants";
 export type { BookingResultsProps } from "./BookingResults";

package/src/sales/coupon/control/CouponFormControl.tsx

@@ -233,6 +233,7 @@ export const CouponFormControl = ({
               <Form.Control
                 type="date"
                 {...register("validTill")}
+                value={validTillValue}
                 onChange={(e) => {
                   const date = DateTime.fromSQL(e.target.value).toISODate();
                   setValue("validTill", date);
@@ -331,6 +332,7 @@ export const CouponFormControl = ({
             <Form.Group>
               <Form.Label>{t("Design:totalCoupons")}</Form.Label>
               <Form.Control
+                {...register("totalCoupons")}
                 type="number"
                 isInvalid={errors.totalCoupons !== undefined}
                 disabled={isLoading}

package/src/sales/filters/SaleFilter.stories.tsx

@@ -13,7 +13,7 @@ export const Default: Story<SaleFiltersProps> = () => {
     name: "",
     email: "",
     date: "",
-    is_pending: false,
+    is_in_cart: false,
   });
 
   return <SaleFilters values={values} onChange={setValues} />;

package/src/sales/filters/SaleFilters.tsx

@@ -4,7 +4,7 @@ import clsx from "clsx";
 import { TextField } from "../../static/TextField";
 import { DateRangeInput } from "../../static/date-range-input";
 
-interface Filters {
+export interface Filters {
   id: string;
   name: string;
   email: string;
@@ -12,7 +12,7 @@ interface Filters {
   order_date_to: string;
   orderable_date_from: string;
   orderable_date_to: string;
-  is_pending: boolean;
+  is_in_cart: boolean;
 }
 
 export interface SaleFiltersProps {

package/src/sales/guest-profile/previous-bookings/PreviousBookings.stories.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 import { Meta } from "@storybook/react";
+import { boolean } from "@storybook/addon-knobs";
 import { Event } from "@licklist/core/dist/DataMapper/Provider/EventDataMapper";
 import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
 import { Product } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
@@ -10,11 +11,26 @@ export default {
   title: "Sales/Guest Profile/Previous Bookings",
 } as Meta;
 
-export const Default = (args) => (
-  <div>
-    <PreviousBookings {...args} />
-  </div>
-);
+export const Default = (args) => {
+  const useProviderLink = boolean("useProviderLink", true);
+
+  const renderOrderTitleLinkByProvider = (order: Order) => {
+    return (
+      <a href={`/some_href/${order.id}`}>{order[order.orderableType]?.name}</a>
+    );
+  };
+
+  return (
+    <div>
+      <PreviousBookings
+        {...args}
+        renderOrderTitleLinkByProvider={
+          useProviderLink ? renderOrderTitleLinkByProvider : undefined
+        }
+      />
+    </div>
+  );
+};
 
 Default.args = {
   orders: [
@@ -43,6 +59,8 @@ Default.args = {
       updatedAt: "2022-05-20 18:28:56",
       status: "cart",
       tickets: [],
+      orderableType: "event",
+      orderableId: 1,
       event: {
         id: 1,
         name: "testEvent1",
@@ -79,6 +97,8 @@ Default.args = {
       updatedAt: "2022-05-20 18:28:56",
       status: "cart",
       tickets: [],
+      orderableType: "event",
+      orderableId: 2,
       event: {
         id: 2,
         name: "testEvent2",
@@ -128,6 +148,8 @@ Default.args = {
       updatedAt: "2022-05-20 18:28:56",
       status: "cart",
       tickets: [],
+      orderableType: "event",
+      orderableId: 3,
       event: {
         id: 3,
         name: "testEvent3",
@@ -156,6 +178,8 @@ Default.args = {
       updatedAt: "2022-05-20 18:28:56",
       status: "cart",
       tickets: [],
+      orderableType: "event",
+      orderableId: 3,
       event: {
         id: 3,
         name: "testEvent3",
@@ -184,6 +208,8 @@ Default.args = {
       updatedAt: "2022-05-20 18:28:56",
       status: "cart",
       tickets: [],
+      orderableType: "event",
+      orderableId: 3,
       event: {
         id: 3,
         name: "testEvent3",
@@ -212,6 +238,8 @@ Default.args = {
       updatedAt: "2022-05-20 18:28:56",
       status: "cart",
       tickets: [],
+      orderableType: "event",
+      orderableId: 3,
       event: {
         id: 3,
         name: "testEvent3",
@@ -239,6 +267,8 @@ Default.args = {
       updatedAt: "2022-05-20 18:28:56",
       status: "cart",
       tickets: [],
+      orderableType: "event",
+      orderableId: 3,
       event: {
         id: 3,
         name: "testEvent3",

package/src/sales/guest-profile/previous-bookings/PreviousBookings.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState, ReactNode } from "react";
 import { useTranslation } from "react-i18next";
 import { DateTime } from "luxon";
 import { Button } from "react-bootstrap";
@@ -8,9 +8,13 @@ const MAX_ORDERS_COUNT = 6;
 
 export type PreviousBookingsProps = {
   orders: Order[];
+  renderOrderTitleLinkByProvider?: (order: Order) => ReactNode;
 };
 
-export const PreviousBookings = ({ orders }: PreviousBookingsProps) => {
+export const PreviousBookings = ({
+  orders,
+  renderOrderTitleLinkByProvider,
+}: PreviousBookingsProps) => {
   const { t } = useTranslation("Design");
   const [showOlderBookings, setShowOlderBookings] = useState(false);
 
@@ -36,13 +40,17 @@ export const PreviousBookings = ({ orders }: PreviousBookingsProps) => {
       {orders.length > 0 ? (
         <div className="events-wrapper">
           {orders.slice(0, endSlicedOrdersNumber).map((order) => {
+            const eventName = renderOrderTitleLinkByProvider
+              ? renderOrderTitleLinkByProvider(order)
+              : order[order.orderableType]?.name;
+
             return (
               <div
                 className="event-info col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6"
                 key={order.id}
               >
                 <div className="info-wrapper">
-                  <p className="label">{order.event?.name}</p>
+                  <p className="label">{eventName}</p>
                   {order.createdAt && (
                     <p className="event-date">{formatDate(order.createdAt)}</p>
                   )}

package/src/sales/manual-booking/index.ts

@@ -1,10 +1,6 @@
 export * from "./select-event";
 export * from "./number-input-horizontal";
-export * from "./category-products";
-export * from "./controll/ManualBookingStepsControll";
-export * from "./category-product";
-export * from "./final-step";
-export * from "./customer-info";
 export * from "./summary";
+export * from "./search-user";
 export * from "./select-date-type-control";
 export * from "./select-menu";

package/src/sales/manual-booking/number-input-horizontal/NumberInputHorizontal.tsx

@@ -17,6 +17,7 @@ interface NumberInputHorizontalProps {
   max?: number;
   size?: Sizes;
   defaultValue?: number;
+  hasCurrency?: boolean;
   isLoading?: boolean;
 }
 
@@ -30,6 +31,7 @@ export const NumberInputHorizontal = forwardRef<
       className = "",
       value,
       size = "small",
+      hasCurrency,
       onChange,
       onPlusClick,
       onMinusClick,
@@ -90,7 +92,7 @@ export const NumberInputHorizontal = forwardRef<
             disabled && hasBigSize && "w-100",
           ].join(" ")}
         >
-          {size === "small" && <div className="currency">£</div>}
+          {hasCurrency && <div className="currency">£</div>}
 
           <FormControl
             ref={ref}

package/src/sales/manual-booking/select-date-type-control/SelectDateTypeControl.stories.tsx

@@ -21,7 +21,7 @@ export const Default: Story<any> = (args) => {
         orderableType={orderableType}
         setOrderableType={setOrderableType}
         orderDate={orderDate}
-        setOrderDate={setOrderDate}
+        onChangeDate={setOrderDate}
         showTypeSelect={showTypeSelect}
       />
     </div>

package/src/sales/manual-booking/select-date-type-control/SelectDateTypeControl.tsx

@@ -9,14 +9,14 @@ import HTMLInputDateElement from "../../../types/static/HTMLInputDateElement";
 
 type SelectDateTypeControlProps = {
   orderDate: string;
-  setOrderDate: (date: string) => void;
+  onChangeDate: (date: string) => void;
   showTypeSelect?: boolean;
   orderableType?: OrderableType;
   setOrderableType: (value?: OrderableType) => void;
 };
 
 export const SelectDateTypeControl = ({
-  setOrderDate,
+  onChangeDate,
   orderDate,
   showTypeSelect,
   orderableType,
@@ -29,11 +29,11 @@ export const SelectDateTypeControl = ({
 
   const changeFromDate = useCallback(
     ({ target: { value } }: ChangeEvent<HTMLInputElement>) => {
-      if (!setOrderDate) return;
+      if (!onChangeDate) return;
 
-      setOrderDate(value);
+      onChangeDate(value);
     },
-    [setOrderDate]
+    [onChangeDate]
   );
 
   const onChangeOrderableType = useCallback(
@@ -71,7 +71,7 @@ export const SelectDateTypeControl = ({
           >
             <option value="">{t("Design:pleaseChooseOne")}</option>
             <option value="event">{t("Design:event")}</option>
-            <option value="menu">{t("Design:menu")}</option>
+            <option value="menu">{t("Design:productSet")}</option>
           </Form.Control>
         </Form.Group>
       )}

package/src/sales/manual-booking/select-event/SelectEvent.tsx

@@ -4,14 +4,14 @@ import { Card, Form } from "react-bootstrap";
 import MediaService from "@licklist/plugins/dist/services/Media/MediaService";
 import { rrulestr } from "rrule";
 import { DateTime } from "luxon";
-import { TransformedEvent } from "@licklist/plugins/dist/types/context/sale/menuSteps";
+import { ManualBookingEvent } from "@licklist/plugins/dist/types/context/sale/menuSteps";
 import { formatToDays, formatToHours } from "../formatDays";
 import { BlockLoader } from "../../../static/loader";
 
 interface SelectEventProps {
-  selectEvent: (event: TransformedEvent) => void;
+  selectEvent: (event: ManualBookingEvent) => void;
   isLoading: boolean;
-  events?: TransformedEvent[] | null;
+  events?: ManualBookingEvent[] | null;
 }
 
 export const SelectEvent = ({

package/src/sales/manual-booking/select-menu/SelectMenu.tsx

@@ -1,20 +1,22 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Form } from "react-bootstrap";
-import { TransformedMenu } from "@licklist/plugins/dist/types/context/sale/menuSteps";
+import { ManualBookingMenu } from "@licklist/plugins/dist/types/context/sale/menuSteps";
 import { BlockLoader } from "../../../static/loader";
 import { MenuButton } from "./components/MenuButton";
 
 export type SelectMenuProps = {
   isLoading?: boolean;
-  menus?: TransformedMenu[];
-  onSelectMenu?: (menu: TransformedMenu) => void;
+  menus?: ManualBookingMenu[] | null;
+  onSelectMenu?: (menu: ManualBookingMenu) => void;
+  noMenusMessage?: string;
 };
 
 export const SelectMenu = ({
   isLoading = false,
   menus,
   onSelectMenu,
+  noMenusMessage,
 }: SelectMenuProps) => {
   const { t } = useTranslation(["App", "Sale"]);
 
@@ -33,13 +35,15 @@ export const SelectMenu = ({
       {(!menus || !menus.length) && !isLoading ? (
         <div className="no-results-content">
           <span className="no-results-found">
-            {t("App:noResultsFoundForSelectedDate")}
+            {noMenusMessage ?? t("App:noResultsFoundForSelectedDate")}
           </span>
         </div>
       ) : (
         <>
           {!isLoading && (
-            <Form.Label className="bold-text">{t("App:menus")}</Form.Label>
+            <Form.Label className="bold-text">
+              {t("Design:productSets")}
+            </Form.Label>
           )}
 
           <div className="menu-list-manual-booking">

package/src/sales/manual-booking/select-menu/components/MenuButton.tsx

@@ -1,9 +1,9 @@
 import React from "react";
-import { TransformedMenu } from "@licklist/plugins/dist/types/context/sale/menuSteps";
+import { ManualBookingMenu } from "@licklist/plugins/dist/types/context/sale/menuSteps";
 
 export type MenuButtonProps = {
-  menu: TransformedMenu;
-  onSelectMenu?: (menu: TransformedMenu) => void;
+  menu: ManualBookingMenu;
+  onSelectMenu?: (menu: ManualBookingMenu) => void;
 };
 
 export const MenuButton = ({ menu, onSelectMenu }: MenuButtonProps) => {

package/src/sales/notes/NotesTableRow.tsx

@@ -7,8 +7,8 @@ import { Note } from "@licklist/core/dist/DataMapper/Order/NoteDataMapper";
 import { capitalize } from "lodash";
 import { DateTime } from "luxon";
 import {
-  DATE_TIME_FULL_FORMAT,
   DATE_TIME_FORMAT,
+  DATE_TIME_FULL_FORMAT,
 } from "@licklist/core/dist/Config";
 import { getClientTimeZone } from "@licklist/core/dist/Services";
 import { ConfirmModal } from "../../modals";

package/src/setting/dashboard/index.ts

@@ -1,7 +1,5 @@
 export * from "./DashboardSettingForm";
-export * from "./snippets/form";
 export * from "./snippets/card";
 export * from "./snippet-templates/card";
 export * from "./payments/payments-form/PaymentsForm";
 export * from "./payments/payments-modal/PaymentsModal";
-export * from "./snippets/modal";

package/src/snippet/snippet-template/SnippetTemplate.tsx

@@ -44,7 +44,7 @@ export function SnippetTemplate({
         <SnippetTemplateViewContextProvider>
           <div
             ref={containerRef}
-            className="d-flex flex-column-reverse flex-sm-row"
+            className="d-flex flex-column-reverse flex-sm-row overflow-auto"
           >
             <div className="d-flex flex-grow-1">
               <Preview

package/src/snippet/snippet-template/form/SnippetTemplateForm.tsx

@@ -6,8 +6,8 @@ import { useTranslation } from "react-i18next";
 import { isEqual } from "lodash";
 import {
   SnippetTemplateValues,
-  SNIPPET_TEMPLATE_TYPE_EVENT,
-  SNIPPET_TEMPLATE_TYPE_CALENDAR,
+  SNIPPET_TEMPLATE_TYPE_EVENT_LIST,
+  SNIPPET_TEMPLATE_TYPE_VENUE_MAP,
 } from "@licklist/core/dist/DataMapper/Provider/SnippetTemplateDataMapper";
 import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
 import Row from "react-bootstrap/Row";
@@ -80,7 +80,7 @@ export function SnippetTemplateForm({
     <FormProvider {...form}>
       <Form onSubmit={form.handleSubmit(onSubmit)}>
         <h2 className="mb-2 pb-1 border-bottom border-secondary">
-          {t("templateSettings")}
+          {t("designSettings")}
         </h2>
 
         <Row>
@@ -113,21 +113,21 @@ export function SnippetTemplateForm({
         {providerHasMap && (
           <Row>
             <Form.Group as={Col} xs sm={12} md={8} lg={10} xl={12}>
-              <Form.Label>{t("snippetType")}</Form.Label>
+              <Form.Label>{t("widgetType")}</Form.Label>
               <Form.Control
                 as="select"
                 {...register("type", {
                   required: t("Validation:fieldRequired", {
-                    attribute: t("snippetType"),
+                    attribute: t("widgetType"),
                   }) as string,
                 })}
-                placeholder={t("snippetType")}
+                placeholder={t("widgetType")}
               >
-                <option value={SNIPPET_TEMPLATE_TYPE_EVENT}>
-                  {t("snippetTypeEventList")}
+                <option value={SNIPPET_TEMPLATE_TYPE_EVENT_LIST}>
+                  {t("widgetTypeEventList")}
                 </option>
-                <option value={SNIPPET_TEMPLATE_TYPE_CALENDAR}>
-                  {t("snippetTypeVenueMaps")}
+                <option value={SNIPPET_TEMPLATE_TYPE_VENUE_MAP}>
+                  {t("widgetTypeVenueMaps")}
                 </option>
               </Form.Control>
             </Form.Group>