@stamhoofd/models 2.111.0 → 2.113.0

package/src/models/Invoice.ts

@@ -103,6 +103,29 @@ export class Invoice extends QueryableModel {
     @column({ type: 'boolean' })
     didSendPeppol = false;
 
+    /**
+     * Official invoice date. Set when a number has been generated.
+     */
+    @column({
+        type: 'datetime',
+        nullable: true,
+        beforeSave(old?: any) {
+            if (old !== undefined || !this.number) {
+                return old;
+            }
+            const date = new Date();
+            date.setMilliseconds(0);
+            return date;
+        },
+    })
+    invoicedAt: Date | null = null;
+
+    /**
+     * If null, invoicedAt is used
+     */
+    @column({ type: 'datetime', nullable: true })
+    dueAt: Date | null = null;
+
     @column({
         type: 'datetime', beforeSave(old?: any) {
             if (old !== undefined) {
@@ -186,4 +209,13 @@ export class Invoice extends QueryableModel {
             throw e;
         }
     }
+
+    static async loadBalanceItems(invoices: Invoice[]) {
+        if (invoices.length === 0) {
+            return { invoicedBalanceItems: [] };
+        }
+        // Load all the related models from the database so we can build the structures
+        const invoicedBalanceItems = await InvoicedBalanceItem.select().where('invoiceId', invoices.map(i => i.id)).fetch();
+        return { invoicedBalanceItems };
+    }
 }

package/src/models/InvoicedBalanceItem.ts

@@ -11,7 +11,7 @@ import { VATExcemptReason } from '@stamhoofd/structures';
  * and also how it was invoiced (since the unit price, quantity etc can't always match the balance items invoiced price due to rounding)
  */
 export class InvoicedBalanceItem extends QueryableModel {
-    static table = 'balance_item_invoices';
+    static table = 'invoiced_balance_items';
 
     @column({
         primary: true, type: 'string', beforeSave(value) {

package/src/models/Member.ts

@@ -367,7 +367,7 @@ export class Member extends QueryableModel {
             return false;
         }
 
-        if (this.details.uitpasNumber) {
+        if (this.details.uitpasNumberDetails) {
             return false;
         }
 

package/src/models/Payment.ts

@@ -86,8 +86,8 @@ export class Payment extends QueryableModel {
      *
      * E.g. total price to pay is 0,242 because of VAT, then we round this to 0,24. The roundingAmount will be -0,002 in this case.
      */
-    // @column({ type: 'integer' })
-    // roundingAmount = 0;
+    @column({ type: 'integer' })
+    roundingAmount = 0;
 
     /**
      * Fee paid to the payment provider (if available, otherwise set to 0)
@@ -131,6 +131,9 @@ export class Payment extends QueryableModel {
     @column({ type: 'json', nullable: true, decoder: TransferSettings })
     transferSettings: TransferSettings | null = null;
 
+    @column({ type: 'string', nullable: true })
+    invoiceId: string | null = null;
+
     @column({
         type: 'datetime', beforeSave(old?: any) {
             if (old !== undefined) {

package/src/models/UitpasClientCredential.ts

@@ -46,4 +46,11 @@ export class UitpasClientCredential extends QueryableModel {
         skipUpdate: true,
     })
     updatedAt: Date;
+
+    async save() {
+        if (this.organizationId === null) {
+            throw new Error('Not allowed to save uitpas client credentials for platform (organizationId = null)');
+        }
+        return await super.save();
+    }
 }