payservedb 9.0.5 → 9.0.7

package/index.js

@@ -259,6 +259,7 @@ const models = {
   MoveinLandlord: require("./src/models/movein_landlord"),
   MoveinUser: require("./src/models/movein_user"),
   InvoiceWithholdingTax: require("./src/models/InvoiceWithholdingTax"),
+  InvoiceCreditAdjustment: require("./src/models/invoiceCreditAdjustment"),
   // Customer Obsession admin-managed config
   EmailCcConfig: require("./src/models/email_cc_config"),
   AutoReplyRule: require("./src/models/auto_reply_rule"),

package/package.json

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

package/src/models/customer.js

@@ -207,6 +207,26 @@ const CustomerSchema = new mongoose.Schema({
       },
     },
   ],
+  secondaryContacts: [
+    {
+      name: {
+        type: String,
+        required: true,
+      },
+      phone: {
+        type: String,
+        required: false,
+      },
+      email: {
+        type: String,
+        required: false,
+      },
+      receiveNotifications: {
+        type: Boolean,
+        default: true,
+      },
+    },
+  ],
 });
 
 const Customer = mongoose.model("Customer", CustomerSchema);

package/src/models/invoiceCreditAdjustment.js

@@ -0,0 +1,46 @@
+const mongoose = require("mongoose");
+
+const invoiceCreditAdjustmentSchema = new mongoose.Schema(
+  {
+    invoice: {
+      id: { type: mongoose.Schema.Types.ObjectId, ref: "Invoice", required: true },
+      invoiceNumber: { type: String, required: true },
+    },
+    facility: {
+      id: { type: mongoose.Schema.Types.ObjectId, ref: "Facility", required: true },
+      name: { type: String, required: true },
+    },
+    client: {
+      clientId: { type: mongoose.Schema.Types.ObjectId, ref: "Customer", required: true },
+      firstName: { type: String, required: true },
+      lastName: { type: String, required: true },
+    },
+    adjustmentType: {
+      type: String,
+      enum: ["credit", "debit", "opening-balance"],
+      required: true,
+    },
+    previousBalance: { type: Number, required: true },   // balanceBroughtForward before change
+    adjustmentAmount: { type: Number, required: true },  // the actual change (can be negative)
+    newBalance: { type: Number, required: true },        // balanceBroughtForward after change
+    reason: { type: String, required: true },
+    madeBy: {
+      userId: { type: mongoose.Schema.Types.ObjectId, ref: "User", required: true },
+      name: { type: String, required: true },
+      role: { type: String, required: true },
+    },
+  },
+  { timestamps: true }
+);
+
+invoiceCreditAdjustmentSchema.index({ "invoice.id": 1 });
+invoiceCreditAdjustmentSchema.index({ "client.clientId": 1 });
+invoiceCreditAdjustmentSchema.index({ "facility.id": 1 });
+invoiceCreditAdjustmentSchema.index({ adjustmentType: 1 });
+
+const InvoiceCreditAdjustment = mongoose.model(
+  "InvoiceCreditAdjustment",
+  invoiceCreditAdjustmentSchema
+);
+
+module.exports = InvoiceCreditAdjustment;

package/src/models/powerMeters.js

@@ -59,6 +59,14 @@ const powerMeterSchema = new mongoose.Schema({
         type: String,
         required: true
     },
+    
+    meterCategory: {
+        type: String,
+        required: true,
+        enum: ['unit', 'common_area', 'bulk'],
+        default: 'unit'
+    },
+
     unitId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Unit',
@@ -68,6 +76,13 @@ const powerMeterSchema = new mongoose.Schema({
         type: String,
         trim: true
     },
+
+    // ─── Common Area / Bulk Meter Fields ──────────────────────────────────────
+    description: {
+        type: String,
+        trim: true
+    },
+
     type: {
         type: String,
         required: true,
@@ -111,6 +126,25 @@ const powerMeterSchema = new mongoose.Schema({
     timestamps: true
 });
 
+powerMeterSchema.virtual('displayName').get(function () {
+    return this.meterCategory === 'unit'
+        ? this.unitName
+        : this.description;
+});
+powerMeterSchema.pre('save', function (next) {
+    if (this.meterCategory === 'unit') {
+        if (!this.unitId || !this.unitName) {
+            return next(new Error('Unit meters require both unitId and unitName.'));
+        }
+    } else {
+        // common_area or bulk
+        if (!this.description) {
+            return next(new Error(`${this.meterCategory} meters require a description.`));
+        }
+    }
+    next();
+});
+
 const PowerMeters = mongoose.model('PowerMeters', powerMeterSchema);
 
-module.exports = PowerMeters;
+module.exports = PowerMeters;

package/src/models/suppliers.js

@@ -37,6 +37,11 @@ const supplierSchema = new mongoose.Schema({
             trim: true
         }
     },
+    category: {
+        type: String,
+        trim: true,
+        index: true
+    },
     taxIdentificationNumber: {
         type: String,
         trim: true