kaui 0.14.2 → 0.15.0

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

@@ -0,0 +1,138 @@
+<div id="overdue_config_simple">
+
+    <div>
+      <h1>Overdue Configuration
+        <a class='btn btn-xs' href="javascript:void(0);" onclick="switch_overdue_xml_config();">Enable Advanced Configuration
+          (Upload XML)</a>
+      </h1>
+    </div>
+
+    <%= form_for @overdue, :url => {:action => :modify_overdue_config}, :html => {:class => 'form-horizontal'} do |f| %>
+
+      <a class='btn btn-xs' href="javascript:void(0);" onclick="overdue_new_state();" id="new_state"><%= '<i class="fa fa-plus-square"></i>'.html_safe + " new overdue states" %></a>
+
+        <table id="existing-overdue-config-for-tenants" class="table table-condensed">
+          <thead>
+          <tr>
+            <th>Name</th>
+            <th>External Message</th>
+            <th>Block Subscription Changes</th>
+            <th>Subscription Cancellation</th>
+            <th>Days since earliest unpaid invoice</th>
+            <th>Tag inclusion</th>
+            <th>Tag exclusion</th>
+            <th></th>
+          </tr>
+          </thead>
+          <tbody>
+          <%= f.hidden_field_tag(:id, @tenant.id) %>
+
+          <% @overdue.overdue_states.reverse.each_with_index do |state, idx| %>
+              <tr class="overdue_state_<%= state %>" id="tr_state_<%= idx %>">
+                <%= f.fields_for 'states[]', state do |state_form| %>
+                    <td><%= state_form.text_field :name %></td>
+                    <td><%= state_form.text_field :external_message %></td>
+                    <td><%= state_form.select :block_changes, options_for_select([true, false ], state.block_changes), :class => 'form-control'  %></td>
+                    <td><%= state_form.select :subscription_cancellation_policy, options_for_select([:NONE, :POLICY_NONE, :POLICY_IMMEDIATE, :POLICY_END_OF_TERM], state.subscription_cancellation), :class => 'form-control' %></td>
+                    <%= state_form.fields_for 'condition' do |condition| %>
+                        <td><%= condition.text_field :time_since_earliest_unpaid_invoice_equals_or_exceeds, :value => state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds.number %></td>
+                        <td><%= condition.select :control_tag_inclusion, options_for_select([:NONE, :AUTO_PAY_OFF, :AUTO_INVOICING_OFF, :OVERDUE_ENFORCEMENT_OFF, :MANUAL_PAY, :TEST, :PARTNER], state.condition.control_tag_inclusion), :class => 'form-control'  %></td>
+                        <td><%= condition.select :control_tag_exclusion, options_for_select([:NONE, :AUTO_PAY_OFF, :AUTO_INVOICING_OFF, :OVERDUE_ENFORCEMENT_OFF, :MANUAL_PAY, :TEST, :PARTNER], state.condition.control_tag_exclusion), :class => 'form-control'%></td>
+                    <% end %>
+                <% end %>
+                <td><a class='btn btn-xs' href="javascript:void(0);" onclick="overdue_delete_state(this);" id="delete_state_<%= idx %>"><%= '<i class="fa fa-times"></i>'.html_safe %></a></td>
+              </tr>
+          <% end %>
+        </tbody>
+        </table>
+        <div class="form-group">
+          <div class="col-sm-offset-3 col-sm-9">
+            <%= submit_tag 'Save', :class => 'btn btn-default' %>
+          </div>
+        </div>
+  <% end %>
+</div>
+
+
+<div id="overdue_config_xml">
+  <hr/>
+  <h1>Upload Overdue XML Config
+    <a class='btn btn-xs' href="javascript:void(0);" onclick="switch_overdue_basic_config();">Enable Simple View</a>
+  </h1>
+  <% if can? :config_upload, Kaui::AdminTenant %>
+      <%= form_tag({:action => :upload_overdue_config}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
+          <%= hidden_field_tag(:id, @tenant.id) %>
+
+          <div class="form-group">
+            <div class="col-sm-10">
+              <%= file_field_tag 'overdue', :class => 'form-control' %>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-10">
+              <%= submit_tag 'Upload', :class => 'btn btn-default' %>
+            </div>
+          </div>
+      <% end %>
+  <% else %>
+      You don't have the permission to upload the XML config
+  <% end %>
+</div>
+
+
+<%= javascript_tag do %>
+
+
+function switch_overdue_xml_config() {
+    $('#overdue_config_simple').hide();
+    $('#overdue_config_xml').show();
+}
+
+function switch_overdue_basic_config() {
+    $('#overdue_config_xml').hide();
+    $('#overdue_config_simple').show();
+}
+
+
+function overdue_new_state() {
+    /* Compute max index value to assign new rows with unsued index */
+    var max_idx = $.map($('[id^=delete_state_]'), function(e, i) {
+        return e.id.split("delete_state_")[1] }
+    ).sort(function(a, b) {
+        return b - a
+    })[0];
+
+    /* Clone existing row and reset id based on max_idx */
+    var row = $('#existing-overdue-config-for-tenants tbody>tr:last').clone(true);
+    var row_idx = (parseInt(max_idx) + 1).toString();
+    row.attr('id', "tr_state_" + row_idx);
+    row.children("td:last").children('a').attr('id', "delete_state_" + row_idx);
+
+    /* Attach rom into dom */
+    row.insertAfter('#existing-overdue-config-for-tenants tbody>tr:last');
+
+    /* Also reset the disabled state */
+    $('#' + row.attr('id') + ' :input').each( function() {
+    $(this).prop('disabled', false); }
+    );
+
+    /* The cloned version may need to be displayed */
+    row.show();
+}
+
+function overdue_delete_state(obj) {
+    var idx = obj.id.split("delete_state_")[1];
+    /* Disable the entry in the form */
+    $("#tr_state_" + idx + " :input").each( function() {
+        $(this).prop('disabled', true); }
+    );
+    /* Hide the table row */
+    $("#tr_state_" + idx).hide();
+};
+
+$(document).ready(function() {
+    switch_overdue_basic_config();
+});
+
+
+<% end %>

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

@@ -0,0 +1,34 @@
+<div id="catalog_simple">
+
+  <div>
+    <h1>Catalog (Add Plan Currency)
+    </h1>
+  </div>
+  <%= form_for @simple_plan, :url => {:action => :create_simple_plan}, :html => {:class => 'form-horizontal'} do |f| %>
+
+      <%= f.hidden_field_tag(:id, @tenant.id) %>
+      <div class="form-group">
+        <%= f.label :plan_id, 'Plan ID', :class => 'col-sm-3 control-label' %>
+        <div class="col-sm-4">
+          <%= f.text_field :plan_id, :class => 'form-control' %>
+        </div>
+      </div>
+      <div class="form-group">
+        <%= f.label :amount, 'Amount', :class => 'col-sm-3 control-label' %>
+        <div class="col-sm-4">
+          <%= f.text_field :amount, :class => 'form-control' %>
+        </div>
+      </div>
+      <div class="form-group">
+        <%= f.label :currency, 'Currency', :class => 'col-sm-3 control-label' %>
+        <div class="col-sm-4">
+          <%= f.select :currency, currencies, {:selected => 'USD'}, :class => 'form-control' %>
+        </div>
+      </div>
+      <div class="form-group">
+        <div class="col-sm-offset-3 col-sm-9">
+          <%= submit_tag 'Save', :class => 'btn btn-default' %>
+        </div>
+      </div>
+  <% end %>
+</div>

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

@@ -61,133 +61,26 @@
     <% end %>
 <% end %>
 
-<% if can? :config_upload, Kaui::AdminTenant %>
-    <h3>Tenant operations</h3>
-
-    <%= form_tag({:action => :upload_catalog}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
-        <%= hidden_field_tag(:id, @tenant.id) %>
-
-        <div class="form-group">
-          <%= label_tag :catalog, 'Catalog', :class => 'col-sm-2 control-label' %>
-          <div class="col-sm-10">
-            <%= file_field_tag 'catalog', :class => 'form-control' %>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-sm-offset-2 col-sm-10">
-            <%= submit_tag 'Upload', :class => 'btn btn-default' %>
-          </div>
-        </div>
-    <% end %>
-    <hr/>
-    <%= form_tag({:action => :upload_overdue_config}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
-        <%= hidden_field_tag(:id, @tenant.id) %>
-
-        <div class="form-group">
-          <%= label_tag :overdue, 'Overdue Config', :class => 'col-sm-2 control-label' %>
-          <div class="col-sm-10">
-            <%= file_field_tag 'overdue', :class => 'form-control' %>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-sm-offset-2 col-sm-10">
-            <%= submit_tag 'Upload', :class => 'btn btn-default' %>
-          </div>
-        </div>
-    <% end %>
-    <hr/>
-    <%= form_tag({:action => :upload_invoice_template}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
-        <%= hidden_field_tag(:id, @tenant.id) %>
-
-        <div class="form-group">
-          <%= label_tag :invoice_template, 'Invoice template', :class => 'col-sm-2 control-label' %>
-          <div class="col-sm-10">
-            <%= file_field_tag 'invoice_template', :class => 'form-control' %>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-sm-offset-2 col-sm-10">
-            <div class="checkbox">
-              <label>
-                <%= check_box_tag :manual_pay %>
-                <span>Manual Pay</span>
-              </label>
-            </div>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-sm-offset-2 col-sm-10">
-            <%= submit_tag 'Upload', :class => 'btn btn-default' %>
-          </div>
-        </div>
-    <% end %>
-    <hr/>
-    <%= form_tag({:action => :upload_invoice_translation}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
-        <%= hidden_field_tag(:id, @tenant.id) %>
-
-        <div class="form-group">
-          <%= label_tag :invoice_translation, 'Invoice translation', :class => 'col-sm-2 control-label' %>
-          <div class="col-sm-10">
-            <%= file_field_tag 'invoice_translation', :class => 'form-control' %>
-          </div>
-        </div>
-        <div class="form-group">
-          <%= label_tag :translation_locale, 'Locale', :class => 'col-sm-2 control-label' %>
-          <div class="col-sm-10">
-            <%= text_field_tag :translation_locale, nil, :class => 'form-control' %>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-sm-offset-2 col-sm-10">
-            <%= submit_tag 'Upload', :class => 'btn btn-default' %>
-          </div>
-        </div>
-    <% end %>
-    <hr/>
-    <%= form_tag({:action => :upload_catalog_translation}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
-        <%= hidden_field_tag(:id, @tenant.id) %>
-
-        <div class="form-group">
-          <%= label_tag :catalog_translation, 'Catalog translation', :class => 'col-sm-2 control-label' %>
-          <div class="col-sm-10">
-            <%= file_field_tag 'catalog_translation', :class => 'form-control' %>
-          </div>
-        </div>
-        <div class="form-group">
-          <%= label_tag :translation_locale, 'Locale', :class => 'col-sm-2 control-label' %>
-          <div class="col-sm-10">
-            <%= text_field_tag :translation_locale, nil, :class => 'form-control' %>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-sm-offset-2 col-sm-10">
-            <%= submit_tag 'Upload', :class => 'btn btn-default' %>
-          </div>
-        </div>
-    <% end %>
-    <hr/>
-    <%= form_tag({:action => :upload_plugin_config}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
-        <%= hidden_field_tag(:id, @tenant.id) %>
-
-        <div class="form-group">
-          <%= label_tag :plugin_config, 'Plugin config', :class => 'col-sm-2 control-label' %>
-          <div class="col-sm-10">
-            <%= file_field_tag 'plugin_config', :class => 'form-control' %>
-          </div>
-        </div>
-        <div class="form-group">
-          <%= label_tag :plugin_name, 'Plugin name', :class => 'col-sm-2 control-label' %>
-          <div class="col-sm-10">
-            <%= text_field_tag :plugin_name, nil, :class => 'form-control' %>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-sm-offset-2 col-sm-10">
-            <%= submit_tag 'Upload', :class => 'btn btn-default' %>
-          </div>
-        </div>
-    <% end %>
-<% end %>
+<div class="container">
+  <ul class="nav nav-tabs">
+    <li class="nav active"><a href="#CatalogShow" data-toggle="tab">Catalog Show</a></li>
+    <li class="nav"><a href="#OverdueShow" data-toggle="tab">Overdue Show</a></li>
+    <li class="nav"><a href="#InvoiceTemplate" data-toggle="tab">Invoice Template</a></li>
+    <li class="nav"><a href="#InvoiceTranslation" data-toggle="tab">Invoice Translation</a></li>
+    <li class="nav"><a href="#CatalogTranslation" data-toggle="tab">Catalog Translation</a></li>
+    <li class="nav"><a href="#PluginConfig" data-toggle="tab">Plugin Config</a></li>
+  </ul>
+
+  <!-- Tab panes -->
+  <div class="tab-content">
+    <%= render :partial => 'show_catalog' %>
+    <%= render :partial => 'show_overdue' %>
+    <%= render :partial => 'form_invoice_template' %>
+    <%= render :partial => 'form_invoice_translation' %>
+    <%= render :partial => 'form_catalog_translation' %>
+    <%= render :partial => 'form_plugin_config' %>
+  </div>
+</div>
 
 <%= javascript_tag do %>
   $(document).ready(function() {

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

@@ -43,7 +43,7 @@
             </div>
           </div>
 
-          <% if !is_cancelled?(@base_subscription[bundle.bundle_id]) && (can?(:create, Kaui::Subscription) || can?(:transfer, Kaui::Subscription)) %>
+          <% if !is_subscription_cancelled?(@base_subscription[bundle.bundle_id]) && (can?(:create, Kaui::Subscription) || can?(:transfer, Kaui::Subscription)) %>
               <div class="tag-select" onclick="void(0)">
                 <span><i class="fa fa-gift"></i><i class="fa fa-caret-down"></i></span>
 

data/app/views/kaui/invoice_items/_edit_form.html.erb

@@ -2,6 +2,7 @@
     <%= f.hidden_field :invoice_id %>
     <%= f.hidden_field :invoice_item_id %>
     <%= f.hidden_field :account_id %>
+    <%= f.hidden_field :currency %>
 
     <div class="form-group">
       <%= f.label :amount, 'Item amount', :class => 'col-sm-2 control-label' %>

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

@@ -1,6 +1,8 @@
 <div class="title-nav-area">
 
   <div class="container">
+    <p><%= pretty_account_identifier %></p>
+
     <%= link_to 'Account', kaui_engine.account_path(params[:account_id]), :class => (params[:controller].ends_with?('accounts') ? 'current' : 'non-current') %>
     <%= link_to 'Subscriptions', kaui_engine.account_bundles_path(params[:account_id]), :class => (params[:controller].ends_with?('bundles') ? 'current' : 'non-current') %>
     <%= link_to 'Invoices', kaui_engine.account_invoices_path(params[:account_id]), :class => (params[:controller].ends_with?('invoices') ? 'current' : 'non-current') %>

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

@@ -93,11 +93,22 @@
           <td><%= transaction.gateway_error_code %></td>
           <td><%= transaction.gateway_error_msg %></td>
           <td>
-          <span
-          <% if transaction.status != 'SUCCESS' %>class='alert-danger'
-          <% else %>class='alert-success' <% end %>>
-          <%= transaction.status %>
-          </span>
+            <ul style="list-style: none">
+              <li>
+                <span <% if transaction.status != 'SUCCESS' %>class='alert-danger'<% else %>class='alert-success' <% end %>>
+                  <%= transaction.status %>
+                </span>
+              </li>
+              <% if transaction.next_retry_date %>
+                  <li>
+                    Scheduled retry:
+                    <%= format_date(transaction.next_retry_date) %>
+                    <% if can? :trigger, Kaui::Payment %>
+                        <%= link_to '<i class="fa fa-times"></i>'.html_safe, kaui_engine.payment_cancel_scheduled_payment_path(payment.payment_id, :account_id => payment.account_id, :transaction_external_key => transaction.transaction_external_key), :method => :delete %>
+                    <% end %>
+                  </li>
+              <% end %>
+            </ul>
           </td>
         </tr>
     <% end %>

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

@@ -98,10 +98,10 @@
         if (Number($("#refund_amount").attr('value')) > <%= @payment.purchased_amount %> ||
           Number($("#refund_amount").attr('value')) <= 0) {
           setClassForElement("#div_refund_amount", "form-group error");
-          $("#submit").prop('disabled', true);
+          $('#new_kill_bill_client_model_invoice_item :submit').prop('disabled', true);
         } else {
           setClassForElement("#div_refund_amount", "form-group");
-          $("#submit").prop('disabled', false);
+          $('#new_kill_bill_client_model_invoice_item :submit').prop('disabled', false);
         }
     };
 
@@ -109,6 +109,7 @@
     * Disabled unwanted invoice item at the time we submit the form
     */
     var disableNonCheckedInvoiceItem = function() {
+
         $('input').filter(function() {
             return this.id.match(/cb_adj_/);
         }).each(function() {
@@ -196,15 +197,13 @@
         * If doing invoice Item adjustment, disable entries that were not selected, so the controllers does not
         * get them
         */
-        $("#submit").click(disableNonCheckedInvoiceItem);
+        $('#new_kill_bill_client_model_invoice_item :submit').mousedown(disableNonCheckedInvoiceItem);
 
         /*
         * Adjustment type handlers
         */
         $("#adjustment_type_noInvoiceAdjustment")
         .click(onClickWithInvoiceOrNoAdjustment);
-        $("#adjustment_type_invoiceAdjustment")
-        .click(onClickWithInvoiceOrNoAdjustment);
         $("#adjustment_type_invoiceItemAdjustment")
         .click(onClickWithInvoiceItemAdjustment);
 

data/app/views/kaui/subscriptions/_edit_form.html.erb

@@ -5,13 +5,36 @@
         <%= select_tag :plan_name, options_for_select(@plans), :class => 'form-control' %>
       </div>
     </div>
+
     <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <div class="radio">
+          <%= label_tag :type_change do %>
+              <%= radio_button_tag :type_change, 'IMM', :checked => true %>
+              Immediate Change
+          <% end %>
+        </div>
+        <div class="radio">
+          <%= label_tag :type_change do %>
+              <%= radio_button_tag :type_change, 'POLICY' %>
+              Specify Policy
+          <% end %>
+        </div>
+        <div class="radio">
+          <%= label_tag :type_change do %>
+              <%= radio_button_tag :type_change, 'DATE' %>
+              Specify a date
+          <% end %>
+        </div>
+      </div>
+    </div>
+    <div class="form-group", id="form_requested_date" >
       <%= label_tag :requested_date, 'Change Date', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
         <%= text_field_tag :requested_date, Date.parse(Time.now.to_s).to_s, :class => 'form-control date-picker' %>
       </div>
     </div>
-    <div class="form-group">
+    <div class="form-group", id="form_policy">
       <%= label_tag :policy, 'Policy', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
         <%= select_tag :policy, options_for_select(['', 'IMMEDIATE', 'END_OF_TERM']), :class => 'form-control' %>
@@ -24,3 +47,27 @@
       </div>
     </div>
 <% end %>
+
+<%= javascript_tag do %>
+
+function onTypeChange() {
+    var value = $("input[type=radio]:checked").val();
+        if (value == "IMM") {
+            $("#form_requested_date").hide();
+            $("#form_policy").hide();
+        } else if (value == "POLICY")  {
+            $("#form_requested_date").hide();
+            $("#form_policy").show();
+        } else if (value == "DATE") {
+           $("#form_policy").hide();
+           $("#form_requested_date").show();
+    }
+}
+
+$(document).ready(function() {
+    onTypeChange();
+    $( "input[type=radio]").on("click", function() {
+        onTypeChange();
+    });
+});
+<% end %>

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

@@ -26,6 +26,22 @@
         </div>
     <% end %>
     <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <div class="radio">
+          <%= label_tag :type_change do %>
+              <%= radio_button_tag :type_change, 'IMM', :checked => true %>
+              Immediate Creation
+          <% end %>
+        </div>
+        <div class="radio">
+          <%= label_tag :type_change do %>
+              <%= radio_button_tag :type_change, 'DATE' %>
+              Specify a date
+          <% end %>
+        </div>
+      </div>
+    </div>
+    <div class="form-group" id="form_requested_date">
       <%= label_tag :requested_date, 'Date', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
         <%= text_field_tag :requested_date, Date.parse(Time.now.to_s).to_s, :class => 'form-control date-picker' %>
@@ -37,3 +53,23 @@
       </div>
     </div>
 <% end %>
+
+
+<%= javascript_tag do %>
+
+function onTypeChange() {
+    var value = $("input[type=radio]:checked").val();
+    if (value == "IMM") {
+        $("#form_requested_date").hide();
+    } else if (value == "DATE") {
+        $("#form_requested_date").show();
+    }
+}
+
+$(document).ready(function() {
+    onTypeChange();
+    $( "input[type=radio]").on("click", function() {
+        onTypeChange();
+    });
+});
+<% end %>

data/app/views/kaui/subscriptions/_subscriptions_table.html.erb

@@ -3,6 +3,7 @@
   <tr>
     <th>Product category</th>
     <th>Product name</th>
+    <th>Phase type</th>
     <th>Start date</th>
     <th>Charged through date</th>
     <th>Notes</th>
@@ -11,16 +12,17 @@
   </thead>
   <tbody>
   <% (bundle.subscriptions || []).each do |sub| %>
-      <tr class="<%= is_cancelled?(sub) ? 'expired' : 'non-expired' %>">
-        <td><%= humanized_product_category(sub) %></td>
-        <td><%= humanized_full_product_name(sub) %></td>
-        <td><%= humanized_start_date(sub, account) %></td>
-        <td><%= humanized_charged_through_date(sub, account) %></td>
-        <td><%= humanized_cancelled_date(sub, account) %></td>
+      <tr class="<%= is_subscription_cancelled?(sub) ? 'expired' : 'non-expired' %>">
+        <td><%= humanized_subscription_product_category(sub) %></td>
+        <td><%= humanized_subscription_full_product_name(sub) %></td>
+        <td><%= humanized_subscription_phase_type(sub) %></td>
+        <td><%= humanized_subscription_start_date(sub, account) %></td>
+        <td><%= humanized_subscription_charged_through_date(sub, account) %></td>
+        <td><%= humanized_subscription_cancelled_date(sub, account) %></td>
         <td class="text-center">
-          <% if is_future_cancelled?(sub) %>
+          <% if is_subscription_future_cancelled?(sub) %>
               <%= link_to 'Reinstate', kaui_engine.reinstate_subscription_path(:id => sub.subscription_id), :method => :put, :class => 'btn btn-xs' %>
-          <% elsif !is_cancelled?(sub) %>
+          <% elsif !is_subscription_cancelled?(sub) %>
               <% if can? :change_plan, Kaui::Subscription %>
                   <%= link_to 'Change', kaui_engine.edit_subscription_path(sub.subscription_id), :class => 'btn btn-xs' %>
               <% end %>
@@ -50,13 +52,14 @@
     $('#subscriptions_<%= bundle.bundle_id %>').dataTable({
       "dom": "t",
       "paging": false,
-      "order": [[ 2, "asc" ]],
+      "order": [[ 3, "asc" ]],
       "columns": [
       null,
       null,
       null,
       null,
       null,
+      null,
       { "orderable": false }
       ]
     });

data/config/routes.rb

@@ -75,6 +75,7 @@ Kaui::Engine.routes.draw do
   scope '/payments' do
     match '/pagination' => 'payments#pagination', :via => :get, :as => 'payments_pagination'
     match '/:id' => 'payments#restful_show', :via => :get, :as => 'payment'
+    match '/:id/cancel_scheduled_payment' => 'payments#cancel_scheduled_payment', :via => :delete, :as => 'payment_cancel_scheduled_payment'
   end
 
   scope '/bundles' do
@@ -117,7 +118,14 @@ Kaui::Engine.routes.draw do
 
   resources :admin_tenants, :only => [ :index, :new, :create, :show ]
   scope '/admin_tenants' do
+    match '/:id/new_catalog' => 'admin_tenants#new_catalog', :via => :get, :as => 'admin_tenant_new_catalog'
+    match '/:id/new_plan_currency' => 'admin_tenants#new_plan_currency', :via => :get, :as => 'admin_tenant_new_plan_currency'
+    match '/:id/new_overdue_config' => 'admin_tenants#new_overdue_config', :via => :get, :as => 'admin_tenant_new_overdue_config'
     match '/upload_catalog' => 'admin_tenants#upload_catalog', :via => :post, :as => 'admin_tenant_upload_catalog'
+    match '/display_catalog_xml' => 'admin_tenants#display_catalog_xml', :via => :post, :as => 'admin_tenant_display_catalog_xml'
+    match '/display_overdue_xml' => 'admin_tenants#display_overdue_xml', :via => :post, :as => 'admin_tenant_display_overdue_xml'
+    match '/create_simple_plan' => 'admin_tenants#create_simple_plan', :via => :post, :as => 'admin_tenant_create_simple_plan'
+    match '/modify_overdue_config' => 'admin_tenants#modify_overdue_config', :via => :post, :as => 'admin_tenant_modify_overdue_config'
     match '/upload_overdue_config' => 'admin_tenants#upload_overdue_config', :via => :post, :as => 'admin_tenant_upload_overdue_config'
     match '/upload_invoice_template' => 'admin_tenants#upload_invoice_template', :via => :post, :as => 'admin_tenant_upload_invoice_template'
     match '/upload_invoice_translation' => 'admin_tenants#upload_invoice_translation', :via => :post, :as => 'admin_tenant_upload_invoice_translation'

data/db/ddl.sql

@@ -10,13 +10,16 @@ CREATE TABLE `kaui_users` (
 
 CREATE TABLE `kaui_tenants` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) DEFAULT NULL,
+  `name` varchar(255) NOT NULL,
   `kb_tenant_id` varchar(255) DEFAULT NULL,
   `api_key` varchar(255) DEFAULT NULL,
   `encrypted_api_secret` varchar(255) DEFAULT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `kaui_tenants_kb_name` (`name`),
+  UNIQUE KEY `kaui_tenants_kb_tenant_id` (`kb_tenant_id`),
+  UNIQUE KEY `kaui_tenants_kb_api_key` (`api_key`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `kaui_allowed_users` (

data/kaui.gemspec

@@ -29,10 +29,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'js-routes', '~> 1.1'
   s.add_dependency 'jquery-rails', '~> 3.0.4'
+  s.add_dependency 'jquery-ui-rails', '~> 5.0.5'
   s.add_dependency 'jquery-datatables-rails', '~> 3.3.0'
   s.add_dependency 'money-rails', '~> 1.3.0'
   s.add_dependency 'd3_rails', '~> 3.2.8'
-  s.add_dependency 'killbill-client', '~> 0.22'
+  s.add_dependency 'killbill-client', '~> 1.0'
   s.add_dependency 'twitter-bootstrap-rails', '~> 3.2.0'
   s.add_dependency 'bootstrap-datepicker-rails', '~> 1.4.0'
   s.add_dependency 'devise', '~> 3.4.1'
@@ -42,7 +43,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sass-rails', '~> 5.0.2'
   s.add_dependency 'less-rails', '~> 2.7.0'
   s.add_dependency 'concurrent-ruby', '~> 1.0.0.pre1'
-
+  s.add_dependency 'sprockets-rails', '2.3.3'
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'multi_json', '~> 1.11'
   s.add_development_dependency 'rake', '>= 0.8.7'