@stamhoofd/backend 2.43.2 → 2.44.0

package/src/helpers/StripeHelper.ts

@@ -27,19 +27,29 @@ export class StripeHelper {
 
             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.iban = '•••• ' + 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.iban = '•••• ' + 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;
+                    payment.iban = '•••• ' + charge.payment_method_details.card.last4;
+                }
+            }
+            if (charge.payment_method_details?.sepa_debit) {
+                if (charge.payment_method_details.sepa_debit.last4) {
+                    if (charge.payment_method_details.sepa_debit.country === 'BE') {
+                        payment.iban = charge.payment_method_details.sepa_debit.country + '•• ' + charge.payment_method_details.sepa_debit.bank_code + '• •••• ' + charge.payment_method_details.sepa_debit.last4;
+                    }
+                    else {
+                        payment.iban = '•••• ' + charge.payment_method_details.sepa_debit.last4;
+                    }
                 }
             }
             await payment.save();
@@ -139,7 +149,7 @@ export class StripeHelper {
 
         console.log('session', session);
 
-        if (session.status === 'complete') {
+        if (session.payment_status === 'paid') {
             // This is a direct charge
             const payment_intent = session.payment_intent;
             if (payment_intent !== null && typeof payment_intent !== 'string') {
@@ -158,7 +168,7 @@ export class StripeHelper {
             // Cancel the session
             const session = await stripe.checkout.sessions.expire(model.stripeSessionId);
 
-            if (session.status === 'complete') {
+            if (session.payment_status === 'paid') {
                 return PaymentStatus.Succeeded;
             }
             if (session.status === 'expired') {
@@ -166,6 +176,11 @@ export class StripeHelper {
             }
         }
 
+        if (session.status === 'complete') {
+            // Small difference to detect if the payment is almost done
+            return PaymentStatus.Pending;
+        }
+
         return PaymentStatus.Created;
     }
 
@@ -231,10 +246,18 @@ export class StripeHelper {
         // Bancontact or iDEAL: use payment intends
         if (payment.method === PaymentMethod.Bancontact || payment.method === PaymentMethod.iDEAL) {
             const paymentMethod = await stripe.paymentMethods.create({
-                type: payment.method.toLowerCase() as 'bancontact',
+                type: payment.method.toLowerCase() as 'bancontact' | 'ideal',
                 billing_details: {
-                    name: customer.name && customer.name.length > 2 ? customer.name : 'Onbekend',
-                    email: customer.email,
+                    name: payment.customer?.dynamicName || (customer.name.length > 2 ? customer.name : 'Onbekend'),
+                    email: payment.customer?.dynamicEmail || customer.email,
+                    address: payment.customer?.company?.address
+                        ? {
+                                city: payment.customer.company.address.city,
+                                country: payment.customer.company.address.country,
+                                line1: payment.customer.company.address.street + ' ' + payment.customer.company.address.number,
+                                postal_code: payment.customer.company.address.postalCode,
+                            }
+                        : undefined,
                 },
             });
 
@@ -315,7 +338,7 @@ export class StripeHelper {
                 mode: 'payment',
                 success_url: redirectUrl,
                 cancel_url: cancelUrl,
-                payment_method_types: ['card'],
+                payment_method_types: payment.method === PaymentMethod.DirectDebit ? ['sepa_debit'] : ['card'],
                 line_items: stripeLineItems,
                 currency: 'eur',
                 locale: i18n.language as 'nl',
@@ -329,8 +352,10 @@ export class StripeHelper {
                         : undefined,
                     metadata: fullMetadata,
                     statement_descriptor: Formatter.slug(statementDescriptor).substring(0, 22).toUpperCase(),
+
                 },
-                customer_email: customer.email,
+                customer_email: payment.customer?.dynamicEmail || customer.email,
+                customer_creation: 'if_required',
                 metadata: fullMetadata,
                 expires_at: Math.floor(Date.now() / 1000) + 30 * 60, // Expire in 30 minutes
             });

package/src/sql-filters/orders.ts

@@ -0,0 +1,26 @@
+import { baseSQLFilterCompilers, createSQLColumnFilterCompiler, SQLFilterDefinitions } from '@stamhoofd/sql';
+
+export const orderFilterCompilers: SQLFilterDefinitions = {
+    ...baseSQLFilterCompilers,
+    id: createSQLColumnFilterCompiler('id'),
+    organizationId: createSQLColumnFilterCompiler('organizationId'),
+    number: createSQLColumnFilterCompiler('number'),
+    // 'startDate': createSQLColumnFilterCompiler('startDate'),
+    // 'endDate': createSQLColumnFilterCompiler('endDate'),
+    // 'groupIds': createSQLExpressionFilterCompiler(
+    //     SQL.jsonValue(SQL.column('meta'), '$.value.groups[*].id'),
+    //     { isJSONValue: true, isJSONObject: true },
+    // ),
+    // 'defaultAgeGroupIds': createSQLExpressionFilterCompiler(
+    //     SQL.jsonValue(SQL.column('meta'), '$.value.defaultAgeGroupIds'),
+    //     { isJSONValue: true, isJSONObject: true },
+    // ),
+    // 'organizationTagIds': createSQLExpressionFilterCompiler(
+    //     SQL.jsonValue(SQL.column('meta'), '$.value.organizationTagIds'),
+    //     { isJSONValue: true, isJSONObject: true },
+    // ),
+    // 'meta.visible': createSQLExpressionFilterCompiler(
+    //     SQL.jsonValue(SQL.column('meta'), '$.value.visible'),
+    //     { isJSONValue: true, type: SQLValueType.JSONBoolean },
+    // ),
+};

package/src/sql-filters/{cached-outstanding-balance.ts → receivable-balances.ts}

@@ -3,7 +3,7 @@ import { SQLFilterDefinitions, baseSQLFilterCompilers, createSQLColumnFilterComp
 /**
  * Defines how to filter cached balance items in the database from StamhoofdFilter objects
  */
-export const cachedOutstandingBalanceFilterCompilers: SQLFilterDefinitions = {
+export const receivableBalanceFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,
     id: createSQLColumnFilterCompiler('id'),
     organizationId: createSQLColumnFilterCompiler('organizationId'),

package/src/sql-sorters/orders.ts

@@ -0,0 +1,47 @@
+import { Order } from '@stamhoofd/models';
+import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { Formatter } from '@stamhoofd/utility';
+
+export const orderSorters: SQLSortDefinitions<Order> = {
+    // WARNING! TEST NEW SORTERS THOROUGHLY!
+    // Try to avoid creating sorters on fields that er not 1:1 with the database, that often causes pagination issues if not thought through
+    // An example: sorting on 'name' is not a good idea, because it is a concatenation of two fields.
+    // You might be tempted to use ORDER BY firstName, lastName, but that will not work as expected and it needs to be ORDER BY CONCAT(firstName, ' ', lastName)
+    // Why? Because ORDER BY firstName, lastName produces a different order dan ORDER BY CONCAT(firstName, ' ', lastName) if there are multiple people with spaces in the first name
+    // And that again causes issues with pagination because the next query will append a filter of name > 'John Doe' - causing duplicate and/or skipped results
+    // What if you need mapping? simply map the sorters in the frontend: name -> firstname, lastname, age -> birthDay, etc.
+
+    number: {
+        getValue(a) {
+            return a.number;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('number'),
+                direction,
+            });
+        },
+    },
+    id: {
+        getValue(a) {
+            return a.id;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('id'),
+                direction,
+            });
+        },
+    },
+    createdAt: {
+        getValue(a) {
+            return Formatter.dateTimeIso(a.createdAt);
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('createdAt'),
+                direction,
+            });
+        },
+    },
+};

package/src/sql-sorters/{cached-outstanding-balance.ts → receivable-balances.ts}

@@ -1,7 +1,7 @@
-import { CachedOutstandingBalance } from '@stamhoofd/models';
+import { CachedBalance } from '@stamhoofd/models';
 import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
 
-export const cachedOutstandingBalanceSorters: SQLSortDefinitions<CachedOutstandingBalance> = {
+export const receivableBalanceSorters: SQLSortDefinitions<CachedBalance> = {
     // WARNING! TEST NEW SORTERS THOROUGHLY!
     // Try to avoid creating sorters on fields that er not 1:1 with the database, that often causes pagination issues if not thought through
     // An example: sorting on 'name' is not a good idea, because it is a concatenation of two fields.