@stamhoofd/backend 2.127.0 → 2.127.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.127.0",
+    "version": "2.127.1",
     "type": "module",
     "main": "./dist/index.js",
     "exports": {
@@ -57,20 +57,20 @@
         "@simonbackx/simple-endpoints": "1.21.1",
         "@simonbackx/simple-errors": "1.5.0",
         "@simonbackx/simple-logging": "1.0.1",
-        "@stamhoofd/backend-env": "2.127.0",
-        "@stamhoofd/backend-i18n": "2.127.0",
-        "@stamhoofd/backend-middleware": "2.127.0",
-        "@stamhoofd/crons": "2.127.0",
-        "@stamhoofd/email": "2.127.0",
-        "@stamhoofd/excel-writer": "2.127.0",
-        "@stamhoofd/logging": "2.127.0",
-        "@stamhoofd/models": "2.127.0",
-        "@stamhoofd/object-differ": "2.127.0",
-        "@stamhoofd/queues": "2.127.0",
-        "@stamhoofd/sql": "2.127.0",
-        "@stamhoofd/structures": "2.127.0",
-        "@stamhoofd/types": "2.127.0",
-        "@stamhoofd/utility": "2.127.0",
+        "@stamhoofd/backend-env": "2.127.1",
+        "@stamhoofd/backend-i18n": "2.127.1",
+        "@stamhoofd/backend-middleware": "2.127.1",
+        "@stamhoofd/crons": "2.127.1",
+        "@stamhoofd/email": "2.127.1",
+        "@stamhoofd/excel-writer": "2.127.1",
+        "@stamhoofd/logging": "2.127.1",
+        "@stamhoofd/models": "2.127.1",
+        "@stamhoofd/object-differ": "2.127.1",
+        "@stamhoofd/queues": "2.127.1",
+        "@stamhoofd/sql": "2.127.1",
+        "@stamhoofd/structures": "2.127.1",
+        "@stamhoofd/types": "2.127.1",
+        "@stamhoofd/utility": "2.127.1",
         "archiver": "7.0.1",
         "axios": "1.16.0",
         "base-x": "3.0.11",
@@ -91,7 +91,7 @@
         "stripe": "16.12.0"
     },
     "devDependencies": {
-        "@stamhoofd/test-utils": "2.127.0",
+        "@stamhoofd/test-utils": "2.127.1",
         "@types/cookie": "0.6.0",
         "@types/luxon": "3.7.1",
         "@types/mailparser": "3.4.6",
@@ -107,5 +107,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "c3c61a7728293f5fe7b4b639f95b3cc79166265f"
+    "gitHead": "0e8db3ce693701ff334894c2e9e60d9a51c7286e"
 }

package/src/crons/stripe-invoices.ts

@@ -44,6 +44,6 @@ async function createStripeInvoices() {
     const invoicer = new StripeInvoicer({
         secretKey: STAMHOOFD.STRIPE_SECRET_KEY,
     });
-    await invoicer.generateAllInvoices(membershipOrganization);
+    await invoicer.generateAllInvoices(membershipOrganization, { forceLast: Formatter.dateIso(today) === '2026-07-03' });
     lastStripeInvoice = new Date();
 }

package/src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.ts

@@ -8,10 +8,10 @@ import { QueueHandler } from '@stamhoofd/queues';
 import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, TranslatedString, Webshop as WebshopStruct, WebshopTicketType } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context.js';
-import { AuditLogService } from '../../../../services/AuditLogService.js';
-import { shouldReserveUitpasNumbers, UitpasService } from '../../../../services/uitpas/UitpasService.js';
 import { ServiceFeeHelper } from '../../../../helpers/ServiceFeeHelper.js';
+import { AuditLogService } from '../../../../services/AuditLogService.js';
 import { PaymentService } from '../../../../services/PaymentService.js';
+import { shouldReserveUitpasNumbers, UitpasService } from '../../../../services/uitpas/UitpasService.js';
 
 type Params = { id: string };
 type Query = undefined;
@@ -153,6 +153,16 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                         const payment = new Payment();
                         payment.organizationId = organization.id;
                         payment.method = struct.data.paymentMethod;
+
+                        // quick throw to prevent payment from being saved
+                        if (payment.method === PaymentMethod.Transfer && !webshop.meta.paymentConfiguration.transferSettings.iban) {
+                            throw new SimpleError({
+                                code: 'missing_iban',
+                                message: 'Missing IBAN',
+                                human: $t(`%w2`),
+                            });
+                        }
+
                         payment.status = PaymentStatus.Created;
                         payment.price = totalPrice;
                         PaymentService.roundPayment(payment);

package/src/helpers/StripeInvoicer.ts

@@ -7,6 +7,7 @@ import { Formatter } from '@stamhoofd/utility';
 import Stripe from 'stripe';
 import { PaymentService } from '../services/PaymentService.js';
 import { VATService } from '../services/VATService.js';
+import { SQL } from '@stamhoofd/sql';
 
 export class ApplicationFeeDetails {
     transferFee = 0;
@@ -138,7 +139,13 @@ export class StripeReportInvoicer {
     }
 
     static async hasPayment(sellingOrganization: Organization, reference: string) {
-        return !!await Payment.select().where('organizationId', sellingOrganization.id).where('reference', reference).where('status', PaymentStatus.Succeeded).first(false);
+        return !!await Payment.select()
+            .where('organizationId', sellingOrganization.id)
+            .where('reference', reference)
+            .where('status', PaymentStatus.Succeeded)
+            .where('method', PaymentMethod.AccountDeductions)
+            .where('provider', PaymentProvider.Stripe)
+            .first(false);
     }
 
     async generateInvoice(sellingOrganization: Organization, reference: string, accountId: string, applicationFee: ApplicationFeeDetails) {
@@ -175,7 +182,14 @@ export class StripeReportInvoicer {
         const existingPayments = await Payment.select()
             .where('organizationId', sellingOrganization.id)
             .where('payingOrganizationId', organization.id)
+            .where(
+                // required because the same organization can have multiple stripe accounts. Null = legacy
+                SQL.where('stripeAccountId', stripeAccount.id)
+                    .or('stripeAccountId', null),
+            )
             .where('reference', reference)
+            .where('method', PaymentMethod.AccountDeductions)
+            .where('provider', PaymentProvider.Stripe)
             .where('status', PaymentStatus.Succeeded)
             .fetch();
 
@@ -320,7 +334,7 @@ export class StripeInvoicer {
     }
 
     // Loops all months until all invoices are generated
-    async generateAllInvoices(sellingOrganization: Organization, options?: { force?: boolean; start?: Date }) {
+    async generateAllInvoices(sellingOrganization: Organization, options?: { force?: boolean; start?: Date; forceLast?: boolean }) {
         const startMonth = options?.start ?? new Date(2026, 0, 1);
         const stopAt = new Date(Date.now() + (STAMHOOFD.environment === 'production' ? (-60 * 60 * 24 * 1000) : (60 * 60 * 24 * 1000 * 31))); // One day margin before creating invoices
         let currentMonth = new Date(startMonth);
@@ -332,8 +346,11 @@ export class StripeInvoicer {
                 // Stop
                 break;
             }
-            await this.generateInvoices(sellingOrganization, currentMonth, options);
-            currentMonth = new Date(currentMonth.getFullYear(), currentMonth.getMonth() + 1, 1);
+            const nextMonth = new Date(currentMonth.getFullYear(), currentMonth.getMonth() + 1, 1);
+            const { end: endNext } = StripeInvoicer.getMonthUnixStartEnd(currentMonth);
+            const isLastMonth = endNext >= stopAt.getTime() / 1000;
+            await this.generateInvoices(sellingOrganization, currentMonth, { ...options, force: (isLastMonth && !!options?.forceLast) || !!options?.force });
+            currentMonth = nextMonth;
         }
     }