Fix code

TariffCollectionBase.cs TariffCollectionView.razor No Finish
wsmcbl · Jun 27, 2024 · bfa9f64 · bfa9f64
1 parent d228e21
commit bfa9f64
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@
 .idea/
 obj/
 bin/Debug/
+wsmcbl.front.csproj.user
 *.user
diff --git a/Accounting/TariffCollection/TariffCollectionBase.cs b/Accounting/TariffCollection/TariffCollectionBase.cs
@@ -74,7 +74,7 @@ protected override async Task OnParametersSetAsync()
         debtTariffs = new List<Tariff>();
         foreach (var item in fullTariffs)
         {
-            if (item.Type != 1)
+            if (item.Type != 1)//Fix 
             {
                 continue;
             }
@@ -105,16 +105,8 @@ protected void OnSelectItemChanged(ChangeEventArgs e, Tariff tariff)
         {
             if (!selectedTariffs.Contains(tariff))
             {
+                subtotal = getTotal(tariff);
                 selectedTariffs.Add(tariff);
-                subtotal = subtotal + tariff.Amount;
-
-                var discountAmount = tariff.Amount * student.discount;
-                discount += tariff.Amount - discountAmount;
-
-                if (tariff.IsLate)
-                {
-                    arrears += tariff.Amount * taxArrears;
-                }
             }
         }
         else
@@ -123,7 +115,7 @@ protected void OnSelectItemChanged(ChangeEventArgs e, Tariff tariff)
             {
                 selectedTariffs.Remove(tariff);
                 subtotal = subtotal - tariff.Amount;
-                discount -= student.discount;
+                discount = 0;
 
                 if (tariff.IsLate)
                 {
@@ -132,6 +124,25 @@ protected void OnSelectItemChanged(ChangeEventArgs e, Tariff tariff)
             }
         }
     }
+    private double getTotal(Tariff item)
+    {
+        var total = 0.0;
+        var arrear = 0.0;
+
+        if(student.paymentHistory.Any(t => t.TariffId == item.TariffId && t.DebtBalance > 0)) //Existe un abono?
+        {
+            item.Amount = student.paymentHistory.First(t => t.TariffId == item.TariffId && t.DebtBalance > 0).DebtBalance;
+            total = item.Amount;
+            arrear = 1;
+        }
+        else
+        {
+            total = item.Amount * (1 - student.discount);
+            arrear = (item.IsLate) ? (1 + taxArrears) : 1;
+        }
+
+        return Math.Round(total * arrear);
+    }
     protected void DistributePay()
     {
         if (amountToDivide <= 0)
@@ -154,14 +165,6 @@ protected void DistributePay()
             }
         }
     }
-
-    private double getTotal(Tariff item)
-    {
-        var total = item.Amount * (1 - student.discount);
-        var arrear = (item.IsLate) ? (1 + taxArrears) : 1;
-        return Math.Round(total * arrear);
-    }
-
     protected async Task Pay()
     {
         controller.addDetail(selectedTariffs, applyArear);
@@ -178,7 +181,6 @@ protected async Task Pay()
             await alertService.AlertError("¡Error en el Pago!", "La transacción no se completó correctamente.");
         }
     }
-
     protected async Task ConfirmTransaction()
     {
         if (selectedTariffs.Count == 0)
@@ -192,8 +194,6 @@ protected async Task ConfirmTransaction()
             await JSRuntime.InvokeVoidAsync("showModal", "finistariff");
         }
     }
-
-
     protected void ReloadPage()
     {
         navigationManager.NavigateTo(navigationManager.Uri, forceLoad: true);

diff --git a/Accounting/TariffCollection/TariffCollectionView.razor b/Accounting/TariffCollection/TariffCollectionView.razor
@@ -46,11 +46,21 @@ else
                         <td>@item.TariffId</td>
                         <td>@item.SchoolYear</td>
                         <td>@item.Concept</td>
-                        <td>@item.Amount</td>
+                        <td>
+                            @if(student.paymentHistory.Any(t => t.TariffId == item.TariffId && t.DebtBalance > 0))
+                            {
+                                var amount = student.paymentHistory.First(t => t.TariffId == item.TariffId && t.DebtBalance > 0).DebtBalance;
+                                @amount
+                            }
+                            else
+                            {
+                                @item.Amount
+                            }
+                        </td>
                         <td>@item.IsLate</td>
                         <td>@item.DueDate</td>
                         <td>
-                            @if (student.paymentHistory.Any(t => t.DebtBalance == 0))
+                            @if (student.paymentHistory.Any(t => t.TariffId == item.TariffId && t.DebtBalance == 0))
                             {
                                 <button type="button" class="btn btn-danger btn-sm " disabled>
                                     Pagado
@@ -311,19 +321,12 @@ else
                                     <tr>
                                         <td>@item.Concept</td>
                                         <td>@item.Amount</td>
-                                        <td>
-                                            @{
-                                                var discountAmount = item.Amount * student.discount;
-                                                var total = item.Amount - discountAmount;
-                                                @total
-                                            }
-                                        </td>
-
+                                        <td>@(student.discount*100)%</td>
                                         @if (item.IsLate)
                                         {
                                             <td>
                                                 @{
-                                                    var mora = (discountAmount * taxArrears);
+                                                    var mora = (item.Amount * taxArrears);
                                                     @mora
                                                 }
                                             </td>