payservedb 5.3.8 → 5.4.0

package/package.json

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

package/src/models/handover.js

@@ -128,7 +128,12 @@ const handoverSchema = new mongoose.Schema({
         type: Number,
         min: 0
       },
-      description: String
+      description: String,
+      invoiceId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Invoice',
+        default: null
+      }
     }],
     refundAmount: {
       type: Number,

package/src/models/purchase_order.js

@@ -105,36 +105,6 @@ const purchaseOrderSchema = new mongoose.Schema({
         type: Number,
         required: true
     },
-
-    // Approvers Section
-    approvers: [{
-        approverId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'User',
-            required: true
-        },
-        approverName: {
-            type: String,
-            required: true
-        },
-        approverRole: {
-            type: String,
-            required: true
-        },
-        approvalStatus: {
-            type: String,
-            enum: ['pending', 'approved', 'rejected'],
-            default: 'pending'
-        },
-        approvalDate: {
-            type: Date
-        },
-        comments: {
-            type: String,
-            trim: true
-        }
-    }],
-
     // Document attachments
     attachments: [{
         name: {
@@ -153,22 +123,56 @@ const purchaseOrderSchema = new mongoose.Schema({
             type: Date,
             default: Date.now
         }
+    }],
+    approvalWorkflowId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'ApprovalWorkflow',
+        required: true
+    },
+    approvalStatus: {
+        type: String,
+        enum: ['pending', 'in_progress', 'approved', 'rejected'],
+        default: 'pending',
+        index: true
+    },
+    currentStep: {
+        type: Number,
+        default: 1,
+        min: 1
+    },
+    approvals: [{
+        stepNumber: {
+            type: Number,
+            required: true
+        },
+        stepName: {
+            type: String,
+            required: true
+        },
+        approvers: [{
+            userId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'User',
+                required: true
+            },
+            status: {
+                type: String,
+                enum: ['pending', 'approved', 'rejected'],
+                default: 'pending'
+            },
+            actionDate: {
+                type: Date
+            },
+            comments: {
+                type: String,
+                trim: true
+            }
+        }]
     }]
 }, {
     timestamps: true
 });
 
-// Virtual for tracking approval progress
-purchaseOrderSchema.virtual('approvalProgress').get(function () {
-    if (!this.approvers || this.approvers.length === 0) return 0;
-
-    const approvedCount = this.approvers.filter(
-        approver => approver.approvalStatus === 'approved'
-    ).length;
-
-    return (approvedCount / this.approvers.length) * 100;
-});
-
 // Pre-save middleware to calculate totals
 purchaseOrderSchema.pre('save', function (next) {
     // Calculate subtotal

package/src/models/rfq_details.js

@@ -77,9 +77,53 @@ const rfqDetailsSchema = new mongoose.Schema({
     unitOfMeasure: { type: String, trim: true },
     specifications: { type: String, trim: true },
   }],
-
+  approvalWorkflowId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'ApprovalWorkflow',
+    required: true
+  },
+  approvalStatus: {
+    type: String,
+    enum: ['pending', 'in_progress', 'approved', 'rejected'],
+    default: 'pending',
+    index: true
+  },
+  currentStep: {
+    type: Number,
+    default: 1,
+    min: 1
+  },
+  approvals: [{
+    stepNumber: {
+      type: Number,
+      required: true
+    },
+    stepName: {
+      type: String,
+      required: true
+    },
+    approvers: [{
+      userId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true
+      },
+      status: {
+        type: String,
+        enum: ['pending', 'approved', 'rejected'],
+        default: 'pending'
+      },
+      actionDate: {
+        type: Date
+      },
+      comments: {
+        type: String,
+        trim: true
+      }
+    }]
+  }]
 }, {
-  timestamps: true,
+  timestamps: true
 });
 
 const RFQDetails = mongoose.model('RFQDetails', rfqDetailsSchema);