cloud-ide-fees 0.0.37 → 0.0.41

package/fesm2022/{cloud-ide-fees-cloud-ide-fees-DiELXkPH.mjs → cloud-ide-fees-cloud-ide-fees-Cyb9Q9l7.mjs}

@@ -117,7 +117,7 @@ const feesRoutes = [
     // Discount & Scholarship Management
     {
         path: 'discounts',
-        loadComponent: () => import('./cloud-ide-fees-discount-rule-manager.component-CGWOUR49.mjs').then(c => c.DiscountRuleManagerComponent),
+        loadComponent: () => import('./cloud-ide-fees-discount-rule-manager.component-CTgMTze9.mjs').then(c => c.DiscountRuleManagerComponent),
         title: 'Discount Rules Management',
         canActivate: [authGuard],
         data: { sypg_page_code: "fee_discount_rule" }
@@ -4230,7 +4230,22 @@ class FeeDetailsViewerComponent {
                 // We have a name but no ID object, that's fine, logic later handles name only
             }
         }
-        const finalAmount = (fee.fees_total_amount || fee.fees_amount || 0) - (this.discount || fee.discount || 0) - (this.scholarship || fee.scholarship || 0);
+        // Final amount logic: prioritize total_amount, then base amount minus discounts
+        const totalBase = Number(fee.fees_total_amount) || Number(fee.fees_amount) || 0;
+        const discountVal = Number(this.discount) || Number(fee.discount) || 0;
+        const scholarshipVal = Number(this.scholarship) || Number(fee.scholarship) || 0;
+        // If we have fees_total_amount, assume it's already net of discounts (common in assignments)
+        // Otherwise, calculate net amount
+        let finalAmount = 0;
+        if (Number(fee.fees_total_amount) > 0) {
+            finalAmount = Number(fee.fees_total_amount);
+        }
+        else {
+            finalAmount = Math.max(0, totalBase - discountVal - scholarshipVal);
+        }
+        // Double check that finalAmount is not NaN
+        if (isNaN(finalAmount))
+            finalAmount = 0;
         // Ensure assignmentDate is a Date object
         let assignmentDate;
         try {
@@ -4265,7 +4280,8 @@ class FeeDetailsViewerComponent {
     }
     processFeeAssignmentData(assignment) {
         // Transform assignment data to fee details format
-        const finalAmount = assignment.feeas_final_amount || assignment.feeas_total_amount || 0;
+        const totalAmount = Number(assignment.feeas_total_amount) || Number(assignment.feeas_final_amount) || Number(assignment.feeas_original_amount) || 0;
+        const finalAmount = totalAmount;
         // Ensure assignmentDate is a Date object
         let assignmentDate;
         try {
@@ -4316,10 +4332,10 @@ class FeeDetailsViewerComponent {
                 ? assignment.feeas_fee_structure_id_feest?.fees_structure_name
                 : assignment.fee_structure_name || 'Custom Fee',
             fees_category_name: assignment.feeas_fee_category_sygms || 'N/A',
-            fees_amount: assignment.feeas_original_amount || 0,
-            fees_total_amount: assignment.feeas_original_amount || 0,
-            discount: assignment.feeas_discount_amount || 0,
-            scholarship: assignment.feeas_scholarship_amount || 0,
+            fees_amount: Number(assignment.feeas_original_amount) || 0,
+            fees_total_amount: totalAmount,
+            discount: Number(assignment.feeas_discount_amount) || 0,
+            scholarship: Number(assignment.feeas_scholarship_amount) || 0,
             finalAmount: finalAmount,
             _feeItemData: itemData,
             _feeAssignmentData: assignment
@@ -4327,7 +4343,8 @@ class FeeDetailsViewerComponent {
         this.calculateAndSetFeeDetails(itemData, feeData, finalAmount, assignmentDate);
     }
     processFeeItemData(item, structure) {
-        const finalAmount = (item.feesi_amount || 0) - (this.discount || 0) - (this.scholarship || 0);
+        const totalAmount = Number(item.feesi_amount) || 0;
+        const finalAmount = totalAmount - (Number(this.discount) || 0) - (Number(this.scholarship) || 0);
         // Ensure assignmentDate is a Date object
         let assignmentDate;
         try {
@@ -4352,10 +4369,10 @@ class FeeDetailsViewerComponent {
             fees_category_name: typeof item.feesi_category_id_sygms === 'object'
                 ? item.feesi_category_id_sygms?.sygms_title || 'N/A'
                 : 'N/A',
-            fees_amount: item.feesi_amount || 0,
-            fees_total_amount: item.feesi_amount || 0,
-            discount: this.discount,
-            scholarship: this.scholarship,
+            fees_amount: Number(item.feesi_amount) || 0,
+            fees_total_amount: totalAmount,
+            discount: Number(this.discount) || 0,
+            scholarship: Number(this.scholarship) || 0,
             finalAmount: finalAmount,
             _feeItemData: item
         };
@@ -5428,7 +5445,6 @@ class FeeApplicableFeesComponent {
         // Cap at fee amount
         discountAmount = Math.min(discountAmount, feeAmount);
         const discountData = {
-            fee_id: feeId,
             discount_type: data.discount_type,
             discount_value: data.discount_value,
             discount_amount: discountAmount,
@@ -5451,7 +5467,6 @@ class FeeApplicableFeesComponent {
         // Cap at fee amount (considering discount?) 
         scholarshipAmount = Math.min(scholarshipAmount, feeAmount);
         const scholarshipData = {
-            fee_id: feeId,
             scholarship_type_id: data.scholarship_type_id,
             scholarship_category: data.scholarship_category,
             scholarship_percentage: data.scholarship_percentage,
@@ -11268,4 +11283,4 @@ var myOnlinePayment_component = /*#__PURE__*/Object.freeze({
  */
 
 export { CideFeeDiscountRuleService as C, DiscountRulesComponent as D, FeeStructureListComponent as F, MyFeeStatementComponent as M, ReceiptTemplateService as R, StudentSelectionWrapperComponent as S, TemplateDesignerComponent as T, CloudIdeFees as a, CideFeeFeeStructureService as b, FeeStructureCreateComponent as c, CideFeeFeeAssignmentService as d, FeeAssignmentListComponent as e, feesRoutes as f, FeeAssignmentCreateComponent as g, CideFeeFeePaymentService as h, FeePaymentListComponent as i, FeePaymentProcessComponent as j, FeePaymentViewComponent as k, CollectionReportComponent as l, MyOnlinePaymentComponent as m, FeeDetailsViewerComponent as n, FeeApplicableFeesComponent as o };
-//# sourceMappingURL=cloud-ide-fees-cloud-ide-fees-DiELXkPH.mjs.map
+//# sourceMappingURL=cloud-ide-fees-cloud-ide-fees-Cyb9Q9l7.mjs.map