payservedb 7.0.8 → 7.8.0

package/package.json

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

package/src/models/water_invoice.js

@@ -37,7 +37,7 @@ const waterInvoiceSchema = new mongoose.Schema(
       default: 0
     },
 
-    // PAYMENTS
+    // PAYMENTS - Updated structure
     paymentMethods: {
       mobilePayment: {
         status: {
@@ -58,10 +58,23 @@ const waterInvoiceSchema = new mongoose.Schema(
           type: mongoose.Schema.Types.ObjectId,
           ref: 'BankDetails'
         }
+      },
+      cashPayment: {
+        status: {
+          type: Boolean,
+          default: false
+        }
       }
     },
 
-    // Biller Address Information (added from WaterMeterSettings)
+    // Add a separate field for the primary payment method used
+    primaryPaymentMethod: {
+      type: String,
+      enum: ['mobile', 'bank', 'cash', 'mixed'],
+      default: null
+    },
+
+    // Biller Address Information
     billerAddress: {
       name: {
         type: String,
@@ -291,13 +304,49 @@ const waterInvoiceSchema = new mongoose.Schema(
   }
 );
 
+// Pre-save middleware to update payment method status and primary payment method
 waterInvoiceSchema.pre('save', function (next) {
+  // Handle due date and status
   if (this.isModified('dueDate') || this.isNew) {
     const today = new Date();
     if (this.dueDate < today && this.status === 'Pending') {
       this.status = 'Overdue';
     }
   }
+
+  // Update payment method status based on reconciliation history
+  if (this.isModified('reconciliationHistory') || this.isNew) {
+    if (this.reconciliationHistory && this.reconciliationHistory.length > 0) {
+      const latestPayment = this.reconciliationHistory[this.reconciliationHistory.length - 1];
+      const paymentType = latestPayment.type?.toLowerCase();
+
+      // Initialize paymentMethods if not exists
+      if (!this.paymentMethods) {
+        this.paymentMethods = {
+          mobilePayment: { status: false },
+          bankPayment: { status: false },
+          cashPayment: { status: false }
+        };
+      }
+
+      // Update payment method status based on payment type
+      if (paymentType && (paymentType.includes('mobile') || paymentType.includes('mpesa') || paymentType.includes('m-pesa'))) {
+        this.paymentMethods.mobilePayment.status = true;
+        this.primaryPaymentMethod = 'mobile';
+      } else if (paymentType && paymentType.includes('bank')) {
+        this.paymentMethods.bankPayment.status = true;
+        this.primaryPaymentMethod = 'bank';
+      } else if (paymentType && paymentType.includes('cash')) {
+        this.paymentMethods.cashPayment.status = true;
+        this.primaryPaymentMethod = 'cash';
+      } else {
+        // Default to cash for manual or unspecified payments
+        this.paymentMethods.cashPayment.status = true;
+        this.primaryPaymentMethod = 'cash';
+      }
+    }
+  }
+
   next();
 });
 

package/src/models/water_meter_settings.js

@@ -4,7 +4,8 @@ const waterMeterSettingsSchema = new mongoose.Schema({
   facilityId: {
     type: mongoose.Schema.Types.ObjectId,
     ref: 'Facility',
-    required: true
+    required: true,
+    unique: true
   },
   minAmount: {
     type: Number,
@@ -18,9 +19,11 @@ const waterMeterSettingsSchema = new mongoose.Schema({
   },
   lowThreshold: {
     type: Number,
+    default: 0
   },
   highThreshold: {
     type: Number,
+    default: 0
   },
   gracePeriod: {
     type: Number,
@@ -71,8 +74,9 @@ const waterMeterSettingsSchema = new mongoose.Schema({
     default: 0
   },
   
-  // Updated notification structure
+  // Updated notification structure - separated concerns
   notifications: {
+    // Usage and billing notifications
     usageAlerts: {
       enabled: {
         type: Boolean,
@@ -96,22 +100,28 @@ const waterMeterSettingsSchema = new mongoose.Schema({
         type: Boolean,
         default: false
       }
+    },
+    // Payment reminder notifications 
+    paymentReminders: {
+      enabled: {
+        type: Boolean,
+        default: false
+      },
+      daysBeforeDue: {
+        type: Number,
+        default: 3,
+        min: 1,
+        max: 30
+      },
+      frequency: {
+        type: String,
+        enum: ['daily', 'weekly', 'once'],
+        default: 'once'
+      }
     }
   },
-  dailyNotifications: {
-    type: Boolean,
-    default: false
-  },
-  weeklyNotifications: {
-    type: Boolean,
-    default: false
-  },
-  allNotifications: {
-    type: Boolean,
-    default: false
-  },
 
-  // Add other charges section
+  // Other charges section
   otherCharges: {
     type: String,
     enum: ['yes', 'no'],
@@ -132,7 +142,7 @@ const waterMeterSettingsSchema = new mongoose.Schema({
     default: 0
   },
 
-  // PAYMENTS
+  // Payment methods
   paymentMethods: {
     mobilePayment: {
       status: {
@@ -156,7 +166,7 @@ const waterMeterSettingsSchema = new mongoose.Schema({
     }
   },
   
-  // Biller Address Information for Invoice Generation
+  // Biller address for invoices
   billerAddress: {
     name: {
       type: String,
@@ -193,6 +203,7 @@ const waterMeterSettingsSchema = new mongoose.Schema({
     }
   },
 
+  // GL accounts for accounting entries
   glAccounts: {
     invoice: {
       debit: {