payservedb 7.8.7 → 7.8.9

package/index.js

@@ -203,8 +203,8 @@ const models = {
     PowerPrepaidCredit: require("./src/models/power_prepaid_credits"),
     PowerNegativeBalance: require("./src/models/power_meter_negative_balance"),
     PowerCommandQueue: require("./src/models/power_meter_command_queue"),
+    PowerNotification: require("./src/models/power_sms_notification"),
     FacilityWalletTransactionsMetadata: require("./src/models/facilityWalletTransactionsMetadata"),
-    SmsNotification: require("./src/models/sms_balance_notification"),
     NegativeBalance: require("./src/models/water_meter_negative_amounts"),
     MasterWorkplan: require("./src/models/master_workplan"),
     MasterWorkplanChild: require("./src/models/master_workplan_child"),

package/package.json

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

package/src/models/billerAddress.js

@@ -72,6 +72,10 @@ const billerAddressSchema = new mongoose.Schema(
       type: String, // Will store the file path/URL of the uploaded logo
       required: false,
     },
+    digitalSignature: {
+      type: String, // Will store the file path/URL of the uploaded digital signature
+      required: false,
+    },
     isDefault: {
       type: Boolean,
       default: false,
@@ -117,4 +121,4 @@ billerAddressSchema.pre('save', async function (next) {
 // Compile the model from the schema
 const BillerAddress = mongoose.model("BillerAddress", billerAddressSchema);
 
-module.exports = BillerAddress;
+module.exports = BillerAddress;

package/src/models/powerMeterSettings.js

@@ -7,7 +7,7 @@ const powerMeterSettingsSchema = new mongoose.Schema({
         required: true,
         unique: true // Ensure one settings record per facility
     },
-    
+
     // Billing Amounts
     minAmount: {
         type: Number,
@@ -19,7 +19,7 @@ const powerMeterSettingsSchema = new mongoose.Schema({
         default: 50000,
         min: 0
     },
-    
+
     // Suspicious Meter Reading Thresholds
     lowThreshold: {
         type: Number,
@@ -31,7 +31,7 @@ const powerMeterSettingsSchema = new mongoose.Schema({
         default: 0,
         min: 0
     },
-    
+
     // Billing Schedule
     gracePeriod: {
         type: Number,
@@ -44,7 +44,7 @@ const powerMeterSettingsSchema = new mongoose.Schema({
         min: 0,
         max: 30
     },
-    
+
     // Payment Enforcement
     enforcePayment: {
         type: String,
@@ -56,7 +56,7 @@ const powerMeterSettingsSchema = new mongoose.Schema({
         default: 0,
         min: 0
     },
-    
+
     // Tariff Settings
     tariff: {
         type: String,
@@ -78,7 +78,7 @@ const powerMeterSettingsSchema = new mongoose.Schema({
         default: 0,
         min: 0
     },
-    
+
     // GL Account Configuration (following your sample pattern)
     glAccounts: {
         invoice: {
@@ -106,7 +106,28 @@ const powerMeterSettingsSchema = new mongoose.Schema({
             }
         }
     },
-    
+    // Discounts
+    discounts: [{
+        name: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        type: {
+            type: String,
+            enum: ['percentage', 'fixed_amount'],
+            required: true
+        },
+        value: {
+            type: Number,
+            required: true,
+            min: 0
+        },
+        yearMonth: {
+            type: String,
+            required: true
+        }
+    }],
     // Other Charges
     otherCharges: {
         type: String,

package/src/models/power_sms_notification.js

@@ -0,0 +1,27 @@
+const mongoose = require('mongoose');
+
+const PowerNotificationSchema = new mongoose.Schema({
+    accountId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeterAccount',
+        required: true
+    },
+    currentRange: {
+        type: String,
+        required: true
+    },
+    lastNotificationDate: {
+        type: Date,
+        default: Date.now
+    },
+    balance: {
+        type: Number,
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+const PowerNotification = mongoose.model('PowerNotification', PowerNotificationSchema)
+
+module.exports = PowerNotification;

package/src/models/water_meter_settings.js

@@ -165,6 +165,29 @@ const waterMeterSettingsSchema = new mongoose.Schema({
       }
     }
   },
+
+   // Discounts
+    discounts: [{
+        name: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        type: {
+            type: String,
+            enum: ['percentage', 'fixed_amount'],
+            required: true
+        },
+        value: {
+            type: Number,
+            required: true,
+            min: 0
+        },
+        yearMonth: {
+            type: String,
+            required: true
+        }
+    }],
   
   // Biller address for invoices
   billerAddress: {