@things-factory/operato-hub 4.3.564 → 4.3.565

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/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js +2 -0
  2. package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js.map +1 -1
  3. package/package.json +2 -2
  4. package/server/graphql/resolvers/synchronization/powrup-pack-order.ts +2 -0
package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js CHANGED
@@ -27,9 +27,11 @@ exports.powrupPackOrderResolver = {
27
27
  .innerJoinAndSelect('rg.orderProducts', 'op')
28
28
  .innerJoinAndSelect('op.product', 'prd')
29
29
  .innerJoinAndSelect('op.productDetail', 'pd')
30
+ .leftJoinAndSelect(`rg.lastMileDelivery`, 'lmd')
30
31
  .where(`rg.source = :source`, { source: auth_base_1.ApplicationType.POWRUP })
31
32
  .andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
32
33
  .andWhere(`rg.ref_order_id NOTNULL`)
34
+ .andWhere('(lmd.mps = false OR lmd.mps IS NULL)')
33
35
  .andWhere(`rg.status NOT IN(:...status) `, {
34
36
  status: [sales_base_1.ORDER_STATUS.CANCELLED, sales_base_1.ORDER_STATUS.PENDING_CANCEL, sales_base_1.ORDER_STATUS.DONE]
35
37
  })
package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"powrup-pack-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-pack-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"powrup-pack-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-pack-order.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-hub",
3
- "version": "4.3.564",
3
+ "version": "4.3.565",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -122,5 +122,5 @@
122
122
  "resolutions": {
123
123
  "core-js": "^3.16.0"
124
124
  },
125
- "gitHead": "603113d785b5ad7930d8c34a73fa7e3aa2a91d37"
125
+ "gitHead": "ba7267af92163eefd2cf624bdfb4340cd7eb5baf"
126
126
  }
package/server/graphql/resolvers/synchronization/powrup-pack-order.ts CHANGED
@@ -35,9 +35,11 @@ export const powrupPackOrderResolver = {
35
35
  .innerJoinAndSelect('rg.orderProducts', 'op')
36
36
  .innerJoinAndSelect('op.product', 'prd')
37
37
  .innerJoinAndSelect('op.productDetail', 'pd')
38
+ .leftJoinAndSelect(`rg.lastMileDelivery`, 'lmd')
38
39
  .where(`rg.source = :source`, { source: ApplicationType.POWRUP })
39
40
  .andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
40
41
  .andWhere(`rg.ref_order_id NOTNULL`)
42
+ .andWhere('(lmd.mps = false OR lmd.mps IS NULL)')
41
43
  .andWhere(`rg.status NOT IN(:...status) `, {
42
44
  status: [ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL, ORDER_STATUS.DONE]
43
45
  })