@licklist/design 0.44.486-dev.81 → 0.44.486-dev.82

package/dist/sales/booking/results/BookingResults.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="react" />
 import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
+import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
 export type BookingResultsProps = {
     orders?: Order[] | null;
     onCardClick?: (id: number) => void;
+    staffMembers?: User[] | null;
 };
-export declare const BookingResults: ({ orders, onCardClick, }: BookingResultsProps) => JSX.Element;
+export declare const BookingResults: ({ orders, onCardClick, staffMembers, }: BookingResultsProps) => JSX.Element;
 //# sourceMappingURL=BookingResults.d.ts.map

package/dist/sales/booking/results/BookingResults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BookingResults.d.ts","sourceRoot":"","sources":["../../../../src/sales/booking/results/BookingResults.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,sDAAsD,CAAC;AAI7E,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACxB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,cAAc,6BAGxB,mBAAmB,gBA2BrB,CAAC"}
+{"version":3,"file":"BookingResults.d.ts","sourceRoot":"","sources":["../../../../src/sales/booking/results/BookingResults.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,sDAAsD,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,oDAAoD,CAAC;AAI1E,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACxB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,cAAc,2CAIxB,mBAAmB,gBA+BrB,CAAC"}

package/dist/sales/booking/results/BookingResults.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("react"),t=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,n=require("react-i18next"),s=require("./components/ResultCard.js"),o=require("./constants.js");exports.BookingResults=function(e){var r=e.orders,l=e.onCardClick,a=n.useTranslation("Design").t;return t.createElement("div",{className:"booking-results"},0===(null==r?void 0:r.length)?t.createElement("p",null,a("noBookingOrdersWereFound")):t.createElement("div",{className:"booking-results-wrapper"},null==r?void 0:r.map((function(e,r){return t.createElement(s.ResultCard,{key:e.id,order:e,className:o.BACKGROUND_COLOR_CLASSNAMES[r%o.BACKGROUND_COLOR_CLASSNAMES.length],onCardClick:l})}))))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("react"),t=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,n=require("react-i18next"),a=require("./components/ResultCard.js"),o=require("./constants.js");exports.BookingResults=function(e){var r=e.orders,l=e.onCardClick,s=e.staffMembers,i=n.useTranslation("Design").t;return t.createElement("div",{className:"booking-results"},0===(null==r?void 0:r.length)?t.createElement("p",null,i("noBookingOrdersWereFound")):t.createElement("div",{className:"booking-results-wrapper"},null==r?void 0:r.map((function(e,r){var n=null==s?void 0:s.find((function(r){var t;return r.id===(null===(t=null==e?void 0:e.orderMetadata)||void 0===t?void 0:t.created_by)}));return t.createElement(a.ResultCard,{key:e.id,order:e,staffMember:n,className:o.BACKGROUND_COLOR_CLASSNAMES[r%o.BACKGROUND_COLOR_CLASSNAMES.length],onCardClick:l})}))))};

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

@@ -1,9 +1,11 @@
 /// <reference types="react" />
 import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
+import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
 export type ResultCardProps = {
     className: string;
     order: Order;
+    staffMember?: User;
     onCardClick?: (id: number) => void;
 };
-export declare const ResultCard: ({ order, className, onCardClick, }: ResultCardProps) => JSX.Element;
+export declare const ResultCard: ({ order, className, staffMember, onCardClick, }: ResultCardProps) => JSX.Element;
 //# sourceMappingURL=ResultCard.d.ts.map

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":";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"}
+{"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;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,oDAAoD,CAAC;AAS1E,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,CAAC;AAIF,eAAO,MAAM,UAAU,oDAKpB,eAAe,gBAkFjB,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"),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))))))};
+"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"),c=require("react-intl"),u=require("@licklist/core/dist/DataMapper/Order/OrderDataMapper"),s=require("@licklist/plugins/dist/utils/formatDate"),o=require("@licklist/plugins/dist/utils/sourceTitle");exports.ResultCard=function(e){var m,d,p,E=e.order,f=e.className,v=e.staffMember,N=e.onCardClick,q=l.useTranslation("Design").t,D=c.useIntl().formatNumber,y=E.id,O=E.people,g=E.user,C=E.status,M=E.startDate,b=E.products,k=E.source,x=E.totalAmount,T=E.event,h=E.menu,A=(null===(m=b.map((function(e){return e.name})))||void 0===m?void 0:m.join(", "))||"",I=(null==T?void 0:T.name)||(null==h?void 0:h.name)||"",R=function(){N&&N(y)};return t.createElement("div",{className:n("result-card",f),onClick:R,onKeyUp:R,role:"button",tabIndex:0},t.createElement("div",{className:"card-content"},t.createElement("div",{className:"order-id"},y),t.createElement("div",{className:"order-people"},t.createElement(a.default,{type:"user",width:"10",height:"11"}),O),t.createElement("div",{className:"order-description"},t.createElement("p",{className:"name"},g.firstName," ",g.lastName),g.email&&t.createElement("p",null,g.email),(null===(d=g.userDetail)||void 0===d?void 0:d.phone)&&t.createElement("p",null,null===(p=g.userDetail)||void 0===p?void 0:p.phone),t.createElement("p",null,"------"),t.createElement("p",null,q("activity"),": ",I," "),k===u.ORDER_SOURCE_MANUAL&&v&&t.createElement("p",null,q("staff"),": ","".concat(v.firstName," ").concat(v.lastName)),t.createElement("p",null,q("status"),": ",q(C)),t.createElement("p",null,q("date"),": ",s.formatDateStringForEvent(M,!1)),t.createElement("p",null,q("time"),": ",i.DateTime.fromISO(M).toFormat(r.TIME_FORMAT)),t.createElement("p",{className:"products",title:A},q("products"),": ",A),t.createElement("p",null,q("totalAmount"),":"," ",D(x,{style:"currency",currency:r.Currency.GBP})),t.createElement("p",null,q("source"),": ",q(o.getOrderSourceTitle(k))))))};

package/package.json

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

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

@@ -1,17 +1,20 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
+import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
 import { ResultCard } from "./components/ResultCard";
 import { BACKGROUND_COLOR_CLASSNAMES } from "./constants";
 
 export type BookingResultsProps = {
   orders?: Order[] | null;
   onCardClick?: (id: number) => void;
+  staffMembers?: User[] | null;
 };
 
 export const BookingResults = ({
   orders,
   onCardClick,
+  staffMembers,
 }: BookingResultsProps) => {
   const { t } = useTranslation("Design");
 
@@ -22,10 +25,14 @@ export const BookingResults = ({
       ) : (
         <div className="booking-results-wrapper">
           {orders?.map((order, index) => {
+            const staffMember = staffMembers?.find(
+              (staff) => staff.id === order?.orderMetadata?.created_by
+            );
             return (
               <ResultCard
                 key={order.id}
                 order={order}
+                staffMember={staffMember}
                 className={
                   BACKGROUND_COLOR_CLASSNAMES[
                     index % BACKGROUND_COLOR_CLASSNAMES.length

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

@@ -4,15 +4,19 @@ import { useTranslation } from "react-i18next";
 import { DateTime } from "luxon";
 import { useIntl } from "react-intl";
 import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
+import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
 import { TIME_FORMAT } from "@licklist/core/dist/Config";
 import * as Config from "@licklist/core/dist/Config";
+import { ORDER_SOURCE_MANUAL } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
 import { formatDateStringForEvent } from "@licklist/plugins/dist/utils/formatDate";
 import { getOrderSourceTitle } from "@licklist/plugins/dist/utils/sourceTitle";
+
 import Icon from "../../../../static/Icon";
 
 export type ResultCardProps = {
   className: string;
   order: Order;
+  staffMember?: User;
   onCardClick?: (id: number) => void;
 };
 
@@ -21,15 +25,29 @@ export type ResultCardProps = {
 export const ResultCard = ({
   order,
   className,
+  staffMember,
   onCardClick,
 }: ResultCardProps) => {
   const { t } = useTranslation("Design");
   const { formatNumber } = useIntl();
-  const { id, people, user, status, startDate, products, source, totalAmount } =
-    order;
+
+  const {
+    id,
+    people,
+    user,
+    status,
+    startDate,
+    products,
+    source,
+    totalAmount,
+    event,
+    menu,
+  } = order;
 
   const productList = products.map((product) => product.name)?.join(", ") || "";
 
+  const activityName = event?.name || menu?.name || "";
+
   const onClick = () => {
     if (!onCardClick) return;
 
@@ -57,8 +75,14 @@ export const ResultCard = ({
           {user.email && <p>{user.email}</p>}
           {user.userDetail?.phone && <p>{user.userDetail?.phone}</p>}
           <p>------</p>
-          <p>{t("activity")}: </p>
-          <p>{t("staff")}: </p>
+          <p>
+            {t("activity")}: {activityName}{" "}
+          </p>
+          {source === ORDER_SOURCE_MANUAL && staffMember && (
+            <p>
+              {t("staff")}: {`${staffMember.firstName} ${staffMember.lastName}`}
+            </p>
+          )}
           <p>
             {t("status")}: {t(status)}
           </p>