@things-factory/sales-base 4.3.285 → 4.3.286

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.
Files changed (7) hide show
  1. package/dist-server/controllers/ecommerce/ecommerce-controller.js +49 -21
  2. package/dist-server/controllers/ecommerce/ecommerce-controller.js.map +1 -1
  3. package/dist-server/service/order-package-item/order-package-item.js +4 -1
  4. package/dist-server/service/order-package-item/order-package-item.js.map +1 -1
  5. package/package.json +4 -4
  6. package/server/controllers/ecommerce/ecommerce-controller.ts +47 -21
  7. package/server/service/order-package-item/order-package-item.ts +9 -9
package/dist-server/controllers/ecommerce/ecommerce-controller.js CHANGED
@@ -73,29 +73,57 @@ class EcommerceController extends order_controller_1.OrderController {
73
73
  validMarketplaceDistributors = marketplaceStore.marketplaceDistributors.filter(distributor => distributor.status === 'ACTIVE');
74
74
  }
75
75
  const hasVariation = (_b = storeProductVariation === null || storeProductVariation === void 0 ? void 0 : storeProductVariation.marketplaceProduct) === null || _b === void 0 ? void 0 : _b.hasVariation;
76
- if (hasVariation) {
77
- await integration_marketplace_1.StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
78
- {
79
- itemId: storeProductVariation.marketplaceProduct.itemId,
80
- variationId: storeProductVariation.variationId,
81
- variationSku: storeProductVariation.variationSku,
82
- qty: adjustQty,
83
- locationId: productVariationLocationId,
84
- inventoryItemId: storeProductVariation.inventoryItemId,
85
- distributors: validMarketplaceDistributors
86
- }
87
- ]);
76
+ if (marketplaceStore.platform == 'magento' && (validMarketplaceDistributors === null || validMarketplaceDistributors === void 0 ? void 0 : validMarketplaceDistributors.length) > 0) {
77
+ if (hasVariation) {
78
+ await integration_marketplace_1.StoreAPI.updateStoreProductVariationInventoryItem(marketplaceStore, [
79
+ {
80
+ itemId: storeProductVariation.marketplaceProduct.itemId,
81
+ variationId: storeProductVariation.variationId,
82
+ variationSku: storeProductVariation.variationSku,
83
+ qty: adjustQty,
84
+ locationId: productVariationLocationId,
85
+ inventoryItemId: storeProductVariation.inventoryItemId,
86
+ distributors: validMarketplaceDistributors
87
+ }
88
+ ]);
89
+ }
90
+ else {
91
+ await integration_marketplace_1.StoreAPI.updateStoreProductInventoryItem(marketplaceStore, [
92
+ {
93
+ itemId: storeProductVariation.marketplaceProduct.itemId,
94
+ variationId: storeProductVariation.variationId,
95
+ variationSku: storeProductVariation.variationSku,
96
+ qty: adjustQty,
97
+ distributors: validMarketplaceDistributors
98
+ }
99
+ ]);
100
+ }
88
101
  }
89
102
  else {
90
- await integration_marketplace_1.StoreAPI.updateStoreProductStock(marketplaceStore, [
91
- {
92
- itemId: storeProductVariation.marketplaceProduct.itemId,
93
- variationId: storeProductVariation.variationId,
94
- variationSku: storeProductVariation.variationSku,
95
- qty: adjustQty,
96
- distributors: validMarketplaceDistributors
97
- }
98
- ]);
103
+ if (hasVariation) {
104
+ await integration_marketplace_1.StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
105
+ {
106
+ itemId: storeProductVariation.marketplaceProduct.itemId,
107
+ variationId: storeProductVariation.variationId,
108
+ variationSku: storeProductVariation.variationSku,
109
+ qty: adjustQty,
110
+ locationId: productVariationLocationId,
111
+ inventoryItemId: storeProductVariation.inventoryItemId,
112
+ distributors: validMarketplaceDistributors
113
+ }
114
+ ]);
115
+ }
116
+ else {
117
+ await integration_marketplace_1.StoreAPI.updateStoreProductStock(marketplaceStore, [
118
+ {
119
+ itemId: storeProductVariation.marketplaceProduct.itemId,
120
+ variationId: storeProductVariation.variationId,
121
+ variationSku: storeProductVariation.variationSku,
122
+ qty: adjustQty,
123
+ distributors: validMarketplaceDistributors
124
+ }
125
+ ]);
126
+ }
99
127
  }
100
128
  storeProductVariation.qty = remainQty;
101
129
  storeProductVariation.updater = this.user;
package/dist-server/controllers/ecommerce/ecommerce-controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ecommerce-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/ecommerce-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ecommerce-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/ecommerce-controller.ts"],"names":[],"mappings":"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"}
package/dist-server/service/order-package-item/order-package-item.js CHANGED
@@ -44,7 +44,7 @@ __decorate([
44
44
  ], OrderPackageItem.prototype, "bizplaceId", void 0);
45
45
  __decorate([
46
46
  (0, typeorm_1.ManyToOne)(type => __1.OrderPackage),
47
- (0, type_graphql_1.Field)(type => __1.OrderPackage, { nullable: true }),
47
+ (0, type_graphql_1.Field)(type => __1.OrderPackage),
48
48
  __metadata("design:type", __1.OrderPackage)
49
49
  ], OrderPackageItem.prototype, "orderPackage", void 0);
50
50
  __decorate([
@@ -117,6 +117,9 @@ __decorate([
117
117
  OrderPackageItem = __decorate([
118
118
  (0, typeorm_1.Entity)(),
119
119
  (0, typeorm_1.Index)('ix_order_package_item_0', (orderPackageItem) => [orderPackageItem.domain, orderPackageItem.name], { unique: true }),
120
+ (0, typeorm_1.Index)('ix_order_package_item_1', (orderPackageItem) => [orderPackageItem.id], { unique: true }),
121
+ (0, typeorm_1.Index)('ix_order_package_item_2', (orderPackageItem) => [orderPackageItem.orderPackage]),
122
+ (0, typeorm_1.Index)('ix_order_package_item_3', (orderPackageItem) => [orderPackageItem.orderProduct]),
120
123
  (0, type_graphql_1.ObjectType)({ description: 'Entity for OrderPackageItem' })
121
124
  ], OrderPackageItem);
122
125
  exports.OrderPackageItem = OrderPackageItem;
package/dist-server/service/order-package-item/order-package-item.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"order-package-item.js","sourceRoot":"","sources":["../../../server/service/order-package-item/order-package-item.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"order-package-item.js","sourceRoot":"","sources":["../../../server/service/order-package-item/order-package-item.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/sales-base",
3
- "version": "4.3.285",
3
+ "version": "4.3.286",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -28,14 +28,14 @@
28
28
  "@things-factory/biz-base": "^4.3.281",
29
29
  "@things-factory/code-base": "^4.3.281",
30
30
  "@things-factory/integration-accounting": "^4.3.281",
31
- "@things-factory/integration-powrup": "^4.3.284",
31
+ "@things-factory/integration-powrup": "^4.3.286",
32
32
  "@things-factory/integration-sftp": "^4.3.281",
33
33
  "@things-factory/notification": "^4.3.281",
34
34
  "@things-factory/product-base": "^4.3.281",
35
35
  "@things-factory/setting-base": "^4.3.281",
36
36
  "@things-factory/shell": "^4.3.281",
37
37
  "@things-factory/transport-base": "^4.3.281",
38
- "@things-factory/warehouse-base": "^4.3.285"
38
+ "@things-factory/warehouse-base": "^4.3.286"
39
39
  },
40
- "gitHead": "237ce088d7a0a8d882cc76b1efaacc366638c45e"
40
+ "gitHead": "b57b9807ea55ce1ed7d083633819962eb6619526"
41
41
  }
package/server/controllers/ecommerce/ecommerce-controller.ts CHANGED
@@ -101,28 +101,54 @@ export class EcommerceController extends OrderController {
101
101
 
102
102
  const hasVariation: boolean = storeProductVariation?.marketplaceProduct?.hasVariation
103
103
 
104
- if (hasVariation) {
105
- await StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
106
- {
107
- itemId: storeProductVariation.marketplaceProduct.itemId,
108
- variationId: storeProductVariation.variationId,
109
- variationSku: storeProductVariation.variationSku,
110
- qty: adjustQty,
111
- locationId: productVariationLocationId,
112
- inventoryItemId: storeProductVariation.inventoryItemId,
113
- distributors: validMarketplaceDistributors
114
- }
115
- ])
104
+ if (marketplaceStore.platform == 'magento' && validMarketplaceDistributors?.length > 0) {
105
+ if (hasVariation) {
106
+ await StoreAPI.updateStoreProductVariationInventoryItem(marketplaceStore, [
107
+ {
108
+ itemId: storeProductVariation.marketplaceProduct.itemId,
109
+ variationId: storeProductVariation.variationId,
110
+ variationSku: storeProductVariation.variationSku,
111
+ qty: adjustQty,
112
+ locationId: productVariationLocationId,
113
+ inventoryItemId: storeProductVariation.inventoryItemId,
114
+ distributors: validMarketplaceDistributors
115
+ }
116
+ ])
117
+ } else {
118
+ await StoreAPI.updateStoreProductInventoryItem(marketplaceStore, [
119
+ {
120
+ itemId: storeProductVariation.marketplaceProduct.itemId,
121
+ variationId: storeProductVariation.variationId,
122
+ variationSku: storeProductVariation.variationSku,
123
+ qty: adjustQty,
124
+ distributors: validMarketplaceDistributors
125
+ }
126
+ ])
127
+ }
116
128
  } else {
117
- await StoreAPI.updateStoreProductStock(marketplaceStore, [
118
- {
119
- itemId: storeProductVariation.marketplaceProduct.itemId,
120
- variationId: storeProductVariation.variationId,
121
- variationSku: storeProductVariation.variationSku,
122
- qty: adjustQty,
123
- distributors: validMarketplaceDistributors
124
- }
125
- ])
129
+ if (hasVariation) {
130
+ await StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
131
+ {
132
+ itemId: storeProductVariation.marketplaceProduct.itemId,
133
+ variationId: storeProductVariation.variationId,
134
+ variationSku: storeProductVariation.variationSku,
135
+ qty: adjustQty,
136
+ locationId: productVariationLocationId,
137
+ inventoryItemId: storeProductVariation.inventoryItemId,
138
+ distributors: validMarketplaceDistributors
139
+ }
140
+ ])
141
+ } else {
142
+ await StoreAPI.updateStoreProductStock(marketplaceStore, [
143
+ {
144
+ itemId: storeProductVariation.marketplaceProduct.itemId,
145
+ variationId: storeProductVariation.variationId,
146
+ variationSku: storeProductVariation.variationSku,
147
+ qty: adjustQty,
148
+ distributors: validMarketplaceDistributors
149
+ }
150
+ ])
151
+ }
126
152
  }
127
153
 
128
154
  storeProductVariation.qty = remainQty
package/server/service/order-package-item/order-package-item.ts CHANGED
@@ -17,11 +17,11 @@ import { Domain } from '@things-factory/shell'
17
17
  import { OrderPackage, OrderProduct } from '../'
18
18
 
19
19
  @Entity()
20
- @Index(
21
- 'ix_order_package_item_0',
22
- (orderPackageItem: OrderPackageItem) => [orderPackageItem.domain, orderPackageItem.name],
23
- { unique: true }
24
- )
20
+ @Index('ix_order_package_item_0', (orderPackageItem: OrderPackageItem) => [orderPackageItem.domain, orderPackageItem.name], { unique: true })
21
+ @Index('ix_order_package_item_1', (orderPackageItem: OrderPackageItem) => [orderPackageItem.id], { unique: true })
22
+ @Index('ix_order_package_item_2', (orderPackageItem: OrderPackageItem) => [orderPackageItem.orderPackage])
23
+ @Index('ix_order_package_item_3', (orderPackageItem: OrderPackageItem) => [orderPackageItem.orderProduct])
24
+
25
25
  @ObjectType({ description: 'Entity for OrderPackageItem' })
26
26
  export class OrderPackageItem {
27
27
  @PrimaryGeneratedColumn('uuid')
@@ -43,11 +43,11 @@ export class OrderPackageItem {
43
43
  bizplaceId?: string
44
44
 
45
45
  @ManyToOne(type => OrderPackage)
46
- @Field(type => OrderPackage, { nullable: true })
47
- orderPackage?: OrderPackage
46
+ @Field(type => OrderPackage)
47
+ orderPackage: OrderPackage
48
48
 
49
49
  @RelationId((orderPackageItem: OrderPackageItem) => orderPackageItem.orderPackage)
50
- orderPackageId?: string
50
+ orderPackageId: string
51
51
 
52
52
  @ManyToOne(type => OrderProduct)
53
53
  @Field(type => OrderProduct, { nullable: true })
@@ -99,4 +99,4 @@ export class OrderPackageItem {
99
99
 
100
100
  @RelationId((orderPackageItem: OrderPackageItem) => orderPackageItem.creator)
101
101
  updaterId?: string
102
- }
102
+ }