kaui 2.0.0 → 2.1.0

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

@@ -106,8 +106,8 @@
                 plan['new_plan_currency_path'] = Routes.kaui_engine_admin_tenant_new_plan_currency_path(<%= @tenant.id %>, {plan_id: plan['plan_id']});
                 plan['humanized_product_name'] = function(){
                     return function (input, render) {
-                        var product_name = render(input);
-                        return product_name.toLowerCase().replace(/\b\w/g, function(l){ return l.toUpperCase() });
+                        // Keep the product name as-is to avoid confusing with casing
+                        return render(input);
                     }
                 }
 

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

@@ -11,7 +11,7 @@
       <div class="form-group" id="form_category">
         <%= f.label :product_category, 'Product Category', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :product_category, options_for_select(@product_categories.map {|p| [humanized_product_category(p), p] }, :Base), :class => 'form-control' %>
+          <%= f.select :product_category, options_for_select(@product_categories.map {|p| [humanized_product_category(p), p] }, @simple_plan.product_category), :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
@@ -47,31 +47,31 @@
       <div class="form-group">
         <%= f.label :amount, 'Amount', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.number_field :amount, :class => 'form-control', :value => 0, :step => :any %>
+          <%= f.number_field :amount, :class => 'form-control', :step => :any %>
         </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' %>
+          <%= f.select :currency, currencies, {:selected => @simple_plan.currency}, :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :billing_period, 'Billing Period', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :billing_period, options_for_select(@billing_period.map {|bp| [humanized_billing_period(bp), bp] }, :MONTHLY), :class => 'form-control' %>
+          <%= f.select :billing_period, options_for_select(@billing_period.map {|bp| [humanized_billing_period(bp), bp] }, @simple_plan.billing_period), :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :trial_length, 'Trial Length', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.number_field :trial_length, :class => 'form-control', :value => 0 %>
+          <%= f.number_field :trial_length, :class => 'form-control', :type => 'number', :min => 0, :step => 1 %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :trial_time_unit, 'Trial Time Unit', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :trial_time_unit, options_for_select(@time_units.map {|tu| [humanized_time_unit(tu), tu]}, :UNLIMITED), :class => 'form-control' %>
+          <%= f.select :trial_time_unit, options_for_select(@time_units.map {|tu| [humanized_time_unit(tu), tu]}, @simple_plan.trial_time_unit), :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
@@ -111,15 +111,19 @@
 
 function known_products() {
     var result = [];
-    var selected_category = $("#simple_plan_product_category option:selected" ).text();
-    if (selected_category == 'Base') {
+    var selected_category = $("#simple_plan_product_category option:selected").val();
+    if (selected_category == 'BASE') {
         result = $('#simple_plan_product_name').attr('known_base');
-    } else if (selected_category == 'Add_on') {
+    } else if (selected_category == 'ADD_ON') {
         result = $('#simple_plan_product_name').attr('known_ao');
     } else {
         result = $('#simple_plan_product_name').attr('known_std');
     }
-    return result.split(",");
+    if (result) {
+      return result.split(",");
+    } else {
+      return [];
+    }
 }
 
 function switch_xml_config() {
@@ -128,7 +132,7 @@ function switch_xml_config() {
 }
 
 function recompute_available_base_products_for_ao() {
-    if ($("#simple_plan_product_category option:selected" ).text() != 'Add_on') {
+    if ($("#simple_plan_product_category option:selected" ).val() != 'ADD_ON') {
         return;
     }
     var product_name = $('#simple_plan_product_name').val();
@@ -147,10 +151,7 @@ function recompute_available_base_products_for_ao() {
 }
 
 function display_available_base_products_for_ao() {
-    /* Reset prodcut name value; known_products from auto completion will also be updated accordingly */
-    $('#simple_plan_product_name').val('');
-
-    if ($("#simple_plan_product_category option:selected" ).text() == 'Add_on') {
+    if ($("#simple_plan_product_category option:selected" ).val() == 'ADD_ON') {
         $('#form_base_products').show();
     } else {
         $('#form_base_products').hide();

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

@@ -0,0 +1,12 @@
+<table class="transparent subtitle">
+  <tr>
+    <th>Bundle ID</th>
+    <td><%= bundle.bundle_id %></td>
+  </tr>
+  <% unless bundle.bundle_id == bundle.external_key %>
+    <tr>
+      <th>Bundle key</th>
+      <td><%= bundle.external_key %></td>
+    </tr>
+  <% end %>
+</table>

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

@@ -10,19 +10,8 @@
 
   <% @bundles.each_with_index do |bundle, idx| %>
       <div class="row">
-        <div class="col-md-5">
-          <table class="transparent subtitle">
-            <tr>
-              <th>Bundle ID</th>
-              <td><%= bundle.bundle_id %></td>
-            </tr>
-            <% unless bundle.bundle_id == bundle.external_key %>
-                <tr>
-                  <th>Bundle key</th>
-                  <td><%= bundle.external_key %></td>
-                </tr>
-            <% end %>
-          </table>
+        <div class="col-md-6">
+          <%= render :partial => Kaui.bundle_details_partial, :locals => { :bundle => bundle, :account => @account, :catalog => @catalog } %>
         </div>
       </div>
 
@@ -76,7 +65,7 @@
 
         <% if bundle.subscriptions.present? %>
             <div class="search">
-              <%= render :partial => 'kaui/subscriptions/subscriptions_table', :locals => {:bundle => bundle, :account => @account} %>
+              <%= render :partial => 'kaui/subscriptions/subscriptions_table', :locals => {:bundle => bundle, :account => @account, :catalog => @catalog} %>
             </div>
         <% end %>
 

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.number_field :amount, :id => 'chargeback_amount', :class => 'form-control' %>
+        <%= f.number_field :amount, :step => :any, :id => 'chargeback_amount', :class => 'form-control' %>
         <p class="help-block">Currency: <%= @chargeback.currency %></p>
       </div>
     </div>

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.number_field :amount, :id => 'charge_amount', :class => 'form-control' %>
+        <%= f.number_field :amount, :step => :any, :id => 'charge_amount', :class => 'form-control' %>
         <% if @invoice.present? %>
             <p class="help-block">Currency: <%= @invoice.currency %></p>
         <% end %>

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

@@ -0,0 +1,33 @@
+<%= form_tag update_invoice_tags_path, :class => 'form-horizontal' do %>
+    <%= hidden_field_tag :invoice_id, @invoice_id %>
+
+    <div class='form-group'>
+      <div class="col-sm-offset-2 col-sm-10">
+        <% @available_tags.each do |tag| %>
+            <div class="checkbox">
+              <label>
+                <%= check_box_tag "tag_#{tag.id}", tag.name, @tag_names.include?(tag.name) %>
+                <span class='tag-description' rel='tooltip' title='<%= tag.description %>'><%= tag.name %></span>
+              </label>
+            </div>
+        <% end %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :comment, 'Comment', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= submit_tag 'Update', :class => 'btn btn-default' %>
+      </div>
+    </div>
+<% end %>
+
+<%= javascript_tag do %>
+$(function() {
+  $(".tag-description").tooltip();
+});
+<% end %>

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

@@ -0,0 +1,21 @@
+<% can_change_tags = can?(:add, Kaui::Tag) || can?(:delete, Kaui::Tag) %>
+<%= form_tag update_invoice_tags_path do %>
+  <%= hidden_field_tag :invoice_id, invoice_id %>
+
+  <% 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 %>
+        <label class='tag-description' rel='tooltip' title='<%= tag.description %>'><%= tag.name %></label>
+    <% end %>
+
+    <% if can_change_tags %>
+        <%= label_tag :comment, 'Comment', :class => 'col-sm-2 control-label' %>
+        <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
+        <%= submit_tag 'Update', :class => 'btn btn-default' %>
+    <% end %>
+<% end %>
+
+<%= javascript_tag do %>
+$(function() {
+  $(".tag-description").tooltip();
+});
+<% end %>

data/app/views/kaui/invoice_tags/edit.html.erb

@@ -0,0 +1,10 @@
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Add/Remove Tags</h1>
+      <%= render 'form' %>
+    </div>
+
+  </div>
+</div>

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

@@ -1,14 +1,22 @@
 <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).blank? || display_payment_options %>
+     if !(@available_invoice_tags ||= nil).blank? || !(@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>-->
-        <!--<div class="tag-select-box">-->
-        <!--<strong>Tag As:</strong>-->
-        <!--</div>-->
-        <!--</div>-->
+        <% unless @available_invoice_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/invoice_tags/form_bar',
+                         :locals => {:account_id => @account.account_id,
+                                     :invoice_id => @invoice.invoice_id,
+                                     :tag_names => @invoice_tags.map { |tag| tag.tag_definition_name },
+                                     :available_tags => @available_invoice_tags} %>
+            </div>
+          </div>
+        <% end %>
         <%= render :partial => 'kaui/custom_fields/list_bar',
                    :locals => {:custom_fields => @custom_fields} %>
 
@@ -35,6 +43,19 @@
             </div>
         <% end %>
 
+        <% if can?(:void, Kaui::Invoice) && @invoice.status != 'VOID' && @invoice_tags.find { |t| t.tag_definition_name == 'WRITTEN_OFF' }.nil? # The backend will do more comprehensive checks %>
+          <div class="tag-select" onclick="void(0)">
+            <span><i class="fa fa-trash"></i><i class="fa fa-caret-down"></i></span>
+
+            <div class="tag-select-box">
+              <%= form_tag void_invoice_path(:id => @invoice.invoice_id), :method => :delete do %>
+                <%= label_tag :comment, 'Comment', :class => 'col-sm-2 control-label' %>
+                <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
+                <%= submit_tag 'Void', :class => 'btn btn-default' %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
       </div>
   <% end %>
 
@@ -82,7 +103,7 @@
 
               </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.pretty_plan_name.blank? || !item.item_type.in?(%w{USAGE RECURRING}) ? item.description : item.pretty_plan_name %></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>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.subscription_id %></td>
@@ -130,7 +151,7 @@
 
 <script language="javascript">
     function hightlightLinkedItems(invoice_item_id, linked_invoice_item_id) {
-        $("#invoice_table tr:gt(0)").each(function (index) {
+        $("#invoice-table tr:gt(0)").each(function (index) {
             var ids = $(this).attr("id").split("_");
             var item_id = ids[2];
             var linked_item_id = ids[3];

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

@@ -8,9 +8,9 @@
       <thead>
       <tr>
         <th>Number</th>
-        <th>Date</th>
-        <th>Amount</th>
-        <th>Balance</th>
+        <% (@account.account_id.blank? ? Kaui.invoice_search_columns : Kaui.account_invoices_columns).call()[0].each do |title| %>
+          <th><%= title %></th>
+        <% end %>
       </tr>
       </thead>
       <tbody>
@@ -43,7 +43,9 @@ $(document).ready(function() {
         "paging": false,
         "ajax": "<%= invoices_pagination_path :format => :json %>",
     <% end %>
-    <% unless @ordering.blank? %>
+    <% if @search_query.blank? %>
+        "ordering": false,
+    <% elsif !@ordering.blank? %>
         "order": [[ 0, "<%= @ordering %>" ]],
     <% end %>
     "processing": true,

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

@@ -5,7 +5,7 @@
     <h1>
       Invoice <%= @invoice.invoice_number %>
       <% unless @invoice.invoice_number.blank? %>
-        <%= link_to 'View customer invoice html', kaui_engine.show_html_invoice_path(@invoice.invoice_id), :class => 'btn', :target => '_blank' %>
+        <%= Kaui.customer_invoice_link.call(@invoice, self) %>
       <% end %>
     </h1>
 
@@ -22,6 +22,15 @@
           This is a DRAFT invoice.
           <%= link_to 'Commit it', kaui_engine.commit_invoice_path(:id => @invoice.invoice_id), :method => :post %>.
         </div>
+    <% elsif @invoice.status == 'VOID' %>
+        <div class="alert alert-danger">
+          This invoice has been voided.
+        </div>
+    <% end %>
+    <% unless @invoice_tags.find { |t| t.tag_definition_name == 'WRITTEN_OFF' }.nil? %>
+      <div class="alert alert-danger">
+        This invoice has been written off.
+      </div>
     <% end %>
 
     <div class="row">
@@ -105,7 +114,7 @@
     $('#invoice-table').dataTable({
       "dom": "t",
       "paging": false,
-      "order": [[ 1, "asc" ]],
+      "order": [],
       "columns": [
         null,
         null,

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

@@ -8,6 +8,13 @@
         </div>
     <% end %>
 <% end %>
+<% if flash[:warning] %>
+  <div class="row server-alert">
+    <div class="col-md-12">
+      <div class="alert alert-warning"><%= flash[:warning] %></div>
+    </div>
+  </div>
+<% end %>
 <% if flash[:notice] %>
     <div class="row server-alert">
       <div class="col-md-12">
@@ -36,4 +43,4 @@
       <span id="ajaxInfoAlertMessage" class="ajaxAlertMessage"></span>
     </div>
   </div>
-</div>
+</div>

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

@@ -14,7 +14,7 @@
     <div class="form-group">
       <%= f.label :purchased_amount, 'Amount', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= f.number_field :purchased_amount, :id => 'payment_amount', :class => 'form-control' %>
+        <%= f.number_field :purchased_amount, :step => :any, :id => 'payment_amount', :class => 'form-control' %>
         <p class="help-block">Currency: <%= @invoice.present? ? @invoice.currency : @account.currency %></p>
       </div>
     </div>

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

@@ -126,8 +126,8 @@
                 <% end %>
                 <% (transaction.properties || []).sort_by { |p| p.key }.each do |property| %>
                     <% next if property.value.blank? %>
-                    <li><%= property.key %>
-                      : <%= is_json?(property.value) ? "<pre>#{JSON.pretty_generate(JSON.parse(property.value))}</pre>".html_safe : property.value %></li>
+                    <li><strong><%= property.key %>:</strong>
+                        <%= is_json?(property.value) ? "<pre>#{JSON.pretty_generate(JSON.parse(property.value))}</pre>".html_safe : property.value %></li>
                 <% end %>
               </ul>
             </td>

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

@@ -46,7 +46,9 @@ $(document).ready(function() {
         "paging": false,
         "ajax": "<%= payments_pagination_path :format => :json %>",
     <% end %>
-    <% unless @ordering.blank? %>
+    <% if @search_query.blank? %>
+        "ordering": false,
+    <% elsif !@ordering.blank? %>
         "order": [[ 0, "<%= @ordering %>" ]],
     <% end %>
     "processing": true,

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

@@ -9,7 +9,7 @@
     <div class="form-group">
       <%= label_tag :price_override, 'Price Override', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= number_field_tag :price_override, nil, :class => 'form-control' %>
+        <%= number_field_tag :price_override, nil, :step => :any, :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">

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

@@ -37,7 +37,7 @@
     <div class="form-group">
       <%= label_tag :price_override, 'Price Override', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= number_field_tag :price_override, nil, :class => 'form-control' %>
+        <%= number_field_tag :price_override, nil, :step => :any, :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">

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

@@ -4,8 +4,8 @@
     <% unless @available_subscription_tags.blank? && @custom_fields_per_subscription.blank? %>
       <th></th>
     <% end %>
-    <th>Product category</th>
-    <th>Product name</th>
+    <th>Category</th>
+    <th>Name</th>
     <th>Phase type</th>
     <th>Start date</th>
     <th>Charged through date</th>
@@ -47,7 +47,7 @@
             <%= humanized_subscription_product_category(sub) %>
           </span>
         </td>
-        <td><%= humanized_subscription_full_product_name(sub) %></td>
+        <td><%= humanized_subscription_plan_or_product_name(sub, catalog) %></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>