@unchainedshop/plugins 2.6.1 → 2.7.0

package/lib/pricing/discount-100-off.js.map

@@ -1 +1 @@
-{"version":3,"file":"discount-100-off.js","sourceRoot":"","sources":["../../src/pricing/discount-100-off.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,MAAM,CAAC,MAAM,UAAU,GAAqB;IAC1C,GAAG,oBAAoB;IAEvB,GAAG,EAAE,iCAAiC;IACtC,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,EAAE;IAEd,uEAAuE;IACvE,uBAAuB,EAAE,KAAK,IAAI,EAAE;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yEAAyE;IACzE,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/B,GAAG,CAAC,MAAM,oBAAoB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEpD,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wBAAwB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC3C,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC;QACzC,CAAC;QAED,qEAAqE;QACrE,4BAA4B,EAAE,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE;YACtD,IAAI,iBAAiB,KAAK,uCAAuC,EAAE,CAAC;gBAClE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;YAC9B,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;CACH,CAAC;AAEF,qBAAqB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"discount-100-off.js","sourceRoot":"","sources":["../../src/pricing/discount-100-off.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGzF,MAAM,CAAC,MAAM,UAAU,GAAiD;IACtE,GAAG,oBAAoB;IAEvB,GAAG,EAAE,iCAAiC;IACtC,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,EAAE;IAEd,uEAAuE;IACvE,uBAAuB,EAAE,KAAK,IAAI,EAAE;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yEAAyE;IACzE,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/B,GAAG,CAAC,MAAM,oBAAoB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEpD,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wBAAwB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC3C,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC;QACzC,CAAC;QAED,qEAAqE;QACrE,4BAA4B,EAAE,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE;YACtD,IAAI,iBAAiB,KAAK,uCAAuC,EAAE,CAAC;gBAClE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;YAC9B,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;CACH,CAAC;AAEF,qBAAqB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC"}

package/lib/pricing/discount-half-price-manual.d.ts

@@ -1,2 +1,3 @@
 import { IDiscountAdapter } from '@unchainedshop/types/discount.js';
-export declare const HalfPriceManual: IDiscountAdapter;
+import { ProductDiscountConfiguration } from '@unchainedshop/core-products/director/ProductDiscountConfiguration.js';
+export declare const HalfPriceManual: IDiscountAdapter<ProductDiscountConfiguration>;

package/lib/pricing/discount-half-price-manual.js.map

@@ -1 +1 @@
-{"version":3,"file":"discount-half-price-manual.js","sourceRoot":"","sources":["../../src/pricing/discount-half-price-manual.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,MAAM,CAAC,MAAM,eAAe,GAAqB;IAC/C,GAAG,oBAAoB;IAEvB,GAAG,EAAE,2CAA2C;IAChD,KAAK,EAAE,mBAAmB;IAC1B,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,EAAE;IAEd,uEAAuE;IACvE,uBAAuB,EAAE,KAAK,IAAI,EAAE;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yEAAyE;IACzE,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/B,GAAG,CAAC,MAAM,oBAAoB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEpD,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wBAAwB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC3C,OAAO,IAAI,KAAK,WAAW,CAAC;QAC9B,CAAC;QAED,qEAAqE;QACrE,4BAA4B,CAAC,EAAE,iBAAiB,EAAE;YAChD,IAAI,iBAAiB,KAAK,yCAAyC,EAAE,CAAC;gBACpE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;YACvB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;CACH,CAAC;AAEF,qBAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC"}
+{"version":3,"file":"discount-half-price-manual.js","sourceRoot":"","sources":["../../src/pricing/discount-half-price-manual.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGzF,MAAM,CAAC,MAAM,eAAe,GAAmD;IAC7E,GAAG,oBAAoB;IAEvB,GAAG,EAAE,2CAA2C;IAChD,KAAK,EAAE,mBAAmB;IAC1B,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,EAAE;IAEd,uEAAuE;IACvE,uBAAuB,EAAE,KAAK,IAAI,EAAE;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yEAAyE;IACzE,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/B,GAAG,CAAC,MAAM,oBAAoB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEpD,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wBAAwB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC3C,OAAO,IAAI,KAAK,WAAW,CAAC;QAC9B,CAAC;QAED,qEAAqE;QACrE,4BAA4B,CAAC,EAAE,iBAAiB,EAAE;YAChD,IAAI,iBAAiB,KAAK,yCAAyC,EAAE,CAAC;gBACpE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;YACvB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;CACH,CAAC;AAEF,qBAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC"}

package/lib/pricing/discount-half-price.d.ts

@@ -1,2 +1,3 @@
 import { IDiscountAdapter } from '@unchainedshop/types/discount.js';
-export declare const HalfPrice: IDiscountAdapter;
+import { ProductDiscountConfiguration } from '@unchainedshop/core-products/director/ProductDiscountConfiguration.js';
+export declare const HalfPrice: IDiscountAdapter<ProductDiscountConfiguration>;

package/lib/pricing/discount-half-price.js.map

@@ -1 +1 @@
-{"version":3,"file":"discount-half-price.js","sourceRoot":"","sources":["../../src/pricing/discount-half-price.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,MAAM,CAAC,MAAM,SAAS,GAAqB;IACzC,GAAG,oBAAoB;IAEvB,GAAG,EAAE,oCAAoC;IACzC,KAAK,EAAE,YAAY;IACnB,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,EAAE;IAEd,uEAAuE;IACvE,uBAAuB,EAAE,KAAK,IAAI,EAAE;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,yEAAyE;IACzE,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/B,GAAG,CAAC,MAAM,oBAAoB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEpD,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACrC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;YAC1B,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACpE,MAAM,0BAA0B,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YACxF,OAAO,CAAC,CAAC,0BAA0B,CAAC;QACtC,CAAC;QAED,wBAAwB,EAAE,KAAK,IAAI,EAAE;YACnC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,qEAAqE;QACrE,4BAA4B,CAAC,EAAE,iBAAiB,EAAE;YAChD,IAAI,iBAAiB,KAAK,yCAAyC,EAAE,CAAC;gBACpE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;YACvB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;CACH,CAAC;AAEF,qBAAqB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"discount-half-price.js","sourceRoot":"","sources":["../../src/pricing/discount-half-price.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGzF,MAAM,CAAC,MAAM,SAAS,GAAmD;IACvE,GAAG,oBAAoB;IAEvB,GAAG,EAAE,oCAAoC;IACzC,KAAK,EAAE,YAAY;IACnB,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,EAAE;IAEd,uEAAuE;IACvE,uBAAuB,EAAE,KAAK,IAAI,EAAE;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,yEAAyE;IACzE,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/B,GAAG,CAAC,MAAM,oBAAoB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEpD,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACrC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;YAC1B,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACpE,MAAM,0BAA0B,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YACxF,OAAO,CAAC,CAAC,0BAA0B,CAAC;QACtC,CAAC;QAED,wBAAwB,EAAE,KAAK,IAAI,EAAE;YACnC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,qEAAqE;QACrE,4BAA4B,CAAC,EAAE,iBAAiB,EAAE;YAChD,IAAI,iBAAiB,KAAK,yCAAyC,EAAE,CAAC;gBACpE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;YACvB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;CACH,CAAC;AAEF,qBAAqB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC"}

package/lib/pricing/order-discount.d.ts

@@ -1,2 +1,3 @@
 import { IOrderPricingAdapter } from '@unchainedshop/types/orders.pricing.js';
-export declare const OrderDiscount: IOrderPricingAdapter;
+import { OrderDiscountConfiguration } from '@unchainedshop/core-orders/director/OrderDiscountConfiguration.js';
+export declare const OrderDiscount: IOrderPricingAdapter<OrderDiscountConfiguration>;

package/lib/pricing/order-discount.js

@@ -16,9 +16,6 @@ export const OrderDiscount = {
         return {
             ...pricingAdapter,
             calculate: async () => {
-                // discounts need to provide a *fixedRate*
-                // if you want to add percentual discounts,
-                // add it to the order item calculation
                 const totalAmountOfItems = params.calculationSheet.total({
                     category: OrderPricingRowCategory.Items,
                     useNetPrice: false,
@@ -39,16 +36,13 @@ export const OrderDiscount = {
                 let amountLeft = totalAmountOfPaymentAndDelivery + totalAmountOfItems;
                 params.discounts.forEach(({ configuration, discountId }) => {
                     // First, we deduce the discount from the items
-                    let alreadyDeducted = 0;
-                    const leftInDiscountToSplit = calcUtils.calculateAmountToSplit({ ...configuration, alreadyDeducted }, totalAmountOfItems);
+                    const leftInDiscountToSplit = calcUtils.calculateAmountToSplit({ ...configuration }, totalAmountOfItems);
                     const [itemsDiscountAmount, itemsTaxAmount] = calcUtils.applyDiscountToMultipleShares(itemShares, Math.max(0, Math.min(amountLeft, leftInDiscountToSplit)));
                     amountLeft -= itemsDiscountAmount;
-                    alreadyDeducted += itemsDiscountAmount;
                     // After the items, we deduct the remaining discount from payment & delivery fees
-                    const leftInFeesToSplit = calcUtils.calculateAmountToSplit({ ...configuration, alreadyDeducted }, totalAmountOfPaymentAndDelivery);
+                    const leftInFeesToSplit = calcUtils.calculateAmountToSplit({ ...configuration }, totalAmountOfPaymentAndDelivery);
                     const [deliveryAndPaymentDiscountAmount, deliveryAndPaymentTaxAmount] = calcUtils.applyDiscountToMultipleShares([deliveryShare, paymentShare], Math.max(0, Math.min(amountLeft, leftInFeesToSplit)));
                     amountLeft -= deliveryAndPaymentDiscountAmount;
-                    alreadyDeducted += itemsDiscountAmount;
                     const discountAmount = (itemsDiscountAmount + deliveryAndPaymentDiscountAmount) * -1;
                     const taxAmount = (itemsTaxAmount + deliveryAndPaymentTaxAmount) * -1;
                     if (discountAmount) {

package/lib/pricing/order-discount.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-discount.js","sourceRoot":"","sources":["../../src/pricing/order-discount.ts"],"names":[],"mappings":"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"}
+{"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

@@ -24,11 +24,12 @@ const OrderItemsDiscount = {
                     useNetPrice: false,
                 }).amount;
                 const itemShares = orderPositions.map((orderPosition) => calcUtils.resolveRatioAndTaxDivisorForPricingSheet(modules.orders.positions.pricingSheet(orderPosition, order.currency, params.context), totalAmountOfItems));
-                let alreadyDeducted = 0;
+                let amountLeft = totalAmountOfItems;
                 params.discounts.forEach(({ configuration, discountId }) => {
                     // First, we deduce the discount from the items
-                    const [itemsDiscountAmount, itemsTaxAmount] = calcUtils.applyDiscountToMultipleShares(itemShares, calcUtils.calculateAmountToSplit({ ...configuration, alreadyDeducted }, totalAmountOfItems));
-                    alreadyDeducted = +itemsDiscountAmount;
+                    const leftInItemsToSplit = calcUtils.calculateAmountToSplit({ ...configuration }, totalAmountOfItems);
+                    const [itemsDiscountAmount, itemsTaxAmount] = calcUtils.applyDiscountToMultipleShares(itemShares, Math.max(0, Math.min(amountLeft, leftInItemsToSplit)));
+                    amountLeft -= itemsDiscountAmount;
                     const discountAmount = itemsDiscountAmount * -1;
                     const taxAmount = itemsTaxAmount * -1;
                     if (discountAmount) {

package/lib/pricing/order-items-discount.js.map

@@ -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,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,CAAC;wBACnB,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;oBACL,CAAC;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"}
+{"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;AAGhE,MAAM,kBAAkB,GAAqD;IAC3E,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,UAAU,GAAG,kBAAkB,CAAC;gBAEpC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,EAAE,EAAE;oBACzD,+CAA+C;oBAC/C,MAAM,kBAAkB,GAAG,SAAS,CAAC,sBAAsB,CACzD,EAAE,GAAG,aAAa,EAAE,EACpB,kBAAkB,CACnB,CAAC;oBACF,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAAC,GAAG,SAAS,CAAC,6BAA6B,CACnF,UAAU,EACV,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC,CACtD,CAAC;oBACF,UAAU,IAAI,mBAAmB,CAAC;oBAElC,MAAM,cAAc,GAAG,mBAAmB,GAAG,CAAC,CAAC,CAAC;oBAChD,MAAM,SAAS,GAAG,cAAc,GAAG,CAAC,CAAC,CAAC;oBACtC,IAAI,cAAc,EAAE,CAAC;wBACnB,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;oBACL,CAAC;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/product-discount.js

@@ -12,10 +12,11 @@ const ProductDiscount = {
     },
     actions: (params) => {
         const pricingAdapter = ProductPricingAdapter.actions(params);
-        const addDiscount = (discount, total, isTaxable) => {
-            const { configuration, discountId } = discount;
-            const { isNetPrice = false, ...meta } = configuration;
-            const amount = calcUtils.applyRate(configuration, total);
+        const addDiscounts = (discount, total, resolvedConfiguration) => {
+            const { discountId } = discount;
+            const { isNetPrice = false, taxRate, ...meta } = resolvedConfiguration;
+            const amount = calcUtils.applyRate(resolvedConfiguration, total);
+            const isTaxable = taxRate === undefined || taxRate === null;
             pricingAdapter.resultSheet().addDiscount({
                 amount: amount * -1,
                 discountId,
@@ -23,25 +24,30 @@ const ProductDiscount = {
                 isTaxable,
                 meta: { adapter: ProductDiscount.key, ...meta },
             });
+            if (!isTaxable && taxRate) {
+                const taxAmount = calcUtils.getTaxAmount(amount, taxRate, isNetPrice);
+                pricingAdapter.resultSheet().addTax({
+                    amount: taxAmount * -1,
+                    rate: taxRate,
+                    meta: { adapter: ProductDiscount.key, discountId, ...meta },
+                });
+            }
         };
         return {
             ...pricingAdapter,
             calculate: async () => {
-                const taxableTotal = params.calculationSheet.sum({
-                    category: ProductPricingRowCategory.Item,
-                    isTaxable: true,
-                });
-                const nonTaxableTotal = params.calculationSheet.sum({
-                    category: ProductPricingRowCategory.Item,
-                    isTaxable: false,
-                });
                 params.discounts.forEach((discount) => {
-                    if (taxableTotal !== 0) {
-                        addDiscount(discount, taxableTotal, true);
-                    }
-                    if (nonTaxableTotal !== 0) {
-                        addDiscount(discount, nonTaxableTotal, false);
-                    }
+                    const { configuration } = discount;
+                    const resolvedConfiguration = configuration.customPriceConfigurationResolver
+                        ? configuration.customPriceConfigurationResolver(params.context.product, params.context.quantity, params.context.configuration)
+                        : configuration;
+                    if (!resolvedConfiguration)
+                        return;
+                    const total = params.calculationSheet.total({
+                        category: ProductPricingRowCategory.Item,
+                        useNetPrice: resolvedConfiguration.isNetPrice,
+                    });
+                    addDiscounts(discount, total.amount, resolvedConfiguration);
                 });
                 return pricingAdapter.calculate();
             },

package/lib/pricing/product-discount.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-discount.js","sourceRoot":"","sources":["../../src/pricing/product-discount.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,yBAAyB,GAC1B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,WAAW,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,eAAe,GAA2B;IAC9C,GAAG,qBAAqB;IAExB,GAAG,EAAE,yCAAyC;IAC9C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,kCAAkC;IACzC,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,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE7D,MAAM,WAAW,GAAG,CAAC,QAAkB,EAAE,KAAa,EAAE,SAAkB,EAAE,EAAE;YAC5E,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;YAC/C,MAAM,EAAE,UAAU,GAAG,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,aAAa,CAAC;YACtD,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YAEzD,cAAc,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC;gBACvC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC;gBACnB,UAAU;gBACV,UAAU;gBACV,SAAS;gBACT,IAAI,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE;aAChD,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC;oBAC/C,QAAQ,EAAE,yBAAyB,CAAC,IAAI;oBACxC,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;gBACH,MAAM,eAAe,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC;oBAClD,QAAQ,EAAE,yBAAyB,CAAC,IAAI;oBACxC,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC;gBAEH,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACpC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;wBACvB,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;oBAC5C,CAAC;oBACD,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;wBAC1B,WAAW,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;oBAChD,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,sBAAsB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC"}
+{"version":3,"file":"product-discount.js","sourceRoot":"","sources":["../../src/pricing/product-discount.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/plugins",
-  "version": "2.6.1",
+  "version": "2.7.0",
   "main": "lib/plugins-index.js",
   "types": "lib/plugins-index.d.ts",
   "exports": {
@@ -75,35 +75,35 @@
     "@redis/client": "^1.5.8",
     "bip32": "^4.0.0",
     "escape-string-regexp": "^5.0.0",
-    "ethers": "^6.10.0",
+    "ethers": "^6.11.0",
     "express": "^4.18.2",
     "lru-cache": "^10.0.0",
     "open": "^10.0.0",
     "postfinancecheckout": "^4.1.1",
     "stripe": "^13.11.0",
     "tiny-secp256k1": "^2.2.3",
-    "twilio": "^4.21.0",
+    "twilio": "^4.22.0",
     "web-push": "^3.6.3"
   },
   "devDependencies": {
-    "@redis/client": "^1.5.13",
-    "@types/node": "^20.11.10",
-    "@unchainedshop/api": "^2.6.1",
-    "@unchainedshop/core-delivery": "^2.6.1",
-    "@unchainedshop/core-enrollments": "^2.6.1",
-    "@unchainedshop/core-filters": "^2.6.1",
-    "@unchainedshop/core-messaging": "^2.6.1",
-    "@unchainedshop/core-orders": "^2.6.1",
-    "@unchainedshop/core-payment": "^2.6.1",
-    "@unchainedshop/core-products": "^2.6.1",
-    "@unchainedshop/core-quotations": "^2.6.1",
-    "@unchainedshop/core-warehousing": "^2.6.1",
-    "@unchainedshop/core-worker": "^2.6.1",
-    "@unchainedshop/events": "^2.6.1",
-    "@unchainedshop/file-upload": "^2.6.1",
-    "@unchainedshop/logger": "^2.6.1",
-    "@unchainedshop/types": "^2.6.1",
-    "@unchainedshop/utils": "^2.6.1",
+    "@redis/client": "^1.5.14",
+    "@types/node": "^20.11.17",
+    "@unchainedshop/api": "^2.7.0",
+    "@unchainedshop/core-delivery": "^2.7.0",
+    "@unchainedshop/core-enrollments": "^2.7.0",
+    "@unchainedshop/core-filters": "^2.7.0",
+    "@unchainedshop/core-messaging": "^2.7.0",
+    "@unchainedshop/core-orders": "^2.7.0",
+    "@unchainedshop/core-payment": "^2.7.0",
+    "@unchainedshop/core-products": "^2.7.0",
+    "@unchainedshop/core-quotations": "^2.7.0",
+    "@unchainedshop/core-warehousing": "^2.7.0",
+    "@unchainedshop/core-worker": "^2.7.0",
+    "@unchainedshop/events": "^2.7.0",
+    "@unchainedshop/file-upload": "^2.7.0",
+    "@unchainedshop/logger": "^2.7.0",
+    "@unchainedshop/types": "^2.7.0",
+    "@unchainedshop/utils": "^2.7.0",
     "bluebird": "^3.7.2",
     "event-iterator": "^2.0.0",
     "express": "^4.18.2",
@@ -112,7 +112,7 @@
     "lru-cache": "^10.2.0",
     "minio": "^7.1.3",
     "node-sheets": "^1.2.0",
-    "nodemailer": "^6.9.8",
+    "nodemailer": "^6.9.9",
     "open": "^10.0.3",
     "postfinancecheckout": "^4.5.0",
     "request": "^2.88.2",

package/src/payment/payrexx/api/index.ts

@@ -0,0 +1,132 @@
+const baseUrl = 'https://api.payrexx.com/v1.0/';
+
+export enum GatewayObjectStatus {
+  waiting = 'waiting',
+  confirmed = 'confirmed',
+  cancelled = 'cancelled',
+  declined = 'declined',
+  authorized = 'authorized',
+  reserved = 'reserved',
+  refunded = 'refunded',
+  refundpending = 'refundpending',
+  'partially-refunded' = 'partially-refunded',
+  chargeback = 'chargeback',
+  error = 'error',
+  uncaptured = '_',
+}
+
+export type GatewayObject = {
+  status: GatewayObjectStatus;
+  currency: string;
+  amount: number;
+  referenceId: string;
+  invoices: {
+    transactions: {
+      id: string;
+    }[];
+  }[];
+};
+
+export type TransactionObject = any;
+
+const createPayrexxAPI = (instance: string, secret: string) => ({
+  async buildSignature(query = '') {
+    const key = await crypto.subtle.importKey(
+      'raw',
+      new TextEncoder().encode(secret),
+      { name: 'HMAC', hash: 'SHA-256' },
+      false,
+      ['sign', 'verify'],
+    );
+    const signature = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(query));
+    return btoa(String.fromCharCode(...new Uint8Array(signature)));
+  },
+
+  buildUrl(path, params = {}) {
+    const url = new URL(path, baseUrl);
+    url.search = new URLSearchParams({ instance, ...params }).toString();
+    return url.href;
+  },
+
+  async chargePreAuthorized(id, params) {
+    const queryParams = { ...params };
+    const signature = await this.buildSignature(new URLSearchParams(queryParams).toString());
+    queryParams.ApiSignature = signature;
+
+    const url = this.buildUrl(`Transaction/${id}/`);
+
+    const result = await fetch(url, {
+      method: 'POST',
+      body: new URLSearchParams(queryParams).toString(),
+      headers: {
+        accept: 'application/json',
+        'content-type': 'application/x-www-form-urlencoded',
+      },
+    });
+
+    if (result.ok) {
+      return result.json();
+    }
+    throw new Error(await result.text());
+  },
+
+  async deleteReservation(id) {
+    const url = this.buildUrl(`Transaction/${id}/`, { ApiSignature: await this.buildSignature() });
+    const result = await fetch(url, {
+      method: 'DELETE',
+      headers: {
+        accept: 'application/json',
+        'content-type': 'application/x-www-form-urlencoded',
+      },
+    });
+
+    if (result.ok) {
+      return result.json();
+    }
+    throw new Error(await result.text());
+  },
+
+  async getGateway(id): Promise<GatewayObject> {
+    const url = this.buildUrl(`Gateway/${id}/`, { ApiSignature: await this.buildSignature() });
+    const result = await fetch(url);
+    if (!result.ok) throw new Error(await result.text());
+    const { status, data } = await result.json();
+    if (status !== 'success') return null;
+    return data?.[0];
+  },
+
+  async createGateway(params): Promise<GatewayObject> {
+    const queryParams = { ...params };
+    const signature = await this.buildSignature(new URLSearchParams(queryParams).toString());
+    queryParams.ApiSignature = signature;
+
+    const url = this.buildUrl('Gateway/');
+    const result = await fetch(url, {
+      method: 'POST',
+      body: new URLSearchParams(queryParams).toString(),
+      headers: {
+        accept: 'application/json',
+        'content-type': 'application/x-www-form-urlencoded',
+      },
+    });
+
+    if (result.ok) {
+      return result.json();
+    }
+    throw new Error(await result.text());
+  },
+});
+
+export default createPayrexxAPI;
+
+// where you want to consume the payrexx module:
+// const payrexx = payrexx.init(instance, api_secret);
+// const response = await payrexx.createGateway({
+//   amount: 100,
+//   // add more fields here
+// });
+
+// if (response.status === 200) {
+//   const gateway = response.data.data[0];
+//   // here you will get the gateway
+// }

package/src/payment/payrexx/index.ts

@@ -0,0 +1,184 @@
+import { IPaymentAdapter } from '@unchainedshop/types/payments.js';
+import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
+import { createLogger } from '@unchainedshop/logger';
+import { mapOrderDataToGatewayObject } from './payrexx.js';
+import createPayrexxAPI, { GatewayObjectStatus } from './api/index.js';
+
+export * from './middleware.js';
+
+const logger = createLogger('unchained:core-payment:payrexx');
+
+const Payrexx: IPaymentAdapter = {
+  ...PaymentAdapter,
+
+  key: 'shop.unchained.payment.payrexx',
+  label: 'Payrexx',
+  version: '1.0.0',
+
+  typeSupported(type) {
+    return type === 'GENERIC';
+  },
+
+  actions: (params) => {
+    const { modules } = params.context;
+
+    const getInstance = () => {
+      return params.config.find((c) => c.key === 'instance')?.value;
+    };
+
+    const api = createPayrexxAPI(getInstance(), process.env.PAYREXX_SECRET);
+
+    const adapterActions = {
+      ...PaymentAdapter.actions(params),
+
+      configurationError() {
+        if (!process.env.PAYREXX_SECRET) {
+          return PaymentError.INCOMPLETE_CONFIGURATION;
+        }
+        if (!getInstance()) {
+          return PaymentError.INCOMPLETE_CONFIGURATION;
+        }
+        return null;
+      },
+
+      isActive: () => {
+        if (adapterActions.configurationError() === null) return true;
+        return false;
+      },
+
+      isPayLaterAllowed() {
+        return false;
+      },
+
+      validate: async ({ token }) => {
+        throw new Error('Token Registration Flow not implemented yet');
+      },
+
+      register: async ({ setupIntentId }) => {
+        throw new Error('Token Registration Flow not implemented yet');
+      },
+
+      sign: async (transactionContext = {}) => {
+        const { orderPayment, order } = params.paymentContext;
+        if (orderPayment) {
+          const pricing = await modules.orders.pricingSheet(order);
+          const gatewayObject = mapOrderDataToGatewayObject(
+            { order, orderPayment, pricing },
+            transactionContext,
+          );
+          const gateway = await api.createGateway(gatewayObject);
+          return JSON.stringify(gateway);
+        }
+
+        throw new Error('Token Registration Flow not implemented yet');
+      },
+
+      async confirm() {
+        const { orderPayment } = params.paymentContext;
+        const { transactionId } = orderPayment;
+
+        if (!transactionId) {
+          return false;
+        }
+
+        const gatewayObject = await api.getGateway(transactionId);
+
+        if (!gatewayObject) {
+          return false;
+        }
+
+        if (
+          gatewayObject.status === GatewayObjectStatus.authorized ||
+          gatewayObject.status === GatewayObjectStatus.reserved
+        ) {
+          const allTransactions = gatewayObject.invoices?.flatMap((invoice) => invoice.transactions);
+          await Promise.all(
+            allTransactions.map(async (transaction) =>
+              api.chargePreAuthorized(transaction.id, { referenceId: orderPayment._id }),
+            ),
+          );
+          return true;
+        }
+        return false;
+      },
+
+      async cancel() {
+        const { orderPayment } = params.paymentContext;
+        const { transactionId } = orderPayment;
+        if (!transactionId) {
+          return false;
+        }
+
+        const gatewayObject = await api.getGateway(transactionId);
+
+        if (!gatewayObject) {
+          return false;
+        }
+
+        if (gatewayObject.status === GatewayObjectStatus.reserved) {
+          const allTransactions = gatewayObject.invoices?.flatMap((invoice) => invoice.transactions);
+          await Promise.all(
+            allTransactions.map(async (transaction) => api.deleteReservation(transaction.id)),
+          );
+          return true;
+        }
+        return false;
+      },
+
+      charge: async ({ gatewayId, paymentCredentials }) => {
+        if (!gatewayId && !paymentCredentials) {
+          throw new Error('You have to provide gatewayId or paymentCredentials');
+        }
+
+        const { order } = params.paymentContext;
+        const orderPayment = await modules.orders.payments.findOrderPayment({
+          orderPaymentId: order.paymentId,
+        });
+
+        const gatewayObject = await api.getGateway(gatewayId);
+
+        const pricing = await modules.orders.pricingSheet(order);
+        const { currency, amount } = pricing.total({ useNetPrice: false });
+
+        if (
+          gatewayObject.currency !== currency.toUpperCase() ||
+          gatewayObject.amount !== Math.round(amount)
+        ) {
+          throw new Error('The price has changed since the intent has been created');
+        }
+        if (gatewayObject.referenceId !== orderPayment?._id) {
+          throw new Error('The order payment is different from the initiating intent');
+        }
+
+        switch (gatewayObject.status) {
+          case GatewayObjectStatus.waiting:
+            logger.verbose('Charge postponed because Gateway is pending', {
+              orderPaymentId: gatewayObject.referenceId,
+            });
+            return false;
+          case GatewayObjectStatus.authorized:
+          case GatewayObjectStatus.reserved:
+          case GatewayObjectStatus.confirmed:
+            // confirm will do the transition, to do a checkout those stati above are fine
+            logger.verbose(`Mark as charged, status is ${gatewayObject.status}`, {
+              orderPaymentId: gatewayObject.referenceId,
+            });
+            return {
+              transactionId: gatewayId,
+              gatewayObject,
+            };
+          default:
+            logger.verbose('Charge not possible', {
+              orderPaymentId: gatewayObject.referenceId,
+              status: gatewayObject.status,
+            });
+            throw new Error(`Gateway Status ${gatewayObject.status} does not allow checkout`);
+        }
+      },
+    };
+
+    return adapterActions;
+  },
+};
+
+PaymentDirector.registerAdapter(Payrexx);

package/src/payment/payrexx/middleware.ts

@@ -0,0 +1,64 @@
+import { Context } from '@unchainedshop/types/api.js';
+import { createLogger } from '@unchainedshop/logger';
+
+const logger = createLogger('unchained:core-payment:payrexx:webhook');
+
+export const payrexxHandler = async (request, response) => {
+  const resolvedContext = request.unchainedContext as Context;
+  const { modules } = resolvedContext;
+
+  const { transaction } = request.body;
+
+  if (!transaction) {
+    logger.verbose(`unhandled event type`, {
+      type: Object.keys(request.body).join(','),
+    });
+    response.writeHead(200);
+    response.end({
+      ignored: true,
+      message: `Unhandled event type: ${Object.keys(request.body).join(',')}. Supported type: transaction`,
+    });
+  }
+
+  logger.verbose(`Processing event`, {
+    transactionId: transaction.id,
+  });
+  try {
+    const { referenceId: orderPaymentId } = transaction;
+
+    logger.verbose(`checkout with orderPaymentId: ${orderPaymentId}`);
+    await modules.orders.payments.logEvent(orderPaymentId, {
+      transactionId: transaction.id,
+    });
+    const orderPayment = await modules.orders.payments.findOrderPayment({
+      orderPaymentId,
+    });
+    if (!orderPayment) {
+      throw new Error(`order payment not found with orderPaymentId: ${orderPaymentId}`);
+    }
+    const order = await modules.orders.checkout(
+      orderPayment.orderId,
+      {
+        paymentContext: {
+          transactionId: transaction.id,
+        },
+      },
+      resolvedContext,
+    );
+    logger.info(`checkout successful`, {
+      orderPaymentId,
+      orderId: order._id,
+    });
+    response.writeHead(200);
+    response.end({
+      message: 'checkout successful',
+      orderId: order._id,
+    });
+  } catch (error) {
+    logger.error(error, {
+      transactionId: transaction.id,
+    });
+    response.writeHead(500);
+    response.end(error.message);
+  }
+};