@stamhoofd/backend 2.121.0 → 2.122.0

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

@@ -1,15 +1,17 @@
 import type { Response } from '@simonbackx/simple-endpoints';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, StripeAccount, User} from '@stamhoofd/models';
+import type { Organization, StripeAccount, User } from '@stamhoofd/models';
 import { OrganizationFactory, Token, UserFactory, Webshop, WebshopFactory } from '@stamhoofd/models';
-import type { OrderResponse} from '@stamhoofd/structures';
-import { Address, Cart, CartItem, CartItemOption, Customer, Option, OptionMenu, OrderData, PaymentConfiguration, PaymentMethod, PermissionLevel, Permissions, PrivatePaymentConfiguration, Product, ProductPrice, ProductType, SeatingPlan, SeatingPlanRow, SeatingPlanSeat, SeatingPlanSection, TransferSettings, WebshopDeliveryMethod, WebshopMetaData, WebshopOnSiteMethod, WebshopPrivateMetaData, WebshopTakeoutMethod, WebshopTimeSlot } from '@stamhoofd/structures';
+import type { OrderResponse } from '@stamhoofd/structures';
+import { Address, Cart, CartItem, CartItemOption, Customer, Option, OptionMenu, OrderData, PaymentConfiguration, PaymentMethod, PermissionLevel, Permissions, PrivatePaymentConfiguration, Product, ProductPrice, ProductType, SeatingPlan, SeatingPlanRow, SeatingPlanSeat, SeatingPlanSection, TransferSettings, WebshopAuthType, WebshopDeliveryMethod, WebshopMetaData, WebshopOnSiteMethod, WebshopPrivateMetaData, WebshopTakeoutMethod, WebshopTimeSlot } from '@stamhoofd/structures';
+import { STExpect } from '@stamhoofd/test-utils';
 import { Country } from '@stamhoofd/types/Country';
 import sinon from 'sinon';
 
 import { StripeMocker } from '../../../../tests/helpers/StripeMocker.js';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { PatchWebshopOrdersEndpoint } from '../dashboard/webshops/PatchWebshopOrdersEndpoint.js';
+import { GetOrderEndpoint } from './GetOrderEndpoint.js';
 import { PlaceOrderEndpoint } from './PlaceOrderEndpoint.js';
 
 const address = Address.create({
@@ -31,6 +33,7 @@ describe('Endpoint.PlaceOrderEndpoint', () => {
     // Test endpoint
     const endpoint = new PlaceOrderEndpoint();
     const patchWebshopOrdersEndpoint = new PatchWebshopOrdersEndpoint();
+    const getOrderEndpoint = new GetOrderEndpoint();
 
     let organization: Organization;
     let webshop: Webshop;
@@ -328,6 +331,31 @@ describe('Endpoint.PlaceOrderEndpoint', () => {
     });
 
     describe('User authentication', () => {
+        test('Required-auth webshop rejects anonymous orders', async () => {
+            webshop.meta.authType = WebshopAuthType.Required;
+            await webshop.save();
+
+            const orderData = OrderData.create({
+                paymentMethod: PaymentMethod.Unknown,
+                checkoutMethod: onSiteMethod,
+                timeSlot: slot4,
+                cart: Cart.create({
+                    items: [
+                        CartItem.create({
+                            product,
+                            productPrice: freeProductPrice,
+                            amount: 1,
+                        }),
+                    ],
+                }),
+                customer,
+            });
+
+            const r = Request.buildJson('POST', `/webshop/${webshop.id}/order`, organization.getApiHost(), orderData);
+
+            await expect(testServer.test(endpoint, r)).rejects.toThrow(STExpect.errorWithCode('not_authenticated'));
+        });
+
         test('Placing an order with a signed in user overrides the order customer', async () => {
             const user = await new UserFactory({ organization, firstName: 'User', lastName: 'Tester' }).create();
             const token = await Token.createToken(user);
@@ -370,6 +398,49 @@ describe('Endpoint.PlaceOrderEndpoint', () => {
             expect(order.data.customer.lastName).toEqual(user.lastName);
         });
 
+        test('Required-auth webshop order can only be read by owner', async () => {
+            webshop.meta.authType = WebshopAuthType.Required;
+            await webshop.save();
+
+            const user = await new UserFactory({ organization, firstName: 'User', lastName: 'Tester' }).create();
+            const token = await Token.createToken(user);
+            const otherUser = await new UserFactory({ organization }).create();
+            const otherToken = await Token.createToken(otherUser);
+
+            const orderData = OrderData.create({
+                paymentMethod: PaymentMethod.Unknown,
+                checkoutMethod: onSiteMethod,
+                timeSlot: slot4,
+                cart: Cart.create({
+                    items: [
+                        CartItem.create({
+                            product,
+                            productPrice: freeProductPrice,
+                            amount: 1,
+                        }),
+                    ],
+                }),
+                customer,
+            });
+
+            const placeRequest = Request.buildJson('POST', `/webshop/${webshop.id}/order`, organization.getApiHost(), orderData);
+            placeRequest.headers.authorization = 'Bearer ' + token.accessToken;
+            const placeResponse = await testServer.test(endpoint, placeRequest);
+            const order = placeResponse.body.order;
+
+            const anonymousRequest = Request.buildJson('GET', `/webshop/${webshop.id}/order/${order.id}`, organization.getApiHost());
+            await expect(testServer.test(getOrderEndpoint, anonymousRequest)).rejects.toThrow(STExpect.errorWithCode('not_authenticated'));
+
+            const otherUserRequest = Request.buildJson('GET', `/webshop/${webshop.id}/order/${order.id}`, organization.getApiHost());
+            otherUserRequest.headers.authorization = 'Bearer ' + otherToken.accessToken;
+            await expect(testServer.test(getOrderEndpoint, otherUserRequest)).rejects.toThrow(STExpect.errorWithCode('not_found'));
+
+            const ownerRequest = Request.buildJson('GET', `/webshop/${webshop.id}/order/${order.id}`, organization.getApiHost());
+            ownerRequest.headers.authorization = 'Bearer ' + token.accessToken;
+            const ownerResponse = await testServer.test(getOrderEndpoint, ownerRequest);
+            expect(ownerResponse.body.id).toEqual(order.id);
+        });
+
         /**
          * This checks if the authenticated context is passed when multiple orders are executed in a queue
          */

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

@@ -6,7 +6,7 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { Email } from '@stamhoofd/email';
 import { BalanceItem, BalanceItemPayment, MolliePayment, Order, PayconiqPayment, Payment, RateLimiter, Webshop, WebshopDiscountCode } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderData, OrderResponse, Order as OrderStruct, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, TranslatedString, Version, WebshopAuthType, Webshop as WebshopStruct, WebshopTicketType } from '@stamhoofd/structures';
+import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderData, OrderResponse, Order as OrderStruct, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, TranslatedString, Version, Webshop as WebshopStruct, WebshopTicketType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { BuckarooHelper } from '../../../helpers/BuckarooHelper.js';
@@ -17,6 +17,7 @@ import { AuditLogService } from '../../../services/AuditLogService.js';
 import { MollieService } from '../../../services/MollieService.js';
 import { PaymentService } from '../../../services/PaymentService.js';
 import { UitpasService } from '../../../services/uitpas/UitpasService.js';
+import { WebshopAuthHelper } from './WebshopAuthHelper.js';
 
 type Params = { id: string };
 type Query = undefined;
@@ -59,7 +60,6 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOrganizationScope();
-        await Context.optionalAuthenticate();
 
         // Read + validate + update stock in one go, to prevent race conditions
         const { webshop, order } = await QueueHandler.schedule('webshop-stock/' + request.params.id, async () => {
@@ -74,15 +74,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
 
             // const organization = (await Organization.getByID(webshopWithoutOrganization.organizationId))!
             const webshop = webshopWithoutOrganization.setRelation(Webshop.organization, organization);
-
-            if (webshop.meta.authType === WebshopAuthType.Required && !Context.user) {
-                throw new SimpleError({
-                    code: 'not_authenticated',
-                    message: 'Not authenticated',
-                    human: $t(`%w5`),
-                    statusCode: 401,
-                });
-            }
+            await WebshopAuthHelper.optionalAuthenticateForWebshop(webshop);
 
             // For non paid organizations, the limit is 10
             if (!organization.meta.packages.isPaid && STAMHOOFD.environment !== 'test') {
@@ -90,8 +82,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
 
                 try {
                     limiter.track(organization.id, 1);
-                }
-                catch (e) {
+                } catch (e) {
                     Email.sendWebmaster({
                         subject: '[Limiet] Limiet bereikt voor aantal bestellingen',
                         text: 'Beste, \nDe limiet werd bereikt voor het aantal bestellingen per dag. \nVereniging: ' + organization.id + ' (' + organization.name + ')' + '\n\n' + e.message + '\n\nStamhoofd',
@@ -174,8 +165,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 // Mark this order as paid
                 await order.markPaid(null, organization, webshop);
                 await order.save();
-            }
-            else {
+            } else {
                 const payment = new Payment();
                 payment.organizationId = organization.id;
                 payment.method = request.body.paymentMethod;
@@ -195,13 +185,13 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 const { provider, stripeAccount } = await organization.getPaymentProviderFor(payment.method, null, webshop.privateMeta.paymentConfiguration);
                 payment.provider = provider;
                 payment.stripeAccountId = stripeAccount?.id ?? null;
-                ServiceFeeHelper.setServiceFee(
+                await ServiceFeeHelper.setServiceFee(
                     payment,
                     organization,
                     webshop.meta.ticketType === WebshopTicketType.None ? 'webshop' : 'tickets',
                     order.data.cart.items.flatMap(i => i.calculatedPrices.map(p => p.discountedPrice)),
                 );
-
+                await ServiceFeeHelper.setTransferFee({ payment, organization, stripeAccount });
                 await payment.save();
 
                 // Deprecated field
@@ -253,8 +243,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                     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);
 
@@ -265,8 +254,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                     balanceItem.status = BalanceItemStatus.Due;
                     await balanceItem.save();
                     await payment.save();
-                }
-                else {
+                } else {
                     const cancelUrl = 'https://' + webshop.getHost() + '/payment?id=' + encodeURIComponent(payment.id) + '&cancel=true';
                     const redirectUrl = 'https://' + webshop.getHost() + '/payment?id=' + encodeURIComponent(payment.id);
                     const exchangeUrl = 'https://' + organization.getApiHost() + '/v' + Version + '/payments/' + encodeURIComponent(payment.id) + '?exchange=true';
@@ -292,10 +280,9 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                             },
                         });
                         paymentUrl = stripeResult.paymentUrl;
-                    }
-                    else if (payment.provider === PaymentProvider.Mollie) {
+                    } else if (payment.provider === PaymentProvider.Mollie) {
                         // Mollie payment
-                        const mollieService = await MollieService.create({sellingOrganization: organization});
+                        const mollieService = await MollieService.create({ sellingOrganization: organization });
                         if (!mollieService) {
                             throw new SimpleError({
                                 code: '',
@@ -326,7 +313,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                                 webshop: webshop.id,
                                 payment: payment.id,
                             },
-                            locale: mollieService.locale
+                            locale: mollieService.locale,
                         });
                         console.log(molliePayment);
                         paymentUrl = molliePayment.getCheckoutUrl();
@@ -336,11 +323,9 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                         dbPayment.paymentId = payment.id;
                         dbPayment.mollieId = molliePayment.id;
                         await dbPayment.save();
-                    }
-                    else if (payment.provider == PaymentProvider.Payconiq) {
+                    } else if (payment.provider == PaymentProvider.Payconiq) {
                         ({ paymentUrl, paymentQRCode } = await PayconiqPayment.createPayment(payment, organization, description, redirectUrl, exchangeUrl));
-                    }
-                    else if (payment.provider == PaymentProvider.Buckaroo) {
+                    } else if (payment.provider == PaymentProvider.Buckaroo) {
                         // Increase request timeout because buckaroo is super slow
                         request.request.request?.setTimeout(60 * 1000);
                         const buckaroo = new BuckarooHelper(organization.privateMeta?.buckarooSettings?.key ?? '', organization.privateMeta?.buckarooSettings?.secret ?? '', organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production');
@@ -357,8 +342,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                                 }),
                             });
                         }
-                    }
-                    else {
+                    } else {
                         throw new Error('Unknown payment provider');
                     }
                 }
@@ -369,8 +353,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                     order: OrderStruct.create({ ...order, payment: PaymentStruct.create(payment) }),
                 }));
             }
-        }
-        catch (e) {
+        } catch (e) {
             // Mark order as failed to release stock
             if (order) {
                 await order.deleteOrderBecauseOfCreationError();

package/src/endpoints/organization/webshops/RetrieveUitpasSocialTariffPriceEndpoint.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 { SimpleError } from '@simonbackx/simple-errors';
 import { UitpasPriceCheckRequest, UitpasPriceCheckResponse } from '@stamhoofd/structures';
@@ -47,8 +47,7 @@ export class RetrieveUitpasSocialTariffPricesEndpoint extends Endpoint<Params, Q
                     prices: [reducedPrice], // Convert to cents
                 });
                 return new Response(uitpasPriceCheckResponse);
-            }
-            else {
+            } else {
                 // OFFICIAL FLOW with an UiTPAS number
                 // request should include a reduced price (estimate by the frontend)
                 const organization = await Context.setOrganizationScope({ willAuthenticate: false });
@@ -58,8 +57,7 @@ export class RetrieveUitpasSocialTariffPricesEndpoint extends Endpoint<Params, Q
                 });
                 return new Response(uitpasPriceCheckResponse);
             }
-        }
-        else {
+        } else {
             // NON-OFFICIAL FLOW
             // request should include UiTPAS-numbers, reduced price AND base price
             if (request.body.reducedPrice === null) {

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

@@ -0,0 +1,36 @@
+import { SimpleError } from '@simonbackx/simple-errors';
+import type { Order, Webshop } from '@stamhoofd/models';
+import { WebshopAuthType } from '@stamhoofd/structures';
+
+import { Context } from '../../../helpers/Context.js';
+
+export class WebshopAuthHelper {
+    static async optionalAuthenticateForWebshop(webshop: Webshop) {
+        await Context.optionalAuthenticate();
+
+        if (webshop.meta.authType === WebshopAuthType.Required && !Context.user) {
+            throw new SimpleError({
+                code: 'not_authenticated',
+                message: 'Not authenticated',
+                human: $t(`%w5`),
+                statusCode: 401,
+            });
+        }
+    }
+
+    static async checkOrderAccess(webshop: Webshop, order: Order) {
+        await this.optionalAuthenticateForWebshop(webshop);
+
+        if (webshop.meta.authType !== WebshopAuthType.Required) {
+            return;
+        }
+
+        if (order.userId !== Context.user?.id) {
+            throw new SimpleError({
+                code: 'not_found',
+                message: 'Order not found',
+                human: $t(`%FY`),
+            });
+        }
+    }
+}

package/src/endpoints/system/HealthEndpoint.ts

@@ -1,5 +1,5 @@
 import { ArrayDecoder, 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 { SimpleError } from '@simonbackx/simple-errors';
 import { CpuService } from '../../services/CpuService.js';

package/src/excel-loaders/balance-items.ts

@@ -1,7 +1,7 @@
 import type { XlsxTransformerColumn } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { BalanceItem } from '@stamhoofd/models';
-import type { BalanceItemWithPayments} from '@stamhoofd/structures';
+import type { BalanceItemWithPayments } from '@stamhoofd/structures';
 import { BalanceItemRelationType, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemTypeName, PaginatedResponse, PaymentStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';

package/src/excel-loaders/event-notifications.ts

@@ -1,6 +1,6 @@
 import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
-import type { EventNotification, LimitedFilteredRequest} from '@stamhoofd/structures';
+import type { EventNotification, LimitedFilteredRequest } from '@stamhoofd/structures';
 import { EventNotificationStatus, EventNotificationStatusHelper, ExcelExportType, Platform as PlatformStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { GetEventNotificationsEndpoint } from '../endpoints/global/events/GetEventNotificationsEndpoint.js';

package/src/excel-loaders/members.ts

@@ -1,7 +1,7 @@
 import type { XlsxTransformerColumn, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { Platform } from '@stamhoofd/models';
-import type { LimitedFilteredRequest, PlatformMember} from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, PlatformMember } from '@stamhoofd/structures';
 import { ExcelExportType, Gender, GroupType, MembershipStatus, PlatformFamily, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';

package/src/excel-loaders/organizations.ts

@@ -240,9 +240,9 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Organizations, {
         const organizationIds = organizations.results.map(o => o.id);
         const responsibilities = organizationIds.length
             ? await MemberResponsibilityRecord.select()
-                .where('organizationId', organizationIds)
-                .where('endDate', null)
-                .fetch()
+                    .where('organizationId', organizationIds)
+                    .where('endDate', null)
+                    .fetch()
             : [];
 
         // Load groups and members

package/src/excel-loaders/payments.ts

@@ -2,7 +2,7 @@ import { field } from '@simonbackx/simple-encoding';
 import type { XlsxTransformerColumn, XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { StripeAccount } from '@stamhoofd/models';
-import type { BalanceItemPaymentDetailed} from '@stamhoofd/structures';
+import type { BalanceItemPaymentDetailed } from '@stamhoofd/structures';
 import { BalanceItemRelationType, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemTypeName, PaginatedResponse, PaymentGeneral, PaymentMethodHelper, PaymentStatusHelper, StripeAccount as StripeAccountStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
@@ -400,6 +400,36 @@ function getStripeColumns(): XlsxTransformerColumn<PaymentGeneral>[] {
                 };
             },
         },
+        {
+            id: 'serviceFeeManual',
+            name: $t(`%1dO`),
+            width: 42,
+            getValue: (object: PaymentGeneralWithStripeAccount) => {
+                return {
+                    value: object.serviceFeeManual / 1_0000,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'serviceFeePayout',
+            name: $t(`%1VD`),
+            width: 50,
+            getValue: (object: PaymentGeneralWithStripeAccount) => {
+                return {
+                    value: object.serviceFeePayout / 1_0000,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
+                    },
+                };
+            },
+        },
         {
             id: 'stripeAccountId',
             name: $t(`%1m`),

package/src/excel-loaders/platform-memberships.ts

@@ -25,7 +25,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
             getValue: (membership: PlatformMembership) => {
                 const membershipType = Platform.shared.config.membershipTypes.find(m => m.id === membership.membershipTypeId);
                 const value = membershipType ? membershipType.name : '';
-                return {value};
+                return { value };
             },
         },
         {
@@ -66,25 +66,25 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
                 return {
                     value: membership.price / 1_0000,
                     style: {
-                    numberFormat: {
-                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
                     },
-                },
                 };
             },
         },
         {
             id: 'priceWithoutDiscount',
-            name:  $t(`%1Nm`),
+            name: $t(`%1Nm`),
             width: 10,
             getValue: (membership: PlatformMembership) => {
                 return {
                     value: membership.priceWithoutDiscount / 1_0000,
                     style: {
-                    numberFormat: {
-                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
                     },
-                },
                 };
             },
         },
@@ -214,7 +214,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
             id: 'member.firstName',
             name: $t(`%1O8`),
             width: 20,
-            getValue:(membership: PlatformMembership) => ({
+            getValue: (membership: PlatformMembership) => ({
                 value: membership.member.firstName,
             }),
         },
@@ -222,7 +222,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
             id: 'member.lastName',
             name: $t(`%1Or`),
             width: 20,
-            getValue:(membership: PlatformMembership) => ({
+            getValue: (membership: PlatformMembership) => ({
                 value: membership.member.lastName,
             }),
         },
@@ -231,7 +231,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
             id: 'organization.name',
             name: $t(`%1PW`),
             width: 20,
-            getValue:(membership: PlatformMembership) => ({
+            getValue: (membership: PlatformMembership) => ({
                 value: membership.organization.name,
             }),
         },
@@ -239,14 +239,13 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
             id: 'organization.uri',
             name: $t(`%1PZ`),
             width: 20,
-            getValue:(membership: PlatformMembership) => ({
+            getValue: (membership: PlatformMembership) => ({
                 value: membership.organization.uri,
             }),
-        }
+        },
     ],
 };
 
-
 ExportToExcelEndpoint.loaders.set(ExcelExportType.PlatformMemberships, {
     fetch: async (query: LimitedFilteredRequest) => {
         const data = await GetPlatformMembershipsEndpoint.buildData(query);

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

@@ -146,7 +146,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'pricePending',
-            name: $t(`%1PL`),
+            name: $t(`%1OL`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.pricePending / 1_0000,
@@ -273,7 +273,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'amountPending',
-            name: $t(`%1PL`),
+            name: $t(`%1OL`),
             width: 18,
             getValue: (object: ReceivableBalance) => ({
                 value: object.amountPending / 1_0000,

package/src/excel-loaders/registrations.ts

@@ -1,7 +1,7 @@
 import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { Platform } from '@stamhoofd/models';
-import type { LimitedFilteredRequest, PlatformMember} from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, PlatformMember } from '@stamhoofd/structures';
 import { ExcelExportType, getGroupTypeName, PlatformRegistration, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint.js';
@@ -164,8 +164,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
                 if (registration.payingOrganizationId) {
                     const organization = registration.member.organizations.find(o => o.id === registration.payingOrganizationId);
                     value = organization ? organization.name : $t(`%Gr`);
-                }
-                else {
+                } else {
                     value = $t(`%18s`);
                 }
 

package/src/helpers/AddressValidator.ts

@@ -40,8 +40,7 @@ export class AddressValidatorStatic {
 
             // Don't do validation on last letters
             postalCode = numbers;
-        }
-        else {
+        } else {
             postalCode = postalCode.trim();
         }
 
@@ -50,8 +49,7 @@ export class AddressValidatorStatic {
             if (!/\d{4}/.test(numbers)) {
                 postalCode = numbers;
                 address.city = address.city.substring(4).trim();
-            }
-            else {
+            } else {
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Postal code is required',
@@ -93,8 +91,7 @@ export class AddressValidatorStatic {
                 const c = await City.getByID(city.parentCityId ?? city.id);
                 try {
                     await this.syncCity(c!);
-                }
-                catch (e) {
+                } catch (e) {
                     console.error('Ignored error while syncing city');
                     console.error(e);
                 }
@@ -115,8 +112,7 @@ export class AddressValidatorStatic {
 
                 if (bestStreet && bestScore < 3) {
                     address.street = bestStreet.name;
-                }
-                else {
+                } else {
                     // Search for the street
                     bestScore = 0;
                     bestStreet = undefined;
@@ -144,8 +140,7 @@ export class AddressValidatorStatic {
                         field: 'street',
                     });
                 }
-            }
-            else {
+            } else {
                 // Skip validation for some regions that don't support validation
             }
         }
@@ -180,8 +175,7 @@ export class AddressValidatorStatic {
                 streetNames.push(...streets);
                 url = result.volgende;
             }
-        }
-        catch (e) {
+        } catch (e) {
             console.error(e.response.data);
             throw new Error('Failed to fetch streets');
         }
@@ -238,8 +232,7 @@ export class AddressValidatorStatic {
             for (const city of cities) {
                 try {
                     await this.syncCity(city);
-                }
-                catch (e) {
+                } catch (e) {
                     console.error('Failed city sync for ' + city.name, e);
                 }
             }