@stamhoofd/backend 2.112.0 → 2.113.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.112.0",
+    "version": "2.113.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -54,14 +54,14 @@
         "@simonbackx/simple-encoding": "2.23.1",
         "@simonbackx/simple-endpoints": "1.20.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.112.0",
-        "@stamhoofd/backend-middleware": "2.112.0",
-        "@stamhoofd/email": "2.112.0",
-        "@stamhoofd/models": "2.112.0",
-        "@stamhoofd/queues": "2.112.0",
-        "@stamhoofd/sql": "2.112.0",
-        "@stamhoofd/structures": "2.112.0",
-        "@stamhoofd/utility": "2.112.0",
+        "@stamhoofd/backend-i18n": "2.113.0",
+        "@stamhoofd/backend-middleware": "2.113.0",
+        "@stamhoofd/email": "2.113.0",
+        "@stamhoofd/models": "2.113.0",
+        "@stamhoofd/queues": "2.113.0",
+        "@stamhoofd/sql": "2.113.0",
+        "@stamhoofd/structures": "2.113.0",
+        "@stamhoofd/utility": "2.113.0",
         "archiver": "^7.0.1",
         "axios": "^1.13.2",
         "cookie": "^0.7.0",
@@ -79,5 +79,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "8734fff2c389052210c5da51bd3c4beaf149bfd1"
+    "gitHead": "e90b56b0e379e4bc7f7138cef336c267fb5e9bcf"
 }

package/src/endpoints/global/registration/RegisterMembersEndpoint.ts

@@ -1057,6 +1057,8 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
         payment.status = PaymentStatus.Created;
         payment.paidAt = null;
         payment.price = totalPrice;
+        PaymentService.round(payment);
+        totalPrice = payment.price;
 
         if (totalPrice === 0) {
             payment.status = PaymentStatus.Succeeded;

package/src/endpoints/organization/dashboard/payments/PatchPaymentsEndpoint.ts

@@ -1,14 +1,15 @@
-import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
+import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, patchObject, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, BalanceItemPayment, Payment } from '@stamhoofd/models';
+import { BalanceItem, BalanceItemPayment, Payment, User } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { PaymentGeneral, PaymentMethod, PaymentStatus, Payment as PaymentStruct, PaymentType, PermissionLevel } from '@stamhoofd/structures';
+import { PaymentCustomer, PaymentGeneral, PaymentMethod, PaymentStatus, Payment as PaymentStruct, PaymentType, PermissionLevel } from '@stamhoofd/structures';
 
-import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
-import { Context } from '../../../../helpers/Context';
-import { BalanceItemService } from '../../../../services/BalanceItemService';
-import { PaymentService } from '../../../../services/PaymentService';
+import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
+import { Context } from '../../../../helpers/Context.js';
+import { BalanceItemService } from '../../../../services/BalanceItemService.js';
+import { PaymentService } from '../../../../services/PaymentService.js';
+import { ViesHelper } from '../../../../helpers/ViesHelper.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -71,6 +72,38 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
             payment.status = PaymentStatus.Created;
             payment.method = put.method;
             payment.customer = put.customer;
+
+            const payingOrganizationId = put.payingOrganizationId ?? put.payingOrganization?.id ?? null;
+
+            if (payingOrganizationId) {
+                if (Context.auth.hasSomePlatformAccess()) {
+                    if (await Context.auth.hasFullAccess(payingOrganizationId, PermissionLevel.Full)) {
+                        payment.payingOrganizationId = payingOrganizationId;
+                    }
+                    else {
+                        // silently ignore
+                    }
+                }
+            }
+
+            if (put.payingUserId) {
+                const user = await User.getByID(put.payingUserId);
+                if (!user) {
+                    throw new SimpleError({
+                        code: 'user_not_found',
+                        message: 'User not found',
+                        field: 'payingUserId',
+                    });
+                }
+                if (await Context.auth.canAccessUser(user, PermissionLevel.Full)) {
+                    // Allowed
+                    payment.payingUserId = put.payingUserId;
+                }
+            }
+
+            if (put.customer?.company) {
+                await ViesHelper.checkCompany(put.customer.company, put.customer.company);
+            }
             payment.type = put.type;
 
             if (payment.type === PaymentType.Reallocation) {
@@ -131,6 +164,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
             // Check total price
             const totalPrice = balanceItemPayments.reduce((total, item) => total + item.price, 0);
             payment.price = totalPrice;
+            PaymentService.round(payment);
 
             switch (payment.type) {
                 case PaymentType.Payment: {
@@ -265,6 +299,38 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                     payment.paidAt = patch.paidAt;
                 }
 
+                if (patch.customer) {
+                    payment.customer = patchObject(payment.customer, patch.customer, { defaultValue: PaymentCustomer.create({}) });
+                }
+
+                const payingOrganizationId = patch.payingOrganizationId ?? patch.payingOrganization?.id ?? null;
+
+                if (payingOrganizationId) {
+                    if (Context.auth.hasSomePlatformAccess()) {
+                        if (await Context.auth.hasFullAccess(payingOrganizationId, PermissionLevel.Full)) {
+                            payment.payingOrganizationId = payingOrganizationId;
+                        }
+                        else {
+                            // silently ignore
+                        }
+                    }
+                }
+
+                if (patch.payingUserId) {
+                    const user = await User.getByID(patch.payingUserId);
+                    if (!user) {
+                        throw new SimpleError({
+                            code: 'user_not_found',
+                            message: 'User not found',
+                            field: 'payingUserId',
+                        });
+                    }
+                    if (await Context.auth.canAccessUser(user, PermissionLevel.Full)) {
+                        // Allowed
+                        payment.payingUserId = patch.payingUserId;
+                    }
+                }
+
                 await payment.save();
 
                 if (patch.status) {

package/src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.ts

@@ -5,10 +5,11 @@ import { BalanceItem, BalanceItemPayment, Order, Payment, Webshop, WebshopCounte
 import { QueueHandler } from '@stamhoofd/queues';
 import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, TranslatedString, Webshop as WebshopStruct, WebshopTicketType } from '@stamhoofd/structures';
 
-import { Context } from '../../../../helpers/Context';
-import { AuditLogService } from '../../../../services/AuditLogService';
-import { shouldReserveUitpasNumbers, UitpasService } from '../../../../services/uitpas/UitpasService';
-import { ServiceFeeHelper } from '../../../../helpers/ServiceFeeHelper';
+import { Context } from '../../../../helpers/Context.js';
+import { AuditLogService } from '../../../../services/AuditLogService.js';
+import { shouldReserveUitpasNumbers, UitpasService } from '../../../../services/uitpas/UitpasService.js';
+import { ServiceFeeHelper } from '../../../../helpers/ServiceFeeHelper.js';
+import { PaymentService } from '../../../../services/PaymentService.js';
 
 type Params = { id: string };
 type Query = undefined;
@@ -154,6 +155,7 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                         payment.method = struct.data.paymentMethod;
                         payment.status = PaymentStatus.Created;
                         payment.price = totalPrice;
+                        PaymentService.round(payment);
                         payment.paidAt = null;
 
                         // Determine the payment provider (always null because no online payments here)

package/src/endpoints/organization/webshops/PlaceOrderEndpoint.ts

@@ -8,12 +8,13 @@ import { QueueHandler } from '@stamhoofd/queues';
 import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderData, OrderResponse, Order as OrderStruct, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, TranslatedString, Version, WebshopAuthType, Webshop as WebshopStruct, WebshopTicketType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
-import { BuckarooHelper } from '../../../helpers/BuckarooHelper';
-import { Context } from '../../../helpers/Context';
-import { StripeHelper } from '../../../helpers/StripeHelper';
-import { AuditLogService } from '../../../services/AuditLogService';
-import { UitpasService } from '../../../services/uitpas/UitpasService';
-import { ServiceFeeHelper } from '../../../helpers/ServiceFeeHelper';
+import { BuckarooHelper } from '../../../helpers/BuckarooHelper.js';
+import { Context } from '../../../helpers/Context.js';
+import { StripeHelper } from '../../../helpers/StripeHelper.js';
+import { AuditLogService } from '../../../services/AuditLogService.js';
+import { UitpasService } from '../../../services/uitpas/UitpasService.js';
+import { ServiceFeeHelper } from '../../../helpers/ServiceFeeHelper.js';
+import { PaymentService } from '../../../services/PaymentService.js';
 
 type Params = { id: string };
 type Query = undefined;
@@ -154,7 +155,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
         });
 
         // The order now is valid, the stock is reserved for now (until the payment fails or expires)
-        const totalPrice = request.body.totalPrice;
+        let totalPrice = request.body.totalPrice;
 
         if (totalPrice % 100 !== 0) {
             throw new SimpleError({
@@ -178,6 +179,8 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 payment.method = request.body.paymentMethod;
                 payment.status = PaymentStatus.Created;
                 payment.price = totalPrice;
+                PaymentService.round(payment);
+                totalPrice = payment.price;
                 payment.paidAt = null;
                 payment.customer = PaymentCustomer.create({
                     firstName: request.body.customer.firstName,

package/src/excel-loaders/members.ts

@@ -131,7 +131,7 @@ export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
         name: $t(`030be384-9014-410c-87ba-e04920c26111`),
         width: 20,
         getValue: ({ patchedMember: object }: PlatformMember) => ({
-            value: XlsxTransformerColumnHelper.formatBoolean(object.details.requiresFinancialSupport?.value),
+            value: XlsxTransformerColumnHelper.formatBoolean(object.details.hasFinancialSupportOrActiveUitpas),
         }),
     },
     {

package/src/helpers/AdminPermissionChecker.ts

@@ -56,7 +56,11 @@ export class AdminPermissionChecker {
             if (!result) {
                 console.error('Unexpected missing organization in AdminPermissionChecker.getOrganization', id);
                 this.organizationCache.delete(id);
-                throw new Error('Unexpected missing organization in AdminPermissionChecker.getOrganization');
+
+                throw new SimpleError({
+                    code: 'organization_not_found',
+                    message: 'Organization not found',
+                });
             }
             this.organizationCache.set(id, result);
             return result;

package/src/helpers/AuthenticatedStructures.ts

@@ -1,6 +1,6 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { AuditLog, BalanceItem, CachedBalance, Document, Event, EventNotification, Group, Invoice, Member, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, RegistrationPeriod, Ticket, User, Webshop } from '@stamhoofd/models';
-import { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, DetailedReceivableBalance, Document as DocumentStruct, EventNotification as EventNotificationStruct, Event as EventStruct, GenericBalance, Group as GroupStruct, GroupType, InvoicedBalanceItem, InvoiceStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MembersBlob, MemberWithRegistrationsBlob, NamedObject, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentGeneral, PermissionLevel, Platform, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, RegistrationsBlob, RegistrationWithMemberBlob, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, Company, DetailedReceivableBalance, Document as DocumentStruct, EventNotification as EventNotificationStruct, Event as EventStruct, GenericBalance, Group as GroupStruct, GroupType, InvoicedBalanceItem, InvoiceStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MembersBlob, MemberWithRegistrationsBlob, NamedObject, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentCustomer, PaymentGeneral, PermissionLevel, Platform, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, RegistrationsBlob, RegistrationWithMemberBlob, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct } from '@stamhoofd/structures';
 import { Sorter } from '@stamhoofd/utility';
 
 import { SQL } from '@stamhoofd/sql';
@@ -896,10 +896,67 @@ export class AuthenticatedStructures {
 
         const result: { balance: CachedBalance; object: ReceivableBalanceObject }[] = [];
 
+        function getMemberContacts(member: Member, balance: CachedBalance) {
+            const url = Context.organization && Context.organization.id === balance.organizationId ? 'https://' + Context.organization.getHost() : '';
+            return [
+                ...(member.details.getMemberEmails().length
+                    ? [
+                            ReceivableBalanceObjectContact.create({
+                                firstName: member.details.firstName ?? '',
+                                lastName: member.details.lastName ?? '',
+                                emails: member.details.getMemberEmails(),
+                                meta: {
+                                    type: 'member',
+                                    responsibilityIds: [],
+                                    url,
+                                },
+                            }),
+                        ]
+                    : []),
+
+                ...((member.details.calculatedParentsHaveAccess || member.details.getMemberEmails().length === 0)
+                    ? member.details.parents.filter(p => p.getEmails().length > 0).map(p => ReceivableBalanceObjectContact.create({
+                            firstName: p.firstName ?? '',
+                            lastName: p.lastName ?? '',
+                            emails: p.getEmails(),
+                            meta: {
+                                type: 'parent',
+                                responsibilityIds: [],
+                                url,
+                            },
+                        }))
+                    : []),
+            ];
+        }
+
+        function getMemberCustomers(member: Member): PaymentCustomer[] {
+            return [
+                ...(member.details.defaultAge >= 14 || member.details.parents.length === 0 || !member.details.calculatedParentsHaveAccess
+                    ? [
+                            PaymentCustomer.create({
+                                firstName: member.details.firstName ?? '',
+                                lastName: member.details.lastName ?? '',
+                                email: member.details.getMemberEmails()[0] ?? null,
+                                phone: member.details.phone,
+                            }),
+                        ]
+                    : []),
+
+                ...((member.details.calculatedParentsHaveAccess || member.details.getMemberEmails().length === 0)
+                    ? member.details.parents.map(parent => PaymentCustomer.create({
+                            firstName: parent.firstName ?? '',
+                            lastName: parent.lastName ?? '',
+                            email: parent.getEmails()[0] ?? null,
+                            phone: parent.phone,
+                        }))
+                    : []),
+            ];
+        }
+
         for (const balance of balances) {
             let object = ReceivableBalanceObject.create({
                 id: balance.objectId,
-                name: 'Onbekend',
+                name: $t('6c3e777c-7cd6-4566-9540-8a829c26212f'),
             });
 
             if (balance.objectType === ReceivableBalanceType.organization) {
@@ -920,6 +977,7 @@ export class AuthenticatedStructures {
                         id: balance.objectId,
                         name: organization.name,
                         uri: organization.uri,
+                        customers: organization.defaultCompanies.map(company => PaymentCustomer.create({ company })),
                         contacts: thisMembers.map(({ member, responsibilities }) => ReceivableBalanceObjectContact.create({
                             firstName: member.firstName ?? '',
                             lastName: member.lastName ?? '',
@@ -936,39 +994,11 @@ export class AuthenticatedStructures {
             else if (balance.objectType === ReceivableBalanceType.member) {
                 const member = members.find(m => m.id === balance.objectId) ?? null;
                 if (member) {
-                    const url = Context.organization && Context.organization.id === balance.organizationId ? 'https://' + Context.organization.getHost() : '';
                     object = ReceivableBalanceObject.create({
                         id: balance.objectId,
                         name: member.details.name,
-                        contacts: [
-                            ...(member.details.getMemberEmails().length
-                                ? [
-                                        ReceivableBalanceObjectContact.create({
-                                            firstName: member.details.firstName ?? '',
-                                            lastName: member.details.lastName ?? '',
-                                            emails: member.details.getMemberEmails(),
-                                            meta: {
-                                                type: 'member',
-                                                responsibilityIds: [],
-                                                url,
-                                            },
-                                        }),
-                                    ]
-                                : []),
-
-                            ...((member.details.calculatedParentsHaveAccess || member.details.getMemberEmails().length === 0)
-                                ? member.details.parents.filter(p => p.getEmails().length > 0).map(p => ReceivableBalanceObjectContact.create({
-                                        firstName: p.firstName ?? '',
-                                        lastName: p.lastName ?? '',
-                                        emails: p.getEmails(),
-                                        meta: {
-                                            type: 'parent',
-                                            responsibilityIds: [],
-                                            url,
-                                        },
-                                    }))
-                                : []),
-                        ],
+                        customers: getMemberCustomers(member),
+                        contacts: getMemberContacts(member, balance),
                     });
                 }
             }
@@ -979,39 +1009,11 @@ export class AuthenticatedStructures {
                 }
                 const member = members.find(m => m.id === registration.memberId) ?? null;
                 if (member) {
-                    const url = Context.organization && Context.organization.id === balance.organizationId ? 'https://' + Context.organization.getHost() : '';
                     object = ReceivableBalanceObject.create({
                         id: balance.objectId,
                         name: member.details.name,
-                        contacts: [
-                            ...(member.details.getMemberEmails().length
-                                ? [
-                                        ReceivableBalanceObjectContact.create({
-                                            firstName: member.details.firstName ?? '',
-                                            lastName: member.details.lastName ?? '',
-                                            emails: member.details.getMemberEmails(),
-                                            meta: {
-                                                type: 'member',
-                                                responsibilityIds: [],
-                                                url,
-                                            },
-                                        }),
-                                    ]
-                                : []),
-
-                            ...((member.details.calculatedParentsHaveAccess || member.details.getMemberEmails().length === 0)
-                                ? member.details.parents.filter(p => p.getEmails().length > 0).map(p => ReceivableBalanceObjectContact.create({
-                                        firstName: p.firstName ?? '',
-                                        lastName: p.lastName ?? '',
-                                        emails: p.getEmails(),
-                                        meta: {
-                                            type: 'parent',
-                                            responsibilityIds: [],
-                                            url,
-                                        },
-                                    }))
-                                : []),
-                        ],
+                        customers: getMemberCustomers(member),
+                        contacts: getMemberContacts(member, balance),
                     });
                 }
             }
@@ -1022,6 +1024,11 @@ export class AuthenticatedStructures {
                     object = ReceivableBalanceObject.create({
                         id: balance.objectId,
                         name: user.name || user.email,
+                        customers: [PaymentCustomer.create({
+                            firstName: user.firstName,
+                            lastName: user.lastName,
+                            email: user.email,
+                        })],
                         contacts: [
                             ReceivableBalanceObjectContact.create({
                                 firstName: user.firstName ?? '',

package/src/helpers/Context.ts

@@ -6,7 +6,7 @@ import { AsyncLocalStorage } from 'async_hooks';
 
 import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { ApiUserRateLimits } from '@stamhoofd/structures';
-import { AdminPermissionChecker } from './AdminPermissionChecker';
+import { AdminPermissionChecker } from './AdminPermissionChecker.js';
 
 export const apiUserRateLimiter = new RateLimiter({
     limits: [

package/src/helpers/UitpasTokenRepository.ts

@@ -98,7 +98,8 @@ export class UitpasTokenRepository {
     }
 
     private async getNewAccessToken() {
-        const url = 'https://account-test.uitid.be/realms/uitid/protocol/openid-connect/token';
+        console.log('UITPAS: Fetching new access token for', this.uitpasClientCredential.organizationId);
+        const url = STAMHOOFD.UITPAS_API_URL?.includes('test') ? 'https://account-test.uitid.be/realms/uitid/protocol/openid-connect/token' : 'https://account.uitid.be/realms/uitid/protocol/openid-connect/token';
         const myHeaders = new Headers();
         myHeaders.append('Content-Type', 'application/x-www-form-urlencoded');
         const params = new URLSearchParams({
@@ -110,6 +111,7 @@ export class UitpasTokenRepository {
             method: 'POST',
             headers: myHeaders,
             body: params.toString(),
+            signal: AbortSignal.timeout(5000),
         };
         const response = await fetch(url, requestOptions).catch(() => {
             // Handle network errors
@@ -123,6 +125,7 @@ export class UitpasTokenRepository {
             if (response.status === 401) {
                 // Unauthorized, credentials are invalid
                 throw new SimpleError({
+                    statusCode: this.uitpasClientCredential.organizationId === null ? 500 : 400, // Internal, non visible error in case it is a built in credential
                     code: 'invalid_uitpas_client_credentials',
                     message: `Invalid UiTPAS client credentials`,
                     human: $t(`1086bb24-5df4-4faf-9dc0-ab5a955b0d8f`),
@@ -130,6 +133,7 @@ export class UitpasTokenRepository {
             }
             console.error(`Unsuccessful response when fetching UiTPAS token for organization with id ${this.uitpasClientCredential.organizationId}:`, response.statusText);
             throw new SimpleError({
+                statusCode: this.uitpasClientCredential.organizationId === null ? 500 : 400, // Internal, non visible error in case it is a built in credential
                 code: 'unsuccessful_response_fetching_uitpas_token',
                 message: `Unsuccesful response when fetching UiTPAS token`,
                 human: $t(`dd9b30ca-860f-47aa-8cb1-527fd156d9ca`),
@@ -138,6 +142,7 @@ export class UitpasTokenRepository {
         const json: unknown = await response.json().catch(() => {
             // Handle JSON parsing errors
             throw new SimpleError({
+                statusCode: this.uitpasClientCredential.organizationId === null ? 500 : 400, // Internal, non visible error in case it is a built in credential
                 code: 'invalid_json_fetching_uitpas_token',
                 message: `Invalid json when fetching UiTPAS token`,
                 human: $t(`8f217db0-c672-46f0-a8f7-6eba6f080947`),

package/src/seeds/{wip/1769088653-uitpas-status.ts → 1769088653-uitpas-status.ts}

@@ -5,7 +5,7 @@ import { Member } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
 import { UitpasSocialTariff, UitpasSocialTariffStatus } from '@stamhoofd/structures';
 import { sleep } from '@stamhoofd/utility';
-import { updateMemberDetailsUitpasNumber } from '../../helpers/updateMemberDetailsUitpasNumber.js';
+import { updateMemberDetailsUitpasNumber } from '../helpers/updateMemberDetailsUitpasNumber.js';
 
 /**
  * Seed to update the social tariff of all uitpas numbers.
@@ -34,17 +34,15 @@ let idOfLastUpdatedMember: string | null = null;
 
 export async function migrateUitpasStatusOfAllMembers() {
     let query = Member.select()
-    // where there is an uitpas number
-        .where(SQL.jsonValue(SQL.column('details'), '$.value.uitpasNumberDetails'), '!=', null);
+        // where there is an uitpas number
+        .where(SQL.jsonValue(SQL.column('details'), '$.value.uitpasNumber'), '!=', null)
+        .orWhere(SQL.jsonValue(SQL.column('details'), '$.value.uitpasNumberDetails'), '!=', null);
 
     if (idOfLastUpdatedMember !== null) {
         console.log('Continue from member with id ', idOfLastUpdatedMember);
         query = query.where('id', '>', idOfLastUpdatedMember);
     }
-
-    const total = await query.clone().count();
-
-    console.log(`Start updating uitpas status of ${total} members.`);
+    console.log(`Start updating uitpas status members.`);
 
     let c = 0;
 

package/src/services/PaymentService.ts

@@ -341,7 +341,7 @@ export const PaymentService = {
      *
      * TODO: update this method to generate a virtual invoice and use the price of the invoice instead of the rounded payment price, so we don't get differences in calculation
      */
-    async round(payment: Payment) {
+    round(payment: Payment) {
         const amount = payment.price;
         const rounded = Payment.roundPrice(payment.price);
         const difference = rounded - amount;
@@ -354,10 +354,9 @@ export const PaymentService = {
             throw new Error('Unexpected rounding difference of ' + difference + ' for payment ' + payment.id);
         }
 
-        // payment.roundingAmount = difference;
+        payment.roundingAmount = difference;
 
         // Change payment total price
         payment.price += difference;
-        await payment.save();
     },
 };

package/src/sql-sorters/registrations.ts

@@ -5,6 +5,7 @@ import { Formatter } from '@stamhoofd/utility';
 import { memberCachedBalanceForOrganizationJoin, registrationCachedBalanceJoin } from '../helpers/outstandingBalanceJoin.js';
 import { SQLTranslatedString } from '../helpers/SQLTranslatedString.js';
 import { groupJoin, memberJoin, organizationJoin } from '../sql-filters/registrations.js';
+import { Context, ContextInstance } from '../helpers/Context.js';
 
 export class RegistrationSortData {
     readonly registration: RegistrationWithMemberBlob;
@@ -17,8 +18,11 @@ export class RegistrationSortData {
 
     get organization() {
         const organization = this.organizations.find(o => o.id === this.registration.organizationId);
+        if (!organization && ContextInstance.optional?.organization && ContextInstance.optional?.organization.id === this.registration.organizationId) {
+            return Context.organization!;
+        }
         if (!organization) {
-            throw new Error('Organization not found for registration');
+            throw new Error('Organization not found for registration ' + this.registration.id);
         }
 
         return organization;