@stamhoofd/models 2.7.0 → 2.9.0
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/src/factories/RegistrationFactory.d.ts +0 -1
- package/dist/src/factories/RegistrationFactory.d.ts.map +1 -1
- package/dist/src/factories/RegistrationFactory.js +2 -8
- package/dist/src/factories/RegistrationFactory.js.map +1 -1
- package/dist/src/migrations/1722959111-allow-multiple-registrations.sql +2 -0
- package/dist/src/migrations/1722963554-registration-group-price-and-options.sql +3 -0
- package/dist/src/migrations/1723202125-member-number.sql +3 -0
- package/dist/src/migrations/1723218160-balance-item-unit-price.sql +2 -0
- package/dist/src/migrations/1723218161-balance-item-amount.sql +2 -0
- package/dist/src/migrations/1723218162-balance-item-type.sql +2 -0
- package/dist/src/migrations/1723218163-balance-item-type-defaults.sql +2 -0
- package/dist/src/migrations/1723218164-balance-item-relations.sql +2 -0
- package/dist/src/models/BalanceItem.d.ts +14 -3
- package/dist/src/models/BalanceItem.d.ts.map +1 -1
- package/dist/src/models/BalanceItem.js +61 -40
- package/dist/src/models/BalanceItem.js.map +1 -1
- package/dist/src/models/Event.d.ts.map +1 -1
- package/dist/src/models/Event.js +14 -0
- package/dist/src/models/Event.js.map +1 -1
- package/dist/src/models/Image.d.ts.map +1 -1
- package/dist/src/models/Image.js +3 -2
- package/dist/src/models/Image.js.map +1 -1
- package/dist/src/models/Member.d.ts +5 -2
- package/dist/src/models/Member.d.ts.map +1 -1
- package/dist/src/models/Member.js +141 -16
- package/dist/src/models/Member.js.map +1 -1
- package/dist/src/models/Order.d.ts.map +1 -1
- package/dist/src/models/Order.js +1 -1
- package/dist/src/models/Order.js.map +1 -1
- package/dist/src/models/Payment.d.ts +2 -6
- package/dist/src/models/Payment.d.ts.map +1 -1
- package/dist/src/models/Payment.js +5 -21
- package/dist/src/models/Payment.js.map +1 -1
- package/dist/src/models/Registration.d.ts +9 -2
- package/dist/src/models/Registration.d.ts.map +1 -1
- package/dist/src/models/Registration.js +45 -13
- package/dist/src/models/Registration.js.map +1 -1
- package/package.json +3 -3
- package/src/factories/RegistrationFactory.ts +2 -9
- package/src/migrations/1722959111-allow-multiple-registrations.sql +2 -0
- package/src/migrations/1722963554-registration-group-price-and-options.sql +3 -0
- package/src/migrations/1723202125-member-number.sql +3 -0
- package/src/migrations/1723218160-balance-item-unit-price.sql +2 -0
- package/src/migrations/1723218161-balance-item-amount.sql +2 -0
- package/src/migrations/1723218162-balance-item-type.sql +2 -0
- package/src/migrations/1723218163-balance-item-type-defaults.sql +2 -0
- package/src/migrations/1723218164-balance-item-relations.sql +2 -0
- package/src/models/BalanceItem.ts +67 -47
- package/src/models/Event.ts +16 -1
- package/src/models/Image.ts +4 -2
- package/src/models/Member.ts +164 -18
- package/src/models/Order.ts +2 -2
- package/src/models/Payment.ts +6 -26
- package/src/models/Registration.ts +45 -16
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Payment.js","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":";;;;AAAA,iEAA+E;AAC/E,sDAAmO;AACnO,gDAA+C;AAC/C,+BAAoC;
|
|
1
|
+
{"version":3,"file":"Payment.js","sourceRoot":"","sources":["../../../src/models/Payment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ManyToOneRelation, Model } from '@simonbackx/simple-database';
|
|
2
|
-
import { EmailTemplateType, Recipient, Registration as RegistrationStructure, StockReservation } from '@stamhoofd/structures';
|
|
2
|
+
import { EmailTemplateType, GroupPrice, Recipient, RegisterItemOption, Registration as RegistrationStructure, StockReservation } from '@stamhoofd/structures';
|
|
3
3
|
import { Organization, User } from './';
|
|
4
4
|
export declare class Registration extends Model {
|
|
5
5
|
static table: string;
|
|
@@ -8,10 +8,15 @@ export declare class Registration extends Model {
|
|
|
8
8
|
organizationId: string;
|
|
9
9
|
periodId: string;
|
|
10
10
|
groupId: string;
|
|
11
|
+
groupPrice: GroupPrice;
|
|
12
|
+
options: RegisterItemOption[];
|
|
11
13
|
/**
|
|
12
14
|
* @deprecated
|
|
13
15
|
*/
|
|
14
16
|
paymentId: string | null;
|
|
17
|
+
/**
|
|
18
|
+
* @deprecated
|
|
19
|
+
*/
|
|
15
20
|
cycle: number;
|
|
16
21
|
price: number | null;
|
|
17
22
|
createdAt: Date;
|
|
@@ -50,7 +55,9 @@ export declare class Registration extends Model {
|
|
|
50
55
|
*/
|
|
51
56
|
static getActiveMembers(organizationId: string): Promise<number>;
|
|
52
57
|
deactivate(): Promise<void>;
|
|
53
|
-
markValid(this: Registration
|
|
58
|
+
markValid(this: Registration, options?: {
|
|
59
|
+
skipEmail?: boolean;
|
|
60
|
+
}): Promise<boolean>;
|
|
54
61
|
getRecipients(organization: Organization, group: import('./').Group): Promise<Recipient[]>;
|
|
55
62
|
sendEmailTemplate(data: {
|
|
56
63
|
type: EmailTemplateType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Registration.d.ts","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,EAAE,iBAAiB,EAAsC,SAAS,EAAE,YAAY,IAAI,qBAAqB,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAK/
|
|
1
|
+
{"version":3,"file":"Registration.d.ts","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAsC,SAAS,EAAE,kBAAkB,EAAE,YAAY,IAAI,qBAAqB,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAK/M,OAAO,EAAkC,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAIxE,qBAAa,YAAa,SAAQ,KAAK;IACnC,MAAM,CAAC,KAAK,SAAkB;IAO9B,EAAE,EAAG,MAAM,CAAC;IAGZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,cAAc,EAAE,MAAM,CAAA;IAGtB,QAAQ,EAAE,MAAM,CAAC;IAGjB,OAAO,EAAE,MAAM,CAAC;IAGhB,UAAU,EAAE,UAAU,CAAC;IAGvB,OAAO,EAAE,kBAAkB,EAAE,CAAM;IAEnC;;OAEG;IAEH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAO;IAE/B;;OAEG;IAEH,KAAK,EAAE,MAAM,CAAK;IAGlB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAY5B,SAAS,EAAE,IAAI,CAAA;IAUf,SAAS,EAAE,IAAI,CAAA;IAGf,YAAY,EAAE,IAAI,GAAG,IAAI,CAAO;IAGhC,aAAa,EAAE,IAAI,GAAG,IAAI,CAAO;IAEjC;;OAEG;IAEH,WAAW,UAAQ;IAEnB;;;OAGG;IAEH,WAAW,UAAQ;IAGnB,aAAa,EAAE,IAAI,GAAG,IAAI,CAAO;IAEjC;;OAEG;IAEH,SAAS,SAAI;IAEb;;OAEG;IAEH,iBAAiB,EAAE,gBAAgB,EAAE,CAAK;IAE1C,MAAM,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,EAAE,OAAO,SAAS,EAAE,KAAK,CAAC,CAAA;IAEjE,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG;QAAC,KAAK,EAAE,OAAO,SAAS,EAAE,KAAK,CAAA;KAAC;IAQlE;;OAEG;WACU,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,cAAc,CAAC,EAAE,MAAM;IAwChG;;;OAGG;WACU,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBhE,UAAU;IAcV,SAAS,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAC;IAgC7D,aAAa,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,IAAI,EAAE,KAAK;IAgDnE,iBAAiB,CAAC,IAAI,EAAE;QAC1B,IAAI,EAAE,iBAAiB,CAAA;KAC1B;WAkDY,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,OAAO;IAiHpG,kBAAkB;IAMlB;;;;;OAKG;IACH,mBAAmB;CA4DtB"}
|
|
@@ -14,10 +14,15 @@ const queues_1 = require("@stamhoofd/queues");
|
|
|
14
14
|
class Registration extends simple_database_1.Model {
|
|
15
15
|
constructor() {
|
|
16
16
|
super(...arguments);
|
|
17
|
+
this.options = [];
|
|
17
18
|
/**
|
|
18
19
|
* @deprecated
|
|
19
20
|
*/
|
|
20
21
|
this.paymentId = null;
|
|
22
|
+
/**
|
|
23
|
+
* @deprecated
|
|
24
|
+
*/
|
|
25
|
+
this.cycle = 0;
|
|
21
26
|
this.price = null;
|
|
22
27
|
this.registeredAt = null;
|
|
23
28
|
this.reservedUntil = null;
|
|
@@ -69,7 +74,7 @@ class Registration extends simple_database_1.Model {
|
|
|
69
74
|
LEFT JOIN (
|
|
70
75
|
SELECT
|
|
71
76
|
registrationId,
|
|
72
|
-
sum(
|
|
77
|
+
sum(unitPrice * amount) AS price,
|
|
73
78
|
sum(pricePaid) AS pricePaid
|
|
74
79
|
FROM
|
|
75
80
|
balance_items
|
|
@@ -114,7 +119,7 @@ class Registration extends simple_database_1.Model {
|
|
|
114
119
|
const { Member } = await Promise.resolve().then(() => tslib_1.__importStar(require('./Member')));
|
|
115
120
|
await Member.updateMembershipsForId(this.memberId);
|
|
116
121
|
}
|
|
117
|
-
async markValid() {
|
|
122
|
+
async markValid(options) {
|
|
118
123
|
var _a;
|
|
119
124
|
if (this.registeredAt !== null && this.deactivatedAt === null) {
|
|
120
125
|
await this.save();
|
|
@@ -128,9 +133,11 @@ class Registration extends simple_database_1.Model {
|
|
|
128
133
|
this.scheduleStockUpdate();
|
|
129
134
|
const { Member } = await Promise.resolve().then(() => tslib_1.__importStar(require('./Member')));
|
|
130
135
|
await Member.updateMembershipsForId(this.memberId);
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
136
|
+
if ((options === null || options === void 0 ? void 0 : options.skipEmail) !== true) {
|
|
137
|
+
await this.sendEmailTemplate({
|
|
138
|
+
type: structures_1.EmailTemplateType.RegistrationConfirmation
|
|
139
|
+
});
|
|
140
|
+
}
|
|
134
141
|
const member = await Member.getByID(this.memberId);
|
|
135
142
|
if (member) {
|
|
136
143
|
const registrationMemberRelation = new simple_database_1.ManyToOneRelation(Member, "member");
|
|
@@ -237,10 +244,7 @@ class Registration extends simple_database_1.Model {
|
|
|
237
244
|
}
|
|
238
245
|
const template = templates[0];
|
|
239
246
|
const paymentGeneral = await payment.getGeneralStructure();
|
|
240
|
-
const
|
|
241
|
-
let groupIds = registrations.map(r => r.groupId);
|
|
242
|
-
// Remove duplicate groupIds
|
|
243
|
-
groupIds = groupIds.filter((v, i, a) => a.indexOf(v) === i);
|
|
247
|
+
const groupIds = paymentGeneral.groupIds;
|
|
244
248
|
const recipients = [
|
|
245
249
|
structures_1.Recipient.create({
|
|
246
250
|
firstName: user.firstName,
|
|
@@ -275,7 +279,7 @@ class Registration extends simple_database_1.Model {
|
|
|
275
279
|
}),
|
|
276
280
|
structures_1.Replacement.create({
|
|
277
281
|
token: "overviewContext",
|
|
278
|
-
value: "Inschrijving van " + paymentGeneral.
|
|
282
|
+
value: "Inschrijving van " + paymentGeneral.memberNames
|
|
279
283
|
}),
|
|
280
284
|
structures_1.Replacement.create({
|
|
281
285
|
token: "memberNames",
|
|
@@ -354,9 +358,31 @@ class Registration extends simple_database_1.Model {
|
|
|
354
358
|
}
|
|
355
359
|
}
|
|
356
360
|
if (updated.shouldIncludeStock()) {
|
|
357
|
-
const
|
|
358
|
-
|
|
359
|
-
|
|
361
|
+
const groupStockReservations = [
|
|
362
|
+
// Group level stock reservatiosn (stored in the group)
|
|
363
|
+
structures_1.StockReservation.create({
|
|
364
|
+
objectId: updated.groupPrice.id,
|
|
365
|
+
objectType: 'GroupPrice',
|
|
366
|
+
amount: 1
|
|
367
|
+
}),
|
|
368
|
+
...updated.options.map(o => {
|
|
369
|
+
return structures_1.StockReservation.create({
|
|
370
|
+
objectId: o.option.id,
|
|
371
|
+
objectType: 'GroupOption',
|
|
372
|
+
amount: o.amount
|
|
373
|
+
});
|
|
374
|
+
})
|
|
375
|
+
];
|
|
376
|
+
await _1.Group.applyStockReservations(updated.groupId, groupStockReservations);
|
|
377
|
+
updated.stockReservations = [
|
|
378
|
+
// Global level stock reservations (stored in each group)
|
|
379
|
+
structures_1.StockReservation.create({
|
|
380
|
+
objectId: updated.groupId,
|
|
381
|
+
objectType: 'Group',
|
|
382
|
+
amount: 1,
|
|
383
|
+
children: groupStockReservations
|
|
384
|
+
})
|
|
385
|
+
];
|
|
360
386
|
await updated.save();
|
|
361
387
|
}
|
|
362
388
|
else {
|
|
@@ -389,6 +415,12 @@ tslib_1.__decorate([
|
|
|
389
415
|
tslib_1.__decorate([
|
|
390
416
|
(0, simple_database_1.column)({ type: "string", foreignKey: Registration.group })
|
|
391
417
|
], Registration.prototype, "groupId", void 0);
|
|
418
|
+
tslib_1.__decorate([
|
|
419
|
+
(0, simple_database_1.column)({ type: "json", decoder: structures_1.GroupPrice })
|
|
420
|
+
], Registration.prototype, "groupPrice", void 0);
|
|
421
|
+
tslib_1.__decorate([
|
|
422
|
+
(0, simple_database_1.column)({ type: "json", decoder: new simple_encoding_1.ArrayDecoder(structures_1.RegisterItemOption) })
|
|
423
|
+
], Registration.prototype, "options", void 0);
|
|
392
424
|
tslib_1.__decorate([
|
|
393
425
|
(0, simple_database_1.column)({ type: "string", nullable: true })
|
|
394
426
|
], Registration.prototype, "paymentId", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Registration.js","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Registration.js","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stamhoofd/models",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.0",
|
|
4
4
|
"main": "./dist/src/index.js",
|
|
5
5
|
"types": "./dist/src/index.d.ts",
|
|
6
6
|
"license": "UNLICENCED",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"src"
|
|
11
11
|
],
|
|
12
12
|
"scripts": {
|
|
13
|
-
"build": "
|
|
13
|
+
"build": "tsc -b && mkdir -p ./dist/src/migrations && rsync --exclude='*.ts' --exclude='*.js' -r --checksum ./src/migrations/ ./dist/src/migrations/ && rsync -r --checksum ./src/assets/ ./dist/src/assets/",
|
|
14
14
|
"build:full": "rm -rf ./dist && yarn build",
|
|
15
15
|
"test": "jest",
|
|
16
16
|
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
|
|
@@ -27,5 +27,5 @@
|
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@simonbackx/simple-database": "1.24.0"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "d1959fa457e81e41797c4f7fe216095505f50aeb"
|
|
31
31
|
}
|
|
@@ -7,7 +7,6 @@ import { Registration } from '../models/Registration';
|
|
|
7
7
|
class Options {
|
|
8
8
|
member: Member;
|
|
9
9
|
group: Group;
|
|
10
|
-
waitingList?: boolean
|
|
11
10
|
}
|
|
12
11
|
|
|
13
12
|
export class RegistrationFactory extends Factory<Options, Registration> {
|
|
@@ -17,14 +16,8 @@ export class RegistrationFactory extends Factory<Options, Registration> {
|
|
|
17
16
|
registration.groupId = this.options.group.id
|
|
18
17
|
registration.periodId = this.options.group.periodId
|
|
19
18
|
registration.organizationId = this.options.group.organizationId
|
|
20
|
-
registration.
|
|
21
|
-
|
|
22
|
-
if (this.options.waitingList !== true) {
|
|
23
|
-
registration.registeredAt = new Date()
|
|
24
|
-
registration.registeredAt.setMilliseconds(0)
|
|
25
|
-
} else {
|
|
26
|
-
registration.waitingList = true
|
|
27
|
-
}
|
|
19
|
+
registration.registeredAt = new Date()
|
|
20
|
+
registration.registeredAt.setMilliseconds(0)
|
|
28
21
|
|
|
29
22
|
await registration.save()
|
|
30
23
|
return registration;
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
ALTER TABLE `registrations`
|
|
2
|
+
ADD COLUMN `options` json NOT NULL DEFAULT ('{"value": [], "version": 0}') AFTER `price`,
|
|
3
|
+
ADD COLUMN `groupPrice` json NOT NULL DEFAULT ('{"value": {"id": "unknown", "name": "Onbekend", "price": {"price": 0, "reducedPrice": null}}, "version": 0}') AFTER `price`;
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { column, Database, Model } from '@simonbackx/simple-database';
|
|
2
|
-
import { BalanceItemStatus,
|
|
2
|
+
import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BalanceItemWithPayments, BalanceItemPaymentWithPayment, OrderStatus, Payment as PaymentStruct, RegistrationWithMember } from '@stamhoofd/structures';
|
|
3
3
|
import { Formatter } from '@stamhoofd/utility';
|
|
4
4
|
import { v4 as uuidv4 } from "uuid";
|
|
5
5
|
|
|
6
|
+
import { EnumDecoder, MapDecoder } from '@simonbackx/simple-encoding';
|
|
6
7
|
import { Organization, Payment, Webshop } from './';
|
|
7
8
|
|
|
8
9
|
/**
|
|
@@ -54,6 +55,12 @@ export class BalanceItem extends Model {
|
|
|
54
55
|
@column({ type: "string", nullable: true })
|
|
55
56
|
dependingBalanceItemId: string | null = null;
|
|
56
57
|
|
|
58
|
+
@column({ type: "string" })
|
|
59
|
+
type = BalanceItemType.Other
|
|
60
|
+
|
|
61
|
+
@column({ decoder: new MapDecoder(new EnumDecoder(BalanceItemRelationType), BalanceItemRelation), type: 'json' })
|
|
62
|
+
relations: Map<BalanceItemRelationType, BalanceItemRelation> = new Map()
|
|
63
|
+
|
|
57
64
|
@column({ type: "string" })
|
|
58
65
|
description = "";
|
|
59
66
|
|
|
@@ -61,7 +68,13 @@ export class BalanceItem extends Model {
|
|
|
61
68
|
* Total prices
|
|
62
69
|
*/
|
|
63
70
|
@column({ type: "integer" })
|
|
64
|
-
|
|
71
|
+
amount = 1
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* Total prices
|
|
75
|
+
*/
|
|
76
|
+
@column({ type: "integer" })
|
|
77
|
+
unitPrice: number;
|
|
65
78
|
|
|
66
79
|
/**
|
|
67
80
|
* Cached value, for optimizations
|
|
@@ -94,6 +107,10 @@ export class BalanceItem extends Model {
|
|
|
94
107
|
})
|
|
95
108
|
updatedAt: Date
|
|
96
109
|
|
|
110
|
+
get price() {
|
|
111
|
+
return this.unitPrice * this.amount;
|
|
112
|
+
}
|
|
113
|
+
|
|
97
114
|
async markUpdated(payment: Payment, organization: Organization) {
|
|
98
115
|
// For orders: mark order as changed (so they are refetched in front ends)
|
|
99
116
|
if (this.orderId) {
|
|
@@ -158,28 +175,6 @@ export class BalanceItem extends Model {
|
|
|
158
175
|
}
|
|
159
176
|
}
|
|
160
177
|
}
|
|
161
|
-
|
|
162
|
-
// Do we have a different connected balance item?
|
|
163
|
-
// Make it visible if this one is paid
|
|
164
|
-
if (this.dependingBalanceItemId) {
|
|
165
|
-
const depending = await BalanceItem.getByID(this.dependingBalanceItemId)
|
|
166
|
-
if (depending) {
|
|
167
|
-
if (this.status === BalanceItemStatus.Hidden) {
|
|
168
|
-
depending.status = BalanceItemStatus.Pending
|
|
169
|
-
await depending.save()
|
|
170
|
-
|
|
171
|
-
if (depending.memberId) {
|
|
172
|
-
const {Member} = await import("./Member");
|
|
173
|
-
await Member.updateOutstandingBalance([depending.memberId])
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
if (depending.registrationId) {
|
|
177
|
-
const {Registration} = await import("./Registration");
|
|
178
|
-
await Registration.updateOutstandingBalance([depending.registrationId], depending.organizationId)
|
|
179
|
-
}
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
178
|
}
|
|
184
179
|
|
|
185
180
|
async undoPaid(payment: Payment, organization: Organization) {
|
|
@@ -242,10 +237,10 @@ export class BalanceItem extends Model {
|
|
|
242
237
|
if (bip.length === 0) {
|
|
243
238
|
// No payments associated with this item
|
|
244
239
|
item.status = BalanceItemStatus.Hidden
|
|
245
|
-
item.
|
|
240
|
+
item.amount = 0
|
|
246
241
|
await item.save()
|
|
247
242
|
} else {
|
|
248
|
-
item.
|
|
243
|
+
item.amount = 0
|
|
249
244
|
await item.save()
|
|
250
245
|
}
|
|
251
246
|
}
|
|
@@ -307,6 +302,8 @@ export class BalanceItem extends Model {
|
|
|
307
302
|
static async updateOutstanding(items: BalanceItem[], organizationId?: string) {
|
|
308
303
|
const Member = (await import('./Member')).Member;
|
|
309
304
|
|
|
305
|
+
await BalanceItem.updatePricePaid(items.map(i => i.id));
|
|
306
|
+
|
|
310
307
|
// Update outstanding amount of related members and registrations
|
|
311
308
|
const memberIds: string[] = Formatter.uniqueArray(items.map(p => p.memberId).filter(id => id !== null)) as any
|
|
312
309
|
await Member.updateOutstandingBalance(memberIds)
|
|
@@ -316,6 +313,47 @@ export class BalanceItem extends Model {
|
|
|
316
313
|
await Registration.updateOutstandingBalance(registrationIds, organizationId)
|
|
317
314
|
}
|
|
318
315
|
|
|
316
|
+
/**
|
|
317
|
+
* Update the outstanding balance of multiple members in one go (or all members)
|
|
318
|
+
*/
|
|
319
|
+
static async updatePricePaid(balanceItemIds: string[] | 'all') {
|
|
320
|
+
if (balanceItemIds !== 'all' && balanceItemIds.length == 0) {
|
|
321
|
+
return
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
const params: any[] = []
|
|
325
|
+
let firstWhere = ''
|
|
326
|
+
let secondWhere = ''
|
|
327
|
+
|
|
328
|
+
if (balanceItemIds !== 'all') {
|
|
329
|
+
firstWhere = ` AND balanceItemId IN (?)`
|
|
330
|
+
params.push(balanceItemIds)
|
|
331
|
+
|
|
332
|
+
secondWhere = `WHERE balance_items.id IN (?)`
|
|
333
|
+
params.push(balanceItemIds)
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
const query = `
|
|
337
|
+
UPDATE
|
|
338
|
+
balance_items
|
|
339
|
+
LEFT JOIN (
|
|
340
|
+
SELECT
|
|
341
|
+
balanceItemId,
|
|
342
|
+
sum(balance_item_payments.price) AS price
|
|
343
|
+
FROM
|
|
344
|
+
balance_item_payments
|
|
345
|
+
LEFT JOIN payments ON payments.id = balance_item_payments.paymentId
|
|
346
|
+
WHERE
|
|
347
|
+
payments.status = 'Succeeded'${firstWhere}
|
|
348
|
+
GROUP BY
|
|
349
|
+
balanceItemId
|
|
350
|
+
) i ON i.balanceItemId = balance_items.id
|
|
351
|
+
SET balance_items.pricePaid = coalesce(i.price, 0)
|
|
352
|
+
${secondWhere}`;
|
|
353
|
+
|
|
354
|
+
await Database.update(query, params)
|
|
355
|
+
}
|
|
356
|
+
|
|
319
357
|
static async loadPayments(items: BalanceItem[]) {
|
|
320
358
|
if (items.length == 0) {
|
|
321
359
|
return {balanceItemPayments: [], payments: []}
|
|
@@ -330,39 +368,21 @@ export class BalanceItem extends Model {
|
|
|
330
368
|
return {payments, balanceItemPayments}
|
|
331
369
|
}
|
|
332
370
|
|
|
333
|
-
static async
|
|
371
|
+
static async getStructureWithPayments(items: BalanceItem[]): Promise<BalanceItemWithPayments[]> {
|
|
334
372
|
if (items.length == 0) {
|
|
335
373
|
return []
|
|
336
374
|
}
|
|
337
375
|
|
|
338
|
-
const {Registration} = await import("./Registration");
|
|
339
|
-
const {Order} = await import("./Order");
|
|
340
|
-
const {Group} = await import("./Group");
|
|
341
|
-
|
|
342
376
|
const {payments, balanceItemPayments} = await BalanceItem.loadPayments(items)
|
|
343
377
|
|
|
344
|
-
// Load members and orders
|
|
345
|
-
const registrationIds = Formatter.uniqueArray(items.flatMap(b => b.registrationId ? [b.registrationId] : []))
|
|
346
|
-
const orderIds = Formatter.uniqueArray(items.flatMap(b => b.orderId ? [b.orderId] : []))
|
|
347
|
-
|
|
348
|
-
const registrations = await Registration.getByIDs(...registrationIds)
|
|
349
|
-
const orders = await Order.getByIDs(...orderIds)
|
|
350
|
-
|
|
351
|
-
const groupIds = Formatter.uniqueArray(registrations.map(r => r.groupId))
|
|
352
|
-
const groups = await Group.getByIDs(...groupIds)
|
|
353
|
-
|
|
354
378
|
return items.map(item => {
|
|
355
379
|
const thisBalanceItemPayments = balanceItemPayments.filter(p => p.balanceItemId === item.id)
|
|
356
|
-
const registration = registrations.find(r => r.id === item.registrationId)
|
|
357
|
-
const group = registration ? groups.find(g => g.id === registration.groupId) : null
|
|
358
380
|
|
|
359
|
-
return
|
|
381
|
+
return BalanceItemWithPayments.create({
|
|
360
382
|
...item,
|
|
361
|
-
registration: registration && group ? registration.setRelation(Registration.group, group).getStructure() : null,
|
|
362
|
-
order: orders.find(o => o.id === item.orderId)?.getStructureWithoutPayment() ?? null,
|
|
363
383
|
payments: thisBalanceItemPayments.map(p => {
|
|
364
384
|
const payment = payments.find(pp => pp.id === p.paymentId)!
|
|
365
|
-
return
|
|
385
|
+
return BalanceItemPaymentWithPayment.create({
|
|
366
386
|
...p,
|
|
367
387
|
payment: PaymentStruct.create(payment)
|
|
368
388
|
})
|
package/src/models/Event.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
import { column, Model } from "@simonbackx/simple-database";
|
|
3
|
-
import { EventMeta, Event as EventStruct } from '@stamhoofd/structures';
|
|
3
|
+
import { EventMeta, Event as EventStruct, GroupType } from '@stamhoofd/structures';
|
|
4
4
|
import { v4 as uuidv4 } from "uuid";
|
|
5
5
|
import { Group } from "./Group";
|
|
6
6
|
|
|
@@ -83,6 +83,11 @@ export class Event extends Model {
|
|
|
83
83
|
group.settings.requireDefaultAgeGroupIds = this.meta.defaultAgeGroupIds ?? []
|
|
84
84
|
group.settings.requireGroupIds = this.meta.groups?.map(g => g.id) ?? []
|
|
85
85
|
|
|
86
|
+
if (group.type === GroupType.EventRegistration) {
|
|
87
|
+
// Don't change the name of the waiting list
|
|
88
|
+
group.settings.name = this.name
|
|
89
|
+
}
|
|
90
|
+
|
|
86
91
|
if (this.organizationId) {
|
|
87
92
|
// This is a not-national event, so require the organization
|
|
88
93
|
group.settings.requireOrganizationIds = [this.organizationId]
|
|
@@ -98,5 +103,15 @@ export class Event extends Model {
|
|
|
98
103
|
group.settings.requirePlatformMembershipOn = this.endDate
|
|
99
104
|
}
|
|
100
105
|
await group.save()
|
|
106
|
+
|
|
107
|
+
if (group.waitingListId) {
|
|
108
|
+
const waitingList = await Group.getByID(group.waitingListId)
|
|
109
|
+
if (waitingList) {
|
|
110
|
+
if (group.settings.allowRegistrationsByOrganization) {
|
|
111
|
+
waitingList.settings.allowRegistrationsByOrganization = true
|
|
112
|
+
}
|
|
113
|
+
await this.syncGroupRequirements(waitingList)
|
|
114
|
+
}
|
|
115
|
+
}
|
|
101
116
|
}
|
|
102
117
|
}
|
package/src/models/Image.ts
CHANGED
|
@@ -34,13 +34,15 @@ export class Image extends Model {
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
let fileType = 'png';
|
|
37
|
-
if (
|
|
37
|
+
if (type == "image/jpeg" || type == "image/jpg") {
|
|
38
38
|
fileType = "jpg";
|
|
39
39
|
}
|
|
40
|
-
if (
|
|
40
|
+
if (type === "image/svg+xml" || type === "image/svg") {
|
|
41
41
|
fileType = "svg";
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
+
console.log('creating image', fileType, type, resolutions)
|
|
45
|
+
|
|
44
46
|
const supportsTransparency = fileType == "png" || fileType == "svg"
|
|
45
47
|
const promises: Promise<{data: Buffer;info: sharp.OutputInfo}>[] = [];
|
|
46
48
|
|