@unchainedshop/core-payment 2.2.2 → 2.3.0

package/lib/director/PaymentError.js

@@ -4,5 +4,5 @@ export var PaymentError;
     PaymentError["NOT_IMPLEMENTED"] = "NOT_IMPLEMENTED";
     PaymentError["INCOMPLETE_CONFIGURATION"] = "INCOMPLETE_CONFIGURATION";
     PaymentError["WRONG_CREDENTIALS"] = "WRONG_CREDENTIALS";
-})(PaymentError = PaymentError || (PaymentError = {}));
+})(PaymentError || (PaymentError = {}));
 //# sourceMappingURL=PaymentError.js.map

package/lib/director/PaymentError.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaymentError.js","sourceRoot":"","sources":["../../src/director/PaymentError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,uDAAuC,CAAA;IACvC,mDAAmC,CAAA;IACnC,qEAAqD,CAAA;IACrD,uDAAuC,CAAA;AACzC,CAAC,EALW,YAAY,GAAZ,YAAY,KAAZ,YAAY,QAKvB"}
+{"version":3,"file":"PaymentError.js","sourceRoot":"","sources":["../../src/director/PaymentError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,uDAAuC,CAAA;IACvC,mDAAmC,CAAA;IACnC,qEAAqD,CAAA;IACrD,uDAAuC,CAAA;AACzC,CAAC,EALW,YAAY,KAAZ,YAAY,QAKvB"}

package/lib/director/PaymentPricingDirector.js

@@ -3,33 +3,42 @@ import { PaymentPricingSheet } from './PaymentPricingSheet.js';
 const baseDirector = BasePricingDirector('PaymentPricingDirector');
 export const PaymentPricingDirector = {
     ...baseDirector,
-    async buildPricingContext({ item, ...context }, unchainedAPI) {
-        if (!item)
+    async buildPricingContext(context, unchainedAPI) {
+        const { modules } = unchainedAPI;
+        if ('item' in context) {
+            const { item } = context;
+            const order = await modules.orders.findOrder({
+                orderId: item.orderId,
+            });
+            const provider = await modules.payment.paymentProviders.findProvider({
+                paymentProviderId: item.paymentProviderId,
+            });
+            const user = await modules.users.findUserById(order.userId);
+            const discounts = await modules.orders.discounts.findOrderDiscounts({
+                orderId: item.orderId,
+            });
             return {
-                discounts: [],
-                ...context,
                 ...unchainedAPI,
+                country: order.countryCode,
+                currency: order.currency,
+                order,
+                provider,
+                user,
+                discounts,
+                orderPayment: item,
+                providerContext: null,
             };
-        const order = await unchainedAPI.modules.orders.findOrder({
-            orderId: item.orderId,
-        });
-        const provider = await unchainedAPI.modules.payment.paymentProviders.findProvider({
-            paymentProviderId: item.paymentProviderId,
-        });
-        const user = await unchainedAPI.modules.users.findUserById(order.userId);
-        const discounts = await unchainedAPI.modules.orders.discounts.findOrderDiscounts({
-            orderId: item.orderId,
-        });
+        }
         return {
-            country: order.countryCode,
-            currency: order.currency,
-            ...context,
             ...unchainedAPI,
-            order,
-            orderPayment: item,
-            provider,
-            user,
-            discounts,
+            country: context.country,
+            currency: context.currency,
+            order: context.order,
+            provider: context.provider,
+            user: context.user,
+            discounts: [],
+            orderPayment: null,
+            providerContext: context.providerContext,
         };
     },
     async actions(pricingContext, unchainedAPI) {

package/lib/director/PaymentPricingDirector.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaymentPricingDirector.js","sourceRoot":"","sources":["../../src/director/PaymentPricingDirector.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,YAAY,GAAG,mBAAmB,CAKtC,wBAAwB,CAAC,CAAC;AAE5B,MAAM,CAAC,MAAM,sBAAsB,GAA4B;IAC7D,GAAG,YAAY;IAEf,KAAK,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,EAAE,YAAY;QAC1D,IAAI,CAAC,IAAI;YACP,OAAO;gBACL,SAAS,EAAE,EAAE;gBACb,GAAG,OAAO;gBACV,GAAG,YAAY;aAChB,CAAC;QAEJ,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;YACxD,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YAChF,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC1C,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;YAC/E,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,WAAW;YAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,GAAG,OAAO;YACV,GAAG,YAAY;YACf,KAAK;YACL,YAAY,EAAE,IAAI;YAClB,QAAQ;YACR,IAAI;YACJ,SAAS;SACV,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY;QACxC,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnG,OAAO;YACL,GAAG,OAAO;YACV,gBAAgB;gBACd,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;gBACrC,OAAO,mBAAmB,CAAC;oBACzB,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE;oBACrC,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"PaymentPricingDirector.js","sourceRoot":"","sources":["../../src/director/PaymentPricingDirector.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,YAAY,GAAG,mBAAmB,CAKtC,wBAAwB,CAAC,CAAC;AAE5B,MAAM,CAAC,MAAM,sBAAsB,GAA4B;IAC7D,GAAG,YAAY;IAEf,KAAK,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY;QAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QAEjC,IAAI,MAAM,IAAI,OAAO,EAAE;YACrB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YACzB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC3C,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;gBACnE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;aAC1C,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;gBAClE,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;YAEH,OAAO;gBACL,GAAG,YAAY;gBACf,OAAO,EAAE,KAAK,CAAC,WAAW;gBAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,KAAK;gBACL,QAAQ;gBACR,IAAI;gBACJ,SAAS;gBACT,YAAY,EAAE,IAAI;gBAClB,eAAe,EAAE,IAAI;aACtB,CAAC;SACH;QAED,OAAO;YACL,GAAG,YAAY;YACf,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,SAAS,EAAE,EAAE;YACb,YAAY,EAAE,IAAI;YAClB,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY;QACxC,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnG,OAAO;YACL,GAAG,OAAO;YACV,gBAAgB;gBACd,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;gBACrC,OAAO,mBAAmB,CAAC;oBACzB,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE;oBACrC,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/director/PaymentProviderType.js

@@ -3,5 +3,5 @@ export var PaymentProviderType;
     PaymentProviderType["CARD"] = "CARD";
     PaymentProviderType["INVOICE"] = "INVOICE";
     PaymentProviderType["GENERIC"] = "GENERIC";
-})(PaymentProviderType = PaymentProviderType || (PaymentProviderType = {}));
+})(PaymentProviderType || (PaymentProviderType = {}));
 //# sourceMappingURL=PaymentProviderType.js.map

package/lib/director/PaymentProviderType.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaymentProviderType.js","sourceRoot":"","sources":["../../src/director/PaymentProviderType.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,oCAAa,CAAA;IACb,0CAAmB,CAAA;IACnB,0CAAmB,CAAA;AACrB,CAAC,EAJW,mBAAmB,GAAnB,mBAAmB,KAAnB,mBAAmB,QAI9B"}
+{"version":3,"file":"PaymentProviderType.js","sourceRoot":"","sources":["../../src/director/PaymentProviderType.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,oCAAa,CAAA;IACb,0CAAmB,CAAA;IACnB,0CAAmB,CAAA;AACrB,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-payment",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "main": "lib/payment-index.js",
   "exports": {
     ".": "./lib/payment-index.js",
@@ -31,16 +31,16 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^2.2.2",
-    "@unchainedshop/logger": "^2.2.2",
-    "@unchainedshop/utils": "^2.2.2",
+    "@unchainedshop/events": "^2.3.0",
+    "@unchainedshop/logger": "^2.3.0",
+    "@unchainedshop/utils": "^2.3.0",
     "simpl-schema": "=3.2.0"
   },
   "devDependencies": {
-    "@types/node": "^18.16.16",
-    "@unchainedshop/types": "^2.2.2",
-    "jest": "^29.5.0",
-    "ts-jest": "^29.1.0",
-    "typescript": "^4.9.5"
+    "@types/node": "^18.16.19",
+    "@unchainedshop/types": "^2.3.0",
+    "jest": "^29.6.0",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.1.6"
   }
 }

package/src/director/PaymentPricingDirector.ts

@@ -18,35 +18,45 @@ const baseDirector = BasePricingDirector<
 export const PaymentPricingDirector: IPaymentPricingDirector = {
   ...baseDirector,
 
-  async buildPricingContext({ item, ...context }, unchainedAPI) {
-    if (!item)
+  async buildPricingContext(context, unchainedAPI) {
+    const { modules } = unchainedAPI;
+
+    if ('item' in context) {
+      const { item } = context;
+      const order = await modules.orders.findOrder({
+        orderId: item.orderId,
+      });
+      const provider = await modules.payment.paymentProviders.findProvider({
+        paymentProviderId: item.paymentProviderId,
+      });
+      const user = await modules.users.findUserById(order.userId);
+      const discounts = await modules.orders.discounts.findOrderDiscounts({
+        orderId: item.orderId,
+      });
+
       return {
-        discounts: [],
-        ...context,
         ...unchainedAPI,
+        country: order.countryCode,
+        currency: order.currency,
+        order,
+        provider,
+        user,
+        discounts,
+        orderPayment: item,
+        providerContext: null,
       };
-
-    const order = await unchainedAPI.modules.orders.findOrder({
-      orderId: item.orderId,
-    });
-    const provider = await unchainedAPI.modules.payment.paymentProviders.findProvider({
-      paymentProviderId: item.paymentProviderId,
-    });
-    const user = await unchainedAPI.modules.users.findUserById(order.userId);
-    const discounts = await unchainedAPI.modules.orders.discounts.findOrderDiscounts({
-      orderId: item.orderId,
-    });
+    }
 
     return {
-      country: order.countryCode,
-      currency: order.currency,
-      ...context,
       ...unchainedAPI,
-      order,
-      orderPayment: item,
-      provider,
-      user,
-      discounts,
+      country: context.country,
+      currency: context.currency,
+      order: context.order,
+      provider: context.provider,
+      user: context.user,
+      discounts: [],
+      orderPayment: null,
+      providerContext: context.providerContext,
     };
   },