@things-factory/marketplace-base 4.2.5 → 4.2.6
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/marketplace-order/generate-marketplace-order.js +13 -2
- package/dist-server/graphql/resolvers/marketplace-order/generate-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js.map +1 -1
- package/package.json +2 -2
- package/server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts +15 -3
- package/server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts +1 -1
|
@@ -50,9 +50,20 @@ async function generateMarketplaceOrder(_, marketplaceOrder, domain, marketplace
|
|
|
50
50
|
marketplaceOrderItems = await Promise.all(marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceOrderItems.map(async (orderItem) => {
|
|
51
51
|
let marketplaceOrderItem = Object.assign({}, orderItem);
|
|
52
52
|
const marketplaceProductVariation = orderItem.marketplaceProductVariation;
|
|
53
|
-
|
|
53
|
+
const qb = await tx
|
|
54
54
|
.getRepository(entities_1.MarketplaceProductVariation)
|
|
55
|
-
.
|
|
55
|
+
.createQueryBuilder('mpv')
|
|
56
|
+
.leftJoin('mpv.marketplaceProduct', 'mp')
|
|
57
|
+
.leftJoin('mp.marketplaceStore', 'ms')
|
|
58
|
+
.where('mpv.domain_id = :domainId')
|
|
59
|
+
.andWhere('mpv.variation_id = :variationId')
|
|
60
|
+
.andWhere('ms.id = :marketplaceStoreId')
|
|
61
|
+
.setParameters({
|
|
62
|
+
domainId: domain.id,
|
|
63
|
+
variationId: marketplaceProductVariation.variationId,
|
|
64
|
+
marketplaceStoreId: marketplaceStore.id
|
|
65
|
+
});
|
|
66
|
+
let foundVariation = await qb.getOne();
|
|
56
67
|
if (!foundVariation) {
|
|
57
68
|
let newVariation = Object.assign({}, marketplaceProductVariation);
|
|
58
69
|
newVariation.status = 'ACTIVE';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"generate-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-order-ready-to-ship.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"update-order-ready-to-ship.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.6",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -29,5 +29,5 @@
|
|
|
29
29
|
"@things-factory/product-base": "^4.2.3",
|
|
30
30
|
"@things-factory/shell": "^4.1.40"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "a6ae8ce83ac935693632447e58012bd2d5aee512"
|
|
33
33
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EntityManager, IsNull } from 'typeorm'
|
|
1
|
+
import { EntityManager, IsNull, SelectQueryBuilder } from 'typeorm'
|
|
2
2
|
import uuid from 'uuid/v4'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
@@ -82,9 +82,21 @@ export async function generateMarketplaceOrder(
|
|
|
82
82
|
let marketplaceOrderItem: MarketplaceOrderItemEntity = Object.assign({}, orderItem)
|
|
83
83
|
|
|
84
84
|
const marketplaceProductVariation = orderItem.marketplaceProductVariation
|
|
85
|
-
|
|
85
|
+
const qb: SelectQueryBuilder<MarketplaceProductVariationEntity> = await tx
|
|
86
86
|
.getRepository(MarketplaceProductVariationEntity)
|
|
87
|
-
.
|
|
87
|
+
.createQueryBuilder('mpv')
|
|
88
|
+
.leftJoin('mpv.marketplaceProduct', 'mp')
|
|
89
|
+
.leftJoin('mp.marketplaceStore', 'ms')
|
|
90
|
+
.where('mpv.domain_id = :domainId')
|
|
91
|
+
.andWhere('mpv.variation_id = :variationId')
|
|
92
|
+
.andWhere('ms.id = :marketplaceStoreId')
|
|
93
|
+
.setParameters({
|
|
94
|
+
domainId: domain.id,
|
|
95
|
+
variationId: marketplaceProductVariation.variationId,
|
|
96
|
+
marketplaceStoreId: marketplaceStore.id
|
|
97
|
+
})
|
|
98
|
+
|
|
99
|
+
let foundVariation: MarketplaceProductVariationEntity = await qb.getOne()
|
|
88
100
|
|
|
89
101
|
if (!foundVariation) {
|
|
90
102
|
let newVariation: MarketplaceProductVariationEntity = Object.assign({}, marketplaceProductVariation)
|