payservedb 8.0.8 → 8.1.0

package/package.json

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

package/src/models/leaseagreement.js

@@ -26,10 +26,15 @@ const leaseAgreementSchema = new mongoose.Schema({
         ref: 'Customer',
         required: true
     },
-     billerAddressId: {
+    billerAddressId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'BillerAddress'
     },
+    // Reference to BankDetails instead of storing bank info directly
+    bankDetails: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BankDetails'
+    },
     // GL Account configurations
     invoiceDoubleEntryAccount: {
         type: mongoose.Schema.Types.ObjectId,
@@ -78,15 +83,21 @@ const leaseAgreementSchema = new mongoose.Schema({
                 required: true,
                 enum: ['Bank Transfer', 'Cash', 'Cheque']
             },
+            // Reference bank details ID instead of storing bank info
+            bankDetailsId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'BankDetails'
+            },
+            // Keep other payment method details for non-bank methods
             details: {
-                bankName: String,
-                accountName: String,
-                accountNumber: String,
-                branch: String,
-                swiftCode: String,
+                // For non-bank payment methods
                 bankToDraft: String,
                 chequeAccountNumber: String,
-                preferredCashLocation: String
+                preferredCashLocation: String,
+                // For mobile money
+                provider: String,
+                phoneNumber: String,
+                accountName: String
             },
             isPrimary: { type: Boolean, default: false }
         }],
@@ -121,6 +132,7 @@ const leaseAgreementSchema = new mongoose.Schema({
             }
         }]
     },
+    // ... rest of the schema remains the same
     billingCycle: {
         frequency: {
             type: String,
@@ -208,7 +220,7 @@ const leaseAgreementSchema = new mongoose.Schema({
             },
             editedAt: { type: Date, default: Date.now },
             reason: { type: String, required: true },
-            changes: { type: Object } // Optional: Store what fields were changed
+            changes: { type: Object }
         }
     ],
     createdBy: {

package/src/models/water_meter_concentrator.js

@@ -32,6 +32,10 @@ const concentratorSchema = new mongoose.Schema({
         enum: ['online', 'offline', 'maintenance'],
         default: 'offline'
     },
+    ipAddress: {
+        type: String,
+        trim: true
+    },
     meter_fails: {
         type: Number,
         min: 0