@things-factory/marketplace-base 4.3.190 → 4.3.191
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.
- package/dist-server/entities/marketplace-order-shipping.js +4 -0
- package/dist-server/entities/marketplace-order-shipping.js.map +1 -1
- package/dist-server/entities/marketplace-order.js +13 -1
- package/dist-server/entities/marketplace-order.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order/marketplace-order.js +1 -0
- package/dist-server/graphql/types/marketplace-order/marketplace-order.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.js +1 -0
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js +1 -0
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.js +1 -0
- package/dist-server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.js.map +1 -1
- package/dist-server/index.js +2 -1
- package/dist-server/index.js.map +1 -1
- package/package.json +2 -2
- package/server/entities/marketplace-order-shipping.ts +3 -0
- package/server/entities/marketplace-order.ts +12 -2
- package/server/graphql/types/marketplace-order/marketplace-order.ts +1 -0
- package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.ts +1 -0
- package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts +1 -0
- package/server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.ts +1 -0
- package/server/index.ts +3 -2
|
@@ -47,6 +47,10 @@ __decorate([
|
|
|
47
47
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
48
48
|
__metadata("design:type", String)
|
|
49
49
|
], MarketplaceOrderShipping.prototype, "subOrderNoRef", void 0);
|
|
50
|
+
__decorate([
|
|
51
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
52
|
+
__metadata("design:type", String)
|
|
53
|
+
], MarketplaceOrderShipping.prototype, "billingAddress", void 0);
|
|
50
54
|
__decorate([
|
|
51
55
|
(0, typeorm_1.Column)(),
|
|
52
56
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAA0D;AAWnD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAA0D;AAWnD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;CAgKpC,CAAA;AA/JC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;oDACrB;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;wDAAA;AAEd;IAAC,IAAA,gBAAM,GAAE;;sDACG;AAEZ;IAAC,IAAA,mBAAS,EACR,IAAI,CAAC,EAAE,CAAC,uCAA4B,EACpC,4BAA4B,CAAC,EAAE,CAAC,4BAA4B,CAAC,wBAAwB,CACtF;;+EAC4D;AAE7D;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,0CAAgB,CAAC;kDAClB,0CAAgB,oBAAhB,0CAAgB;kEAAA;AAElC;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DACT;AAElB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+DACN;AAErB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gEACL;AAEtB;IAAC,IAAA,gBAAM,GAAE;;0DACO;AAEhB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACX;AAEhB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACX;AAEhB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACX;AAEhB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACX;AAEhB;IAAC,IAAA,gBAAM,GAAE;;6DACU;AAEnB;IAAC,IAAA,gBAAM,GAAE;;sDACG;AAEZ;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACd;AAEb;IAAC,IAAA,gBAAM,GAAE;;0DACO;AAEhB;IAAC,IAAA,gBAAM,GAAE;;yDACM;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACb;AAEd;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACb;AAEd;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACd;AAEb;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DACR;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gEACL;AAEtB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACV;AAEjB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;6DACrB;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;4DACtB;AAElB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;2DACvB;AAEjB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;gEAClB;AAEtB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DACR;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DACT;AAElB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;;6DACvB;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DACT;AAElB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;;6DACvB;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gEACL;AAEtB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;;kEAClB;AAExB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oEACD;AAE1B;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DACT;AAElB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+DACN;AAErB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DACT;AAElB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACZ;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DACvB;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mEACjB;AAEzB;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+EACL;AAErC;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0EACV;AAEhC;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gEACL;AAEtB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,2CAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACtC,2CAAiB,oBAAjB,2CAAiB;mEAAA;AAEpC;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACd,MAAM;6DAAA;AAEnB;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;2DAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;2DAAA;AAEf;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;yDAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;yDAAA;AA/JF,wBAAwB;IATpC,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,iCAAiC,EACjC,CAAC,wBAAkD,EAAE,EAAE,CAAC;QACtD,wBAAwB,CAAC,MAAM;QAC/B,wBAAwB,CAAC,IAAI;KAC9B,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,wBAAwB,CAgKpC;AAhKY,4DAAwB"}
|
|
@@ -59,10 +59,18 @@ __decorate([
|
|
|
59
59
|
(0, typeorm_1.Column)({ type: 'float', nullable: true }),
|
|
60
60
|
__metadata("design:type", Number)
|
|
61
61
|
], MarketplaceOrder.prototype, "totalAmount", void 0);
|
|
62
|
+
__decorate([
|
|
63
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
64
|
+
__metadata("design:type", Number)
|
|
65
|
+
], MarketplaceOrder.prototype, "platformFee", void 0);
|
|
62
66
|
__decorate([
|
|
63
67
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
64
68
|
__metadata("design:type", String)
|
|
65
69
|
], MarketplaceOrder.prototype, "paymentMethod", void 0);
|
|
70
|
+
__decorate([
|
|
71
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
72
|
+
__metadata("design:type", String)
|
|
73
|
+
], MarketplaceOrder.prototype, "paymentStatus", void 0);
|
|
66
74
|
__decorate([
|
|
67
75
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
68
76
|
__metadata("design:type", String)
|
|
@@ -189,7 +197,11 @@ __decorate([
|
|
|
189
197
|
], MarketplaceOrder.prototype, "updater", void 0);
|
|
190
198
|
MarketplaceOrder = __decorate([
|
|
191
199
|
(0, typeorm_1.Entity)(),
|
|
192
|
-
(0, typeorm_1.Index)('ix_marketplace-order_0', (marketplaceOrder) => [
|
|
200
|
+
(0, typeorm_1.Index)('ix_marketplace-order_0', (marketplaceOrder) => [
|
|
201
|
+
marketplaceOrder.domain,
|
|
202
|
+
marketplaceOrder.name,
|
|
203
|
+
marketplaceOrder.marketplaceStore
|
|
204
|
+
], { unique: true })
|
|
193
205
|
], MarketplaceOrder);
|
|
194
206
|
exports.MarketplaceOrder = MarketplaceOrder;
|
|
195
207
|
//# sourceMappingURL=marketplace-order.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAAkD;
|
|
1
|
+
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsClC,CAAA"}
|
package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.js.map
CHANGED
|
@@ -1 +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
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2C/C,CAAA"}
|
package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js.map
CHANGED
|
@@ -1 +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
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyD1C,CAAA"}
|
package/dist-server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.js.map
CHANGED
|
@@ -1 +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
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0C7C,CAAA"}
|
package/dist-server/index.js
CHANGED
|
@@ -14,9 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
require("./routes");
|
|
17
18
|
__exportStar(require("./entities"), exports);
|
|
18
19
|
__exportStar(require("./migrations"), exports);
|
|
19
20
|
__exportStar(require("./graphql"), exports);
|
|
20
21
|
__exportStar(require("./middlewares"), exports);
|
|
21
|
-
require("./
|
|
22
|
+
__exportStar(require("./utils"), exports);
|
|
22
23
|
//# sourceMappingURL=index.js.map
|
package/dist-server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,+CAA4B;AAC5B,4CAAyB;AACzB,gDAA6B;
|
|
1
|
+
{"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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.191",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,5 +28,5 @@
|
|
|
28
28
|
"@things-factory/product-base": "^4.3.186",
|
|
29
29
|
"@things-factory/shell": "^4.3.179"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "5107d82042eaff367632abd564a31947d1da13ee"
|
|
32
32
|
}
|
|
@@ -19,7 +19,11 @@ import { MarketplaceOrderItem } from '../entities'
|
|
|
19
19
|
@Entity()
|
|
20
20
|
@Index(
|
|
21
21
|
'ix_marketplace-order_0',
|
|
22
|
-
(marketplaceOrder: MarketplaceOrder) => [
|
|
22
|
+
(marketplaceOrder: MarketplaceOrder) => [
|
|
23
|
+
marketplaceOrder.domain,
|
|
24
|
+
marketplaceOrder.name,
|
|
25
|
+
marketplaceOrder.marketplaceStore
|
|
26
|
+
],
|
|
23
27
|
{ unique: true }
|
|
24
28
|
)
|
|
25
29
|
export class MarketplaceOrder {
|
|
@@ -53,9 +57,15 @@ export class MarketplaceOrder {
|
|
|
53
57
|
@Column({ type: 'float', nullable: true })
|
|
54
58
|
totalAmount: number
|
|
55
59
|
|
|
60
|
+
@Column({ nullable: true, type: 'float' })
|
|
61
|
+
platformFee: number
|
|
62
|
+
|
|
56
63
|
@Column({ nullable: true })
|
|
57
64
|
paymentMethod: string
|
|
58
65
|
|
|
66
|
+
@Column({ nullable: true })
|
|
67
|
+
paymentStatus: string
|
|
68
|
+
|
|
59
69
|
@Column({ nullable: true })
|
|
60
70
|
type: string
|
|
61
71
|
|
|
@@ -129,7 +139,7 @@ export class MarketplaceOrder {
|
|
|
129
139
|
shippingRebate: Number
|
|
130
140
|
|
|
131
141
|
@Column({ nullable: true })
|
|
132
|
-
shippingMode: String
|
|
142
|
+
shippingMode: String
|
|
133
143
|
|
|
134
144
|
@Column({ nullable: true })
|
|
135
145
|
payoutDate: Date
|