@things-factory/marketplace-base 4.3.20 → 4.3.21
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.21",
|
|
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.3.20",
|
|
30
30
|
"@things-factory/shell": "^4.3.20"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "2021cf9407cfd29d9e1b32063f834584c7b97714"
|
|
33
33
|
}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import { EntityManager,
|
|
1
|
+
import { EntityManager, getConnection, IsNull, SelectQueryBuilder } from 'typeorm'
|
|
2
2
|
import uuid from 'uuid/v4'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
5
|
import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
|
|
6
|
+
import { logger } from '@things-factory/env'
|
|
6
7
|
import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
|
|
7
|
-
import { MarketplaceStore,
|
|
8
|
+
import { MarketplaceStore, MarketplaceTransporter, StoreAPI } from '@things-factory/integration-marketplace'
|
|
8
9
|
import { Product, ProductBundle, ProductBundleSetting } from '@things-factory/product-base'
|
|
9
10
|
import { Domain } from '@things-factory/shell'
|
|
10
|
-
import { logger } from '@things-factory/env'
|
|
11
11
|
|
|
12
|
+
import { RESERVE_QTY_ORDER_STATUSES } from '../../../constants/reserve-qty-order-statuses'
|
|
12
13
|
import {
|
|
13
14
|
MarketplaceOrder,
|
|
14
15
|
MarketplaceOrderItem,
|
|
@@ -17,7 +18,6 @@ import {
|
|
|
17
18
|
MarketplaceProductVariation
|
|
18
19
|
} from '../../../entities'
|
|
19
20
|
import { NoGenerator } from '../../../utils'
|
|
20
|
-
import { RESERVE_QTY_ORDER_STATUSES } from '../../../constants/reserve-qty-order-statuses'
|
|
21
21
|
|
|
22
22
|
const cancelStatuses: string[] = [
|
|
23
23
|
'cancelled',
|
|
@@ -391,7 +391,7 @@ export const syncMarketplaceOrder = {
|
|
|
391
391
|
.andWhere('mpv.variation_id = :variationId')
|
|
392
392
|
.andWhere('ms.id = :marketplaceStoreId')
|
|
393
393
|
.setParameters({
|
|
394
|
-
domainId: marketplaceStore.domain,
|
|
394
|
+
domainId: marketplaceStore.domain.id,
|
|
395
395
|
variationId: item.variationId,
|
|
396
396
|
marketplaceStoreId: marketplaceStore.id
|
|
397
397
|
})
|