payservedb 8.9.2 → 8.9.4

package/package.json

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

package/src/models/invoice.js

@@ -78,6 +78,13 @@ const invoiceSchema = new mongoose.Schema(
       type: Number,
       required: true,
     },
+    taxes: [
+      {
+        name: { type: String, required: true },  // e.g. "VAT", "Withholding Tax"
+        percentage: { type: Number, required: true },  // e.g. 16
+        amount: { type: Number, required: true },  // e.g. 160.00  (subTotal * percentage / 100)
+      },
+    ],
     totalAmount: {
       type: Number,
       required: true,
@@ -462,6 +469,13 @@ invoiceSchema.statics.findFailedTaxSync = function (facilityId) {
 
 // Pre-save middleware to ensure overpay and balanceBroughtForward stay in sync during transition
 invoiceSchema.pre("save", function (next) {
+
+  if (this.taxes && this.taxes.length > 0) {
+    this.tax = Math.round(
+      this.taxes.reduce((sum, t) => sum + (t.amount || 0), 0) * 100
+    ) / 100;
+  }
+
   // If balanceBroughtForward is negative (credit), sync with overpay for backwards compatibility
   if (this.balanceBroughtForward < 0) {
     this.overpay = Math.abs(this.balanceBroughtForward);

package/src/models/levy.js

@@ -98,24 +98,20 @@ const levySchema = new mongoose.Schema(
         debit: {
           type: mongoose.Schema.Types.ObjectId,
           ref: "GLAccount",
-          required: true,
         },
         credit: {
           type: mongoose.Schema.Types.ObjectId,
           ref: "GLAccount",
-          required: true,
         }
       },
       payment: {
         debit: {
           type: mongoose.Schema.Types.ObjectId,
           ref: "GLAccount",
-          required: true,
         },
         credit: {
           type: mongoose.Schema.Types.ObjectId,
           ref: "GLAccount",
-          required: true,
         }
       }
     },
@@ -190,13 +186,6 @@ levySchema.pre('save', function (next) {
     return next(error);
   }
 
-  // Validate GL accounts
-  if (!this.glAccounts?.invoice?.debit || !this.glAccounts?.invoice?.credit ||
-    !this.glAccounts?.payment?.debit || !this.glAccounts?.payment?.credit) {
-    const error = new Error('All GL accounts (invoice and payment, debit and credit) are required');
-    return next(error);
-  }
-
   next();
 });