payservedb 4.8.3 → 4.8.4

package/index.js

@@ -140,7 +140,8 @@ const models = {
     Supplier: require('./src/models/suppliers'),
     PurchaseRequest: require('./src/models/purchase_request'),
     PurchaseOrder: require('./src/models/purchase_order'),
-    RFQ: require('./src/models/quotation'),
+    RFQDetails: require('./src/models/rfq_details'),
+    RFQResponse: require('./src/models/rfq_response'),
     ApprovalWorkflow: require('./src/models/approvalsWorkflows'),
     CommonAreaElectricityReading: require('./src/models/common_area_electricity'),
     CommonAreaWaterReading: require('./src/models/common_area_water'),
@@ -150,8 +151,8 @@ const models = {
     BookingReservation: require('./src/models/bookingreservation'),
     BookingConfig: require('./src/models/bookingconfig'),
     BookingAnalytics: require('./src/models/bookinganalytics'),
-    RevenueRecord: require('./src/models/bookingrevenuerecord')
-
+    RevenueRecord: require('./src/models/bookingrevenuerecord'),
+    GLAccount: require('./src/models/gl_accounts'),
 };
 
 // Function to get models dynamically from a specific database connection

package/package.json

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

package/src/models/account.js

@@ -31,7 +31,6 @@ const accountSchema = new mongoose.Schema({
     },
 });
 
-// [ {accountnumber:1,facilityId:1},{accountnumber:2, facility:2}]
 const Account = mongoose.model('Account', accountSchema);
 
 module.exports = Account;

package/src/models/gl_accounts.js

@@ -0,0 +1,53 @@
+const mongoose = require('mongoose');
+
+const glAccountsSchema = new mongoose.Schema({
+    accountCode: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+    },
+    accountName: {
+        type: String,
+        required: true,
+        trim: true,
+    },
+    accountType: {
+        type: String,
+        required: true,
+        trim: true,
+    },
+    accountBalance: {
+        type: Number,
+        default: 0,
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        default: null,
+    },
+    parentAccountId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'GLAccount',
+        default: null,
+    },
+    accountLevel: {
+        type: Number,
+        required: true,
+        default: 0,
+    },
+    isActive: {
+        type: Boolean,
+        default: true,
+    },
+    createdAt: {
+        type: Date,
+        default: Date.now,
+    },
+    updatedAt: {
+        type: Date,
+        default: Date.now,
+    },
+});
+
+module.exports = mongoose.model('GLAccount', glAccountsSchema);

package/src/models/rfq_details.js

@@ -0,0 +1,82 @@
+const mongoose = require('mongoose');
+
+const rfqDetailsSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+    index: true,
+  },
+  name: {
+    type: String,
+    required: true,
+    trim: true,
+    index: true,
+  },
+  rfqNumber: {
+    type: String,
+    required: true,
+    unique: true,
+    trim: true,
+    index: true,
+  },
+
+  startDate: {
+    type: Date,
+    required: true,
+  },
+  closingDate: {
+    type: Date,
+    required: true,
+  },
+
+  currency: {
+    type: String,
+    required: true,
+    enum: ['KES', 'USD', 'EUR', 'GBP'],
+    default: 'KES',
+  },
+  rfqType: {
+    type: String,
+    required: true,
+    enum: ['open', 'closed'],
+    default: 'closed',
+  },
+  rfqFee: {
+    type: Number,
+    default: 0,
+  },
+  rfqEvaluationType: {
+    type: String,
+    required: true,
+    enum: ['automatic', 'approvers'],
+    default: 'automatic',
+  },
+  notes: {
+    type: String,
+    trim: true,
+  },
+
+  // just store the IDs you invited
+  suppliers: [{
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Supplier',
+    required: true,
+  }],
+
+  // the free‑form items your UI collects
+  items: [{
+    itemName:       { type: String, required: true, trim: true },
+    description:    { type: String, trim: true },
+    quantity:       { type: Number, required: true, min: 1 },
+    unitOfMeasure:  { type: String, trim: true },
+    specifications: { type: String, trim: true },
+  }],
+
+}, {
+  timestamps: true,
+});
+
+const RFQDetails = mongoose.model('RFQDetails', rfqDetailsSchema);
+
+module.exports = RFQDetails;

package/src/models/rfq_response.js

@@ -0,0 +1,109 @@
+const mongoose = require('mongoose');
+
+const rfqResponseSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        index: true,
+    },
+    rfqId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'RFQDetails',
+        required: true,
+        unique: true,
+        index: true,
+    },
+
+    // track each supplier’s progress & quotation
+    suppliers: [{
+        supplierId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Supplier',
+            required: true,
+        },
+        invitationStatus: {
+            type: String,
+            enum: ['pending', 'accepted', 'declined', 'no-response'],
+            default: 'pending',
+        },
+        invitationDate: {
+            type: Date,
+            default: Date.now,
+        },
+        responseDate: Date,
+        quotationSubmitted: {
+            type: Boolean,
+            default: false,
+        },
+        quotationDetails: {
+            submissionDate: Date,
+            totalAmount: Number,
+            items: [{
+                // tie back to the Details’ item index or category
+                categoryId: { type: mongoose.Schema.Types.ObjectId, required: true },
+                itemId: { type: mongoose.Schema.Types.ObjectId, required: true },
+                unitPrice: { type: Number, required: true },
+                quantity: { type: Number, required: true },
+                totalPrice: { type: Number, required: true },
+                notes: { type: String, trim: true },
+            }],
+            attachments: [{
+                name: { type: String, required: true },
+                fileType: { type: String, required: true },
+                filePath: { type: String, required: true },
+                uploadDate: { type: Date, default: Date.now },
+            }],
+            notes: { type: String, trim: true },
+        },
+        evaluationScore: { type: Number, min: 0, max: 100 },
+        evaluationNotes: { type: String, trim: true },
+    }],
+
+    // overall lifecycle & award
+    status: {
+        type: String,
+        enum: ['open', 'closed', 'awarded', 'canceled'],
+        default: 'open',
+        index: true,
+    },
+    awardDetails: {
+        awarded: {
+            type: Boolean,
+            default: false,
+        },
+        awardedSupplierId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Supplier',
+        },
+        awardedSupplierName: {
+            type: String,
+            trim: true,
+        },
+        awardDate: Date,
+        awardNotes: { type: String, trim: true },
+
+        purchaseOrderCreated: {
+            type: Boolean,
+            default: false,
+        },
+        purchaseOrderId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'PurchaseOrder',
+        },
+    },
+
+}, {
+    timestamps: true,
+});
+
+// participation rate virtual
+rfqResponseSchema.virtual('participationRate').get(function () {
+    if (!this.suppliers.length) return 0;
+    const responded = this.suppliers.filter(s => s.quotationSubmitted).length;
+    return (responded / this.suppliers.length) * 100;
+});
+
+const RFQResponse = mongoose.model('RFQResponse', rfqResponseSchema);
+
+module.exports = RFQResponse;

package/src/models/quotation.js

@@ -1,268 +0,0 @@
-const mongoose = require('mongoose');
-
-const rfqSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        index: true
-    },
-    name: {
-        type: String,
-        required: true,
-        trim: true,
-        index: true
-    },
-    rfqNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true,
-        index: true
-    },
-    startDate: {
-        type: Date,
-        required: true
-    },
-    closingDate: {
-        type: Date,
-        required: true
-    },
-    currency: {
-        type: String,
-        required: true,
-        default: 'KES',
-        trim: true
-    },
-    rfqType: {
-        type: String,
-        required: true,
-        enum: ['open', 'closed'],
-        default: 'closed'
-    },
-    rfqFee: {
-        type: Number,
-        default: 0
-    },
-    rfqEvaluationType: {
-        type: String,
-        required: true,
-        enum: ['automatic', 'approvers'],
-        default: 'approvers'
-    },
-    notes: {
-        type: String,
-        trim: true
-    },
-    status: {
-        type: String,
-        enum: ['open','closed', 'awarded', 'canceled'],
-        default: 'open',
-        index: true
-    },
-    // RFQ Categories (Products or Services)
-    categories: [{
-        name: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        // For Product type
-        products: [{
-            productName: {
-                type: String,
-                trim: true,
-                required: function() {
-                    return this.parent().categoryType === 'product';
-                }
-            },
-            sku: {
-                type: String,
-                trim: true
-            },
-            quantity: {
-                type: Number,
-                required: function() {
-                    return this.parent().categoryType === 'product';
-                }
-            },
-            unitOfMeasure: {
-                type: String,
-                trim: true
-            },
-            estimatedUnitPrice: {
-                type: Number
-            }
-        }],
-        // For Service type
-        services: [{
-            serviceDescription: {
-                type: String,
-                trim: true,
-                required: function() {
-                    return this.parent().categoryType === 'service';
-                }
-            },
-            quantity: {
-                type: Number,
-                required: function() {
-                    return this.parent().categoryType === 'service';
-                }
-            },
-            unitOfMeasure: {
-                type: String,
-                trim: true
-            },
-            estimatedUnitPrice: {
-                type: Number
-            }
-        }]
-    }],
-    
-    // Suppliers invited to respond to the RFQ
-    suppliers: [{
-        supplierId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Supplier',
-            required: true
-        },
-        supplierName: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        invitationStatus: {
-            type: String,
-            enum: ['pending', 'accepted', 'declined', 'no-response'],
-            default: 'pending'
-        },
-        invitationDate: {
-            type: Date,
-            default: Date.now
-        },
-        responseDate: {
-            type: Date
-        },
-        quotationSubmitted: {
-            type: Boolean,
-            default: false
-        },
-        quotationDetails: {
-            submissionDate: {
-                type: Date
-            },
-            totalAmount: {
-                type: Number
-            },
-            items: [{
-                categoryId: {
-                    type: mongoose.Schema.Types.ObjectId,
-                    required: true
-                },
-                itemId: {
-                    type: mongoose.Schema.Types.ObjectId,
-                    required: true
-                },
-                unitPrice: {
-                    type: Number,
-                    required: true
-                },
-                quantity: {
-                    type: Number,
-                    required: true
-                },
-                totalPrice: {
-                    type: Number,
-                    required: true
-                },
-                notes: {
-                    type: String,
-                    trim: true
-                }
-            }],
-            attachments: [{
-                name: {
-                    type: String,
-                    required: true
-                },
-                fileType: {
-                    type: String,
-                    required: true
-                },
-                filePath: {
-                    type: String,
-                    required: true
-                },
-                uploadDate: {
-                    type: Date,
-                    default: Date.now
-                }
-            }],
-            notes: {
-                type: String,
-                trim: true
-            }
-        },
-        evaluationScore: {
-            type: Number,
-            min: 0,
-            max: 100
-        },
-        evaluationNotes: {
-            type: String,
-            trim: true
-        }
-    }],
-    
-    
-    // Award details after RFQ is closed
-    awardDetails: {
-        awarded: {
-            type: Boolean,
-            default: false
-        },
-        awardedSupplierId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Supplier'
-        },
-        awardedSupplierName: {
-            type: String,
-            trim: true
-        },
-        awardDate: {
-            type: Date
-        },
-        awardNotes: {
-            type: String,
-            trim: true
-        },
-        purchaseOrderCreated: {
-            type: Boolean,
-            default: false
-        },
-        purchaseOrderId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'PurchaseOrder'
-        }
-    }
-}, {
-    timestamps: true
-});
-
-// Virtual for tracking participation rate
-rfqSchema.virtual('participationRate').get(function() {
-    if (!this.suppliers || this.suppliers.length === 0) return 0;
-    
-    const respondedCount = this.suppliers.filter(
-        supplier => supplier.quotationSubmitted === true
-    ).length;
-    
-    return (respondedCount / this.suppliers.length) * 100;
-});
-
-// Index for efficient querying by date ranges
-rfqSchema.index({ startDate: 1, closingDate: 1 });
-
-const RFQ = mongoose.model('RFQ', rfqSchema);
-
-module.exports = RFQ;