@licklist/design 0.50.1-dev.2 → 0.50.1-dev.4

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.
Files changed (9) hide show
  1. package/dist/events/event-card/EventCard.d.ts.map +1 -1
  2. package/dist/events/event-card/EventCard.js +1 -1
  3. package/dist/sales/booking/results/components/ResultCard.d.ts.map +1 -1
  4. package/dist/sales/booking/results/components/ResultCard.js +1 -1
  5. package/dist/styles/affiliate/AffiliateCard.scss +26 -6
  6. package/package.json +1 -1
  7. package/src/events/event-card/EventCard.tsx +22 -4
  8. package/src/sales/booking/results/components/ResultCard.tsx +5 -1
  9. package/src/styles/affiliate/AffiliateCard.scss +26 -6
package/dist/events/event-card/EventCard.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EventCard.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/EventCard.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAElG,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAS5C,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,cAAc,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACvC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,SAAS,CAAC,EACxB,IAAI,EACJ,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,SAAS,EACT,MAAM,EACN,MAAM,EACN,QAAQ,EACR,aAAoB,EACpB,cAAc,EACd,WAAW,EACX,cAAc,EACd,OAAO,EACP,aAAa,GACd,EAAE,cAAc,eAsIhB"}
1
+ {"version":3,"file":"EventCard.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/EventCard.tsx"],"names":[],"mappings":";AAYA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAElG,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAS5C,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,cAAc,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACvC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,SAAS,CAAC,EACxB,IAAI,EACJ,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,SAAS,EACT,MAAM,EACN,MAAM,EACN,QAAQ,EACR,aAAoB,EACpB,cAAc,EACd,WAAW,EACX,cAAc,EACd,OAAO,EACP,aAAa,GACd,EAAE,cAAc,eAkJhB"}
package/dist/events/event-card/EventCard.js CHANGED
@@ -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=require("tslib"),a=require("react"),n=e(a),r=require("@licklist/core/dist/Config"),c=require("react-i18next"),l=require("react-bootstrap"),s=require("../../static/Icon.js"),i=e(require("clsx")),m=require("react-intl"),o=require("../../tiptap-editor/TipTapEditor.js"),u=require("./utils.js"),d=require("../../assets/dashboard/chartBar.svg.js");exports.EventCard=function(e){var E=e.name,v=e.description,p=e.date,y=e.imageUrl,f=e.sales,N=e.onPreview,b=e.onEdit,C=e.onCopy,k=e.onRemove,x=e.hasPermission,g=void 0===x||x,q=e.productSetName,w=e.onStatistic,h=e.eventStatistic,T=e.titleId,j=e.descriptionId,I=c.useTranslation("Design").t,S=m.useIntl(),P=S.formatNumber,_=S.formatDate,B=u.getStatisticInfo(h,p),D=B.totalViews,M=t.__rest(B,["totalViews"]),O=a.useMemo((function(){return u.formatContentWithoutTags(v,u.EVENT_DESCRIPTION_SIZE)}),[v]);return n.createElement(l.Card,{className:"d-flex flex-column event-card h-100"},n.createElement("div",{className:i("event-card-image-container",!y&&"no-image")},y&&n.createElement(l.Card.Img,{variant:"top",src:y}),n.createElement(l.Badge,{className:"event-card-date",as:"time",dateTime:p,variant:"primary"},_(new Date(p),{weekday:"short",day:"numeric",month:"short",year:"numeric",hour:"numeric",minute:"numeric"}))),n.createElement(l.Card.Body,null,n.createElement(l.Card.Title,{id:T},E),n.createElement("div",{className:"flex-grow-1"},n.createElement(o.TipTapEditor,{viewMode:!0,disabled:!0,className:i("event-description",!y&&"no-image"),content:O,id:j}),n.createElement("div",{className:"mt-2 ml-2"},Object.keys(M).map((function(e){return n.createElement("div",{className:"event-card-sale",key:e},n.createElement("span",{className:"event-card-sale-name"},I(e),":"," ","totalAmount"===e?P(M[e],{style:"currency",currency:r.Currency.GBP}):M[e]))}))),f&&f.map((function(e){return n.createElement("div",{className:"event-card-sale",key:e.id},n.createElement("div",{className:"event-card-sale-text"},n.createElement("span",{className:"event-card-sale-name"},e.name)," ",n.createElement("span",{className:"event-card-sale-quantity"},[e.current,e.max].map((function(e){return P(e)})).join(" / "))),n.createElement(l.ProgressBar,{now:e.current,max:e.max}))})))),n.createElement(l.Card.Footer,{className:"flex-column"},q&&n.createElement("div",{className:"pl-3 text-truncate"},I("Design:productSet"),": ",q),n.createElement("div",{className:"d-flex w-100 justify-content-between"},n.createElement("div",{className:"d-flex"},n.createElement("button",{type:"button",className:"event-card-link-button ml-3 mr-4",onClick:w},n.createElement(d.ReactComponent,null)),n.createElement("div",{className:"event-card-views"},n.createElement(s.default,{type:"eye"}),n.createElement("span",null,P(D)))),n.createElement("div",null,n.createElement("button",{type:"button",className:"event-card-link-button",onClick:N},n.createElement(s.default,{type:"external-link-alt"})),g&&n.createElement(n.Fragment,null,n.createElement("button",{type:"button",className:"event-card-link-button",onClick:b},n.createElement(s.default,{type:"edit"})),n.createElement("button",{type:"button",className:"event-card-link-button",onClick:C},n.createElement(s.default,{type:"copy"})),n.createElement("button",{type:"button",className:"event-card-link-button",onClick:k},n.createElement(s.default,{type:"trash-alt"})))))))};
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"),a=require("react"),n=e(a),r=require("@licklist/core/dist/Config"),c=require("react-i18next"),l=require("react-bootstrap"),s=require("../../static/Icon.js"),i=e(require("clsx")),m=require("react-intl"),o=require("../../tiptap-editor/TipTapEditor.js"),u=require("./utils.js"),d=require("../../assets/dashboard/chartBar.svg.js");exports.EventCard=function(e){var v=e.name,E=e.description,p=e.date,y=e.imageUrl,f=e.sales,N=e.onPreview,b=e.onEdit,g=e.onCopy,C=e.onRemove,k=e.hasPermission,x=void 0===k||k,h=e.productSetName,q=e.onStatistic,w=e.eventStatistic,T=e.titleId,j=e.descriptionId,I=c.useTranslation("Design").t,P=m.useIntl(),S=P.formatNumber,_=P.formatDate,B=u.getStatisticInfo(w,p),D=B.totalViews,O=t.__rest(B,["totalViews"]),M=a.useMemo((function(){return u.formatContentWithoutTags(E,u.EVENT_DESCRIPTION_SIZE)}),[E]);return n.createElement(l.Card,{className:"d-flex flex-column event-card h-100"},n.createElement("div",{className:i("event-card-image-container",!y&&"no-image")},y&&n.createElement(l.Card.Img,{variant:"top",src:y}),n.createElement(l.Badge,{className:"event-card-date",as:"time",dateTime:p,variant:"primary"},_(new Date(p),{weekday:"short",day:"numeric",month:"short",year:"numeric",hour:"numeric",minute:"numeric"}))),n.createElement(l.Card.Body,null,n.createElement(l.Card.Title,{id:T},v),n.createElement("div",{className:"flex-grow-1"},n.createElement(o.TipTapEditor,{viewMode:!0,disabled:!0,className:i("event-description",!y&&"no-image"),content:M,id:j}),n.createElement("div",{className:"mt-2 ml-2"},Object.keys(O).map((function(e){return n.createElement("div",{className:"event-card-sale",key:e},n.createElement("span",{className:"event-card-sale-name"},I(e),":"," ","totalAmount"===e?S(O[e],{style:"currency",currency:r.Currency.GBP}):O[e]))}))),f&&f.map((function(e){return n.createElement("div",{className:"event-card-sale",key:e.id},n.createElement("div",{className:"event-card-sale-text"},n.createElement("span",{className:"event-card-sale-name"},e.name)," ",n.createElement("span",{className:"event-card-sale-quantity"},[e.current,e.max].map((function(e){return S(e)})).join(" / "))),n.createElement(l.ProgressBar,{now:e.current,max:e.max}))})))),n.createElement(l.Card.Footer,{className:"flex-column"},h&&n.createElement(l.OverlayTrigger,{trigger:["hover","hover"],overlay:n.createElement(l.Popover,{id:"event-product-set-popover"},n.createElement(l.Popover.Content,{className:"event-product-set-card"},h))},n.createElement("div",{className:"pl-3 text-truncate"},I("Design:productSet"),": ",h)),n.createElement("div",{className:"d-flex w-100 justify-content-between"},n.createElement("div",{className:"d-flex"},n.createElement("button",{type:"button",className:"event-card-link-button ml-3 mr-4",onClick:q},n.createElement(d.ReactComponent,null)),n.createElement("div",{className:"event-card-views"},n.createElement(s.default,{type:"eye"}),n.createElement("span",null,S(D)))),n.createElement("div",null,n.createElement("button",{type:"button",className:"event-card-link-button",onClick:N},n.createElement(s.default,{type:"external-link-alt"})),x&&n.createElement(n.Fragment,null,n.createElement("button",{type:"button",className:"event-card-link-button",onClick:b},n.createElement(s.default,{type:"edit"})),n.createElement("button",{type:"button",className:"event-card-link-button",onClick:g},n.createElement(s.default,{type:"copy"})),n.createElement("button",{type:"button",className:"event-card-link-button",onClick:C},n.createElement(s.default,{type:"trash-alt"})))))))};
package/dist/sales/booking/results/components/ResultCard.d.ts.map CHANGED
@@ -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,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,gBA+FjB,CAAC"}
package/dist/sales/booking/results/components/ResultCard.js CHANGED
@@ -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/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=u.useIntl().formatNumber,D=E.id,g=E.people,C=E.user,O=E.status,b=E.startDate,A=E.products,M=E.source,T=E.totalAmount,k=E.event,x=E.menu,h=E.remainingToPay,I=E.orderPayments[0].discountAmount,P=(null===(m=A.map((function(e){return e.name})))||void 0===m?void 0:m.join(", "))||"",R=(null==k?void 0:k.name)||(null==x?void 0:x.name)||"",_=T+Number(I||0),j=function(){y&&y(D)};return t.createElement("div",{className:n("result-card",f),onClick:j,onKeyUp:j,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," "),M===c.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(b,!1)),t.createElement("p",null,N("time"),": ",i.DateTime.fromISO(b).toFormat(r.TIME_FORMAT)),t.createElement("p",{className:"products",title:P},N("products"),": ",P),!!h&&t.createElement("p",null,N("remainingAmount"),":"," ",q(h,{style:"currency",currency:r.Currency.GBP})),t.createElement("p",null,N("paidAmount"),":"," ",q(_,{style:"currency",currency:r.Currency.GBP})),t.createElement("p",null,N("source"),": ",N(o.getOrderSourceTitle(M))))))};
package/dist/styles/affiliate/AffiliateCard.scss CHANGED
@@ -3,7 +3,10 @@ $affiliate-card-box-shadow-focus: $btn-focus-box-shadow !default;
3
3
  $affiliate-card-transition: $btn-transition !default;
4
4
 
5
5
  $affiliate-card-link-background-color: $affiliate-card-background-color !default;
6
- $affiliate-card-link-background-color-hover: theme-color-level("primary", -10.5) !default;
6
+ $affiliate-card-link-background-color-hover: theme-color-level(
7
+ "primary",
8
+ -10.5
9
+ ) !default;
7
10
  $affiliate-card-link-box-shadow-focus: $affiliate-card-box-shadow-focus !default;
8
11
  $affiliate-card-link-padding-x: sp(10) !default;
9
12
  $affiliate-card-link-padding-y: sp(10) !default;
@@ -12,12 +15,20 @@ $affiliate-card-link-text-color-hover: theme-color("primary") !default;
12
15
  $affiliate-card-link-text-font-weight: $font-weight-normal !default;
13
16
  $affiliate-card-link-transition: $affiliate-card-transition !default;
14
17
 
15
- $affiliate-card-menu-button-background-color-hover: theme-color("primary") !default;
18
+ $affiliate-card-menu-button-background-color-hover: theme-color(
19
+ "primary"
20
+ ) !default;
16
21
  $affiliate-card-menu-button-border-radius: $border-radius !default;
17
22
  $affiliate-card-menu-button-box-shadow-focus: $affiliate-card-box-shadow-focus !default;
18
- $affiliate-card-menu-button-icon-color: adjust-color(theme-color("primary"), $alpha: -1/3) !default;
23
+ $affiliate-card-menu-button-icon-color: adjust-color(
24
+ theme-color("primary"),
25
+ $alpha: -1/3
26
+ ) !default;
19
27
  $affiliate-card-menu-button-icon-color-hover: $affiliate-card-background-color !default;
20
- $affiliate-card-menu-button-icon-color-container-hover: adjust-color(theme-color("primary"), $alpha: -1 / 12) !default;
28
+ $affiliate-card-menu-button-icon-color-container-hover: adjust-color(
29
+ theme-color("primary"),
30
+ $alpha: -1 / 12
31
+ ) !default;
21
32
  $affiliate-card-menu-button-icon-size: sp(4) !default;
22
33
  $affiliate-card-menu-button-inset: sp(2) !default;
23
34
  $affiliate-card-menu-button-size: sp(8) !default;
@@ -139,12 +150,14 @@ $affiliate-card-menu-icon-size: sp(3.5) !default;
139
150
  }
140
151
  }
141
152
 
142
- .affiliate-card-popover {
153
+ .affiliate-card-popover,
154
+ #event-product-set-popover {
143
155
  border-radius: $affiliate-card-popover-border-radius;
144
156
  border: none;
145
157
  filter: $affiliate-card-popover-box-shadow-filter;
146
158
 
147
- .affiliate-card-menu {
159
+ .affiliate-card-menu,
160
+ .event-product-set-card {
148
161
  padding: $affiliate-card-menu-padding-x $affiliate-card-menu-padding-y;
149
162
  border-radius: $affiliate-card-popover-border-radius;
150
163
 
@@ -175,5 +188,12 @@ $affiliate-card-menu-icon-size: sp(3.5) !default;
175
188
  }
176
189
  }
177
190
 
191
+ #event-product-set-popover {
192
+ .event-product-set-card {
193
+ padding-left: 1rem;
194
+ padding-right: 1rem;
195
+ }
196
+ }
197
+
178
198
  $snippet-template-card-background-color: color("red") !default;
179
199
  $snippet-template-card-border: 1px solid red;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@licklist/design",
3
- "version": "0.50.1-dev.2",
3
+ "version": "0.50.1-dev.4",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
package/src/events/event-card/EventCard.tsx CHANGED
@@ -1,5 +1,11 @@
1
1
  import React, { useMemo } from "react";
2
- import { Badge, Card, ProgressBar } from "react-bootstrap";
2
+ import {
3
+ Badge,
4
+ Card,
5
+ OverlayTrigger,
6
+ Popover,
7
+ ProgressBar,
8
+ } from "react-bootstrap";
3
9
  import { useIntl } from "react-intl";
4
10
  import clsx from "clsx";
5
11
  import { useTranslation } from "react-i18next";
@@ -127,9 +133,21 @@ export function EventCard({
127
133
  </Card.Body>
128
134
  <Card.Footer className="flex-column">
129
135
  {productSetName && (
130
- <div className="pl-3 text-truncate">
131
- {t("Design:productSet")}: {productSetName}
132
- </div>
136
+ <OverlayTrigger
137
+ // Workaround for bootstrap error with "hover trigger"
138
+ trigger={["hover", "hover"]}
139
+ overlay={
140
+ <Popover id="event-product-set-popover">
141
+ <Popover.Content className="event-product-set-card">
142
+ {productSetName}
143
+ </Popover.Content>
144
+ </Popover>
145
+ }
146
+ >
147
+ <div className="pl-3 text-truncate">
148
+ {t("Design:productSet")}: {productSetName}
149
+ </div>
150
+ </OverlayTrigger>
133
151
  )}
134
152
  <div className="d-flex w-100 justify-content-between">
135
153
  <div className="d-flex">
package/src/sales/booking/results/components/ResultCard.tsx CHANGED
@@ -45,10 +45,14 @@ export const ResultCard = ({
45
45
  event,
46
46
  menu,
47
47
  remainingToPay,
48
+ orderPayments,
48
49
  } = order;
49
50
 
51
+ const { discountAmount } = orderPayments[0];
52
+
50
53
  const productList = products.map((product) => product.name)?.join(", ") || "";
51
54
  const activityName = event?.name || menu?.name || "";
55
+ const totalAmountWithDiscount = totalAmount + Number(discountAmount || 0);
52
56
 
53
57
  const onClick = () => {
54
58
  if (!onCardClick) return;
@@ -108,7 +112,7 @@ export const ResultCard = ({
108
112
  )}
109
113
  <p>
110
114
  {t("paidAmount")}:{" "}
111
- {formatNumber(totalAmount, {
115
+ {formatNumber(totalAmountWithDiscount, {
112
116
  style: "currency",
113
117
  currency: Config.Currency.GBP,
114
118
  })}
package/src/styles/affiliate/AffiliateCard.scss CHANGED
@@ -3,7 +3,10 @@ $affiliate-card-box-shadow-focus: $btn-focus-box-shadow !default;
3
3
  $affiliate-card-transition: $btn-transition !default;
4
4
 
5
5
  $affiliate-card-link-background-color: $affiliate-card-background-color !default;
6
- $affiliate-card-link-background-color-hover: theme-color-level("primary", -10.5) !default;
6
+ $affiliate-card-link-background-color-hover: theme-color-level(
7
+ "primary",
8
+ -10.5
9
+ ) !default;
7
10
  $affiliate-card-link-box-shadow-focus: $affiliate-card-box-shadow-focus !default;
8
11
  $affiliate-card-link-padding-x: sp(10) !default;
9
12
  $affiliate-card-link-padding-y: sp(10) !default;
@@ -12,12 +15,20 @@ $affiliate-card-link-text-color-hover: theme-color("primary") !default;
12
15
  $affiliate-card-link-text-font-weight: $font-weight-normal !default;
13
16
  $affiliate-card-link-transition: $affiliate-card-transition !default;
14
17
 
15
- $affiliate-card-menu-button-background-color-hover: theme-color("primary") !default;
18
+ $affiliate-card-menu-button-background-color-hover: theme-color(
19
+ "primary"
20
+ ) !default;
16
21
  $affiliate-card-menu-button-border-radius: $border-radius !default;
17
22
  $affiliate-card-menu-button-box-shadow-focus: $affiliate-card-box-shadow-focus !default;
18
- $affiliate-card-menu-button-icon-color: adjust-color(theme-color("primary"), $alpha: -1/3) !default;
23
+ $affiliate-card-menu-button-icon-color: adjust-color(
24
+ theme-color("primary"),
25
+ $alpha: -1/3
26
+ ) !default;
19
27
  $affiliate-card-menu-button-icon-color-hover: $affiliate-card-background-color !default;
20
- $affiliate-card-menu-button-icon-color-container-hover: adjust-color(theme-color("primary"), $alpha: -1 / 12) !default;
28
+ $affiliate-card-menu-button-icon-color-container-hover: adjust-color(
29
+ theme-color("primary"),
30
+ $alpha: -1 / 12
31
+ ) !default;
21
32
  $affiliate-card-menu-button-icon-size: sp(4) !default;
22
33
  $affiliate-card-menu-button-inset: sp(2) !default;
23
34
  $affiliate-card-menu-button-size: sp(8) !default;
@@ -139,12 +150,14 @@ $affiliate-card-menu-icon-size: sp(3.5) !default;
139
150
  }
140
151
  }
141
152
 
142
- .affiliate-card-popover {
153
+ .affiliate-card-popover,
154
+ #event-product-set-popover {
143
155
  border-radius: $affiliate-card-popover-border-radius;
144
156
  border: none;
145
157
  filter: $affiliate-card-popover-box-shadow-filter;
146
158
 
147
- .affiliate-card-menu {
159
+ .affiliate-card-menu,
160
+ .event-product-set-card {
148
161
  padding: $affiliate-card-menu-padding-x $affiliate-card-menu-padding-y;
149
162
  border-radius: $affiliate-card-popover-border-radius;
150
163
 
@@ -175,5 +188,12 @@ $affiliate-card-menu-icon-size: sp(3.5) !default;
175
188
  }
176
189
  }
177
190
 
191
+ #event-product-set-popover {
192
+ .event-product-set-card {
193
+ padding-left: 1rem;
194
+ padding-right: 1rem;
195
+ }
196
+ }
197
+
178
198
  $snippet-template-card-background-color: color("red") !default;
179
199
  $snippet-template-card-border: 1px solid red;