payservedb 4.1.3 → 4.1.5

package/index.js

@@ -128,8 +128,11 @@ const models = {
     DefaultPaymentDetails: require('./src/models/default_payment_details'),
     Currency: require('./src/models/currency_settings'),
     UserAccount: require('./src/models/user_account'),
-    CashPayment: require('./src/models/cashpayment')
-
+    CashPayment: require('./src/models/cashpayment'),
+    VasPayment: require('./src/models/vas_payment'),
+    VasInvoicesUpdate: require('./src/models/vas_invoices_upload'),
+    ServiceChargePayment: require('./src/models/service_charge_payments'),
+    ServiceChargeInvoiceUpload: require('./src/models/service_charge_invoice_upload')
 
 };
 

package/package.json

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

package/src/models/service_charge_invoice_upload.js

@@ -0,0 +1,43 @@
+const mongoose = require("mongoose")
+
+const ServiceChargeInvoiceUploadSchema = new mongoose.Schema({
+	facilityId: {
+		type: mongoose.Schema.Types.ObjectId,
+		ref: 'Facility',
+		required: true,
+	},
+	customerId: {
+		type: String,
+		required: true,
+	},
+	item: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+		required: true,
+	},
+	quantity: {
+		type: Number,
+		required: true,
+	},
+	rate: {
+		type: Number,
+		required: true,
+	},
+	vat: {
+		type: Number,
+		required: true,
+	},
+	account: {
+		type: String,
+		required: true,
+	}
+})
+
+const ServiceChargeInvoiceUpload = mongoose.model(
+	"ServiceChargeInvoiceUpload",
+	ServiceChargeInvoiceUploadSchema
+)
+module.exports = ServiceChargeInvoiceUpload

package/src/models/service_charge_payments.js

@@ -0,0 +1,28 @@
+const mongoose = require("mongoose");
+
+const ServiceChargePaymentSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    customerId: {
+        type: String,
+        required: true,
+    },
+    amount: {
+        type: Number,
+        required: true,
+    },
+    account: {
+        type: String,
+        required: true,
+    },
+});
+
+const ServiceChargePayment = mongoose.model(
+    "ServiceChargePayment",
+    ServiceChargePaymentSchema
+);
+
+module.exports = ServiceChargePayment;

package/src/models/vas_invoices_upload.js

@@ -0,0 +1,51 @@
+const mongoose = require('mongoose');
+
+const VasInvoicesUpdateSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    customerId: {
+        type: String,
+        required: true,
+    },
+    item: {
+        type: String,
+        required: true,
+    },
+    description: {
+        type: String,
+        required: true,
+    },
+    quantity: {
+        type: Number,
+        required: true,
+    },
+    rate: {
+        type: Number,
+        required: true,
+    },
+    ammount: {
+        type: Number,
+        required: true
+    },
+    vat: {
+        type: Number,
+        required: true,
+    },
+    account: {
+        type: String,
+        required: true,
+    },
+    class: {
+        type: String,
+        required: true
+    }
+})
+
+const VasInvoicesUpdate = mongoose.model(
+    'VasInvoicesUpdate',
+    VasInvoicesUpdateSchema
+);
+module.exports = VasInvoicesUpdate

package/src/models/vas_payments.js

@@ -0,0 +1,25 @@
+const mongoose = require("mongoose");
+
+const VasPaymentSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    customerId: {
+        type: String,
+        required: true,
+    },
+    amount: {
+        type: Number,
+        required: true,
+    },
+    account: {
+        type: String,
+        required: true,
+    },
+});
+
+const VasPayment = mongoose.model("VasPayment", VasPaymentSchema);
+
+module.exports = VasPayment;

package/src/models/water_invoice.js

@@ -86,7 +86,11 @@ const waterInvoiceSchema = new mongoose.Schema(
         type: Number,
         default: 0
       },
-      otherFees: {
+      fixedCharge: {
+        type: Number,
+        default: 0
+      },
+      balanceBd: {
         type: Number,
         default: 0
       },

package/src/models/water_meter_settings.js

@@ -50,6 +50,10 @@ const waterMeterSettingsSchema = new mongoose.Schema({
     required: true,
     default: 0
   },
+  tariffAmountSmart: {
+    type: Number,
+    default: 0
+  },
   fixedTariffAmount: {
     type: Number,
     required: true,
@@ -58,6 +62,19 @@ const waterMeterSettingsSchema = new mongoose.Schema({
   notifications: {
     type: Boolean,
     default: false
+  },
+  // New fields for notification periods
+  dailyNotifications: {
+    type: Boolean,
+    default: false
+  },
+  weeklyNotifications: {
+    type: Boolean,
+    default: false
+  },
+  allNotifications: {
+    type: Boolean,
+    default: false
   }
 }, {
   timestamps: true