@things-factory/worksheet-base 4.3.45 → 4.3.46
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.
|
@@ -55,20 +55,21 @@ async function renderPO({ req, timezoneOffSet }, context) {
|
|
|
55
55
|
logo = 'data:' + foundLogo.mimetype + ';base64,' + (await attachment_base_1.STORAGE.readFile(foundLogo.path, 'base64'));
|
|
56
56
|
}
|
|
57
57
|
const template = await attachment_base_1.STORAGE.readFile(foundTemplate.path, 'utf-8');
|
|
58
|
-
const poocQb =
|
|
58
|
+
const poocQb = (0, typeorm_1.getRepository)(sales_base_1.PurchaseOrderOtherCharge)
|
|
59
59
|
.createQueryBuilder('pooc')
|
|
60
60
|
.where('pooc.purchase_order_id = :poId')
|
|
61
61
|
.andWhere('pooc.apply_in_items = false')
|
|
62
62
|
.setParameters({ poId });
|
|
63
63
|
let poOtherCharges = await poocQb.getRawMany();
|
|
64
|
-
const qb =
|
|
64
|
+
const qb = (0, typeorm_1.getRepository)(sales_base_1.OrderProduct)
|
|
65
65
|
.createQueryBuilder('op')
|
|
66
66
|
.innerJoin('domains', 'd', 'op.domain_id = d.id')
|
|
67
|
-
.
|
|
68
|
-
.
|
|
67
|
+
.innerJoinAndSelect('purchase_orders', 'po', 'po.id = op.purchase_order_id')
|
|
68
|
+
.innerJoinAndSelect('products', 'p', 'op.product_id = p.id')
|
|
69
69
|
.where('op.purchase_order_id = :poId')
|
|
70
70
|
.andWhere('op.domain = :domainId')
|
|
71
|
-
.setParameters({ poId, domainId: domain.id })
|
|
71
|
+
.setParameters({ poId, domainId: domain.id })
|
|
72
|
+
.orderBy('p.sku');
|
|
72
73
|
let items = await qb.getRawMany();
|
|
73
74
|
const product_list = items.map((item, idx) => {
|
|
74
75
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-po.js","sourceRoot":"","sources":["../../server/controllers/render-po.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,4DAA8B;AAC9B,qCAA2D;AAE3D,qEAAqE;AAErE,6CAA4C;AAC5C,2DAMmC;AAEnC,iDAA8C;AAE9C,4CAA4C;AAC5C,0DAA0D;AAE1D,MAAM,cAAc,GAAG,YAAM,CAAC,GAAG,CAAC,cAAc,EAAE,6CAA6C,CAAC,CAAA;AAEzF,KAAK,UAAU,QAAQ,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,OAAY;IAClE,IAAI;QACF,MAAM,MAAM,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE;SACvC,CAAC,CAAA;QAEF,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5B,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YACzB,IAAI;gBACF,MAAM,EAAE,GAAsC,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC;qBAC7E,kBAAkB,CAAC,IAAI,CAAC;qBACxB,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC;qBACzC,kBAAkB,CAAC,aAAa,EAAE,UAAU,CAAC;qBAC7C,kBAAkB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;qBACxD,kBAAkB,CAAC,kBAAkB,EAAE,SAAS,CAAC;qBACjD,kBAAkB,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;qBACtD,iBAAiB,CAAC,gBAAgB,EAAE,IAAI,EAAE,wBAAwB,CAAC;qBACnE,iBAAiB,CAAC,iBAAiB,EAAE,IAAI,EAAE,8BAA8B,CAAC;qBAC1E,KAAK,CAAC,eAAe,CAAC;qBACtB,QAAQ,CAAC,uBAAuB,CAAC;qBACjC,aAAa,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;gBAE/C,IAAI,MAAM,GAAQ,MAAM,EAAE,CAAC,SAAS,EAAE,CAAA;gBAEtC,IAAI,MAAM,EAAE;oBACV,MAAM,UAAU,GAAsB;wBACpC,EAAE,EAAE,MAAM,CAAC,WAAW;wBACtB,IAAI,EAAE,MAAM,CAAC,aAAa;wBAC1B,OAAO,EAAE,MAAM,CAAC,gBAAgB;wBAChC,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,kBAAkB,EAAE;qBAC1C,CAAA;oBAED,MAAM,aAAa,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;wBACxE,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,QAAQ,EAAE,yBAAa,CAAC,WAAW,EAAE;qBAC1E,CAAC,CAAA;oBAEF,MAAM,SAAS,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;wBACpE,KAAK,EAAE;4BACL,MAAM,EAAE,UAAU,CAAC,MAAM;4BACzB,QAAQ,EAAE,yBAAa,CAAC,IAAI;yBAC7B;qBACF,CAAC,CAAA;oBAEF,IAAI,IAAI,GAAG,IAAI,CAAA;oBACf,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,EAAE;wBACnB,IAAI,GAAG,OAAO,GAAG,SAAS,CAAC,QAAQ,GAAG,UAAU,GAAG,CAAC,MAAM,yBAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;qBACtG;oBAED,MAAM,QAAQ,GAAG,MAAM,yBAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;oBAEpE,MAAM,MAAM,GAAiD,
|
|
1
|
+
{"version":3,"file":"render-po.js","sourceRoot":"","sources":["../../server/controllers/render-po.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.46",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,21 +24,21 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/auth-base": "^4.3.
|
|
28
|
-
"@things-factory/biz-base": "^4.3.
|
|
29
|
-
"@things-factory/document-template-base": "^4.3.
|
|
30
|
-
"@things-factory/id-rule-base": "^4.3.
|
|
31
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
34
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
36
|
-
"@things-factory/notification": "^4.3.
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
38
|
-
"@things-factory/setting-base": "^4.3.
|
|
39
|
-
"@things-factory/shell": "^4.3.
|
|
40
|
-
"@things-factory/transport-base": "^4.3.
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
27
|
+
"@things-factory/auth-base": "^4.3.46",
|
|
28
|
+
"@things-factory/biz-base": "^4.3.46",
|
|
29
|
+
"@things-factory/document-template-base": "^4.3.46",
|
|
30
|
+
"@things-factory/id-rule-base": "^4.3.46",
|
|
31
|
+
"@things-factory/integration-lmd": "^4.3.46",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.46",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.46",
|
|
34
|
+
"@things-factory/integration-sftp": "^4.3.46",
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.46",
|
|
36
|
+
"@things-factory/notification": "^4.3.46",
|
|
37
|
+
"@things-factory/sales-base": "^4.3.46",
|
|
38
|
+
"@things-factory/setting-base": "^4.3.46",
|
|
39
|
+
"@things-factory/shell": "^4.3.46",
|
|
40
|
+
"@things-factory/transport-base": "^4.3.46",
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.46"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "83ecc645c3cc602bdae8941bc10b8f17b7d6c279"
|
|
44
44
|
}
|
|
@@ -70,7 +70,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
|
|
|
70
70
|
|
|
71
71
|
const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
|
|
72
72
|
|
|
73
|
-
const poocQb: SelectQueryBuilder<PurchaseOrderOtherCharge> =
|
|
73
|
+
const poocQb: SelectQueryBuilder<PurchaseOrderOtherCharge> = getRepository(PurchaseOrderOtherCharge)
|
|
74
74
|
.createQueryBuilder('pooc')
|
|
75
75
|
.where('pooc.purchase_order_id = :poId')
|
|
76
76
|
.andWhere('pooc.apply_in_items = false')
|
|
@@ -78,14 +78,15 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
|
|
|
78
78
|
|
|
79
79
|
let poOtherCharges: any[] = await poocQb.getRawMany()
|
|
80
80
|
|
|
81
|
-
const qb: SelectQueryBuilder<OrderProduct> =
|
|
81
|
+
const qb: SelectQueryBuilder<OrderProduct> = getRepository(OrderProduct)
|
|
82
82
|
.createQueryBuilder('op')
|
|
83
83
|
.innerJoin('domains', 'd', 'op.domain_id = d.id')
|
|
84
|
-
.
|
|
85
|
-
.
|
|
84
|
+
.innerJoinAndSelect('purchase_orders', 'po', 'po.id = op.purchase_order_id')
|
|
85
|
+
.innerJoinAndSelect('products', 'p', 'op.product_id = p.id')
|
|
86
86
|
.where('op.purchase_order_id = :poId')
|
|
87
87
|
.andWhere('op.domain = :domainId')
|
|
88
88
|
.setParameters({ poId, domainId: domain.id })
|
|
89
|
+
.orderBy('p.sku')
|
|
89
90
|
|
|
90
91
|
let items: any[] = await qb.getRawMany()
|
|
91
92
|
|
|
@@ -158,7 +159,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
|
|
|
158
159
|
formData.append('template', template)
|
|
159
160
|
formData.append('jsonString', JSON.stringify(data))
|
|
160
161
|
|
|
161
|
-
const response =
|
|
162
|
+
const response = await fetch(REPORT_API_URL, {
|
|
162
163
|
method: 'POST',
|
|
163
164
|
body: formData
|
|
164
165
|
})
|