@unchainedshop/plugins 2.4.3 → 2.5.0

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 (16) hide show
  1. package/lib/pricing/order-delivery.js +3 -4
  2. package/lib/pricing/order-delivery.js.map +1 -1
  3. package/lib/pricing/order-discount.js +13 -20
  4. package/lib/pricing/order-discount.js.map +1 -1
  5. package/lib/pricing/order-items-discount.js +7 -16
  6. package/lib/pricing/order-items-discount.js.map +1 -1
  7. package/lib/pricing/order-items.js +2 -5
  8. package/lib/pricing/order-items.js.map +1 -1
  9. package/lib/pricing/order-payment.js +3 -4
  10. package/lib/pricing/order-payment.js.map +1 -1
  11. package/package.json +19 -19
  12. package/src/pricing/order-delivery.ts +3 -4
  13. package/src/pricing/order-discount.ts +13 -20
  14. package/src/pricing/order-items-discount.ts +7 -16
  15. package/src/pricing/order-items.ts +2 -6
  16. package/src/pricing/order-payment.ts +3 -4
package/lib/pricing/order-delivery.js CHANGED
@@ -20,10 +20,9 @@ export const OrderDelivery = {
20
20
  const pricing = modules.orders.deliveries.pricingSheet(orderDelivery, order.currency, params.context);
21
21
  const tax = pricing.taxSum();
22
22
  const shipping = pricing.gross();
23
- pricingAdapter.resultSheet().addDelivery({ amount: shipping });
24
- if (tax !== 0) {
25
- pricingAdapter.resultSheet().addTax({ amount: tax });
26
- }
23
+ pricingAdapter
24
+ .resultSheet()
25
+ .addDelivery({ amount: shipping, taxAmount: tax, meta: { adapter: OrderDelivery.key } });
27
26
  return pricingAdapter.calculate();
28
27
  },
29
28
  };
package/lib/pricing/order-delivery.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"order-delivery.js","sourceRoot":"","sources":["../../src/pricing/order-delivery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,MAAM,CAAC,MAAM,aAAa,GAAyB;IACjD,GAAG,mBAAmB;IAEtB,GAAG,EAAE,uCAAuC;IAC5C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,4BAA4B;IACnC,UAAU,EAAE,EAAE;IAEd,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAEzD,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,4CAA4C;gBAC5C,IAAI,CAAC,aAAa;oBAAE,OAAO,IAAI,CAAC;gBAChC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CACpD,aAAa,EACb,KAAK,CAAC,QAAQ,EACd,MAAM,CAAC,OAAO,CACf,CAAC;gBACF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;gBAEjC,cAAc,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC/D,IAAI,GAAG,KAAK,CAAC,EAAE;oBACb,cAAc,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;iBACtD;gBAED,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,oBAAoB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC"}
1
+ {"version":3,"file":"order-delivery.js","sourceRoot":"","sources":["../../src/pricing/order-delivery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,MAAM,CAAC,MAAM,aAAa,GAAyB;IACjD,GAAG,mBAAmB;IAEtB,GAAG,EAAE,uCAAuC;IAC5C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,4BAA4B;IACnC,UAAU,EAAE,EAAE;IAEd,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAEzD,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,4CAA4C;gBAC5C,IAAI,CAAC,aAAa;oBAAE,OAAO,IAAI,CAAC;gBAChC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CACpD,aAAa,EACb,KAAK,CAAC,QAAQ,EACd,MAAM,CAAC,OAAO,CACf,CAAC;gBACF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;gBAEjC,cAAc;qBACX,WAAW,EAAE;qBACb,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAE3F,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,oBAAoB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC"}
package/lib/pricing/order-discount.js CHANGED
@@ -19,15 +19,18 @@ export const OrderDiscount = {
19
19
  // discounts need to provide a *fixedRate*
20
20
  // if you want to add percentual discounts,
21
21
  // add it to the order item calculation
22
- const totalAmountOfItems = params.calculationSheet.sum({
22
+ const totalAmountOfItems = params.calculationSheet.total({
23
23
  category: OrderPricingRowCategory.Items,
24
- });
25
- const totalAmountOfPaymentAndDelivery = params.calculationSheet.sum({
24
+ useNetPrice: false,
25
+ }).amount;
26
+ const totalAmountOfPaymentAndDelivery = params.calculationSheet.total({
26
27
  category: OrderPricingRowCategory.Payment,
27
- }) +
28
- params.calculationSheet.sum({
28
+ useNetPrice: false,
29
+ }).amount +
30
+ params.calculationSheet.total({
29
31
  category: OrderPricingRowCategory.Delivery,
30
- });
32
+ useNetPrice: false,
33
+ }).amount;
31
34
  const itemShares = orderPositions.map((orderPosition) => calcUtils.resolveRatioAndTaxDivisorForPricingSheet(modules.orders.positions.pricingSheet(orderPosition, order.currency, params.context), totalAmountOfItems));
32
35
  const deliveryShare = calcUtils.resolveRatioAndTaxDivisorForPricingSheet(orderDelivery &&
33
36
  modules.orders.deliveries.pricingSheet(orderDelivery, order.currency, params.context), totalAmountOfPaymentAndDelivery);
@@ -46,27 +49,17 @@ export const OrderDiscount = {
46
49
  const [deliveryAndPaymentDiscountAmount, deliveryAndPaymentTaxAmount] = calcUtils.applyDiscountToMultipleShares([deliveryShare, paymentShare], Math.max(0, Math.min(amountLeft, leftInFeesToSplit)));
47
50
  amountLeft -= deliveryAndPaymentDiscountAmount;
48
51
  alreadyDeducted += itemsDiscountAmount;
49
- const discountAmount = itemsDiscountAmount + deliveryAndPaymentDiscountAmount;
50
- const taxAmount = itemsTaxAmount + deliveryAndPaymentTaxAmount;
52
+ const discountAmount = (itemsDiscountAmount + deliveryAndPaymentDiscountAmount) * -1;
53
+ const taxAmount = (itemsTaxAmount + deliveryAndPaymentTaxAmount) * -1;
51
54
  if (discountAmount) {
52
55
  pricingAdapter.resultSheet().addDiscount({
53
- amount: discountAmount * -1,
56
+ amount: discountAmount,
57
+ taxAmount,
54
58
  discountId,
55
- isTaxable: false,
56
- isNetPrice: false,
57
59
  meta: {
58
60
  adapter: OrderDiscount.key,
59
61
  },
60
62
  });
61
- if (taxAmount !== 0) {
62
- pricingAdapter.resultSheet().addTax({
63
- amount: taxAmount * -1,
64
- meta: {
65
- discountId,
66
- adapter: OrderDiscount.key,
67
- },
68
- });
69
- }
70
63
  }
71
64
  });
72
65
  return pricingAdapter.calculate();
package/lib/pricing/order-discount.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"order-discount.js","sourceRoot":"","sources":["../../src/pricing/order-discount.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"order-discount.js","sourceRoot":"","sources":["../../src/pricing/order-discount.ts"],"names":[],"mappings":"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"}
package/lib/pricing/order-items-discount.js CHANGED
@@ -19,36 +19,27 @@ const OrderItemsDiscount = {
19
19
  // discounts need to provide a *fixedRate*
20
20
  // if you want to add percentual discounts,
21
21
  // add it to the order item calculation
22
- const totalAmountOfItems = params.calculationSheet.sum({
22
+ const totalAmountOfItems = params.calculationSheet.total({
23
23
  category: OrderPricingRowCategory.Items,
24
- });
24
+ useNetPrice: false,
25
+ }).amount;
25
26
  const itemShares = orderPositions.map((orderPosition) => calcUtils.resolveRatioAndTaxDivisorForPricingSheet(modules.orders.positions.pricingSheet(orderPosition, order.currency, params.context), totalAmountOfItems));
26
27
  let alreadyDeducted = 0;
27
28
  params.discounts.forEach(({ configuration, discountId }) => {
28
29
  // First, we deduce the discount from the items
29
30
  const [itemsDiscountAmount, itemsTaxAmount] = calcUtils.applyDiscountToMultipleShares(itemShares, calcUtils.calculateAmountToSplit({ ...configuration, alreadyDeducted }, totalAmountOfItems));
30
31
  alreadyDeducted = +itemsDiscountAmount;
31
- const discountAmount = itemsDiscountAmount;
32
- const taxAmount = itemsTaxAmount;
32
+ const discountAmount = itemsDiscountAmount * -1;
33
+ const taxAmount = itemsTaxAmount * -1;
33
34
  if (discountAmount) {
34
35
  pricingAdapter.resultSheet().addDiscount({
35
- amount: discountAmount * -1,
36
+ amount: discountAmount,
37
+ taxAmount,
36
38
  discountId,
37
- isTaxable: false,
38
- isNetPrice: false,
39
39
  meta: {
40
40
  adapter: OrderItemsDiscount.key,
41
41
  },
42
42
  });
43
- if (taxAmount !== 0) {
44
- pricingAdapter.resultSheet().addTax({
45
- amount: taxAmount * -1,
46
- meta: {
47
- discountId,
48
- adapter: OrderItemsDiscount.key,
49
- },
50
- });
51
- }
52
43
  }
53
44
  });
54
45
  return pricingAdapter.calculate();
package/lib/pricing/order-items-discount.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"order-items-discount.js","sourceRoot":"","sources":["../../src/pricing/order-items-discount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACvG,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAE,WAAW,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,kBAAkB,GAAyB;IAC/C,GAAG,mBAAmB;IAEtB,GAAG,EAAE,6CAA6C;IAClD,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,yCAAyC;IAChD,UAAU,EAAE,EAAE;IAEd,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAE1D,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,0CAA0C;gBAC1C,2CAA2C;gBAC3C,uCAAuC;gBAEvC,MAAM,kBAAkB,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC;oBACrD,QAAQ,EAAE,uBAAuB,CAAC,KAAK;iBACxC,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CACtD,SAAS,CAAC,wCAAwC,CAChD,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,EACpF,kBAAkB,CACnB,CACF,CAAC;gBAEF,IAAI,eAAe,GAAG,CAAC,CAAC;gBAExB,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,EAAE,EAAE;oBACzD,+CAA+C;oBAC/C,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAAC,GAAG,SAAS,CAAC,6BAA6B,CACnF,UAAU,EACV,SAAS,CAAC,sBAAsB,CAAC,EAAE,GAAG,aAAa,EAAE,eAAe,EAAE,EAAE,kBAAkB,CAAC,CAC5F,CAAC;oBACF,eAAe,GAAG,CAAC,mBAAmB,CAAC;oBAEvC,MAAM,cAAc,GAAG,mBAAmB,CAAC;oBAC3C,MAAM,SAAS,GAAG,cAAc,CAAC;oBACjC,IAAI,cAAc,EAAE;wBAClB,cAAc,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC;4BACvC,MAAM,EAAE,cAAc,GAAG,CAAC,CAAC;4BAC3B,UAAU;4BACV,SAAS,EAAE,KAAK;4BAChB,UAAU,EAAE,KAAK;4BACjB,IAAI,EAAE;gCACJ,OAAO,EAAE,kBAAkB,CAAC,GAAG;6BAChC;yBACF,CAAC,CAAC;wBACH,IAAI,SAAS,KAAK,CAAC,EAAE;4BACnB,cAAc,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;gCAClC,MAAM,EAAE,SAAS,GAAG,CAAC,CAAC;gCACtB,IAAI,EAAE;oCACJ,UAAU;oCACV,OAAO,EAAE,kBAAkB,CAAC,GAAG;iCAChC;6BACF,CAAC,CAAC;yBACJ;qBACF;gBACH,CAAC,CAAC,CAAC;gBAEH,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,oBAAoB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC"}
1
+ {"version":3,"file":"order-items-discount.js","sourceRoot":"","sources":["../../src/pricing/order-items-discount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACvG,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAE,WAAW,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,kBAAkB,GAAyB;IAC/C,GAAG,mBAAmB;IAEtB,GAAG,EAAE,6CAA6C;IAClD,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,yCAAyC;IAChD,UAAU,EAAE,EAAE;IAEd,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAE1D,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,0CAA0C;gBAC1C,2CAA2C;gBAC3C,uCAAuC;gBAEvC,MAAM,kBAAkB,GAAG,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;oBACvD,QAAQ,EAAE,uBAAuB,CAAC,KAAK;oBACvC,WAAW,EAAE,KAAK;iBACnB,CAAC,CAAC,MAAM,CAAC;gBAEV,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CACtD,SAAS,CAAC,wCAAwC,CAChD,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,EACpF,kBAAkB,CACnB,CACF,CAAC;gBAEF,IAAI,eAAe,GAAG,CAAC,CAAC;gBAExB,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,EAAE,EAAE;oBACzD,+CAA+C;oBAC/C,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAAC,GAAG,SAAS,CAAC,6BAA6B,CACnF,UAAU,EACV,SAAS,CAAC,sBAAsB,CAAC,EAAE,GAAG,aAAa,EAAE,eAAe,EAAE,EAAE,kBAAkB,CAAC,CAC5F,CAAC;oBACF,eAAe,GAAG,CAAC,mBAAmB,CAAC;oBAEvC,MAAM,cAAc,GAAG,mBAAmB,GAAG,CAAC,CAAC,CAAC;oBAChD,MAAM,SAAS,GAAG,cAAc,GAAG,CAAC,CAAC,CAAC;oBACtC,IAAI,cAAc,EAAE;wBAClB,cAAc,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC;4BACvC,MAAM,EAAE,cAAc;4BACtB,SAAS;4BACT,UAAU;4BACV,IAAI,EAAE;gCACJ,OAAO,EAAE,kBAAkB,CAAC,GAAG;6BAChC;yBACF,CAAC,CAAC;qBACJ;gBACH,CAAC,CAAC,CAAC;gBAEH,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,oBAAoB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC"}
package/lib/pricing/order-items.js CHANGED
@@ -29,12 +29,9 @@ const OrderItems = {
29
29
  });
30
30
  pricingAdapter.resultSheet().addItems({
31
31
  amount: totalAndTaxesOfAllItems.items,
32
+ taxAmount: totalAndTaxesOfAllItems.taxes,
33
+ meta: { adapter: OrderItems.key },
32
34
  });
33
- if (totalAndTaxesOfAllItems.taxes !== 0) {
34
- pricingAdapter.resultSheet().addTax({
35
- amount: totalAndTaxesOfAllItems.taxes,
36
- });
37
- }
38
35
  return pricingAdapter.calculate();
39
36
  },
40
37
  };
package/lib/pricing/order-items.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"order-items.js","sourceRoot":"","sources":["../../src/pricing/order-items.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,MAAM,UAAU,GAAyB;IACvC,GAAG,mBAAmB;IAEtB,GAAG,EAAE,oCAAoC;IACzC,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,mCAAmC;IAC1C,UAAU,EAAE,CAAC;IAEb,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAE1D,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,sDAAsD;gBACtD,MAAM,uBAAuB,GAAG,cAAc,CAAC,MAAM,CACnD,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE;oBACzB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CACnD,aAAa,EACb,KAAK,CAAC,QAAQ,EACd,MAAM,CAAC,OAAO,CACf,CAAC;oBACF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;oBAC9B,OAAO;wBACL,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,GAAG;wBAC1B,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,KAAK;qBAC7B,CAAC;gBACJ,CAAC,EACD;oBACE,KAAK,EAAE,CAAC;oBACR,KAAK,EAAE,CAAC;iBACT,CACF,CAAC;gBAEF,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;oBACpC,MAAM,EAAE,uBAAuB,CAAC,KAAK;iBACtC,CAAC,CAAC;gBAEH,IAAI,uBAAuB,CAAC,KAAK,KAAK,CAAC,EAAE;oBACvC,cAAc,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;wBAClC,MAAM,EAAE,uBAAuB,CAAC,KAAK;qBACtC,CAAC,CAAC;iBACJ;gBAED,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,oBAAoB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC"}
1
+ {"version":3,"file":"order-items.js","sourceRoot":"","sources":["../../src/pricing/order-items.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,MAAM,UAAU,GAAyB;IACvC,GAAG,mBAAmB;IAEtB,GAAG,EAAE,oCAAoC;IACzC,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,mCAAmC;IAC1C,UAAU,EAAE,CAAC;IAEb,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAE1D,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,sDAAsD;gBACtD,MAAM,uBAAuB,GAAG,cAAc,CAAC,MAAM,CACnD,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE;oBACzB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CACnD,aAAa,EACb,KAAK,CAAC,QAAQ,EACd,MAAM,CAAC,OAAO,CACf,CAAC;oBACF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;oBAC9B,OAAO;wBACL,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,GAAG;wBAC1B,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,KAAK;qBAC7B,CAAC;gBACJ,CAAC,EACD;oBACE,KAAK,EAAE,CAAC;oBACR,KAAK,EAAE,CAAC;iBACT,CACF,CAAC;gBAEF,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;oBACpC,MAAM,EAAE,uBAAuB,CAAC,KAAK;oBACrC,SAAS,EAAE,uBAAuB,CAAC,KAAK;oBACxC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,GAAG,EAAE;iBAClC,CAAC,CAAC;gBAEH,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,oBAAoB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC"}
package/lib/pricing/order-payment.js CHANGED
@@ -20,10 +20,9 @@ const OrderPayment = {
20
20
  const pricing = modules.orders.payments.pricingSheet(orderPayment, order.currency, params.context);
21
21
  const tax = pricing.taxSum();
22
22
  const paymentFees = pricing.gross();
23
- pricingAdapter.resultSheet().addPayment({ amount: paymentFees });
24
- if (tax !== 0) {
25
- pricingAdapter.resultSheet().addTax({ amount: tax });
26
- }
23
+ pricingAdapter
24
+ .resultSheet()
25
+ .addPayment({ amount: paymentFees, taxAmount: tax, meta: { adapter: OrderPayment.key } });
27
26
  return pricingAdapter.calculate();
28
27
  },
29
28
  };
package/lib/pricing/order-payment.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"order-payment.js","sourceRoot":"","sources":["../../src/pricing/order-payment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,MAAM,YAAY,GAAyB;IACzC,GAAG,mBAAmB;IAEtB,GAAG,EAAE,sCAAsC;IAC3C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,2BAA2B;IAClC,UAAU,EAAE,EAAE;IAEd,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAExD,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,4CAA4C;gBAC5C,IAAI,CAAC,YAAY;oBAAE,OAAO,IAAI,CAAC;gBAE/B,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAClD,YAAY,EACZ,KAAK,CAAC,QAAQ,EACd,MAAM,CAAC,OAAO,CACf,CAAC;gBACF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;gBAEpC,cAAc,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;gBACjE,IAAI,GAAG,KAAK,CAAC,EAAE;oBACb,cAAc,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;iBACtD;gBAED,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,oBAAoB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC"}
1
+ {"version":3,"file":"order-payment.js","sourceRoot":"","sources":["../../src/pricing/order-payment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,MAAM,YAAY,GAAyB;IACzC,GAAG,mBAAmB;IAEtB,GAAG,EAAE,sCAAsC;IAC3C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,2BAA2B;IAClC,UAAU,EAAE,EAAE;IAEd,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAExD,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,4CAA4C;gBAC5C,IAAI,CAAC,YAAY;oBAAE,OAAO,IAAI,CAAC;gBAE/B,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAClD,YAAY,EACZ,KAAK,CAAC,QAAQ,EACd,MAAM,CAAC,OAAO,CACf,CAAC;gBACF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;gBAEpC,cAAc;qBACX,WAAW,EAAE;qBACb,UAAU,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAE5F,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,oBAAoB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/plugins",
3
- "version": "2.4.3",
3
+ "version": "2.5.0",
4
4
  "main": "lib/plugins-index.js",
5
5
  "types": "lib/plugins-index.d.ts",
6
6
  "exports": {
@@ -78,29 +78,29 @@
78
78
  "ethers": "^6.7.1",
79
79
  "express": "^4.18.2",
80
80
  "mongodb": "^4.0.0",
81
- "stripe": "^13.4.0",
81
+ "stripe": "^13.5.0",
82
82
  "tiny-secp256k1": "^2.2.3",
83
83
  "web-push": "^3.6.3"
84
84
  },
85
85
  "devDependencies": {
86
86
  "@redis/client": "^1.5.9",
87
- "@types/node": "^18.17.14",
88
- "@unchainedshop/api": "^2.4.3",
89
- "@unchainedshop/core-delivery": "^2.4.3",
90
- "@unchainedshop/core-enrollments": "^2.4.3",
91
- "@unchainedshop/core-filters": "^2.4.3",
92
- "@unchainedshop/core-messaging": "^2.4.3",
93
- "@unchainedshop/core-orders": "^2.4.3",
94
- "@unchainedshop/core-payment": "^2.4.3",
95
- "@unchainedshop/core-products": "^2.4.3",
96
- "@unchainedshop/core-quotations": "^2.4.3",
97
- "@unchainedshop/core-warehousing": "^2.4.3",
98
- "@unchainedshop/core-worker": "^2.4.3",
99
- "@unchainedshop/events": "^2.4.3",
100
- "@unchainedshop/file-upload": "^2.4.3",
101
- "@unchainedshop/logger": "^2.4.3",
102
- "@unchainedshop/types": "^2.4.3",
103
- "@unchainedshop/utils": "^2.4.3",
87
+ "@types/node": "^18.17.15",
88
+ "@unchainedshop/api": "^2.5.0",
89
+ "@unchainedshop/core-delivery": "^2.5.0",
90
+ "@unchainedshop/core-enrollments": "^2.5.0",
91
+ "@unchainedshop/core-filters": "^2.5.0",
92
+ "@unchainedshop/core-messaging": "^2.5.0",
93
+ "@unchainedshop/core-orders": "^2.5.0",
94
+ "@unchainedshop/core-payment": "^2.5.0",
95
+ "@unchainedshop/core-products": "^2.5.0",
96
+ "@unchainedshop/core-quotations": "^2.5.0",
97
+ "@unchainedshop/core-warehousing": "^2.5.0",
98
+ "@unchainedshop/core-worker": "^2.5.0",
99
+ "@unchainedshop/events": "^2.5.0",
100
+ "@unchainedshop/file-upload": "^2.5.0",
101
+ "@unchainedshop/logger": "^2.5.0",
102
+ "@unchainedshop/types": "^2.5.0",
103
+ "@unchainedshop/utils": "^2.5.0",
104
104
  "bluebird": "^3.7.2",
105
105
  "event-iterator": "^2.0.0",
106
106
  "express": "^4.18.2",
package/src/pricing/order-delivery.ts CHANGED
@@ -31,10 +31,9 @@ export const OrderDelivery: IOrderPricingAdapter = {
31
31
  const tax = pricing.taxSum();
32
32
  const shipping = pricing.gross();
33
33
 
34
- pricingAdapter.resultSheet().addDelivery({ amount: shipping });
35
- if (tax !== 0) {
36
- pricingAdapter.resultSheet().addTax({ amount: tax });
37
- }
34
+ pricingAdapter
35
+ .resultSheet()
36
+ .addDelivery({ amount: shipping, taxAmount: tax, meta: { adapter: OrderDelivery.key } });
38
37
 
39
38
  return pricingAdapter.calculate();
40
39
  },
package/src/pricing/order-discount.ts CHANGED
@@ -25,16 +25,19 @@ export const OrderDiscount: IOrderPricingAdapter = {
25
25
  // discounts need to provide a *fixedRate*
26
26
  // if you want to add percentual discounts,
27
27
  // add it to the order item calculation
28
- const totalAmountOfItems = params.calculationSheet.sum({
28
+ const totalAmountOfItems = params.calculationSheet.total({
29
29
  category: OrderPricingRowCategory.Items,
30
- });
30
+ useNetPrice: false,
31
+ }).amount;
31
32
  const totalAmountOfPaymentAndDelivery =
32
- params.calculationSheet.sum({
33
+ params.calculationSheet.total({
33
34
  category: OrderPricingRowCategory.Payment,
34
- }) +
35
- params.calculationSheet.sum({
35
+ useNetPrice: false,
36
+ }).amount +
37
+ params.calculationSheet.total({
36
38
  category: OrderPricingRowCategory.Delivery,
37
- });
39
+ useNetPrice: false,
40
+ }).amount;
38
41
 
39
42
  const itemShares = orderPositions.map((orderPosition) =>
40
43
  calcUtils.resolveRatioAndTaxDivisorForPricingSheet(
@@ -84,28 +87,18 @@ export const OrderDiscount: IOrderPricingAdapter = {
84
87
  amountLeft -= deliveryAndPaymentDiscountAmount;
85
88
  alreadyDeducted += itemsDiscountAmount;
86
89
 
87
- const discountAmount = itemsDiscountAmount + deliveryAndPaymentDiscountAmount;
88
- const taxAmount = itemsTaxAmount + deliveryAndPaymentTaxAmount;
90
+ const discountAmount = (itemsDiscountAmount + deliveryAndPaymentDiscountAmount) * -1;
91
+ const taxAmount = (itemsTaxAmount + deliveryAndPaymentTaxAmount) * -1;
89
92
 
90
93
  if (discountAmount) {
91
94
  pricingAdapter.resultSheet().addDiscount({
92
- amount: discountAmount * -1,
95
+ amount: discountAmount,
96
+ taxAmount,
93
97
  discountId,
94
- isTaxable: false,
95
- isNetPrice: false,
96
98
  meta: {
97
99
  adapter: OrderDiscount.key,
98
100
  },
99
101
  });
100
- if (taxAmount !== 0) {
101
- pricingAdapter.resultSheet().addTax({
102
- amount: taxAmount * -1,
103
- meta: {
104
- discountId,
105
- adapter: OrderDiscount.key,
106
- },
107
- });
108
- }
109
102
  }
110
103
  });
111
104
 
package/src/pricing/order-items-discount.ts CHANGED
@@ -26,9 +26,10 @@ const OrderItemsDiscount: IOrderPricingAdapter = {
26
26
  // if you want to add percentual discounts,
27
27
  // add it to the order item calculation
28
28
 
29
- const totalAmountOfItems = params.calculationSheet.sum({
29
+ const totalAmountOfItems = params.calculationSheet.total({
30
30
  category: OrderPricingRowCategory.Items,
31
- });
31
+ useNetPrice: false,
32
+ }).amount;
32
33
 
33
34
  const itemShares = orderPositions.map((orderPosition) =>
34
35
  calcUtils.resolveRatioAndTaxDivisorForPricingSheet(
@@ -47,27 +48,17 @@ const OrderItemsDiscount: IOrderPricingAdapter = {
47
48
  );
48
49
  alreadyDeducted = +itemsDiscountAmount;
49
50
 
50
- const discountAmount = itemsDiscountAmount;
51
- const taxAmount = itemsTaxAmount;
51
+ const discountAmount = itemsDiscountAmount * -1;
52
+ const taxAmount = itemsTaxAmount * -1;
52
53
  if (discountAmount) {
53
54
  pricingAdapter.resultSheet().addDiscount({
54
- amount: discountAmount * -1,
55
+ amount: discountAmount,
56
+ taxAmount,
55
57
  discountId,
56
- isTaxable: false,
57
- isNetPrice: false,
58
58
  meta: {
59
59
  adapter: OrderItemsDiscount.key,
60
60
  },
61
61
  });
62
- if (taxAmount !== 0) {
63
- pricingAdapter.resultSheet().addTax({
64
- amount: taxAmount * -1,
65
- meta: {
66
- discountId,
67
- adapter: OrderItemsDiscount.key,
68
- },
69
- });
70
- }
71
62
  }
72
63
  });
73
64
 
package/src/pricing/order-items.ts CHANGED
@@ -44,14 +44,10 @@ const OrderItems: IOrderPricingAdapter = {
44
44
 
45
45
  pricingAdapter.resultSheet().addItems({
46
46
  amount: totalAndTaxesOfAllItems.items,
47
+ taxAmount: totalAndTaxesOfAllItems.taxes,
48
+ meta: { adapter: OrderItems.key },
47
49
  });
48
50
 
49
- if (totalAndTaxesOfAllItems.taxes !== 0) {
50
- pricingAdapter.resultSheet().addTax({
51
- amount: totalAndTaxesOfAllItems.taxes,
52
- });
53
- }
54
-
55
51
  return pricingAdapter.calculate();
56
52
  },
57
53
  };
package/src/pricing/order-payment.ts CHANGED
@@ -32,10 +32,9 @@ const OrderPayment: IOrderPricingAdapter = {
32
32
  const tax = pricing.taxSum();
33
33
  const paymentFees = pricing.gross();
34
34
 
35
- pricingAdapter.resultSheet().addPayment({ amount: paymentFees });
36
- if (tax !== 0) {
37
- pricingAdapter.resultSheet().addTax({ amount: tax });
38
- }
35
+ pricingAdapter
36
+ .resultSheet()
37
+ .addPayment({ amount: paymentFees, taxAmount: tax, meta: { adapter: OrderPayment.key } });
39
38
 
40
39
  return pricingAdapter.calculate();
41
40
  },