vr-commons 1.0.139 → 1.0.140

package/dist/utils/admin.devicePayment.utils.d.ts

@@ -37,10 +37,12 @@ export declare const DPP_OperationsUtil: {
     };
     /**
      * Generate installments for a hire purchase plan
+     * ✅ Updated to use unitPrice and create one installment at a time
      */
     generateInstallments(plan: DevicePaymentPlan, transaction?: Transaction): Promise<void>;
     /**
      * Format plan for operation response
+     * ✅ Updated to use unitPrice and totalAmount
      */
     formatPlanForOps(plan: DevicePaymentPlan | null): any;
 };

package/dist/utils/admin.devicePayment.utils.js

@@ -75,7 +75,7 @@ exports.DPP_OperationsUtil = {
         }
         // For now, require exact installment amount
         // Could be modified to allow overpayment later
-        if (amount !== nextInstallment.amount) {
+        if (amount !== Number(nextInstallment.amount)) {
             return {
                 valid: false,
                 reason: `Payment amount must equal the next installment amount of ${nextInstallment.amount}`,
@@ -88,12 +88,13 @@ exports.DPP_OperationsUtil = {
      * Calculate new values after payment
      */
     calculatePaymentEffects(plan, amount) {
-        const newPaidAmount = plan.paidAmount + amount;
-        const newOutstandingAmount = Math.max(0, plan.outstandingAmount - amount);
+        // ✅ Use plan.totalAmount instead of pricingSnapshot.totalAmount
+        const totalAmount = Number(plan.totalAmount) || 0;
+        const newPaidAmount = Number(plan.paidAmount) + amount;
+        const newOutstandingAmount = Math.max(0, totalAmount - newPaidAmount);
         const wasCompleted = plan.status === "COMPLETED";
         const isNowCompleted = newOutstandingAmount <= 0;
-        const totalAmount = plan.pricingSnapshot.totalAmount;
-        const progress = (newPaidAmount / totalAmount) * 100;
+        const progress = totalAmount > 0 ? (newPaidAmount / totalAmount) * 100 : 0;
         return {
             newPaidAmount,
             newOutstandingAmount,
@@ -104,6 +105,7 @@ exports.DPP_OperationsUtil = {
     },
     /**
      * Generate installments for a hire purchase plan
+     * ✅ Updated to use unitPrice and create one installment at a time
      */
     async generateInstallments(plan, transaction) {
         const pricing = plan.pricingSnapshot;
@@ -112,7 +114,10 @@ exports.DPP_OperationsUtil = {
         }
         const InstallmentModel = vr_models_1.Installment;
         const installments = [];
-        const dueDate = new Date(); // First installment due after creation
+        // ✅ Get device count from plan
+        const deviceCount = plan.devices?.length || 1;
+        const installmentAmount = Number(pricing.installmentAmount) * deviceCount;
+        const dueDate = new Date();
         if (pricing.installmentFrequency === "DAILY") {
             dueDate.setDate(dueDate.getDate() + 1);
         }
@@ -122,33 +127,29 @@ exports.DPP_OperationsUtil = {
         else if (pricing.installmentFrequency === "MONTHLY") {
             dueDate.setMonth(dueDate.getMonth() + 1);
         }
-        for (let i = 1; i <= pricing.installmentCount; i++) {
-            installments.push({
-                devicePaymentPlanId: plan.id,
-                installmentNumber: i,
-                amount: Number(pricing.installmentAmount),
-                dueDate: new Date(dueDate),
-                status: "PENDING",
-                isAutoGenerated: true,
-            });
-            // Calculate next due date
-            if (pricing.installmentFrequency === "DAILY") {
-                dueDate.setDate(dueDate.getDate() + 1);
-            }
-            else if (pricing.installmentFrequency === "WEEKLY") {
-                dueDate.setDate(dueDate.getDate() + 7);
-            }
-            else if (pricing.installmentFrequency === "MONTHLY") {
-                dueDate.setMonth(dueDate.getMonth() + 1);
-            }
-        }
-        await InstallmentModel.bulkCreate(installments, { transaction });
+        // ✅ Create only the first installment (not all at once)
+        const firstInstallment = {
+            devicePaymentPlanId: plan.id,
+            installmentNumber: 1,
+            amount: installmentAmount,
+            paidAmount: 0.0,
+            dueDate: new Date(dueDate),
+            status: "PENDING",
+            isAutoGenerated: true,
+            metadata: {
+                totalInstallments: pricing.installmentCount,
+                remainingInstallments: pricing.installmentCount - 1,
+                createdAt: new Date().toISOString(),
+            },
+        };
+        await InstallmentModel.create(firstInstallment, { transaction });
         // Set the first installment as next due
-        plan.nextInstallmentDueAt = installments[0]?.dueDate || null;
+        plan.nextInstallmentDueAt = firstInstallment.dueDate;
         await plan.save({ transaction });
     },
     /**
      * Format plan for operation response
+     * ✅ Updated to use unitPrice and totalAmount
      */
     formatPlanForOps(plan) {
         if (!plan)
@@ -158,6 +159,7 @@ exports.DPP_OperationsUtil = {
             id: plan.id,
             userId: plan.userId,
             pricingSnapshot: plan.pricingSnapshot,
+            totalAmount: plan.totalAmount, // ✅ Added
             paidAmount: plan.paidAmount,
             outstandingAmount: plan.outstandingAmount,
             lastPaymentAt: plan.lastPaymentAt,
@@ -170,21 +172,27 @@ exports.DPP_OperationsUtil = {
             user: plan.user || null,
             installments: plan.installments || [],
         };
-        const totalAmount = planData.pricingSnapshot?.totalAmount || 0;
+        // ✅ Use plan.totalAmount instead of pricingSnapshot.totalAmount
+        const totalAmount = Number(planData.totalAmount) || 0;
         const hasInstallments = (planData.installments?.length ?? 0) > 0;
         return {
             id: planData.id,
             userId: planData.userId,
             pricingSnapshot: {
+                id: planData.pricingSnapshot?.id || null,
+                name: planData.pricingSnapshot?.name || null,
                 type: planData.pricingSnapshot?.type || null,
-                totalAmount: planData.pricingSnapshot?.totalAmount || 0,
+                unitPrice: planData.pricingSnapshot?.unitPrice || 0, // ✅ Changed from totalAmount
                 downPayment: planData.pricingSnapshot?.downPayment || 0,
                 installmentAmount: planData.pricingSnapshot?.installmentAmount || null,
                 installmentFrequency: planData.pricingSnapshot?.installmentFrequency || null,
                 installmentCount: planData.pricingSnapshot?.installmentCount || null,
                 gracePeriodDays: planData.pricingSnapshot?.gracePeriodDays || 2,
                 autoLockOnMiss: planData.pricingSnapshot?.autoLockOnMiss ?? true,
+                minOrderQuantity: planData.pricingSnapshot?.minOrderQuantity || 1,
+                maxOrderQuantity: planData.pricingSnapshot?.maxOrderQuantity || 1,
             },
+            totalAmount: totalAmount, // ✅ Added
             paidAmount: planData.paidAmount || 0,
             outstandingAmount: planData.outstandingAmount || 0,
             lastPaymentAt: planData.lastPaymentAt,
@@ -196,9 +204,9 @@ exports.DPP_OperationsUtil = {
             devices: planData.devices || [],
             user: planData.user || null,
             installments: planData.installments || [],
-            progress: totalAmount > 0 ? (plan.paidAmount / totalAmount) * 100 : 0,
-            canEdit: plan.paidAmount === 0,
-            canDelete: plan.paidAmount === 0,
+            progress: totalAmount > 0 ? (Number(plan.paidAmount) / totalAmount) * 100 : 0,
+            canEdit: Number(plan.paidAmount) === 0,
+            canDelete: Number(plan.paidAmount) === 0,
             isOverdue: false,
             hasInstallments,
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vr-commons",
-  "version": "1.0.139",
+  "version": "1.0.140",
   "description": "Shared functions package",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",