@stamhoofd/backend 2.116.0 → 2.117.0

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

@@ -0,0 +1,268 @@
+import { XlsxBuiltInNumberFormat, XlsxTransformerColumn } from '@stamhoofd/excel-writer';
+import { BalanceItem } from '@stamhoofd/models';
+import { BalanceItemRelationType, BalanceItemWithPayments, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemTypeName, PaginatedResponse, PaymentStatus } from '@stamhoofd/structures';
+import { Formatter } from '@stamhoofd/utility';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
+import { GetBalanceItemsEndpoint } from '../endpoints/organization/dashboard/balance-items/GetBalanceItemsEndpoint.js';
+
+ExportToExcelEndpoint.loaders.set(ExcelExportType.BalanceItems, {
+    fetch: async (requestQuery) => {
+        const data = await GetBalanceItemsEndpoint.buildData(requestQuery);
+
+        return new PaginatedResponse({
+            ...data,
+            results: await BalanceItem.getStructureWithPayments(data.results),
+        });
+    },
+    sheets: [
+        {
+            id: 'balanceItems',
+            name: $t(`fbe6e4c4-8d98-41b5-b839-11d469031002`),
+            columns: [
+                ...getBalanceItemColumns(),
+            ],
+        },
+    ],
+});
+
+function getBalanceItemColumns(): XlsxTransformerColumn<BalanceItemWithPayments>[] {
+    return [
+        {
+            id: 'id',
+            name: $t(`29360811-3663-496c-8d8f-c9fdf9467a74`),
+            width: 40,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.id,
+                style: {
+                    font: {
+                        bold: true,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'type',
+            name: $t(`f97ad8c1-31d2-4b61-9e09-3be86eaeba08`),
+            width: 30,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: getBalanceItemTypeName(object.type),
+            }),
+        },
+        {
+            id: 'category',
+            name: $t(`c5d24ab8-a87a-481d-a470-23e9386199f3`),
+            width: 30,
+            getValue: (object: BalanceItemWithPayments) => {
+                return {
+                    value: Formatter.capitalizeFirstLetter(object.category),
+                };
+            },
+        },
+        {
+            id: 'description',
+            name: $t(`9c4977db-1ce9-424b-92cf-4bbe7f6606fd`),
+            width: 40,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.description,
+            }),
+        },
+        {
+            id: 'createdAt',
+            name: $t(`10a1cf76-0757-4c92-9923-a19cd77fe24c`),
+            width: 16,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.createdAt,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.DateTimeSlash,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'dueAt',
+            name: $t(`3d586760-01f3-42c3-82be-44cea7ad0820`),
+            width: 16,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.dueAt,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.DateTimeSlash,
+                    },
+                },
+            }),
+        },
+        {
+            match: (id) => {
+                if (id.startsWith('relations.')) {
+                    const type = id.split('.')[1] as BalanceItemRelationType;
+                    if (Object.values(BalanceItemRelationType).includes(type)) {
+                        return [
+                            {
+                                id: `relations.${type}`,
+                                name: getBalanceItemRelationTypeName(type),
+                                width: 35,
+                                getValue: (object: BalanceItemWithPayments) => ({
+                                    value: object.relations.get(type)?.name?.toString() || '',
+                                }),
+                            },
+                        ];
+                    }
+                }
+            },
+        },
+        {
+            id: 'quantity',
+            name: $t(`f085f874-242d-47cb-a404-96eab69662ec`),
+            width: 20,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.quantity,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Number,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'unitPrice',
+            name: $t(`7f7fdce2-1fcd-44c9-8c98-856aea11ffc3`),
+            width: 20,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.unitPrice / 1_0000,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'payablePriceWithVAT',
+            name: $t(`6f3104d4-9b8f-4946-8434-77202efae9f0`),
+            width: 20,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.payablePriceWithVAT / 1_0000,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                    },
+                },
+            }),
+        },
+
+        {
+            id: 'priceOpen',
+            name: $t(`cae1af9b-b2b1-440e-893c-e7c1010f0d4b`),
+            width: 40,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.priceOpen / 1_0000,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                    },
+                },
+            }),
+        },
+
+        {
+            id: 'pricePaid',
+            name: $t(`b9716962-aa02-4bd5-a8b3-d7d8def6ac28`),
+            width: 40,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.pricePaid / 1_0000,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                    },
+                },
+            }),
+        },
+
+        {
+            id: 'pricePending',
+            name: $t(`73637226-b5a9-4a64-b006-27122c0516d4`),
+            width: 40,
+            getValue: (object: BalanceItemWithPayments) => ({
+                value: object.pricePending / 1_0000,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                    },
+                },
+            }),
+        },
+
+        {
+            match: (id) => {
+                if (id.startsWith('paidIn[')) {
+                    // paidIn[year]
+                    const yearStr = id.substring('paidIn['.length, id.length - 1);
+                    const year = parseInt(yearStr);
+                    if (year && year > 2000 && year < 2100) {
+                        return [
+                            {
+                                id: `paidIn[${year}]`,
+                                name: $t('7df15807-0b2d-487f-8c97-deb8ce79d07b', { year: year.toFixed(0) }),
+                                width: 35,
+                                getValue: (object: BalanceItemWithPayments) => {
+                                    let value = 0;
+                                    for (const p of object.payments) {
+                                        if (p.payment.status === PaymentStatus.Succeeded && p.payment.paidAt) {
+                                            if (Formatter.year(p.payment.paidAt) === year) {
+                                                value += p.price;
+                                            }
+                                        }
+                                    }
+
+                                    return {
+                                        value: value / 1_0000,
+                                        style: {
+                                            numberFormat: {
+                                                id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                                            },
+                                        },
+                                    };
+                                },
+                            },
+                        ];
+                    }
+                }
+            },
+        },
+
+        {
+            match: (id) => {
+                if (id.startsWith('chargedIn[')) {
+                    // paidIn[year]
+                    const yearStr = id.substring('chargedIn['.length, id.length - 1);
+                    const year = parseInt(yearStr);
+                    if (year && year > 2000 && year < 2100) {
+                        return [
+                            {
+                                id: `chargedIn[${year}]`,
+                                name: $t('91748032-ca3b-49c2-b065-ddfcb9fd460e', { year: year.toFixed(0) }),
+                                width: 35,
+                                getValue: (object: BalanceItemWithPayments) => {
+                                    let value = 0;
+                                    if (Formatter.year(object.createdAt) === year) {
+                                        value = object.payablePriceWithVAT;
+                                    }
+
+                                    return {
+                                        value: value / 1_0000,
+                                        style: {
+                                            numberFormat: {
+                                                id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                                            },
+                                        },
+                                    };
+                                },
+                            },
+                        ];
+                    }
+                }
+            },
+        },
+    ];
+}

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

@@ -1,9 +1,9 @@
 import { XlsxBuiltInNumberFormat, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { EventNotification, EventNotificationStatus, EventNotificationStatusHelper, ExcelExportType, LimitedFilteredRequest, Platform as PlatformStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
-import { GetEventNotificationsEndpoint } from '../endpoints/global/events/GetEventNotificationsEndpoint';
-import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
-import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
+import { GetEventNotificationsEndpoint } from '../endpoints/global/events/GetEventNotificationsEndpoint.js';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
+import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper.js';
 
 // Assign to a typed variable to assure we have correct type checking in place
 const sheet: XlsxTransformerSheet<EventNotification, EventNotification> = {

package/src/excel-loaders/index.ts

@@ -1,5 +1,6 @@
-import './members';
-import './payments';
-import './organizations';
-import './receivable-balances';
-import './event-notifications';
+import './members.js';
+import './payments.js';
+import './organizations.js';
+import './receivable-balances.js';
+import './event-notifications.js';
+import './balance-items.js';

package/src/excel-loaders/organizations.ts

@@ -3,10 +3,10 @@ import { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { Group, Member, MemberResponsibilityRecord } from '@stamhoofd/models';
 import { ExcelExportType, LimitedFilteredRequest, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, MemberWithRegistrationsBlob, Organization as OrganizationStruct, PaginatedResponse, Platform as PlatformStruct, Premise } from '@stamhoofd/structures';
 import { Formatter, Sorter } from '@stamhoofd/utility';
-import { GetOrganizationsEndpoint } from '../endpoints/admin/organizations/GetOrganizationsEndpoint';
-import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
-import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures';
-import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
+import { GetOrganizationsEndpoint } from '../endpoints/admin/organizations/GetOrganizationsEndpoint.js';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
+import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures.js';
+import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper.js';
 
 class MemberResponsibilityRecordWithMember extends MemberResponsibilityRecordStruct {
     @field({ decoder: MemberWithRegistrationsBlob })

package/src/excel-loaders/payments.ts

@@ -3,9 +3,9 @@ import { XlsxBuiltInNumberFormat, XlsxTransformerColumn, XlsxTransformerConcrete
 import { StripeAccount } from '@stamhoofd/models';
 import { BalanceItemPaymentDetailed, 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';
-import { GetPaymentsEndpoint } from '../endpoints/organization/dashboard/payments/GetPaymentsEndpoint';
-import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
+import { GetPaymentsEndpoint } from '../endpoints/organization/dashboard/payments/GetPaymentsEndpoint.js';
+import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper.js';
 
 type PaymentWithItem = {
     payment: PaymentGeneral;
@@ -113,6 +113,14 @@ function getBalanceItemColumns(): XlsxTransformerColumn<PaymentWithItem>[] {
                 },
             }),
         },
+        {
+            id: 'balanceItem.id',
+            name: $t(`89594841-9a44-473f-8250-0ccafb570b6f`),
+            width: 40,
+            getValue: (object: PaymentWithItem) => ({
+                value: object.balanceItemPayment.balanceItem.id,
+            }),
+        },
         {
             id: 'paymentId',
             name: $t(`0601033f-1678-4781-96cd-1653448d689a`),

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

@@ -1,8 +1,8 @@
 import { XlsxBuiltInNumberFormat, XlsxTransformerColumn, XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
 import { BalanceItemRelationType, BalanceItemWithPayments, DetailedReceivableBalance, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemStatusName, getBalanceItemTypeName, getReceivableBalanceTypeName, PaginatedResponse, ReceivableBalance } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
-import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
-import { GetReceivableBalancesEndpoint } from '../endpoints/organization/dashboard/receivable-balances/GetReceivableBalancesEndpoint';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
+import { GetReceivableBalancesEndpoint } from '../endpoints/organization/dashboard/receivable-balances/GetReceivableBalancesEndpoint.js';
 
 type ReceivableBalanceWithItem = {
     receivableBalance: DetailedReceivableBalance;

package/src/helpers/AddressValidator.test.ts

@@ -1,7 +1,7 @@
 import { City, PostalCode, Province } from '@stamhoofd/models';
 import { Address, Country } from '@stamhoofd/structures';
 
-import { AddressValidator } from './AddressValidator';
+import { AddressValidator } from './AddressValidator.js';
 
 describe('AddressValidator', () => {
     it('Can validate a city', async () => {

package/src/helpers/AddressValidator.ts

@@ -137,7 +137,7 @@ export class AddressValidatorStatic {
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'Invalid street, do you mean ' + bestStreet.name + '?',
-                        human: $t("f35e3d3a-880e-4703-a018-a24eed53bf64", { street: bestStreet.name }),
+                        human: $t('f35e3d3a-880e-4703-a018-a24eed53bf64', { street: bestStreet.name }),
                         field: 'street',
                     });
                 }

package/src/helpers/AdminPermissionChecker.ts

@@ -932,7 +932,7 @@ export class AdminPermissionChecker {
         if (organizationId) {
             return this.hasSomeAccess(organizationId);
         }
-        return this.hasPlatformFullAccess();
+        return this.hasSomePlatformAccess();
     }
 
     async canSendEmails(organizationId: Organization | string | null) {

package/src/helpers/AuthenticatedStructures.ts

@@ -1,11 +1,10 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { AuditLog, BalanceItem, CachedBalance, Document, Event, EventNotification, Group, Invoice, Member, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithUsersRegistrationsAndGroups, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, RegistrationPeriod, Ticket, User, Webshop } from '@stamhoofd/models';
-import { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, Company, DetailedReceivableBalance, Document as DocumentStruct, EventNotification as EventNotificationStruct, Event as EventStruct, GenericBalance, Group as GroupStruct, GroupType, InvoicedBalanceItem, InvoiceStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MembersBlob, MemberWithRegistrationsBlob, NamedObject, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentCustomer, PaymentGeneral, PermissionLevel, Platform, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, RegistrationsBlob, RegistrationWithMemberBlob, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, DetailedReceivableBalance, Document as DocumentStruct, EventNotification as EventNotificationStruct, Event as EventStruct, GenericBalance, Group as GroupStruct, GroupType, InvoicedBalanceItem, InvoiceStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MembersBlob, MemberWithRegistrationsBlob, NamedObject, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentCustomer, PaymentGeneral, PermissionLevel, Platform, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, RegistrationsBlob, RegistrationWithMemberBlob, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct, BalanceItem as BalanceItemStruct } from '@stamhoofd/structures';
 import { Sorter } from '@stamhoofd/utility';
 
 import { SQL } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
-import { BalanceItemService } from '../services/BalanceItemService.js';
 import { Context } from './Context.js';
 
 /**
@@ -61,6 +60,9 @@ export class AuthenticatedStructures {
 
         const { invoicedBalanceItems } = await Invoice.loadBalanceItems(invoices);
 
+        const paymentModels = await Payment.select().where('invoiceId', invoices.map(i => i.id)).fetch();
+        const payments = await this.paymentsGeneral(paymentModels, false);
+
         return invoices.map((invoice) => {
             const items = invoicedBalanceItems.filter(i => i.invoiceId === invoice.id);
             return InvoiceStruct.create({
@@ -68,6 +70,7 @@ export class AuthenticatedStructures {
                 items: items.map((item) => {
                     return InvoicedBalanceItem.create(item);
                 }),
+                payments: payments.filter(p => p.invoiceId === invoice.id),
             });
         });
     }
@@ -1203,4 +1206,16 @@ export class AuthenticatedStructures {
 
         return structs;
     }
+
+    static async balanceItems(balanceItems: BalanceItem[]) {
+        return balanceItems.map((balanceItem) => {
+            return BalanceItemStruct.create({
+                ...balanceItem,
+            });
+        });
+    }
+
+    static async balanceItemsWithPayments(balanceItems: BalanceItem[]) {
+        return await BalanceItem.getStructureWithPayments(balanceItems);
+    }
 }

package/src/helpers/EmailResumer.ts

@@ -1,7 +1,7 @@
 import { Email, Organization, User } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
 import { EmailStatus } from '@stamhoofd/structures';
-import { ContextInstance } from './Context';
+import { ContextInstance } from './Context.js';
 
 export async function resumeEmails() {
     const query = SQL.select()

package/src/helpers/FlagMomentCleanup.ts

@@ -1,7 +1,7 @@
 import { Group, Member, MemberResponsibilityRecord, Organization, Platform, Registration } from '@stamhoofd/models';
 import { SQL, SQLWhereExists } from '@stamhoofd/sql';
 import { GroupType } from '@stamhoofd/structures';
-import { MemberUserSyncer } from './MemberUserSyncer';
+import { MemberUserSyncer } from './MemberUserSyncer.js';
 
 export class FlagMomentCleanup {
     /**

package/src/helpers/ForwardHandler.test.ts

@@ -2,7 +2,7 @@ import { EmailAddress } from '@stamhoofd/email';
 import { OrganizationFactory, UserFactory } from '@stamhoofd/models';
 import { OrganizationEmail, PermissionLevel, Permissions } from '@stamhoofd/structures';
 
-import { ForwardHandler } from './ForwardHandler';
+import { ForwardHandler } from './ForwardHandler.js';
 
 describe('ForwardHandler', () => {
     it('should send to default e-mail', async () => {

package/src/helpers/ForwardHandler.ts

@@ -111,7 +111,7 @@ export class ForwardHandler {
             return doBounce();
         }
 
-        console.log('Forward to ' + defaultEmail);
+        console.log('Forward to', defaultEmail);
 
         let html: string | undefined = undefined;
 

package/src/helpers/GlobalHelper.ts

@@ -1,8 +1,8 @@
 import { I18n } from '@stamhoofd/backend-i18n';
-import { BalanceItemService } from '../services/BalanceItemService';
-import { FileSignService } from '../services/FileSignService';
-import { MemberRecordStore } from '../services/MemberRecordStore';
-import { ContextInstance } from './Context';
+import { BalanceItemService } from '../services/BalanceItemService.js';
+import { FileSignService } from '../services/FileSignService.js';
+import { MemberRecordStore } from '../services/MemberRecordStore.js';
+import { ContextInstance } from './Context.js';
 
 export class GlobalHelper {
     static async load() {