payservedb 6.6.8 → 6.7.0

package/package.json

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

package/src/models/powerMeterGateways.js

@@ -10,23 +10,24 @@ const powerMeterGatewaySchema = new mongoose.Schema({
         type: String,
         required: true
     },
-    gatewayNumber: {
+    gatewayId: {
         type: Number,
         required: false
-
     },
-    location: {
+    manufacturer: {
         type: String,
         required: true
-
+    },
+    location: {
+        type: String,
+        trim: true
     },
     type: {
         type: String,
         trim: true
     },
     status: {
-        type: String,
-        required: true
+        type: String
     }
 }, {
     timestamps: true

package/src/models/water_meter_account.js

@@ -68,6 +68,10 @@ const waterMeterAccountSchema = new mongoose.Schema({
     meter_id: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'WaterMeter',
+    },
+    accountBalance: {
+        type: Number,
+        default: 0
     }
 }, {
     timestamps: true

package/src/models/water_meter_settings.js

@@ -70,9 +70,33 @@ const waterMeterSettingsSchema = new mongoose.Schema({
     required: true,
     default: 0
   },
+  
+  // Updated notification structure
   notifications: {
-    type: Boolean,
-    default: false
+    usageAlerts: {
+      enabled: {
+        type: Boolean,
+        default: false
+      },
+      daily: {
+        type: Boolean,
+        default: false
+      },
+      weekly: {
+        type: Boolean,
+        default: false
+      },
+      monthly: {
+        type: Boolean,
+        default: false
+      }
+    },
+    statements: {
+      enabled: {
+        type: Boolean,
+        default: false
+      }
+    }
   },
   dailyNotifications: {
     type: Boolean,
@@ -86,6 +110,28 @@ const waterMeterSettingsSchema = new mongoose.Schema({
     type: Boolean,
     default: false
   },
+
+  // Add other charges section
+  otherCharges: {
+    type: String,
+    enum: ['yes', 'no'],
+    default: 'no'
+  },
+  sewerageCharge: {
+    type: Number,
+    default: 0
+  },
+  fixedCharge: {
+    type: Number,
+    default: 0
+  },
+  vatPercentage: {
+    type: Number,
+    min: 0,
+    max: 100,
+    default: 0
+  },
+
   // PAYMENTS
   paymentMethods: {
     mobilePayment: {
@@ -109,7 +155,7 @@ const waterMeterSettingsSchema = new mongoose.Schema({
       }
     }
   },
-
+  
   // Biller Address Information for Invoice Generation
   billerAddress: {
     name: {
@@ -146,6 +192,7 @@ const waterMeterSettingsSchema = new mongoose.Schema({
       trim: true,
     }
   },
+
   glAccounts: {
     invoice: {
       debit: {

package/src/models/water_meters.js

@@ -120,7 +120,7 @@ const waterMeterSchema = new mongoose.Schema({
     },
     bulkMeterDescription: {
         type: String,
-        enum: ['City Council Bulk', 'Borehole Bulk', 'Bulk Inlet'],
+        enum: ['City Council Bulk', 'Borehole Bulk', 'Bulk Inlet', 'Bulk Outlet','Bulk Borehole Outlet'],
         trim: true
     }