@things-factory/worksheet-base 4.1.22 → 4.1.23

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.
@@ -50,38 +50,44 @@ class EcommerceController extends worksheet_controller_1.WorksheetController {
50
50
  where: { domain: companyDomain, sku: inventoryProduct.sku },
51
51
  relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
52
52
  });
53
- let marketplaceProductVariation = marketplaceProductVariations.filter(productVariation => productVariation.marketplaceProduct.marketplaceStore.id === marketplaceStore.id)[0];
53
+ let storeProductVariations = marketplaceProductVariations.filter(productVariation => productVariation.marketplaceProduct.marketplaceStore.id === marketplaceStore.id);
54
54
  let percentageValue = 100;
55
- if (marketplaceProductVariation) {
56
- if (marketplaceSetting) {
57
- percentageValue = parseInt(marketplaceSetting.value);
58
- }
59
- let productVariationLocationId = marketplaceProductVariation === null || marketplaceProductVariation === void 0 ? void 0 : marketplaceProductVariation.locationId;
60
- let adjustQty = Math.floor((inventoryProduct.qty - marketplaceProductVariation.reserveQty) * (percentageValue / 100));
61
- if (marketplaceStore.platform === 'shopify') {
62
- let locationIds = JSON.parse(productVariationLocationId);
63
- adjustQty = adjustQty - marketplaceProductVariation.qty;
64
- if ((_a = locationIds[0]) === null || _a === void 0 ? void 0 : _a.location_id)
65
- productVariationLocationId = locationIds[0].location_id;
66
- }
67
- let validMarketplaceDistributors = [];
68
- if (marketplaceStore.marketplaceDistributors) {
69
- validMarketplaceDistributors = marketplaceStore.marketplaceDistributors.filter(distributor => distributor.status === 'ACTIVE');
70
- }
71
- await integration_marketplace_1.StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
72
- {
73
- itemId: marketplaceProductVariation.marketplaceProduct.itemId,
74
- variationId: marketplaceProductVariation.variationId,
75
- variationSku: marketplaceProductVariation.variationSku,
76
- qty: adjustQty,
77
- locationId: productVariationLocationId,
78
- inventoryItemId: marketplaceProductVariation.inventoryItemId,
79
- distributors: validMarketplaceDistributors
55
+ if (storeProductVariations) {
56
+ for (let k = 0; k < storeProductVariations.length; k++) {
57
+ let storeProductVariation = storeProductVariations[k];
58
+ if (marketplaceSetting) {
59
+ percentageValue = parseInt(marketplaceSetting.value);
80
60
  }
81
- ]);
82
- marketplaceProductVariation.qty = Math.floor(inventoryProduct.qty * (percentageValue / 100));
83
- marketplaceProductVariation.updater = this.user;
84
- await this.trxMgr.getRepository(marketplace_base_1.MarketplaceProductVariation).save(marketplaceProductVariation);
61
+ let remainQty = Math.floor((inventoryProduct.qty - storeProductVariation.reserveQty) * (percentageValue / 100));
62
+ if (remainQty < 0)
63
+ remainQty = 0;
64
+ let productVariationLocationId = storeProductVariation === null || storeProductVariation === void 0 ? void 0 : storeProductVariation.locationId;
65
+ let adjustQty = remainQty;
66
+ if (marketplaceStore.platform === 'shopify') {
67
+ let locationIds = JSON.parse(productVariationLocationId);
68
+ adjustQty = adjustQty - storeProductVariation.qty;
69
+ if ((_a = locationIds[0]) === null || _a === void 0 ? void 0 : _a.location_id)
70
+ productVariationLocationId = locationIds[0].location_id;
71
+ }
72
+ let validMarketplaceDistributors = [];
73
+ if (marketplaceStore.marketplaceDistributors) {
74
+ validMarketplaceDistributors = marketplaceStore.marketplaceDistributors.filter(distributor => distributor.status === 'ACTIVE');
75
+ }
76
+ await integration_marketplace_1.StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
77
+ {
78
+ itemId: storeProductVariation.marketplaceProduct.itemId,
79
+ variationId: storeProductVariation.variationId,
80
+ variationSku: storeProductVariation.variationSku,
81
+ qty: adjustQty,
82
+ locationId: productVariationLocationId,
83
+ inventoryItemId: storeProductVariation.inventoryItemId,
84
+ distributors: validMarketplaceDistributors
85
+ }
86
+ ]);
87
+ storeProductVariation.qty = remainQty;
88
+ storeProductVariation.updater = this.user;
89
+ await this.trxMgr.getRepository(marketplace_base_1.MarketplaceProductVariation).save(storeProductVariation);
90
+ }
85
91
  }
86
92
  }
87
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ecommerce-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/ecommerce-controller.ts"],"names":[],"mappings":";;;AAEA,qFAAwG;AACxG,uEAMyC;AAGzC,mEAAsH;AAEtH,kEAA6D;AAE7D,MAAa,mBAAoB,SAAQ,0CAAmB;IAC1D,KAAK,CAAC,2BAA2B,CAC/B,iBAAqC,EACrC,aAAoB,EACpB,aAAqB;;QAErB,IAAI,iBAAiB,GAAU,MAAM,OAAO,CAAC,GAAG,CAC9C,aAAa,CAAC,GAAG,CAAC,KAAK,EAAC,YAAY,EAAC,EAAE;YACrC,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAA;YACpC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;YAC7E,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC;iBACxC,QAAQ,CAAC,+BAA+B,CAAC;iBACzC,QAAQ,CAAC,iCAAiC,CAAC;iBAC3C,QAAQ,CAAC,2BAA2B,CAAC;iBACrC,QAAQ,CAAC,yCAAyC,CAAC;iBACnD,aAAa,CAAC;gBACb,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;gBACxB,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE;gBAClC,MAAM,EAAE,iCAAgB,CAAC,UAAU;gBACnC,aAAa,EAAE,CAAC,8BAAa,CAAC,UAAU,EAAE,8BAAa,CAAC,OAAO,CAAC;aACjE,CAAC,CAAA;YAEJ,IAAI,WAAW,GAAgB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;YAEjD,WAAW,GAAG,WAAW,CAAC,MAAM,CAC9B,SAAS,CAAC,EAAE,CACV,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,IAAI,MAAK,8BAAa,CAAC,UAAU,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,IAAI,MAAK,8BAAa,CAAC,OAAO,CAC9G,CAAA;YAED,MAAM,YAAY,GAAW,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;gBACtE,KAAK,IAAI,YAAY,CAAC,GAAG,CAAA;gBACzB,OAAO,KAAK,CAAA;YACd,CAAC,EAAE,CAAC,CAAC,CAAA;YAEL,MAAM,kBAAkB,GAAW,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;gBAC5E,KAAK,IAAI,YAAY,CAAC,SAAS,CAAA;gBAC/B,OAAO,KAAK,CAAA;YACd,CAAC,EAAE,CAAC,CAAC,CAAA;YAEL,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,GAAG,kBAAkB,EAAE,CAAA;QACzF,CAAC,CAAC,CACH,CAAA;QAED,IAAI,sBAAsB,GAAU,MAAM,IAAA,0CAAyB,EACjE,IAAI,CAAC,MAAM,EACX,aAAa,EACb,aAAa,EACb,IAAI,CAAC,MAAM,CACZ,CAAA;QAED,iBAAiB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;YAE7C,0DAA0D;YAC1D,MAAM,kBAAkB,GAAuB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,4CAAkB,CAAC,CAAC,OAAO,CAAC;gBACzG,KAAK,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB,EAAE;aAC1D,CAAC,CAAA;YAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACjD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBAC7C,MAAM,4BAA4B,GAAkC,MAAM,IAAI,CAAC,MAAM;qBAClF,aAAa,CAAC,8CAA2B,CAAC;qBAC1C,IAAI,CAAC;oBACJ,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,GAAG,EAAE;oBAC3D,SAAS,EAAE,CAAC,oBAAoB,EAAE,qCAAqC,CAAC;iBACzE,CAAC,CAAA;gBAEJ,IAAI,2BAA2B,GAAgC,4BAA4B,CAAC,MAAM,CAChG,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,KAAK,gBAAgB,CAAC,EAAE,CACpG,CAAC,CAAC,CAAC,CAAA;gBAEJ,IAAI,eAAe,GAAW,GAAG,CAAA;gBACjC,IAAI,2BAA2B,EAAE;oBAC/B,IAAI,kBAAkB,EAAE;wBACtB,eAAe,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;qBACrD;oBAED,IAAI,0BAA0B,GAAG,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,UAAU,CAAA;oBACxE,IAAI,SAAS,GAAW,IAAI,CAAC,KAAK,CAChC,CAAC,gBAAgB,CAAC,GAAG,GAAG,2BAA2B,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,CAC1F,CAAA;oBAED,IAAI,gBAAgB,CAAC,QAAQ,KAAK,SAAS,EAAE;wBAC3C,IAAI,WAAW,GAAU,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;wBAC/D,SAAS,GAAG,SAAS,GAAG,2BAA2B,CAAC,GAAG,CAAA;wBACvD,IAAI,MAAA,WAAW,CAAC,CAAC,CAAC,0CAAE,WAAW;4BAAE,0BAA0B,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;qBACzF;oBAED,IAAI,4BAA4B,GAAU,EAAE,CAAA;oBAC5C,IAAI,gBAAgB,CAAC,uBAAuB,EAAE;wBAC5C,4BAA4B,GAAG,gBAAgB,CAAC,uBAAuB,CAAC,MAAM,CAC5E,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,QAAQ,CAC/C,CAAA;qBACF;oBAED,MAAM,kCAAQ,CAAC,gCAAgC,CAAC,gBAAgB,EAAE;wBAChE;4BACE,MAAM,EAAE,2BAA2B,CAAC,kBAAkB,CAAC,MAAM;4BAC7D,WAAW,EAAE,2BAA2B,CAAC,WAAW;4BACpD,YAAY,EAAE,2BAA2B,CAAC,YAAY;4BACtD,GAAG,EAAE,SAAS;4BACd,UAAU,EAAE,0BAA0B;4BACtC,eAAe,EAAE,2BAA2B,CAAC,eAAe;4BAC5D,YAAY,EAAE,4BAA4B;yBAC3C;qBACF,CAAC,CAAA;oBAEF,2BAA2B,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAG,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,CAAC,CAAA;oBAC5F,2BAA2B,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;oBAC/C,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,8CAA2B,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;iBAC/F;aACF;SACF;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,WAAwB,EACxB,gBAAkC,EAClC,gBAAkC,EAClC,aAAqB;QAErB,IAAI,wBAAkD,CAAA;QAEtD,IAAI,gBAAgB,CAAC,UAAU,EAAE;YAC/B,wBAAwB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2CAAwB,CAAC,CAAC,OAAO,CAAC;gBAC3F,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE;aACtF,CAAC,CAAA;SACH;aAAM;YACL,wBAAwB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,2CAAwB,CAAC,CAAC,OAAO,CAAC;gBAC3F,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,UAAU,EAAE,WAAW,CAAC,KAAK,EAAE;aAClF,CAAC,CAAA;SACH;QAED,MAAM,UAAU,GAAW,wBAAwB,CAAC,aAAa;YAC/D,CAAC,CAAC,wBAAwB,CAAC,aAAa;YACxC,CAAC,CAAC,wBAAwB,CAAC,UAAU,CAAA;QACvC,MAAM,gBAAgB,GAAW,wBAAwB,CAAC,cAAc;YACtE,CAAC,CAAC,wBAAwB,CAAC,cAAc;YACzC,CAAC,CAAC,wBAAwB,CAAC,WAAW,CAAA;QAExC,IAAI,4BAA4B,GAAU,EAAE,CAAA;QAC5C,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,uBAAuB,EAAE;YAC7D,4BAA4B,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,MAAM,CAC7F,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,QAAQ,CAC/C,CAAA;SACF;QAED,IAAI,qBAAqB,GAA2B,gBAAgB,CAAC,qBAAqB,CAAA;QAC1F,IAAI,UAAU,GAAU,EAAE,CAAA;QAC1B,qBAAqB,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE;YAC/C,MAAM,6BAA6B,GACjC,oBAAoB,CAAC,6BAA6B,CAAA;YACpD,6BAA6B,CAAC,GAAG,CAAC,4BAA4B,CAAC,EAAE;gBAC/D,IAAI,CAAA,4BAA4B,aAA5B,4BAA4B,uBAA5B,4BAA4B,CAAE,wBAAwB,CAAC,EAAE,KAAI,wBAAwB,CAAC,EAAE,EAAE;oBAC5F,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;iBACtC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,MAAM,kCAAQ,CAAC,eAAe,CAAC,gBAAgB,EAAE;YAC/C,OAAO,EAAE,gBAAgB,CAAC,IAAI;YAC9B,UAAU;YACV,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;YAC1D,WAAW,EAAE,4BAA4B,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;SAC/E,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,gBAAkC,EAClC,gBAAkC,EAClC,WAAmB;QAEnB,MAAM,kCAAQ,CAAC,kBAAkB,CAAC,gBAAgB,EAAE;YAClD,OAAO,EAAE,gBAAgB,CAAC,IAAI;YAC9B,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,gBAAgB,CAAC,MAAM;SAChC,CAAC,CAAA;IACJ,CAAC;CACF;AApLD,kDAoLC"}
1
+ {"version":3,"file":"ecommerce-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/ecommerce-controller.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.1.22",
3
+ "version": "4.1.23",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -31,14 +31,14 @@
31
31
  "@things-factory/integration-lmd": "^4.1.22",
32
32
  "@things-factory/integration-marketplace": "^4.1.22",
33
33
  "@things-factory/integration-sellercraft": "^4.1.22",
34
- "@things-factory/integration-sftp": "^4.1.22",
34
+ "@things-factory/integration-sftp": "^4.1.23",
35
35
  "@things-factory/marketplace-base": "^4.1.22",
36
36
  "@things-factory/notification": "^4.1.22",
37
- "@things-factory/sales-base": "^4.1.22",
37
+ "@things-factory/sales-base": "^4.1.23",
38
38
  "@things-factory/setting-base": "^4.1.22",
39
39
  "@things-factory/shell": "^4.1.22",
40
40
  "@things-factory/transport-base": "^4.1.22",
41
41
  "@things-factory/warehouse-base": "^4.1.22"
42
42
  },
43
- "gitHead": "e40b890d9a573562872298a6b79b26f600f607bf"
43
+ "gitHead": "f13228576595836d2a4c2e5412adf412c0f82f33"
44
44
  }
@@ -1,5 +1,3 @@
1
- import { Equal, Not } from 'typeorm'
2
-
3
1
  import { MarketplaceSetting, MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
4
2
  import {
5
3
  MarketplaceOrder,
@@ -83,49 +81,55 @@ export class EcommerceController extends WorksheetController {
83
81
  relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
84
82
  })
85
83
 
86
- let marketplaceProductVariation: MarketplaceProductVariation = marketplaceProductVariations.filter(
84
+ let storeProductVariations: MarketplaceProductVariation[] = marketplaceProductVariations.filter(
87
85
  productVariation => productVariation.marketplaceProduct.marketplaceStore.id === marketplaceStore.id
88
- )[0]
86
+ )
89
87
 
90
88
  let percentageValue: number = 100
91
- if (marketplaceProductVariation) {
92
- if (marketplaceSetting) {
93
- percentageValue = parseInt(marketplaceSetting.value)
94
- }
89
+ if (storeProductVariations) {
90
+ for (let k = 0; k < storeProductVariations.length; k++) {
91
+ let storeProductVariation: MarketplaceProductVariation = storeProductVariations[k]
92
+ if (marketplaceSetting) {
93
+ percentageValue = parseInt(marketplaceSetting.value)
94
+ }
95
95
 
96
- let productVariationLocationId = marketplaceProductVariation?.locationId
97
- let adjustQty: number = Math.floor(
98
- (inventoryProduct.qty - marketplaceProductVariation.reserveQty) * (percentageValue / 100)
99
- )
96
+ let remainQty: number = Math.floor(
97
+ (inventoryProduct.qty - storeProductVariation.reserveQty) * (percentageValue / 100)
98
+ )
99
+ if (remainQty < 0) remainQty = 0
100
100
 
101
- if (marketplaceStore.platform === 'shopify') {
102
- let locationIds: any[] = JSON.parse(productVariationLocationId)
103
- adjustQty = adjustQty - marketplaceProductVariation.qty
104
- if (locationIds[0]?.location_id) productVariationLocationId = locationIds[0].location_id
105
- }
101
+ let productVariationLocationId = storeProductVariation?.locationId
102
+ let adjustQty: number = remainQty
106
103
 
107
- let validMarketplaceDistributors: any[] = []
108
- if (marketplaceStore.marketplaceDistributors) {
109
- validMarketplaceDistributors = marketplaceStore.marketplaceDistributors.filter(
110
- distributor => distributor.status === 'ACTIVE'
111
- )
112
- }
104
+ if (marketplaceStore.platform === 'shopify') {
105
+ let locationIds: any[] = JSON.parse(productVariationLocationId)
106
+ adjustQty = adjustQty - storeProductVariation.qty
107
+ if (locationIds[0]?.location_id) productVariationLocationId = locationIds[0].location_id
108
+ }
113
109
 
114
- await StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
115
- {
116
- itemId: marketplaceProductVariation.marketplaceProduct.itemId,
117
- variationId: marketplaceProductVariation.variationId,
118
- variationSku: marketplaceProductVariation.variationSku,
119
- qty: adjustQty,
120
- locationId: productVariationLocationId,
121
- inventoryItemId: marketplaceProductVariation.inventoryItemId,
122
- distributors: validMarketplaceDistributors
110
+ let validMarketplaceDistributors: any[] = []
111
+ if (marketplaceStore.marketplaceDistributors) {
112
+ validMarketplaceDistributors = marketplaceStore.marketplaceDistributors.filter(
113
+ distributor => distributor.status === 'ACTIVE'
114
+ )
123
115
  }
124
- ])
125
116
 
126
- marketplaceProductVariation.qty = Math.floor(inventoryProduct.qty * (percentageValue / 100))
127
- marketplaceProductVariation.updater = this.user
128
- await this.trxMgr.getRepository(MarketplaceProductVariation).save(marketplaceProductVariation)
117
+ await StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
118
+ {
119
+ itemId: storeProductVariation.marketplaceProduct.itemId,
120
+ variationId: storeProductVariation.variationId,
121
+ variationSku: storeProductVariation.variationSku,
122
+ qty: adjustQty,
123
+ locationId: productVariationLocationId,
124
+ inventoryItemId: storeProductVariation.inventoryItemId,
125
+ distributors: validMarketplaceDistributors
126
+ }
127
+ ])
128
+
129
+ storeProductVariation.qty = remainQty
130
+ storeProductVariation.updater = this.user
131
+ await this.trxMgr.getRepository(MarketplaceProductVariation).save(storeProductVariation)
132
+ }
129
133
  }
130
134
  }
131
135
  }