payservedb 3.9.8 → 3.9.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payservedb",
-  "version": "3.9.8",
+  "version": "3.9.9",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/models/vasinvoice.js

@@ -7,6 +7,11 @@ const vasInvoiceSchema = new mongoose.Schema({
         required: true,
         unique: true,
     },
+    accountNumber: {
+        type: String,
+        required: true,
+        unique: true
+    },
     facilityId: {
         type: mongoose.Schema.Types.ObjectId,
         required: true
@@ -25,31 +30,131 @@ const vasInvoiceSchema = new mongoose.Schema({
     },
     invoiceNote: {
         type: String,
-        default: null,
+        default: "Payment is due within 30 days",
     },
     status: {
         type: String,
         required: true,
-        enum: ['Pending', 'Paid', 'Cancelled', 'Overdue'],
+        enum: ['Pending', 'Paid', 'Partially Paid', 'Cancelled', 'Overdue', 'Unpaid'],
+        default: 'Pending'
     },
     unit: {
         type: String,
         required: true
     },
+    serviceName: {
+        type: String,
+        default: 'Service Fee'
+    },
+    amountPaid: {
+        type: Number,
+        default: 0
+    },
     subTotal: {
         type: Number,
         required: true,
     },
     tax: {
         type: Number,
+        default: 0
     },
     amount: {
-        type: Number
+        type: Number,
+        required: true
+    },
+    currency: {
+        id: {
+            type: mongoose.Schema.Types.ObjectId
+        },
+        name: {
+            type: String,
+            default: 'Kenyan Shilling'
+        },
+        code: {
+            type: String,
+            default: 'KES'
+        },
+        symbol: {
+            type: String,
+            default: 'KSh'
+        }
+    },
+    items: [{
+        description: {
+            type: String,
+            required: true
+        },
+        quantity: {
+            type: Number,
+            default: 1
+        },
+        unitPrice: {
+            type: Number,
+            required: true
+        }
+    }],
+    reconciliationHistory: [{
+        date: {
+            type: Date,
+            default: Date.now
+        },
+        amount: {
+            type: Number,
+            required: true
+        },
+        type: {
+            type: String,
+            default: 'Manual'
+        },
+        paymentReference: String,
+        paymentCompletion: {
+            type: String,
+            default: 'Completed'
+        },
+        sourceInvoice: String,
+        destinationInvoice: String,
+        notes: String,
+        remainingBalance: Number
+    }],
+    customerInfo: {
+        fullName: {
+            type: String,
+            default: 'Customer'
+        }
+    },
+    paymentDetails: {
+        paymentStatus: {
+            type: String,
+            enum: ['Pending', 'Completed', 'Failed', 'Partial'],
+            default: 'Pending'
+        },
+        paymentMethod: String,
+        paymentDate: Date,
+        transactionId: String,
+        mobilePayment: {
+            type: Boolean,
+            default: false
+        }
+    },
+    overpay: {
+        type: Number,
+        default: 0
     }
 }, {
     timestamps: true
 });
 
+// Add pre-save middleware to check if invoice is overdue
+vasInvoiceSchema.pre('save', function (next) {
+    if (this.isModified('dueDate') || this.isNew) {
+        const today = new Date();
+        if (this.dueDate < today && this.status === 'Pending') {
+            this.status = 'Overdue';
+        }
+    }
+    next();
+});
+
 const VasInvoice = mongoose.model('VasInvoice', vasInvoiceSchema);
 
-module.exports = VasInvoice;
+module.exports = VasInvoice;