@things-factory/marketplace-base 3.7.9 → 3.8.0
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-item.js +64 -0
- package/dist-server/entities/marketplace-order-item.js.map +1 -1
- package/dist-server/entities/marketplace-order.js +28 -0
- package/dist-server/entities/marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js +17 -0
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js +265 -212
- package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js +89 -44
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.js +28 -10
- package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.js +7 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js +33 -3
- package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js.map +1 -1
- package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js +31 -1
- package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js.map +1 -1
- package/package.json +5 -5
- package/server/entities/marketplace-order-item.ts +48 -0
- package/server/entities/marketplace-order.ts +21 -0
- package/server/graphql/resolvers/marketplace-order/marketplace-orders.ts +23 -0
- package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts +336 -290
- package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts +93 -47
- package/server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.ts +35 -14
- package/server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.ts +8 -0
- package/server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts +33 -3
- package/server/graphql/types/marketplace-report/marketplace-sales-report.ts +31 -1
|
@@ -7,9 +7,19 @@ import { MarketplaceOrder } from '../../../entities'
|
|
|
7
7
|
export const marketplaceOrdersResolver = {
|
|
8
8
|
async marketplaceOrders(_: any, params: ListParam, context: any) {
|
|
9
9
|
let postCodeSorter = params.sortings.find(sort => sort.name === 'postCode')
|
|
10
|
+
const noOfItemsFilter = params.filters.find(param => param.name === 'itemCount')
|
|
11
|
+
const skuFilter = params.filters.find(param => param.name === 'sku')
|
|
10
12
|
|
|
11
13
|
params.sortings = params.sortings.filter(sort => sort.name !== 'postCode')
|
|
12
14
|
|
|
15
|
+
if (noOfItemsFilter && noOfItemsFilter.value == 1) {
|
|
16
|
+
params.filters.find(param => param.name === 'itemCount').operator = 'eq'
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
if (skuFilter) {
|
|
20
|
+
params.filters = params.filters.filter(param => param.name !== 'sku')
|
|
21
|
+
}
|
|
22
|
+
|
|
13
23
|
let qb: SelectQueryBuilder<MarketplaceOrder> = getRepository(MarketplaceOrder).createQueryBuilder('mo')
|
|
14
24
|
buildQuery(qb, params, context)
|
|
15
25
|
qb.leftJoinAndSelect('mo.domain', 'domain')
|
|
@@ -25,6 +35,19 @@ export const marketplaceOrdersResolver = {
|
|
|
25
35
|
qb.addOrderBy('mos.postCode', postCodeSorter?.desc ? 'DESC' : 'ASC')
|
|
26
36
|
}
|
|
27
37
|
|
|
38
|
+
if (skuFilter) {
|
|
39
|
+
qb.andWhere(
|
|
40
|
+
`
|
|
41
|
+
exists (select * from marketplace_order_items moi
|
|
42
|
+
inner join marketplace_product_variations mpv
|
|
43
|
+
on moi.marketplace_product_variation_id = mpv.id
|
|
44
|
+
where moi.marketplace_order_id = mo.id
|
|
45
|
+
and lower(mpv.sku) like :sku)
|
|
46
|
+
`,
|
|
47
|
+
{ sku: skuFilter.value.toLowerCase() }
|
|
48
|
+
)
|
|
49
|
+
}
|
|
50
|
+
|
|
28
51
|
let [items, total] = await qb.getManyAndCount()
|
|
29
52
|
|
|
30
53
|
return { items, total }
|