payservedb 2.8.5 → 2.8.6

package/index.js

@@ -106,7 +106,8 @@ const models = {
     VasInvoice:require('./src/models/vasinvoice'),
     VasVendor:require('./src/models/vasvendor'),
     Staff:require('./src/models/staff'),
-    ServiceRequest:require('./src/models/servicerequest')
+    ServiceRequest:require('./src/models/servicerequest'),
+    CountryTaxRate:require('./src/models/country_tax')
    
     
 };

package/package.json

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

package/src/models/country_tax.js

@@ -0,0 +1,33 @@
+const mongoose = require('mongoose');
+
+// Define the schema for CountryTaxRate
+const countryTaxRateSchema = new mongoose.Schema({
+    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']
+    }
+}, {
+    timestamps: true 
+});
+
+const CountryTaxRate = mongoose.model('CountryTaxRate', countryTaxRateSchema);
+
+module.exports = CountryTaxRate;

package/src/models/servicerequest.js

@@ -1,53 +1,55 @@
 const mongoose = require('mongoose');
 
 // Define the schema for ServiceRequests
+const mongoose = require('mongoose');
 const serviceRequestSchema = new mongoose.Schema({
     facilityId: {
-        type: Number,
-        required: true
+        type: mongoose.Schema.Types.ObjectId,
+        required: true,
+        ref: 'Facility'
     },
     date: {
         type: Date,
-        required: true
     },
     time: {
         type: String,
-        required: true
     },
     serviceId: {
-        type: Number,
-        required: true
+        type: mongoose.Schema.Types.ObjectId,
+        required: true,
+        ref: 'Service'
     },
     status: {
         type: String,
         required: true,
-        enum: ['Pending', 'In Progress', 'Completed', 'Cancelled'], 
+        enum: ['Pending', 'In Progress', 'Completed', 'Cancelled'],
     },
     customerId: {
-        type: Number,
-        required: true
+        type: mongoose.Schema.Types.ObjectId,
+        required: true,
+        ref: 'Customer'
     },
     // Fields for commission-related services (appears when isCommissionSelected is true)
     frequency: {
         type: String,
-        enum: ['Daily', 'Weekly', 'Monthly'],  
+        enum: ['Once', 'Recurring'],
         required: function () {
-            return this.isCommissionSelected;  
+            return this.isCommissionSelected;
         }
     },
     percentage: {
         type: Number,
         required: function () {
-            return this.isCommissionSelected;  
+            return this.isCommissionSelected;
         }
     },
     // Fields for non-commission-related services
     isCommissionSelected: {
         type: Boolean,
-        default: false  
+        default: false
     }
 }, {
-    timestamps: true 
+    timestamps: true
 });
 
 const ServiceRequest = mongoose.model('ServiceRequest', serviceRequestSchema);