@stamhoofd/backend 2.120.6 → 2.122.0

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);
                 }
             }

package/src/helpers/AdminPermissionChecker.ts

@@ -8,6 +8,8 @@ import { AccessRight, EmailTemplate as EmailTemplateStruct, EventPermissionCheck
 import { Formatter } from '@stamhoofd/utility';
 import type { RecordCacheEntry } from '../services/MemberRecordStore.js';
 import { MemberRecordStore } from '../services/MemberRecordStore.js';
+import { getFinancialSupportSettingsAsync } from './FinancialSupportHelper.js';
+import { RecordAnswerHelper } from './RecordAnswerHelper.js';
 import { addTemporaryMemberAccess, hasTemporaryMemberAccess } from './TemporaryMemberAccess.js';
 
 /**
@@ -99,12 +101,10 @@ export class AdminPermissionChecker {
                 const resolved = await cache;
                 if (resolved) {
                     cached.push(resolved);
-                }
-                else {
+                } else {
                     // Not found, no need to readd
                 }
-            }
-            else {
+            } else {
                 remainingIds.push(groupId);
             }
         }
@@ -223,15 +223,13 @@ export class AdminPermissionChecker {
             if (this.user.organizationId && organizationId !== this.user.organizationId) {
                 return false;
             }
-        }
-        else {
+        } else {
             if (STAMHOOFD.userMode === 'organization') {
                 // User is limited to a scope: can't access platform resources
                 if (this.user.organizationId) {
                     return false;
                 }
-            }
-            else {
+            } else {
                 // User can access platform resources (e.g. API keys)
             }
         }
@@ -321,8 +319,7 @@ export class AdminPermissionChecker {
             if (group.settings.allowRegistrationsByOrganization && !group.getStructure().closed) {
                 if (group.organizationId !== asOrganizationId) {
                     return await this.hasFullAccess(asOrganizationId);
-                }
-                else {
+                } else {
                     return await this.hasSomeAccess(asOrganizationId);
                 }
             }
@@ -348,8 +345,7 @@ export class AdminPermissionChecker {
         try {
             await this.checkEventAccess(event);
             return true;
-        }
-        catch (e) {
+        } catch (e) {
             if (isSimpleError(e) || isSimpleErrors(e)) {
                 return false;
             }
@@ -628,7 +624,7 @@ export class AdminPermissionChecker {
     ): Promise<boolean> {
         // These balance items are out of scope - but we do have access to them
         for (const balanceItem of balanceItems) {
-            if (balanceItem.payingOrganizationId && this.checkScope(balanceItem.payingOrganizationId)) {
+            if (balanceItem.payingOrganizationId && (this.checkScope(balanceItem.payingOrganizationId) || this.checkScope(balanceItem.organizationId))) {
                 if (await this.canManagePayments(balanceItem.payingOrganizationId)) {
                     return true;
                 }
@@ -800,7 +796,12 @@ export class AdminPermissionChecker {
                 return false;
             }
 
-            return EmailTemplateStruct.allowOrganizationLevel(template.type);
+            if (!this.organization) {
+                const org = await this.getOrganization(template.organizationId);
+                return EmailTemplateStruct.allowOrganizationLevel(template.type, org, this.platform);
+            }
+
+            return EmailTemplateStruct.allowOrganizationLevel(template.type, this.organization, this.platform);
         }
 
         // Note: if the template has an organizationId of null, everyone can access it, but only for reading
@@ -868,8 +869,7 @@ export class AdminPermissionChecker {
             if (await this.canManagePayments(member.organizationId)) {
                 return true;
             }
-        }
-        else {
+        } else {
             const organizationIds = Formatter.uniqueArray(member.registrations.map(r => r.organizationId));
             for (const organizationId of organizationIds) {
                 if (await this.canManagePayments(organizationId)) {
@@ -1117,7 +1117,7 @@ export class AdminPermissionChecker {
         return false;
     }
 
-    async hasFullAccess(organizationId: string, level = PermissionLevel.Full): Promise<boolean> {
+    async hasFullAccess(organizationId: string | Organization, level = PermissionLevel.Full): Promise<boolean> {
         const organizationPermissions = await this.getOrganizationPermissions(organizationId);
 
         if (!organizationPermissions) {
@@ -1157,14 +1157,12 @@ export class AdminPermissionChecker {
             if (this.checkScope(member.organizationId)) {
                 organizations.push(await this.getOrganization(member.organizationId));
             }
-        }
-        else {
+        } else {
             if (organizationId) {
                 if (this.checkScope(organizationId)) {
                     organizations.push(await this.getOrganization(organizationId));
                 }
-            }
-            else {
+            } else {
                 for (const registration of member.registrations) {
                     if (this.checkScope(registration.organizationId)) {
                         if (!organizations.find(o => o.id === registration.organizationId)) {
@@ -1205,8 +1203,7 @@ export class AdminPermissionChecker {
                 if (platformPermissions.hasAccessRight(AccessRight.OrganizationManagePayments)) {
                     return true;
                 }
-            }
-            else {
+            } else {
                 if (platformPermissions.hasAccessRight(level === PermissionLevel.Read ? AccessRight.MemberReadFinancialData : AccessRight.MemberWriteFinancialData)) {
                     return true;
                 }
@@ -1284,8 +1281,8 @@ export class AdminPermissionChecker {
                             return {
                                 record,
                                 rootCategoryId: recordCategory.id,
-                                organizationId: this.organization.id
-                            }
+                                organizationId: this.organization.id,
+                            };
                         }
                     }
                 }
@@ -1330,8 +1327,7 @@ export class AdminPermissionChecker {
                     record: record.record,
                 };
             }
-        }
-        else {
+        } else {
             // ONLY check current scoped organization
             if (this.organization) {
                 const organizationPermissions = await this.getOrganizationPermissions(this.organization.id);
@@ -1366,14 +1362,13 @@ export class AdminPermissionChecker {
         };
     }
 
-    private async loopRecordAnswerSettingsAccess<T extends RecordAnswer | AutoEncoderPatchType<RecordAnswer>>({member, level, recordAnswers, callback }:
+    private async loopRecordAnswerSettingsAccess<T extends RecordAnswer | AutoEncoderPatchType<RecordAnswer>>({ member, level, recordAnswers, callback }:
         {
-            member: MemberWithUsersRegistrationsAndGroups,
-            level: PermissionLevel,
-            recordAnswers: PatchMap<string, T | null | undefined> |  Map<string, T>
-            callback: (result: { canAccess: false; record: RecordSettings | null } | { canAccess: true; record: RecordSettings }, entry: [keys: string, value: T | null | undefined]) => void
-        }): Promise<void>
-    {
+            member: MemberWithUsersRegistrationsAndGroups;
+            level: PermissionLevel;
+            recordAnswers: PatchMap<string, T | null | undefined> | Map<string, T>;
+            callback: (result: { canAccess: false; record: RecordSettings | null } | { canAccess: true; record: RecordSettings }, entry: [keys: string, value: T | null | undefined]) => void;
+        }): Promise<void> {
         if (STAMHOOFD.userMode !== 'platform') {
             let organization = this.organization;
 
@@ -1386,11 +1381,11 @@ export class AdminPermissionChecker {
                     if (member.registrations.length === 0) {
                         // no access to any records (theoretically a global admin should have access, but normally this case should not happen)
                         for (const entry of recordAnswers.entries()) {
-                            callback({canAccess: false, record: null}, entry);
+                            callback({ canAccess: false, record: null }, entry);
                         }
                         return;
                     }
-                    
+
                     // in userMode organization a member can only be linked to 1 organization
                     organizationId = member.registrations[0].organizationId;
                 }
@@ -1399,7 +1394,7 @@ export class AdminPermissionChecker {
             }
 
             const organizationId = organization.id;
-            const map = new Map<string, RecordCacheEntry>()
+            const map = new Map<string, RecordCacheEntry>();
 
             // create map
             for (const category of organization.meta.recordsConfiguration.recordCategories) {
@@ -1413,7 +1408,7 @@ export class AdminPermissionChecker {
                     });
                 }
             }
-            
+
             for (const entry of recordAnswers.entries()) {
                 const key = entry[0];
                 const cachedRecordEntry = map.get(key);
@@ -1423,11 +1418,11 @@ export class AdminPermissionChecker {
                         record: cachedRecordEntry.record,
                         organizationId: cachedRecordEntry.organizationId,
                         rootCategoryId: cachedRecordEntry.rootCategoryId,
-                        level
+                        level,
                     });
-                    callback({canAccess, record: cachedRecordEntry.record}, entry);
+                    callback({ canAccess, record: cachedRecordEntry.record }, entry);
                 } else {
-                    callback({canAccess: false, record: null}, entry);
+                    callback({ canAccess: false, record: null }, entry);
                 }
             }
 
@@ -1435,7 +1430,7 @@ export class AdminPermissionChecker {
         }
 
         // userMode platform
-         for (const entry of recordAnswers.entries()) {
+        for (const entry of recordAnswers.entries()) {
             const key = entry[0];
             const cachedRecordEntry = await MemberRecordStore.getRecord(key);
             if (cachedRecordEntry) {
@@ -1444,18 +1439,18 @@ export class AdminPermissionChecker {
                     record: cachedRecordEntry.record,
                     organizationId: cachedRecordEntry.organizationId,
                     rootCategoryId: cachedRecordEntry.rootCategoryId,
-                    level
+                    level,
                 });
-                callback({canAccess, record: cachedRecordEntry.record}, entry);
+                callback({ canAccess, record: cachedRecordEntry.record }, entry);
             } else {
-                callback({canAccess: false, record: null}, entry);
+                callback({ canAccess: false, record: null }, entry);
             }
         }
     }
 
-    private async checkRecordAccess({member, level, record, organizationId, rootCategoryId}: {member: MemberWithUsersRegistrationsAndGroups, record: RecordSettings, organizationId: string | null, rootCategoryId: string, level: PermissionLevel}): Promise<boolean> {
+    private async checkRecordAccess({ member, level, record, organizationId, rootCategoryId }: { member: MemberWithUsersRegistrationsAndGroups; record: RecordSettings; organizationId: string | null; rootCategoryId: string; level: PermissionLevel }): Promise<boolean> {
         if (!this.checkScope(organizationId)) {
-            return false
+            return false;
         }
 
         const isUserManager = this.isUserManager(member);
@@ -1474,8 +1469,7 @@ export class AdminPermissionChecker {
             if (organizationPermissions && organizationPermissions.hasResourceAccess(PermissionsResourceType.RecordCategories, rootCategoryId, level)) {
                 return true;
             }
-        }
-        else {
+        } else {
             // Also check current scoped organization
             if (this.organization) {
                 const organizationPermissions = await this.getOrganizationPermissions(this.organization.id);
@@ -1520,8 +1514,7 @@ export class AdminPermissionChecker {
                     if (await this.canAccessRegistration(registration, level)) {
                         return true;
                     }
-                }
-                else {
+                } else {
                     checkedOrganizations.set(registration.organizationId, false);
                 }
             }
@@ -1555,14 +1548,13 @@ export class AdminPermissionChecker {
             callback: ({ canAccess, record }, [key, value]) => {
                 if (!canAccess) {
                     cloned.details.recordAnswers.delete(key);
-                }
-                else {
-                    if (value) {
+                } else {
+                    if (value && RecordAnswerHelper.haveTypesSameClass(value.settings.type, record.type)) {
                         // Force update
                         value.settings = record;
                     }
                 }
-            }
+            },
         });
 
         const isUserManager = this.isUserManager(member);
@@ -1669,14 +1661,12 @@ export class AdminPermissionChecker {
         if (data.details.uitpasNumberDetails && data.details.uitpasNumberDetails.socialTariff !== undefined) {
             if (data.details.uitpasNumberDetails.uitpasNumber === undefined) {
                 data.details.uitpasNumberDetails = undefined;
-            }
-            else if (data.details.uitpasNumberDetails.uitpasNumber !== member.details.uitpasNumberDetails?.uitpasNumber) {
+            } else if (data.details.uitpasNumberDetails.uitpasNumber !== member.details.uitpasNumberDetails?.uitpasNumber) {
                 // if uitpas number did change -> status should be reset
                 data.details.uitpasNumberDetails = UitpasNumberDetails.create({
                     uitpasNumber: data.details.uitpasNumberDetails.uitpasNumber,
                 });
-            }
-            else {
+            } else {
                 // if uitpas number did not change
                 data.details.uitpasNumberDetails.socialTariff = member.details.uitpasNumberDetails?.socialTariff;
             }
@@ -1695,7 +1685,7 @@ export class AdminPermissionChecker {
                 member,
                 level: PermissionLevel.Write,
                 recordAnswers: data.details.recordAnswers,
-                callback: ({canAccess, record}, [_key, value]) => {
+                callback: ({ canAccess, record }, [_key, value]) => {
                     if (!canAccess) {
                         throw new SimpleError({
                             code: 'permission_denied',
@@ -1708,8 +1698,8 @@ export class AdminPermissionChecker {
                     if (value) {
                         value.settings = record;
                     }
-                }
-            })
+                },
+            });
         }
 
         const isUserManager = this.isUserManager(member);
@@ -1731,7 +1721,13 @@ export class AdminPermissionChecker {
         // Has financial write access?
         if (!await this.hasFinancialMemberAccess(member, PermissionLevel.Write)) {
             if (isUserManager && isSetFinancialSupportTrue) {
-                const financialSupportSettings = this.platform.config.financialSupport;
+                const financialSupportSettings = await getFinancialSupportSettingsAsync(this.platform, async () => {
+                    if (member.organizationId) {
+                        return await this.getOrganization(member.organizationId);
+                    }
+                    return null;
+                });
+
                 const preventSelfAssignment = financialSupportSettings?.preventSelfAssignment === true;
 
                 if (preventSelfAssignment) {
@@ -1747,8 +1743,7 @@ export class AdminPermissionChecker {
             if (data.details.requiresFinancialSupport) {
                 if (isUserManager) {
                     // Already handled
-                }
-                else {
+                } else {
                     throw new SimpleError({
                         code: 'permission_denied',
                         message: 'Je hebt geen toegangsrechten om de financiële status van dit lid aan te passen',