payservedb 4.2.1 → 4.2.3

package/src/models/bankdetails.js

@@ -1,40 +1,40 @@
-const mongoose = require('mongoose');
-
-const BankDetailsSchema = new mongoose.Schema({
-    accountName: {
-        type: String,
-        required: true
-    },
-    accountNumber: {
-        type: String,
-        required: true,
-    },
-    bankName: {
-        type: String,
-        required: true,
-    },
-    branchName: {
-        type: String,
-        required: true,
-    },
-    branchCode: {
-        type: String,
-        required: false,
-    },
-    bankCode: {
-        type: String,
-        required: false,
-    },
-    isDefault: {
-        type: Boolean,
-        default: false
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility'
-    },
-});
-
-const BankDetails = mongoose.model('BankDetails', BankDetailsSchema);
-
-module.exports = BankDetails;
+const mongoose = require('mongoose');
+
+const BankDetailsSchema = new mongoose.Schema({
+    accountName: {
+        type: String,
+        required: true
+    },
+    accountNumber: {
+        type: String,
+        required: true,
+    },
+    bankName: {
+        type: String,
+        required: true,
+    },
+    branchName: {
+        type: String,
+        required: true,
+    },
+    branchCode: {
+        type: String,
+        required: false,
+    },
+    bankCode: {
+        type: String,
+        required: false,
+    },
+    isDefault: {
+        type: Boolean,
+        default: false
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility'
+    },
+});
+
+const BankDetails = mongoose.model('BankDetails', BankDetailsSchema);
+
+module.exports = BankDetails;

package/src/models/budget.js

@@ -1,34 +1,34 @@
-const mongoose = require('mongoose');
-
-const budgetSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    categoryId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'BudgetCategory',
-        required: true
-    },
-    amount: {
-        type: Number,
-        required: true
-    },
-    period: {
-        startDate: {
-            type: Date,
-            required: true
-        },
-        endDate: {
-            type: Date,
-            required: true
-        }
-    }
-}, {
-    timestamps: true
-});
-
-const Budget = mongoose.model('Budget', budgetSchema);
-
+const mongoose = require('mongoose');
+
+const budgetSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    categoryId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BudgetCategory',
+        required: true
+    },
+    amount: {
+        type: Number,
+        required: true
+    },
+    period: {
+        startDate: {
+            type: Date,
+            required: true
+        },
+        endDate: {
+            type: Date,
+            required: true
+        }
+    }
+}, {
+    timestamps: true
+});
+
+const Budget = mongoose.model('Budget', budgetSchema);
+
 module.exports = Budget;

package/src/models/budgetCategory.js

@@ -1,20 +1,20 @@
-const mongoose = require('mongoose');
-
-const budgetCategorySchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    title: {
-        type: String,
-        required: true,
-        trim: true
-    }
-}, {
-    timestamps: true
-});
-
-const BudgetCategory = mongoose.model('BudgetCategory', budgetCategorySchema);
-
+const mongoose = require('mongoose');
+
+const budgetCategorySchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    title: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    timestamps: true
+});
+
+const BudgetCategory = mongoose.model('BudgetCategory', budgetCategorySchema);
+
 module.exports = BudgetCategory;

package/src/models/cashpayment.js

@@ -1,186 +1,186 @@
-// File: models/CashPayment.js
-const mongoose = require('mongoose');
-
-// Define the schema for Cash Payments
-const cashPaymentSchema = new mongoose.Schema({
-    // Payment reference details
-    paymentReference: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    // Invoice details
-    invoice: {
-        invoiceId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Invoice',
-            required: true
-        },
-        invoiceNumber: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        accountNumber: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        totalAmount: {
-            type: Number,
-            required: true,
-            min: 0
-        }
-    },
-    // Client details
-    client: {
-        clientId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Customer',
-            required: true
-        },
-        firstName: {
-            type: String,
-            required: true
-        },
-        lastName: {
-            type: String,
-            required: true
-        }
-    },
-    // Payment details
-    paymentAmount: {
-        type: Number,
-        required: true,
-        min: 0
-    },
-    currency: {
-        id: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Currency',
-            required: true
-        },
-        name: {
-            type: String,
-            required: true
-        },
-        code: {
-            type: String,
-            required: true,
-            uppercase: true,
-            minlength: 3,
-            maxlength: 3
-        }
-    },
-    paymentDate: {
-        type: Date,
-        required: true,
-        default: Date.now
-    },
-    receivedBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User',
-        required: true
-    },
-    receiptNumber: {
-        type: String,
-        required: true,
-        unique: true
-    },
-    paymentMethod: {
-        type: String,
-        enum: ['Cash', 'Check', 'Bank Transfer'],
-        default: 'Cash'
-    },
-    paymentDetails: {
-        checkNumber: String,
-        bankName: String,
-        transferReference: String,
-        notes: String
-    },
-    // Reconciliation status
-    reconciliationStatus: {
-        type: String,
-        enum: ['Pending', 'Matched', 'Partial', 'Overpaid', 'Voided'],
-        default: 'Pending'
-    },
-    // Approval details
-    approvalStatus: {
-        type: String,
-        enum: ['Pending', 'Approved', 'Rejected'],
-        default: 'Pending'
-    },
-    approvedBy: {
-        userId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'User'
-        },
-        name: String,
-        approvalDate: Date,
-        comments: String
-    },
-    // Reconciliation details
-    reconciliationDetails: {
-        appliedAmount: {
-            type: Number,
-            default: 0
-        },
-        overpayAmount: {
-            type: Number,
-            default: 0
-        },
-        reconciliationDate: Date,
-        reconciledBy: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'User'
-        }
-    },
-    // Exchange rate (for payments in different currencies)
-    exchangeRate: {
-        rate: {
-            type: Number,
-            default: 1
-        },
-        originalCurrency: {
-            code: String,
-            amount: Number
-        }
-    },
-    // Additional fields
-    isVoided: {
-        type: Boolean,
-        default: false
-    },
-    voidReason: {
-        type: String
-    },
-    voidedBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User'
-    },
-    voidDate: Date,
-    attachments: [{
-        fileName: String,
-        fileUrl: String,
-        uploadDate: {
-            type: Date,
-            default: Date.now
-        },
-        uploadedBy: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'User'
-        }
-    }]
-}, {
-    timestamps: true
-});
-
-const CashPayment = mongoose.model('CashPayment', cashPaymentSchema);
-
+// File: models/CashPayment.js
+const mongoose = require('mongoose');
+
+// Define the schema for Cash Payments
+const cashPaymentSchema = new mongoose.Schema({
+    // Payment reference details
+    paymentReference: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    // Invoice details
+    invoice: {
+        invoiceId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Invoice',
+            required: true
+        },
+        invoiceNumber: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        accountNumber: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        totalAmount: {
+            type: Number,
+            required: true,
+            min: 0
+        }
+    },
+    // Client details
+    client: {
+        clientId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Customer',
+            required: true
+        },
+        firstName: {
+            type: String,
+            required: true
+        },
+        lastName: {
+            type: String,
+            required: true
+        }
+    },
+    // Payment details
+    paymentAmount: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    currency: {
+        id: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Currency',
+            required: true
+        },
+        name: {
+            type: String,
+            required: true
+        },
+        code: {
+            type: String,
+            required: true,
+            uppercase: true,
+            minlength: 3,
+            maxlength: 3
+        }
+    },
+    paymentDate: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    receivedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true
+    },
+    receiptNumber: {
+        type: String,
+        required: true,
+        unique: true
+    },
+    paymentMethod: {
+        type: String,
+        enum: ['Cash', 'Check', 'Bank Transfer'],
+        default: 'Cash'
+    },
+    paymentDetails: {
+        checkNumber: String,
+        bankName: String,
+        transferReference: String,
+        notes: String
+    },
+    // Reconciliation status
+    reconciliationStatus: {
+        type: String,
+        enum: ['Pending', 'Matched', 'Partial', 'Overpaid', 'Voided'],
+        default: 'Pending'
+    },
+    // Approval details
+    approvalStatus: {
+        type: String,
+        enum: ['Pending', 'Approved', 'Rejected'],
+        default: 'Pending'
+    },
+    approvedBy: {
+        userId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        },
+        name: String,
+        approvalDate: Date,
+        comments: String
+    },
+    // Reconciliation details
+    reconciliationDetails: {
+        appliedAmount: {
+            type: Number,
+            default: 0
+        },
+        overpayAmount: {
+            type: Number,
+            default: 0
+        },
+        reconciliationDate: Date,
+        reconciledBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        }
+    },
+    // Exchange rate (for payments in different currencies)
+    exchangeRate: {
+        rate: {
+            type: Number,
+            default: 1
+        },
+        originalCurrency: {
+            code: String,
+            amount: Number
+        }
+    },
+    // Additional fields
+    isVoided: {
+        type: Boolean,
+        default: false
+    },
+    voidReason: {
+        type: String
+    },
+    voidedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User'
+    },
+    voidDate: Date,
+    attachments: [{
+        fileName: String,
+        fileUrl: String,
+        uploadDate: {
+            type: Date,
+            default: Date.now
+        },
+        uploadedBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        }
+    }]
+}, {
+    timestamps: true
+});
+
+const CashPayment = mongoose.model('CashPayment', cashPaymentSchema);
+
 module.exports = CashPayment;

package/src/models/combinedUnits.js

@@ -1,62 +1,62 @@
-const mongoose = require('mongoose');
-
-// Define the schema for companies
-const combinedUnitSchema = new mongoose.Schema({
-    combinedUnitName: {
-        type: String,
-        required: true
-    },
-    combinedDivision:{
-        type:String,
-        required:true
-    },
-    combinedUnitType:{
-        type:String,
-        required:true
-    },
-    combinedFloorUnit:{
-        type:String,
-        required:true
-    },
-    combinedLettableFloorArea:{
-        type:String,
-        required:false
-    },
-    combinedLRNumber:{
-        type:String,
-        required:true
-    },
-    combinedGrossArea:{
-        type:Number,
-        required:false
-    },
-    combinedNetLettableArea:{
-        type:Number,
-        required:false
-    },
-    combinedReason:{
-        type:String,
-        required:false
-    },
-    status:{
-        type:String,
-        required:true
-    },
-    selectedCombinedUnits:[],
-    facilityId:{
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    }
-   
-  
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Indexes for improved performance
-combinedUnitSchema.index({ name: 1 });
-
-// Compile the model from the schema
-const CombinedUnit = mongoose.model('CombinedUnit', combinedUnitSchema);
-
-module.exports = CombinedUnit;
+const mongoose = require('mongoose');
+
+// Define the schema for companies
+const combinedUnitSchema = new mongoose.Schema({
+    combinedUnitName: {
+        type: String,
+        required: true
+    },
+    combinedDivision:{
+        type:String,
+        required:true
+    },
+    combinedUnitType:{
+        type:String,
+        required:true
+    },
+    combinedFloorUnit:{
+        type:String,
+        required:true
+    },
+    combinedLettableFloorArea:{
+        type:String,
+        required:false
+    },
+    combinedLRNumber:{
+        type:String,
+        required:true
+    },
+    combinedGrossArea:{
+        type:Number,
+        required:false
+    },
+    combinedNetLettableArea:{
+        type:Number,
+        required:false
+    },
+    combinedReason:{
+        type:String,
+        required:false
+    },
+    status:{
+        type:String,
+        required:true
+    },
+    selectedCombinedUnits:[],
+    facilityId:{
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+    }
+   
+  
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+// Indexes for improved performance
+combinedUnitSchema.index({ name: 1 });
+
+// Compile the model from the schema
+const CombinedUnit = mongoose.model('CombinedUnit', combinedUnitSchema);
+
+module.exports = CombinedUnit;