@stamhoofd/backend 2.106.1 → 2.107.0

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

@@ -277,6 +277,13 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             }
         }
 
+        if (totalPrice % 100 !== 0) {
+            throw new SimpleError({
+                code: 'more_than_2_decimal_places',
+                message: 'Unexpected total price. The total price should be rounded to maximum 2 decimal places',
+            });
+        }
+
         const registrationMemberRelation = new ManyToOneRelation(Member, 'member');
         registrationMemberRelation.foreignKey = 'memberId';
 

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

@@ -42,7 +42,6 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
         }
 
         const returnedModels: BalanceItem[] = [];
-        const updateOutstandingBalance: BalanceItem[] = [];
 
         // Tracking changes
         const additionalItems: { memberId: string; organizationId: string }[] = [];
@@ -60,6 +59,9 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
                 model.createdAt = put.createdAt;
                 model.dueAt = put.dueAt;
                 model.status = put.status === BalanceItemStatus.Hidden ? BalanceItemStatus.Hidden : BalanceItemStatus.Due;
+                model.VATIncluded = put.VATIncluded;
+                model.VATPercentage = put.VATPercentage;
+                model.VATExcempt = put.VATExcempt;
 
                 if (put.userId) {
                     model.userId = (await this.validateUserId(model, put.userId)).id;
@@ -113,8 +115,6 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
 
                 await model.save();
                 returnedModels.push(model);
-
-                updateOutstandingBalance.push(model);
             }
 
             for (const patch of request.body.getPatches()) {
@@ -186,6 +186,9 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
                 model.unitPrice = patch.unitPrice ?? model.unitPrice;
                 model.amount = patch.amount ?? model.amount;
                 model.dueAt = patch.dueAt === undefined ? model.dueAt : patch.dueAt;
+                model.VATIncluded = patch.VATIncluded === undefined ? model.VATIncluded : patch.VATIncluded;
+                model.VATPercentage = patch.VATPercentage === undefined ? model.VATPercentage : patch.VATPercentage;
+                model.VATExcempt = patch.VATExcempt === undefined ? model.VATExcempt : patch.VATExcempt;
 
                 if ((patch.dueAt !== undefined || patch.unitPrice !== undefined) && model.dueAt && model.price < 0) {
                     throw new SimpleError({
@@ -224,13 +227,12 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
 
                 await model.save();
                 returnedModels.push(model);
-
-                if (patch.unitPrice || patch.amount || patch.status || patch.dueAt !== undefined || patch.memberId || patch.userId) {
-                    updateOutstandingBalance.push(model);
-                }
             }
         });
 
+        // Update balances before we return the up to date versions
+        await BalanceItemService.flushCaches(organization.id);
+
         // Reload returnedModels
         const returnedModelsReloaded = await BalanceItem.getByIDs(...returnedModels.map(m => m.id));
 

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

@@ -73,6 +73,10 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
             payment.customer = put.customer;
             payment.type = put.type;
 
+            if (payment.type === PaymentType.Reallocation) {
+                payment.method = PaymentMethod.Unknown;
+            }
+
             if (payment.method === PaymentMethod.Transfer) {
                 if (!put.transferSettings) {
                     throw new SimpleError({
@@ -273,6 +277,9 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
             });
         }
 
+        // Update balances before we return the up to date versions
+        await BalanceItemService.flushCaches(organization.id);
+
         return new Response(
             await AuthenticatedStructures.paymentsGeneral(changedPayments, true),
         );

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

@@ -156,8 +156,15 @@ 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;
 
+        if (totalPrice % 100 !== 0) {
+            throw new SimpleError({
+                code: 'more_than_2_decimal_places',
+                message: 'Unexpected total price. The total price should be rounded to maximum 2 decimal places',
+            });
+        }
+
         try {
-            if (totalPrice == 0) {
+            if (totalPrice === 0) {
                 // Force unknown payment method
                 order.data.paymentMethod = PaymentMethod.Unknown;
 
@@ -306,7 +313,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                         const molliePayment = await mollieClient.payments.create({
                             amount: {
                                 currency: 'EUR',
-                                value: (totalPrice / 100).toFixed(2),
+                                value: (totalPrice / 10000).toFixed(2), // from 4 decimals to 0 decimals
                             },
                             method: payment.method == PaymentMethod.Bancontact ? molliePaymentMethod.bancontact : (payment.method == PaymentMethod.iDEAL ? molliePaymentMethod.ideal : molliePaymentMethod.creditcard),
                             testmode: organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production',

package/src/excel-loaders/payments.ts

@@ -210,7 +210,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<PaymentWithItem>[] {
             name: $t(`7f7fdce2-1fcd-44c9-8c98-856aea11ffc3`),
             width: 20,
             getValue: (object: PaymentWithItem) => ({
-                value: object.balanceItemPayment.unitPrice / 100,
+                value: object.balanceItemPayment.unitPrice / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -223,7 +223,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<PaymentWithItem>[] {
             name: $t(`6f3104d4-9b8f-4946-8434-77202efae9f0`),
             width: 20,
             getValue: (object: PaymentWithItem) => ({
-                value: object.balanceItemPayment.price / 100,
+                value: object.balanceItemPayment.price / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -254,7 +254,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<PaymentGeneral>[] {
             name: $t(`61b7b9cb-287a-4655-bac2-bb2d0b83fe47`),
             width: 10,
             getValue: (object: PaymentGeneralWithStripeAccount) => ({
-                value: object.price / 100,
+                value: object.price / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -361,7 +361,7 @@ function getSettlementColumns(): XlsxTransformerColumn<PaymentGeneral>[] {
             width: 18,
             getValue: (object: PaymentGeneralWithStripeAccount) => {
                 return {
-                    value: object.settlement?.amount !== undefined ? (object.settlement?.amount / 100) : null,
+                    value: object.settlement?.amount !== undefined ? (object.settlement?.amount / 1_0000) : null,
                     style: {
                         numberFormat: {
                             id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -381,7 +381,7 @@ function getStripeColumns(): XlsxTransformerColumn<PaymentGeneral>[] {
             width: 16,
             getValue: (object: PaymentGeneralWithStripeAccount) => {
                 return {
-                    value: object.transferFee / 100,
+                    value: object.transferFee / 1_0000,
                     style: {
                         numberFormat: {
                             id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,

package/src/excel-loaders/receivable-balances.ts

@@ -108,7 +108,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
             name: $t(`7f7fdce2-1fcd-44c9-8c98-856aea11ffc3`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
-                value: object.balanceItem.unitPrice / 100,
+                value: object.balanceItem.unitPrice / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -121,7 +121,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
             name: $t(`6f3104d4-9b8f-4946-8434-77202efae9f0`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
-                value: object.balanceItem.price / 100,
+                value: object.balanceItem.priceWithVAT / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -134,7 +134,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
             name: $t(`dc9f65e0-19ce-4908-8830-da48235faa70`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
-                value: object.balanceItem.pricePaid / 100,
+                value: object.balanceItem.pricePaid / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -147,7 +147,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
             name: $t(`5c75e9bf-1b64-4d28-a435-6e33247d5170`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
-                value: object.balanceItem.pricePending / 100,
+                value: object.balanceItem.pricePending / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -160,7 +160,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
             name: $t(`eb0421f4-6ee9-4d81-b549-2bc4e16c4b63`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
-                value: object.balanceItem.priceOpen / 100,
+                value: object.balanceItem.priceOpen / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -261,7 +261,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
             name: $t(`eb0421f4-6ee9-4d81-b549-2bc4e16c4b63`),
             width: 10,
             getValue: (object: ReceivableBalance) => ({
-                value: object.amountOpen / 100,
+                value: object.amountOpen / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
@@ -274,7 +274,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
             name: $t(`5c75e9bf-1b64-4d28-a435-6e33247d5170`),
             width: 18,
             getValue: (object: ReceivableBalance) => ({
-                value: object.amountPending / 100,
+                value: object.amountPending / 1_0000,
                 style: {
                     numberFormat: {
                         id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,

package/src/helpers/AdminPermissionChecker.ts

@@ -1504,6 +1504,19 @@ export class AdminPermissionChecker {
         return cloned;
     }
 
+    /**
+     * Only for creating new members
+     */
+    filterMemberPut(member: MemberWithRegistrations, data: MemberWithRegistrationsBlob, options: {asUserManager: boolean}) {
+        if (options.asUserManager || STAMHOOFD.userMode === 'platform') {
+            // A user manager cannot choose the member number + in platform mode, nobody can choose the member number
+            data.details.memberNumber = null;
+        }
+
+        // Do not allow setting the security code
+        data.details.securityCode = null;
+     }
+
     async filterMemberPatch(member: MemberWithRegistrations, data: AutoEncoderPatchType<MemberWithRegistrationsBlob>): Promise<AutoEncoderPatchType<MemberWithRegistrationsBlob>> {
         if (!data.details) {
             return data;
@@ -1524,6 +1537,7 @@ export class AdminPermissionChecker {
             });
         }
 
+
         const hasRecordAnswers = !!data.details.recordAnswers;
         const hasNotes = data.details.notes !== undefined;
         const isSetFinancialSupportTrue = data.details.shouldApplyReducedPrice;
@@ -1575,6 +1589,12 @@ export class AdminPermissionChecker {
 
         const isUserManager = this.isUserManager(member);
 
+        // Do not allow setting the member number
+        if (isUserManager || STAMHOOFD.userMode === 'platform') {
+            // A user manager cannot choose the member number + in platform mode, nobody can choose the member number
+            delete data.details.memberNumber;
+        }
+        
         if (hasNotes && isUserManager && !(await this.canAccessMember(member, PermissionLevel.Full))) {
             throw new SimpleError({
                 code: 'permission_denied',

package/src/helpers/BuckarooHelper.ts

@@ -166,7 +166,7 @@ export class BuckarooHelper {
 
         const data = {
             Currency: 'EUR',
-            AmountDebit: (payment.price / 100).toFixed(2),
+            AmountDebit: (payment.price / 10000).toFixed(2), // 4 decimals to zero
             Invoice: 'ID ' + payment.id,
             ClientIP: {
                 Type: 0, // 0 = ipv4, 1 = ipv6

package/src/helpers/ServiceFeeHelper.ts

@@ -18,16 +18,14 @@ export class ServiceFeeHelper {
             if (price === 0 && !minimumFee) {
                 return 0;
             }
-            let fee = Math.round(fixed + Math.max(1, price * percentageTimes100 / 100 / 100));
+            let fee = Math.round((fixed + Math.max(100, price * percentageTimes100 / 100 / 100)) / 100) * 100; // Round to 2 decimals, minimum 1 cent
             if (minimumFee !== null && fee < minimumFee) {
                 fee = minimumFee;
             }
             if (maximumFee !== null && fee > maximumFee) {
                 fee = maximumFee;
             }
-            return Math.round(
-                fee * (100 + vat) / 100,
-            ); // € 0,21 + 0,2%
+            return fee;
         }
 
         let serviceFee = 0;
@@ -52,6 +50,12 @@ export class ServiceFeeHelper {
             }
         }
 
+        // Add VAT
+        serviceFee = serviceFee * (100 + vat) / 100;
+
+        // Round service fee to 2 decimal places
+        serviceFee = Math.round(serviceFee / 100) * 100;
+
         console.log('Service fee for payment', payment.id, type, 'is', serviceFee);
         if (payment.provider === PaymentProvider.Stripe && payment.stripeAccountId) {
             payment.serviceFeePayout = serviceFee;

package/src/helpers/StripeHelper.ts

@@ -219,7 +219,7 @@ export class StripeHelper {
             });
         }
 
-        const totalPrice = payment.price;
+        const totalPrice = Math.round(payment.price / 100); // Convert from 4 decimal places to 2 decimal places
 
         if (totalPrice < 50) {
             throw new SimpleError({
@@ -252,14 +252,14 @@ export class StripeHelper {
             directCharge = true;
         }
 
-        payment.transferFee = fee;
-        const serviceFee = payment.serviceFeePayout;
+        payment.transferFee = fee * 100; // Convert back to 4 decimal places for storage
+        const serviceFee = Math.round(payment.serviceFeePayout / 100);
 
         const fullMetadata = {
             ...(metadata ?? {}),
             organizationVATNumber: organization.meta.VATNumber,
             transactionFee: fee,
-            serviceFee: serviceFee,
+            serviceFee: serviceFee, // For historic reasons, this is stored in cents
         };
 
         const stripe = StripeHelper.getInstance(directCharge ? stripeAccount.accountId : null);
@@ -327,41 +327,24 @@ export class StripeHelper {
             await paymentIntentModel.save();
         }
         else {
-            // Build Stripe line items
-            const stripeLineItems: Stripe.Checkout.SessionCreateParams.LineItem[] = [];
-            let lineItemsPrice = 0;
-            for (const item of lineItems) {
-                const stripeLineItem = {
-                    price_data: {
-                        currency: 'eur',
-                        unit_amount: item.price,
-                        product_data: {
-                            name: item.balanceItem.description,
-                        },
-                    },
-                    quantity: 1,
-                };
-                stripeLineItems.push(stripeLineItem);
-                lineItemsPrice += item.price;
-            }
-
-            if (lineItemsPrice !== totalPrice) {
-                console.error('Total price of line items does not match total price of payment', lineItemsPrice, totalPrice, payment.id);
-                throw new SimpleError({
-                    code: 'invalid_price',
-                    message: 'De totale prijs van de betaling komt niet overeen met de prijs van de items',
-                    human: $t(`e66b54d3-70fb-4b40-b3e5-21bc795ba704`),
-                    statusCode: 500,
-                });
-            }
-
             // Use checkout flow
-            const session = await stripe.checkout.sessions.create({
+            const data: Stripe.Checkout.SessionCreateParams = {
                 mode: 'payment',
                 success_url: redirectUrl,
                 cancel_url: cancelUrl,
                 payment_method_types: payment.method === PaymentMethod.DirectDebit ? ['sepa_debit'] : ['card'],
-                line_items: stripeLineItems,
+                line_items: [
+                    {
+                        price_data: {
+                            currency: 'eur',
+                            unit_amount: totalPrice,
+                            product_data: {
+                                name: statementDescriptor,
+                            },
+                        },
+                        quantity: 1,
+                    },
+                ],
                 currency: 'eur',
                 locale: i18n.language as 'nl',
                 payment_intent_data: {
@@ -385,7 +368,9 @@ export class StripeHelper {
                         request_three_d_secure: 'challenge', // Force usage of string customer authentication for card payments
                     },
                 },
-            });
+            };
+            console.log('Creating Stripe session', data);
+            const session = await stripe.checkout.sessions.create(data);
             console.log('Stripe session', session);
 
             if (!session.url) {

package/src/seeds/1752848561-groups-registration-periods.ts

@@ -54,6 +54,8 @@ async function start(dryRun: boolean) {
 
 async function cleanupGroup(group: Group, dryRun: boolean) {
     group.settings.cycleSettings = new Map();
+    group.settings.preventPreviousGroupIds = [];
+    group.settings.requirePreviousGroupIds = [];
     group.cycle = cycleIfMigrated;
     if (group.status === GroupStatus.Archived) {
         group.status = GroupStatus.Closed;
@@ -157,6 +159,39 @@ async function migrateGroups({ groups, organization, periodSpan }: { groups: Gro
         }
     }
 
+    // migrate require and prevent group ids
+    for (const originalGroup of groups) {
+        // migrate requirePreviousGroupIds
+        const requirePreviousGroupIds = originalGroup.settings.requirePreviousGroupIds;
+        const requireIdSet = new Set<string>();
+
+        for (const groupIdToGetPreviousGroupOf of requirePreviousGroupIds) {
+            const previousGroups = groupMap.get(groupIdToGetPreviousGroupOf);
+            if (previousGroups && previousGroups.length > 0) {
+                // previous groups are already ordered
+                const firstPreviousGroup = previousGroups[0];
+                requireIdSet.add(firstPreviousGroup.id);
+            }
+        }
+
+        originalGroup.settings.requireGroupIds = [...requireIdSet];
+
+        // migrate preventPreviousGroupIds
+        const preventPreviousGroupIds = originalGroup.settings.preventPreviousGroupIds;
+        const preventIdSet = new Set<string>();
+
+        for (const groupIdToGetPreviousGroupOf of preventPreviousGroupIds) {
+            const previousGroups = groupMap.get(groupIdToGetPreviousGroupOf);
+            if (previousGroups && previousGroups.length > 0) {
+                // previous groups are already ordered
+                const firstPreviousGroup = previousGroups[0];
+                preventIdSet.add(firstPreviousGroup.id);
+            }
+        }
+
+        originalGroup.settings.preventGroupIds = [...preventIdSet];
+    }
+
     // #region create categories for current period
     const nonArchivedGroupIds = [...new Set(groups.filter(g => g.status !== GroupStatus.Archived).map(g => g.id))];
     const newCategoriesData = organization.meta.categories.map((c: GroupCategory) => {

package/src/services/BalanceItemService.ts

@@ -70,9 +70,8 @@ export const BalanceItemService = {
             // status, unitPrice, dueAt, amount
             if (
                 'status' in event.changedFields
-                || 'unitPrice' in event.changedFields
                 || 'dueAt' in event.changedFields
-                || 'amount' in event.changedFields
+                || 'priceTotal' in event.changedFields
                 || 'memberId' in event.changedFields
                 || 'userId' in event.changedFields
                 || 'payingOrganizationId' in event.changedFields
@@ -268,6 +267,13 @@ export const BalanceItemService = {
                 await order.undoPaid(payment, organization);
             }
         }
+
+        // If a rounded payment was canceled, make sure the balance item is hidden again (will become visible again when marking paid)
+        if (this.type === BalanceItemType.Rounding && balanceItem.status !== BalanceItemStatus.Hidden) {
+            // Mark undue
+            balanceItem.status = BalanceItemStatus.Hidden;
+            await balanceItem.save();
+        }
     },
 
     async markFailed(balanceItem: BalanceItem, payment: Payment, organization: Organization) {
@@ -283,6 +289,13 @@ export const BalanceItemService = {
                 }
             }
         }
+
+        // If a rounded payment was canceled, make sure the balance item is hidden again (will become visible again when marking paid)
+        if (this.type === BalanceItemType.Rounding && balanceItem.status !== BalanceItemStatus.Hidden) {
+            // Mark undue
+            balanceItem.status = BalanceItemStatus.Hidden;
+            await balanceItem.save();
+        }
     },
 
     async undoFailed(balanceItem: BalanceItem, payment: Payment, organization: Organization) {