payservedb 3.8.1 → 3.8.3

package/package.json

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

package/src/models/invoice.js

@@ -33,11 +33,33 @@ const invoiceSchema = new mongoose.Schema(
         ref: "Facility",
         required: true,
       },
+      name: {
+        type: String,
+        required: true
+      }
     },
     unit: {
       id: { type: mongoose.Schema.Types.ObjectId, ref: "Unit", required: true },
       name: { type: String, required: true },
     },
+    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
+      }
+    },
     items: [
       {
         description: { type: String, required: true },
@@ -113,7 +135,15 @@ const invoiceSchema = new mongoose.Schema(
       paymentReference: String,
       paymentCompletion: String,
       remainingBalance: Number,
-      notes: String
+      notes: String,
+      exchangeRate: {
+        type: Number,
+        default: 1  // For cross-currency reconciliations
+      },
+      originalCurrency: {
+        code: String,  // Original currency code if different from invoice currency
+        amount: Number // Amount in original currency
+      }
     }],
     paymentDetails: {
       paymentStatus: { type: String, required: true },
@@ -133,12 +163,43 @@ invoiceSchema.index({ status: 1 });
 invoiceSchema.index({ 'client.clientId': 1, status: 1 });
 invoiceSchema.index({ 'reconciliationHistory.paymentReference': 1 });
 invoiceSchema.index({ issueDate: -1 });
+invoiceSchema.index({ 'currency.code': 1 }); // Add index for currency code
+invoiceSchema.index({ 'currency.id': 1 }); // Add index for currency ID
+invoiceSchema.index({ 'currency.code': 1, 'client.clientId': 1, status: 1 }); // Compound index for currency-based queries
 
 // Add virtual field for calculating balance
 invoiceSchema.virtual('calculatedBalance').get(function () {
   return this.totalAmount - (this.amountPaid || 0);
 });
 
+// Add method for currency conversion if needed
+invoiceSchema.methods.convertAmount = function (amount, fromCurrency, toCurrency, exchangeRate) {
+  if (fromCurrency === toCurrency) {
+    return amount;
+  }
+  return amount * exchangeRate;
+};
+
+// Add static method to find invoices by currency
+invoiceSchema.statics.findByCurrency = function (currencyCode) {
+  return this.find({ 'currency.code': currencyCode.toUpperCase() });
+};
+
+// Add static method to calculate totals by currency
+invoiceSchema.statics.calculateTotalsByCurrency = function (query = {}) {
+  return this.aggregate([
+    { $match: query },
+    {
+      $group: {
+        _id: '$currency.code',
+        totalAmount: { $sum: '$totalAmount' },
+        totalPaid: { $sum: '$amountPaid' },
+        count: { $sum: 1 }
+      }
+    }
+  ]);
+};
+
 const Invoice = mongoose.model('Invoice', invoiceSchema);
 
 module.exports = Invoice;

package/src/models/leaseagreement.js

@@ -39,19 +39,19 @@ const leaseAgreementSchema = new mongoose.Schema({
             type: {
                 type: String,
                 required: true,
-                enum: ['Bank Transfer', 'Mobile Money', 'Cash', 'Cheque']
+                enum: ['Bank Transfer', 'Cash', 'Cheque']
             },
             details: {
+                // Bank Transfer details
                 bankName: String,
                 accountName: String,
                 accountNumber: String,
                 branch: String,
                 swiftCode: String,
-                phoneNumber: String,
-                provider: String,
-                mobileAccountName: String,
+                // Cheque details
                 bankToDraft: String,
                 chequeAccountNumber: String,
+                // Cash details
                 preferredCashLocation: String
             },
             isPrimary: { type: Boolean, default: false }
@@ -60,6 +60,15 @@ const leaseAgreementSchema = new mongoose.Schema({
         penaltyId: {
             type: mongoose.Schema.Types.ObjectId,
             ref: 'Penalty'
+        },
+        mpesaEnabled: { 
+            type: Boolean, 
+            default: false 
+        },
+        mpesaDetails: {
+            businessNumber: String,  // Paybill or Till number
+            accountNumber: String,   // Account number if using Paybill
+            phoneNumber: String      // Phone number for receiving payments
         }
     },
     billingCycle: {
@@ -114,15 +123,19 @@ const leaseAgreementSchema = new mongoose.Schema({
             method: {
                 type: {
                     type: String,
-                    enum: ['Bank Transfer', 'Mobile Money', 'Cash', 'Cheque'],
+                    enum: ['Bank Transfer', 'Cash', 'Cheque', 'MPESA'],
                     required: true
                 },
                 details: {
+                    // Bank Transfer payment details
                     bankName: String,
                     accountNumber: String,
                     transactionId: String,
-                    mobileNumber: String,
-                    chequeNumber: String
+                    // Cheque payment details
+                    chequeNumber: String,
+                    // MPESA payment details
+                    mpesaTransactionId: String,
+                    mpesaPhoneNumber: String
                 }
             },
             amount: { type: Number, required: true },