payservedb 8.4.0 → 8.4.2

package/index.js

@@ -236,6 +236,8 @@ const models = {
   DocumentType: require("./src/models/document_type"),
   Counter: require("./src/models/counter_schema"),
   ZohoIntegration: require("./src/models/zohoIntegration"),
+  PrivacyPolicy: require("./src/models/privacy_policy"),
+  TermsAndConditions: require("./src/models/terms_and_conditions")
 };
 
 // Function to get models dynamically from a specific database connection

package/package.json

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

package/src/models/booking_invoice.js

@@ -127,6 +127,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

@@ -1,123 +1,21 @@
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 
-// Define the schema for Booking Properties (listing configuration)
-const bookingPropertySchema = new mongoose.Schema({
-    facilityId: {
+const facilityPaymentDetailsSchema = new mongoose.Schema({
+    facility: {
         type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
     },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        required: true
-    },
-    managedByLandlord: {
-        type: Boolean,
-        default: false
-    },
-    division: {
+    shortCode: { type: String },
+    passkey: { type: String },
+    authorizationKey: {
         type: String,
-        required: false
     },
-    description: {
+    module: {
         type: String,
-        required: false
-    },
-    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
+        enum: ["All", "Water", "Electricity", "Levy","Lease","Booking"],
+        default: "All"
     },
-    maximumStay: {
-        type: Number,
-        default: 30
-    },
-    advanceBookingDays: {
-        type: Number,
-        default: 0
-    },
-    cancellationPolicy: {
-        type: String,
-        enum: ['Flexible', 'Moderate', 'Strict'],
-        default: 'Moderate'
-    },
-    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: ['Active', 'Inactive', 'Pending Approval'],
-        default: 'Active'
-    }
-}, {
-    timestamps: true
 });
 
-// Create model from schema
-const BookingProperty = mongoose.model('BookingProperty', bookingPropertySchema);
+const FacilityPaymentDetails = mongoose.model('FacilityPaymentDetails', facilityPaymentDetailsSchema);
 
-module.exports = BookingProperty;
+module.exports = FacilityPaymentDetails;

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"
     },
 });

package/src/models/privacy_policy.js

@@ -0,0 +1,20 @@
+const mongoose = require('mongoose');
+
+const privacyPolicySchema = new mongoose.Schema({
+    title: {
+      type: String,
+      default: "Privacy Policy",
+    },
+    content: {
+      type: String,
+      required: true,
+    },
+  },
+{
+    timestamps: true,
+}
+);
+
+const PrivacyPolicy = mongoose.model('PrivacyPolicy', privacyPolicySchema);
+
+module.exports = PrivacyPolicy;

package/src/models/terms_and_conditions.js

@@ -0,0 +1,20 @@
+const mongoose = require('mongoose');
+
+const termsAndConditionsSchema = new mongoose.Schema({
+     title: {
+      type: String,
+      default: "Terms & Conditions",
+    },
+    content: {
+      type: String,
+      required: true,
+    },
+  },
+  {
+    timestamps: true,
+}
+);
+
+const TermsAndConditions = mongoose.model('TermsAndConditions', termsAndConditionsSchema);
+
+module.exports = TermsAndConditions;