payservedb 8.4.1 → 8.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payservedb",
-  "version": "8.4.1",
+  "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',
@@ -127,6 +132,15 @@ const bookingInvoiceSchema = new mongoose.Schema({
         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'],

package/src/models/bookingproperty.js

@@ -12,6 +12,15 @@ const bookingPropertySchema = new mongoose.Schema({
         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
@@ -24,6 +33,24 @@ const bookingPropertySchema = new mongoose.Schema({
         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
     }],
@@ -61,6 +88,26 @@ const bookingPropertySchema = new mongoose.Schema({
         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
+            }
+        }]
+    },
     isListed: {
         type: Boolean,
         default: false
@@ -110,8 +157,12 @@ const bookingPropertySchema = new mongoose.Schema({
     }],
     status: {
         type: String,
-        enum: ['Active', 'Inactive', 'Pending Approval'],
-        default: 'Active'
+        enum: ['active', 'inactive', 'maintenance', 'Active', 'Inactive', 'Pending Approval'],
+        default: 'active'
+    },
+    reservationId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BookingReservation'
     }
 }, {
     timestamps: true

package/src/models/bookingreservation.js

@@ -155,13 +155,13 @@ const bookingReservationSchema = new mongoose.Schema({
     },
     status: {
         type: String,
-        enum: ['new', 'confirmed', 'cancelled', 'completed'],
-        default: 'new'
+        enum: ['reserved', 'booked', 'canceled', 'completed'],
+        default: 'reserved'
     },
     statusHistory: [{
         status: {
             type: String,
-            enum: ['new', 'confirmed', 'cancelled', 'completed'],
+            enum: ['reserved', 'booked', 'canceled', 'completed'],
             required: true
         },
         timestamp: {
@@ -170,6 +170,23 @@ const bookingReservationSchema = new mongoose.Schema({
         },
         updatedBy: mongoose.Schema.Types.ObjectId
     }],
+    // Partial payment and reservation settings
+    partialPaymentAllowed: {
+        type: Boolean,
+        default: true
+    },
+    paymentDeadline: {
+        type: Date
+    },
+    reassignmentAllowed: {
+        type: Boolean,
+        default: true
+    },
+    // Reservation policy details
+    reservationPolicy: {
+        type: String,
+        default: 'Units can be reserved with partial payment. Full payment required before check-in. Reserved units may be reassigned if payment deadline is not met.'
+    },
     cancellationDetails: {
         date: Date,
         reason: String,

package/src/models/facility_payment_details.js

@@ -11,7 +11,7 @@ const facilityPaymentDetailsSchema = new mongoose.Schema({
     },
     module: {
         type: String,
-        enum: ["All", "Water", "Electricity", "Levy","Lease"],
+        enum: ["All", "Water", "Electricity", "Levy","Lease","Booking"],
         default: "All"
     },
 });