Dev

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml

@@ -45,7 +45,7 @@
                         </abp-column>
                         <abp-column size="_4">
                             <label for="@Model.TotalAmount" class="form-label unt-form-label-primary">@L["ApplicationPaymentRequest:TotalAmount"]</label>
-                            <input type="text" class="form-control totalAmount unity-currency-input" id="ApplicationCount" value="@Model.TotalAmount" disabled />
+                            <input type="text" class="form-control totalAmount unity-currency-input" id="UpdateTotalAmount" value="@Model.TotalAmount" disabled />
                         </abp-column>
                         <abp-column size="_4">
                             <label for="Note" class="form-label unt-form-label-primary">@L["ApplicationPaymentRequest:BatchNote"]</label>

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs

@@ -41,7 +41,7 @@ public class UpdatePaymentRequestStatus(
         public decimal TotalAmount { get; set; }
 
         [BindProperty]
-        public string Note { get; set; } = string.Empty;
+        public string? Note { get; set; } = string.Empty;
         public List<Guid> SelectedPaymentIds { get; set; } = new();
         public string FromStatusText { get; set; } = string.Empty;
 

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatusModal.js

@@ -1,10 +1,11 @@
+const upatePaymentNumberFormatter = createNumberFormatter();
 
 function removeApplicationPaymentApproval(applicationId, groupId) {
     let $container = $('#' + applicationId);
     $container.remove();
 
     $('#' + applicationId).remove();
-    let applicationCount = $('#ApplicationCount').val();
+    let applicationCount =  $('#ApplicationCount').val();
     let groupCount = $(`#${groupId}_count`).val();
     $(`#${groupId}_count`).val(groupCount - 1);
     $('#ApplicationCount').val(applicationCount - 1);
@@ -39,7 +40,7 @@ function removeApplicationPaymentApproval(applicationId, groupId) {
         $(`#${groupId}_container .payment-status-transition`).css("display", "none");
     }
 
-    calculateTotalAmount();
+    calculateUpdateTotalAmount();
 }
 
 function closePaymentModal() {
@@ -106,16 +107,15 @@ function getStatusText(data) {
     }
 }
 
-function calculateTotalAmount() {
+function calculateUpdateTotalAmount() {
     let total = 0;
     $('.amount').each(function () {
-        let value = parseFloat($(this).val().replace(/,/g, '')) || 0;
+        // Remove commas and $ symbols before parsing
+        let rawValue = $(this).val().replace(/[$,]/g, '');
+        let value = parseFloat(rawValue) || 0;
         total += value;
+        this.value = upatePaymentNumberFormatter.format(value);
     });
-    $('.totalAmount').val(total.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 }));
+    let totalFormatted = upatePaymentNumberFormatter.format(total);
+    $('#UpdateTotalAmount').val(totalFormatted);
 }
-
-
-
-
-

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/CreatePaymentRequests.cshtml

@@ -27,7 +27,7 @@
                         </abp-column>
                         <abp-column size="_4">
                             <label for="@Model.TotalAmount" class="form-label unt-form-label-primary">@L["ApplicationPaymentRequest:TotalAmount"]</label>
-                            <input type="text" class="form-control totalAmount unity-currency-input" id="ApplicationCount" value="@Model.TotalAmount" disabled />
+                            <input type="text" class="form-control unity-currency-input" id="TotalAmount" value="@Model.TotalAmount" disabled />
                         </abp-column>
                     </abp-row>
                 </abp-card-body>

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/CreatePaymentRequestsModal.js

@@ -1,3 +1,4 @@
+let createPaymentNumberFormatter = createNumberFormatter();
 
 function removeApplicationPaymentRequest(applicationId) {
     let $container = $('#' + applicationId);
@@ -61,5 +62,7 @@ function calculateTotalAmount() {
         let value = parseFloat($(this).val().replace(/,/g, '')) || 0;
         total += value;
     });
-    $('.totalAmount').val(total.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 }));
-}
+
+    let totalFormatted = createPaymentNumberFormatter.format(total);
+   $('#TotalAmount').val(totalFormatted);
+}

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js

@@ -32,6 +32,10 @@ $(function () {
         viewUrl: 'PaymentApprovals/UpdatePaymentRequestStatus',
     });
 
+    paymentRequestStatusModal.onOpen(function () {
+        calculateUpdateTotalAmount();
+    });
+
     let selectedPaymentIds = [];
 
     let actionButtons = [
@@ -719,7 +723,6 @@ $(function () {
 
 });
 
-
 let casPaymentResponseModal = new abp.ModalManager({
     viewUrl: '../PaymentRequests/CasPaymentRequestResponse'
 });

applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/ActionBar.cs

@@ -43,8 +43,6 @@ public override void ConfigureBundle(BundleConfigurationContext context)
               .AddIfNotContains("/Pages/PaymentRequests/CreatePaymentRequestsModal.js");
             context.Files
               .AddIfNotContains("/libs/jquery-maskmoney/dist/jquery.maskMoney.min.js");
-            context.Files
-              .AddIfNotContains("/Pages/PaymentApprovals/UpdatePaymentRequestStatusModal.js");
             context.Files
               .AddIfNotContains("/Pages/BulkApprovals/ApproveApplicationsModal.js");
         }

applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.js

@@ -329,7 +329,11 @@ $(function () {
             'The application/s payment request has been successfully submitted.',
             'Payment'
         );
-        PubSub.publish("refresh_application_list");
+        PubSub.publish("refresh_application_list");        
     });
+
+    applicationPaymentRequestModal.onOpen(function () {
+        calculateTotalAmount();     
+    });    
 });