@social-mail/social-mail-web-server 1.5.330 → 1.5.331
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/model/entities/StoreJournal.d.ts +3 -1
- package/dist/server/model/entities/StoreJournal.d.ts.map +1 -1
- package/dist/server/model/entities/StoreJournal.js +7 -1
- package/dist/server/model/entities/StoreJournal.js.map +1 -1
- package/dist/server/model/events/StoreJournalCouponEvents.d.ts +5 -0
- package/dist/server/model/events/StoreJournalCouponEvents.d.ts.map +1 -1
- package/dist/server/model/events/StoreJournalCouponEvents.js +32 -1
- package/dist/server/model/events/StoreJournalCouponEvents.js.map +1 -1
- package/dist/server/model/events/StoreJournalEvents.d.ts.map +1 -1
- package/dist/server/model/events/StoreJournalEvents.js +0 -1
- package/dist/server/model/events/StoreJournalEvents.js.map +1 -1
- package/dist/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/services/accounts/sales/SalesInvoiceService.d.ts.map +1 -1
- package/dist/server/services/accounts/sales/SalesInvoiceService.js +14 -6
- package/dist/server/services/accounts/sales/SalesInvoiceService.js.map +1 -1
- package/dist/server/services/coupons/CouponService.d.ts.map +1 -1
- package/dist/server/services/coupons/CouponService.js +8 -1
- package/dist/server/services/coupons/CouponService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/store/buy/[productID]/get.d.ts.map +1 -1
- package/dist/wwwroot/routes/store/buy/[productID]/get.js +2 -1
- package/dist/wwwroot/routes/store/buy/[productID]/get.js.map +1 -1
- package/package.json +1 -1
- package/src/server/model/entities/StoreJournal.ts +10 -2
- package/src/server/model/events/StoreJournalCouponEvents.ts +45 -1
- package/src/server/model/events/StoreJournalEvents.ts +0 -2
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/accounts/sales/SalesInvoiceService.ts +16 -6
- package/src/server/services/coupons/CouponService.ts +9 -1
- package/src/wwwroot/routes/store/buy/[productID]/get.tsx +2 -1
|
@@ -9,6 +9,8 @@ import { StoreAccountAddress } from "./StoreAddress.js";
|
|
|
9
9
|
import type StoreJournalCoupon from "./StoreJournalCoupon.js";
|
|
10
10
|
declare const journalTypeArray: readonly ["order", "purchase-order", "sales-invoice", "journal", "purchase-bill", "payment"];
|
|
11
11
|
export type journalTypeArrayType = typeof journalTypeArray[number];
|
|
12
|
+
declare const statusTypeArray: readonly ["new", "paid", "draft"];
|
|
13
|
+
export type statusType = typeof statusTypeArray[number];
|
|
12
14
|
export declare class StoreJournal {
|
|
13
15
|
journalID: number;
|
|
14
16
|
storeID: number;
|
|
@@ -17,7 +19,7 @@ export declare class StoreJournal {
|
|
|
17
19
|
journalType: journalTypeArrayType;
|
|
18
20
|
description: string;
|
|
19
21
|
posted: boolean;
|
|
20
|
-
status:
|
|
22
|
+
status: statusType;
|
|
21
23
|
sellerID: number;
|
|
22
24
|
buyerID: number;
|
|
23
25
|
buyerBillingAddressID: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournal.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/StoreJournal.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAC;AAE9D,QAAA,MAAM,gBAAgB,8FAAgG,CAAC;AACvH,MAAM,MAAM,oBAAoB,GAAG,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"StoreJournal.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/StoreJournal.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAC;AAE9D,QAAA,MAAM,gBAAgB,8FAAgG,CAAC;AACvH,MAAM,MAAM,oBAAoB,GAAG,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAGnE,QAAA,MAAM,eAAe,mCAAqC,CAAC;AAC3D,MAAM,MAAM,UAAU,GAAG,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AAGxD,qBACa,YAAY;IAGd,SAAS,EAAE,MAAM,CAAC;IAOlB,OAAO,EAAE,MAAM,CAAC;IAGvB,WAAW,EAAE,QAAQ,CAAC;IAGtB,WAAW,EAAE,QAAQ,CAAC;IAGtB,WAAW,EAAE,oBAAoB,CAAC;IAGlC,WAAW,EAAE,MAAM,CAAC;IAGpB,MAAM,EAAE,OAAO,CAAC;IAQhB,MAAM,EAAE,UAAU,CAAC;IAWnB,QAAQ,EAAE,MAAM,CAAC;IAWjB,OAAO,EAAE,MAAM,CAAC;IAOhB,qBAAqB,EAAE,MAAM,CAAC;IAO9B,sBAAsB,EAAE,MAAM,CAAC;IAG/B,KAAK,EAAE,MAAM,CAAC;IAGd,OAAO,EAAE,MAAM,CAAC;IAOhB,WAAW,EAAE,MAAM,CAAC;IAYpB,QAAQ,EAAE,MAAM,CAAC;IAGjB,SAAS,EAAE,OAAO,CAAC;IAGnB,cAAc,EAAE,MAAM,CAAC;IAGvB,cAAc,EAAE,MAAM,CAAC;IAEvB,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;IAErB,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAC7B,SAAS,EAAE,oBAAoB,EAAE,CAAC;IAElC,SAAS,EAAE,YAAY,CAAC;IACxB,UAAU,EAAE,YAAY,EAAE,CAAC;IAE3B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,oBAAoB,EAAE,mBAAmB,CAAC;IAE1C,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,mBAAmB,EAAE,CAAC;IACvC,YAAY,EAAE,kBAAkB,EAAE,CAAC;CACtC"}
|
|
@@ -17,6 +17,7 @@ import WebSiteFolder from "./WebSiteFolder.js";
|
|
|
17
17
|
import { StoreAccount } from "./StoreAccount.js";
|
|
18
18
|
import { StoreAccountAddress } from "./StoreAddress.js";
|
|
19
19
|
const journalTypeArray = ["order", "purchase-order", "sales-invoice", "journal", "purchase-bill", "payment"];
|
|
20
|
+
const statusTypeArray = ["new", "paid", "draft"];
|
|
20
21
|
let StoreJournal = class StoreJournal {
|
|
21
22
|
};
|
|
22
23
|
__decorate([
|
|
@@ -52,7 +53,12 @@ __decorate([
|
|
|
52
53
|
__metadata("design:type", Boolean)
|
|
53
54
|
], StoreJournal.prototype, "posted", void 0);
|
|
54
55
|
__decorate([
|
|
55
|
-
Column({
|
|
56
|
+
Column({
|
|
57
|
+
dataType: "Char",
|
|
58
|
+
length: 50,
|
|
59
|
+
default: () => "draft",
|
|
60
|
+
enum: statusTypeArray
|
|
61
|
+
}),
|
|
56
62
|
__metadata("design:type", String)
|
|
57
63
|
], StoreJournal.prototype, "status", void 0);
|
|
58
64
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournal.js","sourceRoot":"","sources":["../../../../src/server/model/entities/StoreJournal.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,OAAO,MAAM,cAAc,CAAC;AAInC,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,MAAM,gBAAgB,GAAG,CAAE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"StoreJournal.js","sourceRoot":"","sources":["../../../../src/server/model/entities/StoreJournal.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,18 @@ import AuthenticatedEvents from "./AuthenticatedEvents.js";
|
|
|
3
3
|
import StoreJournalCoupon from "../entities/StoreJournalCoupon.js";
|
|
4
4
|
import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
|
|
5
5
|
import CouponService from "../../services/coupons/CouponService.js";
|
|
6
|
+
import SocialMailContext from "../SocialMailContext.js";
|
|
7
|
+
import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
|
|
6
8
|
export default class StoreJournalCouponEvents extends AuthenticatedEvents<StoreJournalCoupon> {
|
|
7
9
|
couponService: CouponService;
|
|
10
|
+
db: SocialMailContext;
|
|
8
11
|
filter(query: IEntityQuery<StoreJournalCoupon>): IEntityQuery<StoreJournalCoupon>;
|
|
9
12
|
modify(query: IEntityQuery<StoreJournalCoupon>): IEntityQuery<StoreJournalCoupon>;
|
|
10
13
|
delete(query: IEntityQuery<StoreJournalCoupon>): IEntityQuery<StoreJournalCoupon>;
|
|
11
14
|
includeFilter(query: IEntityQuery<StoreJournalCoupon>, type?: any, key?: string): IEntityQuery<StoreJournalCoupon>;
|
|
12
15
|
beforeInsert(entity: StoreJournalCoupon, entry: ChangeEntry<StoreJournalCoupon>): Promise<void>;
|
|
16
|
+
beforeDelete(entity: StoreJournalCoupon, entry: ChangeEntry<StoreJournalCoupon>): Promise<void>;
|
|
13
17
|
beforeUpdate(entity: StoreJournalCoupon, entry: ChangeEntry<StoreJournalCoupon>): void;
|
|
18
|
+
onForeignKeyFilter(filter: ForeignKeyFilter<StoreJournalCoupon, any>): any;
|
|
14
19
|
}
|
|
15
20
|
//# sourceMappingURL=StoreJournalCouponEvents.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournalCouponEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalCouponEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AACnE,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAGzF,OAAO,aAAa,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"StoreJournalCouponEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalCouponEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AACnE,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAGzF,OAAO,aAAa,MAAM,yCAAyC,CAAC;AACpE,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAGlG,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAGzF,aAAa,EAAE,aAAa,CAAC;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAEtB,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,kBAAkB,CAAC;IAc9C,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,kBAAkB,CAAC;IAI9C,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,kBAAkB,CAAC,GAAG,YAAY,CAAC,kBAAkB,CAAC;IAWjF,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;IAIzE,YAAY,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,CAAC,kBAAkB,CAAC;IAyB/E,YAAY,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,CAAC,kBAAkB,CAAC;IAcrF,YAAY,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,CAAC,kBAAkB,CAAC;IAI/E,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,kBAAkB,EAAE,GAAG,CAAC;CAIvE"}
|
|
@@ -12,6 +12,8 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
|
|
|
12
12
|
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
13
13
|
import Inject from "@entity-access/entity-access/dist/di/di.js";
|
|
14
14
|
import CouponService from "../../services/coupons/CouponService.js";
|
|
15
|
+
import SocialMailContext from "../SocialMailContext.js";
|
|
16
|
+
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
15
17
|
export default class StoreJournalCouponEvents extends AuthenticatedEvents {
|
|
16
18
|
filter(query) {
|
|
17
19
|
if (!this.verify) {
|
|
@@ -35,21 +37,50 @@ export default class StoreJournalCouponEvents extends AuthenticatedEvents {
|
|
|
35
37
|
if (sessionUser.isAdmin) {
|
|
36
38
|
return query;
|
|
37
39
|
}
|
|
38
|
-
|
|
40
|
+
return this.modify(query);
|
|
39
41
|
}
|
|
40
42
|
includeFilter(query, type, key) {
|
|
41
43
|
return query;
|
|
42
44
|
}
|
|
43
45
|
async beforeInsert(entity, entry) {
|
|
44
46
|
this.sessionUser.ensureLoggedIn();
|
|
47
|
+
if (!entity.couponID) {
|
|
48
|
+
await entry.loadNavigationAsync((x) => x.order);
|
|
49
|
+
const { storeID } = entity.order;
|
|
50
|
+
const { couponCode } = entity;
|
|
51
|
+
const ce = this.db.changeSet.getEntry(entity.order);
|
|
52
|
+
entity.order.dateUpdated = DateTime.now;
|
|
53
|
+
ce.detect();
|
|
54
|
+
const coupon = await this.db.storeCoupons.where({ storeID, couponCode }, (p) => (x) => x.storeID === p.storeID
|
|
55
|
+
&& x.code === p.couponCode)
|
|
56
|
+
.first() ?? EntityAccessError.throw(`Coupon ${entity.couponCode} not found`);
|
|
57
|
+
entity.couponID = coupon.couponID;
|
|
58
|
+
entity.coupon = coupon;
|
|
59
|
+
}
|
|
45
60
|
await this.couponService.apply(entity, entry);
|
|
46
61
|
}
|
|
62
|
+
async beforeDelete(entity, entry) {
|
|
63
|
+
this.sessionUser.ensureLoggedIn();
|
|
64
|
+
const isNonPaid = await this.db.storeJournalCoupons.where(entity, (p) => (x) => x.appliedCouponID === p.appliedCouponID
|
|
65
|
+
&& x.order.status !== "paid")
|
|
66
|
+
.first();
|
|
67
|
+
if (!isNonPaid) {
|
|
68
|
+
throw new EntityAccessError(`Coupon cannot be deleted from paid order`);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
47
71
|
beforeUpdate(entity, entry) {
|
|
48
72
|
throw new EntityAccessError(`Cannot modify coupon, delete and add it again.`);
|
|
49
73
|
}
|
|
74
|
+
onForeignKeyFilter(filter) {
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
50
77
|
}
|
|
51
78
|
__decorate([
|
|
52
79
|
Inject,
|
|
53
80
|
__metadata("design:type", CouponService)
|
|
54
81
|
], StoreJournalCouponEvents.prototype, "couponService", void 0);
|
|
82
|
+
__decorate([
|
|
83
|
+
Inject,
|
|
84
|
+
__metadata("design:type", SocialMailContext)
|
|
85
|
+
], StoreJournalCouponEvents.prototype, "db", void 0);
|
|
55
86
|
//# sourceMappingURL=StoreJournalCouponEvents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournalCouponEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalCouponEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,aAAa,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"StoreJournalCouponEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalCouponEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournalEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAEzF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAmB,CAAC,YAAY,CAAC;IAG7E,EAAE,EAAE,iBAAiB,CAAC;IAEtB,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;IAcxC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;IAIxC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC;IAWrE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;IAInE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAQnE,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAa3C,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"StoreJournalEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAEzF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAmB,CAAC,YAAY,CAAC;IAG7E,EAAE,EAAE,iBAAiB,CAAC;IAEtB,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;IAcxC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;IAIxC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC;IAWrE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;IAInE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAQnE,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAa3C,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAmBnE,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAkCpD,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAIlE,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAIlE,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAkB/D,aAAa,CAAC,KAAK,EAAE,iBAAiB;CAmB/C"}
|
|
@@ -68,7 +68,6 @@ export default class StoreJournalEvents extends AuthenticatedEvents {
|
|
|
68
68
|
if (entry.getChange("posted").oldValue) {
|
|
69
69
|
throw new EntityAccessError("Posted journal cannot be saved as draft.");
|
|
70
70
|
}
|
|
71
|
-
await this.syncAmount(entry);
|
|
72
71
|
await this.verifyEntries(entry);
|
|
73
72
|
}
|
|
74
73
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournalEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"StoreJournalEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { UIPackageConfig } from "../../services/DBConfig.js";
|
|
2
2
|
import semver from "semver";
|
|
3
3
|
export default async function seedUI(config) {
|
|
4
|
-
const version = "1.2.
|
|
4
|
+
const version = "1.2.710";
|
|
5
5
|
const existing = await config.getValue(UIPackageConfig, false);
|
|
6
6
|
if (existing) {
|
|
7
7
|
if (semver.gte(existing.version, version)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesInvoiceService.d.ts","sourceRoot":"","sources":["../../../../../src/server/services/accounts/sales/SalesInvoiceService.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AAEpE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAG3D,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAGpC,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,EAAE,aAAa,CAAC;IAEjB,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"SalesInvoiceService.d.ts","sourceRoot":"","sources":["../../../../../src/server/services/accounts/sales/SalesInvoiceService.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AAEpE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAG3D,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAGpC,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,EAAE,aAAa,CAAC;IAEjB,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,YAAY;IAoHvE,QAAQ,CAAC,OAAO,KAAA,EAAE,QAAQ,KAAA;IAYpB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAO5B,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ;CAYvE"}
|
|
@@ -16,7 +16,7 @@ import CouponService from "../../coupons/CouponService.js";
|
|
|
16
16
|
let SalesInvoiceService = class SalesInvoiceService {
|
|
17
17
|
async syncAmount(entry, entity) {
|
|
18
18
|
await this.db.storeJournals.where(entity, (p) => (x) => x.journalID === p.journalID)
|
|
19
|
-
.include((x) => [x.lineItems.forEach((i) => [i.coupons, i.itemPrice])])
|
|
19
|
+
.include((x) => [x.lineItems.forEach((i) => [i.coupons.forEach((c) => c.coupon), i.itemPrice])])
|
|
20
20
|
.first();
|
|
21
21
|
for (const lineItem of [...entity.lineItems]) {
|
|
22
22
|
// set amount...
|
|
@@ -28,9 +28,13 @@ let SalesInvoiceService = class SalesInvoiceService {
|
|
|
28
28
|
lineItem.price = itemPrice.amount;
|
|
29
29
|
const itemAmount = Number(lineItem.price) * Number(lineItem.quantity);
|
|
30
30
|
if (lineItem.discountPercentage) {
|
|
31
|
-
lineItem.discount = lineItem.discountPercentage * lineItem.amount;
|
|
31
|
+
lineItem.discount = Number(lineItem.discountPercentage) * Number(lineItem.amount);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
lineItem.discount = 0;
|
|
32
35
|
}
|
|
33
36
|
const priceAfterDiscount = itemAmount - lineItem.discount;
|
|
37
|
+
lineItem.couponDiscount ??= 0;
|
|
34
38
|
if (priceAfterDiscount !== Number(lineItem.priceAfterDiscount)) {
|
|
35
39
|
lineItem.priceAfterDiscount = priceAfterDiscount;
|
|
36
40
|
await this.db.storeJournalLineItems.statements.update({ priceAfterDiscount }, { lineItemID: lineItem.lineItemID });
|
|
@@ -54,7 +58,11 @@ let SalesInvoiceService = class SalesInvoiceService {
|
|
|
54
58
|
lineItem.taxLineItems ??= [];
|
|
55
59
|
const itemPrices = await this.getTaxes(itemPrice.priceID, itemPrice.currency);
|
|
56
60
|
let taxes = 0;
|
|
57
|
-
|
|
61
|
+
await this.coupons.compute(lineItem);
|
|
62
|
+
lineItem.couponDiscount = Number(lineItem.couponDiscount);
|
|
63
|
+
lineItem.quantity ??= 0;
|
|
64
|
+
lineItem.quantity = Number(lineItem.quantity);
|
|
65
|
+
lineItem.amount = (lineItem.priceAfterDiscount - Number(lineItem.couponDiscount)) * lineItem.quantity;
|
|
58
66
|
for (const price of itemPrices) {
|
|
59
67
|
let taxLine = lineItem.taxLineItems.find((r) => r.itemID === price.storeItemID);
|
|
60
68
|
if (!taxLine) {
|
|
@@ -71,12 +79,12 @@ let SalesInvoiceService = class SalesInvoiceService {
|
|
|
71
79
|
taxLine.itemPriceID = price.priceID;
|
|
72
80
|
taxLine.quantity = 1;
|
|
73
81
|
if (itemPrice.taxIncluded) {
|
|
74
|
-
let amount = lineItem.amount
|
|
82
|
+
let amount = lineItem.amount;
|
|
75
83
|
amount = amount / (Number(price.amount) + 1);
|
|
76
|
-
lineItem.amount = amount
|
|
84
|
+
lineItem.amount = amount;
|
|
77
85
|
}
|
|
78
86
|
taxLine.price = Number(price.amount);
|
|
79
|
-
taxLine.total =
|
|
87
|
+
taxLine.total = Number(lineItem.amount) * Number(price.amount);
|
|
80
88
|
taxes += taxLine.total;
|
|
81
89
|
}
|
|
82
90
|
lineItem.taxes = taxes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesInvoiceService.js","sourceRoot":"","sources":["../../../../../src/server/services/accounts/sales/SalesInvoiceService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAG5C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAWpC,KAAK,CAAC,UAAU,CAAC,KAAgC,EAAE,MAAoB;QAEnE,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC;aAC/E,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"SalesInvoiceService.js","sourceRoot":"","sources":["../../../../../src/server/services/accounts/sales/SalesInvoiceService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CouponService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/coupons/CouponService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAGjE,OAAO,kBAAkB,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AAIpF,MAAM,CAAC,OAAO,OAAO,aAAa;IAG9B,EAAE,EAAE,iBAAiB,CAAC;IAEhB,KAAK,CAAC,WAAW,EAAE,kBAAkB,EAAE,KAAK,uGAA0C;
|
|
1
|
+
{"version":3,"file":"CouponService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/coupons/CouponService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAGjE,OAAO,kBAAkB,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AAIpF,MAAM,CAAC,OAAO,OAAO,aAAa;IAG9B,EAAE,EAAE,iBAAiB,CAAC;IAEhB,KAAK,CAAC,WAAW,EAAE,kBAAkB,EAAE,KAAK,uGAA0C;IAqEtF,OAAO,CAAC,QAAQ,EAAE,oBAAoB;CA2B/C"}
|
|
@@ -31,6 +31,10 @@ let CouponService = class CouponService {
|
|
|
31
31
|
&& x.active === true)
|
|
32
32
|
.first()) ?? EntityAccessError.throw(`Coupon "${couponCode}" not found`);
|
|
33
33
|
let applicableItems = order.lineItems;
|
|
34
|
+
if (!orderCoupon.couponID) {
|
|
35
|
+
orderCoupon.couponID = coupon.couponID;
|
|
36
|
+
orderCoupon.coupon = coupon;
|
|
37
|
+
}
|
|
34
38
|
if (coupon.itemID) {
|
|
35
39
|
applicableItems = order.lineItems.filter((i) => i.itemID === coupon.itemID);
|
|
36
40
|
if (!applicableItems.length) {
|
|
@@ -66,11 +70,14 @@ let CouponService = class CouponService {
|
|
|
66
70
|
async compute(lineItem) {
|
|
67
71
|
// set couponDiscount amount
|
|
68
72
|
const coupons = lineItem.coupons ?? lineItem.journal.orderCoupons;
|
|
69
|
-
if (!coupons) {
|
|
73
|
+
if (!coupons?.length) {
|
|
70
74
|
return;
|
|
71
75
|
}
|
|
72
76
|
lineItem.couponDiscount = 0;
|
|
73
77
|
for (const coupon of coupons) {
|
|
78
|
+
if (!coupon.coupon) {
|
|
79
|
+
await this.db.changeSet.getEntry(coupon).loadNavigationAsync((x) => x.coupon);
|
|
80
|
+
}
|
|
74
81
|
switch (coupon.coupon.type) {
|
|
75
82
|
case "discount":
|
|
76
83
|
lineItem.couponDiscount += lineItem.priceAfterDiscount * Number(coupon.coupon.amount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CouponService.js","sourceRoot":"","sources":["../../../../src/server/services/coupons/CouponService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CouponService.js","sourceRoot":"","sources":["../../../../src/server/services/coupons/CouponService.ts"],"names":[],"mappings":"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"}
|