@unchainedshop/core 4.0.0-rc.7 → 4.0.0-rc.9
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/DeliveryAdapter.d.ts +1 -2
- package/lib/directors/DeliveryAdapter.d.ts.map +1 -1
- package/lib/directors/DeliveryAdapter.js.map +1 -1
- package/lib/directors/FailedRescheduler.d.ts +2 -2
- package/lib/directors/FailedRescheduler.d.ts.map +1 -1
- package/lib/directors/FailedRescheduler.js +1 -1
- package/lib/directors/FailedRescheduler.js.map +1 -1
- package/lib/services/removeProduct.d.ts.map +1 -1
- package/lib/services/removeProduct.js +1 -0
- package/lib/services/removeProduct.js.map +1 -1
- package/package.json +1 -1
- package/src/directors/DeliveryAdapter.ts +0 -2
- package/src/directors/FailedRescheduler.ts +2 -2
- package/src/services/removeProduct.ts +2 -0
|
@@ -4,7 +4,7 @@ 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,
|
|
7
|
+
import { DeliveryConfiguration, DeliveryLocation, DeliveryProviderType } from '@unchainedshop/core-delivery';
|
|
8
8
|
import { Modules } from '../modules.js';
|
|
9
9
|
export declare enum DeliveryError {
|
|
10
10
|
ADAPTER_NOT_FOUND = "ADAPTER_NOT_FOUND",
|
|
@@ -23,7 +23,6 @@ export interface DeliveryAdapterActions {
|
|
|
23
23
|
}
|
|
24
24
|
export interface DeliveryContext {
|
|
25
25
|
countryCode?: string;
|
|
26
|
-
deliveryProvider?: DeliveryProvider;
|
|
27
26
|
order?: Order;
|
|
28
27
|
orderDelivery?: OrderDelivery;
|
|
29
28
|
orderPosition?: OrderPosition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryAdapter.d.ts","sourceRoot":"","sources":["../../src/directors/DeliveryAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjE,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,EACL,qBAAqB,EACrB,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"DeliveryAdapter.d.ts","sourceRoot":"","sources":["../../src/directors/DeliveryAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjE,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,EACL,qBAAqB,EACrB,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,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,CAAC;IAChE,2BAA2B,EAAE,CAAC,yBAAyB,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACpF,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,oBAAoB,EAAE,MAAM,OAAO,CAAC;IACpC,kBAAkB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACtE,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,CAAA;KAAE,KAC5C,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,EAAgB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"DeliveryAdapter.js","sourceRoot":"","sources":["../../src/directors/DeliveryAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAC;AAajE,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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { WorkData } from '@unchainedshop/core-worker';
|
|
1
|
+
import { Work, WorkData } from '@unchainedshop/core-worker';
|
|
2
2
|
export interface FailedReschedulerParams {
|
|
3
|
-
transformRetry?: (workData: WorkData) => Promise<WorkData | null>;
|
|
3
|
+
transformRetry?: (workData: WorkData, lastFailedWork: Work) => Promise<WorkData | null>;
|
|
4
4
|
}
|
|
5
5
|
export interface IScheduler<P> {
|
|
6
6
|
key: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FailedRescheduler.d.ts","sourceRoot":"","sources":["../../src/directors/FailedRescheduler.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"FailedRescheduler.d.ts","sourceRoot":"","sources":["../../src/directors/FailedRescheduler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAoB,MAAM,4BAA4B,CAAC;AAE9E,MAAM,WAAW,uBAAuB;IACtC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,IAAI,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;CACzF;AAED,MAAM,WAAW,UAAU,CAAC,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,CACP,MAAM,EAAE,CAAC,EACT,YAAY,KAAA,KACT;QACH,KAAK,EAAE,MAAM,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,IAAI,CAAC;KAClB,CAAC;CACH;AAED,eAAO,MAAM,iBAAiB,EAAE,UAAU,CAAC,uBAAuB,CAkDjE,CAAC"}
|
|
@@ -24,7 +24,7 @@ export const FailedRescheduler = {
|
|
|
24
24
|
input: work.input,
|
|
25
25
|
scheduled,
|
|
26
26
|
};
|
|
27
|
-
await unchainedAPI.modules.worker.addWork(transformRetry ? await transformRetry(newWorkData) : newWorkData);
|
|
27
|
+
await unchainedAPI.modules.worker.addWork(transformRetry ? await transformRetry(newWorkData, work) : newWorkData);
|
|
28
28
|
}
|
|
29
29
|
};
|
|
30
30
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FailedRescheduler.js","sourceRoot":"","sources":["../../src/directors/FailedRescheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAkB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAoB9E,MAAM,CAAC,MAAM,iBAAiB,GAAwC;IACpE,GAAG,EAAE,iCAAiC;IACtC,KAAK,EAAE,yBAAyB;IAChC,OAAO,EAAE,OAAO;IAEhB,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,YAAY,EAAE,EAAE;QAC5C,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAqB,EAAE,EAAE;YACxE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;gBACtC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBAEtE,oEAAoE;gBACpE,MAAM,SAAS,GACb,WAAW,GAAG,IAAI;oBAChB,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,WAAW,GAAG,CAAC,CAAC;oBAC3C,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;gBAErD,aAAa,CAAC,KAAK,CACjB,GAAG,iBAAiB,CAAC,GAAG,8BAA8B,IAAI,CAAC,GAAG,IAC5D,IAAI,CAAC,IACP,QAAQ,SAAS,CAAC,WAAW,EAAE,QAAQ,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,yBACnE,IAAI,CAAC,OACP,EAAE,CACH,CAAC;gBAEF,MAAM,WAAW,GAAG;oBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,GAAG;oBAC/C,OAAO,EAAE,IAAI,CAAC,OAAO,GAAG,CAAC;oBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,SAAS;iBACV,CAAC;gBACF,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CACvC,cAAc,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"FailedRescheduler.js","sourceRoot":"","sources":["../../src/directors/FailedRescheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAkB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAoB9E,MAAM,CAAC,MAAM,iBAAiB,GAAwC;IACpE,GAAG,EAAE,iCAAiC;IACtC,KAAK,EAAE,yBAAyB;IAChC,OAAO,EAAE,OAAO;IAEhB,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,YAAY,EAAE,EAAE;QAC5C,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAqB,EAAE,EAAE;YACxE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;gBACtC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBAEtE,oEAAoE;gBACpE,MAAM,SAAS,GACb,WAAW,GAAG,IAAI;oBAChB,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,WAAW,GAAG,CAAC,CAAC;oBAC3C,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;gBAErD,aAAa,CAAC,KAAK,CACjB,GAAG,iBAAiB,CAAC,GAAG,8BAA8B,IAAI,CAAC,GAAG,IAC5D,IAAI,CAAC,IACP,QAAQ,SAAS,CAAC,WAAW,EAAE,QAAQ,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,yBACnE,IAAI,CAAC,OACP,EAAE,CACH,CAAC;gBAEF,MAAM,WAAW,GAAG;oBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,GAAG;oBAC/C,OAAO,EAAE,IAAI,CAAC,OAAO,GAAG,CAAC;oBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,SAAS;iBACV,CAAC;gBACF,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CACvC,cAAc,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CACvE,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QAEF,OAAO;YACL,KAAK;gBACH,SAAS,CAAO,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;YACjE,CAAC;YAED,IAAI;gBACF,KAAK;YACP,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeProduct.d.ts","sourceRoot":"","sources":["../../src/services/removeProduct.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,OAAO,EACb,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACnC,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"removeProduct.d.ts","sourceRoot":"","sources":["../../src/services/removeProduct.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,OAAO,EACb,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACnC,OAAO,CAAC,OAAO,CAAC,CA4BlB"}
|
|
@@ -11,6 +11,7 @@ export async function removeProductService({ productId }) {
|
|
|
11
11
|
{
|
|
12
12
|
await this.bookmarks.deleteByProductId(productId);
|
|
13
13
|
await this.assortments.products.delete(productId);
|
|
14
|
+
await this.products.removeAllAssignmentsAndBundleItems(productId);
|
|
14
15
|
const orderIdsToRecalculate = await this.orders.positions.removeProductByIdFromAllOpenPositions(productId);
|
|
15
16
|
await Promise.all([...new Set(orderIdsToRecalculate)].map(async (orderIdToRecalculate) => {
|
|
16
17
|
await updateCalculationService.bind(this)(orderIdToRecalculate);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeProduct.js","sourceRoot":"","sources":["../../src/services/removeProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAGlE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAExC,EAAE,SAAS,EAAyB;IAEpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"removeProduct.js","sourceRoot":"","sources":["../../src/services/removeProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAGlE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAExC,EAAE,SAAS,EAAyB;IAEpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAE/D,QAAQ,OAAO,CAAC,MAAM,EAAE,CAAC;QACvB,KAAK,aAAa,CAAC,MAAM;YACvB,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,gBAAgB;QAChB,KAAK,IAAI,CAAC;QACV,KAAK,aAAa,CAAC,KAAK;YACtB,CAAC;gBACC,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;gBAClD,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAClD,MAAM,IAAI,CAAC,QAAQ,CAAC,kCAAkC,CAAC,SAAS,CAAC,CAAC;gBAClE,MAAM,qBAAqB,GACzB,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,qCAAqC,CAAC,SAAS,CAAC,CAAC;gBAC/E,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,oBAAoB,EAAE,EAAE;oBACrE,MAAM,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,CAAC;gBAClE,CAAC,CAAC,CACH,CAAC;gBACF,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACxC,CAAC;YACD,MAAM;QACR;YACE,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/package.json
CHANGED
|
@@ -7,7 +7,6 @@ import type { User } from '@unchainedshop/core-users';
|
|
|
7
7
|
import {
|
|
8
8
|
DeliveryConfiguration,
|
|
9
9
|
DeliveryLocation,
|
|
10
|
-
DeliveryProvider,
|
|
11
10
|
DeliveryProviderType,
|
|
12
11
|
} from '@unchainedshop/core-delivery';
|
|
13
12
|
import { Modules } from '../modules.js';
|
|
@@ -31,7 +30,6 @@ export interface DeliveryAdapterActions {
|
|
|
31
30
|
|
|
32
31
|
export interface DeliveryContext {
|
|
33
32
|
countryCode?: string;
|
|
34
|
-
deliveryProvider?: DeliveryProvider;
|
|
35
33
|
order?: Order;
|
|
36
34
|
orderDelivery?: OrderDelivery;
|
|
37
35
|
orderPosition?: OrderPosition;
|
|
@@ -3,7 +3,7 @@ import { subscribe } from '@unchainedshop/events';
|
|
|
3
3
|
import { Work, WorkData, WorkerEventTypes } from '@unchainedshop/core-worker';
|
|
4
4
|
|
|
5
5
|
export interface FailedReschedulerParams {
|
|
6
|
-
transformRetry?: (workData: WorkData) => Promise<WorkData | null>;
|
|
6
|
+
transformRetry?: (workData: WorkData, lastFailedWork: Work) => Promise<WorkData | null>;
|
|
7
7
|
}
|
|
8
8
|
|
|
9
9
|
export interface IScheduler<P> {
|
|
@@ -55,7 +55,7 @@ export const FailedRescheduler: IScheduler<FailedReschedulerParams> = {
|
|
|
55
55
|
scheduled,
|
|
56
56
|
};
|
|
57
57
|
await unchainedAPI.modules.worker.addWork(
|
|
58
|
-
transformRetry ? await transformRetry(newWorkData) : newWorkData,
|
|
58
|
+
transformRetry ? await transformRetry(newWorkData, work) : newWorkData,
|
|
59
59
|
);
|
|
60
60
|
}
|
|
61
61
|
};
|
|
@@ -7,6 +7,7 @@ export async function removeProductService(
|
|
|
7
7
|
{ productId }: { productId: string },
|
|
8
8
|
): Promise<boolean> {
|
|
9
9
|
const product = await this.products.findProduct({ productId });
|
|
10
|
+
|
|
10
11
|
switch (product.status) {
|
|
11
12
|
case ProductStatus.ACTIVE:
|
|
12
13
|
await this.products.unpublish(product);
|
|
@@ -16,6 +17,7 @@ export async function removeProductService(
|
|
|
16
17
|
{
|
|
17
18
|
await this.bookmarks.deleteByProductId(productId);
|
|
18
19
|
await this.assortments.products.delete(productId);
|
|
20
|
+
await this.products.removeAllAssignmentsAndBundleItems(productId);
|
|
19
21
|
const orderIdsToRecalculate =
|
|
20
22
|
await this.orders.positions.removeProductByIdFromAllOpenPositions(productId);
|
|
21
23
|
await Promise.all(
|