@stamhoofd/backend 2.121.0 → 2.122.0

package/src/endpoints/organization/dashboard/mollie/ConnectMollieEndpoint.ts

@@ -1,9 +1,9 @@
-import type { Decoder} from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { MollieToken } from '@stamhoofd/models';
-import type { Organization as OrganizationStruct} from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
@@ -48,9 +48,9 @@ export class ConnectMollieEndpoint extends Endpoint<Params, Query, Body, Respons
         }
 
         const mollieToken = await MollieToken.create(organization, request.body.code);
-        const service = await MollieService.create({sellingOrganization: organization})
+        const service = await MollieService.create({ sellingOrganization: organization });
         if (service) {
-            await service.setupOnboarding()
+            await service.setupOnboarding();
 
             // Check settlements after linking (shouldn't block)
             checkMollieSettlementsFor(mollieToken.accessToken, true).catch(console.error);

package/src/endpoints/organization/dashboard/mollie/DisconnectMollieEndpoint.ts

@@ -1,7 +1,7 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { MollieToken } from '@stamhoofd/models';
-import type { Organization as OrganizationStruct} from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';

package/src/endpoints/organization/dashboard/mollie/GetMollieDashboardEndpoint.ts

@@ -1,15 +1,15 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
 import { MollieToken } from '@stamhoofd/models';
 import { PermissionLevel } from '@stamhoofd/structures';
-
+import { GetMollieDashboardResponse } from '@stamhoofd/structures/endpoints/GetMollieDashboardResponse.js';
 import { Context } from '../../../../helpers/Context.js';
 
 type Params = Record<string, never>;
 type Body = undefined;
 type Query = undefined;
-type ResponseBody = string;
+type ResponseBody = GetMollieDashboardResponse;
 
 export class GetMollieDashboardEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     protected doesMatch(request: Request): [true, Params] | [false] {
@@ -46,11 +46,11 @@ export class GetMollieDashboardEndpoint extends Endpoint<Params, Query, Body, Re
         try {
             const url = await mollie.getOnboardingLink() as string;
 
-            const response = new Response(url);
-            response.headers['Content-Type'] = 'text/plain';
+            const response = new Response(GetMollieDashboardResponse.create({
+                url,
+            }));
             return response;
-        }
-        catch (e) {
+        } catch (e) {
             if (isSimpleErrors(e) || isSimpleError(e)) {
                 throw e;
             }

package/src/endpoints/organization/dashboard/nolt/CreateNoltTokenEndpoint.ts

@@ -1,5 +1,5 @@
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import jwt from 'jsonwebtoken';
 

package/src/endpoints/organization/dashboard/organization/GetOrganizationArchivedGroups.ts

@@ -1,8 +1,8 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Group, Token } from '@stamhoofd/models';
-import type { Group as GroupStruct} from '@stamhoofd/structures';
+import type { Group as GroupStruct } from '@stamhoofd/structures';
 import { GroupStatus } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';

package/src/endpoints/organization/dashboard/organization/GetOrganizationDeletedGroups.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Group } from '@stamhoofd/models';
 import type { Group as GroupStruct } from '@stamhoofd/structures';

package/src/endpoints/organization/dashboard/organization/GetUitpasClientIdEndpoint.ts

@@ -1,4 +1,4 @@
-import type { Request} from '@simonbackx/simple-endpoints';
+import type { Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { UitpasGetClientIdResponse } from '@stamhoofd/structures';
 

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.test.ts

@@ -1,9 +1,9 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, User, Webshop} from '@stamhoofd/models';
+import type { Organization, User, Webshop } from '@stamhoofd/models';
 import { GroupFactory, OrganizationFactory, OrganizationRegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory, WebshopFactory } from '@stamhoofd/models';
 import { AccessRight, MemberResponsibility, OrganizationPrivateMetaData, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PermissionLevel, PermissionRoleDetailed, PermissionRoleForResponsibility, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 
-import type { AutoEncoderPatchType, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray, PatchMap } from '@simonbackx/simple-encoding';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.ts

@@ -17,6 +17,8 @@ import { SetupStepUpdater } from '../../../../helpers/SetupStepUpdater.js';
 import { TagHelper } from '../../../../helpers/TagHelper.js';
 import { ViesHelper } from '../../../../helpers/ViesHelper.js';
 import { UitpasService } from '../../../../services/uitpas/UitpasService.js';
+import { VATService } from '../../../../services/VATService.js';
+import { isAbortedError, isCanceledError } from '@stamhoofd/queues';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -71,6 +73,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
         const errors = new SimpleErrors();
         let shouldUpdateSetupSteps = false;
+        let shouldUpdateVATExcempt = false;
         let shouldUpdateUserPermissions = false;
         let updateTags = false;
 
@@ -220,8 +223,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 if (request.body.privateMeta.buckarooSettings !== undefined) {
                     if (request.body.privateMeta.buckarooSettings === null) {
                         organization.privateMeta.buckarooSettings = null;
-                    }
-                    else {
+                    } else {
                         organization.privateMeta.buckarooSettings = organization.privateMeta.buckarooSettings ?? BuckarooSettings.create({});
                         organization.privateMeta.buckarooSettings.patchOrPut(request.body.privateMeta.buckarooSettings);
 
@@ -257,6 +259,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 if (request.body.meta.companies) {
                     await this.validateCompanies(organization, request.body.meta.companies);
                     shouldUpdateSetupSteps = true;
+                    shouldUpdateVATExcempt = true;
                 }
 
                 if (request.body.meta.recordsConfiguration?.recordCategories) {
@@ -429,21 +432,37 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'The period you want to set is already closed',
-                            human: $t('%15i'),
+                            human: $t('%1X8'),
                             field: 'period',
                         });
                     }
 
-                    const maximumStart = 1000 * 60 * 60 * 24 * 31 * 2; // 2 months in advance
-                    if (period.startDate > new Date(Date.now() + maximumStart) && STAMHOOFD.environment !== 'development') {
+                    const struct = period.getBaseStructure();
+                    if (struct.switchDate && struct.switchDate > new Date()) {
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'The period you want to set has not started yet',
-                            human: $t('%15k'),
+                            human: $t('%1ca', { date: Formatter.date(struct.switchDate) }),
                             field: 'period',
                         });
                     }
 
+                    if (period.organizationId === null) {
+                        // Not allowed to return to a period lower than the currently active platform period
+                        const platform = await Platform.getShared();
+                        const platformPeriod = await RegistrationPeriod.getByID(platform.periodId);
+                        if (platformPeriod) {
+                            if (period.startDate < platformPeriod.startDate) {
+                                throw new SimpleError({
+                                    code: 'invalid_field',
+                                    message: 'Cannot return to period with a start date before the currently active platform period',
+                                    human: $t('%1Wt', {}),
+                                    field: 'period',
+                                });
+                            }
+                        }
+                    }
+
                     organization.periodId = period.id;
                     shouldUpdateSetupSteps = true;
                 }
@@ -451,8 +470,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
             // Save the organization
             await organization.save();
-        }
-        else {
+        } else {
             if (request.body.name || request.body.address || request.body.website || request.body.meta?.companies || request.body.meta?.recordsConfiguration || request.body.meta?.registrationPaymentConfiguration) {
                 throw new SimpleError({
                     code: 'permission_denied',
@@ -614,12 +632,29 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
             await SetupStepUpdater.updateForOrganization(organization);
         }
 
+        if (shouldUpdateVATExcempt) {
+            const platform = await Platform.getShared();
+            const sellingOrganizationId = platform.membershipOrganizationId;
+            if (sellingOrganizationId) {
+                const sellingOrganization = await Organization.getByID(sellingOrganizationId, true);
+
+                await VATService.updateVATExcempt({
+                    organization,
+                    sellingOrganization,
+                });
+            }
+        }
+
         if (shouldUpdateUserPermissions) {
             await MemberUserSyncer.updatePermissionsForOrganization(organization.id);
         }
 
         if (updateTags) {
-            await TagHelper.updateOrganizations();
+            try {
+                await TagHelper.updateOrganizations();
+            } catch (e) {
+                if (!isAbortedError(e) && !isCanceledError(e)) throw e;
+            }
         }
         const struct = await AuthenticatedStructures.organization(organization);
         return new Response(struct);
@@ -632,7 +667,11 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 const original = organization.meta.companies.find(c => c.id === patch.id);
 
                 if (!original) {
-                    throw new Error('Could not find company');
+                    throw new SimpleError({
+                        code: 'not_found',
+                        message: 'Company not found',
+                        human: $t('%1cw'),
+                    });
                 }
 
                 // Changed VAT number
@@ -655,8 +694,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
                 await ViesHelper.checkCompany(put, put);
             }
-        }
-        else {
+        } else {
             if (companies.length > 5) {
                 throw new SimpleError({
                     code: 'invalid_field',

package/src/endpoints/organization/dashboard/organization/SearchUitpasOrganizersEndpoint.ts

@@ -1,8 +1,8 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { UitpasService } from '../../../../services/uitpas/UitpasService.js';
 import type { UitpasOrganizersResponse } from '@stamhoofd/structures';
-import type { Decoder} from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { Context } from '../../../../helpers/Context.js';
 

package/src/endpoints/organization/dashboard/organization/SetOrganizationDomainEndpoint.ts

@@ -104,8 +104,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                     // We set a custom domainname for webshops already
                     // This is not used at this moment
                     organization.privateMeta.mailFromDomain = defaultFromDomain;
-                }
-                else {
+                } else {
                     // CNAME domain: for SPF + MX + A record
                     organization.privateMeta.mailFromDomain = organization.privateMeta.pendingRegisterDomain;
                 }
@@ -126,8 +125,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                             value: (STAMHOOFD.domains.registrationCname[organization.address.country] ?? STAMHOOFD.domains.registrationCname['']) + '.',
                         }));
                     }
-                }
-                else {
+                } else {
                     organization.privateMeta.dnsRecords.push(DNSRecord.create({
                         type: DNSRecordType.CNAME,
                         name: organization.privateMeta.mailFromDomain + '.',
@@ -149,8 +147,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
 
                     organization.serverMeta.privateDKIMKey = priv;
                     organization.serverMeta.publicDKIMKey = pub;
-                }
-                else {
+                } else {
                     priv = organization.serverMeta.privateDKIMKey;
                     pub = organization.serverMeta.publicDKIMKey;
                 }
@@ -170,8 +167,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                     description: $t(`%Ee`),
                     optional: true,
                 }));
-            }
-            else {
+            } else {
                 if (oldMailDomain) {
                     organization.deleteAWSMailIdenitity(oldMailDomain).catch(console.error);
                 }
@@ -189,8 +185,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
             }
 
             await organization.save();
-        }
-        else {
+        } else {
             // Validate DNS-records if not empty
             console.log('Validating domains');
             await organization.updateDNSRecords();

package/src/endpoints/organization/dashboard/organization/SetUitpasClientCredentialsEndpoint.ts

@@ -1,5 +1,5 @@
 import type { AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { UitpasClientCredentialsStatus, UitpasClientIdAndSecret, UitpasSetClientCredentialsResponse } from '@stamhoofd/structures';

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

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 

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

@@ -1,10 +1,10 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Payment } from '@stamhoofd/models';
 import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import type { CountFilteredRequest, PaymentGeneral, StamhoofdFilter} from '@stamhoofd/structures';
+import type { CountFilteredRequest, PaymentGeneral, StamhoofdFilter } from '@stamhoofd/structures';
 import { LimitedFilteredRequest, PaginatedResponse, TransferSettings, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
@@ -167,8 +167,7 @@ export class GetPaymentsEndpoint extends Endpoint<Params, Query, Body, ResponseB
 
         try {
             data = await query.fetch();
-        }
-        catch (error) {
+        } catch (error) {
             if (error.message.includes('ER_QUERY_TIMEOUT')) {
                 throw new SimpleError({
                     code: 'timeout',

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

@@ -1,6 +1,6 @@
-import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArrayDecoder, patchObject, StringDecoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { BalanceItem, BalanceItemPayment, Payment, User } from '@stamhoofd/models';
@@ -40,7 +40,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOrganizationScope();
-        await Context.authenticate();
+        const { user } = await Context.authenticate();
 
         if (!await Context.auth.hasSomeAccess(organization.id)) {
             throw Context.auth.error();
@@ -74,6 +74,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
             payment.status = PaymentStatus.Created;
             payment.method = put.method;
             payment.customer = put.customer;
+            payment.adminUserId = user.id;
 
             const payingOrganizationId = put.payingOrganizationId ?? put.payingOrganization?.id ?? null;
 
@@ -81,8 +82,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                 if (Context.auth.hasSomePlatformAccess()) {
                     if (await Context.auth.hasFullAccess(payingOrganizationId, PermissionLevel.Full)) {
                         payment.payingOrganizationId = payingOrganizationId;
-                    }
-                    else {
+                    } else {
                         // silently ignore
                     }
                 }
@@ -233,8 +233,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                     payment.paidAt = put.paidAt;
                     await payment.save();
                 }
-            }
-            else {
+            } else {
                 for (const balanceItem of balanceItems) {
                     await BalanceItemService.markUpdated(balanceItem, payment, organization);
                 }
@@ -255,8 +254,18 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                     });
                 }
 
-                if (patch.method || patch.paidAt !== undefined || patch.status !== undefined) {
-                    if (payment.method && ![PaymentMethod.Unknown, PaymentMethod.Transfer, PaymentMethod.PointOfSale].includes(payment.method)) {
+                if (patch.method || patch.paidAt !== undefined) {
+                    if (![PaymentMethod.Unknown, PaymentMethod.Transfer, PaymentMethod.PointOfSale].includes(payment.method)) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid payment method',
+                            human: $t(`%Ex`),
+                        });
+                    }
+                }
+
+                if (patch.status !== undefined && patch.status !== payment.status) {
+                    if (!payment.canChangeStatus) {
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'Invalid payment method',
@@ -268,8 +277,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                 if (patch.transferSettings && payment.method == PaymentMethod.Transfer) {
                     if (patch.transferSettings.isPut()) {
                         payment.transferSettings = patch.transferSettings;
-                    }
-                    else if (payment.transferSettings !== null) {
+                    } else if (payment.transferSettings !== null) {
                         payment.transferSettings = payment.transferSettings.patch(patch.transferSettings);
                     }
                 }
@@ -311,8 +319,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                     if (Context.auth.hasSomePlatformAccess()) {
                         if (await Context.auth.hasFullAccess(payingOrganizationId, PermissionLevel.Full)) {
                             payment.payingOrganizationId = payingOrganizationId;
-                        }
-                        else {
+                        } else {
                             // silently ignore
                         }
                     }
@@ -335,7 +342,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
 
                 await payment.save();
 
-                if (patch.status) {
+                if (patch.status && patch.status !== payment.status) {
                     await PaymentService.handlePaymentStatusUpdate(payment, organization, patch.status);
                 }
 

package/src/endpoints/organization/dashboard/receivable-balances/ChargeReceivableBalancesEndpoint.ts

@@ -1,12 +1,12 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
-import {  CountFilteredRequest, CountResponse, PaymentCustomer, PaymentMethod, PermissionLevel, ReceivableBalanceType } from '@stamhoofd/structures';
+import { CountFilteredRequest, CountResponse, PaymentCustomer, PaymentMethod, PermissionLevel, ReceivableBalanceType } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context.js';
 import { GetReceivableBalancesEndpoint } from './GetReceivableBalancesEndpoint.js';
-import type { BalanceItem} from '@stamhoofd/models';
-import { Organization, User} from '@stamhoofd/models';
+import type { BalanceItem } from '@stamhoofd/models';
+import { Organization, User } from '@stamhoofd/models';
 import { CachedBalance } from '@stamhoofd/models';
 import { PaymentService } from '../../../../services/PaymentService.js';
 import { SimpleError } from '@simonbackx/simple-errors';
@@ -36,35 +36,41 @@ export class ChargeReceivableBalancesEndpoint extends Endpoint<Params, Query, Bo
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const sellingOrganization = await Context.setOrganizationScope();
-        await Context.authenticate();
+        const { user } = await Context.authenticate();
         const query = await GetReceivableBalancesEndpoint.buildQuery(request.query);
 
         for await (const cachedBalance of query.all()) {
             if (cachedBalance.organizationId !== sellingOrganization.id) {
                 throw new SimpleError({
                     code: 'wrong_organization',
-                    message: 'Cannot charge a cached balance from a different organization'
-                })
+                    message: 'Cannot charge a cached balance from a different organization',
+                });
             }
             // todo
             const items = await CachedBalance.balanceForObjects(cachedBalance.organizationId, [cachedBalance.objectId], cachedBalance.objectType);
 
             if (items.length === 0) {
-                console.log('Nothing to charge for', cachedBalance.id)
+                console.log('Nothing to charge for', cachedBalance.id);
                 continue;
             }
 
             const map: Map<BalanceItem, number> = new Map();
+            let total = 0;
             for (const i of items) {
-                map.set(i, i.priceOpen)
+                map.set(i, i.priceOpen);
+                total += i.priceOpen;
             }
+            if (total <= 0) {
+                continue;
+            }
+
             let payingOrganization: Organization | null = null;
-            let user: User | null = null;
+            let customerUser: User | null = null;
             if (cachedBalance.objectType === ReceivableBalanceType.organization) {
                 const p = await Organization.getByID(cachedBalance.objectId);
                 if (!p || !(await Context.auth.hasFullAccess(p))) {
-                    console.error('Unexpected missing paying organization id', cachedBalance)
-                    continue
+                    console.error('Unexpected missing paying organization id', cachedBalance);
+                    continue;
                 }
                 payingOrganization = p;
             }
@@ -72,34 +78,34 @@ export class ChargeReceivableBalancesEndpoint extends Endpoint<Params, Query, Bo
             if (cachedBalance.objectType === ReceivableBalanceType.user || cachedBalance.objectType === ReceivableBalanceType.userWithoutMembers) {
                 const p = await User.getByID(cachedBalance.objectId);
                 if (!p || !(Context.auth.checkScope(p.organizationId))) {
-                    console.error('Unexpected missing user id', cachedBalance)
-                    continue
+                    console.error('Unexpected missing customer user id', cachedBalance);
+                    continue;
                 }
-                user = p
+                customerUser = p;
             }
 
             const mandates = await PaymentMandateService.getMandates({
                 sellingOrganization,
-                user,
-                payingOrganization
+                user: customerUser,
+                payingOrganization,
             });
 
-            const mandate = mandates.find(m => m.isDefault)
+            const mandate = mandates.find(m => m.isDefault);
 
             if (!mandate) {
                 // Not possible
-                console.error('No mandates found for', cachedBalance.id)
+                console.error('No mandates found for', cachedBalance.id);
                 continue;
             }
 
-            const customerUser = user ?? (payingOrganization ? (await payingOrganization.getFullAdmins())[0] : null)
+            customerUser = customerUser ?? (payingOrganization ? (await payingOrganization.getFullAdmins())[0] : null);
             const customer = PaymentCustomer.create({
                 firstName: customerUser?.firstName,
                 lastName: customerUser?.lastName,
                 email: customerUser?.email ?? (payingOrganization ? (await payingOrganization.getReplyEmails())[0].email : null),
-                company: payingOrganization?.defaultCompanies[0]
-            })
-            
+                company: payingOrganization?.defaultCompanies[0],
+            });
+
             await PaymentService.createPayment({
                 balanceItems: map,
                 checkout: {
@@ -107,21 +113,22 @@ export class ChargeReceivableBalancesEndpoint extends Endpoint<Params, Query, Bo
                     totalPrice: null,
                     customer,
                     cancelUrl: null,
-                    redirectUrl: null
+                    redirectUrl: null,
                 },
-                user,
+                user: customerUser,
+                adminUserId: user.id,
                 organization: sellingOrganization,
                 payingOrganization,
                 serviceFeeType: 'system',
                 createMandate: null,
                 useMandate: mandate,
                 paymentConfiguration: sellingOrganization.meta.registrationPaymentConfiguration,
-                privatePaymentConfiguration: sellingOrganization.privateMeta.registrationPaymentConfiguration
-            })
+                privatePaymentConfiguration: sellingOrganization.privateMeta.registrationPaymentConfiguration,
+            });
         }
 
         // Make sure the user can refresh data and see the updated cached amounts
-        await BalanceItemService.flushCaches(sellingOrganization.id)
+        await BalanceItemService.flushCaches(sellingOrganization.id);
         return new Response(undefined, 201);
     }
 }

package/src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalanceEndpoint.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { DetailedReceivableBalance, PaymentStatus, ReceivableBalanceType } from '@stamhoofd/structures';
 
@@ -113,8 +113,7 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
 
                 if (memberIds.length === 0) {
                     q.where(SQL.column(BalanceItem.table, 'userId'), request.params.id);
-                }
-                else {
+                } else {
                     q.where(
                         SQL.where(SQL.column(BalanceItem.table, 'userId'), request.params.id)
                             .or(SQL.column(BalanceItem.table, 'memberId'), memberIds),

package/src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalancesCountEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 

package/src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalancesEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { CachedBalance } from '@stamhoofd/models';

package/src/endpoints/organization/dashboard/registration-periods/GetOrganizationRegistrationPeriodsEndpoint.test.ts

@@ -1,5 +1,5 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod} from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod } from '@stamhoofd/models';
 import { GroupFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { GroupType, LimitedFilteredRequest, PermissionLevel, Permissions } from '@stamhoofd/structures';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';