@licklist/design 0.44.539 → 0.44.541

package/dist/events/event-card/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAGlG,wBAAgB,aAAa,CAAC,OAAO,KAAA,EAAE,UAAU,KAAA,OAIhD;AAED,eAAO,MAAM,wBAAwB,2CAYpC,CAAC;AAEF,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAE1C,eAAO,MAAM,gBAAgB,mBACX,cAAc,GAAG,IAAI,QAC/B,MAAM;;;;CA6Bb,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAGlG,wBAAgB,aAAa,CAAC,OAAO,KAAA,EAAE,UAAU,KAAA,OAIhD;AAED,eAAO,MAAM,wBAAwB,2CAepC,CAAC;AAEF,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAE1C,eAAO,MAAM,gBAAgB,mBACX,cAAc,GAAG,IAAI,QAC/B,MAAM;;;;CA6Bb,CAAC"}

package/dist/events/event-card/utils.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("@licklist/core/dist/Config"),o=require("luxon");exports.EVENT_DESCRIPTION_SIZE=300,exports.formatContent=function(t,o){return t?t.length>o?"".concat(t.slice(0,o),"..."):t:""},exports.formatContentWithoutTags=function(t,o){if(void 0===o&&(o=300),!t)return"";if(t<o)return t;var r=t.replace(/<[^>]*>/g,"").trim().replace(/&nbsp;|[^a-zA-Z0-9\s]/g,"").replace(/\s\s+/g," ").slice(0,o).split(" "),e=String(t).indexOf(r[r.length-2]);return t.slice(0,e).concat("...")},exports.getStatisticInfo=function(r,e){var i,n,a,l,u=0,s=0;if(!r)return{totalViews:0,totalSold:0,totalAmount:0};var c=o.DateTime.fromISO(e).toUTC().toFormat(t.DATE_FORMAT);l=(null===(i=r.views[c])||void 0===i?void 0:i.pageViews)||0;var d=o.DateTime.fromISO(e).toUTC().toFormat(t.DATE_TIME_FULL_FORMAT);return null===(a=null===(n=null==r?void 0:r.productCategorySummary)||void 0===n?void 0:n[d])||void 0===a||a.forEach((function(t){var o=t.totalPerCategory,r=t.productsSummary,e=void 0===r?[]:r;s+=o||0,null==e||e.forEach((function(t){var o=t.productsSold;u+=o}))})),{totalViews:l,totalSold:u,totalAmount:s}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("@licklist/core/dist/Config"),o=require("luxon");var r=300;exports.EVENT_DESCRIPTION_SIZE=r,exports.formatContent=function(t,o){return t?t.length>o?"".concat(t.slice(0,o),"..."):t:""},exports.formatContentWithoutTags=function(t,o){if(void 0===o&&(o=r),!t)return"";if(t<o)return t;var e=t.replace(/<[^>]*>/g,"").trim().replace(/&nbsp;|[^a-zA-Z0-9\s]/g,"").replace(/\s\s+/g," ").slice(0,o).split(" "),i=String(t).indexOf(e[e.length-2]);return t.slice(0,i).concat("...")},exports.getStatisticInfo=function(r,e){var i,n,a,l,u=0,s=0;if(!r)return{totalViews:0,totalSold:0,totalAmount:0};var c=o.DateTime.fromISO(e).toUTC().toFormat(t.DATE_FORMAT);l=(null===(i=r.views[c])||void 0===i?void 0:i.pageViews)||0;var d=o.DateTime.fromISO(e).toUTC().toFormat(t.DATE_TIME_FULL_FORMAT);return null===(a=null===(n=null==r?void 0:r.productCategorySummary)||void 0===n?void 0:n[d])||void 0===a||a.forEach((function(t){var o=t.totalPerCategory,r=t.productsSummary,e=void 0===r?[]:r;s+=o||0,null==e||e.forEach((function(t){var o=t.productsSold;u+=o}))})),{totalViews:l,totalSold:u,totalAmount:s}};

package/dist/sales/booking/results/components/ResultCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResultCard.d.ts","sourceRoot":"","sources":["../../../../../src/sales/booking/results/components/ResultCard.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,sDAAsD,CAAC;AAK7E,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,CAAC;AAIF,eAAO,MAAM,UAAU,uCAIpB,eAAe,gBAmDjB,CAAC"}
+{"version":3,"file":"ResultCard.d.ts","sourceRoot":"","sources":["../../../../../src/sales/booking/results/components/ResultCard.tsx"],"names":[],"mappings":";AAKA,OAAO,EAAE,KAAK,EAAE,MAAM,sDAAsD,CAAC;AAO7E,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,CAAC;AAIF,eAAO,MAAM,UAAU,uCAIpB,eAAe,gBA+DjB,CAAC"}

package/dist/sales/booking/results/components/ResultCard.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=e(require("react")),r=require("@licklist/core/dist/Config"),l=require("react-i18next"),a=require("../../../../static/Icon.js"),n=e(require("clsx")),i=require("luxon"),s=require("@licklist/plugins/dist/utils/formatDate");exports.ResultCard=function(e){var c,u,o,m=e.order,d=e.className,p=e.onCardClick,E=l.useTranslation("Design").t,f=m.id,v=m.people,N=m.user,q=m.status,D=m.startDate,x=(null===(c=m.products.map((function(e){return e.name})))||void 0===c?void 0:c.join(", "))||"",g=function(){p&&p(f)};return t.createElement("div",{className:n("result-card",d),onClick:g,onKeyUp:g,role:"button",tabIndex:0},t.createElement("div",{className:"card-content"},t.createElement("div",{className:"order-id"},f),t.createElement("div",{className:"order-people"},t.createElement(a.default,{type:"user",width:"10",height:"11"}),v),t.createElement("div",{className:"order-description"},t.createElement("p",{className:"name"},N.firstName," ",N.lastName),N.email&&t.createElement("p",null,N.email),(null===(u=N.userDetail)||void 0===u?void 0:u.phone)&&t.createElement("p",null,null===(o=N.userDetail)||void 0===o?void 0:o.phone),t.createElement("p",null,"------"),t.createElement("p",null,E("activity"),": "),t.createElement("p",null,E("staff"),": "),t.createElement("p",null,E("status"),": ",E(q)),t.createElement("p",null,E("date"),": ",s.formatDateStringForEvent(D,!1)),t.createElement("p",null,E("time"),": ",i.DateTime.fromISO(D).toFormat(r.TIME_FORMAT)),t.createElement("p",{className:"products",title:x},E("products"),": ",x))))};
+"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=e(require("react")),r=require("@licklist/core/dist/Config"),l=require("react-i18next"),a=require("../../../../static/Icon.js"),n=e(require("clsx")),i=require("luxon"),u=require("react-intl"),c=require("@licklist/plugins/dist/utils/formatDate"),s=require("@licklist/plugins/dist/utils/sourceTitle");exports.ResultCard=function(e){var o,m,d,p=e.order,E=e.className,f=e.onCardClick,v=l.useTranslation("Design").t,N=u.useIntl().formatNumber,q=p.id,y=p.people,g=p.user,D=p.status,x=p.startDate,C=p.products,T=p.source,b=p.totalAmount,h=(null===(o=C.map((function(e){return e.name})))||void 0===o?void 0:o.join(", "))||"",k=function(){f&&f(q)};return t.createElement("div",{className:n("result-card",E),onClick:k,onKeyUp:k,role:"button",tabIndex:0},t.createElement("div",{className:"card-content"},t.createElement("div",{className:"order-id"},q),t.createElement("div",{className:"order-people"},t.createElement(a.default,{type:"user",width:"10",height:"11"}),y),t.createElement("div",{className:"order-description"},t.createElement("p",{className:"name"},g.firstName," ",g.lastName),g.email&&t.createElement("p",null,g.email),(null===(m=g.userDetail)||void 0===m?void 0:m.phone)&&t.createElement("p",null,null===(d=g.userDetail)||void 0===d?void 0:d.phone),t.createElement("p",null,"------"),t.createElement("p",null,v("activity"),": "),t.createElement("p",null,v("staff"),": "),t.createElement("p",null,v("status"),": ",v(D)),t.createElement("p",null,v("date"),": ",c.formatDateStringForEvent(x,!1)),t.createElement("p",null,v("time"),": ",i.DateTime.fromISO(x).toFormat(r.TIME_FORMAT)),t.createElement("p",{className:"products",title:h},v("products"),": ",h),t.createElement("p",null,v("totalAmount"),":"," ",N(b,{style:"currency",currency:r.Currency.GBP})),t.createElement("p",null,v("source"),": ",v(s.getOrderSourceTitle(T))))))};

package/dist/sales/filters/SaleFilters.d.ts

@@ -8,6 +8,7 @@ export interface Filters {
     orderable_date_from: string;
     orderable_date_to: string;
     is_in_cart: boolean;
+    isFilterOpen?: boolean;
 }
 export interface SaleFiltersProps {
     values: Filters;

package/dist/sales/filters/SaleFilters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SaleFilters.d.ts","sourceRoot":"","sources":["../../../src/sales/filters/SaleFilters.tsx"],"names":[],"mappings":";AAMA,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACrC;AAUD,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,gBAAgB,eAsDjE"}
+{"version":3,"file":"SaleFilters.d.ts","sourceRoot":"","sources":["../../../src/sales/filters/SaleFilters.tsx"],"names":[],"mappings":";AAMA,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACrC;AAUD,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,gBAAgB,eAsDjE"}

package/dist/styles/events/EventCard.scss

@@ -39,7 +39,7 @@ $event-card-views-gutter: sp(3) !default;
   }
 
   .card-body {
-    padding: 0;
+    padding: 0 0 3rem 0;
 
     .event-description {
       min-height: 8rem;
@@ -54,7 +54,7 @@ $event-card-views-gutter: sp(3) !default;
         min-height: 13.75rem;
         max-height: 22rem;
       }
-    }
+  }
   }
 
   .card-title {

package/dist/styles/sales/BookingResults.scss

@@ -5,14 +5,14 @@
     flex-wrap: wrap;
 
     .result-card {
-      height: 12.125rem;
+      height: 13.825rem;
       border: 1px solid $gray-400;
       max-width: calc(50% - 0.75rem);
       flex: 0 0 calc(50% - 0.75rem);
       transition: ease-in 0.25s;
       border-radius: 0.25rem;
       box-shadow: 0px 0px 0.125rem 0px rgb(0 0 0 / 20%);
-      
+
       .card-content {
         width: 100%;
         height: 100%;
@@ -28,7 +28,7 @@
           position: absolute;
           left: 0.5rem;
           top: 0.125rem;
-          font-weight: 600;   
+          font-weight: 600;
         }
 
         .order-people {
@@ -43,7 +43,7 @@
           height: 1.75rem;
           font-size: 0.625rem;
           line-height: 0.625rem;
-          color: #6D6D6D;
+          color: #6d6d6d;
           font-weight: 600;
 
           svg {
@@ -64,7 +64,7 @@
         }
 
         .products {
-          display: inline-block;
+          display: block;
           width: 80%;
           white-space: nowrap;
           overflow: hidden;
@@ -74,7 +74,7 @@
 
       &:hover {
         box-shadow: 0px 0px 0.5rem 0px rgb(0 0 0 / 20%);
-        cursor: pointer; 
+        cursor: pointer;
       }
     }
 
@@ -93,4 +93,4 @@
       }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.44.539",
+  "version": "0.44.541",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"

package/src/events/event-card/utils.ts

@@ -8,7 +8,10 @@ export function formatContent(content, maxSymbols) {
   return content;
 }
 
-export const formatContentWithoutTags = (content, maxLength = 300) => {
+export const formatContentWithoutTags = (
+  content,
+  maxLength = EVENT_DESCRIPTION_SIZE
+) => {
   if (!content) return "";
   if (content < maxLength) return content;
   const text = content.replace(/<[^>]*>/g, "");

package/src/sales/booking/results/BookingResults.stories.tsx

@@ -4,6 +4,10 @@ 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";
 import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
+import {
+  ORDER_SOURCE_IFRAME,
+  ORDER_SOURCE_MANUAL,
+} from "@licklist/core/src/DataMapper/Order/OrderDataMapper";
 import { BookingResults } from "./BookingResults";
 
 export default {
@@ -21,6 +25,7 @@ Default.args = {
     {
       id: 1,
       people: 2,
+      source: ORDER_SOURCE_MANUAL,
       products: [
         {
           id: 1,
@@ -60,6 +65,7 @@ Default.args = {
     {
       id: 2,
       people: 10,
+      source: ORDER_SOURCE_MANUAL,
       products: [
         {
           id: 2,
@@ -100,6 +106,8 @@ Default.args = {
     {
       id: 3,
       people: 10,
+      source: ORDER_SOURCE_MANUAL,
+
       products: [
         {
           id: 3,
@@ -151,6 +159,7 @@ Default.args = {
     {
       id: 4,
       people: 10,
+      source: ORDER_SOURCE_MANUAL,
       products: [
         {
           id: 3,
@@ -182,6 +191,7 @@ Default.args = {
     {
       id: 5,
       people: 10,
+      source: ORDER_SOURCE_IFRAME,
       products: [
         {
           id: 3,
@@ -209,6 +219,7 @@ Default.args = {
     {
       id: 6,
       people: 10,
+      source: ORDER_SOURCE_IFRAME,
       products: [
         {
           id: 3,
@@ -235,6 +246,7 @@ Default.args = {
     {
       id: 7,
       people: 10,
+      source: ORDER_SOURCE_IFRAME,
       products: [
         {
           id: 3,

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

@@ -2,9 +2,12 @@ import React from "react";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { DateTime } from "luxon";
+import { useIntl } from "react-intl";
 import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
 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 = {
@@ -21,7 +24,9 @@ export const ResultCard = ({
   onCardClick,
 }: ResultCardProps) => {
   const { t } = useTranslation("Design");
-  const { id, people, user, status, startDate, products } = order;
+  const { formatNumber } = useIntl();
+  const { id, people, user, status, startDate, products, source, totalAmount } =
+    order;
 
   const productList = products.map((product) => product.name)?.join(", ") || "";
 
@@ -66,6 +71,16 @@ export const ResultCard = ({
           <p className="products" title={productList}>
             {t("products")}: {productList}
           </p>
+          <p>
+            {t("totalAmount")}:{" "}
+            {formatNumber(totalAmount, {
+              style: "currency",
+              currency: Config.Currency.GBP,
+            })}
+          </p>
+          <p>
+            {t("source")}: {t(getOrderSourceTitle(source))}
+          </p>
         </div>
       </div>
     </div>

package/src/sales/filters/SaleFilters.tsx

@@ -13,6 +13,7 @@ export interface Filters {
   orderable_date_from: string;
   orderable_date_to: string;
   is_in_cart: boolean;
+  isFilterOpen?: boolean;
 }
 
 export interface SaleFiltersProps {

package/src/styles/events/EventCard.scss

@@ -39,7 +39,7 @@ $event-card-views-gutter: sp(3) !default;
   }
 
   .card-body {
-    padding: 0;
+    padding: 0 0 3rem 0;
 
     .event-description {
       min-height: 8rem;
@@ -54,7 +54,7 @@ $event-card-views-gutter: sp(3) !default;
         min-height: 13.75rem;
         max-height: 22rem;
       }
-    }
+  }
   }
 
   .card-title {

package/src/styles/sales/BookingResults.scss

@@ -5,14 +5,14 @@
     flex-wrap: wrap;
 
     .result-card {
-      height: 12.125rem;
+      height: 13.825rem;
       border: 1px solid $gray-400;
       max-width: calc(50% - 0.75rem);
       flex: 0 0 calc(50% - 0.75rem);
       transition: ease-in 0.25s;
       border-radius: 0.25rem;
       box-shadow: 0px 0px 0.125rem 0px rgb(0 0 0 / 20%);
-      
+
       .card-content {
         width: 100%;
         height: 100%;
@@ -28,7 +28,7 @@
           position: absolute;
           left: 0.5rem;
           top: 0.125rem;
-          font-weight: 600;   
+          font-weight: 600;
         }
 
         .order-people {
@@ -43,7 +43,7 @@
           height: 1.75rem;
           font-size: 0.625rem;
           line-height: 0.625rem;
-          color: #6D6D6D;
+          color: #6d6d6d;
           font-weight: 600;
 
           svg {
@@ -64,7 +64,7 @@
         }
 
         .products {
-          display: inline-block;
+          display: block;
           width: 80%;
           white-space: nowrap;
           overflow: hidden;
@@ -74,7 +74,7 @@
 
       &:hover {
         box-shadow: 0px 0px 0.5rem 0px rgb(0 0 0 / 20%);
-        cursor: pointer; 
+        cursor: pointer;
       }
     }
 
@@ -93,4 +93,4 @@
       }
     }
   }
-}
+}