@licklist/design 0.44.547-dev.0 → 0.44.548

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,10 +1,8 @@
1
1
  /// <reference types="react" />
2
2
  import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
3
- import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
4
3
  export type BookingResultsProps = {
5
4
  orders?: Order[] | null;
6
5
  onCardClick?: (id: number) => void;
7
- staffMembers?: User[] | null;
8
6
  };
9
- export declare const BookingResults: ({ orders, onCardClick, staffMembers, }: BookingResultsProps) => JSX.Element;
7
+ export declare const BookingResults: ({ orders, onCardClick, }: BookingResultsProps) => JSX.Element;
10
8
  //# sourceMappingURL=BookingResults.d.ts.map
@@ -1 +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;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"}
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"}
@@ -1 +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"),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})}))))};
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})}))))};
@@ -1,11 +1,9 @@
1
1
  /// <reference types="react" />
2
2
  import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
3
- import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
4
3
  export type ResultCardProps = {
5
4
  className: string;
6
5
  order: Order;
7
- staffMember?: User;
8
6
  onCardClick?: (id: number) => void;
9
7
  };
10
- export declare const ResultCard: ({ order, className, staffMember, onCardClick, }: ResultCardProps) => JSX.Element;
8
+ export declare const ResultCard: ({ order, className, onCardClick, }: ResultCardProps) => JSX.Element;
11
9
  //# sourceMappingURL=ResultCard.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ResultCard.d.ts","sourceRoot":"","sources":["../../../../../src/sales/booking/results/components/ResultCard.tsx"],"names":[],"mappings":";AAKA,OAAO,EACL,KAAK,EAEN,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,oDAAoD,CAAC;AAQ1E,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,gBA2FjB,CAAC"}
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"}
@@ -1 +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"),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,y=e.onCardClick,N=l.useTranslation("Design").t,q=c.useIntl().formatNumber,D=E.id,g=E.people,C=E.user,O=E.status,M=E.startDate,T=E.products,b=E.source,k=E.totalAmount,x=E.event,A=E.menu,h=E.remainingToPay,I=(null===(m=T.map((function(e){return e.name})))||void 0===m?void 0:m.join(", "))||"",R=(null==x?void 0:x.name)||(null==A?void 0:A.name)||"",_=function(){y&&y(D)};return t.createElement("div",{className:n("result-card",f),onClick:_,onKeyUp:_,role:"button",tabIndex:0},t.createElement("div",{className:"card-content"},t.createElement("div",{className:"order-id"},D),t.createElement("div",{className:"order-people"},t.createElement(a.default,{type:"user",width:"10",height:"11"}),g),t.createElement("div",{className:"order-description"},t.createElement("p",{className:"name"},C.firstName," ",C.lastName),C.email&&t.createElement("p",null,C.email),(null===(d=C.userDetail)||void 0===d?void 0:d.phone)&&t.createElement("p",null,null===(p=C.userDetail)||void 0===p?void 0:p.phone),t.createElement("p",null,"------"),t.createElement("p",null,N("activity"),": ",R," "),b===u.ORDER_SOURCE_MANUAL&&v&&t.createElement("p",null,N("staff"),": ","".concat(v.firstName," ").concat(v.lastName)),t.createElement("p",null,N("status"),": ",N(O)),t.createElement("p",null,N("date"),": ",s.formatDateStringForEvent(M,!1)),t.createElement("p",null,N("time"),": ",i.DateTime.fromISO(M).toFormat(r.TIME_FORMAT)),t.createElement("p",{className:"products",title:I},N("products"),": ",I),!!h&&t.createElement("p",null,N("remainingAmount"),":"," ",q(h,{style:"currency",currency:r.Currency.GBP})),t.createElement("p",null,N("paidAmount"),":"," ",q(k,{style:"currency",currency:r.Currency.GBP})),t.createElement("p",null,N("source"),": ",N(o.getOrderSourceTitle(b))))))};
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))))))};
@@ -5,7 +5,7 @@
5
5
  flex-wrap: wrap;
6
6
 
7
7
  .result-card {
8
- height: 14rem;
8
+ height: 13.825rem;
9
9
  border: 1px solid $gray-400;
10
10
  max-width: calc(50% - 0.75rem);
11
11
  flex: 0 0 calc(50% - 0.75rem);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@licklist/design",
3
- "version": "0.44.547-dev.0",
3
+ "version": "0.44.548",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -53,9 +53,9 @@
53
53
  "@fortawesome/free-brands-svg-icons": "5.15.2",
54
54
  "@fortawesome/free-solid-svg-icons": "5.15.2",
55
55
  "@fortawesome/react-fontawesome": "0.1.9",
56
- "@licklist/core": ">=0.15.41-dev.0 < 0.15.41",
56
+ "@licklist/core": "0.15.x",
57
57
  "@licklist/eslint-config": "0.3.4",
58
- "@licklist/plugins": ">=0.20.133-dev.5 < 0.20.133",
58
+ "@licklist/plugins": "0.20.x",
59
59
  "@mdx-js/react": "1.6.22",
60
60
  "@popperjs/core": "2.11.8",
61
61
  "@react-aria/utils": "3.9.0",
@@ -1,20 +1,17 @@
1
1
  import React from "react";
2
2
  import { useTranslation } from "react-i18next";
3
3
  import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
4
- import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
5
4
  import { ResultCard } from "./components/ResultCard";
6
5
  import { BACKGROUND_COLOR_CLASSNAMES } from "./constants";
7
6
 
8
7
  export type BookingResultsProps = {
9
8
  orders?: Order[] | null;
10
9
  onCardClick?: (id: number) => void;
11
- staffMembers?: User[] | null;
12
10
  };
13
11
 
14
12
  export const BookingResults = ({
15
13
  orders,
16
14
  onCardClick,
17
- staffMembers,
18
15
  }: BookingResultsProps) => {
19
16
  const { t } = useTranslation("Design");
20
17
 
@@ -25,14 +22,10 @@ export const BookingResults = ({
25
22
  ) : (
26
23
  <div className="booking-results-wrapper">
27
24
  {orders?.map((order, index) => {
28
- const staffMember = staffMembers?.find(
29
- (staff) => staff.id === order?.orderMetadata?.created_by
30
- );
31
25
  return (
32
26
  <ResultCard
33
27
  key={order.id}
34
28
  order={order}
35
- staffMember={staffMember}
36
29
  className={
37
30
  BACKGROUND_COLOR_CLASSNAMES[
38
31
  index % BACKGROUND_COLOR_CLASSNAMES.length
@@ -3,22 +3,16 @@ import clsx from "clsx";
3
3
  import { useTranslation } from "react-i18next";
4
4
  import { DateTime } from "luxon";
5
5
  import { useIntl } from "react-intl";
6
- import {
7
- Order,
8
- ORDER_SOURCE_MANUAL,
9
- } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
10
- import { User } from "@licklist/core/dist/DataMapper/User/UserDataMapper";
6
+ import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
11
7
  import { TIME_FORMAT } from "@licklist/core/dist/Config";
12
8
  import * as Config from "@licklist/core/dist/Config";
13
9
  import { formatDateStringForEvent } from "@licklist/plugins/dist/utils/formatDate";
14
10
  import { getOrderSourceTitle } from "@licklist/plugins/dist/utils/sourceTitle";
15
-
16
11
  import Icon from "../../../../static/Icon";
17
12
 
18
13
  export type ResultCardProps = {
19
14
  className: string;
20
15
  order: Order;
21
- staffMember?: User;
22
16
  onCardClick?: (id: number) => void;
23
17
  };
24
18
 
@@ -27,28 +21,14 @@ export type ResultCardProps = {
27
21
  export const ResultCard = ({
28
22
  order,
29
23
  className,
30
- staffMember,
31
24
  onCardClick,
32
25
  }: ResultCardProps) => {
33
26
  const { t } = useTranslation("Design");
34
27
  const { formatNumber } = useIntl();
35
-
36
- const {
37
- id,
38
- people,
39
- user,
40
- status,
41
- startDate,
42
- products,
43
- source,
44
- totalAmount,
45
- event,
46
- menu,
47
- remainingToPay,
48
- } = order;
28
+ const { id, people, user, status, startDate, products, source, totalAmount } =
29
+ order;
49
30
 
50
31
  const productList = products.map((product) => product.name)?.join(", ") || "";
51
- const activityName = event?.name || menu?.name || "";
52
32
 
53
33
  const onClick = () => {
54
34
  if (!onCardClick) return;
@@ -77,14 +57,8 @@ export const ResultCard = ({
77
57
  {user.email && <p>{user.email}</p>}
78
58
  {user.userDetail?.phone && <p>{user.userDetail?.phone}</p>}
79
59
  <p>------</p>
80
- <p>
81
- {t("activity")}: {activityName}{" "}
82
- </p>
83
- {source === ORDER_SOURCE_MANUAL && staffMember && (
84
- <p>
85
- {t("staff")}: {`${staffMember.firstName} ${staffMember.lastName}`}
86
- </p>
87
- )}
60
+ <p>{t("activity")}: </p>
61
+ <p>{t("staff")}: </p>
88
62
  <p>
89
63
  {t("status")}: {t(status)}
90
64
  </p>
@@ -97,17 +71,8 @@ export const ResultCard = ({
97
71
  <p className="products" title={productList}>
98
72
  {t("products")}: {productList}
99
73
  </p>
100
- {!!remainingToPay && (
101
- <p>
102
- {t("remainingAmount")}:{" "}
103
- {formatNumber(remainingToPay, {
104
- style: "currency",
105
- currency: Config.Currency.GBP,
106
- })}
107
- </p>
108
- )}
109
74
  <p>
110
- {t("paidAmount")}:{" "}
75
+ {t("totalAmount")}:{" "}
111
76
  {formatNumber(totalAmount, {
112
77
  style: "currency",
113
78
  currency: Config.Currency.GBP,
@@ -5,7 +5,7 @@
5
5
  flex-wrap: wrap;
6
6
 
7
7
  .result-card {
8
- height: 14rem;
8
+ height: 13.825rem;
9
9
  border: 1px solid $gray-400;
10
10
  max-width: calc(50% - 0.75rem);
11
11
  flex: 0 0 calc(50% - 0.75rem);