@licklist/design 0.58.3-dev.5 → 0.58.3-dev.7

package/dist/iframe/payment/order-items-table/utils/paymentSummary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paymentSummary.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/payment/order-items-table/utils/paymentSummary.tsx"],"names":[],"mappings":"AACA,OAAO,EAGL,oBAAoB,EAEpB,WAAW,EAEZ,MAAM,UAAU,CAAC;AA8FlB,eAAO,MAAM,oBAAoB,oEAK9B,oBAAoB,KAAG,WAAW,EAUpC,CAAC"}
+{"version":3,"file":"paymentSummary.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/payment/order-items-table/utils/paymentSummary.tsx"],"names":[],"mappings":"AACA,OAAO,EAGL,oBAAoB,EAEpB,WAAW,EAEZ,MAAM,UAAU,CAAC;AAmGlB,eAAO,MAAM,oBAAoB,oEAK9B,oBAAoB,KAAG,WAAW,EAUpC,CAAC"}

package/dist/iframe/payment/order-items-table/utils/paymentSummary.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("tslib"),t=require("./index.js"),r=require("../types/index.js"),a=require("../hooks/useTableData.js");exports.getOrderSummaryItems=function(n){var s=n.order,_=n.externalDiscount,l=n.paymentDetail;return n.isPaymentProcessed?function(n){var s=n.order,_=n.paymentDetail,l=_&&!s.payments.length?t.getExternalPaymentDetail(_):Object.keys(a.PAYMENT_TYPE_TRANSLATE_KEYS).map((function(e){return{translateKey:a.PAYMENT_TYPE_TRANSLATE_KEYS[e],price:t.getPaymentValueByType(s.payments,e)}})),i=t.calculateTotalPrice(s,l),u=t.calculateTotalDiscount(s.payments),y=i-Number(u),p=[{translateKey:r.AMOUNT_TOTAL,price:i}];return u&&p.push({translateKey:r.AMOUNT_WITH_DISCOUNT,price:y<0?0:y}),_&&!s.payments.length?e.__spreadArray(e.__spreadArray([],e.__read(p),!1),e.__read(l),!1):(p.push({translateKey:r.TOTAL_PAID,price:y<=0?0:s.totalAmount}),y<=0||(p=e.__spreadArray(e.__spreadArray([],e.__read(p),!1),e.__read(l),!1),y>s.totalAmount&&p.push({translateKey:r.REMAINING_TO_PAY,price:y-s.totalAmount})),p)}({order:s,paymentDetail:l}):function(a){var n=a.order,s=a.externalDiscount,_=a.paymentDetail,l=_?t.getExternalPaymentDetail(_):void 0,i=t.calculateTotalPrice(n,l),u=[{translateKey:r.AMOUNT_TOTAL,price:i}];return s&&u.push({price:s,translateKey:r.AMOUNT_WITH_DISCOUNT}),l?e.__spreadArray(e.__spreadArray([],e.__read(u),!1),e.__read(t.getExternalPaymentDetail(_)),!1):u}({order:s,externalDiscount:_,paymentDetail:l})};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("tslib"),t=require("./index.js"),r=require("../types/index.js"),a=require("../hooks/useTableData.js");exports.getOrderSummaryItems=function(n){var s=n.order,_=n.externalDiscount,l=n.paymentDetail;return n.isPaymentProcessed?function(n){var s=n.order,_=n.paymentDetail,l=_&&!s.payments.length?t.getExternalPaymentDetail(_):Object.keys(a.PAYMENT_TYPE_TRANSLATE_KEYS).map((function(e){return{translateKey:a.PAYMENT_TYPE_TRANSLATE_KEYS[e],price:t.getPaymentValueByType(s.payments,e)}})),i=t.calculateTotalPrice(s,l),u=t.calculateTotalDiscount(s.payments),o=s.orderPayments.reduce((function(e,t){return e+t.amount+t.discountAmount}),0),y=[{translateKey:r.AMOUNT_TOTAL,price:i}];return u&&y.push({translateKey:r.AMOUNT_WITH_DISCOUNT,price:o<0?0:o}),_&&!s.payments.length?e.__spreadArray(e.__spreadArray([],e.__read(y),!1),e.__read(l),!1):(y.push({translateKey:r.TOTAL_PAID,price:o<=0?0:s.totalAmount}),o<=0||(y=e.__spreadArray(e.__spreadArray([],e.__read(y),!1),e.__read(l),!1),o>s.totalAmount&&y.push({translateKey:r.REMAINING_TO_PAY,price:o-s.totalAmount})),y)}({order:s,paymentDetail:l}):function(a){var n=a.order,s=a.externalDiscount,_=a.paymentDetail,l=_?t.getExternalPaymentDetail(_):void 0,i=t.calculateTotalPrice(n,l),u=[{translateKey:r.AMOUNT_TOTAL,price:i}];return s&&u.push({price:s,translateKey:r.AMOUNT_WITH_DISCOUNT}),l?e.__spreadArray(e.__spreadArray([],e.__read(u),!1),e.__read(t.getExternalPaymentDetail(_)),!1):u}({order:s,externalDiscount:_,paymentDetail:l})};

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,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;AAEF,eAAO,MAAM,UAAU,oDAKpB,eAAe,gBA+FjB,CAAC"}
+{"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;AAO1E,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;AAEF,eAAO,MAAM,UAAU,oDAKpB,eAAe,gBA2FjB,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"),c=require("react-intl"),u=require("@licklist/core/dist/DataMapper/Order/OrderDataMapper"),s=require("../../../../iframe/payment/order-items-table/utils/index.js"),o=require("@licklist/plugins/dist/utils/formatDate"),m=require("@licklist/plugins/dist/utils/sourceTitle");exports.ResultCard=function(e){var d,p,E,f=e.order,v=e.className,y=e.staffMember,N=e.onCardClick,q=l.useTranslation("Design").t,D=c.useIntl().formatNumber,g=f.id,C=f.people,O=f.user,T=f.status,b=f.startDate,x=f.products,M=f.source,k=f.totalAmount,A=f.event,h=f.menu,j=f.remainingToPay,I=f.payments,R=s.calculateTotalDiscount(I),_=(null===(d=x.map((function(e){return e.name})))||void 0===d?void 0:d.join(", "))||"",P=(null==A?void 0:A.name)||(null==h?void 0:h.name)||"",S=k-R,F=function(){N&&N(g)};return t.createElement("div",{className:n("result-card",v),onClick:F,onKeyUp:F,role:"button",tabIndex:0},t.createElement("div",{className:"card-content"},t.createElement("div",{className:"order-id"},g),t.createElement("div",{className:"order-people"},t.createElement(a.default,{type:"user",width:"10",height:"11"}),C),t.createElement("div",{className:"order-description"},t.createElement("p",{className:"name"},O.firstName," ",O.lastName),O.email&&t.createElement("p",null,O.email),(null===(p=O.userDetail)||void 0===p?void 0:p.phone)&&t.createElement("p",null,null===(E=O.userDetail)||void 0===E?void 0:E.phone),t.createElement("p",null,"------"),t.createElement("p",null,q("activity"),": ",P," "),M===u.ORDER_SOURCE_MANUAL&&y&&t.createElement("p",null,q("staff"),": ","".concat(y.firstName," ").concat(y.lastName)),t.createElement("p",null,q("status"),": ",q(T)),t.createElement("p",null,q("date"),": ",o.formatDateStringForEvent(b,!1)),t.createElement("p",null,q("time"),": ",i.DateTime.fromISO(b).toFormat(r.TIME_FORMAT)),t.createElement("p",{className:"products",title:_},q("products"),": ",_),!!j&&t.createElement("p",null,q("remainingAmount"),":"," ",D(j,{style:"currency",currency:r.Currency.GBP})),t.createElement("p",null,q("paidAmount"),":"," ",D(S,{style:"currency",currency:r.Currency.GBP})),t.createElement("p",null,q("source"),": ",q(m.getOrderSourceTitle(M))))))};
+"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))))))};

package/package.json

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

package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx

@@ -63,7 +63,12 @@ const processedPaymentSummary = ({
   const total = calculateTotalPrice(order, externalPaymentDetail);
 
   const totalDiscount = calculateTotalDiscount(order.payments);
-  const totalWithDiscount = total - Number(totalDiscount);
+
+  const totalWithDiscount = order.orderPayments.reduce(
+    (acc, payment) => acc + payment.amount + payment.discountAmount,
+    0
+  );
+
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,

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

@@ -12,7 +12,6 @@ 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 { calculateTotalDiscount } from "../../../../iframe/payment/order-items-table/utils";
 import Icon from "../../../../static/Icon";
 
 export type ResultCardProps = {
@@ -43,14 +42,10 @@ export const ResultCard = ({
     event,
     menu,
     remainingToPay,
-    payments,
   } = order;
 
-  const discount = calculateTotalDiscount(payments);
-
   const productList = products.map((product) => product.name)?.join(", ") || "";
   const activityName = event?.name || menu?.name || "";
-  const totalAmountWithDiscount = totalAmount - discount;
 
   const onClick = () => {
     if (!onCardClick) return;
@@ -110,7 +105,7 @@ export const ResultCard = ({
           )}
           <p>
             {t("paidAmount")}:{" "}
-            {formatNumber(totalAmountWithDiscount, {
+            {formatNumber(totalAmount, {
               style: "currency",
               currency: Config.Currency.GBP,
             })}