payservedb 9.5.2 → 9.5.3

package/src/models/levy_deposits.js

@@ -1,140 +1,140 @@
-const mongoose = require('mongoose');
-const Schema = mongoose.Schema;
-
-const DepositSchema = new Schema(
-    {
-        contractId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'LevyContract',
-            required: [true, 'Contract ID is required']
-        },
-        customerId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Customer',
-            required: [true, 'Customer ID is required']
-        },
-        unitId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Unit',
-            required: [true, 'Unit ID is required']
-        },
-        facilityId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Facility',
-            required: [true, 'Facility ID is required']
-        },
-        amount: {
-            type: Number,
-            min: [0, 'Amount cannot be negative']
-        },
-        datePaid: {
-            type: Date
-        },
-        // NEW FIELDS FOR DEPOSIT/UPFRONT PAYMENT
-        receiptNumber: {
-            type: String,
-            trim: true
-        },
-        paymentReference: {
-            type: String,
-            trim: true
-        },
-        // For upfront payment tracking
-        upfrontPaymentId: {
-            type: String,
-            trim: true
-        },
-        billingPeriods: [{
-            type: String
-        }],
-        // Status fields
-        status: {
-            type: String,
-            enum: ['Pending', 'Held', 'Refunded', 'Partially Refunded', 'Forfeited'],
-            default: 'Pending', 
-            required: [true, 'Status is required']
-        },
-        refundedAmount: {
-            type: Number,
-            default: 0,
-            min: [0, 'Refunded amount cannot be negative']
-        },
-        refundDate: {
-            type: Date
-        }
-    },
-    {
-        timestamps: true,
-        toJSON: { virtuals: true },
-        toObject: { virtuals: true }
-    }
-);
-
-// Virtual populate for Contract details
-DepositSchema.virtual('contract', {
-    ref: 'LevyContract',
-    localField: 'contractId',
-    foreignField: '_id',
-    justOne: true
-});
-
-// Virtual populate for Customer details
-DepositSchema.virtual('customer', {
-    ref: 'Customer',
-    localField: 'customerId',
-    foreignField: '_id',
-    justOne: true
-});
-
-// Virtual populate for Unit details
-DepositSchema.virtual('unit', {
-    ref: 'Unit',
-    localField: 'unitId',
-    foreignField: '_id',
-    justOne: true
-});
-
-// Virtual for remaining (unrefunded) balance
-DepositSchema.virtual('balanceRemaining').get(function () {
-    return this.amount - (this.refundedAmount || 0);
-});
-
-// Pre-save middleware: set refundDate when status moves to Refunded/Partially Refunded
-DepositSchema.pre('save', function (next) {
-    if (
-        (this.status === 'Refunded' || this.status === 'Partially Refunded') &&
-        !this.refundDate &&
-        this.isModified('status')
-    ) {
-        this.refundDate = new Date();
-    }
-    // Guard against refunded amount exceeding original amount
-    if ((this.refundedAmount || 0) > this.amount) {
-        return next(new Error('Refunded amount cannot exceed deposit amount'));
-    }
-    // Auto-flip to fully Refunded when refundedAmount covers the amount
-    if (this.refundedAmount >= this.amount) {
-        this.status = 'Refunded';
-    }
-    next();
-});
-
-const ReceiptCounterSchema = new Schema({
-    _id: {
-        type: String,
-        required: true // fixed value: 'ContractPaymentReceipt'
-    },
-    seq: {
-        type: Number,
-        default: 0
-    }
-});
-
-module.exports = {
-    schema: DepositSchema,
-    name: 'Deposit',
-    ReceiptCounterSchema: {
-        schema: ReceiptCounterSchema,
-        name: 'ReceiptCounter'
-    }
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const DepositSchema = new Schema(
+    {
+        contractId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'LevyContract',
+            required: [true, 'Contract ID is required']
+        },
+        customerId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Customer',
+            required: [true, 'Customer ID is required']
+        },
+        unitId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Unit',
+            required: [true, 'Unit ID is required']
+        },
+        facilityId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Facility',
+            required: [true, 'Facility ID is required']
+        },
+        amount: {
+            type: Number,
+            min: [0, 'Amount cannot be negative']
+        },
+        datePaid: {
+            type: Date
+        },
+        // NEW FIELDS FOR DEPOSIT/UPFRONT PAYMENT
+        receiptNumber: {
+            type: String,
+            trim: true
+        },
+        paymentReference: {
+            type: String,
+            trim: true
+        },
+        // For upfront payment tracking
+        upfrontPaymentId: {
+            type: String,
+            trim: true
+        },
+        billingPeriods: [{
+            type: String
+        }],
+        // Status fields
+        status: {
+            type: String,
+            enum: ['Pending', 'Held', 'Refunded', 'Partially Refunded', 'Forfeited'],
+            default: 'Pending', 
+            required: [true, 'Status is required']
+        },
+        refundedAmount: {
+            type: Number,
+            default: 0,
+            min: [0, 'Refunded amount cannot be negative']
+        },
+        refundDate: {
+            type: Date
+        }
+    },
+    {
+        timestamps: true,
+        toJSON: { virtuals: true },
+        toObject: { virtuals: true }
+    }
+);
+
+// Virtual populate for Contract details
+DepositSchema.virtual('contract', {
+    ref: 'LevyContract',
+    localField: 'contractId',
+    foreignField: '_id',
+    justOne: true
+});
+
+// Virtual populate for Customer details
+DepositSchema.virtual('customer', {
+    ref: 'Customer',
+    localField: 'customerId',
+    foreignField: '_id',
+    justOne: true
+});
+
+// Virtual populate for Unit details
+DepositSchema.virtual('unit', {
+    ref: 'Unit',
+    localField: 'unitId',
+    foreignField: '_id',
+    justOne: true
+});
+
+// Virtual for remaining (unrefunded) balance
+DepositSchema.virtual('balanceRemaining').get(function () {
+    return this.amount - (this.refundedAmount || 0);
+});
+
+// Pre-save middleware: set refundDate when status moves to Refunded/Partially Refunded
+DepositSchema.pre('save', function (next) {
+    if (
+        (this.status === 'Refunded' || this.status === 'Partially Refunded') &&
+        !this.refundDate &&
+        this.isModified('status')
+    ) {
+        this.refundDate = new Date();
+    }
+    // Guard against refunded amount exceeding original amount
+    if ((this.refundedAmount || 0) > this.amount) {
+        return next(new Error('Refunded amount cannot exceed deposit amount'));
+    }
+    // Auto-flip to fully Refunded when refundedAmount covers the amount
+    if (this.refundedAmount >= this.amount) {
+        this.status = 'Refunded';
+    }
+    next();
+});
+
+const ReceiptCounterSchema = new Schema({
+    _id: {
+        type: String,
+        required: true // fixed value: 'ContractPaymentReceipt'
+    },
+    seq: {
+        type: Number,
+        default: 0
+    }
+});
+
+module.exports = {
+    schema: DepositSchema,
+    name: 'Deposit',
+    ReceiptCounterSchema: {
+        schema: ReceiptCounterSchema,
+        name: 'ReceiptCounter'
+    }
 };

package/src/models/levy_invoice_settings.js

@@ -1,27 +1,27 @@
-const mongoose = require('mongoose');
-
-const InvoiceSettingsSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: [true, 'Facility ID is required']
-    },
-    termsAndConditions: {
-        type: String,
-        default: 'Payment is due within 15 days'
-    },
-    bankName: {
-        type: String,
-        required: [true, 'Bank name is required']
-    },
-    accountNumber: {
-        type: String,
-        required: [true, 'Account number is required']
-    }
-}, {
-    timestamps: true
-});
-
-const InvoiceSettings = mongoose.model('InvoiceSettings', InvoiceSettingsSchema);
-
+const mongoose = require('mongoose');
+
+const InvoiceSettingsSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: [true, 'Facility ID is required']
+    },
+    termsAndConditions: {
+        type: String,
+        default: 'Payment is due within 15 days'
+    },
+    bankName: {
+        type: String,
+        required: [true, 'Bank name is required']
+    },
+    accountNumber: {
+        type: String,
+        required: [true, 'Account number is required']
+    }
+}, {
+    timestamps: true
+});
+
+const InvoiceSettings = mongoose.model('InvoiceSettings', InvoiceSettingsSchema);
+
 module.exports = InvoiceSettings;

package/src/models/levy_payment_receipt.js

@@ -1,157 +1,157 @@
-const mongoose = require('mongoose');
-const Schema = mongoose.Schema;
-
-const ContractPaymentReceiptSchema = new Schema(
-    {
-        contractId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'LevyContract',
-            required: [true, 'Contract ID is required']
-        },
-        customerId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Customer',
-            required: [true, 'Customer ID is required']
-        },
-        unitId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Unit',
-            required: [true, 'Unit ID is required']
-        },
-        facilityId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Facility',
-            required: [true, 'Facility ID is required']
-        },
-
-        receiptNumber: {
-            type: String,
-            required: [true, 'Receipt number is required'],
-            unique: true,
-            trim: true
-        },
-        paymentReference: {
-            type: String,
-            trim: true
-        },
-        datePaid: {
-            type: Date,
-            required: [true, 'Date paid is required']
-        },
-        paymentMethod: {
-            type: String,
-            trim: true
-            // e.g. 'mpesa', 'bank', 'cash' — not currently captured on the
-            // contract form, left optional until that's wired up
-        },
-
-        lineItems: [
-            {
-                lineType: {
-                    type: String,
-                    enum: ['Deposit', 'UpfrontPayment'],
-                    required: true
-                },
-                description: {
-                    type: String,
-                    required: true
-                },
-                quantity: {
-                    type: Number,
-                    default: 1
-                },
-                unitAmount: {
-                    type: Number,
-                    required: true,
-                    min: [0, 'Unit amount cannot be negative']
-                },
-                taxRate: {
-                    type: Number,
-                    default: 0
-                },
-                taxAmount: {
-                    type: Number,
-                    default: 0
-                },
-                lineTotal: {
-                    type: Number,
-                    required: true
-                },
-                depositId: {
-                    type: mongoose.Schema.Types.ObjectId,
-                    ref: 'Deposit'
-                }
-            }
-        ],
-
-        subTotal: {
-            type: Number,
-            required: true,
-            default: 0
-        },
-        taxTotal: {
-            type: Number,
-            required: true,
-            default: 0
-        },
-        totalCharges: {
-            type: Number,
-            required: true,
-            default: 0
-        },
-        amountPaid: {
-            type: Number,
-            required: true,
-            default: 0
-        },
-        balanceDue: {
-            type: Number,
-            required: true,
-            default: 0
-            // positive = still owed, negative = overpaid
-        },
-        overpaymentAmount: {
-            type: Number,
-            default: 0
-        },
-
-        createdBy: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'User'
-        }
-    },
-    {
-        timestamps: true,
-        toJSON: { virtuals: true },
-        toObject: { virtuals: true }
-    }
-);
-
-ContractPaymentReceiptSchema.virtual('contract', {
-    ref: 'LevyContract',
-    localField: 'contractId',
-    foreignField: '_id',
-    justOne: true
-});
-
-ContractPaymentReceiptSchema.virtual('customer', {
-    ref: 'Customer',
-    localField: 'customerId',
-    foreignField: '_id',
-    justOne: true
-});
-
-ContractPaymentReceiptSchema.virtual('unit', {
-    ref: 'Unit',
-    localField: 'unitId',
-    foreignField: '_id',
-    justOne: true
-});
-
-ContractPaymentReceiptSchema.index({ facilityId: 1, receiptNumber: 1 });
-ContractPaymentReceiptSchema.index({ contractId: 1 });
-
-module.exports = {
-    schema: ContractPaymentReceiptSchema,
-    name: 'ContractPaymentReceipt'
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const ContractPaymentReceiptSchema = new Schema(
+    {
+        contractId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'LevyContract',
+            required: [true, 'Contract ID is required']
+        },
+        customerId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Customer',
+            required: [true, 'Customer ID is required']
+        },
+        unitId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Unit',
+            required: [true, 'Unit ID is required']
+        },
+        facilityId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Facility',
+            required: [true, 'Facility ID is required']
+        },
+
+        receiptNumber: {
+            type: String,
+            required: [true, 'Receipt number is required'],
+            unique: true,
+            trim: true
+        },
+        paymentReference: {
+            type: String,
+            trim: true
+        },
+        datePaid: {
+            type: Date,
+            required: [true, 'Date paid is required']
+        },
+        paymentMethod: {
+            type: String,
+            trim: true
+            // e.g. 'mpesa', 'bank', 'cash' — not currently captured on the
+            // contract form, left optional until that's wired up
+        },
+
+        lineItems: [
+            {
+                lineType: {
+                    type: String,
+                    enum: ['Deposit', 'UpfrontPayment'],
+                    required: true
+                },
+                description: {
+                    type: String,
+                    required: true
+                },
+                quantity: {
+                    type: Number,
+                    default: 1
+                },
+                unitAmount: {
+                    type: Number,
+                    required: true,
+                    min: [0, 'Unit amount cannot be negative']
+                },
+                taxRate: {
+                    type: Number,
+                    default: 0
+                },
+                taxAmount: {
+                    type: Number,
+                    default: 0
+                },
+                lineTotal: {
+                    type: Number,
+                    required: true
+                },
+                depositId: {
+                    type: mongoose.Schema.Types.ObjectId,
+                    ref: 'Deposit'
+                }
+            }
+        ],
+
+        subTotal: {
+            type: Number,
+            required: true,
+            default: 0
+        },
+        taxTotal: {
+            type: Number,
+            required: true,
+            default: 0
+        },
+        totalCharges: {
+            type: Number,
+            required: true,
+            default: 0
+        },
+        amountPaid: {
+            type: Number,
+            required: true,
+            default: 0
+        },
+        balanceDue: {
+            type: Number,
+            required: true,
+            default: 0
+            // positive = still owed, negative = overpaid
+        },
+        overpaymentAmount: {
+            type: Number,
+            default: 0
+        },
+
+        createdBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        }
+    },
+    {
+        timestamps: true,
+        toJSON: { virtuals: true },
+        toObject: { virtuals: true }
+    }
+);
+
+ContractPaymentReceiptSchema.virtual('contract', {
+    ref: 'LevyContract',
+    localField: 'contractId',
+    foreignField: '_id',
+    justOne: true
+});
+
+ContractPaymentReceiptSchema.virtual('customer', {
+    ref: 'Customer',
+    localField: 'customerId',
+    foreignField: '_id',
+    justOne: true
+});
+
+ContractPaymentReceiptSchema.virtual('unit', {
+    ref: 'Unit',
+    localField: 'unitId',
+    foreignField: '_id',
+    justOne: true
+});
+
+ContractPaymentReceiptSchema.index({ facilityId: 1, receiptNumber: 1 });
+ContractPaymentReceiptSchema.index({ contractId: 1 });
+
+module.exports = {
+    schema: ContractPaymentReceiptSchema,
+    name: 'ContractPaymentReceipt'
 };