payservedb 3.0.4 → 3.0.5

package/index.js

@@ -101,7 +101,6 @@ const models = {
     StockRequisition:require('./src/models/maintenancerequisition'),
     LeaseAgreement:require('./src/models/leaseagreement'),
     WorkOrder:require('./src/models/workorder'),
-    ServiceInvoice:require('./src/models/service_invoice'),
     ValueAddedService:require('./src/models/valueaddedservices'),
     VasInvoice:require('./src/models/vasinvoice'),
     VasVendor:require('./src/models/vasvendor'),

package/package.json

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

package/src/models/servicerequest.js

@@ -20,7 +20,7 @@ const serviceRequestSchema = new mongoose.Schema({
     status: {
         type: String,
         required: true,
-        enum: ['Pending', 'Awaiting', 'In Progress', 'Completed', 'Cancelled'],
+        enum: ['Pending', 'In Progress', 'Completed', 'Cancelled'],
     },
     customerId: {
         type: mongoose.Schema.Types.ObjectId,

package/src/models/vasinvoice.js

@@ -3,18 +3,15 @@ const mongoose = require('mongoose');
 // Define the schema for VasInvoices
 const vasInvoiceSchema = new mongoose.Schema({
     facilityId: {
-        type: Number,
+        type: mongoose.Schema.Types.ObjectId,
         required: true
     },
     serviceId: {
-        type: Number,
+        type: mongoose.Schema.Types.ObjectId,
         required: true
     },
-    serviceVendorId: {
-        type: Number
-    },
     customerId: {
-        type: Number,
+        type: mongoose.Schema.Types.ObjectId,
         required: true
     },
     status: {
@@ -22,21 +19,13 @@ const vasInvoiceSchema = new mongoose.Schema({
         required: true,
         enum: ['Pending', 'Paid', 'Cancelled', 'Overdue'],  // Example of possible statuses, can be adjusted as needed
     },
-    time: {
-        type: String,
-        required: true
-    },
-    date: {
-        type: Date,
-        required: true
-    },
     amount: {
         type: Number
     }
 }, {
-    timestamps: true  
+    timestamps: true
 });
 
 const VasInvoice = mongoose.model('VasInvoice', vasInvoiceSchema);
 
-module.exports = VasInvoice;
+module.exports = VasInvoice;

package/src/models/service_invoice.js

@@ -1,43 +0,0 @@
-const mongoose = require('mongoose');
-
-const ServiceInvoiceSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility', 
-        required: true
-    },
-    serviceId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Service', 
-        required: true
-    },
-    serviceVendorId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'ServiceVendor', 
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer', 
-        required: true
-    },
-    status: {
-        type: String,
-        required: true,
-    },
-    time: {
-        type: String,
-        required: true
-    },
-    date: {
-        type: Date,
-        required: true,
-    },
-    amount: {
-        type: Number,
-    },
-
-});
-
-const ServiceInvoice = mongoose.model('ServiceInvoice', ServiceInvoiceSchema);
-
-module.exports = ServiceInvoice;