payservedb 9.2.3 → 9.2.4

package/src/models/booking_invoice.js

@@ -1,166 +1,166 @@
-const mongoose = require('mongoose');
-
-// Define the schema for Booking Invoices
-const bookingInvoiceSchema = new mongoose.Schema({
-    invoiceNumber: {
-        type: String,
-        required: true,
-        unique: true,
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    invoiceId: {
-        type: String,
-        required: true,
-        unique: true
-    },
-    accountNumber: {
-        type: String,
-        unique: true,
-        sparse: true // Allow null/undefined values while maintaining uniqueness for non-null values
-    },
-    bookingReservationId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'BookingReservation',
-        required: true
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        required: true
-    },
-    guestInfo: {
-        name: {
-            type: String,
-            required: true
-        },
-        email: {
-            type: String,
-            required: true
-        },
-        phone: {
-            type: String,
-            required: true
-        },
-        idNumber: {
-            type: String
-        }
-    },
-    issueDate: {
-        type: Date,
-        default: Date.now,
-        required: true
-    },
-    dueDate: {
-        type: Date,
-        required: true
-    },
-    checkIn: {
-        type: Date,
-        required: true
-    },
-    checkOut: {
-        type: Date,
-        required: true
-    },
-    basePrice: {
-        type: Number,
-        required: true
-    },
-    totalAmount: {
-        type: Number,
-        required: true
-    },
-    additionalServices: [{
-        serviceId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'ValueAddedService'
-        },
-        serviceName: {
-            type: String,
-            required: true
-        },
-        quantity: {
-            type: Number,
-            default: 1
-        },
-        price: {
-            type: Number,
-            required: true
-        }
-    }],
-    discountAmount: {
-        type: Number,
-        default: 0
-    },
-    taxAmount: {
-        type: Number,
-        default: 0
-    },
-    paymentMethod: {
-        type: String,
-        enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
-        required: true
-    },
-    paymentStatus: {
-        type: String,
-        enum: ['Pending', 'Paid', 'Partially Paid', 'Refunded', 'Cancelled'],
-        default: 'Pending'
-    },
-    paymentHistory: [{
-        amount: {
-            type: Number,
-            required: true
-        },
-        paymentMethod: {
-            type: String,
-            enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
-            required: true
-        },
-        transactionId: String,
-        date: {
-            type: Date,
-            default: Date.now
-        },
-        notes: String
-    }],
-    currencyId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Currency',
-        required: true
-    },
-    // Payment details for M-Pesa STK push
-    paymentDetails: {
-        paybillNumber: String,
-        paybillAccountName: String,
-        facilityPaymentDetailsId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'FacilityPaymentDetails'
-        }
-    },
-    status: {
-        type: String,
-        enum: ['active', 'cancelled', 'void'],
-        default: 'active'
-    },
-    notes: {
-        type: String
-    },
-    createdBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User'
-    },
-    updatedBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User'
-    }
-}, {
-    timestamps: true
-});
-
-const BookingInvoice = mongoose.model('BookingInvoice', bookingInvoiceSchema);
-
+const mongoose = require('mongoose');
+
+// Define the schema for Booking Invoices
+const bookingInvoiceSchema = new mongoose.Schema({
+    invoiceNumber: {
+        type: String,
+        required: true,
+        unique: true,
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    invoiceId: {
+        type: String,
+        required: true,
+        unique: true
+    },
+    accountNumber: {
+        type: String,
+        unique: true,
+        sparse: true // Allow null/undefined values while maintaining uniqueness for non-null values
+    },
+    bookingReservationId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BookingReservation',
+        required: true
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        required: true
+    },
+    guestInfo: {
+        name: {
+            type: String,
+            required: true
+        },
+        email: {
+            type: String,
+            required: true
+        },
+        phone: {
+            type: String,
+            required: true
+        },
+        idNumber: {
+            type: String
+        }
+    },
+    issueDate: {
+        type: Date,
+        default: Date.now,
+        required: true
+    },
+    dueDate: {
+        type: Date,
+        required: true
+    },
+    checkIn: {
+        type: Date,
+        required: true
+    },
+    checkOut: {
+        type: Date,
+        required: true
+    },
+    basePrice: {
+        type: Number,
+        required: true
+    },
+    totalAmount: {
+        type: Number,
+        required: true
+    },
+    additionalServices: [{
+        serviceId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'ValueAddedService'
+        },
+        serviceName: {
+            type: String,
+            required: true
+        },
+        quantity: {
+            type: Number,
+            default: 1
+        },
+        price: {
+            type: Number,
+            required: true
+        }
+    }],
+    discountAmount: {
+        type: Number,
+        default: 0
+    },
+    taxAmount: {
+        type: Number,
+        default: 0
+    },
+    paymentMethod: {
+        type: String,
+        enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
+        required: true
+    },
+    paymentStatus: {
+        type: String,
+        enum: ['Pending', 'Paid', 'Partially Paid', 'Refunded', 'Cancelled'],
+        default: 'Pending'
+    },
+    paymentHistory: [{
+        amount: {
+            type: Number,
+            required: true
+        },
+        paymentMethod: {
+            type: String,
+            enum: ['Cash', 'Card', 'Bank Transfer', 'Mobile Money', 'Other'],
+            required: true
+        },
+        transactionId: String,
+        date: {
+            type: Date,
+            default: Date.now
+        },
+        notes: String
+    }],
+    currencyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        required: true
+    },
+    // Payment details for M-Pesa STK push
+    paymentDetails: {
+        paybillNumber: String,
+        paybillAccountName: String,
+        facilityPaymentDetailsId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'FacilityPaymentDetails'
+        }
+    },
+    status: {
+        type: String,
+        enum: ['active', 'cancelled', 'void'],
+        default: 'active'
+    },
+    notes: {
+        type: String
+    },
+    createdBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User'
+    },
+    updatedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User'
+    }
+}, {
+    timestamps: true
+});
+
+const BookingInvoice = mongoose.model('BookingInvoice', bookingInvoiceSchema);
+
 module.exports = BookingInvoice;

package/src/models/bookinganalytics.js

@@ -1,64 +1,64 @@
-const mongoose = require('mongoose');
-
-// Define schema for Booking Analytics
-const bookingAnalyticsSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    date: {
-        type: Date,
-        required: true
-    },
-    metrics: {
-        totalBookings: {
-            type: Number,
-            default: 0
-        },
-        totalRevenue: {
-            type: Number,
-            default: 0
-        },
-        pmCommission: {
-            type: Number,
-            default: 0
-        },
-        landlordRevenue: {
-            type: Number,
-            default: 0
-        },
-        occupancyRate: {
-            type: Number,
-            default: 0
-        },
-        averageDailyRate: {
-            type: Number,
-            default: 0
-        }
-    },
-    bookingsByStatus: {
-        new: {
-            type: Number,
-            default: 0
-        },
-        confirmed: {
-            type: Number,
-            default: 0
-        },
-        cancelled: {
-            type: Number,
-            default: 0
-        },
-        completed: {
-            type: Number,
-            default: 0
-        }
-    }
-}, {
-    timestamps: true
-});
-// Create model from schema
-const BookingAnalytics = mongoose.model('BookingAnalytics', bookingAnalyticsSchema);
-
+const mongoose = require('mongoose');
+
+// Define schema for Booking Analytics
+const bookingAnalyticsSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    date: {
+        type: Date,
+        required: true
+    },
+    metrics: {
+        totalBookings: {
+            type: Number,
+            default: 0
+        },
+        totalRevenue: {
+            type: Number,
+            default: 0
+        },
+        pmCommission: {
+            type: Number,
+            default: 0
+        },
+        landlordRevenue: {
+            type: Number,
+            default: 0
+        },
+        occupancyRate: {
+            type: Number,
+            default: 0
+        },
+        averageDailyRate: {
+            type: Number,
+            default: 0
+        }
+    },
+    bookingsByStatus: {
+        new: {
+            type: Number,
+            default: 0
+        },
+        confirmed: {
+            type: Number,
+            default: 0
+        },
+        cancelled: {
+            type: Number,
+            default: 0
+        },
+        completed: {
+            type: Number,
+            default: 0
+        }
+    }
+}, {
+    timestamps: true
+});
+// Create model from schema
+const BookingAnalytics = mongoose.model('BookingAnalytics', bookingAnalyticsSchema);
+
 module.exports = BookingAnalytics;

package/src/models/bookingconfig.js

@@ -1,46 +1,46 @@
-const mongoose = require('mongoose');
-
-// Define schema for API Configuration (for Booking.com integration if needed)
-const bookingConfigSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    apiKey: {
-        type: String,
-        required: false
-    },
-    apiSecret: {
-        type: String,
-        required: false
-    },
-    isEnabled: {
-        type: Boolean,
-        default: false
-    },
-    lastConnected: {
-        type: Date
-    },
-    settings: {
-        autoAcceptBookings: {
-            type: Boolean,
-            default: false
-        },
-        syncCalendar: {
-            type: Boolean,
-            default: true
-        },
-        defaultCommission: {
-            type: Number,
-            default: 10
-        }
-    }
-}, {
-    timestamps: true
-});
-
-// Create model from schema
-const BookingConfig = mongoose.model('BookingConfig', bookingConfigSchema);
-
+const mongoose = require('mongoose');
+
+// Define schema for API Configuration (for Booking.com integration if needed)
+const bookingConfigSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    apiKey: {
+        type: String,
+        required: false
+    },
+    apiSecret: {
+        type: String,
+        required: false
+    },
+    isEnabled: {
+        type: Boolean,
+        default: false
+    },
+    lastConnected: {
+        type: Date
+    },
+    settings: {
+        autoAcceptBookings: {
+            type: Boolean,
+            default: false
+        },
+        syncCalendar: {
+            type: Boolean,
+            default: true
+        },
+        defaultCommission: {
+            type: Number,
+            default: 10
+        }
+    }
+}, {
+    timestamps: true
+});
+
+// Create model from schema
+const BookingConfig = mongoose.model('BookingConfig', bookingConfigSchema);
+
 module.exports = BookingConfig;