@things-factory/marketplace-base 3.6.26 → 3.6.29
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/entities/marketplace-order.js +2 -2
- package/dist-server/entities/marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js +32 -12
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js.map +1 -1
- package/package.json +5 -5
- package/server/entities/marketplace-order.ts +2 -2
- package/server/graphql/resolvers/marketplace-order/marketplace-orders.ts +39 -16
|
@@ -56,8 +56,8 @@ __decorate([
|
|
|
56
56
|
__metadata("design:type", Number)
|
|
57
57
|
], MarketplaceOrder.prototype, "itemCount", void 0);
|
|
58
58
|
__decorate([
|
|
59
|
-
(0, typeorm_1.Column)({ nullable: true }),
|
|
60
|
-
__metadata("design:type",
|
|
59
|
+
(0, typeorm_1.Column)({ type: 'float', nullable: true }),
|
|
60
|
+
__metadata("design:type", Number)
|
|
61
61
|
], MarketplaceOrder.prototype, "totalAmount", void 0);
|
|
62
62
|
__decorate([
|
|
63
63
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAAkD;AAQlD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;CAiG5B,CAAA;AA/FC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4CACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;gDAAA;AAGd;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,0CAAgB,CAAC;kDAClB,0CAAgB,oBAAhB,0CAAgB;0DAAA;AAGlC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,+BAAoB,EAAE,oBAAoB,CAAC,EAAE,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;;+DAC1D;AAG7C;IADC,IAAA,gBAAM,GAAE;;8CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACZ;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACvB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;
|
|
1
|
+
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.marketplaceOrdersResolver = void 0;
|
|
4
|
-
const shell_1 = require("@things-factory/shell");
|
|
5
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const shell_1 = require("@things-factory/shell");
|
|
6
6
|
const entities_1 = require("../../../entities");
|
|
7
7
|
exports.marketplaceOrdersResolver = {
|
|
8
8
|
async marketplaceOrders(_, params, context) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
9
|
+
var _a;
|
|
10
|
+
let postCodeSorter = params.sortings.filter(sort => sort.name === 'postCode');
|
|
11
|
+
params.sortings = params.sortings.filter(sort => sort.name !== 'postCode');
|
|
12
|
+
let qb = (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).createQueryBuilder('mo');
|
|
13
|
+
(0, shell_1.buildQuery)(qb, params, context);
|
|
14
|
+
qb.leftJoinAndSelect('mo.domain', 'domain')
|
|
15
|
+
.leftJoinAndSelect('mo.marketplaceStore', 'ms')
|
|
16
|
+
.leftJoinAndSelect('mo.marketplaceOrderItems', 'mi')
|
|
17
|
+
.leftJoinAndSelect('mi.marketplaceProductVariation', 'mpv')
|
|
18
|
+
.leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
|
|
19
|
+
.leftJoinAndSelect('mi.marketplaceOrderShipping', 'mos')
|
|
20
|
+
.leftJoinAndSelect('mo.creator', 'creator')
|
|
21
|
+
.leftJoinAndSelect('mo.updater', 'updater');
|
|
22
|
+
if (postCodeSorter) {
|
|
23
|
+
qb.addOrderBy('mos.postCode', ((_a = postCodeSorter[0]) === null || _a === void 0 ? void 0 : _a.desc) ? 'DESC' : 'ASC');
|
|
24
|
+
}
|
|
25
|
+
let [items, total] = await qb.getManyAndCount();
|
|
26
|
+
// const convertedParams = convertListParams(params, context.state.domain.id)
|
|
27
|
+
// const [items, total] = await getRepository(MarketplaceOrder).findAndCount({
|
|
28
|
+
// ...convertedParams,
|
|
29
|
+
// relations: [
|
|
30
|
+
// 'domain',
|
|
31
|
+
// 'marketplaceStore',
|
|
32
|
+
// 'marketplaceOrderItems',
|
|
33
|
+
// 'marketplaceOrderItems.marketplaceProductVariation',
|
|
34
|
+
// 'marketplaceOrderItems.marketplaceProductVariation.marketplaceProduct',
|
|
35
|
+
// 'marketplaceOrderItems.marketplaceOrderShipping',
|
|
36
|
+
// 'creator',
|
|
37
|
+
// 'updater'
|
|
38
|
+
// ]
|
|
39
|
+
// })
|
|
20
40
|
return { items, total };
|
|
21
41
|
}
|
|
22
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,iDAA6D;AAE7D,gDAAoD;AAEvC,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAC7D,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAE7E,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAE1E,IAAI,EAAE,GAAyC,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACvG,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC;aACxC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC;aAC9C,iBAAiB,CAAC,0BAA0B,EAAE,IAAI,CAAC;aACnD,iBAAiB,CAAC,gCAAgC,EAAE,KAAK,CAAC;aAC1D,iBAAiB,CAAC,wBAAwB,EAAE,IAAI,CAAC;aACjD,iBAAiB,CAAC,6BAA6B,EAAE,KAAK,CAAC;aACvD,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;aAC1C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAE7C,IAAI,cAAc,EAAE;YAClB,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAA,MAAA,cAAc,CAAC,CAAC,CAAC,0CAAE,IAAI,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SACxE;QAED,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;QAE/C,6EAA6E;QAC7E,8EAA8E;QAC9E,wBAAwB;QACxB,iBAAiB;QACjB,gBAAgB;QAChB,0BAA0B;QAC1B,+BAA+B;QAC/B,2DAA2D;QAC3D,8EAA8E;QAC9E,wDAAwD;QACxD,iBAAiB;QACjB,gBAAgB;QAChB,MAAM;QACN,KAAK;QAEL,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.29",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/integration-fulfillment": "^3.6.
|
|
28
|
-
"@things-factory/integration-marketplace": "^3.6.
|
|
29
|
-
"@things-factory/shell": "^3.6.
|
|
27
|
+
"@things-factory/integration-fulfillment": "^3.6.29",
|
|
28
|
+
"@things-factory/integration-marketplace": "^3.6.29",
|
|
29
|
+
"@things-factory/shell": "^3.6.29"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "68873f7d01cf4fdabb992d3cca0c7c2d4cca07b4"
|
|
32
32
|
}
|
|
@@ -50,8 +50,8 @@ export class MarketplaceOrder {
|
|
|
50
50
|
@Column({ type: 'int', nullable: true })
|
|
51
51
|
itemCount: number
|
|
52
52
|
|
|
53
|
-
@Column({ nullable: true })
|
|
54
|
-
totalAmount:
|
|
53
|
+
@Column({ type: 'float', nullable: true })
|
|
54
|
+
totalAmount: number
|
|
55
55
|
|
|
56
56
|
@Column({ nullable: true })
|
|
57
57
|
paymentMethod: string
|
|
@@ -1,23 +1,46 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import { getRepository, SelectQueryBuilder } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { buildQuery, ListParam } from '@things-factory/shell'
|
|
4
|
+
|
|
3
5
|
import { MarketplaceOrder } from '../../../entities'
|
|
4
6
|
|
|
5
7
|
export const marketplaceOrdersResolver = {
|
|
6
8
|
async marketplaceOrders(_: any, params: ListParam, context: any) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
9
|
+
let postCodeSorter = params.sortings.filter(sort => sort.name === 'postCode')
|
|
10
|
+
|
|
11
|
+
params.sortings = params.sortings.filter(sort => sort.name !== 'postCode')
|
|
12
|
+
|
|
13
|
+
let qb: SelectQueryBuilder<MarketplaceOrder> = getRepository(MarketplaceOrder).createQueryBuilder('mo')
|
|
14
|
+
buildQuery(qb, params, context)
|
|
15
|
+
qb.leftJoinAndSelect('mo.domain', 'domain')
|
|
16
|
+
.leftJoinAndSelect('mo.marketplaceStore', 'ms')
|
|
17
|
+
.leftJoinAndSelect('mo.marketplaceOrderItems', 'mi')
|
|
18
|
+
.leftJoinAndSelect('mi.marketplaceProductVariation', 'mpv')
|
|
19
|
+
.leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
|
|
20
|
+
.leftJoinAndSelect('mi.marketplaceOrderShipping', 'mos')
|
|
21
|
+
.leftJoinAndSelect('mo.creator', 'creator')
|
|
22
|
+
.leftJoinAndSelect('mo.updater', 'updater')
|
|
23
|
+
|
|
24
|
+
if (postCodeSorter) {
|
|
25
|
+
qb.addOrderBy('mos.postCode', postCodeSorter[0]?.desc ? 'DESC' : 'ASC')
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
let [items, total] = await qb.getManyAndCount()
|
|
29
|
+
|
|
30
|
+
// const convertedParams = convertListParams(params, context.state.domain.id)
|
|
31
|
+
// const [items, total] = await getRepository(MarketplaceOrder).findAndCount({
|
|
32
|
+
// ...convertedParams,
|
|
33
|
+
// relations: [
|
|
34
|
+
// 'domain',
|
|
35
|
+
// 'marketplaceStore',
|
|
36
|
+
// 'marketplaceOrderItems',
|
|
37
|
+
// 'marketplaceOrderItems.marketplaceProductVariation',
|
|
38
|
+
// 'marketplaceOrderItems.marketplaceProductVariation.marketplaceProduct',
|
|
39
|
+
// 'marketplaceOrderItems.marketplaceOrderShipping',
|
|
40
|
+
// 'creator',
|
|
41
|
+
// 'updater'
|
|
42
|
+
// ]
|
|
43
|
+
// })
|
|
21
44
|
|
|
22
45
|
return { items, total }
|
|
23
46
|
}
|