npm - payservedb - Versions diffs - 6.8.6 → 6.8.7 - Mend

payservedb 6.8.6 → 6.8.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json +1 -1
package/src/models/facilityContractPricing.js +40 -34
package/src/models/facilityInvoiceContract.js +211 -206

package/package.json CHANGED Viewed

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

package/src/models/facilityContractPricing.js CHANGED Viewed

@@ -1,41 +1,47 @@
 const mongoose = require("mongoose");
-const FacilityContractPricingSchema = new mongoose.Schema({
-  name: {
-    type: String,
-    required: true,
+const FacilityContractPricingSchema = new mongoose.Schema(
+  {
+    name: {
+      type: String,
+      required: true,
+    },
+    powerMetersPrice: {
+      type: Number,
+      required: true,
+      min: [0, "Power meters price cannot be negative"],
+      default: 0,
+    },
+    hotWaterMetersPrice: {
+      type: Number,
+      required: true,
+      min: [0, "Hot water meters price cannot be negative"],
+      default: 0,
+    },
+    coldWaterMetersPrice: {
+      type: Number,
+      required: true,
+      min: [0, "Cold water meters price cannot be negative"],
+      default: 0,
+    },
+    unitsPrice: {
+      type: Number,
+      required: true,
+      min: [0, "Units price cannot be negative"],
+      default: 0,
+    },
+    licensePrice: {
+      type: Number,
+      required: true,
+      min: [0, "License price cannot be negative"],
+      default: 0,
+    },
   },
-  powerMetersPrice: {
-    type: Number,
-    required: true,
-    min: [0, "Power meters price cannot be negative"],
-    default: 0,
-  },
-  hotWaterMetersPrice: {
-    type: Number,
-    required: true,
-    min: [0, "Hot water meters price cannot be negative"],
-    default: 0,
-  },
-  coldWaterMetersPrice: {
-    type: Number,
-    required: true,
-    min: [0, "Cold water meters price cannot be negative"],
-    default: 0,
-  },
-  unitsPrice: {
-    type: Number,
-    required: true,
-    min: [0, "Units price cannot be negative"],
-    default: 0,
-  },
-  licensePrice: {
-    type: Number,
-    required: true,
-    min: [0, "License price cannot be negative"],
-    default: 0,
+  {
+    timestamps: true,
   },
-});
+);
 const FacilityContractPricing = mongoose.model(
   "FacilityContractPricing",

package/src/models/facilityInvoiceContract.js CHANGED Viewed

@@ -1,245 +1,250 @@
 const mongoose = require("mongoose");
-const facilityInvoiceContractSchema = new mongoose.Schema({
-  facility: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: "Facility",
-    required: true,
-  },
-  pricing: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: "FacilityContractPricing",
-    required: true,
-  },
-  name: {
-    type: String,
-    required: true,
-    trim: true,
-  },
-  phone: {
-    type: String,
-    required: true,
-    trim: true,
-  },
-  email: {
-    type: String,
-    required: true,
-    trim: true,
-    lowercase: true,
-    match: [/^\S+@\S+\.\S+$/, "Please enter a valid email address"],
-  },
-  paymentInterval: {
-    type: String,
-    enum: ["monthly", "quarterly", "yearly"],
-    default: "monthly",
-  },
-  paymentType: {
-    type: String,
-    enum: ["prepaid", "postpaid", "cash"],
-    default: "cash",
-  },
-  invoiceDueAfterDays: {
-    type: Number,
-    required: true,
-    min: [0, "Invoice due days cannot be negative"],
-  },
-  overdueAfterDays: {
-    type: Number,
-    required: true,
-    min: [0, "Overdue days cannot be negative"],
-    default: 7,
-  },
-  prorate: {
-    type: Boolean,
-    default: false,
-  },
-  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,
-      },
-      price: {
-        type: Number,
-        required: true,
-        min: [0, "Price cannot be negative"],
-      },
-      quantity: {
-        type: Number,
-        required: true,
-        min: [1, "Quantity must be at least 1"],
-      },
-    },
-  ],
-  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",
-      },
-    },
-  ],
-  dates: {
-    startDate: {
-      type: Date,
-      required: true,
-    },
-    endDate: {
-      type: Date,
-      required: true,
-    },
-    invoiceGeneratedDate: {
-      type: Date,
+const facilityInvoiceContractSchema = new mongoose.Schema(
+  {
+    facility: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
       required: true,
     },
-    invoiceDueDate: {
-      type: Date,
+    pricing: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "FacilityContractPricing",
       required: true,
     },
-  },
-  signedContractDocument: {
-    type: String,
-    required: true,
-  },
-  status: {
-    type: String,
-    enum: ["pending", "signed", "rejected"],
-    default: "pending",
-  },
-  active: {
-    type: Boolean,
-    default: true,
-  },
-  header: {
-    companyName: {
+    name: {
       type: String,
       required: true,
       trim: true,
     },
-    companyAddress: {
+    phone: {
       type: String,
       required: true,
       trim: true,
     },
-    companyPhone: {
-      type: String,
-      trim: true,
-    },
-    companyEmail: {
+    email: {
       type: String,
+      required: true,
       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: {
+    paymentInterval: {
       type: String,
-      trim: true,
+      enum: ["monthly", "quarterly", "yearly"],
+      default: "monthly",
     },
-    logo: {
+    paymentType: {
       type: String,
-      default: null,
+      enum: ["prepaid", "postpaid", "cash"],
+      default: "cash",
     },
-  },
-  footer: {
-    bankName: {
-      type: String,
-      trim: true,
-    },
-    accountName: {
-      type: String,
-      trim: true,
-    },
-    accountNumber: {
-      type: String,
-      trim: true,
+    invoiceDueAfterDays: {
+      type: Number,
+      required: true,
+      min: [0, "Invoice due days cannot be negative"],
     },
-    swiftCode: {
-      type: String,
-      trim: true,
+    overdueAfterDays: {
+      type: Number,
+      required: true,
+      min: [0, "Overdue days cannot be negative"],
+      default: 7,
+    },
+    prorate: {
+      type: Boolean,
+      default: false,
+    },
+    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,
+        },
+        price: {
+          type: Number,
+          required: true,
+          min: [0, "Price cannot be negative"],
+        },
+        quantity: {
+          type: Number,
+          required: true,
+          min: [1, "Quantity must be at least 1"],
+        },
+      },
+    ],
+    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",
+        },
+      },
+    ],
+    dates: {
+      startDate: {
+        type: Date,
+        required: true,
+      },
+      endDate: {
+        type: Date,
+        required: true,
+      },
+      invoiceGeneratedDate: {
+        type: Date,
+        required: true,
+      },
+      invoiceDueDate: {
+        type: Date,
+        required: true,
+      },
     },
-    paymentTerms: {
+    signedContractDocument: {
       type: String,
-      trim: true,
-      default: "Net 30 days",
+      required: true,
     },
-    latePaymentFee: {
+    status: {
       type: String,
-      trim: true,
+      enum: ["pending", "signed", "rejected"],
+      default: "pending",
     },
-    taxRate: {
-      type: String,
-      trim: true,
+    active: {
+      type: Boolean,
+      default: true,
     },
-    additionalNotes: {
-      type: String,
-      trim: true,
+    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,
+      },
     },
-    supportEmail: {
-      type: String,
-      trim: true,
-      lowercase: true,
-      match: [/^\S+@\S+\.\S+$/, "Please enter a valid email address"],
+    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,
+      },
     },
-    supportPhone: {
-      type: String,
-      trim: true,
+    createdAt: {
+      type: Date,
+      default: Date.now,
     },
-    termsAndConditions: {
-      type: String,
-      trim: true,
+    updatedAt: {
+      type: Date,
+      default: Date.now,
     },
   },
-  createdAt: {
-    type: Date,
-    default: Date.now,
+  {
+    timestamps: true,
   },
-  updatedAt: {
-    type: Date,
-    default: Date.now,
-  },
-});
+);
 const FacilityInvoiceContract = mongoose.model(
   "FacilityInvoiceContract",