payservedb 8.9.8 → 8.9.9

package/index.js

@@ -110,6 +110,7 @@ const models = {
   Report: require("./src/models/report"),
   Ticket: require("./src/models/tickets"),
   Rating: require("./src/models/facility_rating"),
+  FacilityEtimsConfig: require("./src/models/facility_etims_config"),
   Stocksandspare: require("./src/models/stocksandspare"),
   ServiceVendor: require("./src/models/maintenance_service_vendor"),
   MaintenanceServices: require("./src/models/maintenance_services"),
@@ -251,7 +252,7 @@ const models = {
   PrivacyPolicy: require("./src/models/privacy_policy"),
   TermsAndConditions: require("./src/models/terms_and_conditions"),
   CommunityGuidelines: require("./src/models/community_guidelines"),
-  WhatsappConversation : require("./src/models/whatsapp_conversation"),
+  WhatsappConversation: require("./src/models/whatsapp_conversation"),
   CustomerPreference: require("./src/models/customer_preference"),
   MoveinApplication: require("./src/models/movein_application"),
   EmailThread: require("./src/models/email_thread"),

package/package.json

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

package/src/models/facility_etims_config.js

@@ -0,0 +1,117 @@
+const mongoose = require("mongoose");
+
+const FacilityEtimsConfigSchema = new mongoose.Schema(
+  {
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+      unique: true,
+      index: true,
+    },
+
+    // ── KRA Organisation Details ─────────────────────────────────────────────
+    tin: {
+      type: String,
+      required: true,
+      trim: true,
+      // Kenya TIN format e.g. P051201909L
+    },
+
+    branchId: {
+      type: String,
+      required: true,
+      trim: true,
+      default: "00", // "00" = headquarters
+    },
+
+    // ── Master Enable/Disable for this facility ───────────────────────────────
+    enabled: {
+      type: Boolean,
+      default: true,
+    },
+
+    // ── Optional per-facility overrides (fall back to .env if absent) ─────────
+    // Leave null to use the system-wide .env values
+    baseUrl: {
+      type: String,
+      trim: true,
+      default: null,
+    },
+
+    username: {
+      type: String,
+      trim: true,
+      default: null,
+    },
+
+    // Store hashed or as-is depending on your security posture.
+    // Recommend encrypting at rest; kept as String here to match
+    // the pattern used by ZohoConfig in the same codebase.
+    password: {
+      type: String,
+      default: null,
+    },
+
+    // ── Audit / Meta ──────────────────────────────────────────────────────────
+    configuredBy: {
+      type: String, // user email or ID who last saved
+      default: null,
+    },
+
+    lastUpdatedAt: {
+      type: Date,
+      default: null,
+    },
+
+    // Lightweight sync stats (updated by the etims service)
+    syncStats: {
+      totalSynced: { type: Number, default: 0 },
+      lastSyncAt: { type: Date, default: null },
+      lastSyncStatus: {
+        type: String,
+        enum: ["success", "failed", null],
+        default: null,
+      },
+    },
+  },
+  {
+    timestamps: true, // createdAt + updatedAt
+    collection: "facilityetimsconfigs",
+  }
+);
+
+// ── Instance helper ───────────────────────────────────────────────────────────
+/**
+ * Returns the effective config object ready for use in the etims service.
+ * Falls back to .env values for credentials not stored per-facility.
+ */
+FacilityEtimsConfigSchema.methods.toEtimsConfig = function () {
+  return {
+    enabled: this.enabled,
+    tin: this.tin,
+    branchId: this.branchId,
+    baseUrl:
+      this.baseUrl ||
+      process.env.ETIMS_BASE_URL ||
+      "http://102.217.144.50:8888/api/v1/",
+    username: this.username || process.env.ETIMS_USERNAME || "admin",
+    password: this.password || process.env.ETIMS_PASSWORD || "admin",
+  };
+};
+
+// ── Static helper ────────────────────────────────────────────────────────────
+/**
+ * Load config for a facility. Returns null if not found.
+ * @param {string|ObjectId} facilityId
+ */
+FacilityEtimsConfigSchema.statics.getForFacility = async function (facilityId) {
+  return this.findOne({ facilityId }).lean();
+};
+
+const FacilityEtimsConfig = mongoose.model(
+  "FacilityEtimsConfig",
+  FacilityEtimsConfigSchema
+);
+
+module.exports = FacilityEtimsConfig;

package/src/models/vasinvoice.js

@@ -62,6 +62,10 @@ const vasInvoiceSchema = new mongoose.Schema({
         type: Number,
         required: true
     },
+    whatFor: {
+        invoiceType: { type: String, required: true },
+        description: { type: String },
+    },
     currency: {
         id: {
             type: mongoose.Schema.Types.ObjectId