kaui 0.16.2 → 1.0.0

data/app/views/kaui/admin_tenants/_show_catalog_xml.erb

@@ -17,13 +17,14 @@
       </tr>
       </thead>
       <tbody>
-      <% @catalogs_xml.each do |catalog| %>
+      <% @catalog_versions.each do |catalog| %>
           <tr>
             <td><%= catalog[:version] %></td>
             <td><%= catalog[:version_date] %></td>
             <td>
               <%= form_tag(kaui_engine.admin_tenant_display_catalog_xml_path, :id => "submit_form_xml_#{catalog[:version]}", :method => 'post', :multipart => true, :class => "hide") do %>
-                  <%= hidden_field_tag(:xml, catalog[:xml]) %>
+                  <%= hidden_field_tag(:effective_date, catalog[:version_date]) %>
+                  <%= hidden_field_tag(:id, @tenant.id) %>
                   <%= submit_tag 'submit' %>
               <% end %>
               <a class='btn btn-xs' href="javascript:void(0);" onclick="submit_xml(<%= catalog[:version] %>);">view xml</a>

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

@@ -9,7 +9,10 @@
 
       <div class="column-block">
 
-        <h1>Allowed Users</h1>
+        <h1>Allowed Users
+        <%= link_to '<i class="fa fa-plus-square"></i>'.html_safe,
+                                          '#addAllowedUserModal',
+                                          :class => 'btn btn-xs', data: {toggle: 'modal'} %></h1>
         <table id="allowed-users-for-tenant-table" class="table table-condensed">
           <thead>
           <tr>
@@ -78,6 +81,8 @@
   </div>
 </div>
 
+<%= render :partial => 'add_allowed_user_modal' %>
+
 <%= javascript_tag do %>
 
 

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

@@ -0,0 +1,177 @@
+<div class="modal fade" id="showHistoryModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content column-block">
+      <div>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h1 class="modal-title">History</h1>
+      </div>
+      <div class="modal-body">
+        <input type="hidden" id="objectId" />
+        <input type="hidden" id="objectType" />
+        <input type="hidden" id="changeDate" />
+        <input type="hidden" id="changeType" />
+        <div class="alert alert-info" role="alert">Loading data from server</div>
+        <div id="templatesPlaceHolder" style="display: flex;">
+          <div id="templateFieldsPlaceHolder"></div>
+          <div id="templatePlaceHolder"></div>
+        </div>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+<script id="history_template" type="text/template" >
+  {{#auditLogs}}
+  <div class="panel panel-{{selected}}" id="{{panelId}}">
+    <div class="panel-heading">{{#changeType}}{{changeType}} - {{changeDate}}{{/changeType}}&nbsp;</div>
+    <ul class="list-group">
+      {{#history}}
+        <li class="list-group-item {{class}}">
+          <span {{#longValue}}title="{{.}}"{{/longValue}} >{{value}}</span>
+        </li>
+      {{/history}}
+    </ul>
+  </div>
+  {{/auditLogs}}
+</script>
+
+<%= javascript_tag do %>
+    $(document).ready(function() {
+
+        const IGNORABLE_FIELDS = ['id','createdDate','updatedDate','recordId','accountRecordId','tenantRecordId','historyTableName','tableName']
+        function renderHistory(auditLogsWithHistory) {
+            var auditLogs = [];
+            var changeDateSelected = $("#changeDate").val();
+            var changeTypeSelected = $("#changeType").val();
+            var activePanel = "history0";
+            var fieldNamePanel = {
+                selected: false,
+                changeType: null,
+                changeDate: null,
+                panelId: "fields",
+                history: []
+            };
+
+            for (var i = 0 ; i < auditLogsWithHistory.length; i++) {
+                var isActivePanel = auditLogsWithHistory[i].changeDate == changeDateSelected && auditLogsWithHistory[i].changeType == changeTypeSelected;
+                var auditLog = {
+                    selected: isActivePanel ? 'primary' : 'default',
+                    changeType: auditLogsWithHistory[i].changeType,
+                    changeDate: auditLogsWithHistory[i].changeDate,
+                    panelId: "history" + i,
+                    history: []
+                };
+
+                var currentHistory = auditLogsWithHistory[i].history;
+                var previousHistory = (i == 0 ? null : auditLogsWithHistory[i - 1].history);
+                for (var field in currentHistory) {
+                    if (IGNORABLE_FIELDS.indexOf(field) == -1) {
+                        var previousValue = previousHistory == null || previousHistory[field] == undefined ? null : previousHistory[field];
+                        auditLog.history.push({
+                            class: diffClass(previousValue, currentHistory[field], previousHistory == null),
+                            value: getValue(currentHistory[field]),
+                            longValue: !isBlank(currentHistory[field]) && currentHistory[field].length > 40 ? currentHistory[field] : null
+                        });
+
+                        // only use the first history object to set the fields title
+                        if (i == 0) {
+                          fieldNamePanel.history.push({
+                              class: 'disabled',
+                              value: field.replace(/([a-zA-Z])(?=[A-Z])/g, '$1 ').toLowerCase(),
+                              longValue: null
+                          });
+                        }
+                    }
+                }
+
+                auditLogs.push(auditLog);
+                if (isActivePanel) {
+                    activePanel = auditLog.panelId;
+                }
+            }
+
+            var template = $("#history_template").html();
+            var markup = Mustache.render(template, { auditLogs: auditLogs });
+            var headerMarkup = Mustache.render(template, { auditLogs: fieldNamePanel });
+            $("#showHistoryModal").find(".alert").hide();
+            $("#templateFieldsPlaceHolder").html(headerMarkup);
+            $("#templatePlaceHolder").html(markup);
+
+            moveToActivePanel(activePanel);
+        }
+
+        function getValue(value) {
+            if (isBlank(value)) {
+                return value;
+            }
+
+            return value.length > 40 ? value.substring(0,40) + "..." : value
+        }
+
+        function moveToActivePanel(activePanel) {
+            var leftPos = $('#templatePlaceHolder').scrollLeft();
+            var panelLeftPosition = $('#' + activePanel).position().left;
+            $("#templatePlaceHolder").animate({
+                scrollLeft: leftPos + panelLeftPosition - 270
+            }, 800);
+        }
+
+        function diffClass(previousValue, currentValue, isTheBeginningOfTime) {
+            var updated = 'list-group-item-success';
+            var deleted = 'list-group-item-danger';
+            var noChange = '';
+
+            if ( isTheBeginningOfTime ) {
+                return isNullOrUndefined(currentValue) ? noChange : updated;
+            } else if (isBlank(previousValue) && !isBlank(currentValue)) {
+                return updated;
+            } else if (!isBlank(previousValue) && isBlank(currentValue)) {
+                return deleted;
+            } else if (previousValue != currentValue) {
+                return updated;
+            } else {
+                return noChange;
+            }
+        }
+
+        function loadHistory(url) {
+            var object_id = $("#objectId").val();
+            var object_type = $("#objectType").val();
+
+            $.ajax({
+                url: '<%= audit_logs_history_path(@account.account_id) %>',
+                type: "GET",
+                dataType: "json",
+                data: {
+                    "object_id": object_id,
+                    "object_type": object_type
+                },
+                success: function(data) {
+                    if (data.error == null && data.audits != null) {
+                        renderHistory(data.audits);
+                    } else {
+                        $('#showHistoryModal').modal('hide')
+                        ajaxAlert(data.error);
+                    }
+                }
+            });
+        }
+
+        $('#showHistoryModal').on('show.bs.modal', function (e) {
+            $("#objectId").val(e.relatedTarget.dataset['objectId']);
+            $("#objectType").val(e.relatedTarget.dataset['objectType']);
+            $("#changeDate").val(e.relatedTarget.dataset['changeDate']);
+            $("#changeType").val(e.relatedTarget.dataset['changeType']);
+            $("#templatePlaceHolder").html('');
+            $("#templateFieldsPlaceHolder").html('');
+            $("#showHistoryModal").find(".alert").show();
+            $("#showHistoryModal").find(".modal-title").html((e.relatedTarget.dataset['objectType']).toLowerCase().replace('_',' ') + " History [" + e.relatedTarget.dataset['objectId'] + "]");
+            ajaxCloseAlert();
+        });
+
+        $('#showHistoryModal').on('shown.bs.modal', function (e) {
+            loadHistory();
+        });
+
+    });
+<% end %>

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

@@ -0,0 +1,52 @@
+<div class="search">
+
+  <div class="column-block">
+
+    <h1>Audit logs</h1>
+    <input type="hidden" id="audit-logs" value="<%= @audit_logs_json %>">
+    <table id="audit-logs-table" class="table table-condensed table-colored-rows mobile-data">
+      <thead>
+      <tr>
+        <th>Created date</th>
+        <th>Object id</th>
+        <th>Object type</th>
+        <th>Change type</th>
+        <th>Username</th>
+        <th>Reason</th>
+        <th>Comment</th>
+        <th>User token</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr>
+        <td colspan="1" class="dataTables_empty">Loading data from server</td>
+      </tr>
+      </tbody>
+    </table>
+
+  </div>
+
+  <%= render :partial => 'show_history_modal' %>
+
+</div>
+
+
+<%= javascript_tag do %>
+    $(document).ready(function() {
+        var auditLogs = JSON.parse($("#audit-logs").val());
+        $('#audit-logs-table').DataTable({
+            dom: "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+            data: auditLogs,
+            order: [[ 0, 'desc' ]],
+            createdRow: function( row, data, dataIndex ) {
+                if ( data[3] == "INSERT" ) {
+                    $(row).addClass( 'insert' );
+                } else if ( data[3] == "UPDATE" ) {
+                    $(row).addClass( 'update' );
+                } else if ( data[3] == "DELETE" ) {
+                    $(row).addClass( 'delete' );
+                }
+            }
+        });
+    });
+<% end %>

data/app/views/kaui/bundle_tags/_form_bar.html.erb

@@ -1,6 +1,8 @@
 <% can_change_tags = can?(:add, Kaui::Tag) || can?(:delete, Kaui::Tag) %>
-<%= form_tag update_bundle_tags_path do %>
-    <%= hidden_field_tag :bundle_id, bundle_id %>
+<%= form_tag update_tags_path do %>
+    <% params.each_key do |key| %>
+        <%= hidden_field_tag key, params[key] %>
+    <% end %>
 
     <% available_tags.each do |tag| %>
         <%= check_box_tag "tag_#{tag.id}", tag.name, tag_names.include?(tag.name), :disabled => !can_change_tags, :readonly => !can_change_tags %>

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

@@ -29,31 +29,38 @@
       <div class="info-wrapper">
 
         <div class="tag-bar">
+          <% unless @available_tags.empty? %>
+            <div class="tag-select" onclick="void(0)">
+              <span><i class="fa fa-tag"></i><i class="fa fa-caret-down"></i></span>
 
-          <div class="tag-select" onclick="void(0)">
-            <span><i class="fa fa-tag"></i><i class="fa fa-caret-down"></i></span>
+              <div class="tag-select-box">
+                <strong>Tag as:</strong>
 
-            <div class="tag-select-box">
-              <strong>Tag as:</strong>
-
-              <%= render :partial => 'kaui/bundle_tags/form_bar',
-                         :locals => {:bundle_id => bundle.bundle_id,
-                                     :tag_names => (@tags_per_bundle[bundle.bundle_id] || []).map { |tag| tag.tag_definition_name },
-                                     :available_tags => @available_tags} %>
+                <%= render :partial => 'kaui/bundle_tags/form_bar',
+                           :locals => {:params => { :bundle_id => bundle.bundle_id},
+                                       :tag_names => (@tags_per_bundle[bundle.bundle_id] || []).map { |tag| tag.tag_definition_name },
+                                       :available_tags => @available_tags,
+                                       :update_tags_path => update_bundle_tags_path
+                           } %>
+              </div>
             </div>
-          </div>
-
+          <% end %>
           <%= render :partial => 'kaui/custom_fields/list_bar',
                      :locals => {:custom_fields => @custom_fields_per_bundle[bundle.bundle_id] || []} %>
 
-          <% if !is_subscription_cancelled?(@base_subscription[bundle.bundle_id]) &&
+          <% if !is_subscription_cancelled?(@subscription[bundle.bundle_id]) &&
               (can?(:create, Kaui::Subscription) || can?(:transfer, Kaui::Subscription) || can?(:pause_resume, Kaui::Subscription)) %>
               <div class="tag-select" onclick="void(0)">
                 <span><i class="fa fa-gift"></i><i class="fa fa-caret-down"></i></span>
 
                 <div class="tag-select-box">
-                  <% if can?(:create, Kaui::Subscription) && @base_subscription[bundle.bundle_id].present? %>
-                      <%= link_to '<i class="fa fa-plus"></i>&nbsp;Add add-on'.html_safe, kaui_engine.new_subscription_path(:params => {:account_id => bundle.account_id, :bundle_id => bundle.bundle_id, :base_product_name => @base_subscription[bundle.bundle_id].product_name, :product_category => 'ADD_ON'}) %>
+                  <% if can?(:create, Kaui::Subscription) && @subscription[bundle.bundle_id].present? %>
+                      <%= link_to "<i class='fa fa-plus'></i>&nbsp;#{@subscription[bundle.bundle_id].product_category == 'BASE' ? 'Add add-on' : 'Add standalone subscription'}".html_safe,
+                                  kaui_engine.new_subscription_path(:params => {
+                                      :account_id => bundle.account_id,
+                                      :bundle_id => bundle.bundle_id,
+                                      :base_product_name => @subscription[bundle.bundle_id].product_name,
+                                      :product_category => @subscription[bundle.bundle_id].product_category == 'BASE' ? 'ADD_ON' : 'STANDALONE'}) %>
                   <% end %>
                   <% if can? :transfer, Kaui::Subscription %>
                       <%= link_to '<i class="fa fa-random"></i>&nbsp;Transfer Ownership'.html_safe, kaui_engine.transfer_bundle_path(bundle.bundle_id) %>

data/app/views/kaui/chargebacks/_form.html.erb

@@ -5,7 +5,7 @@
     <div class="form-group">
       <%= f.label :amount, 'Amount', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.text_field :amount, :id => 'chargeback_amount', :class => 'form-control' %>
+        <%= f.number_field :amount, :id => 'chargeback_amount', :class => 'form-control' %>
         <p class="help-block">Currency: <%= @chargeback.currency %></p>
       </div>
     </div>
@@ -36,11 +36,3 @@
       </div>
     </div>
 <% end %>
-
-<%= javascript_tag do %>
-$(document).ready(function() {
-  $("#chargeback_amount").keydown(function(event) {
-    preventNonNumericValues(event);
-  });
-});
-<% end %>

data/app/views/kaui/charges/_form.html.erb

@@ -15,7 +15,7 @@
     <div class="form-group">
       <%= f.label :amount, 'Amount', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.text_field :amount, :id => 'charge_amount', :class => 'form-control' %>
+        <%= f.number_field :amount, :id => 'charge_amount', :class => 'form-control' %>
         <% if @invoice.present? %>
             <p class="help-block">Currency: <%= @invoice.currency %></p>
         <% end %>
@@ -49,12 +49,4 @@
         <%= submit_tag 'Save', :class => 'btn btn-default' %>
       </div>
     </div>
-<% end %>
-
-<%= javascript_tag do %>
-$(document).ready(function() {
-  $("#charge_amount").keydown(function(event) {
-    preventNonNumericValues(event);
-  });
-});
-<% end %>
+<% end %>

data/app/views/kaui/credits/_form.html.erb

@@ -35,12 +35,4 @@
         <%= submit_tag 'Save', :class => 'btn btn-default' %>
       </div>
     </div>
-<% end %>
-
-<%= javascript_tag do %>
-$(document).ready(function() {
-  $("#credit_amount").keydown(function(event) {
-    preventNonNumericValues(event);
-  });
-});
-<% end %>
+<% end %>

data/app/views/kaui/custom_fields/_form.html.erb

@@ -8,7 +8,7 @@
     <div class="form-group">
       <%= f.label :object_type, 'Object type', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.select :object_type, [:ACCOUNT, :BUNDLE, :SUBSCRIPTION, :INVOICE, :PAYMENT], {:selected => :account}, :class => 'form-control' %>
+        <%= f.select :object_type, [:ACCOUNT, :BUNDLE, :SUBSCRIPTION, :INVOICE, :INVOICE_ITEM, :PAYMENT], {:selected => :account}, :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">

data/app/views/kaui/custom_fields/_list_bar.html.erb

@@ -1,4 +1,4 @@
-<% unless custom_fields.empty? %>
+<% unless custom_fields.blank? %>
     <div class="tag-select" onclick="void(0)">
       <span><i class="fa fa-sticky-note"></i><i class="fa fa-caret-down"></i></span>
 

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

@@ -1,7 +1,7 @@
 <div class="info-wrapper">
 
   <% display_payment_options = (!dry_run && ((can?(:credit, Kaui::Account) && @invoice.status == 'DRAFT') || (can?(:charge, Kaui::Account) && @invoice.status == 'DRAFT') || (@invoice.balance > 0 && can?(:trigger, Kaui::Payment))))
-     if (!@custom_fields.nil? && !@custom_fields.empty?) || display_payment_options %>
+     if !(@custom_fields ||= nil).blank? || display_payment_options %>
       <div class="tag-bar">
         <!--<div class="tag-select">-->
         <!--<span><i class="fa fa-tag"></i><i class="fa fa-caret-down"></i></span>-->
@@ -41,6 +41,9 @@
   <table id="invoice-table" class="table table-condensed mobile-data">
     <thead>
     <tr>
+      <% unless (@available_invoice_item_tags ||= nil).blank? && (@custom_fields_per_invoice_item ||= nil).blank? %>
+          <th></th>
+      <% end %>
       <th>Description</th>
       <th>Start date</th>
       <th>End date</th>
@@ -53,6 +56,32 @@
     <tbody>
     <% @invoice.items.each do |item| %>
         <tr id=<%= "invoice_item_#{item.invoice_item_id}_#{item.linked_invoice_item_id}" %>>
+          <% unless @available_invoice_item_tags.blank? && @custom_fields_per_invoice_item.blank? %>
+              <td class="inline-row-tag-bar">
+                <div class="tag-bar tag-bar-no-border">
+                  <% unless @available_invoice_item_tags.blank? %>
+                      <div class="tag-select" onclick="void(0)">
+                        <span><i class="fa fa-tag"></i><i class="fa fa-caret-down"></i></span>
+
+                        <div class="tag-select-box">
+                          <strong>Tag as:</strong>
+
+                          <%= render :partial => 'kaui/bundle_tags/form_bar',
+                                     :locals => {:params => { :invoice_id => item.invoice_id, :account_id => item.account_id},
+                                                 :tag_names => (@tags_per_invoice_item[item.invoice_item_id] || []).map { |tag| tag.tag_definition_name },
+                                                 :available_tags => @available_invoice_item_tags,
+                                                 :update_tags_path => update_invoice_items_tags_path(item.invoice_item_id)
+                                     } %>
+                        </div>
+                      </div>
+                  <% end %>
+
+                  <%= render :partial => 'kaui/custom_fields/list_bar',
+                             :locals => {:custom_fields => @custom_fields_per_invoice_item[item.invoice_item_id] || []} %>
+                </div>
+
+              </td>
+          <% end %>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.description %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.start_date.html_safe if item.start_date %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.end_date.html_safe if item.end_date %></td>
@@ -74,7 +103,6 @@
     <% end %>
     </tbody>
   </table>
-
   <table class="invoice-totals">
     <tr>
       <th></th>

data/app/views/kaui/layouts/kaui_account_navbar.html.erb

@@ -8,9 +8,16 @@
     <%= link_to 'Invoices', kaui_engine.account_invoices_path(params[:account_id]), :class => (params[:controller].ends_with?('invoices') ? 'current' : 'non-current') %>
     <%= link_to 'Payments', kaui_engine.account_payments_path(params[:account_id]), :class => (params[:controller].ends_with?('payments') ? 'current' : 'non-current') %>
     <%= link_to 'Timeline', kaui_engine.account_timeline_path(params[:account_id]), :class => (params[:controller].ends_with?('timelines') ? 'current' : 'non-current') %>
+    <%= link_to 'Tags', kaui_engine.account_tags_path(params[:account_id]), :class => (params[:controller].ends_with?('tags') ? 'current' : 'non-current') %>
+    <%= link_to 'Custom Fields', kaui_engine.account_custom_fields_path(params[:account_id]), :class => (params[:controller].ends_with?('custom_fields') ? 'current' : 'non-current') %>
 
     <% if current_user.root? %>
         <%= link_to 'Queues', kaui_engine.account_queues_path(params[:account_id]), :class => (params[:controller].ends_with?('queues') ? 'current' : 'non-current') %>
+        <%= link_to 'Audit', kaui_engine.account_audit_logs_path(params[:account_id]), :class => (params[:controller].ends_with?('logs') ? 'current' : 'non-current') %>
+    <% end %>
+
+    <% if account_closed? %>
+        <span class="label label-danger">CLOSED</span>
     <% end %>
   </div>
 

data/app/views/kaui/layouts/kaui_flash.html.erb

@@ -1,7 +1,7 @@
 <%- # :alert used by devise -%>
 <% [:error, :alert].each do |key| %>
     <% if flash[key] %>
-        <div class="row">
+        <div class="row server-alert">
           <div class="col-md-12">
             <div class="alert alert-danger"><%= flash[key] %></div>
           </div>
@@ -9,9 +9,20 @@
     <% end %>
 <% end %>
 <% if flash[:notice] %>
-    <div class="row">
+    <div class="row server-alert">
       <div class="col-md-12">
         <div class="alert alert-info"><%= flash[:notice] %></div>
       </div>
     </div>
 <% end %>
+<!--This is for ajax calls that need to notify for error, to trigger this alert use ajaxAlert(message)-->
+<div id="ajaxAlert" class="row" style="display: none">
+  <div class="col-md-12">
+    <div class="alert alert-danger">
+      <button type="button" class="close" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <span id="ajaxErrorMessage"></span>
+    </div>
+  </div>
+</div>

data/app/views/kaui/payment_methods/_new_creditcard_payment_method.html.erb

@@ -1,66 +1,66 @@
 <div class="form-group">
   <%= label_tag :card_type, 'Card type', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :card_type, @card_type, :class => 'form-control' %>
+    <%= text_field_tag :card_type, @card_type ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :card_holder_name, 'Card holder name', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :card_holder_name, @card_holder_name, :class => 'form-control' %>
+    <%= text_field_tag :card_holder_name, @card_holder_name ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :expiration_month, 'Expiration month', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :expiration_month, @expiration_month, :class => 'form-control' %>
+    <%= text_field_tag :expiration_month, @expiration_month ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :expiration_year, 'Expiration year', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :expiration_year, @expiration_year, :class => 'form-control' %>
+    <%= text_field_tag :expiration_year, @expiration_year ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :credit_card_number, 'Credit card number', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :credit_card_number, @credit_card_number, :class => 'form-control' %>
+    <%= text_field_tag :credit_card_number, @credit_card_number ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :address1, 'Address 1', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :address1, @address1, :class => 'form-control' %>
+    <%= text_field_tag :address1, @address1 ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :address2, 'Address 2', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :address2, @address2, :class => 'form-control' %>
+    <%= text_field_tag :address2, @address2 ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :city, 'City', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :city, @city, :class => 'form-control' %>
+    <%= text_field_tag :city, @city ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :postal_code, 'ZIP code', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :postal_code, @postal_code, :class => 'form-control' %>
+    <%= text_field_tag :postal_code, @postal_code ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :state, 'State', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :state, @state, :class => 'form-control' %>
+    <%= text_field_tag :state, @state ||= nil, :class => 'form-control' %>
   </div>
 </div>
 <div class="form-group">
   <%= label_tag :country, 'Country', :class => 'col-sm-3 control-label' %>
   <div class="col-sm-9">
-    <%= text_field_tag :country, @country, :class => 'form-control' %>
+    <%= text_field_tag :country, @country ||= nil, :class => 'form-control' %>
   </div>
 </div>

data/app/views/kaui/payment_methods/_plugin_properties.html.erb

@@ -9,7 +9,7 @@
     </tr>
     </thead>
     <tbody>
-    <% (@plugin_properties || [{}]).each_with_index do |plugin_properties, index| %>
+    <% (@plugin_properties ||= [{}]).each_with_index do |plugin_properties, index| %>
       <%= fields :plugin_properties do |property| %>
         <%= property.fields_for "#{index}", plugin_properties do |key_value| %>
           <tr id="plugin_property_<%= index %>" >

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

@@ -16,7 +16,7 @@
     <div class="form-group">
       <%= f.label :purchased_amount, 'Amount', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= f.text_field :purchased_amount, :id => 'payment_amount', :class => 'form-control' %>
+        <%= f.number_field :purchased_amount, :id => 'payment_amount', :class => 'form-control' %>
         <p class="help-block">Currency: <%= @invoice.present? ? @invoice.currency : @account.currency %></p>
       </div>
     </div>
@@ -45,11 +45,3 @@
       </div>
     </div>
 <% end %>
-
-<%= javascript_tag do %>
-  $(document).ready(function() {
-    $("#payment_amount").keydown(function(event) {
-      preventNonNumericValues(event);
-    });
-  });
-<% end %>