payservedb 8.3.7 → 8.3.9

package/src/models/facilityInvoice.js

@@ -1,223 +1,240 @@
-const mongoose = require("mongoose");
-const {RecipientSchema} = require("./facilityInvoiceRecipient")
-
-const FacilityInvoiceSchema = new mongoose.Schema(
-  {
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-    },
-    facilityInvoiceContract: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "FacilityInvoiceContract",
-      required: true,
-    },
-      recipient: {
-          type: RecipientSchema,
-          required: true,
-      },
-      invoiceNumber: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    invoiceDate: {
-      type: Date,
-      required: true,
-    },
-    dueDate: {
-      type: Date,
-      required: true,
-    },
-    status: {
-      type: String,
-      enum: ["pending", "paid", "overdue"],
-      default: "pending",
-    },
-    invoiceType: {
-      type: String,
-      required: true,
-      enum: ["unit", "license", "meters"],
-      trim: true,
-    },
-    items: [
-      {
-        itemType: {
-          type: String,
-          required: true,
-          enum: [
-            "unit",
-            "license",
-            "powerMeters",
-            "hotWaterMeters",
-            "coldWaterMeters",
-          ],
-          trim: true,
-        },
-        name: {
-          type: String,
-          required: true,
-          trim: true,
-        },
-        description: {
-          type: String,
-          required: true,
-          trim: true,
-        },
-        detail: {
-          type: String,
-          trim: true,
-          default: null,
-        },
-        quantity: {
-          type: Number,
-          required: true,
-          min: [1, "Quantity must be at least 1"],
-          default: 1,
-        },
-        unitPrice: {
-          type: Number,
-          required: true,
-          min: [0, "Unit price cannot be negative"],
-        },
-        amount: {
-          type: Number,
-          required: true,
-          min: [0, "Amount cannot be negative"],
-        },
-      },
-    ],
-    amount: {
-      type: Number,
-      required: true,
-      min: [0, "Total amount cannot be negative"],
-    },
-    taxRate: {
-      type: Number,
-      min: [0, "Tax rate cannot be negative"],
-      default: 0,
-    },
-    reminders: [
-      {
-        frequency: {
-          type: String,
-          required: true,
-          enum: ["daily", "custom"],
-          default: "daily",
-        },
-        customDays: {
-          type: Number,
-          required: function () {
-            return this.frequency === "custom";
-          },
-          min: [1, "Custom days must be at least 1"],
-          default: null,
-        },
-        startDate: {
-          type: Date,
-          required: true,
-        },
-        status: {
-          type: String,
-          enum: ["sent", "pending"],
-          default: "pending",
-        },
-      },
-    ],
-    header: {
-      companyName: {
-        type: String,
-        required: true,
-        trim: true,
-      },
-      companyAddress: {
-        type: String,
-        required: true,
-        trim: true,
-      },
-      companyPhone: {
-        type: String,
-        trim: true,
-      },
-      companyEmail: {
-        type: String,
-        trim: true,
-        lowercase: true,
-        match: [/^\S+@\S+\.\S+$/, "Please enter a valid email address"],
-      },
-      companyWebsite: {
-        type: String,
-        trim: true,
-        match: [/^https?:\/\/[^\s$.?#].[^\s]*$/, "Please enter a valid URL"],
-      },
-      taxNumber: {
-        type: String,
-        trim: true,
-      },
-      logo: {
-        type: String,
-        default: null,
-      },
-    },
-    footer: {
-      bankName: {
-        type: String,
-        trim: true,
-      },
-      accountName: {
-        type: String,
-        trim: true,
-      },
-      accountNumber: {
-        type: String,
-        trim: true,
-      },
-      swiftCode: {
-        type: String,
-        trim: true,
-      },
-      paymentTerms: {
-        type: String,
-        trim: true,
-        default: "Net 30 days",
-      },
-      latePaymentFee: {
-        type: String,
-        trim: true,
-      },
-      taxRate: {
-        type: String,
-        trim: true,
-      },
-      additionalNotes: {
-        type: String,
-        trim: true,
-      },
-      supportEmail: {
-        type: String,
-        trim: true,
-        lowercase: true,
-        match: [/^\S+@\S+\.\S+$/, "Please enter a valid email address"],
-      },
-      supportPhone: {
-        type: String,
-        trim: true,
-      },
-      termsAndConditions: {
-        type: String,
-        trim: true,
-      },
-    },
-  },
-  {
-    timestamps: true,
-  },
-);
-
-const FacilityInvoice = mongoose.model(
-  "FacilityInvoice",
-  FacilityInvoiceSchema,
-);
-
-module.exports = FacilityInvoice;
+const mongoose = require("mongoose");
+const { RecipientSchema } = require("./facilityInvoiceRecipient");
+
+const FacilityInvoiceSchema = new mongoose.Schema(
+  {
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+    facilityInvoiceContract: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "FacilityInvoiceContract",
+      required: true,
+    },
+    recipient: {
+      type: RecipientSchema,
+      required: true,
+    },
+    invoiceNumber: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    invoiceDate: {
+      type: Date,
+      required: true,
+    },
+    dueDate: {
+      type: Date,
+      required: true,
+    },
+    status: {
+      type: String,
+      enum: ["pending", "paid", "partially_paid", "overdue"],
+      default: "pending",
+    },
+    invoiceType: {
+      type: String,
+      required: true,
+      enum: ["unit", "license", "meters"],
+      trim: true,
+    },
+    items: [
+      {
+        itemType: {
+          type: String,
+          required: true,
+          enum: [
+            "unit",
+            "license",
+            "powerMeters",
+            "hotWaterMeters",
+            "coldWaterMeters",
+            "sms",
+          ],
+          trim: true,
+        },
+        name: {
+          type: String,
+          required: true,
+          trim: true,
+        },
+        description: {
+          type: String,
+          required: true,
+          trim: true,
+        },
+        detail: {
+          type: String,
+          trim: true,
+          default: null,
+        },
+        quantity: {
+          type: Number,
+          required: true,
+          min: [1, "Quantity must be at least 1"],
+          default: 1,
+        },
+        unitPrice: {
+          type: Number,
+          required: true,
+          min: [0, "Unit price cannot be negative"],
+        },
+        amount: {
+          type: Number,
+          required: true,
+          min: [0, "Amount cannot be negative"],
+        },
+      },
+    ],
+    // Subtotal of all invoice items before tax and balance
+    subtotal: {
+      type: Number,
+      required: true,
+      min: [0, "Subtotal cannot be negative"],
+      default: 0,
+    },
+    balanceBroughtForward: {
+      type: Number,
+      default: 0,
+    },
+    // Tax amount calculated on subtotal
+    taxAmount: {
+      type: Number,
+      default: 0,
+      min: [0, "Tax amount cannot be negative"],
+    },
+    amount: {
+      type: Number,
+      required: true,
+    },
+    taxRate: {
+      type: Number,
+      min: [0, "Tax rate cannot be negative"],
+      default: 0,
+    },
+    reminders: [
+      {
+        frequency: {
+          type: String,
+          required: true,
+          enum: ["daily", "custom"],
+          default: "daily",
+        },
+        customDays: {
+          type: Number,
+          required: function () {
+            return this.frequency === "custom";
+          },
+          min: [1, "Custom days must be at least 1"],
+          default: null,
+        },
+        startDate: {
+          type: Date,
+          required: true,
+        },
+        status: {
+          type: String,
+          enum: ["sent", "pending"],
+          default: "pending",
+        },
+      },
+    ],
+    header: {
+      companyName: {
+        type: String,
+        required: true,
+        trim: true,
+      },
+      companyAddress: {
+        type: String,
+        required: true,
+        trim: true,
+      },
+      companyPhone: {
+        type: String,
+        trim: true,
+      },
+      companyEmail: {
+        type: String,
+        trim: true,
+        lowercase: true,
+        match: [/^\S+@\S+\.\S+$/, "Please enter a valid email address"],
+      },
+      companyWebsite: {
+        type: String,
+        trim: true,
+        match: [/^https?:\/\/[^\s$.?#].[^\s]*$/, "Please enter a valid URL"],
+      },
+      taxNumber: {
+        type: String,
+        trim: true,
+      },
+      logo: {
+        type: String,
+        default: null,
+      },
+    },
+    footer: {
+      bankName: {
+        type: String,
+        trim: true,
+      },
+      accountName: {
+        type: String,
+        trim: true,
+      },
+      accountNumber: {
+        type: String,
+        trim: true,
+      },
+      swiftCode: {
+        type: String,
+        trim: true,
+      },
+      paymentTerms: {
+        type: String,
+        trim: true,
+        default: "Net 30 days",
+      },
+      latePaymentFee: {
+        type: String,
+        trim: true,
+      },
+      taxRate: {
+        type: String,
+        trim: true,
+      },
+      additionalNotes: {
+        type: String,
+        trim: true,
+      },
+      supportEmail: {
+        type: String,
+        trim: true,
+        lowercase: true,
+        match: [/^\S+@\S+\.\S+$/, "Please enter a valid email address"],
+      },
+      supportPhone: {
+        type: String,
+        trim: true,
+      },
+      termsAndConditions: {
+        type: String,
+        trim: true,
+      },
+    },
+  },
+  {
+    timestamps: true,
+  },
+);
+
+const FacilityInvoice = mongoose.model(
+  "FacilityInvoice",
+  FacilityInvoiceSchema,
+);
+
+module.exports = FacilityInvoice;

package/src/models/facilityInvoicePayment.js

@@ -1,47 +1,52 @@
-const mongoose = require("mongoose");
-
-const FacilityInvoicePaymentSchema = new mongoose.Schema({
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: "Facility",
-    required: true,
-  },
-  invoiceId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: "FacilityInvoice",
-    required: true,
-  },
-  paymentDate: {
-    type: Date,
-    required: true,
-  },
-  amountPaid: {
-    type: Number,
-    required: true,
-  },
-  comments: {
-    type: String,
-    required: false,
-  },
-  status: {
-    type: String,
-    enum: ["pending", "paid", "overpaid", "rejected"],
-    default: "pending",
-  },
-  paymentMethod: {
-    type: String,
-    enum: ["cash", "credit", "debit"],
-    default: "cash",
-  },
-  rejectedReason: {
-    type: String,
-    required: false,
-  },
-});
-
-const FacilityInvoicePayment = mongoose.model(
-  "FacilityInvoicePayment",
-  FacilityInvoicePaymentSchema,
-);
-
-module.exports = FacilityInvoicePayment;
+const mongoose = require("mongoose");
+
+const FacilityInvoicePaymentSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: "Facility",
+    required: true,
+  },
+  invoiceId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: "FacilityInvoice",
+    required: true,
+  },
+  paymentDate: {
+    type: Date,
+    required: true,
+  },
+  amountPaid: {
+    type: Number,
+    required: true,
+  },
+  comments: {
+    type: String,
+    required: false,
+  },
+  proofOfPaymentUrl: {
+    type: String,
+    required: false,
+    trim: true,
+  },
+  status: {
+    type: String,
+    enum: ["pending", "paid", "overpaid", "rejected"],
+    default: "pending",
+  },
+  paymentMethod: {
+    type: String,
+    enum: ["cash", "credit", "debit"],
+    default: "cash",
+  },
+  rejectedReason: {
+    type: String,
+    required: false,
+  },
+});
+
+const FacilityInvoicePayment = mongoose.model(
+  "FacilityInvoicePayment",
+  FacilityInvoicePaymentSchema,
+);
+
+module.exports = FacilityInvoicePayment;

package/src/models/facilityInvoiceRecipient.js

@@ -1,33 +1,33 @@
-const mongoose = require("mongoose");
-
-const RecipientSchema = new mongoose.Schema(
-    {
-        facilityId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: "Facility",
-            required: true,
-        },
-        phoneNumber: {
-            type: String,
-            required: true
-        },
-        email: {
-            type: String,
-            required: true,
-            lowercase: true,
-            trim: true,
-            match: [/^\S+@\S+\.\S+$/, "Please enter a valid email address"]
-        }
-    },
-    {
-        timestamps: true,
-    }
-);
-
-// Create the model
-const Recipient = mongoose.model("Recipient", RecipientSchema);
-
-// Export the model as default and the schema as a named export
-module.exports = Recipient;
-module.exports.RecipientSchema = RecipientSchema;
+const mongoose = require("mongoose");
+
+const RecipientSchema = new mongoose.Schema(
+    {
+        facilityId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: "Facility",
+            required: true,
+        },
+        phoneNumber: {
+            type: String,
+            required: true
+        },
+        email: {
+            type: String,
+            required: true,
+            lowercase: true,
+            trim: true,
+            match: [/^\S+@\S+\.\S+$/, "Please enter a valid email address"]
+        }
+    },
+    {
+        timestamps: true,
+    }
+);
+
+// Create the model
+const Recipient = mongoose.model("Recipient", RecipientSchema);
+
+// Export the model as default and the schema as a named export
+module.exports = Recipient;
+module.exports.RecipientSchema = RecipientSchema;
 module.exports.schema = RecipientSchema; // For compatibility with getModel if needed