@stamhoofd/backend 2.4.0 → 2.6.0

package/src/helpers/MemberUserSyncer.ts

@@ -15,7 +15,8 @@ export class MemberUserSyncerStatic {
             userEmails.push(member.details.email)
         }
 
-        const parentEmails = member.details.parentsHaveAccess ? member.details.parents.flatMap(p => p.email ? [p.email, ...p.alternativeEmails] : p.alternativeEmails) : []
+        const uncategorizedEmails: string[] = member.details.uncategorizedEmails;
+        const parentAndUncategorizedEmails = member.details.parentsHaveAccess ? member.details.parents.flatMap(p => p.email ? [p.email, ...p.alternativeEmails] : p.alternativeEmails).concat(uncategorizedEmails) : []
 
         // Make sure all these users have access to the member
         for (const email of userEmails) {
@@ -23,18 +24,17 @@ export class MemberUserSyncerStatic {
             await this.linkUser(email, member, false)
         }
 
-        for (const email of parentEmails) {
-            // Link parents
+        for (const email of parentAndUncategorizedEmails) {
+            // Link parents and uncategorized emails
             await this.linkUser(email, member, true)
         }
 
         // Remove access of users that are not in this list
         for (const user of member.users) {
-            if (!userEmails.includes(user.email) && !parentEmails.includes(user.email)) {
+            if (!userEmails.includes(user.email) && !parentAndUncategorizedEmails.includes(user.email)) {
                 await this.unlinkUser(user, member)
             }
         }
-
     }
 
     async onDeleteMember(member: MemberWithRegistrations) {

package/src/helpers/StripeHelper.ts

@@ -6,8 +6,46 @@ import { Formatter } from '@stamhoofd/utility';
 import Stripe from 'stripe';
 
 export class StripeHelper {
-    static getInstance() {
-        return new Stripe(STAMHOOFD.STRIPE_SECRET_KEY, {apiVersion: '2022-11-15', typescript: true, maxNetworkRetries: 0, timeout: 10000});
+    static getInstance(accountId: string|null = null) {
+        return new Stripe(STAMHOOFD.STRIPE_SECRET_KEY, {apiVersion: '2024-06-20', typescript: true, maxNetworkRetries: 0, timeout: 10000, stripeAccount: accountId ?? undefined});
+    }
+
+    static async saveChargeInfo(model: StripePaymentIntent|StripeCheckoutSession, charge: Stripe.Charge, payment: Payment) {
+        try {
+            if (model.accountId) {
+                // This is a direct charge
+                
+                if (charge.balance_transaction !== null && typeof charge.balance_transaction !== 'string') {
+                    const fees = charge.balance_transaction.fee;
+                    payment.transferFee = fees;
+                }
+            }
+
+            if (charge.billing_details.name) {
+                payment.ibanName = charge.billing_details.name
+            }
+
+            if (charge.payment_method_details?.bancontact) {
+                if (charge.payment_method_details.bancontact.iban_last4) {
+                    payment.iban = "xxxx " + charge.payment_method_details.bancontact.iban_last4
+                }
+                payment.ibanName = charge.payment_method_details.bancontact.verified_name
+            }
+            if (charge.payment_method_details?.ideal) {
+                if (charge.payment_method_details.ideal.iban_last4) {
+                    payment.iban = "xxxx " + charge.payment_method_details.ideal.iban_last4
+                }
+                payment.ibanName = charge.payment_method_details.ideal.verified_name
+            }
+            if (charge.payment_method_details?.card) {
+                if (charge.payment_method_details.card.last4) {
+                    payment.iban = "xxxx " + charge.payment_method_details.card.last4
+                }
+            }
+            await payment.save()
+        } catch (e) {
+            console.error('Failed processing charge', e)
+        }
     }
 
     static async getStatus(payment: Payment, cancel = false, testMode = false): Promise<PaymentStatus> {
@@ -22,37 +60,15 @@ export class StripeHelper {
             return await this.getStatusFromCheckoutSession(payment, cancel)
         }
 
-        const stripe = this.getInstance()
+        const stripe = this.getInstance(model.accountId)
 
-        let intent = await stripe.paymentIntents.retrieve(model.stripeIntentId)
+        let intent = await stripe.paymentIntents.retrieve(model.stripeIntentId, {
+            expand: ['latest_charge.balance_transaction']
+        })
         console.log(intent);
         if (intent.status === "succeeded") {
-            if (intent.latest_charge) {
-                try {
-                    const charge = await stripe.charges.retrieve(typeof intent.latest_charge === 'string' ? intent.latest_charge : intent.latest_charge.id)
-                    if (charge.payment_method_details?.bancontact) {
-                        if (charge.payment_method_details.bancontact.iban_last4) {
-                            payment.iban = "xxxx " + charge.payment_method_details.bancontact.iban_last4
-                        }
-                        payment.ibanName = charge.payment_method_details.bancontact.verified_name
-                        await payment.save()
-                    }
-                    if (charge.payment_method_details?.ideal) {
-                        if (charge.payment_method_details.ideal.iban_last4) {
-                            payment.iban = "xxxx " + charge.payment_method_details.ideal.iban_last4
-                        }
-                        payment.ibanName = charge.payment_method_details.ideal.verified_name
-                        await payment.save()
-                    }
-                    if (charge.payment_method_details?.card) {
-                        if (charge.payment_method_details.card.last4) {
-                            payment.iban = "xxxx " + charge.payment_method_details.card.last4
-                        }
-                        await payment.save()
-                    }
-                } catch (e) {
-                    console.error('Failed fatching charge', e)
-                }
+            if (intent.latest_charge !== null && typeof intent.latest_charge !== 'string') {
+                await this.saveChargeInfo(model, intent.latest_charge, payment)
             }
             return PaymentStatus.Succeeded
         }
@@ -93,10 +109,22 @@ export class StripeHelper {
             return PaymentStatus.Failed
         }
 
-        const stripe = this.getInstance()
-        const session = await stripe.checkout.sessions.retrieve(model.stripeSessionId)
+        const stripe = this.getInstance(model.accountId)
+        const session = await stripe.checkout.sessions.retrieve(model.stripeSessionId, {
+            expand: ['payment_intent.latest_charge.balance_transaction']
+        })
+
         console.log("session", session);
+
         if (session.status === "complete") {
+            // This is a direct charge
+            const payment_intent = session.payment_intent
+            if (payment_intent !== null && typeof payment_intent !== 'string') {
+                const charge = payment_intent.latest_charge
+                if (charge !== null && typeof charge !== 'string') {
+                    await this.saveChargeInfo(model, charge, payment)
+                }
+            }
             return PaymentStatus.Succeeded
         }
         if (session.status === "expired") {
@@ -145,6 +173,7 @@ export class StripeHelper {
         const totalPrice = payment.price;
 
         let fee = 0;
+        let directCharge = false;
         const vat = calculateVATPercentage(organization.address, organization.meta.VATNumber)
         function calculateFee(fixed: number, percentageTimes100: number) {
             return Math.round(Math.round(fixed + Math.max(1, totalPrice * percentageTimes100 / 100 / 100)) * (100 + vat) / 100); // € 0,21 + 0,2%
@@ -158,6 +187,12 @@ export class StripeHelper {
             fee = calculateFee(25, 150); // € 0,25 + 1,5%
         }
 
+        if (stripeAccount.meta.type === 'standard') {
+            // Submerchant is charged by Stripe for the fees directly
+            fee = 0;
+            directCharge = true;
+        }
+
         payment.transferFee = fee;
 
         const fullMetadata = {
@@ -165,7 +200,7 @@ export class StripeHelper {
             organizationVATNumber: organization.meta.VATNumber
         }
 
-        const stripe = StripeHelper.getInstance()
+        const stripe = StripeHelper.getInstance(directCharge ? stripeAccount.accountId : null)
         let paymentUrl: string
 
         // Bancontact or iDEAL: use payment intends
@@ -185,12 +220,12 @@ export class StripeHelper {
                 payment_method_types: [payment.method.toLowerCase()],
                 statement_descriptor: Formatter.slug(statementDescriptor).substring(0, 22).toUpperCase(),
                 application_fee_amount: fee,
-                on_behalf_of: stripeAccount.accountId,
+                on_behalf_of: !directCharge ? stripeAccount.accountId : undefined,
                 confirm: true,
                 return_url: redirectUrl,
-                transfer_data: {
+                transfer_data: !directCharge ?  {
                     destination: stripeAccount.accountId,
-                },
+                } : undefined,
                 metadata: fullMetadata,
                 payment_method_options: {bancontact: {preferred_language: ['nl', 'fr', 'de', 'en'].includes(i18n.language) ? i18n.language as 'en' : 'nl'}},
             });
@@ -213,6 +248,10 @@ export class StripeHelper {
             paymentIntentModel.paymentId = payment.id
             paymentIntentModel.stripeIntentId = paymentIntent.id
             paymentIntentModel.organizationId = organization.id
+
+            if (directCharge) {
+                paymentIntentModel.accountId = stripeAccount.accountId
+            }
             await paymentIntentModel.save()
         } else {
             // Build Stripe line items
@@ -253,11 +292,11 @@ export class StripeHelper {
                 currency: 'eur',
                 locale: i18n.language as 'nl',
                 payment_intent_data: {
-                    on_behalf_of: stripeAccount.accountId,
+                    on_behalf_of: !directCharge ? stripeAccount.accountId : undefined,
                     application_fee_amount: fee,
-                    transfer_data: {
+                    transfer_data: !directCharge ? {
                         destination: stripeAccount.accountId,
-                    },
+                    } : undefined,
                     metadata: fullMetadata,
                     statement_descriptor: Formatter.slug(statementDescriptor).substring(0, 22).toUpperCase(),
                 },
@@ -281,6 +320,10 @@ export class StripeHelper {
             paymentIntentModel.paymentId = payment.id
             paymentIntentModel.stripeSessionId = session.id
             paymentIntentModel.organizationId = organization.id
+
+            if (directCharge) {
+                paymentIntentModel.accountId = stripeAccount.accountId
+            }
             await paymentIntentModel.save()
         }
 
@@ -290,4 +333,4 @@ export class StripeHelper {
             paymentUrl
         }
     }
-}
+}

package/src/helpers/StripePayoutChecker.ts

@@ -9,7 +9,7 @@ export class StripePayoutChecker {
     constructor({secretKey, stripeAccount}: { secretKey: string, stripeAccount?: string}) {
         this.stripe = new Stripe(
             secretKey, {
-                apiVersion: '2022-11-15', 
+                apiVersion: '2024-06-20', 
                 typescript: true, 
                 maxNetworkRetries: 1, 
                 timeout: 10000,
@@ -18,7 +18,7 @@ export class StripePayoutChecker {
 
         this.stripePlatform = new Stripe(
             secretKey, {
-                apiVersion: '2022-11-15', 
+                apiVersion: '2024-06-20', 
                 typescript: true, 
                 maxNetworkRetries: 1, 
                 timeout: 10000
@@ -147,6 +147,8 @@ export class StripePayoutChecker {
         }
 
         const applicationFee = balanceItem.source.application_fee_amount;
+        const otherFees = balanceItem.fee
+        const totalFees = otherFees + (applicationFee ?? 0);
 
         // Cool, we can store this in the database now.
 
@@ -167,11 +169,11 @@ export class StripePayoutChecker {
             settledAt: new Date(payout.arrival_date * 1000),
             amount: payout.amount,
             // Set only if application fee is witheld
-            fee: applicationFee ?? 0
+            fee: totalFees
         });
 
         payment.settlement = settlement;
-        payment.transferFee = applicationFee ?? 0;
+        payment.transferFee = totalFees;
 
         // Force an updatedAt timestamp of the related order
         // Mark order as 'updated', or the frontend won't pull in the updates
@@ -185,4 +187,4 @@ export class StripePayoutChecker {
         await payment.save();
     }
 
-}
+}

package/src/seeds/1722344160-update-membership.ts

@@ -0,0 +1,57 @@
+import { Migration } from '@simonbackx/simple-database';
+import { Member } from '@stamhoofd/models';
+
+export default new Migration(async () => {
+    if (STAMHOOFD.environment == "test") {
+        console.log("skipped in tests")
+        return;
+    }
+
+    if(STAMHOOFD.userMode !== "platform") {
+        console.log("skipped seed update-membership because usermode not platform")
+        return;
+    }
+
+    process.stdout.write('\n');
+    let c = 0;
+    let id: string = '';
+
+    while(true) {
+        const rawMembers = await Member.where({
+            id: {
+                value: id,
+                sign: '>'
+            }
+        }, {limit: 100, sort: ['id']});
+
+        // const members = await Member.getByIDs(...rawMembers.map(m => m.id));
+
+        for (const member of rawMembers) {
+            const memberWithRegistrations = await Member.getWithRegistrations(member.id);
+            if(memberWithRegistrations) {
+                await memberWithRegistrations.updateMemberships();
+                await memberWithRegistrations.save();
+            } else {
+                throw new Error("Member with registrations not found: " + member.id);
+            }
+
+            c++;
+
+            if (c%1000 === 0) {
+                process.stdout.write('.');
+            }
+            if (c%10000 === 0) {
+                process.stdout.write('\n');
+            }
+        }
+
+        if (rawMembers.length === 0) {
+            break;
+        }
+
+        id = rawMembers[rawMembers.length - 1].id;
+    }
+
+    // Do something here
+    return Promise.resolve()
+})