payservedb 2.9.3 → 2.9.5

package/package.json

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

package/src/models/maintenancerequisition.js

@@ -3,35 +3,18 @@ const mongoose = require('mongoose');
 const requisitionSchema = new mongoose.Schema({
     facilityId: {
         type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility', 
-        required: true,
+        ref: 'Facility',
+        required: [true, 'Facility ID is required']
     },
-    spareOrStockId: {
+    stockId: {
         type: mongoose.Schema.Types.ObjectId,
-        ref: 'Stocksandspare', 
-        required: true,
-    },
-    vendorId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'ServiceVendor', 
-        required: true,
+        ref: 'Stocksandspare',
+        required: [true, 'stock ID is required']
     },
-    date: {
-        type: Date, 
-        required: true,
-        default: Date.now,
-    },
-    quantity: {
-        type: Number, 
-        required: true,
-        min: 1, 
-    },
-    status: {
+    description: {
         type: String,
-        enum: ['Pending', 'Approved', 'Rejected', 'Completed'], 
         required: true,
-        default: 'Pending',
-    },
+    }
 }, {
     timestamps: true, 
 });

package/src/models/settings.js

@@ -1,19 +1,63 @@
 const mongoose = require('mongoose');
 
 const SettingsSchema = new mongoose.Schema({
+    // Basic Settings
     name: {
         type: String,
-        required:true
+        required: [true, 'Name is required']
     },
     size: {
         type: String,
-        required:true
+        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, // Automatically add createdAt and updatedAt fields
+    timestamps: true
 });
 
 const Settings = mongoose.model('Settings', SettingsSchema);
 
-module.exports = Settings;
+module.exports = Settings;

package/src/models/tickets.js

@@ -14,35 +14,35 @@ const ticketSchema = new mongoose.Schema({
     type: String,
   },
   description: {
-    type: String, 
+    type: String,
   },
   priority: {
-    type: String, 
+    type: String,
   },
   image: {
     type: String,
   },
   date: {
-    type: Date, 
+    type: Date,
   },
   time: {
     type: String,
   },
   extras: {
-    type: String, 
+    type: String,
   },
   status: {
     type: String,
-    enum: ['open', 'on hold', 'ongoing', 'resolved', 'cancelled', 'closed'], 
-    required: true, 
-    default: 'open', 
+    enum: ['open', 'on hold', 'ongoing', 'resolved', 'cancelled', 'closed'],
+    required: true,
+    default: 'open',
   },
   customerId: {
     type: mongoose.Schema.Types.ObjectId,
     ref: 'Customer',
   },
   ticketNumber: {
-    type: Number, 
+    type: Number,
   },
   needsFix: {
     type: String,
@@ -67,9 +67,21 @@ const ticketSchema = new mongoose.Schema({
     type: String,
     required: false,
   },
-  amount: {
+  services: [
+    {
+      description: {
+        type: String,
+        required: false,
+      },
+      amount: {
+        type: Number,
+        required: true,
+      },
+    },
+  ],
+  totalAmount: {
     type: Number,
-    required: false,
+    required: false
   },
   payer: {
     type: String,
@@ -79,16 +91,12 @@ const ticketSchema = new mongoose.Schema({
     type: Boolean,
     default: false,
   },
-  serviceDescription: {
-    type: [String], 
-    required: false
-  },
   costAttachment: {
-    type: String,   
-    required: false
-  }
+    type: String,
+    required: false,
+  },
 }, {
-  timestamps: true, 
+  timestamps: true,
 });
 
-module.exports = mongoose.model('Ticket', ticketSchema);
+module.exports = mongoose.model('Ticket', ticketSchema);