@unchainedshop/core-payment 2.0.0-beta7 → 2.0.0-beta9
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.
- package/jest.config.js +9 -0
- package/lib/db/PaymentProvidersSchema.js +0 -1
- package/lib/db/PaymentProvidersSchema.js.map +1 -1
- package/lib/director/PaymentDirector.js +3 -3
- package/lib/director/PaymentDirector.js.map +1 -1
- package/lib/director/PaymentPricingDirector.js +9 -9
- package/lib/director/PaymentPricingDirector.js.map +1 -1
- package/lib/module/configurePaymentCredentialsModule.js +0 -2
- package/lib/module/configurePaymentCredentialsModule.js.map +1 -1
- package/lib/module/configurePaymentModule.js +20 -2
- package/lib/module/configurePaymentModule.js.map +1 -1
- package/lib/module/configurePaymentProvidersModule.d.ts +5 -1
- package/lib/module/configurePaymentProvidersModule.js +39 -39
- package/lib/module/configurePaymentProvidersModule.js.map +1 -1
- package/lib/payment-index.d.ts +0 -1
- package/lib/payment-index.js +0 -1
- package/lib/payment-index.js.map +1 -1
- package/lib/payment-settings.js +2 -13
- package/lib/payment-settings.js.map +1 -1
- package/package.json +10 -9
- package/src/db/PaymentProvidersSchema.js +0 -1
- package/src/director/PaymentDirector.ts +3 -3
- package/src/director/PaymentPricingDirector.ts +9 -9
- package/src/module/configurePaymentCredentialsModule.ts +0 -2
- package/src/module/configurePaymentModule.ts +32 -2
- package/src/module/configurePaymentProvidersModule.ts +43 -47
- package/src/payment-index.ts +0 -1
- package/src/payment-settings.ts +1 -16
- package/tests/payment-index.test.ts +12 -43
- package/lib/service/cancelService.d.ts +0 -2
- package/lib/service/cancelService.js +0 -13
- package/lib/service/cancelService.js.map +0 -1
- package/lib/service/chargeService.d.ts +0 -2
- package/lib/service/chargeService.js +0 -33
- package/lib/service/chargeService.js.map +0 -1
- package/lib/service/confirmService.d.ts +0 -2
- package/lib/service/confirmService.js +0 -13
- package/lib/service/confirmService.js.map +0 -1
- package/lib/service/paymentServices.d.ts +0 -2
- package/lib/service/paymentServices.js +0 -11
- package/lib/service/paymentServices.js.map +0 -1
- package/lib/service/registerPaymentCredentialsService.d.ts +0 -2
- package/lib/service/registerPaymentCredentialsService.js +0 -17
- package/lib/service/registerPaymentCredentialsService.js.map +0 -1
- package/src/service/cancelService.ts +0 -24
- package/src/service/chargeService.ts +0 -47
- package/src/service/confirmService.ts +0 -24
- package/src/service/paymentServices.ts +0 -12
- package/src/service/registerPaymentCredentialsService.ts +0 -28
package/jest.config.js
CHANGED
|
@@ -3,7 +3,6 @@ import SimpleSchema from 'simpl-schema';
|
|
|
3
3
|
export const PaymentProvidersSchema = new SimpleSchema({
|
|
4
4
|
type: { type: String, required: true },
|
|
5
5
|
adapterKey: { type: String, required: true },
|
|
6
|
-
authorId: { type: String, required: true },
|
|
7
6
|
configuration: { type: Array },
|
|
8
7
|
'configuration.$': { type: Object },
|
|
9
8
|
'configuration.$.key': { type: String },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymentProvidersSchema.js","sourceRoot":"","sources":["../../src/db/PaymentProvidersSchema.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,YAAY,CACpD;IACE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC5C,
|
|
1
|
+
{"version":3,"file":"PaymentProvidersSchema.js","sourceRoot":"","sources":["../../src/db/PaymentProvidersSchema.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,YAAY,CACpD;IACE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC5C,aAAa,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;IAC9B,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACnC,qBAAqB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACvC,uBAAuB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACzC,GAAG,OAAO,CAAC,eAAe;CAC3B,EACD,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAC"}
|
|
@@ -5,7 +5,7 @@ const logger = createLogger('unchained:core-payment');
|
|
|
5
5
|
const baseDirector = BaseDirector('PaymentDirector');
|
|
6
6
|
export const PaymentDirector = {
|
|
7
7
|
...baseDirector,
|
|
8
|
-
actions: async (paymentProvider, paymentContext,
|
|
8
|
+
actions: async (paymentProvider, paymentContext, unchainedAPI) => {
|
|
9
9
|
const Adapter = baseDirector.getAdapter(paymentProvider.adapterKey);
|
|
10
10
|
if (!Adapter) {
|
|
11
11
|
throw new Error(`Payment Plugin ${paymentProvider.adapterKey} not available`);
|
|
@@ -14,7 +14,7 @@ export const PaymentDirector = {
|
|
|
14
14
|
...paymentContext,
|
|
15
15
|
};
|
|
16
16
|
if (paymentContext?.orderPayment) {
|
|
17
|
-
const { modules } =
|
|
17
|
+
const { modules } = unchainedAPI;
|
|
18
18
|
const { orderId } = paymentContext.orderPayment;
|
|
19
19
|
const order = paymentContext?.order ||
|
|
20
20
|
(await modules.orders.findOrder({
|
|
@@ -29,7 +29,7 @@ export const PaymentDirector = {
|
|
|
29
29
|
paymentProviderId: paymentProvider._id,
|
|
30
30
|
...newPaymentContext,
|
|
31
31
|
},
|
|
32
|
-
context:
|
|
32
|
+
context: unchainedAPI,
|
|
33
33
|
});
|
|
34
34
|
return {
|
|
35
35
|
configurationError: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymentDirector.js","sourceRoot":"","sources":["../../src/director/PaymentDirector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,GAAG,YAAY,CAAC,wBAAwB,CAAC,CAAC;AACtD,MAAM,YAAY,GAAG,YAAY,CAAkB,iBAAiB,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,eAAe,GAAqB;IAC/C,GAAG,YAAY;IAEf,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"PaymentDirector.js","sourceRoot":"","sources":["../../src/director/PaymentDirector.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,28 +3,28 @@ import { PaymentPricingSheet } from './PaymentPricingSheet';
|
|
|
3
3
|
const baseDirector = BasePricingDirector('PaymentPricingDirector');
|
|
4
4
|
export const PaymentPricingDirector = {
|
|
5
5
|
...baseDirector,
|
|
6
|
-
async buildPricingContext({ item, ...context },
|
|
6
|
+
async buildPricingContext({ item, ...context }, unchainedAPI) {
|
|
7
7
|
if (!item)
|
|
8
8
|
return {
|
|
9
9
|
discounts: [],
|
|
10
10
|
...context,
|
|
11
|
-
...
|
|
11
|
+
...unchainedAPI,
|
|
12
12
|
};
|
|
13
|
-
const order = await
|
|
13
|
+
const order = await unchainedAPI.modules.orders.findOrder({
|
|
14
14
|
orderId: item.orderId,
|
|
15
15
|
});
|
|
16
|
-
const provider = await
|
|
16
|
+
const provider = await unchainedAPI.modules.payment.paymentProviders.findProvider({
|
|
17
17
|
paymentProviderId: item.paymentProviderId,
|
|
18
18
|
});
|
|
19
|
-
const user = await
|
|
20
|
-
const discounts = await
|
|
19
|
+
const user = await unchainedAPI.modules.users.findUserById(order.userId);
|
|
20
|
+
const discounts = await unchainedAPI.modules.orders.discounts.findOrderDiscounts({
|
|
21
21
|
orderId: item.orderId,
|
|
22
22
|
});
|
|
23
23
|
return {
|
|
24
24
|
country: order.countryCode,
|
|
25
25
|
currency: order.currency,
|
|
26
26
|
...context,
|
|
27
|
-
...
|
|
27
|
+
...unchainedAPI,
|
|
28
28
|
order,
|
|
29
29
|
orderPayment: item,
|
|
30
30
|
provider,
|
|
@@ -32,8 +32,8 @@ export const PaymentPricingDirector = {
|
|
|
32
32
|
discounts,
|
|
33
33
|
};
|
|
34
34
|
},
|
|
35
|
-
async actions(pricingContext,
|
|
36
|
-
const actions = await baseDirector.actions(pricingContext,
|
|
35
|
+
async actions(pricingContext, unchainedAPI) {
|
|
36
|
+
const actions = await baseDirector.actions(pricingContext, unchainedAPI, this.buildPricingContext);
|
|
37
37
|
return {
|
|
38
38
|
...actions,
|
|
39
39
|
calculationSheet() {
|
|
@@ -1 +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,uBAAuB,CAAC;AAE5D,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,
|
|
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,uBAAuB,CAAC;AAE5D,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"}
|
|
@@ -46,11 +46,9 @@ export const configurePaymentCredentialsModule = (PaymentCredentials) => {
|
|
|
46
46
|
paymentProviderId,
|
|
47
47
|
isPreferred: false,
|
|
48
48
|
created: new Date(),
|
|
49
|
-
createdBy: userId,
|
|
50
49
|
},
|
|
51
50
|
$set: {
|
|
52
51
|
updated: new Date(),
|
|
53
|
-
updatedBy: userId,
|
|
54
52
|
token,
|
|
55
53
|
meta,
|
|
56
54
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configurePaymentCredentialsModule.js","sourceRoot":"","sources":["../../src/module/configurePaymentCredentialsModule.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAEhF,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAC/C,kBAAsD,EACjB,EAAE;IACvC,MAAM,aAAa,GAAG,KAAK,EAAE,EAAE,MAAM,EAAE,oBAAoB,EAAE,EAAE,EAAE;QAC/D,MAAM,kBAAkB,CAAC,SAAS,CAChC;YACE,GAAG,EAAE,oBAAoB;SAC1B,EACD;YACE,IAAI,EAAE;gBACJ,WAAW,EAAE,IAAI;aAClB;SACF,CACF,CAAC;QACF,MAAM,kBAAkB,CAAC,UAAU,CACjC;YACE,GAAG,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE;YAClC,MAAM;SACP,EACD;YACE,IAAI,EAAE;gBACJ,WAAW,EAAE,KAAK;aACnB;SACF,CACF,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO;QACL,aAAa;QAEb,iBAAiB,EAAE,KAAK,EAAE,EAAE,oBAAoB,EAAE,EAAE,EAAE;YACpD,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,cAAc,CAC9D,oBAAoB,CAAC,oBAAoB,CAAC,EAC1C,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;YACF,OAAO,CAAC,CAAC,gBAAgB,CAAC;QAC5B,CAAC;QAED,qBAAqB,EAAE,KAAK,EAAE,EAAE,oBAAoB,EAAE,MAAM,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,EAAE;YAC5F,OAAO,kBAAkB,CAAC,OAAO,CAC/B,oBAAoB;gBAClB,CAAC,CAAC,oBAAoB,CAAC,oBAAoB,CAAC;gBAC5C,CAAC,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,EACjC,OAAO,CACR,CAAC;QACJ,CAAC;QAED,sBAAsB,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC/C,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;YAC5E,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;YAC9E,MAAM,UAAU,GAAG,GAAG,IAAI,kBAAkB,EAAE,CAAC;YAC/C,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,SAAS,CAC/C,GAAG;gBACD,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC;gBAC3B,CAAC,CAAC;oBACE,MAAM;oBACN,iBAAiB;iBAClB,EACL;gBACE,YAAY,EAAE;oBACZ,GAAG,EAAE,UAAU;oBACf,MAAM;oBACN,iBAAiB;oBACjB,WAAW,EAAE,KAAK;oBAClB,OAAO,EAAE,IAAI,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"configurePaymentCredentialsModule.js","sourceRoot":"","sources":["../../src/module/configurePaymentCredentialsModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,27 @@ export const configurePaymentModule = async ({ db, options: paymentOptions = {},
|
|
|
7
7
|
const PaymentProviders = await PaymentProvidersCollection(db);
|
|
8
8
|
const PaymentCredentials = await PaymentCredentialsCollection(db);
|
|
9
9
|
paymentSettings.configureSettings(paymentOptions);
|
|
10
|
+
const paymentProviders = configurePaymentProvidersModule(PaymentProviders);
|
|
11
|
+
const paymentCredentials = configurePaymentCredentialsModule(PaymentCredentials);
|
|
12
|
+
const registerCredentials = async (paymentProviderId, paymentContext, unchainedAPI) => {
|
|
13
|
+
const registration = await paymentProviders.register(paymentProviderId, paymentContext, unchainedAPI);
|
|
14
|
+
if (!registration)
|
|
15
|
+
return null;
|
|
16
|
+
const paymentCredentialsId = await paymentCredentials.upsertCredentials({
|
|
17
|
+
userId: paymentContext.userId,
|
|
18
|
+
paymentProviderId,
|
|
19
|
+
...registration,
|
|
20
|
+
});
|
|
21
|
+
return paymentCredentials.findPaymentCredential({
|
|
22
|
+
paymentCredentialsId,
|
|
23
|
+
userId: paymentContext.userId,
|
|
24
|
+
paymentProviderId,
|
|
25
|
+
});
|
|
26
|
+
};
|
|
10
27
|
return {
|
|
11
|
-
paymentProviders
|
|
12
|
-
paymentCredentials
|
|
28
|
+
paymentProviders,
|
|
29
|
+
paymentCredentials,
|
|
30
|
+
registerCredentials,
|
|
13
31
|
};
|
|
14
32
|
};
|
|
15
33
|
//# sourceMappingURL=configurePaymentModule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configurePaymentModule.js","sourceRoot":"","sources":["../../src/module/configurePaymentModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAC;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAAE,EAC3C,EAAE,EACF,OAAO,EAAE,cAAc,GAAG,EAAE,GACQ,EAA0B,EAAE;IAChE,MAAM,gBAAgB,GAAG,MAAM,0BAA0B,CAAC,EAAE,CAAC,CAAC;IAC9D,MAAM,kBAAkB,GAAG,MAAM,4BAA4B,CAAC,EAAE,CAAC,CAAC;IAElE,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAElD,
|
|
1
|
+
{"version":3,"file":"configurePaymentModule.js","sourceRoot":"","sources":["../../src/module/configurePaymentModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAC;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAAE,EAC3C,EAAE,EACF,OAAO,EAAE,cAAc,GAAG,EAAE,GACQ,EAA0B,EAAE;IAChE,MAAM,gBAAgB,GAAG,MAAM,0BAA0B,CAAC,EAAE,CAAC,CAAC;IAC9D,MAAM,kBAAkB,GAAG,MAAM,4BAA4B,CAAC,EAAE,CAAC,CAAC;IAElE,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAElD,MAAM,gBAAgB,GAAG,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;IAC3E,MAAM,kBAAkB,GAAG,iCAAiC,CAAC,kBAAkB,CAAC,CAAC;IAEjF,MAAM,mBAAmB,GAAyC,KAAK,EACrE,iBAAiB,EACjB,cAAc,EACd,YAAY,EACZ,EAAE;QACF,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAClD,iBAAiB,EACjB,cAAc,EACd,YAAY,CACb,CAAC;QAEF,IAAI,CAAC,YAAY;YAAE,OAAO,IAAI,CAAC;QAE/B,MAAM,oBAAoB,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,CAAC;YACtE,MAAM,EAAE,cAAc,CAAC,MAAM;YAC7B,iBAAiB;YACjB,GAAG,YAAY;SAChB,CAAC,CAAC;QAEH,OAAO,kBAAkB,CAAC,qBAAqB,CAAC;YAC9C,oBAAoB;YACpB,MAAM,EAAE,cAAc,CAAC,MAAM;YAC7B,iBAAiB;SAClB,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,OAAO;QACL,gBAAgB;QAChB,kBAAkB;QAClB,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
1
|
import { Collection } from '@unchainedshop/types/common';
|
|
2
|
-
import { PaymentModule, PaymentProvider } from '@unchainedshop/types/payments';
|
|
2
|
+
import { PaymentModule, PaymentProvider, PaymentProviderQuery } from '@unchainedshop/types/payments';
|
|
3
|
+
export declare const buildFindSelector: ({ type }?: PaymentProviderQuery) => {
|
|
4
|
+
deleted: any;
|
|
5
|
+
type?: import("@unchainedshop/types/payments").PaymentProviderType;
|
|
6
|
+
};
|
|
3
7
|
export declare const configurePaymentProvidersModule: (PaymentProviders: Collection<PaymentProvider>) => PaymentModule['paymentProviders'];
|
|
@@ -10,7 +10,7 @@ const PAYMENT_PROVIDER_EVENTS = [
|
|
|
10
10
|
'PAYMENT_PROVIDER_UPDATE',
|
|
11
11
|
'PAYMENT_PROVIDER_REMOVE',
|
|
12
12
|
];
|
|
13
|
-
const buildFindSelector = ({ type } = {}) => {
|
|
13
|
+
export const buildFindSelector = ({ type } = {}) => {
|
|
14
14
|
return { ...(type ? { type } : {}), deleted: null };
|
|
15
15
|
};
|
|
16
16
|
const asyncFilter = async (arr, predicate) => {
|
|
@@ -20,9 +20,9 @@ const asyncFilter = async (arr, predicate) => {
|
|
|
20
20
|
export const configurePaymentProvidersModule = (PaymentProviders) => {
|
|
21
21
|
registerEvents(PAYMENT_PROVIDER_EVENTS);
|
|
22
22
|
const mutations = generateDbMutations(PaymentProviders, PaymentProvidersSchema);
|
|
23
|
-
const getPaymentAdapter = async (paymentProviderId, paymentContext,
|
|
23
|
+
const getPaymentAdapter = async (paymentProviderId, paymentContext, unchainedAPI) => {
|
|
24
24
|
const provider = await PaymentProviders.findOne(generateDbFilterById(paymentProviderId), {});
|
|
25
|
-
return PaymentDirector.actions(provider, paymentContext,
|
|
25
|
+
return PaymentDirector.actions(provider, paymentContext, unchainedAPI);
|
|
26
26
|
};
|
|
27
27
|
return {
|
|
28
28
|
// Queries
|
|
@@ -63,11 +63,11 @@ export const configurePaymentProvidersModule = (PaymentProviders) => {
|
|
|
63
63
|
version: Adapter.version,
|
|
64
64
|
}));
|
|
65
65
|
},
|
|
66
|
-
findSupported: async (paymentContext,
|
|
66
|
+
findSupported: async (paymentContext, unchainedAPI) => {
|
|
67
67
|
const allProviders = await PaymentProviders.find({ deleted: null }).toArray();
|
|
68
68
|
const providers = await asyncFilter(allProviders, async (provider) => {
|
|
69
69
|
try {
|
|
70
|
-
const director = await PaymentDirector.actions(provider, paymentContext,
|
|
70
|
+
const director = await PaymentDirector.actions(provider, paymentContext, unchainedAPI);
|
|
71
71
|
return director.isActive();
|
|
72
72
|
}
|
|
73
73
|
catch {
|
|
@@ -77,83 +77,83 @@ export const configurePaymentProvidersModule = (PaymentProviders) => {
|
|
|
77
77
|
return paymentSettings.filterSupportedProviders({
|
|
78
78
|
providers,
|
|
79
79
|
order: paymentContext.order,
|
|
80
|
-
},
|
|
80
|
+
}, unchainedAPI);
|
|
81
81
|
},
|
|
82
|
-
determineDefault: async (paymentProviders, deliveryContext,
|
|
82
|
+
determineDefault: async (paymentProviders, deliveryContext, unchainedAPI) => {
|
|
83
83
|
return paymentSettings.determineDefaultProvider({
|
|
84
84
|
providers: paymentProviders,
|
|
85
85
|
...deliveryContext,
|
|
86
|
-
},
|
|
86
|
+
}, unchainedAPI);
|
|
87
87
|
},
|
|
88
88
|
// Payment Adapter
|
|
89
|
-
configurationError: async (paymentProvider,
|
|
90
|
-
const actions = await PaymentDirector.actions(paymentProvider, {},
|
|
89
|
+
configurationError: async (paymentProvider, unchainedAPI) => {
|
|
90
|
+
const actions = await PaymentDirector.actions(paymentProvider, {}, unchainedAPI);
|
|
91
91
|
return actions.configurationError();
|
|
92
92
|
},
|
|
93
|
-
calculate: async (pricingContext,
|
|
94
|
-
const pricing = await PaymentPricingDirector.actions(pricingContext,
|
|
93
|
+
calculate: async (pricingContext, unchainedAPI) => {
|
|
94
|
+
const pricing = await PaymentPricingDirector.actions(pricingContext, unchainedAPI);
|
|
95
95
|
return pricing.calculate();
|
|
96
96
|
},
|
|
97
|
-
isActive: async (paymentProvider,
|
|
98
|
-
const actions = await PaymentDirector.actions(paymentProvider, {},
|
|
97
|
+
isActive: async (paymentProvider, unchainedAPI) => {
|
|
98
|
+
const actions = await PaymentDirector.actions(paymentProvider, {}, unchainedAPI);
|
|
99
99
|
return actions.isActive();
|
|
100
100
|
},
|
|
101
|
-
isPayLaterAllowed: async (paymentProvider,
|
|
102
|
-
const actions = await PaymentDirector.actions(paymentProvider, {},
|
|
101
|
+
isPayLaterAllowed: async (paymentProvider, unchainedAPI) => {
|
|
102
|
+
const actions = await PaymentDirector.actions(paymentProvider, {}, unchainedAPI);
|
|
103
103
|
return actions.isPayLaterAllowed();
|
|
104
104
|
},
|
|
105
|
-
charge: async (paymentProviderId, paymentContext,
|
|
106
|
-
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext,
|
|
105
|
+
charge: async (paymentProviderId, paymentContext, unchainedAPI) => {
|
|
106
|
+
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
|
|
107
107
|
return adapter.charge();
|
|
108
108
|
},
|
|
109
|
-
register: async (paymentProviderId, paymentContext,
|
|
110
|
-
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext,
|
|
109
|
+
register: async (paymentProviderId, paymentContext, unchainedAPI) => {
|
|
110
|
+
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
|
|
111
111
|
return adapter.register();
|
|
112
112
|
},
|
|
113
|
-
sign: async (paymentProviderId, paymentContext,
|
|
114
|
-
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext,
|
|
113
|
+
sign: async (paymentProviderId, paymentContext, unchainedAPI) => {
|
|
114
|
+
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
|
|
115
115
|
return adapter.sign();
|
|
116
116
|
},
|
|
117
|
-
validate: async (paymentProviderId, paymentContext,
|
|
118
|
-
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext,
|
|
117
|
+
validate: async (paymentProviderId, paymentContext, unchainedAPI) => {
|
|
118
|
+
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
|
|
119
119
|
return adapter.validate();
|
|
120
120
|
},
|
|
121
|
-
cancel: async (paymentProviderId, paymentContext,
|
|
122
|
-
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext,
|
|
121
|
+
cancel: async (paymentProviderId, paymentContext, unchainedAPI) => {
|
|
122
|
+
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
|
|
123
123
|
return adapter.cancel();
|
|
124
124
|
},
|
|
125
|
-
confirm: async (paymentProviderId, paymentContext,
|
|
126
|
-
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext,
|
|
125
|
+
confirm: async (paymentProviderId, paymentContext, unchainedAPI) => {
|
|
126
|
+
const adapter = await getPaymentAdapter(paymentProviderId, paymentContext, unchainedAPI);
|
|
127
127
|
return adapter.confirm();
|
|
128
128
|
},
|
|
129
129
|
// Mutations
|
|
130
|
-
create: async (doc
|
|
130
|
+
create: async (doc) => {
|
|
131
131
|
const Adapter = PaymentDirector.getAdapter(doc.adapterKey);
|
|
132
132
|
if (!Adapter)
|
|
133
133
|
return null;
|
|
134
134
|
const paymentProviderId = await mutations.create({
|
|
135
135
|
configuration: Adapter.initialConfiguration,
|
|
136
136
|
...doc,
|
|
137
|
-
}
|
|
137
|
+
});
|
|
138
138
|
const paymentProvider = await PaymentProviders.findOne(generateDbFilterById(paymentProviderId), {});
|
|
139
|
-
emit('PAYMENT_PROVIDER_CREATE', { paymentProvider });
|
|
139
|
+
await emit('PAYMENT_PROVIDER_CREATE', { paymentProvider });
|
|
140
140
|
return paymentProvider;
|
|
141
141
|
},
|
|
142
|
-
update: async (_id, doc
|
|
143
|
-
await mutations.update(_id, doc
|
|
142
|
+
update: async (_id, doc) => {
|
|
143
|
+
await mutations.update(_id, doc);
|
|
144
144
|
const paymentProvider = await PaymentProviders.findOne(generateDbFilterById(_id), {});
|
|
145
|
-
emit('PAYMENT_PROVIDER_UPDATE', { paymentProvider });
|
|
145
|
+
await emit('PAYMENT_PROVIDER_UPDATE', { paymentProvider });
|
|
146
146
|
return paymentProvider;
|
|
147
147
|
},
|
|
148
|
-
delete: async (_id
|
|
149
|
-
await mutations.delete(_id
|
|
148
|
+
delete: async (_id) => {
|
|
149
|
+
await mutations.delete(_id);
|
|
150
150
|
const paymentProvider = await PaymentProviders.findOne(generateDbFilterById(_id), {});
|
|
151
|
-
emit('PAYMENT_PROVIDER_REMOVE', { paymentProvider });
|
|
151
|
+
await emit('PAYMENT_PROVIDER_REMOVE', { paymentProvider });
|
|
152
152
|
return paymentProvider;
|
|
153
153
|
},
|
|
154
|
-
deletePermanently: async (_id
|
|
154
|
+
deletePermanently: async (_id) => {
|
|
155
155
|
const deliveryProvider = await PaymentProviders.findOne(generateDbFilterById(_id), {});
|
|
156
|
-
await mutations.deletePermanently(_id
|
|
156
|
+
await mutations.deletePermanently(_id);
|
|
157
157
|
return deliveryProvider;
|
|
158
158
|
},
|
|
159
159
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configurePaymentProvidersModule.js","sourceRoot":"","sources":["../../src/module/configurePaymentProvidersModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configurePaymentProvidersModule.js","sourceRoot":"","sources":["../../src/module/configurePaymentProvidersModule.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,uBAAuB,GAAa;IACxC,yBAAyB;IACzB,yBAAyB;IACzB,yBAAyB;CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,IAAI,KAA2B,EAAE,EAAE,EAAE;IACvE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE;IAC3C,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAEtD,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC7C,gBAA6C,EACV,EAAE;IACrC,cAAc,CAAC,uBAAuB,CAAC,CAAC;IAExC,MAAM,SAAS,GAAG,mBAAmB,CACnC,gBAAgB,EAChB,sBAAsB,CACa,CAAC;IAEtC,MAAM,iBAAiB,GAAG,KAAK,EAC7B,iBAAyB,EACzB,cAA8B,EAC9B,YAA2B,EAC3B,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;QAE7F,OAAO,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC,CAAC;IAEF,OAAO;QACL,UAAU;QACV,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACrB,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACtF,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,YAAY,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE;YAC/D,OAAO,gBAAgB,CAAC,OAAO,CAC7B,iBAAiB,CAAC,CAAC,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,KAAK,EACnE,OAAO,CACR,CAAC;QACJ,CAAC;QAED,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACtC,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;YAC3E,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QAED,cAAc,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE;YAC9C,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,cAAc,CACzD,oBAAoB,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAC1D,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;YACF,OAAO,CAAC,CAAC,aAAa,CAAC;QACzB,CAAC;QAED,aAAa,EAAE,CAAC,eAAe,EAAE,EAAE;YACjC,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACvE,IAAI,CAAC,OAAO;gBAAE,OAAO,IAAI,CAAC;YAC1B,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC;QACJ,CAAC;QAED,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE;YACvB,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;QAED,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YAC3B,OAAO,eAAe,CAAC,WAAW,EAAE;iBACjC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;iBAChD,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBACjB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC,CAAC;QACR,CAAC;QAED,aAAa,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE;YACpD,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9E,MAAM,SAAS,GAAsB,MAAM,WAAW,CACpD,YAAY,EACZ,KAAK,EAAE,QAAyB,EAAE,EAAE;gBAClC,IAAI;oBACF,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;oBACvF,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC;iBAC5B;gBAAC,MAAM;oBACN,OAAO,KAAK,CAAC;iBACd;YACH,CAAC,CACF,CAAC;YAEF,OAAO,eAAe,CAAC,wBAAwB,CAC7C;gBACE,SAAS;gBACT,KAAK,EAAE,cAAc,CAAC,KAAK;aAC5B,EACD,YAAY,CACb,CAAC;QACJ,CAAC;QAED,gBAAgB,EAAE,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE;YAC1E,OAAO,eAAe,CAAC,wBAAwB,CAC7C;gBACE,SAAS,EAAE,gBAAgB;gBAC3B,GAAG,eAAe;aACnB,EACD,YAAY,CACb,CAAC;QACJ,CAAC;QAED,kBAAkB;QAElB,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE;YAC1D,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;YACjF,OAAO,OAAO,CAAC,kBAAkB,EAAE,CAAC;QACtC,CAAC;QAED,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YACnF,OAAO,OAAO,CAAC,SAAS,EAAE,CAAC;QAC7B,CAAC;QAED,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;YACjF,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC5B,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE;YACzD,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;YACjF,OAAO,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACrC,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE;YAChE,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;YACzF,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;QAC1B,CAAC;QAED,QAAQ,EAAE,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE;YAClE,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;YACzF,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE;YAC9D,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;YACzF,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;QACxB,CAAC;QAED,QAAQ,EAAE,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE;YAClE,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;YACzF,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC5B,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE;YAChE,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;YACzF,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;QAC1B,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE;YACjE,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;YACzF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QAED,YAAY;QACZ,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACpB,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,CAAC,OAAO;gBAAE,OAAO,IAAI,CAAC;YAE1B,MAAM,iBAAiB,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC;gBAC/C,aAAa,EAAE,OAAO,CAAC,oBAAoB;gBAC3C,GAAG,GAAG;aACP,CAAC,CAAC;YAEH,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,OAAO,CACpD,oBAAoB,CAAC,iBAAiB,CAAC,EACvC,EAAE,CACH,CAAC;YACF,MAAM,IAAI,CAAC,yBAAyB,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;YAC3D,OAAO,eAAe,CAAC;QACzB,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,GAAW,EAAE,GAAoB,EAAE,EAAE;YAClD,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACjC,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YACtF,MAAM,IAAI,CAAC,yBAAyB,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;YAC3D,OAAO,eAAe,CAAC;QACzB,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACpB,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YACtF,MAAM,IAAI,CAAC,yBAAyB,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;YAC3D,OAAO,eAAe,CAAC;QACzB,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC/B,MAAM,gBAAgB,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YACvF,MAAM,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACvC,OAAO,gBAAgB,CAAC;QAC1B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
package/lib/payment-index.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export { configurePaymentModule } from './module/configurePaymentModule';
|
|
2
|
-
export { paymentServices } from './service/paymentServices';
|
|
3
2
|
export { paymentSettings } from './payment-settings';
|
|
4
3
|
export { PaymentDirector } from './director/PaymentDirector';
|
|
5
4
|
export { PaymentAdapter } from './director/PaymentAdapter';
|
package/lib/payment-index.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export { configurePaymentModule } from './module/configurePaymentModule';
|
|
2
|
-
export { paymentServices } from './service/paymentServices';
|
|
3
2
|
export { paymentSettings } from './payment-settings';
|
|
4
3
|
export { PaymentDirector } from './director/PaymentDirector';
|
|
5
4
|
export { PaymentAdapter } from './director/PaymentAdapter';
|
package/lib/payment-index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payment-index.js","sourceRoot":"","sources":["../src/payment-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"payment-index.js","sourceRoot":"","sources":["../src/payment-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC"}
|
package/lib/payment-settings.js
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { createLogger } from '@unchainedshop/logger';
|
|
2
|
-
const logger = createLogger('unchained:core-payment');
|
|
3
1
|
const sortByCreationDate = (left, right) => {
|
|
4
2
|
return new Date(left.created).getTime() - new Date(right.created).getTime();
|
|
5
3
|
};
|
|
@@ -16,20 +14,11 @@ const firstProviderIsDefault = async ({ providers, paymentCredentials }) => {
|
|
|
16
14
|
return foundSupportedPreferredProvider;
|
|
17
15
|
return providers?.length > 0 && providers[0];
|
|
18
16
|
};
|
|
19
|
-
const defaultFilterSupportedProviders = (sortProviders) => async ({ providers }) => {
|
|
20
|
-
return providers.sort(sortProviders);
|
|
21
|
-
};
|
|
22
17
|
export const paymentSettings = {
|
|
23
18
|
filterSupportedProviders: null,
|
|
24
19
|
determineDefaultProvider: null,
|
|
25
|
-
configureSettings({
|
|
26
|
-
|
|
27
|
-
logger.warn('sortProviders is deprecated, please specifc filterSupportedProviders instead');
|
|
28
|
-
paymentSettings.filterSupportedProviders = defaultFilterSupportedProviders(sortProviders);
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
paymentSettings.filterSupportedProviders = filterSupportedProviders;
|
|
32
|
-
}
|
|
20
|
+
configureSettings({ filterSupportedProviders = allProviders, determineDefaultProvider = firstProviderIsDefault, } = {}) {
|
|
21
|
+
paymentSettings.filterSupportedProviders = filterSupportedProviders;
|
|
33
22
|
paymentSettings.determineDefaultProvider = determineDefaultProvider;
|
|
34
23
|
},
|
|
35
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payment-settings.js","sourceRoot":"","sources":["../src/payment-settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"payment-settings.js","sourceRoot":"","sources":["../src/payment-settings.ts"],"names":[],"mappings":"AAOA,MAAM,kBAAkB,GAAG,CAAC,IAAqB,EAAE,KAAsB,EAAE,EAAE;IAC3E,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,YAAY,GAAoB,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;IAC5D,OAAO,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAA6B,KAAK,EAAE,EAAE,SAAS,EAAE,kBAAkB,EAAE,EAAE,EAAE;IACnG,MAAM,+BAA+B,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,wBAAwB,EAAE,EAAE;QAClF,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC,iBAAiB,EAAE,EAAE;YACnD,OAAO,wBAAwB,CAAC,GAAG,KAAK,iBAAiB,CAAC,iBAAiB,CAAC;QAC9E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,+BAA+B;QAAE,OAAO,+BAA+B,CAAC;IAC5E,OAAO,SAAS,EAAE,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAoB;IAC9C,wBAAwB,EAAE,IAAI;IAC9B,wBAAwB,EAAE,IAAI;IAE9B,iBAAiB,CAAC,EAChB,wBAAwB,GAAG,YAAY,EACvC,wBAAwB,GAAG,sBAAsB,GAClD,GAAG,EAAE;QACJ,eAAe,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACpE,eAAe,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;IACtE,CAAC;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-payment",
|
|
3
|
-
"version": "2.0.0-
|
|
3
|
+
"version": "2.0.0-beta9",
|
|
4
4
|
"main": "lib/payment-index.js",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./lib/payment-index.js",
|
|
@@ -12,7 +12,8 @@
|
|
|
12
12
|
"clean": "rm -rf lib",
|
|
13
13
|
"build": "npm run clean && tsc",
|
|
14
14
|
"watch": "tsc -w",
|
|
15
|
-
"test": "jest --
|
|
15
|
+
"test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --forceExit",
|
|
16
|
+
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --detectOpenHandles --forceExit"
|
|
16
17
|
},
|
|
17
18
|
"repository": {
|
|
18
19
|
"type": "git",
|
|
@@ -30,16 +31,16 @@
|
|
|
30
31
|
},
|
|
31
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
32
33
|
"dependencies": {
|
|
33
|
-
"@unchainedshop/events": "^2.0.0-
|
|
34
|
-
"@unchainedshop/logger": "^2.0.0-
|
|
35
|
-
"@unchainedshop/utils": "^2.0.0-
|
|
36
|
-
"simpl-schema": "^3.0
|
|
34
|
+
"@unchainedshop/events": "^2.0.0-beta9",
|
|
35
|
+
"@unchainedshop/logger": "^2.0.0-beta9",
|
|
36
|
+
"@unchainedshop/utils": "^2.0.0-beta9",
|
|
37
|
+
"simpl-schema": "^3.2.0"
|
|
37
38
|
},
|
|
38
39
|
"devDependencies": {
|
|
39
|
-
"@types/node": "^18.11.
|
|
40
|
-
"@unchainedshop/types": "^2.0.0-
|
|
40
|
+
"@types/node": "^18.11.12",
|
|
41
|
+
"@unchainedshop/types": "^2.0.0-beta9",
|
|
41
42
|
"jest": "^29.3.1",
|
|
42
43
|
"ts-jest": "^29.0.3",
|
|
43
|
-
"typescript": "^4.
|
|
44
|
+
"typescript": "^4.9.4"
|
|
44
45
|
}
|
|
45
46
|
}
|
|
@@ -5,7 +5,6 @@ export const PaymentProvidersSchema = new SimpleSchema(
|
|
|
5
5
|
{
|
|
6
6
|
type: { type: String, required: true },
|
|
7
7
|
adapterKey: { type: String, required: true },
|
|
8
|
-
authorId: { type: String, required: true },
|
|
9
8
|
configuration: { type: Array },
|
|
10
9
|
'configuration.$': { type: Object },
|
|
11
10
|
'configuration.$.key': { type: String },
|
|
@@ -9,7 +9,7 @@ const baseDirector = BaseDirector<IPaymentAdapter>('PaymentDirector');
|
|
|
9
9
|
export const PaymentDirector: IPaymentDirector = {
|
|
10
10
|
...baseDirector,
|
|
11
11
|
|
|
12
|
-
actions: async (paymentProvider, paymentContext,
|
|
12
|
+
actions: async (paymentProvider, paymentContext, unchainedAPI) => {
|
|
13
13
|
const Adapter = baseDirector.getAdapter(paymentProvider.adapterKey) as IPaymentAdapter;
|
|
14
14
|
|
|
15
15
|
if (!Adapter) {
|
|
@@ -21,7 +21,7 @@ export const PaymentDirector: IPaymentDirector = {
|
|
|
21
21
|
};
|
|
22
22
|
|
|
23
23
|
if (paymentContext?.orderPayment) {
|
|
24
|
-
const { modules } =
|
|
24
|
+
const { modules } = unchainedAPI;
|
|
25
25
|
const { orderId } = paymentContext.orderPayment;
|
|
26
26
|
const order =
|
|
27
27
|
paymentContext?.order ||
|
|
@@ -39,7 +39,7 @@ export const PaymentDirector: IPaymentDirector = {
|
|
|
39
39
|
paymentProviderId: paymentProvider._id,
|
|
40
40
|
...newPaymentContext,
|
|
41
41
|
},
|
|
42
|
-
context:
|
|
42
|
+
context: unchainedAPI,
|
|
43
43
|
});
|
|
44
44
|
|
|
45
45
|
return {
|
|
@@ -18,22 +18,22 @@ const baseDirector = BasePricingDirector<
|
|
|
18
18
|
export const PaymentPricingDirector: IPaymentPricingDirector = {
|
|
19
19
|
...baseDirector,
|
|
20
20
|
|
|
21
|
-
async buildPricingContext({ item, ...context },
|
|
21
|
+
async buildPricingContext({ item, ...context }, unchainedAPI) {
|
|
22
22
|
if (!item)
|
|
23
23
|
return {
|
|
24
24
|
discounts: [],
|
|
25
25
|
...context,
|
|
26
|
-
...
|
|
26
|
+
...unchainedAPI,
|
|
27
27
|
};
|
|
28
28
|
|
|
29
|
-
const order = await
|
|
29
|
+
const order = await unchainedAPI.modules.orders.findOrder({
|
|
30
30
|
orderId: item.orderId,
|
|
31
31
|
});
|
|
32
|
-
const provider = await
|
|
32
|
+
const provider = await unchainedAPI.modules.payment.paymentProviders.findProvider({
|
|
33
33
|
paymentProviderId: item.paymentProviderId,
|
|
34
34
|
});
|
|
35
|
-
const user = await
|
|
36
|
-
const discounts = await
|
|
35
|
+
const user = await unchainedAPI.modules.users.findUserById(order.userId);
|
|
36
|
+
const discounts = await unchainedAPI.modules.orders.discounts.findOrderDiscounts({
|
|
37
37
|
orderId: item.orderId,
|
|
38
38
|
});
|
|
39
39
|
|
|
@@ -41,7 +41,7 @@ export const PaymentPricingDirector: IPaymentPricingDirector = {
|
|
|
41
41
|
country: order.countryCode,
|
|
42
42
|
currency: order.currency,
|
|
43
43
|
...context,
|
|
44
|
-
...
|
|
44
|
+
...unchainedAPI,
|
|
45
45
|
order,
|
|
46
46
|
orderPayment: item,
|
|
47
47
|
provider,
|
|
@@ -50,8 +50,8 @@ export const PaymentPricingDirector: IPaymentPricingDirector = {
|
|
|
50
50
|
};
|
|
51
51
|
},
|
|
52
52
|
|
|
53
|
-
async actions(pricingContext,
|
|
54
|
-
const actions = await baseDirector.actions(pricingContext,
|
|
53
|
+
async actions(pricingContext, unchainedAPI) {
|
|
54
|
+
const actions = await baseDirector.actions(pricingContext, unchainedAPI, this.buildPricingContext);
|
|
55
55
|
return {
|
|
56
56
|
...actions,
|
|
57
57
|
calculationSheet() {
|