payservedb 9.2.7 → 9.2.9

package/index.js

@@ -144,6 +144,7 @@ const models = {
   ExpenseCategory: require("./src/models/expense_category"),
   InvoiceSettings: require("./src/models/levy_invoice_settings"),
   DepositSchema: require("./src/models/levy_deposits"),
+  ContractPaymentReceiptSchema: require("./src/models/levy_payment_receipt"),
   Account: require("./src/models/account"),
   FacilityPaymentDetails: require("./src/models/facility_payment_details"),
   DefaultPaymentDetails: require("./src/models/default_payment_details"),

package/package.json

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

package/src/models/cashpayment.js

@@ -94,7 +94,7 @@ const cashPaymentSchema = new mongoose.Schema(
         },
         paymentMethod: {
             type: String,
-            enum: ['cash', 'bank-transfer', 'cheque','mpesa', 'withholding-tax', 'landlord-wallet'],
+            enum: ['cash', 'bank-transfer', 'cheque','mpesa', 'withholding-tax'],
             default: 'cash'
         },
         exchangeRate: {
@@ -287,4 +287,4 @@ 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/levy_payment_receipt.js

@@ -0,0 +1,157 @@
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const ContractPaymentReceiptSchema = new Schema(
+    {
+        contractId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'LevyContract',
+            required: [true, 'Contract ID is required']
+        },
+        customerId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Customer',
+            required: [true, 'Customer ID is required']
+        },
+        unitId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Unit',
+            required: [true, 'Unit ID is required']
+        },
+        facilityId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Facility',
+            required: [true, 'Facility ID is required']
+        },
+
+        receiptNumber: {
+            type: String,
+            required: [true, 'Receipt number is required'],
+            unique: true,
+            trim: true
+        },
+        paymentReference: {
+            type: String,
+            trim: true
+        },
+        datePaid: {
+            type: Date,
+            required: [true, 'Date paid is required']
+        },
+        paymentMethod: {
+            type: String,
+            trim: true
+            // e.g. 'mpesa', 'bank', 'cash' — not currently captured on the
+            // contract form, left optional until that's wired up
+        },
+
+        lineItems: [
+            {
+                lineType: {
+                    type: String,
+                    enum: ['Deposit', 'UpfrontPayment'],
+                    required: true
+                },
+                description: {
+                    type: String,
+                    required: true
+                },
+                quantity: {
+                    type: Number,
+                    default: 1
+                },
+                unitAmount: {
+                    type: Number,
+                    required: true,
+                    min: [0, 'Unit amount cannot be negative']
+                },
+                taxRate: {
+                    type: Number,
+                    default: 0
+                },
+                taxAmount: {
+                    type: Number,
+                    default: 0
+                },
+                lineTotal: {
+                    type: Number,
+                    required: true
+                },
+                depositId: {
+                    type: mongoose.Schema.Types.ObjectId,
+                    ref: 'Deposit'
+                }
+            }
+        ],
+
+        subTotal: {
+            type: Number,
+            required: true,
+            default: 0
+        },
+        taxTotal: {
+            type: Number,
+            required: true,
+            default: 0
+        },
+        totalCharges: {
+            type: Number,
+            required: true,
+            default: 0
+        },
+        amountPaid: {
+            type: Number,
+            required: true,
+            default: 0
+        },
+        balanceDue: {
+            type: Number,
+            required: true,
+            default: 0
+            // positive = still owed, negative = overpaid
+        },
+        overpaymentAmount: {
+            type: Number,
+            default: 0
+        },
+
+        createdBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        }
+    },
+    {
+        timestamps: true,
+        toJSON: { virtuals: true },
+        toObject: { virtuals: true }
+    }
+);
+
+ContractPaymentReceiptSchema.virtual('contract', {
+    ref: 'LevyContract',
+    localField: 'contractId',
+    foreignField: '_id',
+    justOne: true
+});
+
+ContractPaymentReceiptSchema.virtual('customer', {
+    ref: 'Customer',
+    localField: 'customerId',
+    foreignField: '_id',
+    justOne: true
+});
+
+ContractPaymentReceiptSchema.virtual('unit', {
+    ref: 'Unit',
+    localField: 'unitId',
+    foreignField: '_id',
+    justOne: true
+});
+
+ContractPaymentReceiptSchema.index({ facilityId: 1, receiptNumber: 1 });
+ContractPaymentReceiptSchema.index({ contractId: 1 });
+
+module.exports = {
+    schema: ContractPaymentReceiptSchema,
+    name: 'ContractPaymentReceipt'
+};

package/src/models/units.js

@@ -70,7 +70,24 @@ const unitSchema = new mongoose.Schema({
     moveInDescription: { type: String, default: null },
     moveInImages: { type: [String], default: [] },
     moveInAmenities: { type: [String], default: [] },
+    moveInLandmarks: { type: [String], default: [] },
+    moveInNearbyServices: { type: [String], default: [] },
+    moveInLocationAddress: { type: String, default: null },
+    moveInLocationCity: { type: String, default: null },
+    moveInLocationCounty: { type: String, default: null },
+    moveInCoordinates: {
+        lat: { type: Number, default: null },
+        lng: { type: Number, default: null },
+    },
     moveInApproval: { type: String, enum: ['pending', 'approved', 'rejected'], default: null, index: true },
+    moveInStatus: {
+        type: String,
+        enum: ['draft', 'pending_approval', 'approved_unlisted', 'listed', 'under_offer', 'reserved', 'rented', 'suspended'],
+        default: 'draft',
+        index: true,
+    },
+    moveInListingId: { type: mongoose.Schema.Types.ObjectId, default: null, index: true },
+    moveInLastSyncedAt: { type: Date, default: null },
     // ───────────────────────────────────────────────────────────────────────
 
     occupants: [
@@ -124,6 +141,7 @@ unitSchema.pre('save', function (next) {
 unitSchema.index({ name: 1 });
 unitSchema.index({ isManagedByPropertyManager: 1 });
 unitSchema.index({ isListedForBooking: 1 });
+unitSchema.index({ listedInMoveIn: 1, moveInApproval: 1 });
 
 // Compile the model from the schema
 const Unit = mongoose.model('Unit', unitSchema);