payservedb 8.6.5 → 8.6.6

package/package.json

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

package/src/models/bookingproperty.js

@@ -135,6 +135,10 @@ const bookingPropertySchema = new mongoose.Schema({
         },
         notes: {
             type: String
+        },
+        reservationId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'BookingReservation'
         }
     }],
     // For seasonal pricing or custom date ranges
@@ -171,4 +175,5 @@ const bookingPropertySchema = new mongoose.Schema({
 // Create model from schema
 const BookingProperty = mongoose.model('BookingProperty', bookingPropertySchema);
 
-module.exports = BookingProperty;
+module.exports = BookingProperty;
+

package/src/models/bookingreservation.js

@@ -41,6 +41,11 @@ const bookingReservationSchema = new mongoose.Schema({
     checkoutDate: {
         type: Date
     },
+    // Flag to indicate checkout is pending finance approval
+    checkoutPending: {
+        type: Boolean,
+        default: false
+    },
     facilityId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Facility',
@@ -207,4 +212,5 @@ const bookingReservationSchema = new mongoose.Schema({
 // Create model from schema
 const BookingReservation = mongoose.model('BookingReservation', bookingReservationSchema);
 
-module.exports = BookingReservation;
+module.exports = BookingReservation;
+

package/src/models/cashpayment.js

@@ -5,6 +5,7 @@ const cashPaymentSchema = new mongoose.Schema(
         paymentReference: {
             type: String,
             required: true,
+            unique: true,
             trim: true
         },
         receiptNumber: {
@@ -27,6 +28,10 @@ const cashPaymentSchema = new mongoose.Schema(
             accountNumber: {
                 type: String,
                 trim: true
+            },
+            invoiceType: {
+                type: String,
+                trim: true
             }
         },
         client: {
@@ -89,7 +94,7 @@ const cashPaymentSchema = new mongoose.Schema(
         },
         paymentMethod: {
             type: String,
-            enum: ['cash', 'bank-transfer', 'cheque', 'mpesa'],
+            enum: ['cash', 'bank-transfer', 'cheque'],
             default: 'cash'
         },
         exchangeRate: {
@@ -261,4 +266,5 @@ cashPaymentSchema.pre('save', function (next) {
 // Create model (only if not already defined by getModel utility)
 const CashPayment = mongoose.models.CashPayment || mongoose.model('CashPayment', cashPaymentSchema);
 
-module.exports = CashPayment;
+module.exports = CashPayment;
+

package/src/models/handover.js

@@ -129,6 +129,15 @@ const handoverSchema = new mongoose.Schema({
         min: 0
       },
       description: String,
+      currencyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        default: null
+      },
+      currency: {
+        type: mongoose.Schema.Types.Mixed,
+        default: null
+      },
       invoiceId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Invoice',
@@ -245,4 +254,5 @@ handoverSchema.methods.compareWithMoveIn = async function() {
 // Create and export the model with the standard pattern
 const Handover = mongoose.model('Handover', handoverSchema);
 
-module.exports = Handover;
+module.exports = Handover;
+