@stamhoofd/backend 2.121.0 → 2.122.0

package/src/endpoints/organization/dashboard/billing/OrganizationCheckoutEndpoint.ts

@@ -3,13 +3,14 @@ import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { BalanceItem, Organization, Platform, STPackage } from '@stamhoofd/models';
-import { BalanceItemStatus, BalanceItemType, CheckoutResponse, OrganizationPackagesStatus, OrganizationCheckout, STPackageStruct } from '@stamhoofd/structures';
+import { BalanceItemStatus, BalanceItemType, CheckoutResponse, OrganizationCheckout, OrganizationPackagesStatus, STPackageStruct } from '@stamhoofd/structures';
+import { CreateMandateSettings } from '@stamhoofd/structures/checkout/CreateMandateSettings.js';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';
+import { BalanceItemService } from '../../../../services/BalanceItemService.js';
 import { PaymentService } from '../../../../services/PaymentService.js';
 import { STPackageService } from '../../../../services/STPackageService.js';
-import { CreateMandateSettings } from '@stamhoofd/structures/checkout/CreateMandateSettings.js';
-import { BalanceItemService } from '../../../../services/BalanceItemService.js';
+import { VATService } from '../../../../services/VATService.js';
 
 type Params = { sellingOrganizationId: string };
 type Query = undefined;
@@ -27,7 +28,7 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, '/billing/@sellingOrganizationId/checkout', {sellingOrganizationId: String});
+        const params = Endpoint.parseParameters(request.url, '/billing/@sellingOrganizationId/checkout', { sellingOrganizationId: String });
 
         if (params) {
             return [true, params as Params];
@@ -45,30 +46,15 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
         }
         const checkout = request.body;
 
-        // Validate company
-        if (checkout.customer && checkout.customer.company) {
-            // Search company id
-            // this avoids needing to check the VAT number every time
-            const id = checkout.customer.company.id;
-            const foundCompany = organization.meta.companies.find(c => c.id === id);
-
-            if (!foundCompany) {
-                throw new SimpleError({
-                    code: 'invalid_data',
-                    message: $t(`%w1`),
-                });
-            }
-        }
-
         const id = request.params.sellingOrganizationId;
         if (!id) {
             throw new SimpleError({
                 code: 'unavailable',
                 message: 'This is temporarily unavailable',
-                human: $t('%1Rz')
-            })
+                human: $t('%1Rz'),
+            });
         }
-        
+
         const sellingOrganization = await Organization.getByID(id);
         if (!sellingOrganization || !sellingOrganization.active) {
             throw new SimpleError({
@@ -76,8 +62,8 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
                 code: 'not_found',
                 message: 'Selling organization not found',
                 human: $t('%1R5'),
-                field: 'sellingOrganization'
-            })
+                field: 'sellingOrganization',
+            });
         }
 
         if (sellingOrganization.id === organization.id) {
@@ -88,8 +74,8 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
         }
 
         const packages: STPackageStruct[] = [];
-        const balanceItems: Map<BalanceItem, number> = new Map();
         const models: STPackage[] = [];
+        const balanceItems: Map<BalanceItem, number> = new Map();
 
         const membershipOrganizationId = (await Platform.getShared()).membershipOrganizationId;
 
@@ -120,11 +106,12 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
                 model.disableSave();
             }
 
-            const balanceItem = await STPackageService.chargePackage(model, undefined, checkout.customer ?? undefined);
+            const balanceItem = await STPackageService.chargePackage(model, sellingOrganization, checkout.customer?.company);
             if (balanceItem) {
-                balanceItem.VATExcempt = PaymentService.getVATExcempt({
-                    customer: checkout.customer,
-                    sellingOrganization
+                balanceItem.VATExcempt = VATService.getVATExcempt({
+                    company: checkout.customer?.company,
+                    sellingOrganization,
+                    type: 'services',
                 });
                 balanceItems.set(balanceItem, balanceItem.priceWithVAT);
             }
@@ -135,9 +122,9 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
             } else {
                 // Security addition
                 if (balanceItem && balanceItem.id) {
-                    throw new Error('Unexpected balance item save')
+                    throw new Error('Unexpected balance item save');
                 }
-                balanceItem?.disableSave()
+                balanceItem?.disableSave();
             }
 
             models.push(model);
@@ -145,7 +132,7 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
             if (model.meta.requiresMandate) {
                 if (checkout.proForma) {
                     if (!checkout.createMandate) {
-                        checkout.createMandate = CreateMandateSettings.create({saveAsDefault: true})
+                        checkout.createMandate = CreateMandateSettings.create({ saveAsDefault: true });
                     }
                 } else {
                     // setting checkout.mandate is not enough - we also need to set it as default.
@@ -153,15 +140,15 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
                     if (!checkout.createMandate) {
                         throw new SimpleError({
                             code: '',
-                            message: $t('%1Rh')
-                        })
+                            message: $t('%1Rh'),
+                        });
                     }
 
                     if (!checkout.createMandate.saveAsDefault) {
                         throw new SimpleError({
                             code: '',
-                            message: $t('%1Qp')
-                        })
+                            message: $t('%1Qp'),
+                        });
                     }
                 }
             }
@@ -172,10 +159,10 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
         await BalanceItemService.flushCaches(organization.id);
 
         // Validate balance items (can only happen serverside)
-        const balanceItemIds = [...request.body.balances.keys()]
-        let balanceItemsModels: BalanceItem[] = [];
+        const balanceItemIds = [...request.body.balances.keys()];
+
         if (balanceItemIds.length > 0) {
-            balanceItemsModels = await BalanceItem.select().where('id', balanceItemIds).andWhere('organizationId', sellingOrganization.id).limit(balanceItemIds.length).fetch();
+            const balanceItemsModels = await BalanceItem.select().where('id', balanceItemIds).andWhere('organizationId', sellingOrganization.id).limit(balanceItemIds.length).fetch();
 
             if (balanceItemsModels.length !== balanceItemIds.length) {
                 throw new SimpleError({
@@ -217,38 +204,54 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
                         message: $t(`%vg`),
                     });
                 }
-                balanceItems.set(item, amount)
+                balanceItems.set(item, amount);
             }
         }
 
         // If still zero payment
-        const { price: totalPrice, roundingAmount } = PaymentService.calculateTotalPrice({ 
-            balanceItems, 
-            organization: sellingOrganization
-        })
-        const minimumAmount = 2_00;
-        
-        if (totalPrice < minimumAmount && checkout.createMandate && !checkout.mandate) {
+        let { price: totalPrice, roundingAmount } = PaymentService.calculateTotalPrice({
+            balanceItems,
+            organization: sellingOrganization,
+        });
+        const minimumAmount = checkout.createMandate && !checkout.mandate ? 2_00 : 0;
+
+        // Automatically add discounts
+        await BalanceItemService.applyDiscountsToCheckout({
+            totalPrice: totalPrice - roundingAmount,
+            minimumAmount,
+            balanceItems,
+            sellingOrganizationId: sellingOrganization.id,
+            payingOrganizationId: organization.id,
+        });
+
+        // Update price and rounding
+        ({ price: totalPrice, roundingAmount } = PaymentService.calculateTotalPrice({
+            balanceItems,
+            organization: sellingOrganization,
+        }));
+
+        if (totalPrice < minimumAmount) {
             const item = new BalanceItem();
             item.type = BalanceItemType.AdministrationFee;
-            item.description = $t('%1Q4')
+            item.description = $t('%1Q4');
             item.payingOrganizationId = organization.id;
             item.organizationId = sellingOrganization.id;
             item.VATPercentage = 21;
-            item.VATExcempt = PaymentService.getVATExcempt({
-                customer: checkout.customer,
-                sellingOrganization
+            item.VATExcempt = VATService.getVATExcempt({
+                company: checkout.customer?.company,
+                sellingOrganization,
+                type: 'services',
             });
             item.VATIncluded = !item.VATExcempt; // Makes sure price with VAT always matches unitPrice
             item.quantity = 1;
-            item.unitPrice = minimumAmount - (totalPrice - roundingAmount); 
+            item.unitPrice = minimumAmount - (totalPrice - roundingAmount);
             item.createdAt = new Date();
             item.status = BalanceItemStatus.Hidden;
 
             if (!request.body.proForma) {
                 await item.save();
             } else {
-                item.disableSave()
+                item.disableSave();
             }
 
             balanceItems.set(item, item.priceWithVAT);
@@ -265,9 +268,9 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
 
             return new Response(CheckoutResponse.create({
                 payment: result.payment,
-                invoice: result.invoice
+                invoice: result.invoice,
             }));
-        } 
+        }
 
         const result = await PaymentService.createPayment({
             balanceItems,
@@ -279,7 +282,7 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
             createMandate: checkout.createMandate,
             useMandate: checkout.mandate,
             paymentConfiguration: sellingOrganization.meta.registrationPaymentConfiguration,
-            privatePaymentConfiguration: sellingOrganization.privateMeta.registrationPaymentConfiguration
+            privatePaymentConfiguration: sellingOrganization.privateMeta.registrationPaymentConfiguration,
         });
 
         if (!result) {
@@ -304,5 +307,5 @@ export class OrganizationCheckoutEndpoint extends Endpoint<Params, Query, Body,
         }));
     }
 
-    setPayment
+    setPayment;
 }

package/src/endpoints/organization/dashboard/billing/PatchOrganizationMandatesEndpoint.ts

@@ -11,13 +11,13 @@ import { PaymentMandateService } from '../../../../services/PaymentMandateServic
 type Params = { sellingOrganizationId: string };
 type Query = undefined;
 type Body = PatchableArrayAutoEncoder<PaymentMandate>;
-type ResponseBody = PaymentMandate[]
+type ResponseBody = PaymentMandate[];
 
 export class DeleteOrganizationMandateEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     bodyDecoder = new PatchableArrayDecoder(
-        PaymentMandate as Decoder<PaymentMandate>, 
-        PaymentMandate.patchType() as Decoder<AutoEncoderPatchType<PaymentMandate>>, 
-        StringDecoder
+        PaymentMandate as Decoder<PaymentMandate>,
+        PaymentMandate.patchType() as Decoder<AutoEncoderPatchType<PaymentMandate>>,
+        StringDecoder,
     ) as Decoder<PatchableArrayAutoEncoder<PaymentMandate>>;
 
     protected doesMatch(request: Request): [true, Params] | [false] {
@@ -25,7 +25,7 @@ export class DeleteOrganizationMandateEndpoint extends Endpoint<Params, Query, B
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, '/billing/@sellingOrganizationId/mandates', {sellingOrganizationId: String});
+        const params = Endpoint.parseParameters(request.url, '/billing/@sellingOrganizationId/mandates', { sellingOrganizationId: String });
 
         if (params) {
             return [true, params as Params];
@@ -37,15 +37,15 @@ export class DeleteOrganizationMandateEndpoint extends Endpoint<Params, Query, B
         const payingOrganization = await Context.setOrganizationScope();
         const { user } = await Context.authenticate();
 
-       const id = request.params.sellingOrganizationId;
+        const id = request.params.sellingOrganizationId;
         if (!id) {
             throw new SimpleError({
                 code: 'unavailable',
                 message: 'This is temporarily unavailable',
-                human: $t('%1Rz')
-            })
+                human: $t('%1Rz'),
+            });
         }
-        
+
         const sellingOrganization = await Organization.getByID(id);
         if (!sellingOrganization || !sellingOrganization.active) {
             throw new SimpleError({
@@ -53,14 +53,14 @@ export class DeleteOrganizationMandateEndpoint extends Endpoint<Params, Query, B
                 code: 'not_found',
                 message: 'Selling organization not found',
                 human: $t('%1R5'),
-                field: 'sellingOrganization'
-            })
+                field: 'sellingOrganization',
+            });
         }
 
         const mandates = await PaymentMandateService.getMandates({
             sellingOrganization,
             user,
-            payingOrganization
+            payingOrganization,
         });
 
         for (const patch of request.body.getPatches()) {
@@ -69,26 +69,26 @@ export class DeleteOrganizationMandateEndpoint extends Endpoint<Params, Query, B
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'This payment mandate is not found',
-                    human: $t('%1R8')
-                })
+                    human: $t('%1R8'),
+                });
             }
 
             if (patch.isDefault === true) {
                 await PaymentMandateService.setDefaultMandate({
                     mandateId: mandate.id,
-                    sellingOrganization,
+                    sellingOrganizationId: sellingOrganization.id,
                     payingOrganizationId: payingOrganization,
-                    payingUserId: null
-                })
+                    payingUserId: null,
+                });
             }
         }
 
         const updatedMandates = await PaymentMandateService.getMandates({
             sellingOrganization,
             user,
-            payingOrganization
-        })
+            payingOrganization,
+        });
 
-       return new Response(PaymentMandateService.groupByMandate(updatedMandates).mandates);
+        return new Response(PaymentMandateService.groupByMandate(updatedMandates).mandates);
     }
 }

package/src/endpoints/organization/dashboard/documents/GetDocumentTemplateXML.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 { DocumentTemplate } from '@stamhoofd/models';

package/src/endpoints/organization/dashboard/documents/GetDocumentTemplatesCountEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } 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 { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 

package/src/endpoints/organization/dashboard/documents/GetDocumentTemplatesEndpoint.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 { DocumentTemplate } from '@stamhoofd/models';
 import type { CountFilteredRequest, DocumentTemplatePrivate, StamhoofdFilter } from '@stamhoofd/structures';

package/src/endpoints/organization/dashboard/documents/GetDocumentsCountEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } 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 { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 

package/src/endpoints/organization/dashboard/documents/GetDocumentsEndpoint.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 { Document } from '@stamhoofd/models';
 import type { CountFilteredRequest, Document as DocumentStruct, StamhoofdFilter } from '@stamhoofd/structures';

package/src/endpoints/organization/dashboard/documents/PatchDocumentEndpoint.ts

@@ -1,6 +1,6 @@
-import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArrayDecoder, 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 { Document, DocumentTemplate, Member, Registration } from '@stamhoofd/models';
@@ -45,6 +45,14 @@ export class PatchDocumentEndpoint extends Endpoint<Params, Query, Body, Respons
                 throw Context.auth.notFoundOrNoAccess($t(`%EK`));
             }
 
+            if (document.isLocked) {
+                throw new SimpleError({
+                    code: 'locked',
+                    message: 'Document is locked',
+                    human: $t(`%1Uc`),
+                });
+            }
+
             if (patch.data) {
                 document.data.patchOrPut(patch.data);
             }

package/src/endpoints/organization/dashboard/documents/PatchDocumentTemplatesEndpoint.test.ts

@@ -1,7 +1,7 @@
 import { PatchableArray } from '@simonbackx/simple-encoding';
-import type { Endpoint} from '@simonbackx/simple-endpoints';
+import type { Endpoint } from '@simonbackx/simple-endpoints';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod, User} from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, User } from '@stamhoofd/models';
 import { DocumentTemplate, DocumentTemplateFactory, OrganizationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
 import { DocumentPrivateSettings, DocumentStatus, DocumentTemplateDefinition, DocumentTemplatePrivate, PermissionLevel, Permissions } from '@stamhoofd/structures';

package/src/endpoints/organization/dashboard/documents/PatchDocumentTemplatesEndpoint.ts

@@ -1,6 +1,6 @@
-import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArrayDecoder, 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 { DocumentTemplate } from '@stamhoofd/models';

package/src/endpoints/organization/dashboard/email/CheckEmailBouncesEndpoint.ts

@@ -1,5 +1,5 @@
 import { ArrayDecoder, 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 { EmailAddress } from '@stamhoofd/email';

package/src/endpoints/organization/dashboard/email-templates/GetEmailTemplatesEndpoint.test.ts

@@ -1,5 +1,5 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod} from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod } from '@stamhoofd/models';
 import { EmailTemplate, GroupFactory, OrganizationFactory, Platform, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { EmailTemplateType, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';

package/src/endpoints/organization/dashboard/email-templates/GetEmailTemplatesEndpoint.ts

@@ -1,8 +1,8 @@
-import type { Decoder} from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { AutoEncoder, EnumDecoder, 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 { EmailTemplate } from '@stamhoofd/models';
+import { EmailTemplate, Platform } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, EmailTemplateType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
@@ -60,11 +60,13 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
             });
         }
 
+        const platform = await Platform.getShared();
+
         const types = (request.query.types ?? [...Object.values(EmailTemplateType)]).filter((type) => {
             if (!organization) {
                 return EmailTemplateStruct.allowPlatformLevel(type);
             }
-            return EmailTemplateStruct.allowOrganizationLevel(type);
+            return EmailTemplateStruct.allowOrganizationLevel(type, organization, platform);
         });
 
         if (types.length === 0) {
@@ -86,10 +88,10 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
                 // Required for event emails when logged in as the platform admin
                     (request.query.webshopId || request.query.groupIds)
                         ? await EmailTemplate.where({
-                            webshopId: request.query.webshopId ?? null,
-                            groupId: request.query.groupIds ? { sign: 'IN', value: request.query.groupIds } : null,
-                            type: { sign: 'IN', value: types },
-                        })
+                                webshopId: request.query.webshopId ?? null,
+                                groupId: request.query.groupIds ? { sign: 'IN', value: request.query.groupIds } : null,
+                                type: { sign: 'IN', value: types },
+                            })
                         : []
                 );
 

package/src/endpoints/organization/dashboard/email-templates/PatchEmailTemplatesEndpoint.test.ts

@@ -1,7 +1,7 @@
 import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod} from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod } from '@stamhoofd/models';
 import { EmailTemplate, GroupFactory, OrganizationFactory, Platform, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, EmailTemplateType, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';

package/src/endpoints/organization/dashboard/email-templates/PatchEmailTemplatesEndpoint.ts

@@ -1,8 +1,8 @@
-import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArrayDecoder, 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 { EmailTemplate, Group, Webshop } from '@stamhoofd/models';
+import { EmailTemplate, Group, Platform, Webshop } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, PermissionLevel } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context.js';
@@ -38,7 +38,6 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
                 throw Context.auth.error();
             }
         }
-
         const templates: EmailTemplate[] = [];
 
         // Get all patches
@@ -61,11 +60,11 @@ export class PatchEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, R
         for (const put of request.body.getPuts()) {
             const struct = put.put;
 
-            if (!EmailTemplateStruct.allowOrganizationLevel(struct.type) && organization) {
+            if (organization && !EmailTemplateStruct.allowOrganizationLevel(struct.type, organization, await Platform.getShared())) {
                 throw Context.auth.error();
             }
 
-            if (!EmailTemplateStruct.allowPlatformLevel(struct.type) && !organization) {
+            if (!organization && !EmailTemplateStruct.allowPlatformLevel(struct.type)) {
                 throw Context.auth.error();
             }
 

package/src/endpoints/organization/dashboard/invoices/GetInvoicesCountEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } 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 { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 

package/src/endpoints/organization/dashboard/invoices/GetInvoicesEndpoint.ts

@@ -1,17 +1,18 @@
 import type { Decoder } 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 { Invoice } from '@stamhoofd/models';
 import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import type { CountFilteredRequest, InvoiceStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import type { CountFilteredRequest, InvoiceStruct, StamhoofdFilter } from '@stamhoofd/structures';
 import { LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';
+import { InvoicePdfService } from '../../../../services/InvoicePdfService.js';
+import { InvoiceXMlService } from '../../../../services/InvoiceXMLService.js';
 import { invoiceFilterCompilers } from '../../../../sql-filters/invoices.js';
 import { invoiceSorters } from '../../../../sql-sorters/invoices.js';
-import { InvoiceService } from '../../../../services/InvoiceService.js';
 
 type Params = Record<string, never>;
 type Query = LimitedFilteredRequest;
@@ -155,8 +156,7 @@ export class GetInvoicesEndpoint extends Endpoint<Params, Query, Body, ResponseB
 
         try {
             invoices = await query.fetch();
-        }
-        catch (error) {
+        } catch (error) {
             if (error.message.includes('ER_QUERY_TIMEOUT')) {
                 throw new SimpleError({
                     code: 'timeout',
@@ -188,8 +188,12 @@ export class GetInvoicesEndpoint extends Endpoint<Params, Query, Body, ResponseB
         }
 
         for (const invoice of invoices) {
+            if (invoice.number && !invoice.pdf && STAMHOOFD.environment === 'development') {
+                await InvoicePdfService.generatePdf(invoice);
+            }
+
             if (invoice.number && STAMHOOFD.environment === 'development') {
-                await InvoiceService.generatePdf(invoice)
+                await InvoiceXMlService.generateXml(invoice);
             }
         }
 

package/src/endpoints/organization/dashboard/invoices/PatchInvoicesEndpoint.ts

@@ -1,6 +1,6 @@
-import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArrayDecoder, 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 { Invoice as InvoiceStruct } from '@stamhoofd/structures';
 
@@ -44,6 +44,15 @@ export class PatchInvoicesEndpoint extends Endpoint<Params, Query, Body, Respons
         const invoices: Invoice[] = [];
 
         for (const { put } of request.body.getPuts()) {
+            if (put.payingOrganizationId) {
+                if (!await Context.auth.hasFullAccess(put.payingOrganizationId)) {
+                    Context.auth.error($t('%1Xw'));
+                }
+            }
+
+            put.stripeAccountId = null;
+            put.reference = null;
+
             const model = await InvoiceService.createFrom(organization, put);
             invoices.push(model);
         }

package/src/endpoints/organization/dashboard/mollie/CheckMollieEndpoint.ts

@@ -1,7 +1,7 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { MollieToken } from '@stamhoofd/models';
-import type { Organization as OrganizationStruct} from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { CheckMollieResponse, PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
@@ -37,7 +37,7 @@ export class CheckMollieEndpoint extends Endpoint<Params, Query, Body, ResponseB
             throw Context.auth.error();
         }
 
-        const service = await MollieService.create({sellingOrganization: organization })
+        const service = await MollieService.create({ sellingOrganization: organization });
 
         if (!service) {
             organization.privateMeta.mollieOnboarding = null;
@@ -64,8 +64,7 @@ export class CheckMollieEndpoint extends Endpoint<Params, Query, Body, ResponseB
             const profile = profiles.find(p => p.id === s);
             if (!profile) {
                 organization.privateMeta.mollieProfile = null;
-            }
-            else {
+            } else {
                 organization.privateMeta.mollieProfile = profile;
             }
         }