kaui 2.0.4 → 2.1.0

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

@@ -44,8 +44,8 @@
           </div>
           <div class="form-group">
             <%= label_tag :configuration, 'Configuration', :class => 'col-sm-2 control-label' %>
-            <div class="col-sm-4">
-              <textarea name="plugin_properties[raw_config]" id="raw_config" rows="10" class="form-control"></textarea>
+            <div class="col-sm-6">
+              <textarea name="plugin_properties[raw_config]" id="raw_config" rows="20" class="form-control"></textarea>
             </div>
           </div>
 
@@ -170,9 +170,19 @@
             /* Retrieve existing plugin properties for this tenant */
             var existing_props = get_existing_tenant_plugin_properties(plugin_key);
 
-            // try by plugin name for proprietary plugins
+            // Try by plugin name for proprietary plugins
             if (isBlank(existing_props) && !isBlank(plugin_name)) {
                 existing_props = get_existing_tenant_plugin_properties(plugin_name);
+                if (isBlank(existing_props)) {
+                    // For proprietary plugins, the killbill- prefix likely doesn't exist (see Kaui::PluginHelper discussion)
+                    plugin_name = plugin_name.replace('killbill-', '');
+                    existing_props = get_existing_tenant_plugin_properties(plugin_name);
+                    if (isBlank(existing_props)) {
+                        // For proprietary plugins, our docs suggest acme:foo as the format for the plugin key, and often the plugin name becomes acme-foo
+                        plugin_name = plugin_name.replace(':', '-');
+                        existing_props = get_existing_tenant_plugin_properties(plugin_name);
+                    }
+                }
             }
 
             return existing_props;

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>
 

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 %>
 

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">

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/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/config/routes.rb

@@ -46,6 +46,10 @@ Kaui::Engine.routes.draw do
         match '/edit' => 'bundle_tags#edit', :via => :get, :as => 'edit_bundle_tags'
         match '/edit' => 'bundle_tags#update', :via => :post, :as => 'update_bundle_tags'
       end
+      scope '/invoice_tags' do
+        match '/edit' => 'invoice_tags#edit', :via => :get, :as => 'edit_invoice_tags'
+        match '/edit' => 'invoice_tags#update', :via => :post, :as => 'update_invoice_tags'
+      end
       scope '/timeline' do
         match '/' => 'account_timelines#show', :via => :get, :as => 'account_timeline'
       end
@@ -86,6 +90,7 @@ Kaui::Engine.routes.draw do
 
   scope '/payment_methods' do
     match '/validate_external_key' => 'payment_methods#validate_external_key', :via => :get, :as => 'payment_methods_validate_external_key'
+    match '/refresh' => 'payment_methods#refresh', :via => :post, :as => 'refresh_payment_methods'
   end
   resources :payment_methods, :only => [:new, :create, :show, :destroy]
 
@@ -94,6 +99,7 @@ Kaui::Engine.routes.draw do
     match '/:id/show_html' => 'invoices#show_html', :via => :get, :as => 'show_html_invoice'
     match '/:id' => 'invoices#restful_show', :via => :get, :as => 'invoice'
     match '/commit' => 'invoices#commit_invoice', :via => :post, :as => 'commit_invoice'
+    match '/void' => 'invoices#void_invoice', :via => :delete, :as => 'void_invoice'
   end
   resources :invoices, :only => [ :index ]
 

data/lib/kaui.rb

@@ -10,8 +10,18 @@ module Kaui
   mattr_accessor :new_user_session_path
   mattr_accessor :destroy_user_session_path
 
+  mattr_accessor :bundle_details_partial
+
+  mattr_accessor :pretty_account_identifier
   mattr_accessor :bundle_key_display_string
   mattr_accessor :creditcard_plugin_name
+
+  mattr_accessor :account_search_columns
+  mattr_accessor :invoice_search_columns
+  mattr_accessor :account_invoices_columns
+
+  mattr_accessor :customer_invoice_link
+
   mattr_accessor :layout
 
   mattr_accessor :thread_pool
@@ -39,9 +49,54 @@ module Kaui
   self.home_path = lambda { Kaui::Engine.routes.url_helpers.home_path }
   self.tenant_home_path = lambda { Kaui::Engine.routes.url_helpers.tenants_path }
 
+  self.bundle_details_partial = 'kaui/bundles/bundle_details'
+
+  self.pretty_account_identifier = lambda { |account| account.name.presence || account.email.presence || Kaui::UuidHelper.truncate_uuid(account.external_key) }
   self.bundle_key_display_string =  lambda {|bundle_key| bundle_key }
   self.creditcard_plugin_name =  lambda { '__EXTERNAL_PAYMENT__' }
 
+  self.account_search_columns = lambda do |account=nil, view_context=nil|
+    [
+      ['External key', 'Balance'],
+      [
+        account&.external_key,
+        account.nil? || view_context.nil? ? nil : view_context.humanized_money_with_symbol(account.balance_to_money)
+      ]
+    ]
+  end
+
+  self.invoice_search_columns = lambda do |invoice=nil, view_context=nil|
+    default_label = 'label-info'
+    default_label = 'label-default' if invoice&.status == 'DRAFT'
+    default_label = 'label-success' if invoice&.status == 'COMMITTED'
+    default_label = 'label-danger' if invoice&.status == 'VOID'
+    [
+      ['Date', 'Status'],
+      [
+        invoice&.invoice_date,
+        invoice.nil? || view_context.nil? ? nil : view_context.content_tag(:span, invoice.status, class: ['label', default_label])
+      ]
+    ]
+  end
+
+  self.account_invoices_columns = lambda do |invoice=nil, view_context=nil|
+    default_label = 'label-info'
+    default_label = 'label-default' if invoice&.status == 'DRAFT'
+    default_label = 'label-success' if invoice&.status == 'COMMITTED'
+    default_label = 'label-danger' if invoice&.status == 'VOID'
+    [
+      ['Date', 'Amount', 'Balance', 'Status'],
+      [
+        invoice&.invoice_date,
+        invoice.nil? || view_context.nil? ? nil : view_context.humanized_money_with_symbol(invoice.amount_to_money),
+        invoice.nil? || view_context.nil? ? nil : view_context.humanized_money_with_symbol(invoice.balance_to_money),
+        invoice.nil? || view_context.nil? ? nil : view_context.content_tag(:span, invoice.status, class: ['label', default_label])
+      ]
+    ]
+  end
+
+  self.customer_invoice_link = lambda { |invoice, ctx| ctx.link_to 'View customer invoice html', ctx.kaui_engine.show_html_invoice_path(invoice.invoice_id), :class => 'btn', :target => '_blank' }
+
   self.demo_mode = false
 
   # Root credentials for SaaS operations

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '2.0.4'
+  VERSION = '2.1.0'
 end

data/test/dummy/config/initializers/money.rb

@@ -0,0 +1,2 @@
+Money.locale_backend = :currency
+Money.rounding_mode = BigDecimal::ROUND_HALF_UP

data/test/functional/kaui/account_emails_controller_test.rb

@@ -24,14 +24,14 @@ class Kaui::AccountEmailsControllerTest < Kaui::FunctionalTestHelper
              :email => 'toto@example.com'
          }
     assert_redirected_to account_path(account_id)
-    assert_equal "Error while communicating with the Kill Bill server: Error 404: Object id=#{account_id} type=ACCOUNT doesn't exist!", flash[:error]
+    assert_equal "Error while communicating with the Kill Bill server: Object id=#{account_id} type=ACCOUNT doesn't exist!", flash[:error]
   end
 
   test 'should handle Kill Bill errors during deletion' do
     account_id = 'invalid-id'
     delete :destroy, :account_id => account_id, :id => 'toto@example.com'
     assert_redirected_to account_path(account_id)
-    assert_equal 'Error while communicating with the Kill Bill server: Error 404: ', flash[:error]
+    assert_equal 'Error while communicating with the Kill Bill server: ', flash[:error]
   end
 
   test 'should add and destroy email' do

data/test/functional/kaui/account_tags_controller_test.rb

@@ -6,7 +6,7 @@ class Kaui::AccountTagsControllerTest < Kaui::FunctionalTestHelper
     account_id = '1234'
     get :edit, :account_id => account_id
     assert_redirected_to account_path(account_id)
-    assert_equal 'Error while communicating with the Kill Bill server: Error 404: ', flash[:error]
+    assert_equal 'Error while communicating with the Kill Bill server: ', flash[:error]
   end
 
   test 'should get edit' do

data/test/functional/kaui/accounts_controller_test.rb

@@ -43,7 +43,7 @@ class Kaui::AccountsControllerTest < Kaui::FunctionalTestHelper
     account_id = SecureRandom.uuid.to_s
     get :show, :account_id => account_id
     assert_redirected_to home_path
-    assert_equal "Error while communicating with the Kill Bill server: Error 404: Object id=#{account_id} type=ACCOUNT doesn't exist!", flash[:error]
+    assert_equal "Error while communicating with the Kill Bill server: Object id=#{account_id} type=ACCOUNT doesn't exist!", flash[:error]
   end
 
   test 'should find account by id' do
@@ -101,7 +101,7 @@ class Kaui::AccountsControllerTest < Kaui::FunctionalTestHelper
 
     post :create, :account => {:external_key => external_key}
     assert_template :new
-    assert_equal "Error while creating account: Error 409: Account already exists for key #{external_key}", flash[:error]
+    assert_equal "Error while creating account: Account already exists for key #{external_key}", flash[:error]
   end
 
   test 'should create account' do
@@ -152,7 +152,7 @@ class Kaui::AccountsControllerTest < Kaui::FunctionalTestHelper
     account_id = SecureRandom.uuid.to_s
     put :set_default_payment_method, :account_id => account_id, :payment_method_id => @payment_method.payment_method_id
     assert_redirected_to home_path
-    assert_equal "Error while communicating with the Kill Bill server: Error 404: Object id=#{account_id} type=ACCOUNT doesn't exist!", flash[:error]
+    assert_equal "Error while communicating with the Kill Bill server: Object id=#{account_id} type=ACCOUNT doesn't exist!", flash[:error]
   end
 
   test 'should set default payment method' do
@@ -164,7 +164,7 @@ class Kaui::AccountsControllerTest < Kaui::FunctionalTestHelper
     account_id = SecureRandom.uuid.to_s
     post :pay_all_invoices, :account_id => account_id
     assert_redirected_to home_path
-    assert_equal "Error while communicating with the Kill Bill server: Error 404: Object id=#{account_id} type=ACCOUNT doesn't exist!", flash[:error]
+    assert_equal "Error while communicating with the Kill Bill server: Object id=#{account_id} type=ACCOUNT doesn't exist!", flash[:error]
   end
 
   test 'should pay all invoices' do