@things-factory/warehouse-base 5.0.0-alpha.36 → 5.0.0-alpha.39
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.
|
@@ -24,6 +24,7 @@ class SellercraftController extends warehouse_controller_1.WarehouseController {
|
|
|
24
24
|
let inventories = await qb.getMany();
|
|
25
25
|
let defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault);
|
|
26
26
|
let inventoryTotalQty = 0;
|
|
27
|
+
let inventoryTotalLockedQty = 0;
|
|
27
28
|
if ((inventories === null || inventories === void 0 ? void 0 : inventories.length) > 0) {
|
|
28
29
|
const sellercraftInvs = await Promise.all(inventories.map(async (inventory) => {
|
|
29
30
|
const inventoryPackingType = inventory.packingType;
|
|
@@ -32,10 +33,14 @@ class SellercraftController extends warehouse_controller_1.WarehouseController {
|
|
|
32
33
|
const unmatchingProductDetail = product.productDetails.find(productDetail => productDetail.packingType === inventoryPackingType);
|
|
33
34
|
packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail);
|
|
34
35
|
}
|
|
35
|
-
return {
|
|
36
|
+
return { totalQty: inventory.qty * packingSize, totalLockedQty: inventory.lockedQty * packingSize };
|
|
36
37
|
}));
|
|
37
38
|
inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
|
|
38
|
-
total += currentValue.
|
|
39
|
+
total += currentValue.totalQty;
|
|
40
|
+
return total;
|
|
41
|
+
}, 0);
|
|
42
|
+
inventoryTotalLockedQty = sellercraftInvs.reduce((total, currentValue) => {
|
|
43
|
+
total += currentValue.totalLockedQty;
|
|
39
44
|
return total;
|
|
40
45
|
}, 0);
|
|
41
46
|
}
|
|
@@ -44,7 +49,8 @@ class SellercraftController extends warehouse_controller_1.WarehouseController {
|
|
|
44
49
|
sku: product.sku,
|
|
45
50
|
gtin: defaultProductDetail.gtin,
|
|
46
51
|
stock: {
|
|
47
|
-
|
|
52
|
+
quantity_total: inventoryTotalQty,
|
|
53
|
+
quantity_reserved: inventoryTotalLockedQty,
|
|
48
54
|
unit_of_measure: 'EA'
|
|
49
55
|
},
|
|
50
56
|
package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":";;;AAAA,qFAAqF;AAGrF,+CAAiE;AACjE,iEAA6D;AAC7D,kEAA6D;AAE7D,MAAa,qBAAsB,SAAQ,0CAAmB;IAC5D,KAAK,CAAC,sBAAsB,CAAC,WAAwB,EAAE,SAAoB;QACzE,IAAI,OAAO,GAAY,SAAS,CAAC,OAAO,CAAA;QACxC,MAAM,cAAc,GAAoB,OAAO,CAAC,cAAc,CAAA;QAE9D,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,qBAAS,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QAC7E,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC;aACxC,QAAQ,CAAC,+BAA+B,CAAC;aACzC,QAAQ,CAAC,iCAAiC,CAAC;aAC3C,QAAQ,CAAC,2BAA2B,CAAC;aACrC,QAAQ,CAAC,yCAAyC,CAAC;aACnD,aAAa,CAAC;YACb,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;YACxB,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,MAAM,EAAE,4BAAgB,CAAC,UAAU;YACnC,aAAa,EAAE,CAAC,yBAAa,CAAC,UAAU,EAAE,yBAAa,CAAC,OAAO,CAAC;SACjE,CAAC,CAAA;QAEJ,IAAI,WAAW,GAAgB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;QAEjD,IAAI,oBAAoB,GAAkB,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAC/G,IAAI,iBAAiB,GAAW,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/warehouse-base",
|
|
3
|
-
"version": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.39",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,12 +24,12 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/biz-base": "^5.0.0-alpha.
|
|
28
|
-
"@things-factory/id-rule-base": "^5.0.0-alpha.
|
|
29
|
-
"@things-factory/integration-sellercraft": "^5.0.0-alpha.
|
|
30
|
-
"@things-factory/marketplace-base": "^5.0.0-alpha.
|
|
31
|
-
"@things-factory/product-base": "^5.0.0-alpha.
|
|
32
|
-
"@things-factory/setting-base": "^5.0.0-alpha.
|
|
27
|
+
"@things-factory/biz-base": "^5.0.0-alpha.39",
|
|
28
|
+
"@things-factory/id-rule-base": "^5.0.0-alpha.39",
|
|
29
|
+
"@things-factory/integration-sellercraft": "^5.0.0-alpha.39",
|
|
30
|
+
"@things-factory/marketplace-base": "^5.0.0-alpha.39",
|
|
31
|
+
"@things-factory/product-base": "^5.0.0-alpha.39",
|
|
32
|
+
"@things-factory/setting-base": "^5.0.0-alpha.39"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "23e58562a4724f157c3bc492cdedb7e32efee6a1"
|
|
35
35
|
}
|
|
@@ -27,6 +27,7 @@ export class SellercraftController extends WarehouseController {
|
|
|
27
27
|
|
|
28
28
|
let defaultProductDetail: ProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
|
|
29
29
|
let inventoryTotalQty: number = 0
|
|
30
|
+
let inventoryTotalLockedQty: number = 0
|
|
30
31
|
|
|
31
32
|
if (inventories?.length > 0) {
|
|
32
33
|
const sellercraftInvs: any[] = await Promise.all(
|
|
@@ -42,12 +43,17 @@ export class SellercraftController extends WarehouseController {
|
|
|
42
43
|
packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
|
|
43
44
|
}
|
|
44
45
|
|
|
45
|
-
return {
|
|
46
|
+
return { totalQty: inventory.qty * packingSize, totalLockedQty: inventory.lockedQty * packingSize }
|
|
46
47
|
})
|
|
47
48
|
)
|
|
48
49
|
|
|
49
50
|
inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
|
|
50
|
-
total += currentValue.
|
|
51
|
+
total += currentValue.totalQty
|
|
52
|
+
return total
|
|
53
|
+
}, 0)
|
|
54
|
+
|
|
55
|
+
inventoryTotalLockedQty = sellercraftInvs.reduce((total, currentValue) => {
|
|
56
|
+
total += currentValue.totalLockedQty
|
|
51
57
|
return total
|
|
52
58
|
}, 0)
|
|
53
59
|
}
|
|
@@ -57,7 +63,8 @@ export class SellercraftController extends WarehouseController {
|
|
|
57
63
|
sku: product.sku,
|
|
58
64
|
gtin: defaultProductDetail.gtin,
|
|
59
65
|
stock: {
|
|
60
|
-
|
|
66
|
+
quantity_total: inventoryTotalQty,
|
|
67
|
+
quantity_reserved: inventoryTotalLockedQty,
|
|
61
68
|
unit_of_measure: 'EA'
|
|
62
69
|
},
|
|
63
70
|
package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
|