@things-factory/marketplace-base 4.3.186 → 4.3.191

package/dist-server/entities/marketplace-order-item.js

@@ -101,6 +101,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
     __metadata("design:type", Number)
 ], MarketplaceOrderItem.prototype, "paymentFee", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
+    __metadata("design:type", Number)
+], MarketplaceOrderItem.prototype, "platformFee", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
     __metadata("design:type", Number)

package/dist-server/entities/marketplace-order-item.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":"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"}

package/dist-server/entities/marketplace-order-shipping.js

@@ -47,6 +47,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], MarketplaceOrderShipping.prototype, "subOrderNoRef", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], MarketplaceOrderShipping.prototype, "billingAddress", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     __metadata("design:type", String)

package/dist-server/entities/marketplace-order-shipping.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-shipping.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-shipping.ts"],"names":[],"mappings":"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"}

package/dist-server/entities/marketplace-order.js

@@ -59,10 +59,18 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'float', nullable: true }),
     __metadata("design:type", Number)
 ], MarketplaceOrder.prototype, "totalAmount", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
+    __metadata("design:type", Number)
+], MarketplaceOrder.prototype, "platformFee", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], MarketplaceOrder.prototype, "paymentMethod", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], MarketplaceOrder.prototype, "paymentStatus", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
@@ -189,7 +197,11 @@ __decorate([
 ], MarketplaceOrder.prototype, "updater", void 0);
 MarketplaceOrder = __decorate([
     (0, typeorm_1.Entity)(),
-    (0, typeorm_1.Index)('ix_marketplace-order_0', (marketplaceOrder) => [marketplaceOrder.domain, marketplaceOrder.name, marketplaceOrder.marketplaceStore], { unique: true })
+    (0, typeorm_1.Index)('ix_marketplace-order_0', (marketplaceOrder) => [
+        marketplaceOrder.domain,
+        marketplaceOrder.name,
+        marketplaceOrder.marketplaceStore
+    ], { unique: true })
 ], MarketplaceOrder);
 exports.MarketplaceOrder = MarketplaceOrder;
 //# sourceMappingURL=marketplace-order.js.map

package/dist-server/entities/marketplace-order.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}

package/dist-server/entities/marketplace-product.js

@@ -11,10 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarketplaceProduct = void 0;
+const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const integration_marketplace_1 = require("@things-factory/integration-marketplace");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const entities_1 = require("../entities");
 const utils_1 = require("../utils");
 let MarketplaceProduct = class MarketplaceProduct {
@@ -114,6 +114,10 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], MarketplaceProduct.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], MarketplaceProduct.prototype, "brand", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         nullable: true

package/dist-server/entities/marketplace-product.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-product.js","sourceRoot":"","sources":["../../server/entities/marketplace-product.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"marketplace-product.js","sourceRoot":"","sources":["../../server/entities/marketplace-product.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/types/marketplace-order/marketplace-order.js

@@ -17,6 +17,7 @@ exports.MarketplaceOrder = (0, graphql_tag_1.default) `
     orderNo: String
     itemCount: Int
     totalAmount: String
+    platformFee: String
     currency: String
     paymentMethod: String
     type: String

package/dist-server/graphql/types/marketplace-order/marketplace-order.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqClC,CAAA"}
+{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsClC,CAAA"}

package/dist-server/graphql/types/marketplace-order-item/marketplace-order-item.js

@@ -29,6 +29,7 @@ exports.MarketplaceOrderItem = (0, graphql_tag_1.default) `
     discount: Float
     promotionId: String
     paymentFee: Float
+    platformFee: Float
     updater: User
     creator: User
     updatedAt: String

package/dist-server/graphql/types/marketplace-order-item/marketplace-order-item.js.map

@@ -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"}
+{"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"}

package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.js

@@ -12,6 +12,7 @@ exports.MarketplaceOrderShippingPatch = (0, graphql_tag_1.default) `
     description: String
     orderNoRef: String
     subOrderNoRef: String
+    billingAddress: String
     address1: String
     address2: String
     address3: String

package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-order-shipping-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,6BAA6B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0C/C,CAAA"}
+{"version":3,"file":"marketplace-order-shipping-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,6BAA6B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2C/C,CAAA"}

package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js

@@ -17,6 +17,7 @@ exports.MarketplaceOrderShipping = (0, graphql_tag_1.default) `
     orderNoRef: String
     subOrderNoRef: String
     shippingId: String
+    billingAddress: String
     address1: String
     address2: String
     address3: String

package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwD1C,CAAA"}
+{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyD1C,CAAA"}

package/dist-server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.js

@@ -12,6 +12,7 @@ exports.NewMarketplaceOrderShipping = (0, graphql_tag_1.default) `
     orderNoRef: String
     subOrderNoRef: String
     shippingId: String
+    billingAddress: String
     address1: String
     address2: String
     address3: String

package/dist-server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,2BAA2B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyC7C,CAAA"}
+{"version":3,"file":"new-marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,2BAA2B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0C7C,CAAA"}

package/dist-server/graphql/types/marketplace-product/marketplace-product.js

@@ -19,6 +19,7 @@ exports.MarketplaceProduct = (0, graphql_tag_1.default) `
     type: String
     storageType: String
     description: String
+    brand: String
     currency: String
     hasVariation: Boolean
     categoryId: String

package/dist-server/graphql/types/marketplace-product/marketplace-product.js.map

@@ -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"}
+{"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"}

package/dist-server/graphql/types/marketplace-product/new-marketplace-product.js

@@ -11,6 +11,7 @@ exports.NewMarketplaceProduct = (0, graphql_tag_1.default) `
     name: String
     description: String
     type: String
+    brand: String
     marketplaceProductVariations: [NewMarketplaceProductVariation]
     marketplaceProductAttribute: NewMarketplaceProductAttribute
     marketplaceProductCategory: NewMarketplaceProductCategory

package/dist-server/graphql/types/marketplace-product/new-marketplace-product.js.map

@@ -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"}
+{"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/dist-server/index.js

@@ -14,9 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+require("./routes");
 __exportStar(require("./entities"), exports);
 __exportStar(require("./migrations"), exports);
 __exportStar(require("./graphql"), exports);
 __exportStar(require("./middlewares"), exports);
-require("./routes");
+__exportStar(require("./utils"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,+CAA4B;AAC5B,4CAAyB;AACzB,gDAA6B;AAE7B,oBAAiB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,6CAA0B;AAC1B,+CAA4B;AAC5B,4CAAyB;AACzB,gDAA6B;AAC7B,0CAAuB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/marketplace-base",
-  "version": "4.3.186",
+  "version": "4.3.191",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,10 +23,10 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/integration-fulfillment": "^4.3.186",
-    "@things-factory/integration-marketplace": "^4.3.186",
+    "@things-factory/integration-fulfillment": "^4.3.190",
+    "@things-factory/integration-marketplace": "^4.3.190",
     "@things-factory/product-base": "^4.3.186",
     "@things-factory/shell": "^4.3.179"
   },
-  "gitHead": "854c79b134b5d94c5635c75c467eca229430183b"
+  "gitHead": "5107d82042eaff367632abd564a31947d1da13ee"
 }

package/server/entities/marketplace-order-item.ts

@@ -87,6 +87,9 @@ export class MarketplaceOrderItem {
   @Column({ nullable: true, type: 'float' })
   paymentFee: number
 
+  @Column({ nullable: true, type: 'float' })
+  platformFee: number
+
   @Column({ nullable: true, type: 'float' })
   commissionFee: number
 

package/server/entities/marketplace-order-shipping.ts

@@ -50,6 +50,9 @@ export class MarketplaceOrderShipping {
   @Column({ nullable: true })
   subOrderNoRef: string
 
+  @Column({ nullable: true })
+  billingAddress: string
+
   @Column()
   address1: string
 

package/server/entities/marketplace-order.ts

@@ -19,7 +19,11 @@ import { MarketplaceOrderItem } from '../entities'
 @Entity()
 @Index(
   'ix_marketplace-order_0',
-  (marketplaceOrder: MarketplaceOrder) => [marketplaceOrder.domain, marketplaceOrder.name, marketplaceOrder.marketplaceStore],
+  (marketplaceOrder: MarketplaceOrder) => [
+    marketplaceOrder.domain,
+    marketplaceOrder.name,
+    marketplaceOrder.marketplaceStore
+  ],
   { unique: true }
 )
 export class MarketplaceOrder {
@@ -53,9 +57,15 @@ export class MarketplaceOrder {
   @Column({ type: 'float', nullable: true })
   totalAmount: number
 
+  @Column({ nullable: true, type: 'float' })
+  platformFee: number
+
   @Column({ nullable: true })
   paymentMethod: string
 
+  @Column({ nullable: true })
+  paymentStatus: string
+
   @Column({ nullable: true })
   type: string
 
@@ -129,7 +139,7 @@ export class MarketplaceOrder {
   shippingRebate: Number
 
   @Column({ nullable: true })
-  shippingMode: String 
+  shippingMode: String
 
   @Column({ nullable: true })
   payoutDate: Date

package/server/entities/marketplace-product.ts

@@ -1,6 +1,3 @@
-import { User } from '@things-factory/auth-base'
-import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Domain } from '@things-factory/shell'
 import {
   Column,
   CreateDateColumn,
@@ -11,6 +8,11 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn
 } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { Domain } from '@things-factory/shell'
+
 import { MarketplaceProductAttribute, MarketplaceProductCategory, MarketplaceProductVariation } from '../entities'
 import { NoGenerator } from '../utils'
 
@@ -111,6 +113,9 @@ export class MarketplaceProduct {
   })
   description: string
 
+  @Column({ nullable: true })
+  brand: string
+
   @Column({
     nullable: true
   })

package/server/graphql/types/marketplace-order/marketplace-order.ts

@@ -12,6 +12,7 @@ export const MarketplaceOrder = gql`
     orderNo: String
     itemCount: Int
     totalAmount: String
+    platformFee: String
     currency: String
     paymentMethod: String
     type: String

package/server/graphql/types/marketplace-order-item/marketplace-order-item.ts

@@ -24,6 +24,7 @@ export const MarketplaceOrderItem = gql`
     discount: Float
     promotionId: String
     paymentFee: Float
+    platformFee: Float
     updater: User
     creator: User
     updatedAt: String

package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.ts

@@ -7,6 +7,7 @@ export const MarketplaceOrderShippingPatch = gql`
     description: String
     orderNoRef: String
     subOrderNoRef: String
+    billingAddress: String
     address1: String
     address2: String
     address3: String

package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts

@@ -12,6 +12,7 @@ export const MarketplaceOrderShipping = gql`
     orderNoRef: String
     subOrderNoRef: String
     shippingId: String
+    billingAddress: String
     address1: String
     address2: String
     address3: String

package/server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.ts

@@ -7,6 +7,7 @@ export const NewMarketplaceOrderShipping = gql`
     orderNoRef: String
     subOrderNoRef: String
     shippingId: String
+    billingAddress: String
     address1: String
     address2: String
     address3: String

package/server/graphql/types/marketplace-product/marketplace-product.ts

@@ -14,6 +14,7 @@ export const MarketplaceProduct = gql`
     type: String
     storageType: String
     description: String
+    brand: String
     currency: String
     hasVariation: Boolean
     categoryId: String

package/server/graphql/types/marketplace-product/new-marketplace-product.ts

@@ -6,6 +6,7 @@ export const NewMarketplaceProduct = gql`
     name: String
     description: String
     type: String
+    brand: String
     marketplaceProductVariations: [NewMarketplaceProductVariation]
     marketplaceProductAttribute: NewMarketplaceProductAttribute
     marketplaceProductCategory: NewMarketplaceProductCategory

package/server/index.ts

@@ -1,6 +1,7 @@
+import './routes'
+
 export * from './entities'
 export * from './migrations'
 export * from './graphql'
 export * from './middlewares'
-
-import './routes'
+export * from './utils'