@unchainedshop/core-orders 1.2.32 → 1.2.40

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.
@@ -1 +1,2 @@
1
- export const OrderDeliveriesSchema: any;
1
+ export const OrderDeliveriesSchema: SimpleSchema;
2
+ import SimpleSchema from "simpl-schema";
@@ -1 +1,2 @@
1
- export const OrderDiscountsSchema: any;
1
+ export const OrderDiscountsSchema: SimpleSchema;
2
+ import SimpleSchema from "simpl-schema";
@@ -1 +1,2 @@
1
- export const OrderPaymentsSchema: any;
1
+ export const OrderPaymentsSchema: SimpleSchema;
2
+ import SimpleSchema from "simpl-schema";
@@ -1 +1,2 @@
1
- export const OrderPositionsSchema: any;
1
+ export const OrderPositionsSchema: SimpleSchema;
2
+ import SimpleSchema from "simpl-schema";
@@ -1 +1,2 @@
1
- export const OrdersSchema: any;
1
+ export const OrdersSchema: SimpleSchema;
2
+ import SimpleSchema from "simpl-schema";
@@ -28,7 +28,7 @@ export const configureOrderDiscountsModule = ({ OrderDiscounts, updateCalculatio
28
28
  const Adapter = OrderDiscountDirector.getAdapter(orderDiscount.discountKey);
29
29
  if (!Adapter)
30
30
  return null;
31
- const adapter = Adapter.actions({
31
+ const adapter = await Adapter.actions({
32
32
  context: { order, orderDiscount, code: orderDiscount.code, ...requestContext },
33
33
  });
34
34
  return adapter;
@@ -154,14 +154,16 @@ export const configureOrderDiscountsModule = ({ OrderDiscounts, updateCalculatio
154
154
  code,
155
155
  discountKey,
156
156
  }, requestContext.userId);
157
- const reservedDiscount = await reserveDiscount(newDiscount, requestContext).catch(async (error) => {
158
- // Rollback
157
+ try {
158
+ const reservedDiscount = await reserveDiscount(newDiscount, requestContext);
159
+ await updateCalculation(order._id, requestContext);
160
+ emit('ORDER_ADD_DISCOUNT', { discount: reserveDiscount });
161
+ return reservedDiscount;
162
+ }
163
+ catch (error) {
159
164
  await deleteDiscount(newDiscount._id, requestContext);
160
165
  throw error;
161
- });
162
- await updateCalculation(order._id, requestContext);
163
- emit('ORDER_ADD_DISCOUNT', { discount: reserveDiscount });
164
- return reservedDiscount;
166
+ }
165
167
  }
166
168
  throw new Error(OrderDiscountErrorCode.CODE_NOT_VALID);
167
169
  },
@@ -1 +1 @@
1
- {"version":3,"file":"configureOrderDiscountsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDiscountsModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"configureOrderDiscountsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDiscountsModule.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/core-orders",
3
- "version": "1.2.32",
3
+ "version": "1.2.40",
4
4
  "main": "lib/orders-index.js",
5
5
  "exports": {
6
6
  ".": "./lib/orders-index.js",
@@ -30,16 +30,16 @@
30
30
  },
31
31
  "homepage": "https://github.com/unchainedshop/unchained#readme",
32
32
  "dependencies": {
33
- "@unchainedshop/events": "^1.2.31",
34
- "@unchainedshop/logger": "^1.2.31",
35
- "@unchainedshop/utils": "^1.2.31",
36
- "simpl-schema": "^1.13.1"
33
+ "@unchainedshop/events": "^1.2.40",
34
+ "@unchainedshop/logger": "^1.2.40",
35
+ "@unchainedshop/utils": "^1.2.40",
36
+ "simpl-schema": "^3.0.1"
37
37
  },
38
38
  "devDependencies": {
39
- "@types/node": "^16.11.64",
40
- "@unchainedshop/types": "^1.2.32",
41
- "jest": "^29.0.2",
42
- "ts-jest": "^28.0.8",
39
+ "@types/node": "^16.11.66",
40
+ "@unchainedshop/types": "^1.2.40",
41
+ "jest": "^29.2.0",
42
+ "ts-jest": "^29.0.3",
43
43
  "typescript": "^4.8.4"
44
44
  }
45
45
  }
@@ -45,7 +45,7 @@ export const configureOrderDiscountsModule = ({
45
45
  });
46
46
  const Adapter = OrderDiscountDirector.getAdapter(orderDiscount.discountKey);
47
47
  if (!Adapter) return null;
48
- const adapter = Adapter.actions({
48
+ const adapter = await Adapter.actions({
49
49
  context: { order, orderDiscount, code: orderDiscount.code, ...requestContext },
50
50
  });
51
51
  return adapter;
@@ -210,19 +210,15 @@ export const configureOrderDiscountsModule = ({
210
210
  requestContext.userId,
211
211
  );
212
212
 
213
- const reservedDiscount = await reserveDiscount(newDiscount, requestContext).catch(
214
- async (error) => {
215
- // Rollback
216
- await deleteDiscount(newDiscount._id, requestContext);
217
- throw error;
218
- },
219
- );
220
-
221
- await updateCalculation(order._id, requestContext);
222
-
223
- emit('ORDER_ADD_DISCOUNT', { discount: reserveDiscount });
224
-
225
- return reservedDiscount;
213
+ try {
214
+ const reservedDiscount = await reserveDiscount(newDiscount, requestContext);
215
+ await updateCalculation(order._id, requestContext);
216
+ emit('ORDER_ADD_DISCOUNT', { discount: reserveDiscount });
217
+ return reservedDiscount;
218
+ } catch (error) {
219
+ await deleteDiscount(newDiscount._id, requestContext);
220
+ throw error;
221
+ }
226
222
  }
227
223
 
228
224
  throw new Error(OrderDiscountErrorCode.CODE_NOT_VALID);