@unchainedshop/core 4.3.0 → 4.3.1
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/lib/directors/BasePricingDirector.d.ts +1 -1
- package/lib/directors/BasePricingDirector.d.ts.map +1 -1
- package/lib/directors/BasePricingDirector.js +5 -1
- package/lib/directors/BasePricingDirector.js.map +1 -1
- package/lib/directors/DeliveryAdapter.d.ts +4 -3
- package/lib/directors/DeliveryAdapter.d.ts.map +1 -1
- package/lib/directors/DeliveryAdapter.js.map +1 -1
- package/lib/directors/DeliveryDirector.js +1 -1
- package/lib/directors/DeliveryDirector.js.map +1 -1
- package/lib/directors/EventListenerWorker.js +1 -1
- package/lib/directors/EventListenerWorker.js.map +1 -1
- package/lib/directors/FilterDirector.js.map +1 -1
- package/lib/directors/IntervalWorker.js +1 -1
- package/lib/directors/IntervalWorker.js.map +1 -1
- package/lib/directors/PaymentAdapter.d.ts +4 -5
- package/lib/directors/PaymentAdapter.d.ts.map +1 -1
- package/lib/directors/PaymentAdapter.js.map +1 -1
- package/lib/directors/PaymentDirector.d.ts.map +1 -1
- package/lib/directors/PaymentDirector.js +8 -14
- package/lib/directors/PaymentDirector.js.map +1 -1
- package/package.json +1 -1
- package/src/directors/BasePricingDirector.ts +7 -5
- package/src/directors/DeliveryAdapter.ts +6 -4
- package/src/directors/DeliveryDirector.ts +1 -1
- package/src/directors/EventListenerWorker.ts +1 -1
- package/src/directors/FilterDirector.ts +1 -1
- package/src/directors/IntervalWorker.ts +1 -1
- package/src/directors/PaymentAdapter.ts +9 -5
- package/src/directors/PaymentDirector.ts +16 -18
|
@@ -13,5 +13,5 @@ export type IPricingDirector<PricingContext extends BasePricingContext, Calculat
|
|
|
13
13
|
rebuildCalculation: (pricingContext: PricingContext, unchainedAPI: Context) => Promise<Calculation[]>;
|
|
14
14
|
calculationSheet: (pricingContext: PricingContext, calculation: Calculation[]) => PricingAdapterSheet;
|
|
15
15
|
};
|
|
16
|
-
export declare const BasePricingDirector: <DirectorContext extends BasePricingContext, AdapterContext extends BasePricingAdapterContext, Calculation extends PricingCalculation, PricingAdapter extends IPricingAdapter<AdapterContext, Calculation, IPricingSheet<Calculation>>>(directorName: string) => IPricingDirector<DirectorContext, Calculation, AdapterContext, IPricingSheet<Calculation>, PricingAdapter
|
|
16
|
+
export declare const BasePricingDirector: <DirectorContext extends BasePricingContext, AdapterContext extends BasePricingAdapterContext, Calculation extends PricingCalculation, PricingAdapter extends IPricingAdapter<AdapterContext, Calculation, IPricingSheet<Calculation>>>(directorName: string) => IPricingDirector<DirectorContext, Calculation, AdapterContext, IPricingSheet<Calculation>, PricingAdapter>;
|
|
17
17
|
//# sourceMappingURL=BasePricingDirector.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasePricingDirector.d.ts","sourceRoot":"","sources":["../../src/directors/BasePricingDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAIxC,MAAM,WAAW,QAAQ,CAAC,qBAAqB;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,qBAAqB,CAAC;CACtC;AAED,MAAM,MAAM,gBAAgB,CAC1B,cAAc,SAAS,kBAAkB,EACzC,WAAW,SAAS,kBAAkB,EACtC,qBAAqB,SAAS,yBAAyB,EACvD,mBAAmB,SAAS,aAAa,CAAC,WAAW,CAAC,EACtD,OAAO,SAAS,eAAe,CAAC,qBAAqB,GAAG,OAAO,EAAE,WAAW,EAAE,mBAAmB,CAAC,EAClG,OAAO,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,IAC5B,aAAa,CAAC,OAAO,CAAC,GAAG;IAC3B,mBAAmB,EAAE,CACnB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,OAAO,KAClB,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAEpC,kBAAkB,EAAE,CAAC,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAEtG,gBAAgB,EAAE,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,mBAAmB,CAAC;CACvG,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,eAAe,SAAS,kBAAkB,EAC1C,cAAc,SAAS,yBAAyB,EAChD,WAAW,SAAS,kBAAkB,EACtC,cAAc,SAAS,eAAe,CAAC,cAAc,EAAE,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,EAE/F,cAAc,MAAM,KACnB,gBAAgB,CACjB,eAAe,EACf,WAAW,EACX,cAAc,EACd,aAAa,CAAC,WAAW,CAAC,EAC1B,cAAc,
|
|
1
|
+
{"version":3,"file":"BasePricingDirector.d.ts","sourceRoot":"","sources":["../../src/directors/BasePricingDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAIxC,MAAM,WAAW,QAAQ,CAAC,qBAAqB;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,qBAAqB,CAAC;CACtC;AAED,MAAM,MAAM,gBAAgB,CAC1B,cAAc,SAAS,kBAAkB,EACzC,WAAW,SAAS,kBAAkB,EACtC,qBAAqB,SAAS,yBAAyB,EACvD,mBAAmB,SAAS,aAAa,CAAC,WAAW,CAAC,EACtD,OAAO,SAAS,eAAe,CAAC,qBAAqB,GAAG,OAAO,EAAE,WAAW,EAAE,mBAAmB,CAAC,EAClG,OAAO,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,IAC5B,aAAa,CAAC,OAAO,CAAC,GAAG;IAC3B,mBAAmB,EAAE,CACnB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,OAAO,KAClB,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAEpC,kBAAkB,EAAE,CAAC,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAEtG,gBAAgB,EAAE,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,mBAAmB,CAAC;CACvG,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,eAAe,SAAS,kBAAkB,EAC1C,cAAc,SAAS,yBAAyB,EAChD,WAAW,SAAS,kBAAkB,EACtC,cAAc,SAAS,eAAe,CAAC,cAAc,EAAE,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,EAE/F,cAAc,MAAM,KACnB,gBAAgB,CACjB,eAAe,EACf,WAAW,EACX,cAAc,EACd,aAAa,CAAC,WAAW,CAAC,EAC1B,cAAc,CA2Ff,CAAC"}
|
|
@@ -27,6 +27,10 @@ export const BasePricingDirector = (directorName) => {
|
|
|
27
27
|
if (!resolvedCalculation)
|
|
28
28
|
return null;
|
|
29
29
|
const discounts = await Promise.all(context.discounts.map(async (orderDiscount) => {
|
|
30
|
+
// TODO: We shouldn't need to fetch this here, most probably we already have an order in context
|
|
31
|
+
// 1. it should propably be required to pass an order
|
|
32
|
+
// 2. we should pass the order in the pricing context or pricing adapter context
|
|
33
|
+
// 3. it can't be different orders for different discounts in the same calculation rebuild
|
|
30
34
|
const order = await unchainedAPI.modules.orders.findOrder({
|
|
31
35
|
orderId: orderDiscount.orderId,
|
|
32
36
|
});
|
|
@@ -34,7 +38,7 @@ export const BasePricingDirector = (directorName) => {
|
|
|
34
38
|
if (!DiscountAdapter)
|
|
35
39
|
return null;
|
|
36
40
|
const adapter = await DiscountAdapter.actions({
|
|
37
|
-
context: { order, orderDiscount, code: orderDiscount.code, ...unchainedAPI },
|
|
41
|
+
context: { order: order, orderDiscount, code: orderDiscount.code, ...unchainedAPI },
|
|
38
42
|
});
|
|
39
43
|
const configuration = adapter.discountForPricingAdapterKey({
|
|
40
44
|
pricingAdapterKey: Adapter.key,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasePricingDirector.js","sourceRoot":"","sources":["../../src/directors/BasePricingDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAqC,MAAM,sBAAsB,CAAC;AAGvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrD,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;AAyB9C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAMjC,YAAoB,
|
|
1
|
+
{"version":3,"file":"BasePricingDirector.js","sourceRoot":"","sources":["../../src/directors/BasePricingDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAqC,MAAM,sBAAsB,CAAC;AAGvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrD,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;AAyB9C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAMjC,YAAoB,EAOpB,EAAE;IACF,MAAM,YAAY,GAAG,YAAY,CAAiB,YAAY,EAAE;QAC9D,cAAc,EAAE,YAAY;KAC7B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAMV;QACF,GAAG,YAAY;QAEf,mBAAmB,EAAE,KAAK,IAAI,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QAED,gBAAgB;YACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QAED,KAAK,CAAC,kBAAkB,CAAwB,cAAc,EAAE,YAAY;YAC1E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YAE7E,IAAI,WAAW,GAAyB,EAAE,CAAC;YAE3C,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC;gBACxC,aAAa,EAAE,CAAC,OAAO,EAAE,EAAE;oBACzB,OAAO,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBACzC,CAAC;aACF,CAAC,CAAC;YAEH,WAAW,GAAG,MAAM,QAAQ,CAAC,MAAM,CACjC,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE;gBACjC,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAAC;gBAClD,IAAI,CAAC,mBAAmB;oBAAE,OAAO,IAAI,CAAC;gBAEtC,MAAM,SAAS,GAA6B,MAAM,OAAO,CAAC,GAAG,CAC3D,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;oBAC5C,gGAAgG;oBAChG,qDAAqD;oBACrD,gFAAgF;oBAChF,0FAA0F;oBAC1F,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;wBACxD,OAAO,EAAE,aAAa,CAAC,OAAO;qBAC/B,CAAC,CAAC;oBACH,MAAM,eAAe,GAAG,qBAAqB,CAAC,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;oBACpF,IAAI,CAAC,eAAe;wBAAE,OAAO,IAAI,CAAC;oBAElC,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;wBAC5C,OAAO,EAAE,EAAE,KAAK,EAAE,KAAM,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,GAAG,YAAY,EAAE;qBACrF,CAAC,CAAC;oBAEH,MAAM,aAAa,GAAG,OAAO,CAAC,4BAA4B,CAAC;wBACzD,iBAAiB,EAAE,OAAO,CAAC,GAAG;wBAC9B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,mBAAmB,CAAC;qBAC7E,CAAC,CAAC;oBAEH,OAAO;wBACL,UAAU,EAAE,aAAa,CAAC,GAAG;wBAC7B,aAAa;qBACd,CAAC;gBACJ,CAAC,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;wBAC9B,OAAO;wBACP,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,mBAAmB,CAAC;wBAC5E,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,aAAa,KAAK,IAAI,CAAoB;qBACjF,CAAC,CAAC;oBAEH,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;oBACxD,IAAI,CAAC,qBAAqB;wBAAE,OAAO,IAAI,CAAC;oBACxC,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;oBAChE,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC;gBACD,OAAO,mBAAmB,CAAC;YAC7B,CAAC,EACD,OAAO,CAAC,OAAO,CAAC,EAAmB,CAAC,CACrC,CAAC;YAEF,OAAO,WAAW,IAAK,EAAoB,CAAC;QAC9C,CAAC;KACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { IBaseAdapter } from '@unchainedshop/utils';
|
|
1
|
+
import type { IBaseAdapter } from '@unchainedshop/utils';
|
|
2
2
|
import type { Order, OrderPosition, OrderDelivery } from '@unchainedshop/core-orders';
|
|
3
3
|
import type { Product } from '@unchainedshop/core-products';
|
|
4
4
|
import type { WarehousingProvider } from '@unchainedshop/core-warehousing';
|
|
5
5
|
import type { Work } from '@unchainedshop/core-worker';
|
|
6
6
|
import type { User } from '@unchainedshop/core-users';
|
|
7
|
-
import { DeliveryConfiguration, DeliveryLocation, DeliveryProviderType } from '@unchainedshop/core-delivery';
|
|
8
|
-
import { Modules } from '../modules.js';
|
|
7
|
+
import type { DeliveryConfiguration, DeliveryLocation, DeliveryProvider, DeliveryProviderType } from '@unchainedshop/core-delivery';
|
|
8
|
+
import type { Modules } from '../modules.js';
|
|
9
9
|
export declare enum DeliveryError {
|
|
10
10
|
ADAPTER_NOT_FOUND = "ADAPTER_NOT_FOUND",
|
|
11
11
|
NOT_IMPLEMENTED = "NOT_IMPLEMENTED",
|
|
@@ -39,6 +39,7 @@ export type IDeliveryAdapter = IBaseAdapter & {
|
|
|
39
39
|
typeSupported: (type: DeliveryProviderType) => boolean;
|
|
40
40
|
actions: (config: DeliveryConfiguration, context: DeliveryContext & {
|
|
41
41
|
modules: Modules;
|
|
42
|
+
deliveryProvider: DeliveryProvider;
|
|
42
43
|
}) => DeliveryAdapterActions;
|
|
43
44
|
};
|
|
44
45
|
export declare const DeliveryAdapter: Omit<IDeliveryAdapter, 'key' | 'label' | 'version'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryAdapter.d.ts","sourceRoot":"","sources":["../../src/directors/DeliveryAdapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DeliveryAdapter.d.ts","sourceRoot":"","sources":["../../src/directors/DeliveryAdapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,KAAK,EACV,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,oBAAY,aAAa;IACvB,iBAAiB,sBAAsB;IACvC,eAAe,oBAAoB;IACnC,wBAAwB,6BAA6B;IACrD,iBAAiB,sBAAsB;CACxC;AAED,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,KAAK,aAAa,GAAG,IAAI,CAAC;IACvE,2BAA2B,EAAE,CAAC,yBAAyB,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3F,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,oBAAoB,EAAE,MAAM,OAAO,CAAC;IACpC,kBAAkB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IAC7E,eAAe,EAAE,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACnD,IAAI,EAAE,MAAM,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,kBAAkB,CAAC,EAAE,GAAG,CAAC;IACzB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC;AAED,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG;IAC5C,oBAAoB,EAAE,qBAAqB,CAAC;IAE5C,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,OAAO,CAAC;IAEvD,OAAO,EAAE,CACP,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,eAAe,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,gBAAgB,EAAE,gBAAgB,CAAA;KAAE,KAChF,sBAAsB,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,OAAO,GAAG,SAAS,CAgD/E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryAdapter.js","sourceRoot":"","sources":["../../src/directors/DeliveryAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"DeliveryAdapter.js","sourceRoot":"","sources":["../../src/directors/DeliveryAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAenD,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,wDAAuC,CAAA;IACvC,oDAAmC,CAAA;IACnC,sEAAqD,CAAA;IACrD,wDAAuC,CAAA;AACzC,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAqCD,MAAM,CAAC,MAAM,eAAe,GAAwD;IAClF,GAAG,WAAW;IACd,oBAAoB,EAAE,EAAE;IAExB,aAAa,EAAE,GAAG,EAAE;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,EAAE,GAAG,EAAE;QACZ,OAAO;YACL,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,aAAa,CAAC,eAAe,CAAC;YACvC,CAAC;YAED,2BAA2B,EAAE,KAAK,IAAI,EAAE;gBACtC,OAAO,CAAC,CAAC;YACX,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,KAAK,CAAC;YACf,CAAC;YAED,oBAAoB,EAAE,GAAG,EAAE;gBACzB,4BAA4B;gBAC5B,iDAAiD;gBACjD,sCAAsC;gBACtC,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,8DAA8D;gBAE9D,2DAA2D;gBAC3D,yCAAyC;gBAEzC,+DAA+D;gBAC/D,OAAO,KAAK,CAAC;YACf,CAAC;YAED,kBAAkB,EAAE,KAAK,IAAI,EAAE;gBAC7B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,eAAe,EAAE,KAAK,IAAI,EAAE;gBAC1B,OAAO,EAAE,CAAC;YACZ,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -11,7 +11,7 @@ export const DeliveryDirector = {
|
|
|
11
11
|
if (!Adapter) {
|
|
12
12
|
throw new Error(`Delivery Plugin ${deliveryProvider.adapterKey} not available`);
|
|
13
13
|
}
|
|
14
|
-
const context = { ...deliveryContext, ...unchainedAPI };
|
|
14
|
+
const context = { ...deliveryContext, ...unchainedAPI, deliveryProvider };
|
|
15
15
|
const adapter = Adapter.actions(deliveryProvider.configuration, context);
|
|
16
16
|
return {
|
|
17
17
|
configurationError: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryDirector.js","sourceRoot":"","sources":["../../src/directors/DeliveryDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAIL,aAAa,GACd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAS,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;AAe9C,MAAM,YAAY,GAAG,YAAY,CAAmB,kBAAkB,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,gBAAgB,GAAsB;IACjD,GAAG,YAAY;IAEf,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAErE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,mBAAmB,gBAAgB,CAAC,UAAU,gBAAgB,CAAC,CAAC;QAClF,CAAC;QAED,MAAM,OAAO,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"DeliveryDirector.js","sourceRoot":"","sources":["../../src/directors/DeliveryDirector.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { BaseWorker } from './BaseWorker.js';
|
|
|
3
3
|
import { WorkerEventTypes } from '@unchainedshop/core-worker';
|
|
4
4
|
import { setTimeout } from 'node:timers/promises';
|
|
5
5
|
import { createLogger } from '@unchainedshop/logger';
|
|
6
|
-
const logger = createLogger('unchained:worker');
|
|
6
|
+
const logger = createLogger('unchained:worker:event-listener');
|
|
7
7
|
function debounce(func, wait) {
|
|
8
8
|
let abortController = null;
|
|
9
9
|
const debounced = (async (...args) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventListenerWorker.js","sourceRoot":"","sources":["../../src/directors/EventListenerWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"EventListenerWorker.js","sourceRoot":"","sources":["../../src/directors/EventListenerWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterDirector.js","sourceRoot":"","sources":["../../src/directors/FilterDirector.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FilterDirector.js","sourceRoot":"","sources":["../../src/directors/FilterDirector.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import later from '@breejs/later';
|
|
|
2
2
|
import { BaseWorker } from './BaseWorker.js';
|
|
3
3
|
import { createLogger } from '@unchainedshop/logger';
|
|
4
4
|
const { NODE_ENV } = process.env;
|
|
5
|
-
const logger = createLogger('unchained:worker');
|
|
5
|
+
const logger = createLogger('unchained:worker:interval');
|
|
6
6
|
const defaultSchedule = later.parse.text(NODE_ENV !== 'production' ? 'every 2 seconds' : 'every 30 seconds');
|
|
7
7
|
export const scheduleToInterval = (schedule) => {
|
|
8
8
|
const referenceDate = new Date(1000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IntervalWorker.js","sourceRoot":"","sources":["../../src/directors/IntervalWorker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAuB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjC,MAAM,MAAM,GAAG,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"IntervalWorker.js","sourceRoot":"","sources":["../../src/directors/IntervalWorker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAuB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjC,MAAM,MAAM,GAAG,YAAY,CAAC,2BAA2B,CAAC,CAAC;AAQzD,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CACtC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CACnE,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAsB,EAAE,EAAE;IAC3D,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,aAAa,CAAW,CAAC;IAE5E,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;IAC7B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,4BAA4B;AACrE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAkC;IAC3D,GAAG,UAAU;IAEb,GAAG,EAAE,4BAA4B;IACjC,KAAK,EAAE,gEAAgE;IACvE,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM;IAEZ,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,GAAG,EAAE,EAAE,QAAQ,GAAG,eAAe,EAAE,EAAE,YAAY,EAAE,EAAE;QACnF,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,YAAY,CAAC,CAAC;QAEjG,MAAM,aAAa,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,cAAc,GAA0B,IAAI,CAAC;QAEjD,OAAO;YACL,GAAG,iBAAiB;YAEpB,KAAK;gBACH,0CAA0C;gBAC1C,IAAI,cAAc,EAAE,CAAC;oBACnB,OAAO;gBACT,CAAC;gBAED,cAAc,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;oBACtC,IAAI,CAAC;wBACH,MAAM,iBAAiB,CAAC,OAAO,CAAC;4BAC9B,gBAAgB,EAAE,UAAU;4BAC5B,aAAa,EAAE,cAAc,CAAC,YAAY,EAAE;yBAC7C,CAAC,CAAC;oBACL,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACtB,CAAC;gBACH,CAAC,EAAE,aAAa,CAAC,CAAC;YACpB,CAAC;YAED,IAAI;gBACF,IAAI,cAAc,EAAE,CAAC;oBACnB,aAAa,CAAC,cAAc,CAAC,CAAC;oBAC9B,cAAc,GAAG,IAAI,CAAC;gBACxB,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { IBaseAdapter } from '@unchainedshop/utils';
|
|
2
|
-
import { Order, OrderPayment } from '@unchainedshop/core-orders';
|
|
3
|
-
import { PaymentConfiguration, PaymentProvider, PaymentProviderType } from '@unchainedshop/core-payment';
|
|
4
|
-
import { Modules } from '../modules.js';
|
|
1
|
+
import type { IBaseAdapter } from '@unchainedshop/utils';
|
|
2
|
+
import type { Order, OrderPayment } from '@unchainedshop/core-orders';
|
|
3
|
+
import type { PaymentConfiguration, PaymentProvider, PaymentProviderType } from '@unchainedshop/core-payment';
|
|
4
|
+
import type { Modules } from '../modules.js';
|
|
5
5
|
export declare enum PaymentError {
|
|
6
6
|
ADAPTER_NOT_FOUND = "ADAPTER_NOT_FOUND",
|
|
7
7
|
NOT_IMPLEMENTED = "NOT_IMPLEMENTED",
|
|
@@ -41,7 +41,6 @@ export type IPaymentAdapter = IBaseAdapter & {
|
|
|
41
41
|
initialConfiguration: PaymentConfiguration;
|
|
42
42
|
typeSupported: (type: PaymentProviderType) => boolean;
|
|
43
43
|
actions: (config: PaymentConfiguration, context: PaymentContext & {
|
|
44
|
-
paymentProviderId: string;
|
|
45
44
|
paymentProvider: PaymentProvider;
|
|
46
45
|
modules: Modules;
|
|
47
46
|
}) => IPaymentActions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymentAdapter.d.ts","sourceRoot":"","sources":["../../src/directors/PaymentAdapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PaymentAdapter.d.ts","sourceRoot":"","sources":["../../src/directors/PaymentAdapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,oBAAY,YAAY;IACtB,iBAAiB,sBAAsB;IACvC,eAAe,oBAAoB;IACnC,wBAAwB,6BAA6B;IACrD,iBAAiB,sBAAsB;CACxC;AAED,MAAM,WAAW,YAAY;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,MAAM,yBAAyB,GAAG,YAAY,GAAG;IACrD,WAAW,CAAC,EAAE;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH,CAAC;AACF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,yBAAyB,GAAG,KAAK,CAAC,CAAC;IACjF,kBAAkB,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,KAAK,YAAY,GAAG,IAAI,CAAC;IACtE,QAAQ,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC;IAChD,iBAAiB,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC;IACzD,QAAQ,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3D,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,OAAO,EAAE,CAAC,kBAAkB,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACzD;AACD,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,kBAAkB,CAAC,EAAE,GAAG,CAAC;IACzB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG;IAC3C,oBAAoB,EAAE,oBAAoB,CAAC;IAE3C,aAAa,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,OAAO,CAAC;IAEtD,OAAO,EAAE,CACP,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,cAAc,GAAG;QACxB,eAAe,EAAE,eAAe,CAAC;QACjC,OAAO,EAAE,OAAO,CAAC;KAClB,KACE,eAAe,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,GAAG,OAAO,GAAG,SAAS,CAuD7E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymentAdapter.js","sourceRoot":"","sources":["../../src/directors/PaymentAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"PaymentAdapter.js","sourceRoot":"","sources":["../../src/directors/PaymentAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAUnD,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;AA+CD,MAAM,CAAC,MAAM,cAAc,GAAuD;IAChF,GAAG,WAAW;IACd,oBAAoB,EAAE,EAAE;IAExB,aAAa,EAAE,GAAG,EAAE;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,EAAE,GAAG,EAAE;QACZ,OAAO;YACL,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,YAAY,CAAC,eAAe,CAAC;YACtC,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,KAAK,CAAC;YACf,CAAC;YAED,iBAAiB,EAAE,GAAG,EAAE;gBACtB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,yDAAyD;gBAEzD,0DAA0D;gBAC1D,yCAAyC;gBAEzC,yDAAyD;gBACzD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,OAAO;oBACL,KAAK,EAAE,EAAE;iBACV,CAAC;YACJ,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,OAAO,IAAI,CAAC;YACd,CAAC;YAED,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClB,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymentDirector.d.ts","sourceRoot":"","sources":["../../src/directors/PaymentDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EAAgB,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrG,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,YAAY,EAAsB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"PaymentDirector.d.ts","sourceRoot":"","sources":["../../src/directors/PaymentDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EAAgB,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrG,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,YAAY,EAAsB,MAAM,4BAA4B,CAAC;AAcrF,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC,eAAe,CAAC,GAAG;IAC9D,mBAAmB,EAAE,CACnB,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE;QACd,kBAAkB,EAAE,GAAG,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC;KAChB,EACD,YAAY,KAAA,KACT,OAAO,CAAC,YAAY,CAAC,CAAC;IAE3B,kBAAkB,EAAE,CAClB,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE;QACd,kBAAkB,EAAE,GAAG,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC;KAChB,EACD,YAAY,KAAA,KACT,OAAO,CAAC,YAAY,CAAC,CAAC;IAE3B,kBAAkB,EAAE,CAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE;QACP,kBAAkB,EAAE,GAAG,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC;KAChB,EACD,YAAY,KAAA,KACT,OAAO,CAAC,YAAY,CAAC,CAAC;IAE3B,OAAO,EAAE,CACP,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAC9B,YAAY,KAAA,KACT,OAAO,CAAC,eAAe,CAAC,CAAC;CAC/B,CAAC;AAIF,eAAO,MAAM,eAAe,EAAE,gBAiP7B,CAAC"}
|
|
@@ -5,7 +5,6 @@ import { OrderPaymentStatus } from '@unchainedshop/core-orders';
|
|
|
5
5
|
const buildPaymentProviderActionsContext = (orderPayment, { transactionContext, ...rest }) => ({
|
|
6
6
|
...rest,
|
|
7
7
|
orderPayment,
|
|
8
|
-
paymentProviderId: orderPayment.paymentProviderId,
|
|
9
8
|
transactionContext: {
|
|
10
9
|
...(transactionContext || {}),
|
|
11
10
|
...(orderPayment.context || {}),
|
|
@@ -32,12 +31,8 @@ export const PaymentDirector = {
|
|
|
32
31
|
}));
|
|
33
32
|
newPaymentContext.order = order;
|
|
34
33
|
}
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
paymentProviderId: paymentProvider._id,
|
|
38
|
-
...newPaymentContext,
|
|
39
|
-
...unchainedAPI,
|
|
40
|
-
});
|
|
34
|
+
const context = { ...newPaymentContext, ...unchainedAPI, paymentProvider };
|
|
35
|
+
const adapter = Adapter.actions(paymentProvider.configuration, context);
|
|
41
36
|
return {
|
|
42
37
|
configurationError: () => {
|
|
43
38
|
try {
|
|
@@ -152,17 +147,16 @@ export const PaymentDirector = {
|
|
|
152
147
|
paymentProviderId: orderPayment.paymentProviderId,
|
|
153
148
|
isPreferred: true,
|
|
154
149
|
}));
|
|
155
|
-
const
|
|
150
|
+
const paymentProvider = await modules.payment.paymentProviders.findProvider({
|
|
151
|
+
paymentProviderId: orderPayment.paymentProviderId,
|
|
152
|
+
});
|
|
153
|
+
const actions = await PaymentDirector.actions(paymentProvider, buildPaymentProviderActionsContext(orderPayment, {
|
|
156
154
|
...context,
|
|
157
155
|
transactionContext: {
|
|
158
156
|
...context.transactionContext,
|
|
159
157
|
paymentCredentials,
|
|
160
158
|
},
|
|
161
|
-
});
|
|
162
|
-
const paymentProvider = await modules.payment.paymentProviders.findProvider({
|
|
163
|
-
paymentProviderId: orderPayment.paymentProviderId,
|
|
164
|
-
});
|
|
165
|
-
const actions = await PaymentDirector.actions(paymentProvider, paymentContext, unchainedAPI);
|
|
159
|
+
}), unchainedAPI);
|
|
166
160
|
const result = await actions.charge();
|
|
167
161
|
if (!result)
|
|
168
162
|
return orderPayment;
|
|
@@ -170,7 +164,7 @@ export const PaymentDirector = {
|
|
|
170
164
|
if (credentials) {
|
|
171
165
|
const { token, ...meta } = credentials;
|
|
172
166
|
await modules.payment.paymentCredentials.upsertCredentials({
|
|
173
|
-
userId:
|
|
167
|
+
userId: context.userId,
|
|
174
168
|
paymentProviderId: orderPayment.paymentProviderId,
|
|
175
169
|
token,
|
|
176
170
|
...meta,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymentDirector.js","sourceRoot":"","sources":["../../src/directors/PaymentDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAoD,MAAM,qBAAqB,CAAC;AAErG,OAAO,EAAuB,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErF,MAAM,kCAAkC,GAAG,CACzC,YAA0B,EAC1B,EAAE,kBAAkB,EAAE,GAAG,IAAI,EAA+C,
|
|
1
|
+
{"version":3,"file":"PaymentDirector.js","sourceRoot":"","sources":["../../src/directors/PaymentDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAoD,MAAM,qBAAqB,CAAC;AAErG,OAAO,EAAuB,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErF,MAAM,kCAAkC,GAAG,CACzC,YAA0B,EAC1B,EAAE,kBAAkB,EAAE,GAAG,IAAI,EAA+C,EAC5D,EAAE,CAAC,CAAC;IACpB,GAAG,IAAI;IACP,YAAY;IACZ,kBAAkB,EAAE;QAClB,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;QAC7B,GAAG,CAAC,YAAY,CAAC,OAAO,IAAI,EAAE,CAAC;KAChC;CACF,CAAC,CAAC;AAoCH,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,YAAY,EAAE,EAAE;QAC/D,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,eAAe,CAAC,UAAU,CAAoB,CAAC;QAEvF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,eAAe,CAAC,UAAU,gBAAgB,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,iBAAiB,GAAmB;YACxC,GAAG,cAAc;SAClB,CAAC;QAEF,IAAI,cAAc,EAAE,YAAY,EAAE,CAAC;YACjC,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;YACjC,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,YAAY,CAAC;YAChD,MAAM,KAAK,GACT,cAAc,EAAE,KAAK;gBACrB,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;oBAC9B,OAAO;iBACR,CAAC,CAAC,CAAC;YAEN,iBAAiB,CAAC,KAAK,GAAG,KAAK,CAAC;QAClC,CAAC;QAED,MAAM,OAAO,GAAG,EAAE,GAAG,iBAAiB,EAAE,GAAG,YAAY,EAAE,eAAe,EAAE,CAAC;QAC3E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAExE,OAAO;YACL,kBAAkB,EAAE,GAAG,EAAE;gBACvB,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;oBAC3C,OAAO,KAAK,CAAC;gBACf,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,YAAY,CAAC,iBAAiB,CAAC;gBACxC,CAAC;YACH,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,IAAI,CAAC;oBACH,OAAO,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;gBAC7D,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YAED,iBAAiB,EAAE,GAAG,EAAE;gBACtB,IAAI,CAAC;oBACH,OAAO,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;gBACtE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YAED,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,OAAO,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;YAC3D,CAAC;YAED,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,OAAO,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;YAC7D,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,OAAO,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;YACzD,CAAC;YAED,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBAC/D,OAAO,CAAC,CAAC,SAAS,CAAC;YACrB,CAAC;YAED,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,OAAO,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;YAC3D,CAAC;YAED,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClB,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;YAC5D,CAAC;SACF,CAAC;IACJ,CAAC;IAED,mBAAmB,EAAE,KAAK,EACxB,KAAY,EACZ,cAGC,EACD,YAAY,EACW,EAAE;QACzB,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QAEjC,MAAM,YAAY,GAChB,KAAK,CAAC,SAAS;YACf,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAC9C,cAAc,EAAE,KAAK,CAAC,SAAS;aAChC,CAAC,CAAC,CAAC;QAEN,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAE5D,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;YACvF,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YAC1E,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;SAClD,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAC3C,eAAe,EACf,kCAAkC,CAAC,YAAY,EAAE,cAAc,CAAC,EAChE,YAAY,CACb,CAAC;QAEF,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAEtD,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,EAAE;gBAC5D,MAAM,EAAE,kBAAkB,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,kBAAkB,EAAE,KAAK,EACvB,KAAY,EACZ,cAGC,EACD,YAAY,EACW,EAAE;QACzB,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QAEjC,MAAM,YAAY,GAChB,KAAK,CAAC,SAAS;YACf,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAC9C,cAAc,EAAE,KAAK,CAAC,SAAS;aAChC,CAAC,CAAC,CAAC;QAEN,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAE5D,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;YACvF,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YAC1E,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;SAClD,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAC3C,eAAe,EACf,kCAAkC,CAAC,YAAY,EAAE,cAAc,CAAC,EAChE,YAAY,CACb,CAAC;QACF,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QAErD,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,EAAE;gBAC5D,MAAM,EAAE,kBAAkB,CAAC,QAAQ;gBACnC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,kBAAkB,EAAE,KAAK,EACvB,KAAY,EACZ,OAGC,EACD,YAAY,EACW,EAAE;QACzB,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QAEjC,MAAM,YAAY,GAChB,KAAK,CAAC,SAAS;YACf,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAC9C,cAAc,EAAE,KAAK,CAAC,SAAS;aAChC,CAAC,CAAC,CAAC;QAEN,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAE5D,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;YACvF,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,MAAM,kBAAkB,GACtB,OAAO,CAAC,kBAAkB,EAAE,kBAAkB;YAC9C,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,qBAAqB,CAAC;gBAC9D,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;gBACjD,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC,CAAC;QAEN,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YAC1E,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;SAClD,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAC3C,eAAe,EACf,kCAAkC,CAAC,YAAY,EAAE;YAC/C,GAAG,OAAO;YACV,kBAAkB,EAAE;gBAClB,GAAG,OAAO,CAAC,kBAAkB;gBAC7B,kBAAkB;aACnB;SACF,CAAC,EACF,YAAY,CACb,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM;YAAE,OAAO,YAAY,CAAC;QAEjC,MAAM,EAAE,WAAW,EAAE,GAAG,qBAAqB,EAAE,GAAG,MAAM,CAAC;QAEzD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;YACvC,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;gBACzD,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;gBACjD,KAAK;gBACL,GAAG,IAAI;aACR,CAAC,CAAC;QACL,CAAC;QAED,IAAI,qBAAqB,EAAE,CAAC;YAC1B,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,EAAE,GAAG,qBAAqB,CAAC;YACzD,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,EAAE;gBAC5D,aAAa;gBACb,MAAM,EAAE,kBAAkB,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,CAAC,CAAC;QACL,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -42,8 +42,7 @@ export const BasePricingDirector = <
|
|
|
42
42
|
Calculation,
|
|
43
43
|
AdapterContext,
|
|
44
44
|
IPricingSheet<Calculation>,
|
|
45
|
-
PricingAdapter
|
|
46
|
-
any
|
|
45
|
+
PricingAdapter
|
|
47
46
|
> => {
|
|
48
47
|
const baseDirector = BaseDirector<PricingAdapter>(directorName, {
|
|
49
48
|
adapterSortKey: 'orderIndex',
|
|
@@ -54,8 +53,7 @@ export const BasePricingDirector = <
|
|
|
54
53
|
Calculation,
|
|
55
54
|
AdapterContext,
|
|
56
55
|
IPricingSheet<Calculation>,
|
|
57
|
-
PricingAdapter
|
|
58
|
-
any
|
|
56
|
+
PricingAdapter
|
|
59
57
|
> = {
|
|
60
58
|
...baseDirector,
|
|
61
59
|
|
|
@@ -85,6 +83,10 @@ export const BasePricingDirector = <
|
|
|
85
83
|
|
|
86
84
|
const discounts: (Discount<any> | null)[] = await Promise.all(
|
|
87
85
|
context.discounts.map(async (orderDiscount) => {
|
|
86
|
+
// TODO: We shouldn't need to fetch this here, most probably we already have an order in context
|
|
87
|
+
// 1. it should propably be required to pass an order
|
|
88
|
+
// 2. we should pass the order in the pricing context or pricing adapter context
|
|
89
|
+
// 3. it can't be different orders for different discounts in the same calculation rebuild
|
|
88
90
|
const order = await unchainedAPI.modules.orders.findOrder({
|
|
89
91
|
orderId: orderDiscount.orderId,
|
|
90
92
|
});
|
|
@@ -92,7 +94,7 @@ export const BasePricingDirector = <
|
|
|
92
94
|
if (!DiscountAdapter) return null;
|
|
93
95
|
|
|
94
96
|
const adapter = await DiscountAdapter.actions({
|
|
95
|
-
context: { order
|
|
97
|
+
context: { order: order!, orderDiscount, code: orderDiscount.code, ...unchainedAPI },
|
|
96
98
|
});
|
|
97
99
|
|
|
98
100
|
const configuration = adapter.discountForPricingAdapterKey({
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
-
import { BaseAdapter
|
|
1
|
+
import { BaseAdapter } from '@unchainedshop/utils';
|
|
2
|
+
import type { IBaseAdapter } from '@unchainedshop/utils';
|
|
2
3
|
import type { Order, OrderPosition, OrderDelivery } from '@unchainedshop/core-orders';
|
|
3
4
|
import type { Product } from '@unchainedshop/core-products';
|
|
4
5
|
import type { WarehousingProvider } from '@unchainedshop/core-warehousing';
|
|
5
6
|
import type { Work } from '@unchainedshop/core-worker';
|
|
6
7
|
import type { User } from '@unchainedshop/core-users';
|
|
7
|
-
import {
|
|
8
|
+
import type {
|
|
8
9
|
DeliveryConfiguration,
|
|
9
10
|
DeliveryLocation,
|
|
11
|
+
DeliveryProvider,
|
|
10
12
|
DeliveryProviderType,
|
|
11
13
|
} from '@unchainedshop/core-delivery';
|
|
12
|
-
import { Modules } from '../modules.js';
|
|
14
|
+
import type { Modules } from '../modules.js';
|
|
13
15
|
|
|
14
16
|
export enum DeliveryError {
|
|
15
17
|
ADAPTER_NOT_FOUND = 'ADAPTER_NOT_FOUND',
|
|
@@ -49,7 +51,7 @@ export type IDeliveryAdapter = IBaseAdapter & {
|
|
|
49
51
|
|
|
50
52
|
actions: (
|
|
51
53
|
config: DeliveryConfiguration,
|
|
52
|
-
context: DeliveryContext & { modules: Modules },
|
|
54
|
+
context: DeliveryContext & { modules: Modules; deliveryProvider: DeliveryProvider },
|
|
53
55
|
) => DeliveryAdapterActions;
|
|
54
56
|
};
|
|
55
57
|
|
|
@@ -37,7 +37,7 @@ export const DeliveryDirector: IDeliveryDirector = {
|
|
|
37
37
|
throw new Error(`Delivery Plugin ${deliveryProvider.adapterKey} not available`);
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
const context = { ...deliveryContext, ...unchainedAPI };
|
|
40
|
+
const context = { ...deliveryContext, ...unchainedAPI, deliveryProvider };
|
|
41
41
|
const adapter = Adapter.actions(deliveryProvider.configuration, context);
|
|
42
42
|
|
|
43
43
|
return {
|
|
@@ -4,7 +4,7 @@ import { WorkerEventTypes } from '@unchainedshop/core-worker';
|
|
|
4
4
|
import { setTimeout } from 'node:timers/promises';
|
|
5
5
|
import { createLogger } from '@unchainedshop/logger';
|
|
6
6
|
|
|
7
|
-
const logger = createLogger('unchained:worker');
|
|
7
|
+
const logger = createLogger('unchained:worker:event-listener');
|
|
8
8
|
|
|
9
9
|
function debounce<T extends (...args: any[]) => Promise<any>>(
|
|
10
10
|
func: T,
|
|
@@ -116,7 +116,7 @@ export const FilterDirector: IFilterDirector = {
|
|
|
116
116
|
},
|
|
117
117
|
|
|
118
118
|
transformSortStage: async (defaultStage, options) => {
|
|
119
|
-
return reduceAdapters<mongodb.FindOptions
|
|
119
|
+
return reduceAdapters<mongodb.FindOptions['sort']>(async (lastSortStage, adapter) => {
|
|
120
120
|
return adapter.transformSortStage(await lastSortStage, options);
|
|
121
121
|
}, defaultStage);
|
|
122
122
|
},
|
|
@@ -4,7 +4,7 @@ import { createLogger } from '@unchainedshop/logger';
|
|
|
4
4
|
|
|
5
5
|
const { NODE_ENV } = process.env;
|
|
6
6
|
|
|
7
|
-
const logger = createLogger('unchained:worker');
|
|
7
|
+
const logger = createLogger('unchained:worker:interval');
|
|
8
8
|
|
|
9
9
|
export interface IntervalWorkerParams {
|
|
10
10
|
workerId?: string;
|
|
@@ -1,7 +1,12 @@
|
|
|
1
|
-
import { BaseAdapter
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
1
|
+
import { BaseAdapter } from '@unchainedshop/utils';
|
|
2
|
+
import type { IBaseAdapter } from '@unchainedshop/utils';
|
|
3
|
+
import type { Order, OrderPayment } from '@unchainedshop/core-orders';
|
|
4
|
+
import type {
|
|
5
|
+
PaymentConfiguration,
|
|
6
|
+
PaymentProvider,
|
|
7
|
+
PaymentProviderType,
|
|
8
|
+
} from '@unchainedshop/core-payment';
|
|
9
|
+
import type { Modules } from '../modules.js';
|
|
5
10
|
|
|
6
11
|
export enum PaymentError {
|
|
7
12
|
ADAPTER_NOT_FOUND = 'ADAPTER_NOT_FOUND',
|
|
@@ -49,7 +54,6 @@ export type IPaymentAdapter = IBaseAdapter & {
|
|
|
49
54
|
actions: (
|
|
50
55
|
config: PaymentConfiguration,
|
|
51
56
|
context: PaymentContext & {
|
|
52
|
-
paymentProviderId: string;
|
|
53
57
|
paymentProvider: PaymentProvider;
|
|
54
58
|
modules: Modules;
|
|
55
59
|
},
|
|
@@ -7,10 +7,9 @@ import { Order, OrderPayment, OrderPaymentStatus } from '@unchainedshop/core-ord
|
|
|
7
7
|
const buildPaymentProviderActionsContext = (
|
|
8
8
|
orderPayment: OrderPayment,
|
|
9
9
|
{ transactionContext, ...rest }: { transactionContext: any; userId: string },
|
|
10
|
-
) => ({
|
|
10
|
+
): PaymentContext => ({
|
|
11
11
|
...rest,
|
|
12
12
|
orderPayment,
|
|
13
|
-
paymentProviderId: orderPayment.paymentProviderId,
|
|
14
13
|
transactionContext: {
|
|
15
14
|
...(transactionContext || {}),
|
|
16
15
|
...(orderPayment.context || {}),
|
|
@@ -80,12 +79,8 @@ export const PaymentDirector: IPaymentDirector = {
|
|
|
80
79
|
newPaymentContext.order = order;
|
|
81
80
|
}
|
|
82
81
|
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
paymentProviderId: paymentProvider._id,
|
|
86
|
-
...newPaymentContext,
|
|
87
|
-
...unchainedAPI,
|
|
88
|
-
});
|
|
82
|
+
const context = { ...newPaymentContext, ...unchainedAPI, paymentProvider };
|
|
83
|
+
const adapter = Adapter.actions(paymentProvider.configuration, context);
|
|
89
84
|
|
|
90
85
|
return {
|
|
91
86
|
configurationError: () => {
|
|
@@ -257,18 +252,21 @@ export const PaymentDirector: IPaymentDirector = {
|
|
|
257
252
|
isPreferred: true,
|
|
258
253
|
}));
|
|
259
254
|
|
|
260
|
-
const paymentContext = buildPaymentProviderActionsContext(orderPayment, {
|
|
261
|
-
...context,
|
|
262
|
-
transactionContext: {
|
|
263
|
-
...context.transactionContext,
|
|
264
|
-
paymentCredentials,
|
|
265
|
-
},
|
|
266
|
-
});
|
|
267
|
-
|
|
268
255
|
const paymentProvider = await modules.payment.paymentProviders.findProvider({
|
|
269
256
|
paymentProviderId: orderPayment.paymentProviderId,
|
|
270
257
|
});
|
|
271
|
-
|
|
258
|
+
|
|
259
|
+
const actions = await PaymentDirector.actions(
|
|
260
|
+
paymentProvider,
|
|
261
|
+
buildPaymentProviderActionsContext(orderPayment, {
|
|
262
|
+
...context,
|
|
263
|
+
transactionContext: {
|
|
264
|
+
...context.transactionContext,
|
|
265
|
+
paymentCredentials,
|
|
266
|
+
},
|
|
267
|
+
}),
|
|
268
|
+
unchainedAPI,
|
|
269
|
+
);
|
|
272
270
|
const result = await actions.charge();
|
|
273
271
|
|
|
274
272
|
if (!result) return orderPayment;
|
|
@@ -278,7 +276,7 @@ export const PaymentDirector: IPaymentDirector = {
|
|
|
278
276
|
if (credentials) {
|
|
279
277
|
const { token, ...meta } = credentials;
|
|
280
278
|
await modules.payment.paymentCredentials.upsertCredentials({
|
|
281
|
-
userId:
|
|
279
|
+
userId: context.userId,
|
|
282
280
|
paymentProviderId: orderPayment.paymentProviderId,
|
|
283
281
|
token,
|
|
284
282
|
...meta,
|