payservedb 6.0.7 → 6.0.8

package/src/models/vasinvoice.js

@@ -1,193 +1,193 @@
-const mongoose = require('mongoose');
-
-// Define the schema for VasInvoices
-const vasInvoiceSchema = new mongoose.Schema({
-    invoiceNumber: {
-        type: String,
-        required: true,
-        unique: true,
-    },
-    accountNumber: {
-        type: String,
-        required: true,
-        unique: true
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true
-    },
-    serviceId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true
-    },
-    dueDate: {
-        type: Date,
-        required: true,
-    },
-    invoiceNote: {
-        type: String,
-        default: "Payment is due within 30 days",
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Pending', 'Paid', 'Partially Paid', 'Cancelled', 'Overdue', 'Unpaid', 'Void'],
-        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,
-        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
-    },
-    // GL Integration Fields
-    invoiceGLEntryId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'GLEntry'
-    },
-    taxGLEntryId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'GLEntry'
-    },
-    glDoubleEntryId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'GLAccountDoubleEntries'
-    },
-    // Tax GL details
-    taxDetails: [{
-        taxId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'CountryTaxRate'
-        },
-        taxName: {
-            type: String
-        },
-        taxRate: {
-            type: Number
-        },
-        taxAmount: {
-            type: Number
-        },
-        glEntryId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'GLEntry'
-        }
-    }]
-}, {
-    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);
-
+const mongoose = require('mongoose');
+
+// Define the schema for VasInvoices
+const vasInvoiceSchema = new mongoose.Schema({
+    invoiceNumber: {
+        type: String,
+        required: true,
+        unique: true,
+    },
+    accountNumber: {
+        type: String,
+        required: true,
+        unique: true
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true
+    },
+    serviceId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true
+    },
+    dueDate: {
+        type: Date,
+        required: true,
+    },
+    invoiceNote: {
+        type: String,
+        default: "Payment is due within 30 days",
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Pending', 'Paid', 'Partially Paid', 'Cancelled', 'Overdue', 'Unpaid', 'Void'],
+        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,
+        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
+    },
+    // GL Integration Fields
+    invoiceGLEntryId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'GLEntry'
+    },
+    taxGLEntryId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'GLEntry'
+    },
+    glDoubleEntryId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'GLAccountDoubleEntries'
+    },
+    // Tax GL details
+    taxDetails: [{
+        taxId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'CountryTaxRate'
+        },
+        taxName: {
+            type: String
+        },
+        taxRate: {
+            type: Number
+        },
+        taxAmount: {
+            type: Number
+        },
+        glEntryId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'GLEntry'
+        }
+    }]
+}, {
+    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;

package/src/models/vasvendor.js

@@ -1,58 +1,58 @@
-const mongoose = require('mongoose');
-
-// Define the schema for VasVendor
-const vasVendorSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-    },
-    name: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    location: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    jobDescription: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    offers: [{
-        serviceId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Service',  // Reference to the Service model
-            required: true
-        },
-        amount: {
-            type: Number,
-            required: true,
-            min: [0, 'Amount must be a positive number']
-        }
-    }],
-    contactDetails: {
-        name: {
-            type: String,
-            required: true
-        },
-        phone: {
-            type: String,
-            required: true
-        },
-        email: {
-            type: String,
-            required: true,
-            match: [/.+\@.+\..+/, 'Please provide a valid email address']
-        }
-    }
-}, {
-    timestamps: true  // This will automatically add createdAt and updatedAt fields
-});
-
-const VasVendor = mongoose.model('VasVendor', vasVendorSchema);
-
+const mongoose = require('mongoose');
+
+// Define the schema for VasVendor
+const vasVendorSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    name: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    location: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    jobDescription: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    offers: [{
+        serviceId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Service',  // Reference to the Service model
+            required: true
+        },
+        amount: {
+            type: Number,
+            required: true,
+            min: [0, 'Amount must be a positive number']
+        }
+    }],
+    contactDetails: {
+        name: {
+            type: String,
+            required: true
+        },
+        phone: {
+            type: String,
+            required: true
+        },
+        email: {
+            type: String,
+            required: true,
+            match: [/.+\@.+\..+/, 'Please provide a valid email address']
+        }
+    }
+}, {
+    timestamps: true  // This will automatically add createdAt and updatedAt fields
+});
+
+const VasVendor = mongoose.model('VasVendor', vasVendorSchema);
+
 module.exports = VasVendor;

package/src/models/visitLog.js

@@ -1,86 +1,86 @@
-const mongoose = require('mongoose');
-
-// Define the schema for visit logs
-const visitLogSchema = new mongoose.Schema({
-    visitorName: {
-        type: String,
-        required: true
-    },
-    visitorId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Visitor',
-        required: true
-    },
-    residentName: {
-        type: String,
-        required: false
-    },
-    residentId: {
-        type: mongoose.Schema.Types.ObjectId,
-    },
-    qrCode:{
-        type:Boolean,
-        required:false
-    },
-    houseNumber: {
-        type: String,
-        required: false
-    },
-    startTime: {
-        type: String, // Changed to Date for better handling of time
-        required: true
-    },
-    endTime: {
-        type: Date, // Changed to Date for better handling of time
-        required: false
-    },
-    days:{
-        type:Number,
-        required:false
-    },
-    division:{
-        type:String,
-        required:false
-    },
-    entryPoint:{
-        type:String,
-        required:false
-    },
-    exitPoint:{
-        type:String,
-        required:false
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Visit Confirmation', 'Scheduled', 'Checked In','Checked Out', 'Cancelled'] // Define valid statuses
-        // Define valid statuses
-    },
-    vehicle: {
-        registration: String,
-        make: String,
-        color: String,
-        occupants: String,
-    },
-    visitationCode: {
-        type: Number,
-        required: false
-    },
-    requestedBy:{
-        type:mongoose.Schema.Types.ObjectId,
-        ref:"User",
-        required:false
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true // Ensures a facilityId is always provided
-    }
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Compile the model from the schema
-const VisitLog = mongoose.model('VisitLog', visitLogSchema);
-
-module.exports = VisitLog;
+const mongoose = require('mongoose');
+
+// Define the schema for visit logs
+const visitLogSchema = new mongoose.Schema({
+    visitorName: {
+        type: String,
+        required: true
+    },
+    visitorId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Visitor',
+        required: true
+    },
+    residentName: {
+        type: String,
+        required: false
+    },
+    residentId: {
+        type: mongoose.Schema.Types.ObjectId,
+    },
+    qrCode:{
+        type:Boolean,
+        required:false
+    },
+    houseNumber: {
+        type: String,
+        required: false
+    },
+    startTime: {
+        type: String, // Changed to Date for better handling of time
+        required: true
+    },
+    endTime: {
+        type: Date, // Changed to Date for better handling of time
+        required: false
+    },
+    days:{
+        type:Number,
+        required:false
+    },
+    division:{
+        type:String,
+        required:false
+    },
+    entryPoint:{
+        type:String,
+        required:false
+    },
+    exitPoint:{
+        type:String,
+        required:false
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Visit Confirmation', 'Scheduled', 'Checked In','Checked Out', 'Cancelled'] // Define valid statuses
+        // Define valid statuses
+    },
+    vehicle: {
+        registration: String,
+        make: String,
+        color: String,
+        occupants: String,
+    },
+    visitationCode: {
+        type: Number,
+        required: false
+    },
+    requestedBy:{
+        type:mongoose.Schema.Types.ObjectId,
+        ref:"User",
+        required:false
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true // Ensures a facilityId is always provided
+    }
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+// Compile the model from the schema
+const VisitLog = mongoose.model('VisitLog', visitLogSchema);
+
+module.exports = VisitLog;