@things-factory/worksheet-base 4.3.663 → 4.3.665
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/worksheet/cancel-arrival-notice.js +3 -1
- package/dist-server/graphql/resolvers/worksheet/cancel-arrival-notice.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/proceed-extra-products.js +3 -1
- package/dist-server/graphql/resolvers/worksheet/proceed-extra-products.js.map +1 -1
- package/package.json +3 -3
- package/server/graphql/resolvers/worksheet/cancel-arrival-notice.ts +76 -72
- package/server/graphql/resolvers/worksheet/proceed-extra-products.ts +4 -1
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cancelArrivalNoticeResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const integration_base_1 = require("@things-factory/integration-base");
|
|
5
6
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
7
|
const constants_1 = require("../../../constants");
|
|
7
8
|
const entities_1 = require("../../../entities");
|
|
@@ -10,7 +11,7 @@ exports.cancelArrivalNoticeResolver = {
|
|
|
10
11
|
const { user, domain } = context.state;
|
|
11
12
|
const arrivalNotice = await (0, typeorm_1.getRepository)(sales_base_1.ArrivalNotice).findOne({
|
|
12
13
|
where: { domain: domain, name },
|
|
13
|
-
relations: ['bizplace', 'orderProducts']
|
|
14
|
+
relations: ['domain', 'bizplace', 'orderProducts']
|
|
14
15
|
});
|
|
15
16
|
if (!arrivalNotice)
|
|
16
17
|
throw new Error(`Arrival notice doesn't exists.`);
|
|
@@ -49,6 +50,7 @@ exports.cancelArrivalNoticeResolver = {
|
|
|
49
50
|
updatedAt: new Date().toISOString()
|
|
50
51
|
});
|
|
51
52
|
}
|
|
53
|
+
(0, integration_base_1.webhookHandler)(arrivalNotice, { id: arrivalNotice.bizplace }, integration_base_1.WebhookEventsEnum.ArrivalNoticeUpdated);
|
|
52
54
|
return true;
|
|
53
55
|
}
|
|
54
56
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel-arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cancel-arrival-notice.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,
|
|
1
|
+
{"version":3,"file":"cancel-arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cancel-arrival-notice.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,uEAAoF;AACpF,2DAA4G;AAG5G,kDAAqD;AACrD,gDAA8D;AAEjD,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QACtD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,MAAM,aAAa,GAAkB,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE;YAC/B,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC;SACnD,CAAC,CAAA;QAEF,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAErE,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,MAAM,CACvC,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE,EACxB;YACE,MAAM,EAAE,yBAAY,CAAC,SAAS;YAC9B,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CACF,CAAA;QAED,IAAI,QAAQ,GAAmB,aAAa,CAAC,aAAa,CAAA;QAE1D,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAgB,EAAE,EAAE,CAChC,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,MAAM,CAChC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EACb;YACE,MAAM,EAAE,iCAAoB,CAAC,UAAU;YACvC,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CACF,CACF,CACF,CAAA;QAED,IAAI,cAAc,GAAc,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE;gBACL,MAAM;gBACN,aAAa,EAAE,aAAa;aAC7B;SACF,CAAC,CAAA;QAEF,IAAI,cAAc,EAAE;YAClB,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,MAAM,CACnC,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE,EACzB;gBACE,MAAM,EAAE,4BAAgB,CAAC,SAAS;gBAClC,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CACF,CAAA;YAED,IAAI,qBAAqB,GAAoB,MAAM,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,OAAO,CAAC;gBACxF,KAAK,EAAE;oBACL,MAAM;oBACN,SAAS,EAAE,cAAc;iBAC1B;aACF,CAAC,CAAA;YAEF,MAAM,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,MAAM,CACzC,EAAE,EAAE,EAAE,qBAAqB,CAAC,EAAE,EAAE,EAChC;gBACE,MAAM,EAAE,4BAAgB,CAAC,SAAS;gBAClC,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CACF,CAAA;SACF;QAED,IAAA,iCAAc,EAAC,aAAa,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,QAAQ,EAAE,EAAE,oCAAiB,CAAC,oBAAoB,CAAC,CAAA;QAErG,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.proceedExtraProductsResolver = void 0;
|
|
4
4
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
5
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
6
|
+
const integration_base_1 = require("@things-factory/integration-base");
|
|
6
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
8
|
const constants_1 = require("../../../constants");
|
|
8
9
|
const entities_1 = require("../../../entities");
|
|
@@ -25,7 +26,7 @@ exports.proceedExtraProductsResolver = {
|
|
|
25
26
|
name: ganNo,
|
|
26
27
|
status: sales_base_1.ORDER_STATUS.PENDING_APPROVAL
|
|
27
28
|
},
|
|
28
|
-
relations: ['orderProducts']
|
|
29
|
+
relations: ['domain', 'bizplace', 'orderProducts']
|
|
29
30
|
});
|
|
30
31
|
if (!arrivalNotice)
|
|
31
32
|
throw new Error(`Unable to find ${arrivalNotice.name} under PENDING APPROVAL status`);
|
|
@@ -148,6 +149,7 @@ exports.proceedExtraProductsResolver = {
|
|
|
148
149
|
await tx.getRepository(sales_base_1.OrderProduct).delete(deleteOrderProducts);
|
|
149
150
|
}
|
|
150
151
|
}
|
|
152
|
+
(0, integration_base_1.webhookHandler)(arrivalNotice, { id: arrivalNotice.bizplace }, integration_base_1.WebhookEventsEnum.ArrivalNoticeUpdated);
|
|
151
153
|
// notification logics
|
|
152
154
|
// get Office Admin Users
|
|
153
155
|
const users = await tx
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proceed-extra-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/proceed-extra-products.ts"],"names":[],"mappings":";;;AAEA,yDAAsD;AACtD,uDAAmD;
|
|
1
|
+
{"version":3,"file":"proceed-extra-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/proceed-extra-products.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.665",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@things-factory/integration-sftp": "^4.3.660",
|
|
37
37
|
"@things-factory/marketplace-base": "^4.3.660",
|
|
38
38
|
"@things-factory/notification": "^4.3.609",
|
|
39
|
-
"@things-factory/sales-base": "^4.3.
|
|
39
|
+
"@things-factory/sales-base": "^4.3.665",
|
|
40
40
|
"@things-factory/setting-base": "^4.3.609",
|
|
41
41
|
"@things-factory/shell": "^4.3.591",
|
|
42
42
|
"@things-factory/transport-base": "^4.3.631",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"puppeteer": "21.0.3",
|
|
46
46
|
"uuid": "^9.0.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "50cc93fbfd21247d73a15a05542189aee5a50e61"
|
|
49
49
|
}
|
|
@@ -1,80 +1,84 @@
|
|
|
1
1
|
import { getRepository } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { User } from '@things-factory/auth-base'
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
ORDER_PRODUCT_STATUS,
|
|
7
|
-
ORDER_STATUS,
|
|
8
|
-
OrderProduct
|
|
9
|
-
} from '@things-factory/sales-base'
|
|
4
|
+
import { webhookHandler, WebhookEventsEnum } from '@things-factory/integration-base'
|
|
5
|
+
import { ArrivalNotice, ORDER_PRODUCT_STATUS, ORDER_STATUS, OrderProduct } from '@things-factory/sales-base'
|
|
10
6
|
import { Domain } from '@things-factory/shell'
|
|
11
7
|
|
|
12
8
|
import { WORKSHEET_STATUS } from '../../../constants'
|
|
13
|
-
import {
|
|
14
|
-
Worksheet,
|
|
15
|
-
WorksheetDetail
|
|
16
|
-
} from '../../../entities'
|
|
9
|
+
import { Worksheet, WorksheetDetail } from '../../../entities'
|
|
17
10
|
|
|
18
11
|
export const cancelArrivalNoticeResolver = {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
12
|
+
async cancelArrivalNotice(_: any, { name }, context: any) {
|
|
13
|
+
const { user, domain }: { user: User; domain: Domain } = context.state
|
|
14
|
+
|
|
15
|
+
const arrivalNotice: ArrivalNotice = await getRepository(ArrivalNotice).findOne({
|
|
16
|
+
where: { domain: domain, name },
|
|
17
|
+
relations: ['domain', 'bizplace', 'orderProducts']
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
if (!arrivalNotice) throw new Error(`Arrival notice doesn't exists.`)
|
|
21
|
+
|
|
22
|
+
await getRepository(ArrivalNotice).update(
|
|
23
|
+
{ id: arrivalNotice.id },
|
|
24
|
+
{
|
|
25
|
+
status: ORDER_STATUS.CANCELLED,
|
|
26
|
+
updater: user,
|
|
27
|
+
updatedAt: new Date().toISOString()
|
|
28
|
+
}
|
|
29
|
+
)
|
|
30
|
+
|
|
31
|
+
let foundOPs: OrderProduct[] = arrivalNotice.orderProducts
|
|
32
|
+
|
|
33
|
+
await Promise.all(
|
|
34
|
+
foundOPs.map((op: OrderProduct) =>
|
|
35
|
+
getRepository(OrderProduct).update(
|
|
36
|
+
{ id: op.id },
|
|
37
|
+
{
|
|
38
|
+
status: ORDER_PRODUCT_STATUS.TERMINATED,
|
|
39
|
+
updater: user,
|
|
40
|
+
updatedAt: new Date().toISOString()
|
|
41
|
+
}
|
|
42
|
+
)
|
|
43
|
+
)
|
|
44
|
+
)
|
|
45
|
+
|
|
46
|
+
let foundWorksheet: Worksheet = await getRepository(Worksheet).findOne({
|
|
47
|
+
where: {
|
|
48
|
+
domain,
|
|
49
|
+
arrivalNotice: arrivalNotice
|
|
50
|
+
}
|
|
51
|
+
})
|
|
52
|
+
|
|
53
|
+
if (foundWorksheet) {
|
|
54
|
+
await getRepository(Worksheet).update(
|
|
55
|
+
{ id: foundWorksheet.id },
|
|
56
|
+
{
|
|
57
|
+
status: WORKSHEET_STATUS.CANCELLED,
|
|
58
|
+
updater: user,
|
|
59
|
+
updatedAt: new Date().toISOString()
|
|
60
|
+
}
|
|
61
|
+
)
|
|
62
|
+
|
|
63
|
+
let foundWorksheetDetails: WorksheetDetail = await getRepository(WorksheetDetail).findOne({
|
|
64
|
+
where: {
|
|
65
|
+
domain,
|
|
66
|
+
worksheet: foundWorksheet
|
|
67
|
+
}
|
|
68
|
+
})
|
|
69
|
+
|
|
70
|
+
await getRepository(WorksheetDetail).update(
|
|
71
|
+
{ id: foundWorksheetDetails.id },
|
|
72
|
+
{
|
|
73
|
+
status: WORKSHEET_STATUS.CANCELLED,
|
|
74
|
+
updater: user,
|
|
75
|
+
updatedAt: new Date().toISOString()
|
|
76
|
+
}
|
|
77
|
+
)
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
webhookHandler(arrivalNotice, { id: arrivalNotice.bizplace }, WebhookEventsEnum.ArrivalNoticeUpdated)
|
|
81
|
+
|
|
82
|
+
return true
|
|
83
|
+
}
|
|
84
|
+
}
|
|
@@ -2,6 +2,7 @@ import { EntityManager } from 'typeorm'
|
|
|
2
2
|
|
|
3
3
|
import { Role, User } from '@things-factory/auth-base'
|
|
4
4
|
import { Bizplace } from '@things-factory/biz-base'
|
|
5
|
+
import { webhookHandler, WebhookEventsEnum } from '@things-factory/integration-base'
|
|
5
6
|
import { sendNotification } from '@things-factory/notification'
|
|
6
7
|
import { ArrivalNotice, ORDER_PRODUCT_STATUS, ORDER_STATUS, OrderProduct } from '@things-factory/sales-base'
|
|
7
8
|
import { Domain } from '@things-factory/shell'
|
|
@@ -34,7 +35,7 @@ export const proceedExtraProductsResolver = {
|
|
|
34
35
|
name: ganNo,
|
|
35
36
|
status: ORDER_STATUS.PENDING_APPROVAL
|
|
36
37
|
},
|
|
37
|
-
relations: ['orderProducts']
|
|
38
|
+
relations: ['domain', 'bizplace', 'orderProducts']
|
|
38
39
|
})
|
|
39
40
|
|
|
40
41
|
if (!arrivalNotice) throw new Error(`Unable to find ${arrivalNotice.name} under PENDING APPROVAL status`)
|
|
@@ -237,6 +238,8 @@ export const proceedExtraProductsResolver = {
|
|
|
237
238
|
}
|
|
238
239
|
}
|
|
239
240
|
|
|
241
|
+
webhookHandler(arrivalNotice, { id: arrivalNotice.bizplace }, WebhookEventsEnum.ArrivalNoticeUpdated)
|
|
242
|
+
|
|
240
243
|
// notification logics
|
|
241
244
|
// get Office Admin Users
|
|
242
245
|
const users: any[] = await tx
|