@stamhoofd/backend 2.61.1 → 2.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.61.1",
+    "version": "2.63.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -34,17 +34,17 @@
         "@bwip-js/node": "^4.5.1",
         "@mollie/api-client": "3.7.0",
         "@simonbackx/simple-database": "1.27.0",
-        "@simonbackx/simple-encoding": "2.18.0",
+        "@simonbackx/simple-encoding": "2.19.0",
         "@simonbackx/simple-endpoints": "1.15.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.61.1",
-        "@stamhoofd/backend-middleware": "2.61.1",
-        "@stamhoofd/email": "2.61.1",
-        "@stamhoofd/models": "2.61.1",
-        "@stamhoofd/queues": "2.61.1",
-        "@stamhoofd/sql": "2.61.1",
-        "@stamhoofd/structures": "2.61.1",
-        "@stamhoofd/utility": "2.61.1",
+        "@stamhoofd/backend-i18n": "2.63.0",
+        "@stamhoofd/backend-middleware": "2.63.0",
+        "@stamhoofd/email": "2.63.0",
+        "@stamhoofd/models": "2.63.0",
+        "@stamhoofd/queues": "2.63.0",
+        "@stamhoofd/sql": "2.63.0",
+        "@stamhoofd/structures": "2.63.0",
+        "@stamhoofd/utility": "2.63.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "f092f61cf3641682fb5a5a9cb50c7977b1e350ef"
+    "gitHead": "0dd71a1869c5931dcf844dea1ecd2167819dc5c6"
 }

package/src/audit-logs/PaymentLogger.ts

@@ -26,7 +26,7 @@ export const PaymentLogger = new ModelLogger(Payment, {
     },
 
     createReplacements(model, options) {
-        let name = `${PaymentMethodHelper.getPaymentName(model.method)}`;
+        let name = `${PaymentMethodHelper.getPaymentName(model.method, model.type)}`;
 
         if (model.customer?.dynamicName) {
             name += ` van ${model.customer.dynamicName}`;

package/src/email-recipient-loaders/receivable-balances.ts

@@ -18,6 +18,11 @@ async function fetch(query: LimitedFilteredRequest, subfilter: StamhoofdFilter |
                     email,
                     replacements: [
                         Replacement.create({
+                            token: 'objectName',
+                            value: balance.object.name,
+                        }),
+                        Replacement.create({
+                            // Deprecated: for backwards compatibility
                             token: 'organizationName',
                             value: balance.object.name,
                         }),

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

@@ -5,7 +5,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email } from '@stamhoofd/email';
 import { BalanceItem, BalanceItemPayment, Group, Member, MemberWithRegistrations, MolliePayment, MollieToken, Organization, PayconiqPayment, Payment, Platform, RateLimiter, Registration, User } from '@stamhoofd/models';
-import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BalanceItemWithPayments, IDRegisterCheckout, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, PermissionLevel, PlatformFamily, PlatformMember, RegisterItem, RegisterResponse, Version } from '@stamhoofd/structures';
+import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BalanceItem as BalanceItemStruct, IDRegisterCheckout, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, PermissionLevel, PlatformFamily, PlatformMember, RegisterItem, RegisterResponse, Version, PaymentType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
@@ -104,7 +104,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
         // Validate balance items (can only happen serverside)
         const balanceItemIds = request.body.cart.balanceItems.map(i => i.item.id);
-        let memberBalanceItemsStructs: BalanceItemWithPayments[] = [];
+        let memberBalanceItemsStructs: BalanceItemStruct[] = [];
         let balanceItemsModels: BalanceItem[] = [];
         if (balanceItemIds.length > 0) {
             balanceItemsModels = await BalanceItem.where({ id: { sign: 'IN', value: balanceItemIds }, organizationId: organization.id });
@@ -114,7 +114,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                     message: 'Oeps, één of meerdere openstaande bedragen in jouw winkelmandje zijn aangepast. Herlaad de pagina en probeer opnieuw.',
                 });
             }
-            memberBalanceItemsStructs = await BalanceItem.getStructureWithPayments(balanceItemsModels);
+            memberBalanceItemsStructs = balanceItemsModels.map(i => i.getStructure());
         }
 
         const memberIds = Formatter.uniqueArray(
@@ -429,7 +429,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 balanceItem2.memberId = registration.memberId;
 
                 // If the paying organization hasn't paid yet, this should be hidden and move to pending as soon as the paying organization has paid
-                balanceItem2.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+                balanceItem2.status = BalanceItemStatus.Hidden;
                 await balanceItem2.save();
 
                 // do not add to createdBalanceItems array because we don't want to add this to the payment if we create a payment
@@ -440,7 +440,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 balanceItem.userId = user.id;
             }
 
-            balanceItem.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+            balanceItem.status = BalanceItemStatus.Hidden;
             balanceItem.pricePaid = 0;
 
             // Connect the 'pay back' balance item to this balance item. As soon as this balance item is paid, we'll mark the other one as pending so the outstanding balance for the member increases
@@ -554,7 +554,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             if (oldestMember) {
                 balanceItem.memberId = oldestMember.id;
             }
-            balanceItem.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+            balanceItem.status = BalanceItemStatus.Hidden;
             await balanceItem.save();
             createdBalanceItems.push(balanceItem);
         }
@@ -579,7 +579,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 }
             }
 
-            balanceItem.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+            balanceItem.status = BalanceItemStatus.Hidden;
             await balanceItem.save();
 
             createdBalanceItems.push(balanceItem);
@@ -674,6 +674,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
         // Calculate total price to pay
         let totalPrice = 0;
         const payMembers: MemberWithRegistrations[] = [];
+        let hasNegative = false;
 
         for (const [balanceItem, price] of balanceItems) {
             if (organization.id !== balanceItem.organizationId) {
@@ -694,6 +695,10 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 });
             }
 
+            if (price < 0) {
+                hasNegative = true;
+            }
+
             totalPrice += price;
 
             if (price > 0 && balanceItem.memberId) {
@@ -709,27 +714,33 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
         }
 
         if (totalPrice < 0) {
-            // No payment needed: the outstanding balance will be negative and can be used in the future
-            return;
-            // throw new SimpleError({
-            //     code: "empty_data",
-            //     message: "Oeps! De totaalprijs is negatief."
-            // })
+            // todo: try to make it non-negative by reducing some balance items
+            throw new SimpleError({
+                code: 'empty_data',
+                message: 'Oeps! De totaalprijs is negatief.',
+            });
         }
+        const payment = new Payment();
+        payment.method = checkout.paymentMethod ?? PaymentMethod.Unknown;
 
         if (totalPrice === 0) {
-            return;
-        }
+            if (balanceItems.size === 0) {
+                return;
+            }
+            // Create an egalizing payment
+            payment.method = PaymentMethod.Unknown;
 
-        if (!checkout.paymentMethod || checkout.paymentMethod === PaymentMethod.Unknown) {
+            if (hasNegative) {
+                payment.type = PaymentType.Reallocation;
+            }
+        }
+        else if (payment.method === PaymentMethod.Unknown) {
             throw new SimpleError({
                 code: 'invalid_data',
                 message: 'Oeps, je hebt geen betaalmethode geselecteerd. Selecteer een betaalmethode en probeer opnieuw.',
             });
         }
 
-        const payment = new Payment();
-
         // Who will receive this money?
         payment.organizationId = organization.id;
 
@@ -793,11 +804,16 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             }
         }
 
-        payment.method = checkout.paymentMethod;
         payment.status = PaymentStatus.Created;
+        payment.paidAt = null;
         payment.price = totalPrice;
 
-        if (payment.method == PaymentMethod.Transfer) {
+        if (totalPrice === 0) {
+            payment.status = PaymentStatus.Succeeded;
+            payment.paidAt = new Date();
+        }
+
+        if (payment.method === PaymentMethod.Transfer) {
             // remark: we cannot add the lastnames, these will get added in the frontend when it is decrypted
             payment.transferSettings = organization.mappedTransferSettings;
 
@@ -821,7 +837,6 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 },
             );
         }
-        payment.paidAt = null;
 
         // Determine the payment provider
         // Throws if invalid
@@ -861,7 +876,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 console.error(e);
             }
         }
-        else if (payment.method !== PaymentMethod.PointOfSale) {
+        else if (payment.method !== PaymentMethod.PointOfSale && payment.method !== PaymentMethod.Unknown) {
             if (!checkout.redirectUrl || !checkout.cancelUrl) {
                 throw new Error('Should have been caught earlier');
             }

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

@@ -43,10 +43,6 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
         const returnedModels: BalanceItem[] = [];
         const updateOutstandingBalance: BalanceItem[] = [];
 
-        // Keep track of updates
-        const memberIds: string[] = [];
-        const registrationIds: string[] = [];
-
         await QueueHandler.schedule('balance-item-update/' + organization.id, async () => {
             for (const { put } of request.body.getPuts()) {
                 // Create a new balance item
@@ -58,7 +54,8 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
                 model.amount = put.amount;
                 model.organizationId = organization.id;
                 model.createdAt = put.createdAt;
-                model.status = put.status === BalanceItemStatus.Hidden ? BalanceItemStatus.Hidden : BalanceItemStatus.Pending;
+                model.dueAt = put.dueAt;
+                model.status = put.status === BalanceItemStatus.Hidden ? BalanceItemStatus.Hidden : BalanceItemStatus.Due;
 
                 if (put.userId) {
                     model.userId = (await this.validateUserId(model, put.userId)).id;
@@ -66,10 +63,43 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
 
                 if (put.memberId) {
                     model.memberId = (await this.validateMemberId(put.memberId)).id;
-                    memberIds.push(model.memberId);
                 }
 
-                if (!model.userId && !model.memberId) {
+                if (put.payingOrganizationId) {
+                    // Not allowed if not full admin
+                    if (!Context.auth.hasPlatformFullAccess()) {
+                        throw Context.auth.error('Je moet volledige platform beheerder zijn om schulden tussen verenigingen te wijzigen of toe te voegen');
+                    }
+                    if (put.payingOrganizationId === model.organizationId) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'payingOrganizationId cannot be the same as organizationId',
+                            human: 'Dit is een ongeldige situatie. Een schuld moet tussen verschillende verenigingen zijn.',
+                            field: 'payingOrganizationId',
+                        });
+                    }
+
+                    model.payingOrganizationId = put.payingOrganizationId;
+                }
+
+                if (model.dueAt && model.price < 0) {
+                    throw new SimpleError({
+                        code: 'invalid_price',
+                        message: 'Cannot create negative balance in the future',
+                        human: 'Het is niet mogelijk om een negatief openstaand bedrag toe te voegen in de toekomst',
+                    });
+                }
+
+                if (model.createdAt > new Date()) {
+                    throw new SimpleError({
+                        code: 'invalid_field',
+                        message: 'createdAt cannot be in the future',
+                        human: 'De datum kan niet in de toekomst liggen',
+                        field: 'createdAt',
+                    });
+                }
+
+                if (!model.userId && !model.memberId && !model.payingOrganizationId) {
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'No user or member provided',
@@ -93,39 +123,53 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
                     });
                 }
 
-                if (patch.unitPrice !== undefined) {
-                    // throw new SimpleError({
-                    //    code: 'invalid_field',
-                    //    message: 'You cannot change the unit price of a balance item',
-                    //    human: 'Het is niet mogelijk om de eenheidsprijs van een openstaande schuld te wijzigen. Je kan de openstaande schuld verwijderen en opnieuw aanmaken indien noodzakelijk.',
-                    // });
-                }
+                if (patch.payingOrganizationId !== undefined) {
+                    // Not allowed if not full admin
+                    if (!Context.auth.hasPlatformFullAccess()) {
+                        throw Context.auth.error('Je moet volledige platform beheerder zijn om schulden tussen verenigingen te wijzigen of toe te voegen');
+                    }
+                    if (patch.payingOrganizationId === model.organizationId) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'payingOrganizationId cannot be the same as organizationId',
+                            human: 'Dit is een ongeldige situatie. Een schuld moet tussen verschillende verenigingen zijn.',
+                            field: 'payingOrganizationId',
+                        });
+                    }
 
-                // Check permissions
-                if (model.memberId) {
-                    // Update old
-                    memberIds.push(model.memberId);
+                    model.payingOrganizationId = patch.payingOrganizationId;
                 }
 
                 if (patch.memberId) {
                     model.memberId = (await this.validateMemberId(patch.memberId)).id;
-
-                    // Update new
-                    memberIds.push(model.memberId);
-                }
-
-                if (model.registrationId) {
-                    // Update old
-                    registrationIds.push(model.registrationId);
                 }
 
                 if (patch.createdAt) {
                     model.createdAt = patch.createdAt;
+
+                    if (model.createdAt > new Date()) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'createdAt cannot be in the future',
+                            human: 'De datum kan niet in de toekomst liggen',
+                            field: 'createdAt',
+                        });
+                    }
                 }
 
                 model.description = patch.description ?? model.description;
                 model.unitPrice = patch.unitPrice ?? model.unitPrice;
                 model.amount = patch.amount ?? model.amount;
+                model.dueAt = patch.dueAt === undefined ? model.dueAt : patch.dueAt;
+
+                if ((patch.dueAt !== undefined || patch.unitPrice !== undefined) && model.dueAt && model.price < 0) {
+                    throw new SimpleError({
+                        code: 'invalid_price',
+                        message: 'Cannot create negative balance in the future',
+                        human: 'Het is niet mogelijk om een negatief openstaand bedrag toe te voegen in de toekomst',
+                        field: 'dueAt',
+                    });
+                }
 
                 if (model.orderId) {
                     // Not allowed to change this
@@ -142,13 +186,21 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
                     }
                 }
                 else if (patch.status) {
-                    model.status = model.pricePaid >= model.price ? BalanceItemStatus.Paid : BalanceItemStatus.Pending;
+                    model.status = patch.status;
+                }
+
+                if (!model.userId && !model.memberId && !model.payingOrganizationId) {
+                    throw new SimpleError({
+                        code: 'invalid_field',
+                        message: 'No user or member provided',
+                        field: 'userId',
+                    });
                 }
 
                 await model.save();
                 returnedModels.push(model);
 
-                if (patch.unitPrice || patch.amount || patch.status) {
+                if (patch.unitPrice || patch.amount || patch.status || patch.dueAt !== undefined) {
                     updateOutstandingBalance.push(model);
                 }
             }

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

@@ -1,15 +1,14 @@
 import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, BalanceItemPayment, Payment, Token } from '@stamhoofd/models';
+import { BalanceItem, BalanceItemPayment, Payment } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { Payment as PaymentStruct, PaymentGeneral, PaymentMethod, PaymentStatus, PermissionLevel } from '@stamhoofd/structures';
+import { PaymentGeneral, PaymentMethod, PaymentStatus, Payment as PaymentStruct, PaymentType, PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
-import { ExchangePaymentEndpoint } from '../../shared/ExchangePaymentEndpoint';
-import { PaymentService } from '../../../../services/PaymentService';
 import { BalanceItemService } from '../../../../services/BalanceItemService';
+import { PaymentService } from '../../../../services/PaymentService';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -49,11 +48,11 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
         // Modify payments
         for (const { put } of request.body.getPuts()) {
             // Create a new payment
-            if (put.balanceItemPayments.length == 0) {
+            if (put.balanceItemPayments.length === 0) {
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'You need to add at least one balance item payment',
-                    human: 'Een betaling moet ten minste één afrekening bevatten voor een openstaande rekening.',
+                    human: 'Een betaling moet ten minste één item bestaan',
                     field: 'balanceItemPayments',
                 });
             }
@@ -72,8 +71,9 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
             payment.status = PaymentStatus.Created;
             payment.method = put.method;
             payment.customer = put.customer;
+            payment.type = put.type;
 
-            if (payment.method == PaymentMethod.Transfer) {
+            if (payment.method === PaymentMethod.Transfer) {
                 if (!put.transferSettings) {
                     throw new SimpleError({
                         code: 'invalid_field',
@@ -112,7 +112,11 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                 balanceItemPayment.organizationId = organization.id;
                 balanceItemPayment.balanceItemId = balanceItem.id;
                 balanceItemPayment.price = item.price;
-                balanceItemPayments.push(balanceItemPayment);
+
+                if (item.price !== 0) {
+                    // Otherwise skip
+                    balanceItemPayments.push(balanceItemPayment);
+                }
             }
 
             // Check permissions
@@ -122,17 +126,55 @@ 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;
 
-            if (totalPrice !== put.price) {
-                throw new SimpleError({
-                    code: 'invalid_field',
-                    message: "Total price doesn't match",
-                    human: 'De totale prijs komt niet overeen met de som van de afrekeningen',
-                    field: 'price',
-                });
-            }
+            switch (payment.type) {
+                case PaymentType.Payment: {
+                    if (totalPrice <= 0) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'The price should be greater than zero',
+                            human: 'Het totaalbedrag moet groter zijn dan 0 euro',
+                            field: 'price',
+                        });
+                    }
+                    break;
+                }
 
-            payment.price = totalPrice;
+                case PaymentType.Chargeback:
+                case PaymentType.Refund: {
+                    if (totalPrice >= 0) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'The price should be smaller than zero',
+                            human: 'Het totaalbedrag moet kleiner zijn dan 0 euro',
+                            field: 'price',
+                        });
+                    }
+                    break;
+                }
+
+                case PaymentType.Reallocation:
+                {
+                    if (totalPrice !== 0) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Total price should be zero',
+                            human: 'Het totaalbedrag moet 0 euro zijn',
+                            field: 'price',
+                        });
+                    }
+
+                    if (balanceItemPayments.length < 2) {
+                        throw new SimpleError({
+                            code: 'missing_items',
+                            message: 'At least two items are required for a reallocation',
+                            human: 'Er moeten minstens twee items in een verrekening zitten',
+                        });
+                    }
+                    break;
+                }
+            }
 
             // Save payment
             await payment.save();

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

@@ -44,10 +44,19 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
             case ReceivableBalanceType.organization: {
                 paymentModels = await Payment.select()
                     .where('organizationId', organization.id)
-                    .where('payingOrganizationId', request.params.id)
                     .andWhere(
                         SQL.whereNot('status', PaymentStatus.Failed),
                     )
+                    .join(
+                        SQL.join(BalanceItemPayment.table)
+                            .where(SQL.column(BalanceItemPayment.table, 'paymentId'), SQL.column(Payment.table, 'id')),
+                    )
+                    .join(
+                        SQL.join(BalanceItem.table)
+                            .where(SQL.column(BalanceItemPayment.table, 'balanceItemId'), SQL.column(BalanceItem.table, 'id')),
+                    )
+                    .where(SQL.column(BalanceItem.table, 'payingOrganizationId'), request.params.id)
+                    .groupBy(SQL.column(Payment.table, 'id'))
                     .fetch();
                 break;
             }
@@ -71,6 +80,26 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
                     .fetch();
                 break;
             }
+
+            case ReceivableBalanceType.user: {
+                paymentModels = await Payment.select()
+                    .where('organizationId', organization.id)
+                    .join(
+                        SQL.join(BalanceItemPayment.table)
+                            .where(SQL.column(BalanceItemPayment.table, 'paymentId'), SQL.column(Payment.table, 'id')),
+                    )
+                    .join(
+                        SQL.join(BalanceItem.table)
+                            .where(SQL.column(BalanceItemPayment.table, 'balanceItemId'), SQL.column(BalanceItem.table, 'id')),
+                    )
+                    .where(SQL.column(BalanceItem.table, 'userId'), request.params.id)
+                    .andWhere(
+                        SQL.whereNot('status', PaymentStatus.Failed),
+                    )
+                    .groupBy(SQL.column(Payment.table, 'id'))
+                    .fetch();
+                break;
+            }
         }
 
         const balanceItems = await BalanceItem.getStructureWithPayments(balanceItemModels);

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

@@ -3,7 +3,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { CachedBalance } from '@stamhoofd/models';
 import { compileToSQLFilter, compileToSQLSorter } from '@stamhoofd/sql';
-import { ReceivableBalance as ReceivableBalanceStruct, CountFilteredRequest, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
+import { ReceivableBalance as ReceivableBalanceStruct, CountFilteredRequest, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter, ReceivableBalanceType } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
@@ -51,9 +51,17 @@ export class GetReceivableBalancesEndpoint extends Endpoint<Params, Query, Body,
             $or: {
                 amount: { $neq: 0 },
                 amountPending: { $neq: 0 },
+                nextDueAt: { $neq: null },
             },
         };
 
+        if (!Context.auth.hasSomePlatformAccess()) {
+            // Cannot see debt between organizations
+            scopeFilter.objectType = {
+                $neq: ReceivableBalanceType.organization,
+            };
+        }
+
         const query = CachedBalance
             .select();
 

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

@@ -1,9 +1,9 @@
 import { ArrayDecoder, AutoEncoderPatchType, Data, Decoder, PatchableArray, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, BalanceItemPayment, Order, Payment, Token, Webshop } from '@stamhoofd/models';
+import { BalanceItem, BalanceItemPayment, Order, Payment, Webshop, WebshopCounter } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, PrivatePayment, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, Webshop as WebshopStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
 import { AuditLogService } from '../../../../services/AuditLogService';
@@ -83,6 +83,8 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
             return new Response([]);
         }
 
+        let clearNumbers = false;
+
         // Need to happen in the queue because we are updating the webshop stock
         const orders = await QueueHandler.schedule('webshop-stock/' + request.params.id, async () => {
             const webshop = await Webshop.getByID(request.params.id);
@@ -167,7 +169,7 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                         balanceItem.description = webshop.meta.name;
                         balanceItem.pricePaid = 0;
                         balanceItem.organizationId = organization.id;
-                        balanceItem.status = BalanceItemStatus.Pending;
+                        balanceItem.status = BalanceItemStatus.Due;
                         balanceItem.relations = new Map([
                             [
                                 BalanceItemRelationType.Webshop,
@@ -244,6 +246,11 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
 
                 if (model.status === OrderStatus.Deleted) {
                     model.data.removePersonalData();
+
+                    if (model.number !== null) {
+                        model.number = Math.floor(Math.random() * 1000000000000) + 1000000000000;
+                    }
+                    clearNumbers = true;
                 }
 
                 if (model.status === OrderStatus.Deleted || model.status === OrderStatus.Canceled) {
@@ -264,13 +271,23 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                     const items = await BalanceItem.where({ orderId: model.id });
                     if (items.length >= 1) {
                         model.markUpdated();
-                        items[0].unitPrice = model.totalToPay;
-                        items[0].description = model.generateBalanceDescription(webshop);
-                        items[0].updateStatus();
-                        await items[0].save();
+
+                        const paidItem = items.find(i => i.status === BalanceItemStatus.Due && i.pricePaid !== 0) ?? items[0];
+
+                        paidItem.unitPrice = model.data.totalPrice;
+                        paidItem.amount = 1;
+
+                        if (model.isDue) {
+                            paidItem.status = BalanceItemStatus.Due;
+                        }
+                        else {
+                            paidItem.status = BalanceItemStatus.Canceled;
+                        }
+                        paidItem.description = model.generateBalanceDescription(webshop);
+                        await paidItem.save();
 
                         // Zero out the other items
-                        const otherItems = items.slice(1);
+                        const otherItems = items.filter(i => i.id !== paidItem.id);
                         await BalanceItem.deleteItems(otherItems);
                     }
                     else if (items.length === 0
@@ -278,11 +295,12 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                         model.markUpdated();
                         const balanceItem = new BalanceItem();
                         balanceItem.orderId = model.id;
-                        balanceItem.unitPrice = model.totalToPay;
+                        balanceItem.unitPrice = model.data.totalPrice;
+                        balanceItem.amount = 1;
+                        balanceItem.status = BalanceItemStatus.Due;
                         balanceItem.description = model.generateBalanceDescription(webshop);
                         balanceItem.pricePaid = 0;
                         balanceItem.organizationId = organization.id;
-                        balanceItem.status = BalanceItemStatus.Pending;
                         await balanceItem.save();
                     }
                 }
@@ -298,6 +316,10 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
             return mapped;
         });
 
+        if (clearNumbers) {
+            WebshopCounter.resetNumbers(request.params.id);
+        }
+
         return new Response(
             await Order.getPrivateStructures(orders),
         );

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

@@ -6,7 +6,7 @@ import { I18n } from '@stamhoofd/backend-i18n';
 import { Email } from '@stamhoofd/email';
 import { BalanceItem, BalanceItemPayment, MolliePayment, MollieToken, Order, PayconiqPayment, Payment, RateLimiter, Webshop, WebshopDiscountCode } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { BalanceItemStatus, Order as OrderStruct, OrderData, OrderResponse, Payment as PaymentStruct, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Version, Webshop as WebshopStruct, WebshopAuthType, BalanceItemType, BalanceItemRelationType, BalanceItemRelation, AuditLogSource } from '@stamhoofd/structures';
+import { BalanceItemStatus, Order as OrderStruct, OrderData, OrderResponse, Payment as PaymentStruct, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Version, Webshop as WebshopStruct, WebshopAuthType, BalanceItemType, BalanceItemRelationType, BalanceItemRelation, AuditLogSource, PaymentCustomer } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { BuckarooHelper } from '../../../helpers/BuckarooHelper';
@@ -169,6 +169,11 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 payment.status = PaymentStatus.Created;
                 payment.price = totalPrice;
                 payment.paidAt = null;
+                payment.customer = PaymentCustomer.create({
+                    firstName: request.body.customer.firstName,
+                    lastName: request.body.customer.lastName,
+                    email: request.body.customer.email,
+                });
 
                 // Determine the payment provider
                 // Throws if invalid
@@ -219,18 +224,18 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 let paymentUrl: string | null = null;
                 const description = webshop.meta.name + ' - ' + payment.id;
 
-                if (payment.method == PaymentMethod.Transfer) {
+                if (payment.method === PaymentMethod.Transfer) {
                     await order.markValid(payment, []);
 
                     if (order.number) {
                         balanceItem.description = order.generateBalanceDescription(webshop);
                     }
 
-                    balanceItem.status = BalanceItemStatus.Pending;
+                    balanceItem.status = BalanceItemStatus.Due;
                     await balanceItem.save();
                     await payment.save();
                 }
-                else if (payment.method == PaymentMethod.PointOfSale) {
+                else if (payment.method === PaymentMethod.PointOfSale) {
                     // Not really paid, but needed to create the tickets if needed
                     await order.markPaid(payment, organization, webshop);
 
@@ -238,7 +243,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                         balanceItem.description = order.generateBalanceDescription(webshop);
                     }
 
-                    balanceItem.status = BalanceItemStatus.Pending;
+                    balanceItem.status = BalanceItemStatus.Due;
                     await balanceItem.save();
                     await payment.save();
                 }

package/src/helpers/AdminPermissionChecker.ts

@@ -211,7 +211,7 @@ export class AdminPermissionChecker {
     }
 
     async canAccessMember(member: MemberWithRegistrations, permissionLevel: PermissionLevel = PermissionLevel.Read) {
-        if (this.isUserManager(member) && permissionLevel !== PermissionLevel.Full) {
+        if (permissionLevel !== PermissionLevel.Full && this.isUserManager(member)) {
             return true;
         }
 
@@ -1107,13 +1107,22 @@ export class AdminPermissionChecker {
         const isSetFinancialSupportTrue = data.details.shouldApplyReducedPrice;
         const isUserManager = this.isUserManager(member);
 
-        if (data.details.securityCode !== undefined) {
+        if (data.details.securityCode !== undefined || data.details.trackingYear !== undefined) {
             const hasFullAccess = await this.canAccessMember(member, PermissionLevel.Full);
 
-            // can only be set to null, and only if can access member with full access
-            if (!hasFullAccess || data.details.securityCode !== null) {
-                // Unset silently
-                data.details.securityCode = undefined;
+            if (!hasFullAccess) {
+                if (data.details.securityCode !== undefined) {
+                    // can only be set to null, and only if can access member with full access
+                    if (data.details.securityCode !== null) {
+                        // Unset silently
+                        data.details.securityCode = undefined;
+                    }
+                }
+
+                if (data.details.trackingYear !== undefined) {
+                    // Unset silently
+                    data.details.trackingYear = undefined;
+                }
             }
         }
 
@@ -1301,7 +1310,7 @@ export class AdminPermissionChecker {
     }
 
     hasSomePlatformAccess(): boolean {
-        return !!this.platformPermissions;
+        return !!this.platformPermissions && !this.platformPermissions.isEmpty;
     }
 
     canManagePlatformAdmins() {

package/src/helpers/AuthenticatedStructures.ts

@@ -40,8 +40,6 @@ export class AuthenticatedStructures {
 
         const includeSettlements = checkPermissions && !!Context.user && !!Context.user.permissions;
 
-        console.log('includeSettlements', includeSettlements);
-
         const { payingOrganizations } = await Payment.loadPayingOrganizations(payments);
 
         return Payment.getGeneralStructureFromRelations({
@@ -576,6 +574,11 @@ export class AuthenticatedStructures {
         ]);
         const members = memberIds.length > 0 ? await Member.getByIDs(...memberIds) : [];
 
+        const userIds = Formatter.uniqueArray([
+            ...balances.filter(b => b.objectType === ReceivableBalanceType.user).map(b => b.objectId),
+        ]);
+        const users = userIds.length > 0 ? await User.getByIDs(...userIds) : [];
+
         const result: ReceivableBalanceStruct[] = [];
         for (const balance of balances) {
             let object = ReceivableBalanceObject.create({
@@ -584,7 +587,7 @@ export class AuthenticatedStructures {
             });
 
             if (balance.objectType === ReceivableBalanceType.organization) {
-                const organization = organizationStructs.find(o => o.id == balance.objectId) ?? null;
+                const organization = organizationStructs.find(o => o.id === balance.objectId) ?? null;
                 if (organization) {
                     const theseResponsibilities = responsibilities.filter(r => r.organizationId === organization.id);
                     const thisMembers = members.flatMap((m) => {
@@ -605,6 +608,7 @@ export class AuthenticatedStructures {
                             lastName: member.lastName ?? '',
                             emails: member.details.getMemberEmails(),
                             meta: {
+                                type: 'organization',
                                 responsibilityIds: responsibilities.map(r => r.responsibilityId),
                                 url: organization.dashboardUrl + '/boekhouding/openstaand/' + (Context.organization?.uri ?? ''),
                             },
@@ -615,14 +619,58 @@ 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.parentsHaveAccess
+                                ? member.details.parents.filter(p => !!p.email).map(p => ReceivableBalanceObjectContact.create({
+                                    firstName: p.firstName ?? '',
+                                    lastName: p.lastName ?? '',
+                                    emails: [p.email!],
+                                    meta: {
+                                        type: 'parent',
+                                        responsibilityIds: [],
+                                        url,
+                                    },
+                                }))
+                                : []),
+                        ],
+                    });
+                }
+            }
+            else if (balance.objectType === ReceivableBalanceType.user) {
+                const user = users.find(m => m.id === balance.objectId) ?? null;
+                if (user) {
+                    const url = Context.organization && Context.organization.id === balance.organizationId ? 'https://' + Context.organization.getHost() : '';
+                    object = ReceivableBalanceObject.create({
+                        id: balance.objectId,
+                        name: user.name || user.email,
                         contacts: [
                             ReceivableBalanceObjectContact.create({
-                                firstName: member.details.firstName ?? '',
-                                lastName: member.details.lastName ?? '',
-                                emails: member.details.getMemberEmails(),
+                                firstName: user.firstName ?? '',
+                                lastName: user.lastName ?? '',
+                                emails: [user.email],
+                                meta: {
+                                    responsibilityIds: [],
+                                    url,
+                                },
                             }),
                         ],
                     });

package/src/helpers/StripeHelper.ts

@@ -210,6 +210,14 @@ export class StripeHelper {
 
         const totalPrice = payment.price;
 
+        if (totalPrice < 50) {
+            throw new SimpleError({
+                code: 'minmum_amount',
+                message: 'The minimum amount for an online payment is € 0,50',
+                human: 'Het minimum bedrag voor een online betaling is € 0,50',
+            });
+        }
+
         let fee = 0;
         let directCharge = false;
         const vat = calculateVATPercentage(organization.address, organization.meta.VATNumber);

package/src/seeds/1733748412-update-deleted-order-numbers.ts

@@ -0,0 +1,109 @@
+import { Migration } from '@simonbackx/simple-database';
+import { logger } from '@simonbackx/simple-logging';
+import { Order, WebshopCounter } from '@stamhoofd/models';
+import { OrderStatus } from '@stamhoofd/structures';
+
+export default new Migration(async () => {
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
+        return;
+    }
+
+    process.stdout.write('\n');
+    let c = 0;
+    let pages = 0;
+    let id: string = '';
+
+    // There is an issue with some deleted orders that can't be stringified anymore
+    let limit = 100;
+    let restoreLimitAt: number | null = null;
+
+    await logger.setContext({ tags: ['seed'] }, async () => {
+        while (true) {
+            try {
+                const orders = await Order.where({
+                    id: {
+                        value: id,
+                        sign: '>',
+                    },
+                    status: OrderStatus.Deleted,
+                }, { limit, sort: ['id'] });
+
+                if (orders.length === 0) {
+                    break;
+                }
+
+                pages++;
+                process.stdout.write('.');
+                if (pages % 100 === 0) {
+                    process.stdout.write('\n');
+                }
+
+                if (limit === 1 && restoreLimitAt && pages > restoreLimitAt) {
+                    limit = 100;
+                }
+
+                for (const order of orders) {
+                    c++;
+
+                    if (order.status === OrderStatus.Deleted) {
+                        order.data.removePersonalData();
+
+                        if (order.number !== null) {
+                            order.number = Math.floor(Math.random() * 1000000000000) + 1000000000000;
+                        }
+                        await order.save();
+                    }
+                }
+
+                if (orders.length < limit) {
+                    break;
+                }
+                id = orders[orders.length - 1].id;
+            }
+            catch (e) {
+                if (e.toString() && e.toString().includes('RangeError')) {
+                    console.error('Found decoding issue at ' + id);
+                    console.error(e);
+                    if (limit === 1) {
+                        // We found the causing order.
+
+                        const _orders = await Order.where({
+                            id: {
+                                value: id,
+                                sign: '>',
+                            },
+                            status: OrderStatus.Deleted,
+                        }, { limit: 1, sort: ['id'], select: 'id' });
+
+                        if (_orders.length === 1) {
+                            console.log('Found broken order: ' + _orders[0].id);
+                            console.log('Deleting order');
+                            // Delete
+                            await _orders[0].delete();
+                        }
+                        else {
+                            console.error('Could not find causing order');
+                            throw e;
+                        }
+                    }
+                    // Something wrong with an order
+                    // continue
+                    limit = 1;
+                    restoreLimitAt = pages + 100;
+                    continue;
+                }
+                console.error('Error at ' + id);
+                throw e;
+            }
+        }
+    });
+
+    console.log('Cleared ' + c + ' deleted orders');
+
+    // Clear all cached order numbers
+    WebshopCounter.clearAll();
+
+    // Do something here
+    return Promise.resolve();
+});

package/src/seeds/1733994455-balance-item-status-open.ts

@@ -0,0 +1,30 @@
+import { Database, Migration } from '@simonbackx/simple-database';
+import { BalanceItemStatus } from '@stamhoofd/structures';
+
+export default new Migration(async () => {
+    if (STAMHOOFD.environment === 'test') {
+        console.log('skipped in tests');
+        return;
+    }
+
+    const query = `
+        UPDATE
+            balance_items
+        SET status = ?
+        WHERE status IN (?)`;
+    await Database.update(query, [
+        BalanceItemStatus.Due,
+        ['Paid', 'Pending'],
+    ]);
+
+    const q2 = `
+        UPDATE
+            balance_items
+        SET status = ?,
+            amount = coalesce(nullif(ROUND(coalesce(pricePaid / nullif(unitPrice, 0), 0)), 0), 1)
+        WHERE amount = 0 AND status = ?`;
+    await Database.update(q2, [
+        BalanceItemStatus.Canceled,
+        BalanceItemStatus.Due,
+    ]);
+});

package/src/seeds/1733996431-update-cached-outstanding-balance-from-items.ts

@@ -0,0 +1,40 @@
+import { Migration } from '@simonbackx/simple-database';
+import { logger } from '@simonbackx/simple-logging';
+import { BalanceItem } from '@stamhoofd/models';
+
+export default new Migration(async () => {
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
+        return;
+    }
+
+    process.stdout.write('\n');
+    let c = 0;
+    let id: string = '';
+
+    await logger.setContext({ tags: ['silent-seed', 'seed'] }, async () => {
+        while (true) {
+            const items = await BalanceItem.where({
+                id: {
+                    value: id,
+                    sign: '>',
+                },
+            }, { limit: 1000, sort: ['id'] });
+
+            await BalanceItem.updateOutstanding(items);
+
+            c += items.length;
+            process.stdout.write('.');
+
+            if (items.length < 1000) {
+                break;
+            }
+            id = items[items.length - 1].id;
+        }
+    });
+
+    console.log('Updated outstanding balance for ' + c + ' items');
+
+    // Do something here
+    return Promise.resolve();
+});

package/src/services/BalanceItemPaymentService.ts

@@ -7,16 +7,20 @@ type Loaded<T> = (T) extends ManyToOneRelation<infer Key, infer Model> ? Record<
 
 export const BalanceItemPaymentService = {
     async markPaid(balanceItemPayment: BalanceItemPayment & Loaded<typeof BalanceItemPayment.balanceItem> & Loaded<typeof BalanceItemPayment.payment>, organization: Organization) {
+        const wasPaid = balanceItemPayment.balanceItem.priceOpen === 0;
+
         // Update cached amountPaid of the balance item (balanceItemPayment will get overwritten later, but we need it to calculate the status)
         balanceItemPayment.balanceItem.pricePaid += balanceItemPayment.price;
 
-        // Update status
-        const old = balanceItemPayment.balanceItem.status;
-        balanceItemPayment.balanceItem.updateStatus();
+        if (balanceItemPayment.balanceItem.status === BalanceItemStatus.Hidden && balanceItemPayment.balanceItem.pricePaid !== 0) {
+            balanceItemPayment.balanceItem.status = BalanceItemStatus.Due;
+        }
+
         await balanceItemPayment.balanceItem.save();
+        const isPaid = balanceItemPayment.balanceItem.priceOpen === 0;
 
         // Do logic of balance item
-        if (balanceItemPayment.balanceItem.status === BalanceItemStatus.Paid && old !== BalanceItemStatus.Paid && balanceItemPayment.price >= 0) {
+        if (isPaid && !wasPaid && balanceItemPayment.price >= 0 && balanceItemPayment.balanceItem.status === BalanceItemStatus.Due) {
             // Only call markPaid once (if it wasn't (partially) paid before)
             await BalanceItemService.markPaid(balanceItemPayment.balanceItem, balanceItemPayment.payment, organization);
         }

package/src/sql-filters/receivable-balances.ts

@@ -10,4 +10,5 @@ export const receivableBalanceFilterCompilers: SQLFilterDefinitions = {
     objectType: createSQLColumnFilterCompiler('objectType'),
     amount: createSQLColumnFilterCompiler('amount'),
     amountPending: createSQLColumnFilterCompiler('amountPending'),
+    nextDueAt: createSQLColumnFilterCompiler('nextDueAt'),
 };