@things-factory/marketplace-base 4.3.180 → 4.3.190

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.
@@ -101,6 +101,10 @@ __decorate([
101
101
  (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
102
102
  __metadata("design:type", Number)
103
103
  ], MarketplaceOrderItem.prototype, "paymentFee", void 0);
104
+ __decorate([
105
+ (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
106
+ __metadata("design:type", Number)
107
+ ], MarketplaceOrderItem.prototype, "platformFee", void 0);
104
108
  __decorate([
105
109
  (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
106
110
  __metadata("design:type", Number)
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":"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"}
@@ -11,10 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
11
11
  var _a, _b, _c, _d;
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  exports.MarketplaceProduct = void 0;
14
+ const typeorm_1 = require("typeorm");
14
15
  const auth_base_1 = require("@things-factory/auth-base");
15
16
  const integration_marketplace_1 = require("@things-factory/integration-marketplace");
16
17
  const shell_1 = require("@things-factory/shell");
17
- const typeorm_1 = require("typeorm");
18
18
  const entities_1 = require("../entities");
19
19
  const utils_1 = require("../utils");
20
20
  let MarketplaceProduct = class MarketplaceProduct {
@@ -114,6 +114,10 @@ __decorate([
114
114
  }),
115
115
  __metadata("design:type", String)
116
116
  ], MarketplaceProduct.prototype, "description", void 0);
117
+ __decorate([
118
+ (0, typeorm_1.Column)({ nullable: true }),
119
+ __metadata("design:type", String)
120
+ ], MarketplaceProduct.prototype, "brand", void 0);
117
121
  __decorate([
118
122
  (0, typeorm_1.Column)({
119
123
  nullable: true
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-product.js","sourceRoot":"","sources":["../../server/entities/marketplace-product.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"marketplace-product.js","sourceRoot":"","sources":["../../server/entities/marketplace-product.ts"],"names":[],"mappings":"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"}
@@ -29,6 +29,7 @@ exports.MarketplaceOrderItem = (0, graphql_tag_1.default) `
29
29
  discount: Float
30
30
  promotionId: String
31
31
  paymentFee: Float
32
+ platformFee: Float
32
33
  updater: User
33
34
  creator: User
34
35
  updatedAt: String
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-item/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6BtC,CAAA"}
1
+ {"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-item/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BtC,CAAA"}
@@ -19,6 +19,7 @@ exports.MarketplaceProduct = (0, graphql_tag_1.default) `
19
19
  type: String
20
20
  storageType: String
21
21
  description: String
22
+ brand: String
22
23
  currency: String
23
24
  hasVariation: Boolean
24
25
  categoryId: String
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-product.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-product/marketplace-product.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,kBAAkB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BpC,CAAA"}
1
+ {"version":3,"file":"marketplace-product.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-product/marketplace-product.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,kBAAkB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BpC,CAAA"}
@@ -11,6 +11,7 @@ exports.NewMarketplaceProduct = (0, graphql_tag_1.default) `
11
11
  name: String
12
12
  description: String
13
13
  type: String
14
+ brand: String
14
15
  marketplaceProductVariations: [NewMarketplaceProductVariation]
15
16
  marketplaceProductAttribute: NewMarketplaceProductAttribute
16
17
  marketplaceProductCategory: NewMarketplaceProductCategory
@@ -1 +1 @@
1
- {"version":3,"file":"new-marketplace-product.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-product/new-marketplace-product.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,qBAAqB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;CAqBvC,CAAA"}
1
+ {"version":3,"file":"new-marketplace-product.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-product/new-marketplace-product.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,qBAAqB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;CAsBvC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/marketplace-base",
3
- "version": "4.3.180",
3
+ "version": "4.3.190",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -23,10 +23,10 @@
23
23
  "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
24
24
  },
25
25
  "dependencies": {
26
- "@things-factory/integration-fulfillment": "^4.3.179",
27
- "@things-factory/integration-marketplace": "^4.3.179",
28
- "@things-factory/product-base": "^4.3.179",
26
+ "@things-factory/integration-fulfillment": "^4.3.190",
27
+ "@things-factory/integration-marketplace": "^4.3.190",
28
+ "@things-factory/product-base": "^4.3.186",
29
29
  "@things-factory/shell": "^4.3.179"
30
30
  },
31
- "gitHead": "15d2c49b93638fceb097e06570bd0116ed5e24e3"
31
+ "gitHead": "9fc85f3d95eeddd2191d156d99fc77bcc81b5071"
32
32
  }
@@ -87,6 +87,9 @@ export class MarketplaceOrderItem {
87
87
  @Column({ nullable: true, type: 'float' })
88
88
  paymentFee: number
89
89
 
90
+ @Column({ nullable: true, type: 'float' })
91
+ platformFee: number
92
+
90
93
  @Column({ nullable: true, type: 'float' })
91
94
  commissionFee: number
92
95
 
@@ -1,6 +1,3 @@
1
- import { User } from '@things-factory/auth-base'
2
- import { MarketplaceStore } from '@things-factory/integration-marketplace'
3
- import { Domain } from '@things-factory/shell'
4
1
  import {
5
2
  Column,
6
3
  CreateDateColumn,
@@ -11,6 +8,11 @@ import {
11
8
  PrimaryGeneratedColumn,
12
9
  UpdateDateColumn
13
10
  } from 'typeorm'
11
+
12
+ import { User } from '@things-factory/auth-base'
13
+ import { MarketplaceStore } from '@things-factory/integration-marketplace'
14
+ import { Domain } from '@things-factory/shell'
15
+
14
16
  import { MarketplaceProductAttribute, MarketplaceProductCategory, MarketplaceProductVariation } from '../entities'
15
17
  import { NoGenerator } from '../utils'
16
18
 
@@ -111,6 +113,9 @@ export class MarketplaceProduct {
111
113
  })
112
114
  description: string
113
115
 
116
+ @Column({ nullable: true })
117
+ brand: string
118
+
114
119
  @Column({
115
120
  nullable: true
116
121
  })
@@ -24,6 +24,7 @@ export const MarketplaceOrderItem = gql`
24
24
  discount: Float
25
25
  promotionId: String
26
26
  paymentFee: Float
27
+ platformFee: Float
27
28
  updater: User
28
29
  creator: User
29
30
  updatedAt: String
@@ -14,6 +14,7 @@ export const MarketplaceProduct = gql`
14
14
  type: String
15
15
  storageType: String
16
16
  description: String
17
+ brand: String
17
18
  currency: String
18
19
  hasVariation: Boolean
19
20
  categoryId: String
@@ -6,6 +6,7 @@ export const NewMarketplaceProduct = gql`
6
6
  name: String
7
7
  description: String
8
8
  type: String
9
+ brand: String
9
10
  marketplaceProductVariations: [NewMarketplaceProductVariation]
10
11
  marketplaceProductAttribute: NewMarketplaceProductAttribute
11
12
  marketplaceProductCategory: NewMarketplaceProductCategory