payservedb 8.7.0 → 8.7.2

package/src/models/purchase_order.js

@@ -1,214 +1,214 @@
-const mongoose = require('mongoose');
-
-const purchaseOrderSchema = new mongoose.Schema({
-    // Main Purchase Order Information
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        index: true
-    },
-    poNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true,
-        index: true
-    },
-    prNumber: {
-        type: String,
-        trim: true,
-        index: true,
-        ref: 'PurchaseRequest'
-    },
-    rfqNumber: {
-        type: String,
-        trim: true,
-        index: true,
-        ref: 'RFQDetails'
-    },
-    supplier: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Supplier',
-        required: true
-    },
-    department: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    currency: {
-        type: String,
-        required: true,
-        trim: true,
-        default: 'KES'
-    },
-    date: {
-        type: Date,
-        required: true,
-        default: Date.now
-    },
-    internalNotes: {
-        type: String,
-        trim: true
-    },
-    supplierNotes: {
-        type: String,
-        trim: true
-    },
-    budget: {
-        type: String,
-        trim: true,
-        index: true,
-        ref: 'Budget'
-    },
-    status: {
-        type: String,
-        enum: ['pending approval', 'approved', 'rejected', 'sent', 'received', 'completed', 'canceled'],
-        default: 'pending approval',
-        index: true
-    },
-
-    // Items Details
-    items: [{
-        itemDescription: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        quantity: {
-            type: Number,
-            required: true
-        },
-        unitOfMeasure: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        unitPrice: {
-            type: Number,
-            required: true
-        },
-        taxRate: {
-            type: Number,
-            default: 0
-        },
-        totalPrice: {
-            type: Number,
-            required: true
-        }
-    }],
-    quantityToBeDelivered: {
-        type: Number,
-        default: 0
-    },
-    deliveredQuantity: {
-        type: Number,
-        default: 0
-    },
-    // Calculated Totals
-    subtotal: {
-        type: Number,
-        required: true
-    },
-    taxTotal: {
-        type: Number,
-        required: true,
-        default: 0
-    },
-    grandTotal: {
-        type: Number,
-        required: true
-    },
-    // Document attachments
-    attachments: [{
-        name: {
-            type: String,
-            required: true
-        },
-        fileType: {
-            type: String,
-            required: true
-        },
-        filePath: {
-            type: String,
-            required: true
-        },
-        uploadDate: {
-            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
-});
-
-// Pre-save middleware to calculate totals
-purchaseOrderSchema.pre('save', function (next) {
-    // Calculate subtotal
-    this.subtotal = this.items.reduce((sum, item) => sum + (item.unitPrice * item.quantity), 0);
-
-    // Calculate tax total
-    this.taxTotal = this.items.reduce((sum, item) => {
-        const itemTax = (item.unitPrice * item.quantity) * (item.taxRate / 100);
-        return sum + itemTax;
-    }, 0);
-
-    // Calculate grand total
-    this.grandTotal = this.subtotal + this.taxTotal;
-
-    // Calculate quantity to be delivered
-    this.quantityToBeDelivered = this.items.reduce((sum, item) => sum + item.quantity, 0);
-
-    next();
-});
-
-
-const PurchaseOrder = mongoose.model('PurchaseOrder', purchaseOrderSchema);
-
+const mongoose = require('mongoose');
+
+const purchaseOrderSchema = new mongoose.Schema({
+    // Main Purchase Order Information
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        index: true
+    },
+    poNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+        index: true
+    },
+    prNumber: {
+        type: String,
+        trim: true,
+        index: true,
+        ref: 'PurchaseRequest'
+    },
+    rfqNumber: {
+        type: String,
+        trim: true,
+        index: true,
+        ref: 'RFQDetails'
+    },
+    supplier: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Supplier',
+        required: true
+    },
+    department: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    currency: {
+        type: String,
+        required: true,
+        trim: true,
+        default: 'KES'
+    },
+    date: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    internalNotes: {
+        type: String,
+        trim: true
+    },
+    supplierNotes: {
+        type: String,
+        trim: true
+    },
+    budget: {
+        type: String,
+        trim: true,
+        index: true,
+        ref: 'Budget'
+    },
+    status: {
+        type: String,
+        enum: ['pending approval', 'approved', 'rejected', 'sent', 'received', 'completed', 'canceled'],
+        default: 'pending approval',
+        index: true
+    },
+
+    // Items Details
+    items: [{
+        itemDescription: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        quantity: {
+            type: Number,
+            required: true
+        },
+        unitOfMeasure: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        unitPrice: {
+            type: Number,
+            required: true
+        },
+        taxRate: {
+            type: Number,
+            default: 0
+        },
+        totalPrice: {
+            type: Number,
+            required: true
+        }
+    }],
+    quantityToBeDelivered: {
+        type: Number,
+        default: 0
+    },
+    deliveredQuantity: {
+        type: Number,
+        default: 0
+    },
+    // Calculated Totals
+    subtotal: {
+        type: Number,
+        required: true
+    },
+    taxTotal: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    grandTotal: {
+        type: Number,
+        required: true
+    },
+    // Document attachments
+    attachments: [{
+        name: {
+            type: String,
+            required: true
+        },
+        fileType: {
+            type: String,
+            required: true
+        },
+        filePath: {
+            type: String,
+            required: true
+        },
+        uploadDate: {
+            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
+});
+
+// Pre-save middleware to calculate totals
+purchaseOrderSchema.pre('save', function (next) {
+    // Calculate subtotal
+    this.subtotal = this.items.reduce((sum, item) => sum + (item.unitPrice * item.quantity), 0);
+
+    // Calculate tax total
+    this.taxTotal = this.items.reduce((sum, item) => {
+        const itemTax = (item.unitPrice * item.quantity) * (item.taxRate / 100);
+        return sum + itemTax;
+    }, 0);
+
+    // Calculate grand total
+    this.grandTotal = this.subtotal + this.taxTotal;
+
+    // Calculate quantity to be delivered
+    this.quantityToBeDelivered = this.items.reduce((sum, item) => sum + item.quantity, 0);
+
+    next();
+});
+
+
+const PurchaseOrder = mongoose.model('PurchaseOrder', purchaseOrderSchema);
+
 module.exports = PurchaseOrder;

package/src/models/purchase_request.js

@@ -1,111 +1,111 @@
-const mongoose = require('mongoose');
-
-const purchaseRequestSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        index: true
-    },
-    items: [{
-        itemDescription: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        quantity: {
-            type: Number,
-            required: true
-        },
-        unitOfMeasure: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        remarksSpecification: {
-            type: String,
-            trim: true
-        }
-    }],
-    from: {
-        type: String,
-        trim: true
-    },
-    date: {
-        type: Date,
-        required: true,
-        default: Date.now
-    },
-    irfNumber: {
-        type: String,
-        required: true,
-        trim: true,
-        index: true
-    },
-    department: {
-        type: String,
-        trim: true
-    },
-    status: {
-        type: String,
-        default: 'pending',
-        index: true
-    },
-    poStatus: {
-        type: String,
-        enum: ['PO Raised', 'pending'],
-        default: 'pending',
-        index: 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
-    });
-
-const PurchaseRequest = mongoose.model('PurchaseRequest', purchaseRequestSchema);
-
+const mongoose = require('mongoose');
+
+const purchaseRequestSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        index: true
+    },
+    items: [{
+        itemDescription: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        quantity: {
+            type: Number,
+            required: true
+        },
+        unitOfMeasure: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        remarksSpecification: {
+            type: String,
+            trim: true
+        }
+    }],
+    from: {
+        type: String,
+        trim: true
+    },
+    date: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    irfNumber: {
+        type: String,
+        required: true,
+        trim: true,
+        index: true
+    },
+    department: {
+        type: String,
+        trim: true
+    },
+    status: {
+        type: String,
+        default: 'pending',
+        index: true
+    },
+    poStatus: {
+        type: String,
+        enum: ['PO Raised', 'pending'],
+        default: 'pending',
+        index: 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
+    });
+
+const PurchaseRequest = mongoose.model('PurchaseRequest', purchaseRequestSchema);
+
 module.exports = PurchaseRequest;