Browse Source

Merge branch 'dev' into dev-vj

Vijayakrishnan 3 years ago
parent
commit
7730d39c4b

+ 2 - 2
resources/views/app/practice-management/pro-financials.blade.php

@@ -119,7 +119,7 @@
 
 
                                                         <div class="form-group">
                                                         <div class="form-group">
                                                             <label for="" class="control-label">Amount</label>
                                                             <label for="" class="control-label">Amount</label>
-                                                            <input type="number" stype=".01"  name="debitDebitProAmount" class="form-control input-sm">
+                                                            <input type="number" step=".01"  name="debitDebitProAmount" class="form-control input-sm">
                                                         </div>
                                                         </div>
                                                         
                                                         
                                                         <div class="mb-0">
                                                         <div class="mb-0">
@@ -136,7 +136,7 @@
                                                         
                                                         
                                                         <div class="form-group">
                                                         <div class="form-group">
                                                             <label for="" class="control-label">Amount</label>
                                                             <label for="" class="control-label">Amount</label>
-                                                            <input type="number" stype=".01"  name="differentDebitProAmount" class="form-control input-sm">
+                                                            <input type="number" step=".01"  name="differentDebitProAmount" class="form-control input-sm">
                                                         </div>
                                                         </div>
                                                         
                                                         
                                                         <div class="mb-0">
                                                         <div class="mb-0">

+ 6 - 2
resources/views/app/stat-tree/stat-trees/sub/dashboard.blade.php

@@ -7,7 +7,10 @@
         <div class="d-flex align-items-center justify-content-between mb-2">
         <div class="d-flex align-items-center justify-content-between mb-2">
             <h6 class="font-weight-bold">Lines</h6>
             <h6 class="font-weight-bold">Lines</h6>
             <div>
             <div>
-                <a href="#" @click="refreshTreeCountQueries" class="btn btn-sm btn-danger text-white"><i class="fas fa-sync-alt"></i> Refresh Counts</a>
+                <a href="#" @click="refreshTreeCountQueries" class="btn btn-sm btn-danger text-white">
+                <span v-if="!refreshing"><i class="fas fa-sync-alt"></i> Refresh Counts</span> 
+                <span v-else><i class="fas fa-circle-notch fa-spin"></i> Refreshing...</span> 
+                </a>
             </div>
             </div>
         </div>
         </div>
         <div class="table-responsive">
         <div class="table-responsive">
@@ -202,7 +205,8 @@
                 }, function(response) {
                 }, function(response) {
                     self.refreshing = false;
                     self.refreshing = false;
                     if (response.success) {
                     if (response.success) {
-                        location.href = "{{ route('practice-management.statTrees.view.dashboard', $statTree) }}";
+                        // location.href = "{{ route('practice-management.statTrees.view.dashboard', $statTree) }}";
+                        location.reload();
                     } else {
                     } else {
                         toastr.error(response.message);
                         toastr.error(response.message);
                     }
                     }