payservedb 5.9.5 → 5.9.7

package/src/models/rfq_response.js

@@ -1,111 +1,154 @@
-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,
-    index: true,
-  },
-  supplierId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Supplier',
-    required: true,
-    index: true,
-  },
-  
-  items: [{
-    itemId: {
-      type: mongoose.Schema.Types.ObjectId,
-      required: true,
-    },
-    itemName: { type: String, required: true, trim: true },
-    unitPrice: {
-      type: Number,
-      required: true,
-      min: 0,
-    },
-    quantity: {
-      type: Number,
-      required: true,
-      min: 1,
-    },
-    totalPrice: {
-      type: Number,
-      required: true,
-      min: 0,
-    },
-    notes: {
-      type: String,
-      trim: true,
-      default: '',
-    }
-  }],
-  
-  vatAmount: {
-    type: Number,
-    required: false,
-    min: 0,
-    default: 0,
-  },
-  
-  deliveryDays: {
-    type: Number,
-    required: true,
-    min: 1,
-    default: 7
-  },
-  
-  notes: {
-    type: String,
-    trim: true,
-    default: '',
-  },
-  
-  attachments: [{
-    fileName: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    filePath: {
-      type: String,
-      required: true,
-    },
-    uploadedAt: {
-      type: Date,
-      default: Date.now,
-    }
-  }],
-  
-  status: {
-    type: String,
-    enum: ['pending', 'submitted', 'evaluated', 'awarded','declined'],
-    default: 'pending',
-    index: true,
-  },
-  
-  evaluation: {
-    score: {
-      type: Number,
-      min: 0,
-      max: 100,
-      default: null,
-    },
-    notes: {
-      type: String,
-      trim: true,
-      default: ''
-    }
-  },
-}, {
-  timestamps: true,
-});
-
+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,
+    index: true,
+  },
+  supplierId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Supplier',
+    required: true,
+    index: true,
+  },
+  
+  items: [{
+    itemId: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: true,
+    },
+    itemName: { type: String, required: true, trim: true },
+    unitPrice: {
+      type: Number,
+      required: true,
+      min: 0,
+    },
+    quantity: {
+      type: Number,
+      required: true,
+      min: 1,
+    },
+    totalPrice: {
+      type: Number,
+      required: true,
+      min: 0,
+    },
+    notes: {
+      type: String,
+      trim: true,
+      default: '',
+    }
+  }],
+  
+  // VAT Information
+  vatPercentage: {
+    type: Number,
+    required: false,
+    min: 0,
+    max: 100,
+    default: 0,
+  },
+  vatAmount: {
+    type: Number,
+    required: false,
+    min: 0,
+    default: 0,
+  },
+  
+  // Delivery Information
+  deliveryDays: {
+    type: Number,
+    required: true,
+    min: 1,
+    default: 7
+  },
+  deliveryMarks: {
+    type: Number,
+    required: true,
+    min: 0,
+    default: 0
+  },
+  
+  // Payment Terms Information
+  paymentTerm: {
+    type: String,
+    required: true,
+    trim: true,
+    default: 'Net 30'
+  },
+  paymentTermMarks: {
+    type: Number,
+    required: true,
+    min: 0,
+    default: 0
+  },
+  
+  // Legacy field for backward compatibility
+  deliveryTimeline: {
+    value: { type: Number },
+    unit: { type: String },
+    daysEquivalent: { type: Number }
+  },
+  
+  notes: {
+    type: String,
+    trim: true,
+    default: '',
+  },
+  
+  attachments: [{
+    fileName: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    filePath: {
+      type: String,
+      required: true,
+    },
+    uploadedAt: {
+      type: Date,
+      default: Date.now,
+    }
+  }],
+  
+  status: {
+    type: String,
+    enum: ['pending', 'submitted', 'evaluated', 'awarded', 'declined'],
+    default: 'pending',
+    index: true,
+  },
+  
+  evaluation: {
+    deliveryScore: {
+      type: Number,
+      min: 0,
+      max: 100,
+      default: null,
+    },
+    paymentScore: {
+      type: Number,
+      min: 0,
+      max: 100,
+      default: null,
+    },
+    notes: {
+      type: String,
+      trim: true,
+      default: ''
+    }
+  },
+}, {
+  timestamps: true,
+});
+
+
 module.exports = mongoose.model('RFQResponse', rfqResponseSchema);

package/src/models/service_charge_invoice_upload.js

@@ -1,43 +1,43 @@
-const mongoose = require("mongoose")
-
-const ServiceChargeInvoiceUploadSchema = new mongoose.Schema({
-	facilityId: {
-		type: mongoose.Schema.Types.ObjectId,
-		ref: 'Facility',
-		required: true,
-	},
-	customerId: {
-		type: String,
-		required: true,
-	},
-	item: {
-		type: String,
-		required: true,
-	},
-	description: {
-		type: String,
-		required: true,
-	},
-	quantity: {
-		type: Number,
-		required: true,
-	},
-	rate: {
-		type: Number,
-		required: true,
-	},
-	vat: {
-		type: Number,
-		required: true,
-	},
-	account: {
-		type: String,
-		required: true,
-	}
-})
-
-const ServiceChargeInvoiceUpload = mongoose.model(
-	"ServiceChargeInvoiceUpload",
-	ServiceChargeInvoiceUploadSchema
-)
+const mongoose = require("mongoose")
+
+const ServiceChargeInvoiceUploadSchema = new mongoose.Schema({
+	facilityId: {
+		type: mongoose.Schema.Types.ObjectId,
+		ref: 'Facility',
+		required: true,
+	},
+	customerId: {
+		type: String,
+		required: true,
+	},
+	item: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+		required: true,
+	},
+	quantity: {
+		type: Number,
+		required: true,
+	},
+	rate: {
+		type: Number,
+		required: true,
+	},
+	vat: {
+		type: Number,
+		required: true,
+	},
+	account: {
+		type: String,
+		required: true,
+	}
+})
+
+const ServiceChargeInvoiceUpload = mongoose.model(
+	"ServiceChargeInvoiceUpload",
+	ServiceChargeInvoiceUploadSchema
+)
 module.exports = ServiceChargeInvoiceUpload

package/src/models/service_charge_payments.js

@@ -1,28 +1,28 @@
-const mongoose = require("mongoose");
-
-const ServiceChargePaymentSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-    },
-    customerId: {
-        type: String,
-        required: true,
-    },
-    amount: {
-        type: Number,
-        required: true,
-    },
-    account: {
-        type: String,
-        required: true,
-    },
-});
-
-const ServiceChargePayment = mongoose.model(
-    "ServiceChargePayment",
-    ServiceChargePaymentSchema
-);
-
+const mongoose = require("mongoose");
+
+const ServiceChargePaymentSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    customerId: {
+        type: String,
+        required: true,
+    },
+    amount: {
+        type: Number,
+        required: true,
+    },
+    account: {
+        type: String,
+        required: true,
+    },
+});
+
+const ServiceChargePayment = mongoose.model(
+    "ServiceChargePayment",
+    ServiceChargePaymentSchema
+);
+
 module.exports = ServiceChargePayment;

package/src/models/servicerequest.js

@@ -1,56 +1,56 @@
-const mongoose = require('mongoose');
-
-const serviceRequestSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true,
-        ref: 'Facility'
-    },
-    date: {
-        type: Date,
-    },
-    time: {
-        type: String,
-    },
-    serviceId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true,
-        ref: 'Service'
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Pending', 'Awaiting', 'In Progress', 'Completed', 'Cancelled'],
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true,
-        ref: 'Customer'
-    },
-    assigneeId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'VasVendor'
-    },
-    unit: {
-        type: String,
-    },
-    frequency: {
-        type: String,
-    },
-    amount: {
-        type: Number,
-    },
-    percentage: {
-        type: Number,
-    },
-    isCommissionSelected: {
-        type: Boolean,
-        default: false
-    }
-}, {
-    timestamps: true
-});
-
-const ServiceRequest = mongoose.model('ServiceRequest', serviceRequestSchema);
-
+const mongoose = require('mongoose');
+
+const serviceRequestSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true,
+        ref: 'Facility'
+    },
+    date: {
+        type: Date,
+    },
+    time: {
+        type: String,
+    },
+    serviceId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true,
+        ref: 'Service'
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Pending', 'Awaiting', 'In Progress', 'Completed', 'Cancelled'],
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true,
+        ref: 'Customer'
+    },
+    assigneeId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'VasVendor'
+    },
+    unit: {
+        type: String,
+    },
+    frequency: {
+        type: String,
+    },
+    amount: {
+        type: Number,
+    },
+    percentage: {
+        type: Number,
+    },
+    isCommissionSelected: {
+        type: Boolean,
+        default: false
+    }
+}, {
+    timestamps: true
+});
+
+const ServiceRequest = mongoose.model('ServiceRequest', serviceRequestSchema);
+
 module.exports = ServiceRequest;

package/src/models/settings.js

@@ -1,63 +1,63 @@
-const mongoose = require('mongoose');
-
-const SettingsSchema = new mongoose.Schema({
-    // Basic Settings
-    name: {
-        type: String,
-        required: [true, 'Name is required']
-    },
-    size: {
-        type: String,
-        required: [true, 'Size is required']
-    },
-
-    // Tax Settings
-    taxSettings: [{
-        facilityId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Facility',
-            required: [true, 'Facility ID is required']
-        },
-        taxRate: {
-            type: Number,
-            required: [true, 'Tax rate is required'],
-            min: [0, 'Tax rate cannot be negative']
-        },
-        country: {
-            type: String,
-            required: [true, 'Country is required'],
-            trim: true,
-            minlength: [1, 'Country name must be at least 1 character long']
-        },
-        currency: {
-            type: String,
-            required: [true, 'Currency is required'],
-            trim: true,
-            minlength: [1, 'Currency code must be at least 1 character long']
-        }
-    }],
-
-    // Invoice Settings
-    invoiceSettings: {
-        termsAndConditions: {
-            type: String,
-            default: 'Payment is due within 15 days'
-        },
-        paymentDetails: {
-            bankName: {
-                type: String,
-                required: [true, 'Bank name is required']
-            },
-            accountNumber: {
-                type: String,
-                required: [true, 'Account number is required']
-            }
-        }
-    }
-}, {
-    timestamps: true
-});
-
-const Settings = mongoose.model('Settings', SettingsSchema);
-
+const mongoose = require('mongoose');
+
+const SettingsSchema = new mongoose.Schema({
+    // Basic Settings
+    name: {
+        type: String,
+        required: [true, 'Name is required']
+    },
+    size: {
+        type: String,
+        required: [true, 'Size is required']
+    },
+
+    // Tax Settings
+    taxSettings: [{
+        facilityId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Facility',
+            required: [true, 'Facility ID is required']
+        },
+        taxRate: {
+            type: Number,
+            required: [true, 'Tax rate is required'],
+            min: [0, 'Tax rate cannot be negative']
+        },
+        country: {
+            type: String,
+            required: [true, 'Country is required'],
+            trim: true,
+            minlength: [1, 'Country name must be at least 1 character long']
+        },
+        currency: {
+            type: String,
+            required: [true, 'Currency is required'],
+            trim: true,
+            minlength: [1, 'Currency code must be at least 1 character long']
+        }
+    }],
+
+    // Invoice Settings
+    invoiceSettings: {
+        termsAndConditions: {
+            type: String,
+            default: 'Payment is due within 15 days'
+        },
+        paymentDetails: {
+            bankName: {
+                type: String,
+                required: [true, 'Bank name is required']
+            },
+            accountNumber: {
+                type: String,
+                required: [true, 'Account number is required']
+            }
+        }
+    }
+}, {
+    timestamps: true
+});
+
+const Settings = mongoose.model('Settings', SettingsSchema);
+
 module.exports = Settings;