payservedb 4.0.7 → 4.0.9

package/package.json

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

package/src/models/cashpayment.js

@@ -0,0 +1,186 @@
+// File: models/CashPayment.js
+const mongoose = require('mongoose');
+
+// Define the schema for Cash Payments
+const cashPaymentSchema = new mongoose.Schema({
+    // Payment reference details
+    paymentReference: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    // Invoice details
+    invoice: {
+        invoiceId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Invoice',
+            required: true
+        },
+        invoiceNumber: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        accountNumber: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        totalAmount: {
+            type: Number,
+            required: true,
+            min: 0
+        }
+    },
+    // Client details
+    client: {
+        clientId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Customer',
+            required: true
+        },
+        firstName: {
+            type: String,
+            required: true
+        },
+        lastName: {
+            type: String,
+            required: true
+        }
+    },
+    // Payment details
+    paymentAmount: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    currency: {
+        id: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Currency',
+            required: true
+        },
+        name: {
+            type: String,
+            required: true
+        },
+        code: {
+            type: String,
+            required: true,
+            uppercase: true,
+            minlength: 3,
+            maxlength: 3
+        }
+    },
+    paymentDate: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    receivedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true
+    },
+    receiptNumber: {
+        type: String,
+        required: true,
+        unique: true
+    },
+    paymentMethod: {
+        type: String,
+        enum: ['Cash', 'Check', 'Bank Transfer'],
+        default: 'Cash'
+    },
+    paymentDetails: {
+        checkNumber: String,
+        bankName: String,
+        transferReference: String,
+        notes: String
+    },
+    // Reconciliation status
+    reconciliationStatus: {
+        type: String,
+        enum: ['Pending', 'Matched', 'Partial', 'Overpaid', 'Voided'],
+        default: 'Pending'
+    },
+    // Approval details
+    approvalStatus: {
+        type: String,
+        enum: ['Pending', 'Approved', 'Rejected'],
+        default: 'Pending'
+    },
+    approvedBy: {
+        userId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        },
+        name: String,
+        approvalDate: Date,
+        comments: String
+    },
+    // Reconciliation details
+    reconciliationDetails: {
+        appliedAmount: {
+            type: Number,
+            default: 0
+        },
+        overpayAmount: {
+            type: Number,
+            default: 0
+        },
+        reconciliationDate: Date,
+        reconciledBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        }
+    },
+    // Exchange rate (for payments in different currencies)
+    exchangeRate: {
+        rate: {
+            type: Number,
+            default: 1
+        },
+        originalCurrency: {
+            code: String,
+            amount: Number
+        }
+    },
+    // Additional fields
+    isVoided: {
+        type: Boolean,
+        default: false
+    },
+    voidReason: {
+        type: String
+    },
+    voidedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User'
+    },
+    voidDate: Date,
+    attachments: [{
+        fileName: String,
+        fileUrl: String,
+        uploadDate: {
+            type: Date,
+            default: Date.now
+        },
+        uploadedBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        }
+    }]
+}, {
+    timestamps: true
+});
+
+const CashPayment = mongoose.model('CashPayment', cashPaymentSchema);
+
+module.exports = CashPayment;

package/src/models/user_account.js

@@ -32,11 +32,9 @@ const userAccountSchema = new mongoose.Schema({
         unique: true,
         trim: true
     },
-    unitName: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
     },
     payment_type: {
         type: String,
@@ -66,12 +64,12 @@ const userAccountSchema = new mongoose.Schema({
     meter_id: {
         type: mongoose.Schema.Types.ObjectId,
         required: true,
-        refPath: 'meterModel'  
+        refPath: 'meterModel'
     },
     meterModel: {
         type: String,
         required: true,
-        enum: ['Meter', 'AnalogMeter'] 
+        enum: ['Meter', 'AnalogMeter']
     }
 }, {
     timestamps: true