kaui 4.0.3 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7cbe8cab6b7967577eb779077021684be2ca3dce7e68bc12fa8c8cbfc14fcf4
-  data.tar.gz: e30c6f225929c287c251874fc22fd66cf25e71177efcc251a5c2842671b87024
+  metadata.gz: 68c8619a8002b5eccb52c3e514b3eaa09c6360c76fb7655305ef38d8a8bd9389
+  data.tar.gz: 2558a2c5362f1547e269bcae07aff1b533854c8dbcead9d81e278f379a62302e
 SHA512:
-  metadata.gz: dc2a8a66d733b76cab4e92be0b9351e6d4f36831463ed4f8e4e6e83cbfd0a3d0c888cbc5978ee9811713ea36bd9a57f4a063eda25141cdeec0383fd2734d1659
-  data.tar.gz: ddad13b0ee0fe86eafd53b705a1b220acff07215826ee3483d6ddc7b164a0e3a7b7c8308edc7df55f8455b7337bbff884ad559f8f52078fdce086b375e77bbd0
+  metadata.gz: ab1dec602fc6943ce1994f7c080ab659e3b40568855ce480237760da4c983780a9e17b30ab2843925adcb29e85119606b59b6cd0bbb26ffdf708ba1f4c99abdd
+  data.tar.gz: fbbf245fd6e028b9d898b4bfe662202222fbd9bc2f0818fc8b582dfb8401ad343a12c8aa86a46044b846866c8f3b76071d7282b2a52cfc77ebe69f4332df4ebb

data/app/assets/javascripts/kaui/kaui_override.js

@@ -556,7 +556,7 @@ function showCustomTooltip(element, objectId) {
   // Set 5-second auto-hide timer
   window.tooltipAutoHideTimeout = setTimeout(function () {
     hideCustomTooltip();
-  }, 5000); // 5 seconds
+  }, 3000); // 3 seconds
 }
 
 function showObjectIdTooltip(element, objectId) {

data/app/controllers/kaui/account_timelines_controller.rb

@@ -72,7 +72,7 @@ module Kaui
       @selected_bundle = params.key?(:external_key) ? @bundle_names[params[:external_key]] : nil
 
       csv_string = CSV.generate(headers: true) do |csv|
-        csv << ['Effective Date', 'Bundles', 'Even Type', 'Details', 'Reason Code/ Comments']
+        csv << ['Effective Date', 'Bundles', 'Event Type', 'Details', 'Reason Code/ Comments']
         if %w[INVOICE ALL].include?(event_type)
           @invoices.each do |invoice_stub|
             invoice = invoice_stub.invoice_id.present? && @invoices_by_id.key?(invoice_stub.invoice_id) ? @invoices_by_id[invoice_stub.invoice_id] : invoice_stub
@@ -97,7 +97,7 @@ module Kaui
                       end
 
             payment.transactions.each do |transaction|
-              effective_date = transaction.effective_date.present? ? transaction.effective_date : '[unknown]'
+              effective_date = transaction.effective_date.present? ? Date.parse(transaction.effective_date).to_s : '[unknown]'
               bundle_keys = @bundle_keys_by_invoice_id[payment.target_invoice_id].present? ? @bundle_keys_by_invoice_id[payment.target_invoice_id].map { |bundle_key| @bundle_names[bundle_key] }.join(', ') : ''
               transaction_type = transaction.transaction_type
               details = []
@@ -120,7 +120,7 @@ module Kaui
                 # Skip SERVICE_STATE_CHANGE events
                 next if event.event_type == 'SERVICE_STATE_CHANGE'
 
-                effective_date = event.effective_date.present? ? event.effective_date : '[unknown]'
+                effective_date = event.effective_date.present? ? Date.parse(event.effective_date).to_s : '[unknown]'
                 bundle_keys = @bundle_names[bundle.external_key]
                 event_type = event.event_type
                 phase = event.phase

data/app/controllers/kaui/home_controller.rb

@@ -14,7 +14,7 @@ module Kaui
       @max_records = {}
       %w[account payment invoice].each do |type|
         model = "Kaui::#{type.capitalize}".constantize
-        @max_records[type.to_sym] = model.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records || 0
+        @max_records[type.to_sym] = model.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records
       end
     end
 

data/app/controllers/kaui/invoices_controller.rb

@@ -36,6 +36,15 @@ module Kaui
                    Kaui::Invoice.list_or_search(query_string, 0, MAXIMUM_NUMBER_OF_RECORDS_DOWNLOAD, options_for_klient.merge(params: kb_params))
                  end
 
+      if start_date && end_date
+        invoices = invoices.select do |invoice|
+          start_date_parsed = Date.parse(start_date)
+          end_date_parsed = Date.parse(end_date)
+          invoice_date = Date.parse(invoice.invoice_date)
+          invoice_date.between?(start_date_parsed, end_date_parsed)
+        end
+      end
+
       csv_string = CSV.generate(headers: true) do |csv|
         csv << columns
 

data/app/controllers/kaui/payments_controller.rb

@@ -44,7 +44,7 @@ module Kaui
       account = account_id.present? ? Kaui::Account.find_by_id_or_key(account_id, false, false, options_for_klient) : nil
 
       payments = if account_id.present? && query_string.blank?
-                   Kaui::Account.paginated_payments(account_id, nil, nil, 'NONE', options_for_klient).map! { |payment| Kaui::Payment.build_from_raw_invoice(payment) }
+                   Kaui::Payment.list_or_search(account_id, 0, MAXIMUM_NUMBER_OF_RECORDS_DOWNLOAD, options_for_klient.merge(params: kb_params))
                  else
                    Kaui::Payment.list_or_search(query_string, 0, MAXIMUM_NUMBER_OF_RECORDS_DOWNLOAD, options_for_klient.merge(params: kb_params))
                  end

data/app/helpers/kaui/plugin_helper.rb

@@ -24,10 +24,12 @@ module Kaui
                         '/kenui'
                       when /payment-test/
                         '/payment_test'
+                      when /aviate/
+                        '/aviate'
                       else
                         "/#{plugin_key}"
                       end
-        plugin_path = nil unless CONFIGABLE_PLUGINS.include?(plugin_key)
+        plugin_path = nil unless CONFIGABLE_PLUGINS.map { |key| plugin_key.include?(key) }.any?
         plugins << { name: plugin_name, path: plugin_path } if plugin_path
       end
       plugins

data/app/views/kaui/account_timelines/_multi_functions_bar.html.erb

@@ -43,7 +43,7 @@
                         <path d="M2.5 8.3335H17.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
                       </svg>
                     </label>
-                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Accounts" name="startDate">
+                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Account Timelines" name="startDate">
                     <div id="dash" class="dash">–</div>
                     <input type="text" class="form-control right-input" id="endDate" placeholder="" name="endDate">
                     <div id="toggle-wrapper" class="position-absolute" style="width: 100%; height: 100%;" onclick="document.getElementById('single-toggle').click()"></div>
@@ -67,7 +67,7 @@
                   <div class="fake-select-dropdown">
                     <label class="fake-select-option">
                       <input type="radio" name="download_option" id="allData" />
-                      <span>All accounts</span>
+                      <span>All account data</span>
                     </label>
 
                     <label class="fake-select-option">

data/app/views/kaui/accounts/_billing_details.html.erb

@@ -117,12 +117,10 @@
             <% end %>
           </div>
 
-          <% if can? :trigger, Kaui::Invoice %>
-            <div class="info-item">
-              <b>Next invoice date</b>
-              <p id='next-invoice-date'>N/A</p>
-            </div>
-          <% end %>
+          <div class="info-item">
+            <b>Next invoice date</b>
+            <p id='next-invoice-date'>N/A</p>
+          </div>
         </div>
 
         <!-- Right Column -->

data/app/views/kaui/admin_allowed_users/index.html.erb

@@ -60,23 +60,12 @@
                     <td><%= link_to u.kb_username, admin_allowed_user_path(u.id) %></td>
                     <td><%= u.description %></td>
                     <td class="text-end">
-
-                        
-                      <%= render "kaui/components/button/button", {
-                        label: 'Delete',
-                        variant: "outline-secondary d-inline-flex align-items-center gap-1",
-                        type: "button",
-                        html_class: "kaui-button delete-button custom-hover",
-                        html_options: { 
-                          data: { 
-                            confirm: "Are you sure?",
-                            method: "delete",
-                            turbo: false,
-                            "url": kaui_engine.admin_allowed_user_path(u.id)
-                          }
-                        }
-                      } %>
-                      <%= link_to kaui_engine.edit_admin_allowed_user_path(u.id), :class => '' do %>
+                      <%= form_tag kaui_engine.admin_allowed_user_path(u.id), method: :delete, class: 'd-inline', onsubmit: "return confirm('Are you sure?');" do %>
+                        <%= button_tag type: 'submit', class: 'btn btn-outline-secondary d-inline-flex align-items-center gap-1 kaui-button delete-button custom-hover' do %>
+                          Delete
+                        <% end %>
+                      <% end %>
+                      <%= link_to kaui_engine.edit_admin_allowed_user_path(u.id), class: 'text-decoration-none' do %>
                         <%= render "kaui/components/button/button", {
                           label: "Edit",
                           variant: "outline-secondary d-inline-flex align-items-center gap-1",
@@ -154,6 +143,8 @@
           $header.find('.sort-' + direction).addClass('active');
         }
         
+      } catch (e) {
+        console.error('Error initializing DataTable:', e);
       }
     }, 100);
   });

data/app/views/kaui/admin_tenants/_clock.html.erb

@@ -15,6 +15,7 @@
         <%= form_tag admin_tenant_set_clock_path(@tenant.id), method: :put, class: 'form-horizontal' do %>
           <div class="trigger-invoice-box form-group">
             <b>Set new date</b>
+            <p id="clock_warning" class="text-danger mb-2" style="display: none;"><%= t('admin_tenants.clock_warning') %></p>
             <div class="d-flex align-items-center">
               <div class="custom-date-input-wrapper kaui-button custom-hover">
                 <svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -25,9 +26,11 @@
                 </svg>
 
                 <input class="form-control" name="new_date" type="text" 
+                       id="clock_datepicker"
                        data-provide="datepicker" 
                        data-date-format="yyyy-mm-dd" 
-                       data-date-today-highlight="true" 
+                       data-date-today-highlight="true"
+                       data-date-autoclose="true"
                        value="<%= @clock&.[]('localDate') || '' %>">
               </div>
 
@@ -56,17 +59,21 @@
 
 <%= javascript_tag do %>
   $(document).ready(function() {
-    scheduleRefresh();
-  });
-
-  function scheduleRefresh() {
-    setTimeout(refreshClock, 1000);
-  }
+    var clockElement = $('#kb_clock');
+    var initialTime = clockElement.text();
+    
+    // Parse the initial time
+    var currentTime = new Date(initialTime);
+    
+    // Update clock every second
+    setInterval(function() {
+      currentTime.setSeconds(currentTime.getSeconds() + 1);
+      clockElement.text(currentTime.toISOString());
+    }, 1000);
 
-  function refreshClock() {
-    $.ajax({url: "<%= admin_tenant_path(@tenant.id, :format => :js) %>"});
-  }
+    // Show warning when date is selected
+    $('#clock_datepicker').on('changeDate', function() {
+      $('#clock_warning').show();
+    });
+  });
 <% end %>
-
-
-

data/app/views/kaui/admin_tenants/new_catalog.html.erb

@@ -246,6 +246,8 @@ function switch_basic_config() {
 $(document).ready(function() {
     switch_basic_config();
 
+    // jQuery UI autocomplete interferes with HTML5 validation
+    // So we keep the custom JS validation
     $('#simple_plan_product_name').autocomplete({
         source: function(query, process) {
             process(known_products());
@@ -261,8 +263,72 @@ $(document).ready(function() {
     $('#simple_plan_product_name').on('mouseleave', function() {
         recompute_available_base_products_for_ao();
     });
+
+    // Custom validation since HTML5 validation is not working
+    // (possibly due to jQuery autocomplete or other JavaScript interference)
+    $('#catalog_simple form').on('submit', function(e) {
+        var isValid = true;
+        var pattern = /^[a-zA-Z_][\w\.-]*$/;
+        
+        // Validate Product Name
+        var productName = $('#simple_plan_product_name').val().trim();
+        var productNameField = $('#simple_plan_product_name');
+        
+        if (productName === '') {
+            showError(productNameField, 'Product Name is required');
+            isValid = false;
+        } else if (!pattern.test(productName)) {
+            showError(productNameField, 'Product Name must start with a letter or underscore, and can only contain letters, digits, underscores, hyphens, and periods');
+            isValid = false;
+        } else {
+            clearError(productNameField);
+        }
+        
+        // Validate Plan Name
+        var planName = $('#simple_plan_plan_id').val().trim();
+        var planNameField = $('#simple_plan_plan_id');
+        
+        if (planName === '') {
+            showError(planNameField, 'Plan Name is required');
+            isValid = false;
+        } else if (!pattern.test(planName)) {
+            showError(planNameField, 'Plan Name must start with a letter or underscore, and can only contain letters, digits, underscores, hyphens, and periods');
+            isValid = false;
+        } else {
+            clearError(planNameField);
+        }
+        
+        if (!isValid) {
+            e.preventDefault();
+            e.stopPropagation();
+            // Scroll to first error
+            $('.error-message:first').get(0)?.scrollIntoView({ behavior: 'smooth', block: 'center' });
+            return false;
+        }
+        
+        return true;
+    });
+    
+    // Clear errors on input
+    $('#simple_plan_product_name, #simple_plan_plan_id').on('input', function() {
+        clearError($(this));
+    });
 });
 
+function showError(field, message) {
+    clearError(field);
+    field.addClass('error-field');
+    field.css('border-color', '#dc3545');
+    var errorDiv = $('<div class="error-message" style="color: #dc3545; font-size: 0.875rem; margin-top: 0.25rem;"></div>').text(message);
+    field.parent().append(errorDiv);
+}
+
+function clearError(field) {
+    field.removeClass('error-field');
+    field.css('border-color', '');
+    field.parent().find('.error-message').remove();
+}
+
 document.querySelectorAll('.toggle-option').forEach(el => {
   el.addEventListener('click', () => {
     document.querySelectorAll('.toggle-option').forEach(opt => opt.classList.remove('active-btn'));

data/app/views/kaui/admin_tenants/show.html.erb

@@ -11,15 +11,11 @@
 
     <div class="w-100">
       <div class="row gap-4 m-0 gap-container pb-2">
-        <%
-=begin%>
- <div class="p-4 card w-100 col">
+        <div class="p-4 card col">
           <%= render :partial => 'clock' %>      
-        </div> 
-<%
-=end%>
+        </div>
 
-        <div class="p-4 card w-100 col">
+        <div class="p-4 card col">
           <%= render :partial => 'useful_links' %>
         </div>
       </div>

data/app/views/kaui/audit_logs/_multi_functions_bar.html.erb

@@ -43,7 +43,7 @@
                         <path d="M2.5 8.3335H17.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
                       </svg>
                     </label>
-                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Accounts" name="startDate">
+                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Logs" name="startDate">
                     <div id="dash" class="dash">–</div>
                     <input type="text" class="form-control right-input" id="endDate" placeholder="" name="endDate">
                     <div id="toggle-wrapper" class="position-absolute" style="width: 100%; height: 100%;" onclick="document.getElementById('single-toggle').click()"></div>
@@ -67,7 +67,7 @@
                   <div class="fake-select-dropdown">
                     <label class="fake-select-option">
                       <input type="radio" name="download_option" id="allData" />
-                      <span>All accounts</span>
+                      <span>All logs</span>
                     </label>
 
                     <label class="fake-select-option">

data/app/views/kaui/components/dashboard/_card.html.erb

@@ -1,3 +1,4 @@
+<% count_text = count.nil? ? "20k+" : count.to_i %>
 <div class="col-md-4">
     <div class="dashboard-card border rounded-4 d-flex flex-column justify-content-between h-100">
         <div class="d-flex px-4 py-3 align-items-center gap-3">
@@ -6,7 +7,7 @@
             </div>
             <div>
                 <h6 class="mb-0 fw-600 text-black-900"><%= title %></h6>
-                <p class="text-muted fw-normal text-tertiary small mb-0"><%= count %></p>
+                <p class="text-muted fw-normal text-tertiary small mb-0"><%= count_text %></p>
             </div>
         </div>
         <div class="w-full dashboard-card-divider"></div>

data/app/views/kaui/invoices/_multi_functions_bar.html.erb

@@ -91,7 +91,7 @@
                         <path d="M2.5 8.3335H17.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
                       </svg>
                     </label>
-                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Accounts" name="startDate">
+                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Invoices" name="startDate">
                     <div id="dash" class="dash">–</div>
                     <input type="text" class="form-control right-input" id="endDate" placeholder="" name="endDate">
                     <div id="toggle-wrapper" class="position-absolute" style="width: 100%; height: 100%;" onclick="document.getElementById('single-toggle').click()"></div>
@@ -115,7 +115,7 @@
                   <div class="fake-select-dropdown">
                     <label class="fake-select-option">
                       <input type="radio" name="download_option" id="allData" />
-                      <span>All accounts</span>
+                      <span>All invoices</span>
                     </label>
 
                     <label class="fake-select-option">

data/app/views/kaui/payments/_multi_functions_bar.html.erb

@@ -90,7 +90,7 @@
                         <path d="M2.5 8.3335H17.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
                       </svg>
                     </label>
-                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Accounts" name="startDate">
+                    <input type="text" class="form-control center-input" id="startDate" placeholder="All Payments" name="startDate">
                     <div id="dash" class="dash">–</div>
                     <input type="text" class="form-control right-input" id="endDate" placeholder="" name="endDate">
                     <div id="toggle-wrapper" class="position-absolute" style="width: 100%; height: 100%;" onclick="document.getElementById('single-toggle').click()"></div>
@@ -114,7 +114,7 @@
                   <div class="fake-select-dropdown">
                     <label class="fake-select-option">
                       <input type="radio" name="download_option" id="allData" />
-                      <span>All accounts</span>
+                      <span>All payments</span>
                     </label>
 
                     <label class="fake-select-option">

data/config/locales/en.yml

@@ -81,3 +81,6 @@ en:
           billing_period: "Billing Period"
           trial: "Trial"
           final_phase_duration: "Final Phase Duration"
+
+  admin_tenants:
+    clock_warning: "This action will affect all tenants across the system. Proceed with caution."

data/lib/kaui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kaui
-  VERSION = '4.0.3'
+  VERSION = '4.0.5'
 end

data/lib/kaui.rb

@@ -82,7 +82,7 @@ module Kaui
       when 'account_id'
         view_context.link_to(account.account_id, view_context.url_for(action: :show, account_id: account.account_id))
       when 'parent_account_id'
-        account.parent_account_id.nil? ? nil : view_context.link_to(account.account_id, view_context.url_for(action: :show, account_id: account.parent_account_id))
+        account.parent_account_id.nil? ? nil : view_context.link_to(account.parent_account_id, view_context.url_for(action: :show, account_id: account.parent_account_id))
       when 'account_balance'
         view_context.humanized_money_with_symbol(account.balance_to_money)
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.5
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-02 00:00:00.000000000 Z
+date: 2025-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -540,8 +540,6 @@ files:
 - app/views/kaui/accounts/index.html.erb
 - app/views/kaui/accounts/new.html.erb
 - app/views/kaui/accounts/show.html.erb
-- app/views/kaui/admin/index.html.erb
-- app/views/kaui/admin/index.js.erb
 - app/views/kaui/admin_allowed_users/_form.html.erb
 - app/views/kaui/admin_allowed_users/edit.html.erb
 - app/views/kaui/admin_allowed_users/index.html.erb

data/app/views/kaui/admin/index.html.erb

@@ -1,64 +0,0 @@
-<div class="kaui-container ">
-  <div class="clock-container">
-    <div class="d-flex flex-column">
-      <div class="clock-header mb-3">
-        <div class="d-flex align-items-start flex-column">
-          <h2>Clock</h2>
-          <p>Current date/time: <span id="kb_clock"><%= @clock['currentUtcTime'] %></span></p>
-        </div>
-        <span>
-        </span>
-      </div>
-      <div>
-        <%= form_tag kaui_engine.admin_set_clock_path(params.to_h), :method => :put, :class => 'form-horizontal' do %>
-
-          <div class="trigger-invoice-box form-group">
-            <b>Set new date</b>
-            <div class="d-flex align-items-center">
-              <div class="custom-date-input-wrapper kaui-button custom-hover">
-                <svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-                  <path d="M14.9167 12.5V18.3333M17.8333 15.4167H12" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-                  <path d="M14.0833 1.66675V5.00008M6.58325 1.66675V5.00008" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-                  <path d="M17.8333 10.8333V4.99992C17.8333 4.07944 17.0871 3.33325 16.1666 3.33325H4.49992C3.57944 3.33325 2.83325 4.07944 2.83325 4.99992V16.6666C2.83325 17.5871 3.57944 18.3333 4.49992 18.3333H10.3333" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-                  <path d="M2.83325 8.33325H17.8333" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-                </svg>
-                <input class="form-control" name="new_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value="<%= @clock['localDate'] %>">
-              </div>
-
-              <%= render "kaui/components/button/button", {
-                label: "Submit",
-                variant: "outline-secondary d-inline-flex align-items-center gap-1",
-                type: "submit",
-                html_class: "btn btn-xs kaui-dropdown custom-hover py-2 px-3",
-                html_options: { name: "commit", value: "Submit" }
-              } %>
-            </div>
-
-            <%= button_tag type: 'submit', name: 'commit', value: 'Reset', class: 'kaui-button dots-menu custom-hover' do %>
-              <%= image_tag('kaui/setting/reset.svg', alt: 'Reset Icon', class: 'me-2', size: '16x16') %>
-              Reset
-            <% end %>
-
-          </div>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
-
-<%= javascript_tag do %>
-  $(document).ready(function() {
-    scheduleRefresh();
-  });
-
-  function scheduleRefresh() {
-    setTimeout(refreshClock, 1000);
-  }
-
-  function refreshClock() {
-    $.ajax({url: "<%= admin_path(:format => :js) %>"});
-  }
-<% end %>
-
-
-

data/app/views/kaui/admin/index.js.erb

@@ -1,3 +0,0 @@
-$('#kb_clock').html("<%= @clock['currentUtcTime'] %>");
-
-scheduleRefresh();