@things-factory/sales-base 4.1.33 → 4.1.34
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/service/invoice/invoice-mutation.js +2 -3
- package/dist-server/service/invoice/invoice-mutation.js.map +1 -1
- package/dist-server/service/invoice/invoice-types.js +1 -1
- package/dist-server/service/invoice/invoice-types.js.map +1 -1
- package/dist-server/service/invoice-product/invoice-product-types.js +17 -1
- package/dist-server/service/invoice-product/invoice-product-types.js.map +1 -1
- package/dist-server/service/invoice-product/invoice-product.js +10 -0
- package/dist-server/service/invoice-product/invoice-product.js.map +1 -1
- package/package.json +4 -4
- package/server/service/invoice/invoice-mutation.ts +0 -3
- package/server/service/invoice/invoice-types.ts +1 -1
- package/server/service/invoice-product/invoice-product-types.ts +13 -1
- package/server/service/invoice-product/invoice-product.ts +8 -0
|
@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.addInvoiceProducts = exports.InvoiceMutation = void 0;
|
|
16
16
|
const type_graphql_1 = require("type-graphql");
|
|
17
17
|
const typeorm_1 = require("typeorm");
|
|
18
|
-
const product_base_1 = require("@things-factory/product-base");
|
|
19
18
|
const __1 = require("../");
|
|
20
19
|
const utils_1 = require("../../utils");
|
|
21
20
|
const invoice_product_1 = require("../invoice-product/invoice-product");
|
|
@@ -81,10 +80,10 @@ InvoiceMutation = __decorate([
|
|
|
81
80
|
], InvoiceMutation);
|
|
82
81
|
exports.InvoiceMutation = InvoiceMutation;
|
|
83
82
|
async function addInvoiceProducts(domain, invoice, invoiceProducts, user, tx) {
|
|
84
|
-
const productRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.Product)) || (0, typeorm_1.getRepository)(product_base_1.Product);
|
|
85
83
|
const invoiceProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(invoice_product_1.InvoiceProduct)) || (0, typeorm_1.getRepository)(invoice_product_1.InvoiceProduct);
|
|
86
84
|
const createdInvoiceProducts = await Promise.all(invoiceProducts.map(async (invoiceProduct) => {
|
|
87
|
-
return Object.assign(Object.assign({ name: utils_1.OrderNoGenerator.invoiceProduct() }, invoiceProduct), { domain,
|
|
85
|
+
return Object.assign(Object.assign({ name: utils_1.OrderNoGenerator.invoiceProduct() }, invoiceProduct), { domain,
|
|
86
|
+
invoice, creator: user });
|
|
88
87
|
}));
|
|
89
88
|
await invoiceProductRepo.save(createdInvoiceProducts);
|
|
90
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoice-mutation.js","sourceRoot":"","sources":["../../../server/service/invoice/invoice-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCAAkE;
|
|
1
|
+
{"version":3,"file":"invoice-mutation.js","sourceRoot":"","sources":["../../../server/service/invoice/invoice-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -200,7 +200,7 @@ __decorate([
|
|
|
200
200
|
__metadata("design:type", Array)
|
|
201
201
|
], NewInvoice.prototype, "invoiceProducts", void 0);
|
|
202
202
|
__decorate([
|
|
203
|
-
(0, type_graphql_1.Field)(type => shell_1.ObjectRef),
|
|
203
|
+
(0, type_graphql_1.Field)(type => shell_1.ObjectRef, { nullable: true }),
|
|
204
204
|
__metadata("design:type", typeof (_a = typeof shell_1.ObjectRef !== "undefined" && shell_1.ObjectRef) === "function" ? _a : Object)
|
|
205
205
|
], NewInvoice.prototype, "releaseGood", void 0);
|
|
206
206
|
NewInvoice = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoice-types.js","sourceRoot":"","sources":["../../../server/service/invoice/invoice-types.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAgE;AAEhE,iDAAiD;AAEjD,oFAAiG;AACjG,uCAAmC;AAGnC,IAAa,WAAW,GAAxB,MAAa,WAAW;CAMvB,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,iBAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC7B;AAGhB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC1B;AALF,WAAW;IADvB,IAAA,yBAAU,GAAE;GACA,WAAW,CAMvB;AANY,kCAAW;AASxB,IAAa,UAAU,GAAvB,MAAa,UAAU;CAiItB,CAAA;AA/HC;IADC,IAAA,oBAAK,GAAE;;wCACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACD;AAGzB;IADC,IAAA,oBAAK,GAAE;;wCACI;AAGZ;IADC,IAAA,oBAAK,GAAE;;oDACgB;AAGxB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACP;AAGnB;IADC,IAAA,oBAAK,GAAE;;6CACS;AAGjB;IADC,IAAA,oBAAK,GAAE;;kDACc;AAGtB;IADC,IAAA,oBAAK,GAAE;;oDACgB;AAGxB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACF;AAGxB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACF;AAGxB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACF;AAGxB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACF;AAGxB;IADC,IAAA,oBAAK,GAAE;;gDACY;AAGpB;IADC,IAAA,oBAAK,GAAE;;iDACa;AAGrB;IADC,IAAA,oBAAK,GAAE;;mDACe;AAGvB;IADC,IAAA,oBAAK,GAAE;;oDACgB;AAGxB;IADC,IAAA,oBAAK,GAAE;;0CACM;AAGd;IADC,IAAA,oBAAK,GAAE;;+CACW;AAGnB;IADC,IAAA,oBAAK,GAAE;;mDACe;AAGvB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACH;AAGvB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACH;AAGvB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACH;AAGvB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACH;AAGvB;IADC,IAAA,oBAAK,GAAE;;mDACe;AAGvB;IADC,IAAA,oBAAK,GAAE;;+CACW;AAGnB;IADC,IAAA,oBAAK,GAAE;;gDACY;AAGpB;IADC,IAAA,oBAAK,GAAE;;kDACc;AAGtB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACR;AAGlB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACP;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,yCAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACnB;AAGpC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"invoice-types.js","sourceRoot":"","sources":["../../../server/service/invoice/invoice-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ __decorate([
|
|
|
51
51
|
__metadata("design:type", String)
|
|
52
52
|
], NewInvoiceProduct.prototype, "description", void 0);
|
|
53
53
|
__decorate([
|
|
54
|
-
(0, type_graphql_1.Field)(type => ProductInput),
|
|
54
|
+
(0, type_graphql_1.Field)(type => ProductInput, { nullable: true }),
|
|
55
55
|
__metadata("design:type", ProductInput)
|
|
56
56
|
], NewInvoiceProduct.prototype, "product", void 0);
|
|
57
57
|
__decorate([
|
|
@@ -70,6 +70,14 @@ __decorate([
|
|
|
70
70
|
(0, type_graphql_1.Field)(type => type_graphql_1.Float),
|
|
71
71
|
__metadata("design:type", Number)
|
|
72
72
|
], NewInvoiceProduct.prototype, "paidPrice", void 0);
|
|
73
|
+
__decorate([
|
|
74
|
+
(0, type_graphql_1.Field)(type => type_graphql_1.Float, { nullable: true }),
|
|
75
|
+
__metadata("design:type", Number)
|
|
76
|
+
], NewInvoiceProduct.prototype, "discount", void 0);
|
|
77
|
+
__decorate([
|
|
78
|
+
(0, type_graphql_1.Field)(type => type_graphql_1.Float, { nullable: true }),
|
|
79
|
+
__metadata("design:type", Number)
|
|
80
|
+
], NewInvoiceProduct.prototype, "shippingFeePaidByCustomer", void 0);
|
|
73
81
|
NewInvoiceProduct = __decorate([
|
|
74
82
|
(0, type_graphql_1.InputType)()
|
|
75
83
|
], NewInvoiceProduct);
|
|
@@ -108,6 +116,14 @@ __decorate([
|
|
|
108
116
|
(0, type_graphql_1.Field)(type => type_graphql_1.Float),
|
|
109
117
|
__metadata("design:type", Number)
|
|
110
118
|
], InvoiceProductPatch.prototype, "paidPrice", void 0);
|
|
119
|
+
__decorate([
|
|
120
|
+
(0, type_graphql_1.Field)(type => type_graphql_1.Float, { nullable: true }),
|
|
121
|
+
__metadata("design:type", Number)
|
|
122
|
+
], InvoiceProductPatch.prototype, "discount", void 0);
|
|
123
|
+
__decorate([
|
|
124
|
+
(0, type_graphql_1.Field)(type => type_graphql_1.Float, { nullable: true }),
|
|
125
|
+
__metadata("design:type", Number)
|
|
126
|
+
], InvoiceProductPatch.prototype, "shippingFeePaidByCustomer", void 0);
|
|
111
127
|
InvoiceProductPatch = __decorate([
|
|
112
128
|
(0, type_graphql_1.InputType)()
|
|
113
129
|
], InvoiceProductPatch);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoice-product-types.js","sourceRoot":"","sources":["../../../server/service/invoice-product/invoice-product-types.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAuE;AAEvE,uDAAkD;AAGlD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;CAM9B,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,gCAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC7B;AAGvB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC1B;AALF,kBAAkB;IAD9B,IAAA,yBAAU,GAAE;GACA,kBAAkB,CAM9B;AANY,gDAAkB;AAS/B,IAAa,YAAY,GAAzB,MAAa,YAAY;CAGxB,CAAA;AADC;IADC,IAAA,oBAAK,GAAE;;yCACG;AAFA,YAAY;IADxB,IAAA,wBAAS,GAAE;GACC,YAAY,CAGxB;AAHY,oCAAY;AAMzB,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"invoice-product-types.js","sourceRoot":"","sources":["../../../server/service/invoice-product/invoice-product-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,6 +78,16 @@ __decorate([
|
|
|
78
78
|
(0, type_graphql_1.Field)(),
|
|
79
79
|
__metadata("design:type", Number)
|
|
80
80
|
], InvoiceProduct.prototype, "paidPrice", void 0);
|
|
81
|
+
__decorate([
|
|
82
|
+
(0, typeorm_1.Column)('float', { default: 0 }),
|
|
83
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
84
|
+
__metadata("design:type", Number)
|
|
85
|
+
], InvoiceProduct.prototype, "discount", void 0);
|
|
86
|
+
__decorate([
|
|
87
|
+
(0, typeorm_1.Column)('float', { default: 0 }),
|
|
88
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
89
|
+
__metadata("design:type", Number)
|
|
90
|
+
], InvoiceProduct.prototype, "shippingFeePaidByCustomer", void 0);
|
|
81
91
|
__decorate([
|
|
82
92
|
(0, typeorm_1.CreateDateColumn)(),
|
|
83
93
|
(0, type_graphql_1.Field)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoice-product.js","sourceRoot":"","sources":["../../../server/service/invoice-product/invoice-product.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;AACpD,qCASgB;AAEhB,yDAAgD;AAChD,+DAAsD;AACtD,iDAA8C;AAE9C,gDAA4C;AAO5C,IAAa,cAAc,GAA3B,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"invoice-product.js","sourceRoot":"","sources":["../../../server/service/invoice-product/invoice-product.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.1.
|
|
3
|
+
"version": "4.1.34",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"@things-factory/code-base": "^4.1.28",
|
|
31
31
|
"@things-factory/integration-sftp": "^4.1.28",
|
|
32
32
|
"@things-factory/notification": "^4.1.28",
|
|
33
|
-
"@things-factory/product-base": "^4.1.
|
|
33
|
+
"@things-factory/product-base": "^4.1.34",
|
|
34
34
|
"@things-factory/setting-base": "^4.1.28",
|
|
35
35
|
"@things-factory/shell": "^4.1.28",
|
|
36
36
|
"@things-factory/transport-base": "^4.1.28",
|
|
37
|
-
"@things-factory/warehouse-base": "^4.1.
|
|
37
|
+
"@things-factory/warehouse-base": "^4.1.34"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "44aa74caa0f26a4b09ddf29c16cf8f3bfcd9b6bd"
|
|
40
40
|
}
|
|
@@ -2,7 +2,6 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
|
|
|
2
2
|
import { EntityManager, getRepository, Repository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
|
-
import { Product } from '@things-factory/product-base'
|
|
6
5
|
import { Domain } from '@things-factory/shell'
|
|
7
6
|
|
|
8
7
|
import { InvoicePatch, NewInvoice } from '../'
|
|
@@ -74,7 +73,6 @@ export async function addInvoiceProducts(
|
|
|
74
73
|
user: User,
|
|
75
74
|
tx?: EntityManager
|
|
76
75
|
): Promise<void> {
|
|
77
|
-
const productRepo: Repository<Product> = tx?.getRepository(Product) || getRepository(Product)
|
|
78
76
|
const invoiceProductRepo: Repository<InvoiceProduct> =
|
|
79
77
|
tx?.getRepository(InvoiceProduct) || getRepository(InvoiceProduct)
|
|
80
78
|
|
|
@@ -84,7 +82,6 @@ export async function addInvoiceProducts(
|
|
|
84
82
|
name: OrderNoGenerator.invoiceProduct(),
|
|
85
83
|
...invoiceProduct,
|
|
86
84
|
domain,
|
|
87
|
-
product: await productRepo.findOne(invoiceProduct?.product.id),
|
|
88
85
|
invoice,
|
|
89
86
|
creator: user
|
|
90
87
|
}
|
|
@@ -28,7 +28,7 @@ export class NewInvoiceProduct {
|
|
|
28
28
|
@Field({ nullable: true })
|
|
29
29
|
description: string
|
|
30
30
|
|
|
31
|
-
@Field(type => ProductInput)
|
|
31
|
+
@Field(type => ProductInput, { nullable: true })
|
|
32
32
|
product: ProductInput
|
|
33
33
|
|
|
34
34
|
@Field(type => Int)
|
|
@@ -42,6 +42,12 @@ export class NewInvoiceProduct {
|
|
|
42
42
|
|
|
43
43
|
@Field(type => Float)
|
|
44
44
|
paidPrice: number
|
|
45
|
+
|
|
46
|
+
@Field(type => Float, { nullable: true })
|
|
47
|
+
discount: number
|
|
48
|
+
|
|
49
|
+
@Field(type => Float, { nullable: true })
|
|
50
|
+
shippingFeePaidByCustomer: number
|
|
45
51
|
}
|
|
46
52
|
|
|
47
53
|
@InputType()
|
|
@@ -69,4 +75,10 @@ export class InvoiceProductPatch {
|
|
|
69
75
|
|
|
70
76
|
@Field(type => Float)
|
|
71
77
|
paidPrice: number
|
|
78
|
+
|
|
79
|
+
@Field(type => Float, { nullable: true })
|
|
80
|
+
discount: number
|
|
81
|
+
|
|
82
|
+
@Field(type => Float, { nullable: true })
|
|
83
|
+
shippingFeePaidByCustomer: number
|
|
72
84
|
}
|
|
@@ -69,6 +69,14 @@ export class InvoiceProduct {
|
|
|
69
69
|
@Field()
|
|
70
70
|
paidPrice: number
|
|
71
71
|
|
|
72
|
+
@Column('float', { default: 0 })
|
|
73
|
+
@Field({ nullable: true })
|
|
74
|
+
discount: number
|
|
75
|
+
|
|
76
|
+
@Column('float', { default: 0 })
|
|
77
|
+
@Field({ nullable: true })
|
|
78
|
+
shippingFeePaidByCustomer: number
|
|
79
|
+
|
|
72
80
|
@CreateDateColumn()
|
|
73
81
|
@Field()
|
|
74
82
|
createdAt: Date
|