payservedb 8.6.6 → 8.6.8

package/package.json

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

package/src/models/bookingreservation.js

@@ -27,6 +27,15 @@ const bookingReservationSchema = new mongoose.Schema({
         reason: {
             type: String
         },
+        status: {
+            type: String,
+            enum: ['Unpaid', 'Partially Paid', 'Paid'],
+            default: 'Unpaid'
+        },
+        paidAmount: {
+            type: Number,
+            default: 0
+        },
         addedAt: {
             type: Date,
             default: Date.now
@@ -195,7 +204,21 @@ const bookingReservationSchema = new mongoose.Schema({
     cancellationDetails: {
         date: Date,
         reason: String,
-        refundAmount: Number
+        refundAmount: Number,
+        refundStatus: {
+            type: String,
+            enum: ["Pending", "Approved", "Rejected"],
+            default: "Pending"
+        },
+        refundPaymentId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: "CashPayment"
+        },
+        refundReference: String,
+        refundRequestedAt: Date,
+        refundApprovedAt: Date,
+        refundRejectedAt: Date,
+        refundRejectionReason: String
     },
     createdBy: {
         type: mongoose.Schema.Types.ObjectId,

package/src/models/cashpayment.js

@@ -160,6 +160,27 @@ const cashPaymentSchema = new mongoose.Schema(
             notes: String
         },
         paymentNotes: String,
+        isRefund: {
+            type: Boolean,
+            default: false
+        },
+        refundDetails: {
+            reservationId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: "BookingReservation",
+                default: null
+            },
+            bookingReservationId: {
+                type: String,
+                default: null
+            },
+            bookingInvoiceId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: "BookingInvoice",
+                default: null
+            },
+            reason: String
+        },
         attachments: [
             {
                 fileId: mongoose.Schema.Types.ObjectId,

package/src/models/combined_invoice.js

@@ -147,7 +147,7 @@ const combinedInvoiceSchema = new mongoose.Schema(
         type: {
           type: String,
           required: true,
-          enum: ["levy", "lease", "water", "service", "utility", "other"],
+          enum: ["levy", "lease", "water", "service", "utility", "contract"],
         },
         description: {
           type: String,