@unchainedshop/core-orders 2.8.11 → 2.8.13

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.
Files changed (4) hide show
  1. package/lib/service/migrateOrderCartService.js +8 -0
  2. package/lib/service/migrateOrderCartService.js.map +1 -1
  3. package/package.json +5 -5
  4. package/src/service/migrateOrderCartService.ts +14 -0
package/lib/service/migrateOrderCartService.js CHANGED
@@ -12,6 +12,14 @@ export const migrateOrderCartsService = async ({ fromUser, toUser, shouldMerge,
12
12
  }
13
13
  // Move positions
14
14
  unchainedAPI.modules.orders.moveCartPositions({ fromOrderId: fromCart._id, toOrderId: toCart._id });
15
+ // Move billing address if target order has none
16
+ if (fromCart.billingAddress && !toCart.billingAddress) {
17
+ await unchainedAPI.modules.orders.updateBillingAddress(toCart._id, fromCart.billingAddress, unchainedAPI);
18
+ }
19
+ // Move contact data if target order has none
20
+ if (fromCart.contact && !toCart.contact) {
21
+ await unchainedAPI.modules.orders.updateContact(toCart._id, fromCart.contact, unchainedAPI);
22
+ }
15
23
  await unchainedAPI.modules.orders.updateCalculation(fromCart._id, unchainedAPI);
16
24
  return unchainedAPI.modules.orders.updateCalculation(toCart._id, unchainedAPI);
17
25
  };
package/lib/service/migrateOrderCartService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"migrateOrderCartService.js","sourceRoot":"","sources":["../../src/service/migrateOrderCartService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,wBAAwB,GAA6B,KAAK,EACrE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,EACjD,YAAY,EACZ,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,QAAQ,CAAC,CAAC;IACtF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,MAAM,CAAC,CAAC;IAElF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,sBAAsB;QACtB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5B,uCAAuC;QACvC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACxF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IACnF,CAAC;IAED,iBAAiB;IACjB,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IAEpG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAChF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AACjF,CAAC,CAAC"}
1
+ {"version":3,"file":"migrateOrderCartService.js","sourceRoot":"","sources":["../../src/service/migrateOrderCartService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,wBAAwB,GAA6B,KAAK,EACrE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,EACjD,YAAY,EACZ,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,QAAQ,CAAC,CAAC;IACtF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,MAAM,CAAC,CAAC;IAElF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,sBAAsB;QACtB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5B,uCAAuC;QACvC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACxF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IACnF,CAAC;IAED,iBAAiB;IACjB,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IAEpG,gDAAgD;IAChD,IAAI,QAAQ,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QACtD,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,CACpD,MAAM,CAAC,GAAG,EACV,QAAQ,CAAC,cAAc,EACvB,YAAY,CACb,CAAC;IACJ,CAAC;IAED,6CAA6C;IAC7C,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAChF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AACjF,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/core-orders",
3
- "version": "2.8.11",
3
+ "version": "2.8.13",
4
4
  "main": "lib/orders-index.js",
5
5
  "exports": {
6
6
  ".": "./lib/orders-index.js",
@@ -31,14 +31,14 @@
31
31
  },
32
32
  "homepage": "https://github.com/unchainedshop/unchained#readme",
33
33
  "dependencies": {
34
- "@unchainedshop/events": "^2.8.11",
35
- "@unchainedshop/logger": "^2.8.11",
36
- "@unchainedshop/utils": "^2.8.11",
34
+ "@unchainedshop/events": "^2.8.13",
35
+ "@unchainedshop/logger": "^2.8.13",
36
+ "@unchainedshop/utils": "^2.8.13",
37
37
  "simpl-schema": "^3.4.6"
38
38
  },
39
39
  "devDependencies": {
40
40
  "@types/node": "^20.12.7",
41
- "@unchainedshop/types": "^2.8.11",
41
+ "@unchainedshop/types": "^2.8.13",
42
42
  "jest": "^29.7.0",
43
43
  "ts-jest": "^29.1.2",
44
44
  "typescript": "^5.4.5"
package/src/service/migrateOrderCartService.ts CHANGED
@@ -21,6 +21,20 @@ export const migrateOrderCartsService: MigrateOrderCartsService = async (
21
21
  // Move positions
22
22
  unchainedAPI.modules.orders.moveCartPositions({ fromOrderId: fromCart._id, toOrderId: toCart._id });
23
23
 
24
+ // Move billing address if target order has none
25
+ if (fromCart.billingAddress && !toCart.billingAddress) {
26
+ await unchainedAPI.modules.orders.updateBillingAddress(
27
+ toCart._id,
28
+ fromCart.billingAddress,
29
+ unchainedAPI,
30
+ );
31
+ }
32
+
33
+ // Move contact data if target order has none
34
+ if (fromCart.contact && !toCart.contact) {
35
+ await unchainedAPI.modules.orders.updateContact(toCart._id, fromCart.contact, unchainedAPI);
36
+ }
37
+
24
38
  await unchainedAPI.modules.orders.updateCalculation(fromCart._id, unchainedAPI);
25
39
  return unchainedAPI.modules.orders.updateCalculation(toCart._id, unchainedAPI);
26
40
  };