payservedb 3.8.3 → 3.8.5

package/package.json

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

package/src/models/facility_payment_details.js

@@ -11,7 +11,7 @@ const facilityPaymentDetailsSchema = new mongoose.Schema({
     },
     module: {
         type: String,
-        enum: ["All", "Water", "Electricity", "Levy"],
+        enum: ["All", "Water", "Electricity", "Levy","Lease"],
         default: "All"
     },
 });

package/src/models/leaseagreement.js

@@ -36,124 +36,43 @@ const leaseAgreementSchema = new mongoose.Schema({
         monthlyRent: { type: Number, required: true },
         paymentDueDate: { type: Number, required: true },
         paymentMethods: [{
-            type: {
-                type: String,
-                required: true,
-                enum: ['Bank Transfer', 'Cash', 'Cheque']
+          type: {
+            type: String,
+            required: true,
+            enum: ['Bank Transfer', 'Cash', 'Cheque', 'MPESA']
+          },
+          details: {
+            // Bank Transfer details
+            bankName: String,
+            accountName: String,
+            accountNumber: String,
+            branch: String,
+            swiftCode: String,
+            // Cheque details
+            bankToDraft: String,
+            chequeAccountNumber: String,
+            // Cash details
+            preferredCashLocation: String,
+            // MPESA details
+            settingsId: {
+              type: mongoose.Schema.Types.ObjectId,
+              ref: 'Settings'
             },
-            details: {
-                // Bank Transfer details
-                bankName: String,
-                accountName: String,
-                accountNumber: String,
-                branch: String,
-                swiftCode: String,
-                // Cheque details
-                bankToDraft: String,
-                chequeAccountNumber: String,
-                // Cash details
-                preferredCashLocation: String
-            },
-            isPrimary: { type: Boolean, default: false }
+            businessNumber: String,
+            accountNumber: String
+          },
+          isPrimary: { type: Boolean, default: false }
         }],
         securityDeposit: { type: Number, required: true },
         penaltyId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Penalty'
-        },
-        mpesaEnabled: { 
-            type: Boolean, 
-            default: false 
-        },
-        mpesaDetails: {
-            businessNumber: String,  // Paybill or Till number
-            accountNumber: String,   // Account number if using Paybill
-            phoneNumber: String      // Phone number for receiving payments
-        }
-    },
-    billingCycle: {
-        frequency: { 
-            type: String, 
-            enum: ['Monthly', 'Quarterly', 'Annually'], 
-            required: true 
-        },
-        nextInvoiceDate: { type: Date },
-        autoSend: { type: Boolean, default: false }
-    },
-    invoices: [
-        { type: mongoose.Schema.Types.ObjectId, ref: 'Invoice' }
-    ],
-    leaseTemplate: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'LeaseTemplate',
-        required: true
-    },
-    leaseDocuments: [
-        {
-            fileName: { type: String },
-            fileUrl: { type: String },
-            uploadedAt: { type: Date, default: Date.now }
+          type: mongoose.Schema.Types.ObjectId,
+          ref: 'Penalty'
         }
-    ],
-    reminders: [
-        {
-            reminderId: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'Reminder'
-            },
-            status: { 
-                type: String, 
-                enum: ['Pending', 'Sent'], 
-                default: 'Pending' 
-            }
-        }
-    ],
-    status: {
-        type: String,
-        enum: ['Active', 'Pending', 'Expired', 'Terminated'],
-        default: 'Active'
-    },
-    payments: [
-        {
-            invoiceId: { 
-                type: mongoose.Schema.Types.ObjectId, 
-                ref: 'Invoice', 
-                required: true 
-            },
-            method: {
-                type: {
-                    type: String,
-                    enum: ['Bank Transfer', 'Cash', 'Cheque', 'MPESA'],
-                    required: true
-                },
-                details: {
-                    // Bank Transfer payment details
-                    bankName: String,
-                    accountNumber: String,
-                    transactionId: String,
-                    // Cheque payment details
-                    chequeNumber: String,
-                    // MPESA payment details
-                    mpesaTransactionId: String,
-                    mpesaPhoneNumber: String
-                }
-            },
-            amount: { type: Number, required: true },
-            receivedBy: { 
-                type: mongoose.Schema.Types.ObjectId, 
-                ref: 'User', 
-                required: true 
-            },
-            receivedAt: { type: Date, default: Date.now }
-        }
-    ],
-    createdBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User'
-    }
-}, {
-    timestamps: true
-});
+      }
+    }, {
+      timestamps: true
+    });
+    
 
 // Add index for multi-tenancy queries
 leaseAgreementSchema.index({ facilityId: 1 });