@licklist/design 0.58.3-dev.4 → 0.58.3-dev.6

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 (7) hide show
  1. package/dist/iframe/payment/order-items-table/utils/paymentSummary.d.ts.map +1 -1
  2. package/dist/iframe/payment/order-items-table/utils/paymentSummary.js +1 -1
  3. package/dist/product-set/form/ProductSetForm.d.ts +4 -1
  4. package/dist/product-set/form/ProductSetForm.d.ts.map +1 -1
  5. package/package.json +1 -1
  6. package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx +6 -1
  7. package/src/product-set/form/ProductSetForm.tsx +5 -1
package/dist/iframe/payment/order-items-table/utils/paymentSummary.d.ts.map CHANGED
@@ -1 +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"}
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;AAmGlB,eAAO,MAAM,oBAAoB,oEAK9B,oBAAoB,KAAG,WAAW,EAUpC,CAAC"}
package/dist/iframe/payment/order-items-table/utils/paymentSummary.js CHANGED
@@ -1 +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})};
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),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/product-set/form/ProductSetForm.d.ts CHANGED
@@ -11,10 +11,13 @@ import { SelectItem } from "../../types/generic/SelectItem";
11
11
  export interface WithIsLoading {
12
12
  isLoading: boolean;
13
13
  }
14
+ export interface WithIdOptional {
15
+ id?: number;
16
+ }
14
17
  export interface WithId {
15
18
  id: number;
16
19
  }
17
- export interface ProductSetFormValues extends FormValues, WithId, ProductSetControlValues {
20
+ export interface ProductSetFormValues extends FormValues, WithIdOptional, ProductSetControlValues {
18
21
  steps: Step[];
19
22
  }
20
23
  export interface ProductSetFormProps extends WithIsLoading, ProductSetControlShared {
package/dist/product-set/form/ProductSetForm.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProductSetForm.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/ProductSetForm.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,8DAA8D,CAAC;AAI1F,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAK5E,OAAO,EAAE,gCAAgC,EAAE,MAAM,oFAAoF,CAAC;AACtI,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAEtF,OAAO,EAEL,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,CAAC;CACpB;AACD,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;CACZ;AACD,MAAM,WAAW,oBACf,SAAQ,UAAU,EAChB,MAAM,EACN,uBAAuB;IACzB,KAAK,EAAE,IAAI,EAAE,CAAC;CACf;AAED,MAAM,WAAW,mBACf,SAAQ,aAAa,EACnB,uBAAuB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,mBAAmB,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC5D,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC5D,gBAAgB,CAAC,EAAE,UAAU,EAAE,CAAC;IAChC,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7B,4BAA4B,CAAC,EAAE,gCAAgC,CAAC,sBAAsB,CAAC,CAAC;IACxF,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,wBAAgB,cAAc,CAAC,EAC7B,WAAW,EACX,SAAS,EACT,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EACZ,cAAsB,EACtB,YAAiB,EACjB,4BAA4B,EAC5B,KAAK,EACL,cAAc,EACd,SAAS,EACT,GAAG,MAAM,EACV,EAAE,mBAAmB,eAqIrB"}
1
+ {"version":3,"file":"ProductSetForm.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/ProductSetForm.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,8DAA8D,CAAC;AAI1F,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAK5E,OAAO,EAAE,gCAAgC,EAAE,MAAM,oFAAoF,CAAC;AACtI,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAEtF,OAAO,EAEL,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,CAAC;CACpB;AACD,MAAM,WAAW,cAAc;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;CACZ;AACD,MAAM,WAAW,oBACf,SAAQ,UAAU,EAChB,cAAc,EACd,uBAAuB;IACzB,KAAK,EAAE,IAAI,EAAE,CAAC;CACf;AAED,MAAM,WAAW,mBACf,SAAQ,aAAa,EACnB,uBAAuB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,mBAAmB,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC5D,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC5D,gBAAgB,CAAC,EAAE,UAAU,EAAE,CAAC;IAChC,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7B,4BAA4B,CAAC,EAAE,gCAAgC,CAAC,sBAAsB,CAAC,CAAC;IACxF,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,wBAAgB,cAAc,CAAC,EAC7B,WAAW,EACX,SAAS,EACT,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EACZ,cAAsB,EACtB,YAAiB,EACjB,4BAA4B,EAC5B,KAAK,EACL,cAAc,EACd,SAAS,EACT,GAAG,MAAM,EACV,EAAE,mBAAmB,eAqIrB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@licklist/design",
3
- "version": "0.58.3-dev.4",
3
+ "version": "0.58.3-dev.6",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx CHANGED
@@ -63,7 +63,12 @@ const processedPaymentSummary = ({
63
63
  const total = calculateTotalPrice(order, externalPaymentDetail);
64
64
 
65
65
  const totalDiscount = calculateTotalDiscount(order.payments);
66
- const totalWithDiscount = total - Number(totalDiscount);
66
+
67
+ const totalWithDiscount = order.orderPayments.reduce(
68
+ (acc, payment) => acc + payment.amount + payment.discountAmount,
69
+ 0
70
+ );
71
+
67
72
  let summaryItems: SummaryItem[] = [
68
73
  {
69
74
  translateKey: AMOUNT_TOTAL,
package/src/product-set/form/ProductSetForm.tsx CHANGED
@@ -26,12 +26,16 @@ import { checkAvailableTimesErrors, getFilteredTemplates } from "../utils";
26
26
  export interface WithIsLoading {
27
27
  isLoading: boolean;
28
28
  }
29
+ export interface WithIdOptional {
30
+ id?: number;
31
+ }
32
+
29
33
  export interface WithId {
30
34
  id: number;
31
35
  }
32
36
  export interface ProductSetFormValues
33
37
  extends FormValues,
34
- WithId,
38
+ WithIdOptional,
35
39
  ProductSetControlValues {
36
40
  steps: Step[];
37
41
  }