@things-factory/operato-mms 4.3.593 → 4.3.594
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/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js +4 -5
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +4 -5
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
- package/package.json +2 -2
- package/server/graphql/resolvers/interface-with-hub/add-release-order.ts +4 -5
- package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +4 -5
|
@@ -38,7 +38,6 @@ exports.addReleaseOrderResolver = {
|
|
|
38
38
|
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
39
39
|
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
40
40
|
.andWhere('MOS.releaseOrderId IS NULL')
|
|
41
|
-
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
42
41
|
.orderBy('MOS.subOrderNoRef', 'ASC')
|
|
43
42
|
.addOrderBy('MOS.orderNoRef', 'ASC')
|
|
44
43
|
.addOrderBy('MOS.createdAt', 'ASC')
|
|
@@ -123,7 +122,7 @@ exports.addReleaseOrderResolver = {
|
|
|
123
122
|
}
|
|
124
123
|
}
|
|
125
124
|
//fetch the latest updated of marketplaceOrderShipping
|
|
126
|
-
const
|
|
125
|
+
const mos = await (0, typeorm_1.createQueryBuilder)(marketplace_base_1.MarketplaceOrderShipping, 'MOS')
|
|
127
126
|
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
128
127
|
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
129
128
|
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
@@ -132,12 +131,12 @@ exports.addReleaseOrderResolver = {
|
|
|
132
131
|
.addOrderBy('MOS.createdAt', 'ASC')
|
|
133
132
|
.getMany();
|
|
134
133
|
//validation to prevent creating invoice if there is any failed creation order
|
|
135
|
-
if (
|
|
134
|
+
if (mos.some(mos => mos.releaseOrderId === null || mos.releaseOrderId === '')) {
|
|
136
135
|
continue;
|
|
137
136
|
}
|
|
138
|
-
if (
|
|
137
|
+
if (mos.length > 0 && ((_c = mos[0]) === null || _c === void 0 ? void 0 : _c.releaseOrderId)) {
|
|
139
138
|
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).update(marketplaceOrder.id, {
|
|
140
|
-
releaseOrderId:
|
|
139
|
+
releaseOrderId: mos[0].releaseOrderId,
|
|
141
140
|
fulfillmentCenter: fulfilmentCenter
|
|
142
141
|
});
|
|
143
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAE/E,yDAA2D;AAC3D,uDAAyE;AACzE,6CAA4C;AAC5C,qFAA2F;AAC3F,uEAQyC;AACzC,+DAAqE;AACrE,iDAA8C;AAEjC,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CACnB,CAAO,EACP,EAAE,mBAAmB,EAAE,WAAW,EAAqD,EACvF,OAAY;;QAEZ,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD,MAAM,gBAAgB,GAAsB,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAClG,MAAM,QAAQ,GAAW,gBAAgB,CAAC,QAAQ,CAAA;QAElD,IAAI,eAAe,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QACrG,IAAI,iBAAiB,GAAe,MAAM,IAAA,+BAAoB,EAAC,eAAe,CAAC,CAAA;QAE/E,MAAM,kBAAkB,GAAW,iBAAiB,CAAC,IAAI,CACvD,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CACrE,CAAC,EAAE,CAAA;QAEJ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAA;YAEjD,MAAM,gBAAgB,GAAqB,MAAM,IAAA,uBAAa,EAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE;gBAC3G,SAAS,EAAE;oBACT,uBAAuB;oBACvB,mDAAmD;oBACnD,qDAAqD;oBACrD,8EAA8E;oBAC9E,kBAAkB;iBACnB;aACF,CAAC,CAAA;YAEF,MAAM,qBAAqB,GAA2B,gBAAgB,CAAC,qBAAqB,CAAA;YAE5F,MAAM,EAAE,GAAiD,IAAA,4BAAkB,EAAC,2CAAwB,EAAE,KAAK,CAAC,CAAA;YAE5G,IAAI,yBAAyB,GAA+B,MAAM,EAAE;iBACjE,iBAAiB,CAAC,mCAAmC,EAAE,MAAM,CAAC;iBAC9D,iBAAiB,CAAC,cAAc,EAAE,GAAG,CAAC;iBACtC,iBAAiB,CAAC,2BAA2B,EAAE,KAAK,CAAC;iBACrD,KAAK,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;iBACxD,QAAQ,CAAC,8BAA8B,EAAE,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC;iBAClF,QAAQ,CAAC,4BAA4B,CAAC;iBACtC,
|
|
1
|
+
{"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,6 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
43
43
|
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
44
44
|
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
45
45
|
.andWhere('MOS.releaseOrderId IS NULL')
|
|
46
|
-
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
47
46
|
.orderBy('MOS.subOrderNoRef', 'ASC')
|
|
48
47
|
.addOrderBy('MOS.orderNoRef', 'ASC')
|
|
49
48
|
.addOrderBy('MOS.createdAt', 'ASC')
|
|
@@ -120,7 +119,7 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
120
119
|
}
|
|
121
120
|
}
|
|
122
121
|
//fetch the latest updated of marketplaceOrderShipping
|
|
123
|
-
const
|
|
122
|
+
const mos = await (0, typeorm_1.createQueryBuilder)(marketplace_base_1.MarketplaceOrderShipping, 'MOS')
|
|
124
123
|
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
125
124
|
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
126
125
|
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
@@ -129,13 +128,13 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
129
128
|
.addOrderBy('MOS.createdAt', 'ASC')
|
|
130
129
|
.getMany();
|
|
131
130
|
//validation to prevent creating invoice if there is any failed release order
|
|
132
|
-
if (
|
|
131
|
+
if (mos.some(mos => mos.releaseOrderId === null || mos.releaseOrderId === '')) {
|
|
133
132
|
continue;
|
|
134
133
|
}
|
|
135
134
|
//update marketplaceOrder with releaseOrderId if all ro is created
|
|
136
|
-
if (
|
|
135
|
+
if (mos.length > 0 && ((_b = mos[0]) === null || _b === void 0 ? void 0 : _b.releaseOrderId)) {
|
|
137
136
|
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).update(marketplaceOrder.id, {
|
|
138
|
-
releaseOrderId:
|
|
137
|
+
releaseOrderId: mos[0].releaseOrderId,
|
|
139
138
|
fulfillmentCenter: fulfilmentCenter
|
|
140
139
|
});
|
|
141
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAE/E,yDAA2D;AAC3D,uDAAyE;AACzE,qFAAwE;AACxE,uEAKyC;AACzC,+DAAqE;AACrE,iDAA8C;AACjC,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAO,EAAE,EAAE,WAAW,EAA2B,EAAE,OAAY;;QACvF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD,MAAM,EAAE,GAAyC,IAAA,4BAAkB,EAAC,mCAAgB,EAAE,IAAI,CAAC,CAAA;QAC3F,MAAM,iBAAiB,GAAuB,MAAM,EAAE;aACnD,iBAAiB,CAAC,0BAA0B,EAAE,KAAK,CAAC;aACpD,iBAAiB,CAAC,mCAAmC,EAAE,MAAM,CAAC;aAC9D,iBAAiB,CAAC,+BAA+B,EAAE,KAAK,CAAC;aACzD,iBAAiB,CAAC,iCAAiC,EAAE,KAAK,CAAC;aAC3D,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,CAAC;aAC/C,KAAK,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;aACvD,QAAQ,CAAC,2BAA2B,CAAC;aACrC,QAAQ,CAAC,2BAA2B,EAAE;YACrC,MAAM,EAAE,CAAC,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,CAAC;SAC9E,CAAC;aACD,QAAQ,CAAC,iCAAiC,EAAE,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC;aAC5E,OAAO,EAAE,CAAA;QAEZ,IAAI,gBAAgB,GAAG,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC7E,IAAI,QAAQ,GAAW,gBAAgB,CAAC,QAAQ,CAAA;QAEhD,IAAI,eAAe,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QACrG,IAAI,iBAAiB,GAAe,MAAM,IAAA,+BAAoB,EAAC,eAAe,CAAC,CAAA;QAC/E,MAAM,kBAAkB,GAAW,iBAAiB,CAAC,IAAI,CACvD,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CACrE,CAAC,EAAE,CAAA;QAEJ,IAAI;YACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACjD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBAE7C,MAAM,qBAAqB,GAA2B,gBAAgB,CAAC,qBAAqB,CAAA;gBAE5F,MAAM,EAAE,GAAiD,IAAA,4BAAkB,EAAC,2CAAwB,EAAE,KAAK,CAAC,CAAA;gBAC5G,MAAM,yBAAyB,GAA+B,MAAM,EAAE;qBACnE,iBAAiB,CAAC,mCAAmC,EAAE,MAAM,CAAC;qBAC9D,iBAAiB,CAAC,cAAc,EAAE,GAAG,CAAC;qBACtC,iBAAiB,CAAC,2BAA2B,EAAE,KAAK,CAAC;qBACrD,KAAK,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;qBACxD,QAAQ,CAAC,8BAA8B,EAAE,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC;qBAClF,QAAQ,CAAC,4BAA4B,CAAC;qBACtC,
|
|
1
|
+
{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-mms",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.594",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -106,5 +106,5 @@
|
|
|
106
106
|
"@things-factory/builder": "^4.3.591",
|
|
107
107
|
"@types/node-fetch": "^2.5.7"
|
|
108
108
|
},
|
|
109
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "3af1e3dcb20aaf3c9bc29b1e7aa0dad45d69ebd3"
|
|
110
110
|
}
|
|
@@ -58,7 +58,6 @@ export const addReleaseOrderResolver = {
|
|
|
58
58
|
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
59
59
|
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
60
60
|
.andWhere('MOS.releaseOrderId IS NULL')
|
|
61
|
-
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
62
61
|
.orderBy('MOS.subOrderNoRef', 'ASC')
|
|
63
62
|
.addOrderBy('MOS.orderNoRef', 'ASC')
|
|
64
63
|
.addOrderBy('MOS.createdAt', 'ASC')
|
|
@@ -151,7 +150,7 @@ export const addReleaseOrderResolver = {
|
|
|
151
150
|
}
|
|
152
151
|
|
|
153
152
|
//fetch the latest updated of marketplaceOrderShipping
|
|
154
|
-
const
|
|
153
|
+
const mos: MarketplaceOrderShipping = await createQueryBuilder(MarketplaceOrderShipping, 'MOS')
|
|
155
154
|
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
156
155
|
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
157
156
|
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
@@ -161,13 +160,13 @@ export const addReleaseOrderResolver = {
|
|
|
161
160
|
.getMany()
|
|
162
161
|
|
|
163
162
|
//validation to prevent creating invoice if there is any failed creation order
|
|
164
|
-
if (
|
|
163
|
+
if (mos.some(mos => mos.releaseOrderId === null || mos.releaseOrderId === '')) {
|
|
165
164
|
continue
|
|
166
165
|
}
|
|
167
166
|
|
|
168
|
-
if (
|
|
167
|
+
if (mos.length > 0 && mos[0]?.releaseOrderId) {
|
|
169
168
|
await getRepository(MarketplaceOrder).update(marketplaceOrder.id, {
|
|
170
|
-
releaseOrderId:
|
|
169
|
+
releaseOrderId: mos[0].releaseOrderId,
|
|
171
170
|
fulfillmentCenter: fulfilmentCenter
|
|
172
171
|
})
|
|
173
172
|
}
|
|
@@ -53,7 +53,6 @@ export const autoAddReleaseOrderResolver = {
|
|
|
53
53
|
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
54
54
|
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
55
55
|
.andWhere('MOS.releaseOrderId IS NULL')
|
|
56
|
-
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
57
56
|
.orderBy('MOS.subOrderNoRef', 'ASC')
|
|
58
57
|
.addOrderBy('MOS.orderNoRef', 'ASC')
|
|
59
58
|
.addOrderBy('MOS.createdAt', 'ASC')
|
|
@@ -138,7 +137,7 @@ export const autoAddReleaseOrderResolver = {
|
|
|
138
137
|
}
|
|
139
138
|
|
|
140
139
|
//fetch the latest updated of marketplaceOrderShipping
|
|
141
|
-
const
|
|
140
|
+
const mos: MarketplaceOrderShipping = await createQueryBuilder(MarketplaceOrderShipping, 'MOS')
|
|
142
141
|
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
143
142
|
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
144
143
|
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
@@ -148,14 +147,14 @@ export const autoAddReleaseOrderResolver = {
|
|
|
148
147
|
.getMany()
|
|
149
148
|
|
|
150
149
|
//validation to prevent creating invoice if there is any failed release order
|
|
151
|
-
if (
|
|
150
|
+
if (mos.some(mos => mos.releaseOrderId === null || mos.releaseOrderId === '')) {
|
|
152
151
|
continue
|
|
153
152
|
}
|
|
154
153
|
|
|
155
154
|
//update marketplaceOrder with releaseOrderId if all ro is created
|
|
156
|
-
if (
|
|
155
|
+
if (mos.length > 0 && mos[0]?.releaseOrderId) {
|
|
157
156
|
await getRepository(MarketplaceOrder).update(marketplaceOrder.id, {
|
|
158
|
-
releaseOrderId:
|
|
157
|
+
releaseOrderId: mos[0].releaseOrderId,
|
|
159
158
|
fulfillmentCenter: fulfilmentCenter
|
|
160
159
|
})
|
|
161
160
|
}
|