payservedb 2.9.5 → 2.9.7

package/index.js

@@ -98,7 +98,7 @@ const models = {
     Stocksandspare:require('./src/models/stocksandspare'),
     ServiceVendor:require('./src/models/maintenance_service_vendor'),
     MaintenanceServices:require('./src/models/maintenance_services'),
-    Requisition:require('./src/models/maintenancerequisition'),
+    StockRequisition:require('./src/models/maintenancerequisition'),
     LeaseAgreement:require('./src/models/leaseagreement'),
     WorkOrder:require('./src/models/workorder'),
     ServiceInvoice:require('./src/models/service_invoice'),

package/package.json

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

package/src/models/maintenancerequisition.js

@@ -19,4 +19,4 @@ const requisitionSchema = new mongoose.Schema({
     timestamps: true, 
 });
 
-module.exports = mongoose.model('Requisition', requisitionSchema);
+module.exports = mongoose.model('StockRequisition', requisitionSchema);

package/src/models/servicerequest.js

@@ -27,21 +27,12 @@ const serviceRequestSchema = new mongoose.Schema({
         required: true,
         ref: 'Customer'
     },
-    // Fields for commission-related services (appears when isCommissionSelected is true)
     frequency: {
         type: String,
-        enum: ['Once', 'Recurring'],
-        required: function () {
-            return this.isCommissionSelected;
-        }
     },
     percentage: {
         type: Number,
-        required: function () {
-            return this.isCommissionSelected;
-        }
     },
-    // Fields for non-commission-related services
     isCommissionSelected: {
         type: Boolean,
         default: false