@licklist/design 0.67.5 → 0.68.0-dev.0

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

@@ -12,9 +12,7 @@ export default {
   component: RecurringDatePickerInput,
 } as Meta;
 
-type DefaultRecurringDatePickerInputProps = RecurringDatePickerInputProps;
-
-export const Default: Story<DefaultRecurringDatePickerInputProps> = (args) => {
+export const Default: Story<RecurringDatePickerInputProps> = (args) => {
   return (
     <Card style={{ maxWidth: "max-content" }}>
       <Card.Body>
@@ -23,7 +21,7 @@ export const Default: Story<DefaultRecurringDatePickerInputProps> = (args) => {
     </Card>
   );
 };
-export const Valid: Story<DefaultRecurringDatePickerInputProps> = (args) => {
+export const Valid: Story<RecurringDatePickerInputProps> = (args) => {
   return (
     <Card style={{ maxWidth: "max-content" }}>
       <Card.Body>
@@ -34,6 +32,15 @@ export const Valid: Story<DefaultRecurringDatePickerInputProps> = (args) => {
 };
 Default.args = {
   onChange: (data) => console.log("onSubmit", data),
+  workHours: [
+    { start: "20:00", end: "04:00", day: 0, description: "" },
+    { start: "20:00", end: "04:00", day: 1, description: "" },
+    { start: "20:00", end: "04:00", day: 2, description: "" },
+    { start: "20:00", end: "12:00", day: 3, description: "" },
+    { start: "20:00", end: "23:00", day: 4, description: "" },
+    { start: "08:00", end: "12:00", day: 5, description: "" },
+    { start: "10:00", end: "16:00", day: 6, description: "" },
+  ],
 };
 Valid.args = {
   onChange: (data) => console.log("onSubmit", data),

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

@@ -2,7 +2,7 @@ import { useEffect, useMemo, PropsWithChildren } from "react";
 import RRule, { Frequency, Weekday } from "rrule";
 import { useTranslation } from "react-i18next";
 import Button from "react-bootstrap/Button";
-import { DateTime, Interval } from "luxon";
+import { DateTime, Interval, WeekdayNumbers } from "luxon";
 import { useIntl } from "react-intl";
 import {
   DATE_TIME_FORMAT,
@@ -12,9 +12,14 @@ import {
 import { usePreviousValue } from "@licklist/plugins/dist/hooks/Value/usePreviousValue";
 import { FormProvider, useForm } from "react-hook-form";
 import { Form } from "react-bootstrap";
+import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 import RecurrenceIntervalAndFrequencyInput from "./RecurrenceIntervalAndFrequencyInput";
 import RecurrenceWeekdaysInput from "./RecurrenceWeekdaysInput";
-import { parseAndValidateRRule, SupportedFrequency } from "./utils";
+import {
+  parseAndValidateRRule,
+  SupportedFrequency,
+  useWorkHoursValidation,
+} from "./utils";
 import { ConfirmModal } from "../modals";
 import { DeleteFieldButton } from "../product-set/elements";
 
@@ -26,6 +31,8 @@ export interface RecurringDatePickerInputProps {
   initialFrequency?: Frequency;
   setInitialStartDateAfterSelect?: boolean;
   minDate?: string;
+  workHours: WorkHour[] | undefined;
+  timeZone: string;
 }
 
 export interface RecurringDatePickerInputValues {
@@ -51,6 +58,8 @@ export function RecurringDatePickerInput({
   setInitialStartDateAfterSelect = false,
   children,
   minDate,
+  workHours,
+  timeZone,
 }: PropsWithChildren<RecurringDatePickerInputProps>) {
   const { t } = useTranslation(["Design"]);
 
@@ -84,6 +93,8 @@ export function RecurringDatePickerInput({
     byWeekDay,
   });
 
+  const validator = useWorkHoursValidation(byWeekDay, workHours, timeZone);
+
   const onSubmit = (nextState: RecurringDatePickerInputValues) => {
     const end = getDateTimeObject(endDate, endTime || "23:59:59");
 
@@ -149,7 +160,7 @@ export function RecurringDatePickerInput({
     // Luxon use standard ISO calendar but in that case
     // first weekday from weekdays array start from 0 index.
     // We need to add 1 to it to show correct data
-    const currentWeekDay = byWeekDay[0]?.weekday + 1;
+    const currentWeekDay = (byWeekDay[0]?.weekday + 1) as WeekdayNumbers;
 
     const currentDate = DateTime.local();
 
@@ -188,6 +199,9 @@ export function RecurringDatePickerInput({
         <RecurrenceIntervalAndFrequencyInput
           disabled={disabled}
           minDate={minDate}
+          startTimeRules={validator}
+          endTimeRules={validator}
+          timeZone={timeZone}
         />
 
         {children}

package/src/recurring-date-picker-input/utils.ts

@@ -1,4 +1,8 @@
-import { DateTime } from "luxon";
+import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
+import { fromIso } from "@licklist/core/dist/Services";
+import { DateTime, Interval } from "luxon";
+import { Validate } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import RRule, { Frequency, Weekday } from "rrule";
 
 export const getWeekdayForFrequency = ({
@@ -11,6 +15,7 @@ export const getWeekdayForFrequency = ({
   const parsedDate = DateTime.fromISO(date);
   return new Weekday(
     parsedDate.weekday - 1,
+    // eslint-disable-next-line no-nested-ternary
     frequency !== Frequency.MONTHLY
       ? undefined
       : parsedDate.day + 7 > parsedDate.daysInMonth
@@ -109,3 +114,94 @@ export const parseAndValidateRRule = ({
     until: options.until,
   } as ParsedRRuleOptions;
 };
+
+export const useWorkHoursValidation = (
+  byWeekDay: Weekday[] = [],
+  _workHours: WorkHour[] | undefined,
+  timeZone: string,
+): {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  validate?: Validate<string, any>;
+} => {
+  const { t } = useTranslation("Validation");
+  if (!_workHours) return {};
+
+  const workHours: WorkHour[] = Array.from({ length: 7 }, (_, i) => {
+    if (_workHours?.[i]) {
+      return _workHours[i];
+    }
+
+    return {
+      day: (i + 1) as Day,
+      start: "00:00",
+      end: "23:59",
+      description: "",
+    };
+  });
+
+  // map every day to array of intervals describing workhours for that day
+  let intervalsByDay = workHours.map((workhour, index, self) => {
+    const res: Interval[] = [];
+
+    const startTime = fromIso(workhour.start, timeZone);
+    const endTime = fromIso(workhour.end, timeZone);
+
+    if (endTime > startTime) {
+      res.push(Interval.fromDateTimes(startTime, endTime));
+    } else {
+      // if end is before start, then it means that end is on the next day
+      // so count only to the end of current day
+      res.push(Interval.fromDateTimes(startTime, startTime.endOf("day")));
+    }
+
+    const prevIndex = index === 0 ? self.length - 1 : index - 1;
+
+    const prevStartTime = fromIso(self[prevIndex].start, timeZone);
+    const prevEndTime = fromIso(self[prevIndex].end, timeZone);
+
+    // if prevStartTime > prevEndTime then it means that prevEndTime is on the current day
+    // so we need to add interval from start of current day to prevEndTime
+    if (prevStartTime > prevEndTime) {
+      res.push(Interval.fromDateTimes(prevEndTime.startOf("day"), prevEndTime));
+    }
+
+    return res;
+  });
+
+  // if length === 0 or length === 7 then all workhours are selected, no need to filter
+  if (![0, 7].includes(byWeekDay.length)) {
+    intervalsByDay = intervalsByDay.filter((_, index) =>
+      byWeekDay.find(({ weekday }) => weekday === index),
+    );
+  }
+
+  return {
+    validate: (_time: string) => {
+      const time = fromIso(_time, timeZone);
+
+      const notFittingIntervalsByDay = intervalsByDay.reduce<Interval[][]>(
+        (acc, intervalsByDay) => {
+          if (!intervalsByDay.some((interval) => interval.contains(time))) {
+            acc.push(intervalsByDay);
+          }
+          return acc;
+        },
+        [],
+      );
+
+      const notFittingIntervals = notFittingIntervalsByDay
+        .flat()
+        .filter((interval) => !interval.contains(time));
+
+      const attribute = notFittingIntervals
+        .map((interval) => interval.toFormat("HH:mm"))
+        .join(", ");
+
+      if (notFittingIntervalsByDay.length !== 0) {
+        return t("outsideWorkingHours", { attribute }) as string;
+      }
+
+      return true;
+    },
+  };
+};

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

@@ -1,6 +1,5 @@
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
-import { DateTime } from "luxon";
 import { useIntl } from "react-intl";
 import {
   Order,
@@ -12,6 +11,7 @@ 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 { FaUser } from "react-icons/fa";
+import { fromIso } from "@licklist/core/dist/Services";
 
 export type ResultCardProps = {
   className: string;
@@ -20,8 +20,6 @@ export type ResultCardProps = {
   onCardClick?: (id: number) => void;
 };
 
-// @TODO integrate when API will be available
-// activity and staff keys
 export const ResultCard = ({
   order,
   className,
@@ -48,11 +46,7 @@ export const ResultCard = ({
   const productList = products.map((product) => product.name)?.join(", ") || "";
   const activityName = event?.name || menu?.name || "";
 
-  const onClick = () => {
-    if (!onCardClick) return;
-
-    onCardClick(id);
-  };
+  const onClick = () => onCardClick?.(id);
 
   return (
     <div
@@ -87,10 +81,10 @@ export const ResultCard = ({
             {t("status")}: {t(status)}
           </p>
           <p>
-            {t("date")}: {formatDateStringForEvent(startDate, false)}
+            {t("date")}: {formatDateStringForEvent(startDate)}
           </p>
           <p>
-            {t("time")}: {DateTime.fromISO(startDate).toFormat(TIME_FORMAT)}
+            {t("time")}: {fromIso(startDate).toFormat(TIME_FORMAT)}
           </p>
           <p className="products" title={productList}>
             {t("products")}: {productList}

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

@@ -19,7 +19,7 @@ export const PreviousBookings = ({
   const [showOlderBookings, setShowOlderBookings] = useState(false);
 
   const formatDate = (date: string) => {
-    return DateTime.fromJSDate(new Date(date)).toFormat("dd LLL yyyy hh:mm");
+    return DateTime.fromJSDate(new Date(date)).toFormat("dd LLL yyyy HH:mm");
   };
 
   const capitalizeFirstLetter = (string: string) => {

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

@@ -1,5 +1,5 @@
 import { TIME_FORMAT } from "@licklist/core/dist/Config";
-import { DateTime } from "luxon";
+import { fromIso } from "@licklist/core/dist/Services";
 
 export const formatToDays = (daysInWeek?: number[]): string | null => {
   if (!daysInWeek) {
@@ -40,7 +40,7 @@ export const formatToDays = (daysInWeek?: number[]): string | null => {
 };
 
 export const formatToHours = (startAt: string, endAt: string) => {
-  const firstTime = DateTime.fromISO(startAt).toFormat(TIME_FORMAT);
-  const lastTime = DateTime.fromISO(endAt).toFormat(TIME_FORMAT);
+  const firstTime = fromIso(startAt).toFormat(TIME_FORMAT);
+  const lastTime = fromIso(endAt).toFormat(TIME_FORMAT);
   return `${firstTime} - ${lastTime}`;
 };

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

@@ -2,8 +2,8 @@ import { useTranslation } from "react-i18next";
 import { Card, Form } from "react-bootstrap";
 import MediaService from "@licklist/plugins/dist/services/Media/MediaService";
 import { rrulestr } from "rrule";
-import { DateTime } from "luxon";
 import { ManualBookingEvent } from "@licklist/plugins/dist/types/context/sale/menuSteps";
+import { fromIso } from "@licklist/core/dist/Services";
 import { formatToDays, formatToHours } from "../formatDays";
 import { BlockLoader } from "../../../static/loader";
 
@@ -106,7 +106,7 @@ export const EventCardManualBooking = ({
                 rrule.includes("EXDATE") ? rrule.split(";EXDATE=")[0] : rrule,
               )?.options?.byweekday,
             )
-          : formatToDays([DateTime.fromISO(startAt)?.day])}
+          : formatToDays([fromIso(startAt)?.day])}
       </div>
       <div className="event-card-hours">{formatToHours(startAt, endAt)}</div>
     </div>

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

@@ -1,6 +1,5 @@
 import { useTranslation } from "react-i18next";
 import { ManualBookingOrder } from "@licklist/plugins/dist/context/sale/ManualBookingStepsContext";
-import { DateTime } from "luxon";
 import {
   DATE_TIME_MANUAL_BOOKING_FORMAT,
   TIME_FORMAT,
@@ -12,6 +11,7 @@ import {
   RelyOnPeopleType,
 } from "@licklist/core/dist/DataMapper/Product/ProductSetDataMapper";
 import { getRelyOnPeopleMultiplier } from "@licklist/plugins/dist/utils/relyOnPeople";
+import { fromIso } from "@licklist/core/dist/Services";
 import { BlockLoader } from "../../../static/loader";
 
 export interface ManualBookingSummaryProps {
@@ -41,7 +41,7 @@ export const ManualBookingSummary = ({
   const { formatNumber } = useIntl();
   const showRelyOnPeople =
     relyOnPeopleType && relyOnPeopleType !== RELY_ON_PEOPLE_QUANTITY;
-  const currentDate = DateTime.fromISO(orderDate);
+  const currentDate = fromIso(orderDate);
   const date = currentDate.toFormat(DATE_TIME_MANUAL_BOOKING_FORMAT);
   const time = currentDate.toFormat(TIME_FORMAT);
   return (

package/src/sales/notes/NotesTableRow.tsx

@@ -9,8 +9,8 @@ import { DateTime } from "luxon";
 import {
   DATE_TIME_FORMAT,
   DATE_TIME_FULL_FORMAT,
+  UTC_TIMEZONE,
 } from "@licklist/core/dist/Config";
-import { getClientTimeZone } from "@licklist/core/dist/Services";
 import { FaEllipsisH, FaEye, FaTrashAlt } from "react-icons/fa";
 import { ConfirmModal } from "../../modals";
 import { MenuButton } from "../../table";
@@ -27,9 +27,9 @@ export const TableRow = ({ note, onClick, onDeleteNote }: TableRowProps) => {
   const [isOverlayVisibile, setIsOverlayVisible] = useState(false);
 
   const date = DateTime.fromFormat(note.updatedAt, DATE_TIME_FULL_FORMAT, {
-    zone: "utc",
+    zone: UTC_TIMEZONE,
   })
-    .setZone(getClientTimeZone())
+    .toLocal()
     .toFormat(DATE_TIME_FORMAT);
 
   return (

package/src/setting/admin/AdminSetting.stories.tsx

@@ -19,6 +19,7 @@ export const SettingFormComponent: Story<AdminSettingFormProps> = (args) => (
   </Container>
 );
 
+
 export const PaymentFeeFormComponent: Story<PaymentFeeFormProps> = (args) => {
   const form = useForm<PaymentFeeFormFieldValues>({
     defaultValues: args.defaultValues,

package/src/setting/admin/AdminSettingForm.tsx

@@ -10,7 +10,7 @@ import Row from "react-bootstrap/Row";
 import Col from "react-bootstrap/Col";
 import { Link } from "react-router-dom";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
-import { ProviderType } from "@licklist/core/dist/DataMapper/Provider/ProvidableDataMapper";
+import { ProvidableType } from "@licklist/core/dist/DataMapper/Provider/ProvidableDataMapper";
 import { FaCommentAlt } from "react-icons/fa";
 import { PaymentFeeForm, PaymentFeeFormFieldValues } from "./PaymentFeeForm";
 import { Currency } from "../../types/currency";
@@ -32,7 +32,7 @@ export interface AdminSettingFormProps extends HasPermissionProp {
   providerMetadata: {
     country?: string;
     providableId?: number;
-    providerType?: ProviderType;
+    providerType?: ProvidableType;
   };
 }
 

package/src/setting/system/SystemSetting.stories.tsx

@@ -23,4 +23,4 @@ export function Default() {
       />
     </Container>
   );
-}
+}

package/src/snippet/snippet-template/preview/Preview.tsx

@@ -307,6 +307,7 @@ export function Preview({
                                   productCategoryId: 57,
                                   productGroupId: null,
                                   availableQuantity: 980,
+                                  zoneId: null,
                                   name: "Cofee",
                                   description: "",
                                   price: 15,
@@ -315,6 +316,8 @@ export function Preview({
                                   maxQuantity: 15,
                                   totalQuantity: 980,
                                   type: "sale" as const,
+                                  capacity: 0,
+                                  duration: 0,
                                   weight: 0,
                                   isAvailable: true,
                                   isSoldOut: false,
@@ -333,6 +336,7 @@ export function Preview({
                                   productCategoryId: 57,
                                   productGroupId: null,
                                   availableQuantity: 980,
+                                  zoneId: null,
                                   name: "Cofee 2",
                                   description: "",
                                   price: 15,
@@ -341,6 +345,8 @@ export function Preview({
                                   maxQuantity: 15,
                                   totalQuantity: 980,
                                   type: "sale" as const,
+                                  capacity: 0,
+                                  duration: 0,
                                   weight: 0,
                                   isAvailable: true,
                                   isSoldOut: false,

package/src/sortable-tree/SortableTreeItem.tsx

@@ -33,6 +33,7 @@ export interface SortableTreeItemProps {
   body: ReactNode;
   children?: ReactNode;
   preItem?: ReactNode;
+  itemButton?: ReactNode;
   postItem?: ReactNode;
   sortableItems?: string[];
   isExpanded?: boolean;
@@ -82,6 +83,7 @@ export function SortableTreeItem({
   secondaryBadge,
   setIsExpanded,
   isOverride,
+  itemButton,
 }: SortableTreeItemProps) {
   const [expanded, setExpanded] = useState(isExpanded);
   const [isModalVisible, setIsModalVisible] = useState(isNewAdded);
@@ -287,9 +289,13 @@ export function SortableTreeItem({
                     className={clsx(
                       "sortable-tree-item-title",
                       modalLabel && "sortable-tree-product-set-element-title",
+                      "d-flex justify-content-between",
                     )}
                   >
                     {title}
+                    <div className="sortable-tree-item-subtitle">
+                      {itemButton}
+                    </div>
                   </span>
                   {!expanded && (
                     <span className="sortable-tree-item-subtitle">

package/src/styles/auth/AccessDenied.scss

@@ -8,4 +8,4 @@
   h6 {
     color: $gray-600;
   }
-}
+}

package/src/styles/back-button/BackButton.scss

@@ -1,32 +1,33 @@
 $base-height: 2.5rem;
 
 .button-wrapper {
-  background-color: $snippet-page-header-steps-close-button-background-color;
-  height: $base-height;
-  width: $base-height;
-  border-radius: $base-height;
-  transition: $color-transition;
-
-  .back-button {
-    font-size: 2rem;
-    width: $base-height;
+    background-color: $snippet-page-header-steps-close-button-background-color;
     height: $base-height;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: lighter;
-    color: $snippet-page-header-steps-close-button-border-color;
+    width: $base-height;
+    border-radius: $base-height;
     transition: $color-transition;
 
-    &:hover {
-      cursor: pointer;
+
+    .back-button {
+      font-size: 2rem;
+      width: $base-height;
+      height: $base-height;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: lighter;
+      color: $snippet-page-header-steps-close-button-border-color;
+      transition: $color-transition;
+
+      &:hover {
+        cursor: pointer;
+      }
     }
-  }
 
-  &.back-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-right: 1rem;
-  }
-}
+    &.back-button {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-right: 1rem;
+    }
+  }

package/src/styles/back-button/_index.scss

@@ -1 +1 @@
-@import "./BackButton.scss";
+@import "./BackButton.scss";

package/src/styles/company-user-form/UserForm.scss

@@ -33,15 +33,11 @@
         }
 
         &.active {
-          color: #0e8ce2;
-          background: linear-gradient(
-            149.72deg,
-            #d9efff 50.04%,
-            #e9f4fe 107.75%
-          );
+          color: #0E8CE2;
+          background: linear-gradient(149.72deg, #D9EFFF 50.04%, #E9F4FE 107.75%);
 
           svg path {
-            stroke: #0e8ce2;
+            stroke: #0E8CE2;
           }
         }
       }
@@ -66,3 +62,4 @@
     }
   }
 }
+

package/src/styles/company-user-form/_index.scss

@@ -1 +1 @@
-@import "./UserForm.scss";
+@import "./UserForm.scss";

package/src/styles/custom-fields/CreateSortableListItem.scss

@@ -1,3 +1,4 @@
+ 
 $sortable-list-item-hover-bg-color: #d9efff !default;
 
 .sortable-list-item-wrapper {
@@ -25,4 +26,4 @@ $sortable-list-item-hover-bg-color: #d9efff !default;
   &:hover {
     background-color: $sortable-list-item-hover-bg-color;
   }
-}
+}

package/src/styles/custom-fields/_index.scss

@@ -1,3 +1,3 @@
 @import "./FieldItem.scss";
 @import "./SelectFieldModal.scss";
-@import "./CreateSortableListItem.scss";
+@import "./CreateSortableListItem.scss";

package/src/styles/customers/Filter.scss

@@ -4,13 +4,13 @@
       font-size: 0.8rem;
     }
   }
-
+  
   @include media-breakpoint-up(md) {
     label {
       font-size: 0.9rem;
     }
   }
-
+  
   @include media-breakpoint-up(lg) {
     label {
       font-size: 1rem;
@@ -28,7 +28,7 @@
       flex: 0 0 33.33%;
       max-width: 33.33%;
     }
-
+  
     @include media-breakpoint-down(xs) {
       flex-direction: column;
 
@@ -43,11 +43,11 @@
         &:first-child {
           padding-left: 0;
         }
-
+  
         &:last-child {
           padding-right: 0;
         }
       }
     }
-  }
+  } 
 }

package/src/styles/events/EditEventModal.scss

@@ -5,9 +5,7 @@
   padding: 1rem 2rem;
   border-radius: 1rem;
   margin-bottom: 1.5rem;
-  transition:
-    color 0.2s ease-out,
-    background-color 0.2s ease-out;
+  transition: color 0.2s ease-out, background-color 0.2s ease-out;
   margin-left: 1rem;
 
   &:hover {