payservedb 8.4.2 → 8.4.3

package/package.json

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

package/src/models/booking_invoice.js

@@ -17,6 +17,11 @@ const bookingInvoiceSchema = new mongoose.Schema({
         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',

package/src/models/bookingproperty.js

@@ -1,21 +1,174 @@
-const mongoose = require("mongoose");
+const mongoose = require('mongoose');
 
-const facilityPaymentDetailsSchema = new mongoose.Schema({
-    facility: {
+// Define the schema for Booking Properties (listing configuration)
+const bookingPropertySchema = new mongoose.Schema({
+    facilityId: {
         type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
     },
-    shortCode: { type: String },
-    passkey: { type: String },
-    authorizationKey: {
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        required: true
+    },
+    propertyName: {
+        type: String,
+        required: true
+    },
+    propertyType: {
+        type: String,
+        enum: ['Apartment', 'Villa', 'Hotel', 'Resort', 'Guesthouse', 'Other'],
+        default: 'Apartment'
+    },
+    managedByLandlord: {
+        type: Boolean,
+        default: false
+    },
+    division: {
+        type: String,
+        required: false
+    },
+    description: {
+        type: String,
+        required: false
+    },
+    location: {
+        address: String,
+        city: String,
+        country: String,
+        coordinates: {
+            latitude: Number,
+            longitude: Number
+        }
+    },
+    images: [{
+        url: String,
+        caption: String,
+        isPrimary: Boolean
+    }],
+    maxOccupancy: {
+        type: Number,
+        default: 2
+    },
+    amenities: [{
+        type: String
+    }],
+    basePrice: {
+        type: Number,
+        required: function () {
+            return !this.managedByLandlord;
+        }
+    },
+    currencyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        required: function () {
+            return !this.managedByLandlord;
+        }
+    },
+    weekendPriceAdjustment: {
+        type: Number,
+        default: 0
+    },
+    minimumStay: {
+        type: Number,
+        default: 1
+    },
+    maximumStay: {
+        type: Number,
+        default: 30
+    },
+    advanceBookingDays: {
+        type: Number,
+        default: 0
+    },
+    cancellationPolicy: {
         type: String,
+        enum: ['Flexible', 'Moderate', 'Strict'],
+        default: 'Moderate'
+    },
+    // Detailed cancellation policy information for display and API
+    cancellationPolicyDetails: {
+        description: {
+            type: String,
+            default: ''
+        },
+        refundRules: [{
+            daysBeforeCheckIn: {
+                type: Number,
+                required: false
+            },
+            refundPercentage: {
+                type: Number,
+                required: false
+            },
+            description: {
+                type: String
+            }
+        }]
     },
-    module: {
+    isListed: {
+        type: Boolean,
+        default: false
+    },
+    commission: {
+        type: Number,
+        required: function () {
+            return !this.managedByLandlord;
+        },
+        default: 10 // Default commission percentage
+    },
+    blockedDates: [{
+        startDate: {
+            type: Date,
+            required: true
+        },
+        endDate: {
+            type: Date,
+            required: true
+        },
+        reason: {
+            type: String,
+            enum: ['Reservation', 'Renovation', 'Owner Use'],
+            required: true
+        },
+        notes: {
+            type: String
+        }
+    }],
+    // For seasonal pricing or custom date ranges
+    specialPricing: [{
+        startDate: {
+            type: Date,
+            required: true
+        },
+        endDate: {
+            type: Date,
+            required: true
+        },
+        price: {
+            type: Number,
+            required: true
+        },
+        name: {
+            type: String
+        }
+    }],
+    status: {
         type: String,
-        enum: ["All", "Water", "Electricity", "Levy","Lease","Booking"],
-        default: "All"
+        enum: ['active', 'inactive', 'maintenance', 'Active', 'Inactive', 'Pending Approval'],
+        default: 'active'
     },
+    reservationId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BookingReservation'
+    }
+}, {
+    timestamps: true
 });
 
-const FacilityPaymentDetails = mongoose.model('FacilityPaymentDetails', facilityPaymentDetailsSchema);
+// Create model from schema
+const BookingProperty = mongoose.model('BookingProperty', bookingPropertySchema);
 
-module.exports = FacilityPaymentDetails;
+module.exports = BookingProperty;