@licklist/design 0.50.0-dev.1 → 0.50.0

package/dist/styles/sales/BookingTabs.scss

@@ -1,49 +1,24 @@
 .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 {
@@ -54,12 +29,6 @@
   .children {
     flex: 1;
     margin-left: 1rem;
-
-    @include media-breakpoint-down(sm) {
-      display: flex;
-      flex-direction: column;
-      align-items: start;
-    }
   }
 
   .buttons {
@@ -92,33 +61,6 @@
         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,7 +33,6 @@
   }
 
   @include media-breakpoint-down(sm) {
-    height: 12rem;
     &__value {
       line-height: 1rem;
       font-size: 2rem;

package/dist/styles/sales/ManualBooking.scss

@@ -361,11 +361,10 @@
   width: inherit;
 
   @include media-breakpoint-down(sm) {
-    display: none;
+    padding: 0 0.5rem;
+    padding-top: 2rem;
   }
 
-
-
   .form-control {
     margin-bottom: 1.5rem;
   }
@@ -412,64 +411,6 @@
   }
 }
 
-.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;
@@ -496,4 +437,4 @@
       color: $blue;
     }
   }
-}
+}

package/dist/styles/sales/SourceOfSales.scss

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

package/dist/styles/static/Switch.scss

@@ -27,7 +27,6 @@ $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/dist/styles/static/Tabs.scss

@@ -11,12 +11,6 @@ $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/table/TableHelperComponent.d.ts

@@ -1,4 +1,4 @@
-import { SetStateAction } from "react";
+/// <reference types="react" />
 import ILengthAwarePaginator from "@licklist/plugins/dist/types/services/Table/ILengthAwarePaginator";
 import ITableHeader from "@licklist/plugins/dist/types/services/Table/ITableHeader";
 import ITableProps from "@licklist/plugins/dist/types/services/Table/ITableProps";
@@ -18,7 +18,6 @@ export interface TableHelperComponentProps {
         [key: string]: any;
     };
     initialOptions?: Partial<ITableProps>;
-    filteredOrdersOptions?: (value: SetStateAction<ITableProps>) => void;
 }
 /**
  * TableHelperComponent

package/dist/table/TableHelperComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableHelperComponent.d.ts","sourceRoot":"","sources":["../../src/table/TableHelperComponent.tsx"],"names":[],"mappings":"AACA,OAAc,EAAE,cAAc,EAAuB,MAAM,OAAO,CAAC;AAOnE,OAAO,qBAAqB,MAAM,mEAAmE,CAAC;AACtG,OAAO,YAAY,MAAM,0DAA0D,CAAC;AACpF,OAAO,WAAW,MAAM,yDAAyD,CAAC;AAQlF,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,QAAQ,CAAC;IACvB,SAAS,CAAC,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACtC,qBAAqB,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;CACtE;AAUD;;;;;;GAMG;AACH,iBAAS,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,eA4S7D;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"TableHelperComponent.d.ts","sourceRoot":"","sources":["../../src/table/TableHelperComponent.tsx"],"names":[],"mappings":";AAQA,OAAO,qBAAqB,MAAM,mEAAmE,CAAC;AACtG,OAAO,YAAY,MAAM,0DAA0D,CAAC;AACpF,OAAO,WAAW,MAAM,yDAAyD,CAAC;AAQlF,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,QAAQ,CAAC;IACvB,SAAS,CAAC,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CACvC;AAUD;;;;;;GAMG;AACH,iBAAS,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,eAsP7D;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/table/TableHelperComponent.js

@@ -1 +1 @@
-"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),r=require("react"),n=e(r),i=require("react-router-dom"),a=e(require("@licklist/plugins/dist/services/Route/RouteService")),o=require("../static/loader/LoaderIndicator.js"),s=require("react-bootstrap"),l=e(require("@licklist/plugins/dist/hooks/Query/useQuery")),u=require("lodash"),c=require("./FilterHelperComponent.js"),g=require("./PaginationHelperComponent.js"),p=e(require("@licklist/plugins/dist/services/Table/TableService")),d=require("./PerPageHelperComponent.js"),_=require("./utils/index.js");exports.TableHelperComponent=function(e){var f,m,v=e.paginator,y=e.headers,E=e.renderItemFn,S=e.isLoading,h=e.onRefreshFn,C=e.refreshAt,P=e.striped,b=void 0===P||P,q=e.bordered,D=void 0===q||q,F=e.displaySearchBar,j=void 0===F||F,O=e.displayPerPageSelect,k=void 0===O||O,L=e.displayShowingSection,w=void 0===L||L,H=e.externalFilters,R=void 0===H?{}:H,T=e.initialOptions,K=void 0===T?{}:T,N=e.filteredOrdersOptions,V=l(),I=i.useLocation().pathname,x=Number(_.getFilterOptionsValue(V,K,"page")),A=Number(_.getFilterOptionsValue(V,K,"perPage")),U=String(_.getFilterOptionsValue(V,K,"sortKey")),Q=String(_.getFilterOptionsValue(V,K,"sortDirection")),B=String(_.getFilterOptionsValue(V,K,"filter")),G=t.__read(r.useState(),2),M=G[0],z=G[1],J=t.__read(r.useState({page:x,perPage:A,sortKey:U,sortDirection:Q,filter:B}),2),W=J[0],X=J[1],Y=t.__read(r.useState(0),2),Z=Y[0],$=Y[1],ee=t.__read(r.useState(R),2),te=ee[0],re=ee[1];r.useEffect((function(){u.isEqual(M,W)&&u.isEqual(te,R)||N||(z(W),re(R),h&&h(W),a.redirectTo([I,["page=".concat(W.page),"perPage=".concat(W.perPage),"sortKey=".concat(escape(W.sortKey)),"sortDirection=".concat(escape(W.sortDirection)),"filter=".concat(escape(W.filter)),new URLSearchParams(R).toString()].join("&")].join("?")))}),[I,W,h,N,R]),r.useEffect((function(){Z===C||N||($((function(e){return null!=C?C:e})),h&&h(W))}),[h,W,C,N,Z]);var ne=function(e){var r,i;if("string"==typeof e)return n.createElement("th",{key:e.toLowerCase(),className:p.getHeaderClasses(e,U,Q)},e);if("object"==typeof e){var a={width:null!==(r=e.width)&&void 0!==r?r:"auto"};return n.createElement("th",{key:null!==(i=e.key)&&void 0!==i?i:e.title.toLowerCase(),className:p.getHeaderClasses(e,U,Q),style:a,onClick:function(){return e.isSortable&&(r=e.key,n=p.DEFAULT_SORT_DIRECTION,void(U===r?N?N((function(e){return n=p.getSortDirection(e.sortDirection,n),t.__assign(t.__assign({},e),{sortKey:r,sortDirection:n})})):X((function(e){return n=p.getSortDirection(e.sortDirection,n),t.__assign(t.__assign({},e),{sortKey:r,sortDirection:n})})):N?N((function(e){return t.__assign(t.__assign({},e),{sortKey:r,sortDirection:n})})):X((function(e){return t.__assign(t.__assign({},e),{sortKey:r,sortDirection:n})}))));var r,n}},e.title)}return null};return n.createElement("div",{className:["table-helper",S?"py-5":"py-1"].join(" ")},n.createElement(o.LoaderIndicator,{isLoaded:!S},n.createElement(s.Row,null,n.createElement(s.Col,null,k&&n.createElement(d.PerPageHelperComponent,{onChangeFn:function(e){N?N((function(r){return t.__assign(t.__assign({},r),{page:e})})):X((function(r){return t.__assign(t.__assign({},r),{perPage:e})}))},defaultValue:null!==(f=null==v?void 0:v.per_page)&&void 0!==f?f:p.DEFAULT_PER_PAGE})),n.createElement(s.Col,null,j&&n.createElement(c.FilterHelperComponent,{onClickFn:function(e){N&&N((function(r){var n=r.page,i=t.__rest(r,["page"]),a=n;return(!e&&i.filter||e&&!i.filter)&&(a=1),t.__assign(t.__assign({},i),{page:a,filter:e})})),X((function(r){var n=r.page,i=t.__rest(r,["page"]),a=n;return(!e&&i.filter||e&&!i.filter)&&(a=1),t.__assign(t.__assign({},i),{page:a,filter:e})}))},defaultValue:null!==(m=W.filter)&&void 0!==m?m:""}))),n.createElement(s.Row,null,n.createElement(s.Col,null,n.createElement("div",{className:"table-responsive"},n.createElement(s.Table,{striped:b,bordered:D,hover:!0},n.createElement("thead",null,n.createElement("tr",null,y.map((function(e){return ne(e)})))),n.createElement("tbody",null,v?v.data.map((function(e,t){return E(e,t)})):null))))),n.createElement(g.PaginationHelperComponent,{displayShowingSection:w,paginator:v,onPageChangeFn:function(e){N?N((function(r){return t.__assign(t.__assign({},r),{page:e})})):X((function(r){return t.__assign(t.__assign({},r),{page:e})}))}})))};
+"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),r=require("react"),n=e(r),i=require("react-router-dom"),a=e(require("@licklist/plugins/dist/services/Route/RouteService")),o=require("../static/loader/LoaderIndicator.js"),l=require("react-bootstrap"),s=e(require("@licklist/plugins/dist/hooks/Query/useQuery")),u=require("lodash"),c=require("./FilterHelperComponent.js"),p=require("./PaginationHelperComponent.js"),d=e(require("@licklist/plugins/dist/services/Table/TableService")),g=require("./PerPageHelperComponent.js"),f=require("./utils/index.js");exports.TableHelperComponent=function(e){var _,m,v=e.paginator,E=e.headers,y=e.renderItemFn,S=e.isLoading,h=e.onRefreshFn,C=e.refreshAt,P=e.striped,b=void 0===P||P,q=e.bordered,F=void 0===q||q,j=e.displaySearchBar,D=void 0===j||j,k=e.displayPerPageSelect,L=void 0===k||k,w=e.displayShowingSection,H=void 0===w||w,O=e.externalFilters,R=void 0===O?{}:O,T=e.initialOptions,N=void 0===T?{}:T,V=s(),K=i.useLocation().pathname,I=Number(f.getFilterOptionsValue(V,N,"page")),x=Number(f.getFilterOptionsValue(V,N,"perPage")),A=String(f.getFilterOptionsValue(V,N,"sortKey")),U=String(f.getFilterOptionsValue(V,N,"sortDirection")),Q=String(f.getFilterOptionsValue(V,N,"filter")),B=t.__read(r.useState(),2),G=B[0],M=B[1],z=t.__read(r.useState({page:I,perPage:x,sortKey:A,sortDirection:U,filter:Q}),2),J=z[0],W=z[1],X=t.__read(r.useState(0),2),Y=X[0],Z=X[1],$=t.__read(r.useState(R),2),ee=$[0],te=$[1];r.useEffect((function(){u.isEqual(G,J)&&u.isEqual(ee,R)||(M(J),te(R),h&&h(J),a.redirectTo([K,["page=".concat(J.page),"perPage=".concat(J.perPage),"sortKey=".concat(escape(J.sortKey)),"sortDirection=".concat(escape(J.sortDirection)),"filter=".concat(escape(J.filter)),new URLSearchParams(R).toString()].join("&")].join("?")))}),[K,J,h,R]),r.useEffect((function(){Y!==C&&(Z((function(e){return null!=C?C:e})),h&&h(J))}),[h,J,C,Y]);var re=function(e){var r,i;if("string"==typeof e)return n.createElement("th",{key:e.toLowerCase(),className:d.getHeaderClasses(e,A,U)},e);if("object"==typeof e){var a={width:null!==(r=e.width)&&void 0!==r?r:"auto"};return n.createElement("th",{key:null!==(i=e.key)&&void 0!==i?i:e.title.toLowerCase(),className:d.getHeaderClasses(e,A,U),style:a,onClick:function(){return e.isSortable&&(r=e.key,n=d.DEFAULT_SORT_DIRECTION,void W(A===r?function(e){return n=d.getSortDirection(e.sortDirection,n),t.__assign(t.__assign({},e),{sortKey:r,sortDirection:n})}:function(e){return t.__assign(t.__assign({},e),{sortKey:r,sortDirection:n})}));var r,n}},e.title)}return null};return n.createElement("div",{className:["table-helper",S?"py-5":"py-1"].join(" ")},n.createElement(o.LoaderIndicator,{isLoaded:!S},n.createElement(l.Row,null,n.createElement(l.Col,null,L&&n.createElement(g.PerPageHelperComponent,{onChangeFn:function(e){W((function(r){return t.__assign(t.__assign({},r),{perPage:e})}))},defaultValue:null!==(_=null==v?void 0:v.per_page)&&void 0!==_?_:d.DEFAULT_PER_PAGE})),n.createElement(l.Col,null,D&&n.createElement(c.FilterHelperComponent,{onClickFn:function(e){W((function(r){var n=r.page,i=t.__rest(r,["page"]),a=n;return(!e&&i.filter||e&&!i.filter)&&(a=1),t.__assign(t.__assign({},i),{page:a,filter:e})}))},defaultValue:null!==(m=J.filter)&&void 0!==m?m:""}))),n.createElement(l.Row,null,n.createElement(l.Col,null,n.createElement("div",{className:"table-responsive"},n.createElement(l.Table,{striped:b,bordered:F,hover:!0},n.createElement("thead",null,n.createElement("tr",null,E.map((function(e){return re(e)})))),n.createElement("tbody",null,v?v.data.map((function(e,t){return y(e,t)})):null))))),n.createElement(p.PaginationHelperComponent,{displayShowingSection:H,paginator:v,onPageChangeFn:function(e){W((function(r){return t.__assign(t.__assign({},r),{page:e})}))}})))};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.50.0-dev.1",
+  "version": "0.50.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.15.41-dev.0 < 0.15.41",
+    "@licklist/core": "^0.17.0",
     "@licklist/eslint-config": "0.3.4",
-    "@licklist/plugins": ">=0.24.0-dev.0 < 0.24.0",
+    "@licklist/plugins": "^0.23.0",
     "@mdx-js/react": "1.6.22",
     "@popperjs/core": "2.11.8",
     "@react-aria/utils": "3.9.0",

package/src/calendar/Calendar.tsx

@@ -4,9 +4,6 @@ import { ZoneResourcesAvailability } from "@licklist/core/dist/DataMapper/Order/
 import { CalendarButtons } from "./components/CalendarButtons";
 import { CalendarDates } from "./components/CalendarDates";
 
-// same as apps/iframe/src/types/availability.ts
-export type AvailableTimes = Record<string, string[]>;
-
 export const defaultStartDay = DateTime.now().set({
   millisecond: 0,
   second: 0,
@@ -26,8 +23,6 @@ export type CalendarProps = {
   initialDate?: DateTime;
   getAvailability?: (date: DateTime) => ZoneResourcesAvailability | null;
   includeAvailability?: boolean;
-  availableTimes?: AvailableTimes;
-  shouldCalculateResources?: boolean;
 };
 
 export const Calendar = ({

package/src/calendar/components/CalendarButtons/CalendarButtons.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { range } from "lodash";
 import { ReactComponent as SelectArrow } from "../../../assets/iframe/selectArrow.svg";
 import { CalendarSelect } from "../CalendarSelect";
-import { isDateDisabled } from "../../utils";
+import { isSelectedDateDisabled } from "../../utils";
 import { CalendarProps } from "../../Calendar";
 
 type CalendarButtonsProps = Pick<
@@ -66,7 +66,7 @@ export const CalendarButtons = ({
   const onTodayClick = () => {
     setCurrentDate(initialDate);
 
-    if (isDateDisabled(initialDate, disabledDates)) return;
+    if (isSelectedDateDisabled(initialDate, disabledDates)) return;
 
     setSelectedDate(initialDate);
   };
@@ -75,7 +75,7 @@ export const CalendarButtons = ({
     const nextDate = initialDate.set({ day: initialDate.day + 1 });
     setCurrentDate(nextDate);
 
-    if (isDateDisabled(nextDate, disabledDates)) return;
+    if (isSelectedDateDisabled(nextDate, disabledDates)) return;
 
     setSelectedDate(nextDate);
   };

package/src/calendar/components/CalendarDates/CalendarDates.tsx

@@ -2,7 +2,7 @@ import React, { useMemo } from "react";
 import { DateTime } from "luxon";
 import { DateTimeButton, Variant } from "../../../date-time-button";
 import { CalendarWeekdays } from "../CalendarWeekdays";
-import { isDateDisabled } from "../../utils";
+import { isSelectedDateDisabled } from "../../utils";
 import { CalendarProps } from "../../Calendar";
 
 export type CalendarDatesProps = Omit<
@@ -19,8 +19,6 @@ export const CalendarDates = ({
   fromPrice,
   getAvailability,
   includeAvailability,
-  shouldCalculateResources,
-  availableTimes,
 }: CalendarDatesProps) => {
   const fillCalendarDates = useMemo(() => {
     let firstDayOfWeek = calendarDates[0]?.weekday ?? 0;
@@ -47,7 +45,7 @@ export const CalendarDates = ({
           if (date === null) return <div />;
 
           const isDisabled =
-            isLoading || isDateDisabled(date, disabledDates, availableTimes);
+            isLoading || isSelectedDateDisabled(date, disabledDates);
 
           return (
             <DateTimeButton
@@ -62,7 +60,6 @@ export const CalendarDates = ({
               resources={getAvailability?.(date)}
               showResources={includeAvailability}
               variant={Variant.month}
-              shouldCalculateResources={shouldCalculateResources}
             />
           );
         })}

package/src/calendar/utils/index.ts

@@ -1,22 +1,13 @@
 import { DateTime, Interval } from "luxon";
 import isEqual from "lodash/isEqual";
-import { DATE_FORMAT } from "@licklist/core/dist/Config";
-import { AvailableTimes } from "../Calendar";
 
-export const isDateDisabled = (
-  date: DateTime,
-  disabledDates: DateTime[] = [],
-  availableTimes?: AvailableTimes
-): boolean => {
-  const disabledByDates = !!disabledDates.find((disabledDate) =>
-    isEqual(disabledDate.toObject(), date.toObject())
+export const isSelectedDateDisabled = (
+  selectedDate: DateTime,
+  disabledDates: DateTime[] = []
+) => {
+  return !!disabledDates.find((disabledDate) =>
+    isEqual(disabledDate.toObject(), selectedDate.toObject())
   );
-
-  const noAvailableTimes = availableTimes
-    ? !availableTimes?.[date.toFormat(DATE_FORMAT)]
-    : false;
-
-  return disabledByDates || noAvailableTimes;
 };
 
 export const getMonthCalendarDates = (initialDate: DateTime): DateTime[] => {

package/src/date-time-button/DateTimeButton.tsx

@@ -2,7 +2,6 @@ import React, { ReactElement } from "react";
 import clsx from "clsx";
 import { DateTime } from "luxon";
 import { ZoneResourcesAvailability } from "@licklist/core/dist/DataMapper/Order/ZoneResourcesAvailabilityDataMapper";
-import { has } from "lodash";
 import { AvailabilityIndicator } from "../availability-indicator";
 import { DateContent } from "./DateContent";
 
@@ -19,9 +18,8 @@ export type DateTimeButtonProps = {
   isSoldOut?: boolean;
   onSelect: (date: DateTime) => void;
   price?: string | number | ReactElement | null;
-  resources: ZoneResourcesAvailability | null | undefined;
+  resources?: ZoneResourcesAvailability | null;
   showResources?: boolean;
-  shouldCalculateResources?: boolean;
   variant: Variant;
 };
 
@@ -34,28 +32,17 @@ export const DateTimeButton = ({
   price,
   resources,
   showResources,
-  shouldCalculateResources = true,
   variant = Variant.week,
 }: DateTimeButtonProps) => {
   const isSoldOut =
     _isSoldOut ||
-    // only consider resources if shouldCalculateResources is true
-    (shouldCalculateResources &&
-      resources &&
-      resources.bookedResources >= resources.totalResources);
+    (resources && resources.bookedResources >= resources.totalResources);
 
   const isTimeVariant = variant === Variant.time;
 
   const isTimeInPast = isTimeVariant && isDateInPast(date);
 
-  const noResources =
-    shouldCalculateResources &&
-    // only consider resources if shouldCalculateResources is true
-    (!resources ||
-      !has(resources, "bookedResources") ||
-      !has(resources, "totalResources"));
-
-  const isDisabled = _isDisabled || isSoldOut || isTimeInPast || noResources;
+  const isDisabled = _isDisabled || isSoldOut || isTimeInPast;
 
   return (
     <button

package/src/iframe/event/event-booking-products/EventBookingProducts.tsx

@@ -27,7 +27,7 @@ export function EventBookingProducts({
             <AccordionItem
               key={productsCategory.id}
               eventKey={`${productsCategory.id}`}
-              productCategoryId={productsCategory.id}
+              productsCategoryId={productsCategory.id}
               name={productsCategory.name}
               products={productsCategory.products}
               order={order}

package/src/iframe/event/event-booking-products/components/AccordionItem/AccordionItem.tsx

@@ -24,7 +24,7 @@ interface AccordionItemProps {
   products: Product[];
   setOrder: SetOrderFn;
   order: Record<number, OrderItem>;
-  productCategoryId: number;
+  productsCategoryId: number;
 }
 
 function CustomToggle({
@@ -60,7 +60,7 @@ export function AccordionItem({
   order,
   setOrder,
   products,
-  productCategoryId,
+  productsCategoryId,
 }: AccordionItemProps) {
   return (
     <Card className="event-booking-products__card">
@@ -71,7 +71,7 @@ export function AccordionItem({
             <ProductItem
               key={product.id}
               id={product.id}
-              productCategoryId={productCategoryId}
+              productsCategoryId={productsCategoryId}
               price={product.price}
               name={product.name}
               description={product.description}
@@ -92,7 +92,7 @@ interface ProductItemProps {
   description: string;
   order: OrderItems;
   setOrder: SetOrderFn;
-  productCategoryId: OrderItem["productCategoryId"];
+  productsCategoryId: number;
 }
 
 function ProductItem({
@@ -102,7 +102,7 @@ function ProductItem({
   description,
   order,
   setOrder,
-  productCategoryId,
+  productsCategoryId,
 }: ProductItemProps) {
   const { formatNumber } = useIntl();
 
@@ -120,7 +120,7 @@ function ProductItem({
                 quantity: val,
                 name,
                 price,
-                productCategoryId,
+                productsCategoryId,
               },
             }));
           }}
@@ -132,7 +132,7 @@ function ProductItem({
                 quantity: prev[id]?.quantity - 1 || 0,
                 name,
                 price,
-                productCategoryId,
+                productsCategoryId,
               },
             }))
           }
@@ -144,7 +144,7 @@ function ProductItem({
                 quantity: prev[id]?.quantity + 1 || 1,
                 name,
                 price,
-                productCategoryId,
+                productsCategoryId,
               },
             }))
           }

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,
-              productCategoryId: 1,
+              productsCategoryId: 1,
             },
             "21": {
               id: 21,
               quantity: 2,
               name: "cat 2 prod 1",
               price: 1,
-              productCategoryId: 2,
+              productsCategoryId: 2,
             },
             "31": {
               id: 31,
               quantity: 4,
               name: "cat 3 prod 1",
               price: 1,
-              productCategoryId: 3,
+              productsCategoryId: 3,
             },
             "32": {
               id: 32,
               quantity: 4,
               name: "cat 3 prod 2",
               price: 1,
-              productCategoryId: 3,
+              productsCategoryId: 3,
             },
             "41": {
               id: 41,
               quantity: 4,
               name: "cat 4 prod 1",
               price: 1,
-              productCategoryId: 4,
+              productsCategoryId: 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.productCategoryId)
+    categoriesIds.includes(item.productsCategoryId)
   );
 
   return stepItems.length > 0;
@@ -23,7 +23,7 @@ const getOrderItemsForCategory = (
   orderItems: OrderItems,
   categoryId: number
 ): OrderItem[] =>
-  values(orderItems).filter((item) => item.productCategoryId === categoryId);
+  values(orderItems).filter((item) => item.productsCategoryId === categoryId);
 
 export type ProductsByMenuStepsProps = {
   orderItems: OrderItems;

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

@@ -1,7 +1,6 @@
 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 = {
@@ -19,41 +18,29 @@ type FooterProps = Partial<
     disabled?: boolean;
     buttonLabel?: ReactNode;
     showButton?: boolean;
-    isLoading: boolean;
   } & (ButtonPropsWithoutOnClick | ButtonPropsWithOnClick)
 >;
 
 export type BookingSummaryFooterProps = PropsWithChildren<FooterProps>;
 
 export const BookingSummaryFooter = ({
-  disabled: _disabled = false,
+  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 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 className="m-0 mt-3" disabled={disabled} {...buttonProps}>
+          {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;
-  productCategoryId: number;
+  productsCategoryId: number;
   zoneId?: Zone["id"];
   deposit?: number | null;
   quantity: number;
@@ -50,7 +50,7 @@ export const ProductQuantityInput = ({
       name: product.name,
       deposit,
       price: product.price,
-      productCategoryId: category.id,
+      productsCategoryId: category.id,
       zoneId: category.zone?.id,
       quantity,
       capacity: product?.capacity,