@unchainedshop/api 3.0.0-alpha7 → 3.0.0-rc1

package/lib/resolvers/type/order/order-item-types.js

@@ -1,18 +1,22 @@
-import crypto from 'crypto';
+import { sha256 } from '@unchainedshop/utils';
+import { ProductPricingSheet } from '@unchainedshop/core';
 const getPricingSheet = async (orderPosition, context) => {
     const { modules } = context;
     const order = await modules.orders.findOrder({
         orderId: orderPosition.orderId,
     });
-    const pricingSheet = modules.orders.positions.pricingSheet(orderPosition, order.currency, context);
-    return pricingSheet;
+    return ProductPricingSheet({
+        calculation: orderPosition.calculation,
+        currency: order.currency,
+        quantity: orderPosition.quantity,
+    });
 };
 export const OrderItem = {
     async discounts(orderPosition, _, context) {
-        const pricingSheet = await getPricingSheet(orderPosition, context);
-        if (pricingSheet.isValid()) {
+        const pricing = await getPricingSheet(orderPosition, context);
+        if (pricing.isValid()) {
             // IMPORTANT: Do not send any parameter to obj.discounts!
-            return pricingSheet.discountPrices().map((discount) => ({
+            return pricing.discountPrices().map((discount) => ({
                 item: orderPosition,
                 ...discount,
             }));
@@ -72,28 +76,22 @@ export const OrderItem = {
         return modules.quotations.findQuotation({ quotationId: orderPosition.quotationId });
     },
     async total(orderPosition, params, context) {
-        const pricingSheet = await getPricingSheet(orderPosition, context);
-        if (pricingSheet.isValid()) {
-            const price = pricingSheet.total(params);
+        const pricing = await getPricingSheet(orderPosition, context);
+        if (pricing.isValid()) {
+            const price = pricing.total(params);
             return {
-                _id: crypto
-                    .createHash('sha256')
-                    .update([orderPosition._id, JSON.stringify(params), JSON.stringify(price)].join(''))
-                    .digest('hex'),
+                _id: await sha256([orderPosition._id, JSON.stringify(params), JSON.stringify(price)].join('')),
                 ...price,
             };
         }
         return null;
     },
     async unitPrice(orderPosition, params, context) {
-        const pricingSheet = await getPricingSheet(orderPosition, context);
-        if (pricingSheet.isValid()) {
-            const price = pricingSheet.unitPrice(params);
+        const pricing = await getPricingSheet(orderPosition, context);
+        if (pricing.isValid()) {
+            const price = pricing.unitPrice(params);
             return {
-                _id: crypto
-                    .createHash('sha256')
-                    .update([`${orderPosition._id}-unit`, price.amount, pricingSheet.currency].join(''))
-                    .digest('hex'),
+                _id: await sha256([`${orderPosition._id}-unit`, price.amount, pricing.currency].join('')),
                 ...price,
             };
         }

package/lib/resolvers/type/order/order-item-types.js.map

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

package/lib/resolvers/type/order/order-payment-card-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { OrderPayment, OrderPaymentDiscount } from '@unchainedshop/core-orders';
 import { PaymentProvider } from '@unchainedshop/core-payment';
 type HelperType<T> = (orderPayment: OrderPayment, _: never, context: Context) => T;

package/lib/resolvers/type/order/order-payment-card-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-card-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-card-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnF,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAC5D,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/C,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,gBAAgB,EAAE,2BAwB9B,CAAC"}
+{"version":3,"file":"order-payment-card-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-card-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnF,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAC5D,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/C,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,gBAAgB,EAAE,2BA2B9B,CAAC"}

package/lib/resolvers/type/order/order-payment-card-types.js

@@ -1,3 +1,4 @@
+import { PaymentPricingSheet } from '@unchainedshop/core';
 export const OrderPaymentCard = {
     status: (obj, _, { modules }) => {
         return modules.orders.payments.normalizedStatus(obj);
@@ -10,10 +11,13 @@ export const OrderPaymentCard = {
     discounts: async (obj, _, context) => {
         const { modules } = context;
         const order = await modules.orders.findOrder({ orderId: obj.orderId });
-        const pricingSheet = modules.orders.payments.pricingSheet(obj, order.currency, context);
-        if (pricingSheet.isValid()) {
+        const pricing = PaymentPricingSheet({
+            calculation: obj.calculation,
+            currency: order.currency,
+        });
+        if (pricing.isValid()) {
             // IMPORTANT: Do not send any parameter to obj.discounts!
-            return pricingSheet.discountPrices().map((discount) => ({
+            return pricing.discountPrices().map((discount) => ({
                 item: obj,
                 ...discount,
             }));

package/lib/resolvers/type/order/order-payment-card-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-card-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-card-types.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACxF,IAAI,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3B,yDAAyD;YACzD,OAAO,YAAY,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACtD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}
+{"version":3,"file":"order-payment-card-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-card-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAa1D,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,yDAAyD;YACzD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACjD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-payment-discount-types.d.ts

@@ -1,16 +1,22 @@
-import { Context } from '@unchainedshop/api';
-import { OrderDiscount } from '@unchainedshop/core-orders';
+import { Context } from '../../../context.js';
 import { OrderPayment } from '@unchainedshop/core-orders';
-import { OrderPrice } from '@unchainedshop/core-orders';
-type HelperType<P, T> = (orderDelivery: OrderPrice & {
-    discountId: string;
-    item: OrderPayment;
-}, params: P, context: Context) => T;
-export interface OrderPaymentDiscountHelperTypes {
-    _id: HelperType<never, string>;
-    orderDiscount: HelperType<never, Promise<OrderDiscount>>;
-    total: HelperType<never, OrderPrice>;
-}
-export declare const OrderPaymentDiscount: OrderPaymentDiscountHelperTypes;
-export {};
+import { Price } from '@unchainedshop/utils';
+export declare const OrderPaymentDiscount: {
+    _id: (orderDelivery: Price & {
+        discountId: string;
+        item: OrderPayment;
+    }) => string;
+    orderDiscount: (orderDelivery: Price & {
+        discountId: string;
+        item: OrderPayment;
+    }, _: any, { modules }: Context) => Promise<import("@unchainedshop/core-orders").OrderDiscount>;
+    total(orderDelivery: Price & {
+        discountId: string;
+        item: OrderPayment;
+    }): Promise<{
+        _id: string;
+        amount: number;
+        currency: string;
+    }>;
+};
 //# sourceMappingURL=order-payment-discount-types.d.ts.map

package/lib/resolvers/type/order/order-payment-discount-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-discount-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-discount-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CACtB,aAAa,EAAE,UAAU,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,EACtE,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,OAAO,KACb,CAAC,CAAC;AAEP,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/B,aAAa,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IACzD,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;CACtC;AAED,eAAO,MAAM,oBAAoB,EAAE,+BAgBlC,CAAC"}
+{"version":3,"file":"order-payment-discount-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-discount-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAU,MAAM,sBAAsB,CAAC;AAErD,eAAO,MAAM,oBAAoB;yBACV,KAAK,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;mCAItD,KAAK,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE,uBAEpD,OAAO;yBAMK,KAAK,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;;;;;CAa9E,CAAC"}

package/lib/resolvers/type/order/order-payment-discount-types.js

@@ -1,16 +1,19 @@
-import crypto from 'crypto';
+import { sha256 } from '@unchainedshop/utils';
 export const OrderPaymentDiscount = {
-    _id: (obj) => `${obj.item._id}:${obj.discountId}`,
-    orderDiscount: (obj, _, { modules }) => modules.orders.discounts.findOrderDiscount({
-        discountId: obj.discountId,
-    }),
-    total: (obj) => ({
-        _id: crypto
-            .createHash('sha256')
-            .update([`${obj.item._id}-${obj.discountId}`, obj.amount, obj.currency].join(''))
-            .digest('hex'),
-        amount: obj.amount,
-        currency: obj.currency,
+    _id: (orderDelivery) => `${orderDelivery.item._id}:${orderDelivery.discountId}`,
+    orderDiscount: (orderDelivery, _, { modules }) => modules.orders.discounts.findOrderDiscount({
+        discountId: orderDelivery.discountId,
     }),
+    async total(orderDelivery) {
+        return {
+            _id: await sha256([
+                `${orderDelivery.item._id}-${orderDelivery.discountId}`,
+                orderDelivery.amount,
+                orderDelivery.currency,
+            ].join('')),
+            amount: orderDelivery.amount,
+            currency: orderDelivery.currency,
+        };
+    },
 };
 //# sourceMappingURL=order-payment-discount-types.js.map

package/lib/resolvers/type/order/order-payment-discount-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-discount-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-discount-types.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAkB5B,MAAM,CAAC,MAAM,oBAAoB,GAAoC;IACnE,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE;IAEjD,aAAa,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACrC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC;QACzC,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;IAEJ,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,EAAE,MAAM;aACR,UAAU,CAAC,QAAQ,CAAC;aACpB,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAChF,MAAM,CAAC,KAAK,CAAC;QAChB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;KACvB,CAAC;CACH,CAAC"}
+{"version":3,"file":"order-payment-discount-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-discount-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,GAAG,EAAE,CAAC,aAAiE,EAAE,EAAE,CACzE,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,aAAa,CAAC,UAAU,EAAE;IAEzD,aAAa,EAAE,CACb,aAAiE,EACjE,CAAC,EACD,EAAE,OAAO,EAAW,EACpB,EAAE,CACF,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC;QACzC,UAAU,EAAE,aAAa,CAAC,UAAU;KACrC,CAAC;IAEJ,KAAK,CAAC,KAAK,CAAC,aAAiE;QAC3E,OAAO;YACL,GAAG,EAAE,MAAM,MAAM,CACf;gBACE,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,aAAa,CAAC,UAAU,EAAE;gBACvD,aAAa,CAAC,MAAM;gBACpB,aAAa,CAAC,QAAQ;aACvB,CAAC,IAAI,CAAC,EAAE,CAAC,CACX;YACD,MAAM,EAAE,aAAa,CAAC,MAAM;YAC5B,QAAQ,EAAE,aAAa,CAAC,QAAQ;SACjC,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-payment-generic-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { OrderPayment, OrderPaymentDiscount } from '@unchainedshop/core-orders';
 import { PaymentProvider } from '@unchainedshop/core-payment';
 type HelperType<P, T> = (orderPayment: OrderPayment, params: P, context: Context) => T;

package/lib/resolvers/type/order/order-payment-generic-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-generic-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-generic-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEvF,MAAM,WAAW,8BAA8B;IAC7C,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACnE,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,mBAAmB,EAAE,8BAwBjC,CAAC"}
+{"version":3,"file":"order-payment-generic-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-generic-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEvF,MAAM,WAAW,8BAA8B;IAC7C,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACnE,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,mBAAmB,EAAE,8BA2BjC,CAAC"}

package/lib/resolvers/type/order/order-payment-generic-types.js

@@ -1,3 +1,4 @@
+import { PaymentPricingSheet } from '@unchainedshop/core';
 export const OrderPaymentGeneric = {
     status: (obj, _, { modules }) => {
         return modules.orders.payments.normalizedStatus(obj);
@@ -10,10 +11,13 @@ export const OrderPaymentGeneric = {
     discounts: async (obj, _, context) => {
         const { modules } = context;
         const order = await modules.orders.findOrder({ orderId: obj.orderId });
-        const pricingSheet = modules.orders.payments.pricingSheet(obj, order.currency, context);
-        if (pricingSheet.isValid()) {
+        const pricing = PaymentPricingSheet({
+            calculation: obj.calculation,
+            currency: order.currency,
+        });
+        if (pricing.isValid()) {
             // IMPORTANT: Do not send any parameter to obj.discounts!
-            return pricingSheet.discountPrices().map((discount) => ({
+            return pricing.discountPrices().map((discount) => ({
                 item: obj,
                 ...discount,
             }));

package/lib/resolvers/type/order/order-payment-generic-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-generic-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-generic-types.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,mBAAmB,GAAmC;IACjE,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACxF,IAAI,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3B,yDAAyD;YACzD,OAAO,YAAY,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACtD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}
+{"version":3,"file":"order-payment-generic-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-generic-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAa1D,MAAM,CAAC,MAAM,mBAAmB,GAAmC;IACjE,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,yDAAyD;YACzD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACjD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-payment-invoice-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { OrderPayment, OrderPaymentDiscount } from '@unchainedshop/core-orders';
 import { PaymentProvider } from '@unchainedshop/core-payment';
 type HelperType<T> = (orderPayment: OrderPayment, _: never, context: Context) => T;

package/lib/resolvers/type/order/order-payment-invoice-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-invoice-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-invoice-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnF,MAAM,WAAW,8BAA8B;IAC7C,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAC5D,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/C,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,mBAAmB,EAAE,8BAwBjC,CAAC"}
+{"version":3,"file":"order-payment-invoice-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-invoice-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnF,MAAM,WAAW,8BAA8B;IAC7C,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAC5D,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/C,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,mBAAmB,EAAE,8BA2BjC,CAAC"}

package/lib/resolvers/type/order/order-payment-invoice-types.js

@@ -1,3 +1,4 @@
+import { PaymentPricingSheet } from '@unchainedshop/core';
 export const OrderPaymentInvoice = {
     status: (obj, _, { modules }) => {
         return modules.orders.payments.normalizedStatus(obj);
@@ -10,10 +11,13 @@ export const OrderPaymentInvoice = {
     discounts: async (obj, _, context) => {
         const { modules } = context;
         const order = await modules.orders.findOrder({ orderId: obj.orderId });
-        const pricingSheet = modules.orders.payments.pricingSheet(obj, order.currency, context);
-        if (pricingSheet.isValid()) {
+        const pricing = PaymentPricingSheet({
+            calculation: obj.calculation,
+            currency: order.currency,
+        });
+        if (pricing.isValid()) {
             // IMPORTANT: Do not send any parameter to obj.discounts!
-            return pricingSheet.discountPrices().map((discount) => ({
+            return pricing.discountPrices().map((discount) => ({
                 item: obj,
                 ...discount,
             }));

package/lib/resolvers/type/order/order-payment-invoice-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-invoice-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-invoice-types.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,mBAAmB,GAAmC;IACjE,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACxF,IAAI,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3B,yDAAyD;YACzD,OAAO,YAAY,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACtD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}
+{"version":3,"file":"order-payment-invoice-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-invoice-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAa1D,MAAM,CAAC,MAAM,mBAAmB,GAAmC;IACjE,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,yDAAyD;YACzD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACjD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-payment-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { OrderPayment as OrderPaymentType } from '@unchainedshop/core-orders';
 export declare const OrderPayment: {
     __resolveType: (obj: OrderPaymentType, { modules }: Context) => Promise<string>;

package/lib/resolvers/type/order/order-payment-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAU9E,eAAO,MAAM,YAAY;yBACI,gBAAgB,eAAe,OAAO;CAWlE,CAAC"}
+{"version":3,"file":"order-payment-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAU9E,eAAO,MAAM,YAAY;yBACI,gBAAgB,eAAe,OAAO;CAWlE,CAAC"}

package/lib/resolvers/type/order/order-types.d.ts

@@ -1,15 +1,11 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { Country } from '@unchainedshop/core-countries';
 import { Currency } from '@unchainedshop/core-currencies';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { Enrollment } from '@unchainedshop/core-enrollments';
-import { Order as OrderType } from '@unchainedshop/core-orders';
-import { OrderDelivery } from '@unchainedshop/core-orders';
-import { OrderDiscount } from '@unchainedshop/core-orders';
-import { OrderPayment } from '@unchainedshop/core-orders';
-import { OrderPosition } from '@unchainedshop/core-orders';
-import { OrderPrice } from '@unchainedshop/core-orders';
+import { Order as OrderType, OrderPosition, OrderPayment, OrderDiscount, OrderDelivery } from '@unchainedshop/core-orders';
 import { User } from '@unchainedshop/core-users';
+import { Price } from '@unchainedshop/utils';
 export declare const Order: {
     supportedDeliveryProviders(order: OrderType, _: any, context: Context): Promise<Array<DeliveryProvider>>;
     supportedPaymentProviders(order: OrderType, _: any, context: Context): Promise<import("@unchainedshop/core-payment").PaymentProvider[]>;
@@ -24,7 +20,7 @@ export declare const Order: {
     total(order: OrderType, params: {
         category: string;
         useNetPrice: boolean;
-    }, { modules }: Context): Promise<OrderPrice>;
+    }): Promise<Price>;
     user(order: OrderType, _: any, { modules }: Context): Promise<User>;
 };
 //# sourceMappingURL=order-types.d.ts.map

package/lib/resolvers/type/order/order-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,eAAO,MAAM,KAAK;sCAEP,SAAS,mBAEP,OAAO,GACf,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;qCASI,SAAS,mBAAc,OAAO;oBAS/C,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;mBAIvD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;qBAInD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBAInE,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;sBAMzD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;iBAM7D,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;mBAMhE,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;kBAMjE,SAAS,GAAG,MAAM;iBAQvB,SAAS,UACR;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,eACrC,OAAO,GACnB,OAAO,CAAC,UAAU,CAAC;gBAgBJ,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrE,CAAC"}
+{"version":3,"file":"order-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,KAAK,IAAI,SAAS,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACb,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,KAAK,EAAU,MAAM,sBAAsB,CAAC;AAGrD,eAAO,MAAM,KAAK;sCAEP,SAAS,mBAEP,OAAO,GACf,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;qCAMI,SAAS,mBAAc,OAAO;oBAM/C,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;mBAIvD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;qBAInD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBAInE,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;sBAMzD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;iBAM7D,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;mBAMhE,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;kBAMjE,SAAS,GAAG,MAAM;iBAOb,SAAS,UAAU;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,KAAK,CAAC;gBAgB/E,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrE,CAAC"}

package/lib/resolvers/type/order/order-types.js

@@ -1,14 +1,15 @@
-import crypto from 'crypto';
+import { sha256 } from '@unchainedshop/utils';
+import { OrderPricingSheet } from '@unchainedshop/core';
 export const Order = {
     async supportedDeliveryProviders(order, _, context) {
-        return context.modules.delivery.findSupported({
+        return context.services.orders.supportedDeliveryProviders({
             order,
-        }, context);
+        });
     },
     async supportedPaymentProviders(order, _, context) {
-        return context.modules.payment.paymentProviders.findSupported({
+        return context.services.orders.supportedPaymentProviders({
             order,
-        }, context);
+        });
     },
     async currency(order, _, { modules }) {
         return modules.currencies.findCurrency({ isoCode: order.currency });
@@ -45,15 +46,15 @@ export const Order = {
         }
         return order.status;
     },
-    async total(order, params, { modules }) {
-        const pricingSheet = modules.orders.pricingSheet(order);
-        if (pricingSheet.isValid()) {
-            const price = pricingSheet.total(params);
+    async total(order, params) {
+        const pricing = OrderPricingSheet({
+            calculation: order.calculation,
+            currency: order.currency,
+        });
+        if (pricing.isValid()) {
+            const price = pricing.total(params);
             return {
-                _id: crypto
-                    .createHash('sha256')
-                    .update([order._id, JSON.stringify(params), JSON.stringify(price)].join(''))
-                    .digest('hex'),
+                _id: await sha256([order._id, JSON.stringify(params), JSON.stringify(price)].join('')),
                 ...price,
             };
         }

package/lib/resolvers/type/order/order-types.js.map

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

package/lib/resolvers/type/payment/payment-credentials-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { PaymentCredentials as PaymentCredentialsType, PaymentProvider } from '@unchainedshop/core-payment';
 import { User } from '@unchainedshop/core-users';
 export type HelperType<P, T> = (credentials: PaymentCredentialsType, params: P, context: Context) => T;

package/lib/resolvers/type/payment/payment-credentials-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payment-credentials-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-credentials-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EACL,kBAAkB,IAAI,sBAAsB,EAC5C,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEvG,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7D,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;CAC9C;AACD,eAAO,MAAM,kBAAkB,EAAE,6BAoBhC,CAAC"}
+{"version":3,"file":"payment-credentials-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-credentials-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EACL,kBAAkB,IAAI,sBAAsB,EAC5C,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEvG,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7D,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;CAC9C;AACD,eAAO,MAAM,kBAAkB,EAAE,6BAwBhC,CAAC"}

package/lib/resolvers/type/payment/payment-credentials-types.js

@@ -1,3 +1,4 @@
+import { PaymentDirector } from '@unchainedshop/core';
 export const PaymentCredentials = {
     async user(obj, _, { modules }) {
         return modules.users.findUserById(obj.userId);
@@ -7,9 +8,13 @@ export const PaymentCredentials = {
             paymentProviderId: obj.paymentProviderId,
         });
     },
-    async isValid(obj, _, context) {
-        const { modules, userId } = context;
-        return modules.payment.paymentProviders.validate(obj.paymentProviderId, { userId, token: obj }, context);
+    async isValid(obj, _, requestContext) {
+        const { modules, userId } = requestContext;
+        const paymentProvider = await modules.payment.paymentProviders.findProvider({
+            paymentProviderId: obj.paymentProviderId,
+        });
+        const actions = await PaymentDirector.actions(paymentProvider, { userId, token: obj }, requestContext);
+        return actions.validate();
     },
 };
 //# sourceMappingURL=payment-credentials-types.js.map

package/lib/resolvers/type/payment/payment-credentials-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment-credentials-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-credentials-types.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,kBAAkB,GAAkC;IAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC5B,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QACvC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO;QAC3B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAEpC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAC9C,GAAG,CAAC,iBAAiB,EACrB,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EACtB,OAAO,CACR,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"payment-credentials-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-credentials-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAetD,MAAM,CAAC,MAAM,kBAAkB,GAAkC;IAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC5B,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QACvC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,cAAc;QAClC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;QAE3C,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YAC1E,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAC3C,eAAe,EACf,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EACtB,cAAc,CACf,CAAC;QACF,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF,CAAC"}

package/lib/resolvers/type/payment/payment-provider-types.d.ts

@@ -1,26 +1,25 @@
-import { Context } from '@unchainedshop/api';
-import { PaymentError, PaymentProvider as PaymentProviderType } from '@unchainedshop/core-payment';
-export interface PaymentProviderHelperTypes {
-    interface: (provider: PaymentProviderType, _: never, context: Context) => {
+import { Context } from '../../../context.js';
+import { PaymentProvider as PaymentProviderType } from '@unchainedshop/core-payment';
+export declare const PaymentProvider: {
+    interface(provider: PaymentProviderType): {
         _id: string;
         label: string;
         version: string;
     };
-    isActive: (provider: PaymentProviderType, _: never, context: Context) => Promise<boolean>;
-    configurationError: (provider: PaymentProviderType, _: never, context: Context) => Promise<PaymentError>;
-    simulatedPrice: (provider: PaymentProviderType, params: {
-        currency?: string;
-        orderId: string;
-        useNetPrice?: boolean;
+    configurationError(paymentProvider: PaymentProviderType, _: any, requestContext: Context): Promise<import("@unchainedshop/core").PaymentError>;
+    isActive(paymentProvider: PaymentProviderType, _: any, requestContext: Context): Promise<boolean>;
+    simulatedPrice(paymentProvider: PaymentProviderType, { currency: currencyCode, orderId, useNetPrice, context: providerContext }: {
+        currency: any;
+        orderId: any;
+        useNetPrice: any;
         context: any;
-    }, context: Context) => Promise<{
+    }, requestContext: Context): Promise<{
         _id: string;
         amount: number;
         currencyCode: string;
         countryCode: string;
         isTaxable: boolean;
-        isNetPrice: boolean;
+        isNetPrice: any;
     }>;
-}
-export declare const PaymentProvider: PaymentProviderHelperTypes;
+};
 //# sourceMappingURL=payment-provider-types.d.ts.map

package/lib/resolvers/type/payment/payment-provider-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payment-provider-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-provider-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGnG,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,CACT,QAAQ,EAAE,mBAAmB,EAC7B,CAAC,EAAE,KAAK,EACR,OAAO,EAAE,OAAO,KACb;QACH,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,QAAQ,EAAE,CAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1F,kBAAkB,EAAE,CAClB,QAAQ,EAAE,mBAAmB,EAC7B,CAAC,EAAE,KAAK,EACR,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3B,cAAc,EAAE,CACd,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,EAAE;QACN,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;KACd,EACD,OAAO,EAAE,OAAO,KACb,OAAO,CAAC;QACX,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC,CAAC;CACJ;AACD,eAAO,MAAM,eAAe,EAAE,0BA6D7B,CAAC"}
+{"version":3,"file":"payment-provider-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAIrF,eAAO,MAAM,eAAe;wBACN,mBAAmB;;;;;wCAUG,mBAAmB,0BAAqB,OAAO;8BAKzD,mBAAmB,0BAAqB,OAAO;oCAM5D,mBAAmB;;;;;uBAEpB,OAAO;;;;;;;;CAkC1B,CAAC"}

package/lib/resolvers/type/payment/payment-provider-types.js

@@ -1,42 +1,43 @@
-import crypto from 'crypto';
-import { PaymentPricingDirector } from '@unchainedshop/core-payment';
+import { PaymentDirector, PaymentPricingDirector } from '@unchainedshop/core';
+import { sha256 } from '@unchainedshop/utils';
 export const PaymentProvider = {
-    interface(obj, _, { modules }) {
-        const Interface = modules.payment.paymentProviders.findInterface(obj);
-        if (!Interface)
+    interface(provider) {
+        const Adapter = PaymentDirector.getAdapter(provider.adapterKey);
+        if (!Adapter)
             return null;
-        return Interface;
+        return {
+            _id: Adapter.key,
+            label: Adapter.label,
+            version: Adapter.version,
+        };
     },
-    configurationError(obj, _, requestContext) {
-        const { modules } = requestContext;
-        return modules.payment.paymentProviders.configurationError(obj, requestContext);
+    async configurationError(paymentProvider, _, requestContext) {
+        const adapter = await PaymentDirector.actions(paymentProvider, {}, requestContext);
+        return adapter.configurationError();
     },
-    isActive(obj, _, requestContext) {
-        const { modules } = requestContext;
-        return modules.payment.paymentProviders.isActive(obj, requestContext);
+    async isActive(paymentProvider, _, requestContext) {
+        const adapter = await PaymentDirector.actions(paymentProvider, {}, requestContext);
+        return adapter.isActive();
     },
     async simulatedPrice(paymentProvider, { currency: currencyCode, orderId, useNetPrice, context: providerContext }, requestContext) {
         const { modules, countryContext: country, user } = requestContext;
         const order = await modules.orders.findOrder({ orderId });
-        const currency = currencyCode || requestContext.currencyContext;
-        const pricingDirector = await PaymentPricingDirector.actions({
+        const currency = currencyCode || order?.currency || requestContext.currencyContext;
+        const pricingContext = {
             country,
             currency,
             provider: paymentProvider,
             order,
             providerContext,
             user,
-        }, requestContext);
-        const calculated = await pricingDirector.calculate();
+        };
+        const calculated = await PaymentPricingDirector.rebuildCalculation(pricingContext, requestContext);
         if (!calculated || !calculated.length)
             return null;
-        const pricing = pricingDirector.calculationSheet();
+        const pricing = PaymentPricingDirector.calculationSheet(pricingContext, calculated);
         const orderPrice = pricing.total({ useNetPrice });
         return {
-            _id: crypto
-                .createHash('sha256')
-                .update([paymentProvider._id, country, useNetPrice, order ? order._id : ''].join(''))
-                .digest('hex'),
+            _id: await sha256([paymentProvider._id, country, useNetPrice, order ? order._id : ''].join('')),
             amount: orderPrice.amount,
             currencyCode: orderPrice.currency,
             countryCode: country,