kaui 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03876ed3f2f539ca41f5d6ae33378309a842c6ba
-  data.tar.gz: 94fc7dd36b710fdaf45c27668b5791d64524914c
+  metadata.gz: 28ef571db6b75b46644076075d33cb15e11a3dd8
+  data.tar.gz: 99e00ae3e2183b20bf86572c406fffc8eafa7430
 SHA512:
-  metadata.gz: 8117303c14d31d75080506897654684d52fb44b1d85e4153b626df24b9b89d16ce8cb787329d68c7cff89e65f2e7bb731e785b23e7cfe82707286a45e832a464
-  data.tar.gz: 4b895ba401fb46e454206d26381dbfbcf648520af5e5bcdbdabce0da6cbfbb30386823c557f06edf0eb88e278899ce195cb92af0f060206c82cd55e889afc240
+  metadata.gz: 32268720a72836539a2c3bf0ea790c0296518d655827201c18811bd65f27efc4bfc1b4fd6623b0e866cd7296356d7195a99530dadb0e22a1d4bfe9e59b4763dd
+  data.tar.gz: fa8f0bddaf0be5b1ed46b279615abd31266ebf6fe6d9573ce3c1f3331918c2d2ca7e6dbdf927ad13875ecf7fc0d54f54031e46eb16c180c619c563ff974e1c76

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -58,6 +58,7 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     # Select the tenant, see TenantsController
     session[:kb_tenant_id] = tenant_model.kb_tenant_id
     session[:kb_tenant_name] = tenant_model.name
+    session[:tenant_id] = tenant_model.id
 
     redirect_to admin_tenant_path(tenant_model[:id]), :notice => 'Tenant was successfully configured'
   end

data/app/controllers/kaui/payments_controller.rb

@@ -53,6 +53,7 @@ class Kaui::PaymentsController < Kaui::EngineController
       [
           payment.payment_number.to_i,
           payment.payment_date,
+          payment.total_authed_amount_to_money,
           payment.paid_amount_to_money,
           payment.returned_amount_to_money,
           payment.transactions.empty? ? nil : payment.transactions[-1].status
@@ -63,6 +64,7 @@ class Kaui::PaymentsController < Kaui::EngineController
       [
           view_context.link_to(payment.payment_number, view_context.url_for(:controller => :payments, :action => :show, :account_id => payment.account_id, :id => payment.payment_id)),
           view_context.format_date(payment.payment_date),
+          view_context.humanized_money_with_symbol(payment.total_authed_amount_to_money),
           view_context.humanized_money_with_symbol(payment.paid_amount_to_money),
           view_context.humanized_money_with_symbol(payment.returned_amount_to_money),
           payment.transactions.empty? ? nil : view_context.colored_transaction_status(payment.transactions[-1].status)

data/app/controllers/kaui/tenants_controller.rb

@@ -16,13 +16,13 @@ class Kaui::TenantsController < Kaui::EngineController
       when 0
         tenant = KillBillClient.api_key.nil? ? nil : KillBillClient::Model::Tenant.find_by_api_key(KillBillClient.api_key, :session_id => current_user.kb_session_id)
         if tenant.present?
-          select_tenant_for_tenant_id(tenant.tenant_id, tenant.external_key)
+          select_tenant_for_tenant_id(tenant.tenant_id, tenant.external_key, nil)
         else
           redirect_to new_admin_tenant_path
         end
       when 1
         # If there is only one tenant defined we skip the screen and set the tenant for the user
-        select_tenant_for_tenant_id(@tenants[0].kb_tenant_id, @tenants[0].name)
+        select_tenant_for_tenant_id(@tenants[0].kb_tenant_id, @tenants[0].name, @tenants[0].id)
       else
         # Jump to default view allowing to chose which tenant to pick
     end
@@ -30,15 +30,16 @@ class Kaui::TenantsController < Kaui::EngineController
 
   def select_tenant
     tenant = Kaui::Tenant.find_by_kb_tenant_id(params.require(:kb_tenant_id))
-    select_tenant_for_tenant_id(tenant.kb_tenant_id, tenant.name)
+    select_tenant_for_tenant_id(tenant.kb_tenant_id, tenant.name, tenant.id)
   end
 
   private
 
-  def select_tenant_for_tenant_id(kb_tenant_id, kb_tenant_name_or_key)
+  def select_tenant_for_tenant_id(kb_tenant_id, kb_tenant_name_or_key, tenant_id)
     # Set kb_tenant_id in the session
     session[:kb_tenant_id] = kb_tenant_id
     session[:kb_tenant_name] = kb_tenant_name_or_key
+    session[:tenant_id] = tenant_id
 
     # Devise will have stored the requested url while signed-out
     redirect_to stored_location_for(:user) || Kaui.home_path.call

data/app/models/kaui/admin_tenant.rb

@@ -32,6 +32,9 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
 
       source = URI.parse('https://raw.githubusercontent.com/killbill/killbill-cloud/master/kpm/lib/kpm/plugins_directory.yml').read
       YAML.load(source)
+    rescue
+      # Ignore gracefully
+      {}
     end
 
     def get_oss_plugin_info(plugin_directory)

data/app/models/kaui/audit_log.rb

@@ -2,7 +2,7 @@ class Kaui::AuditLog
 
   def self.description(log)
     if log.changed_by.present?
-      changed_str = "Done by #{log.changed_by.strip}"
+      changed_str = "#{log.change_type} by #{log.changed_by.strip}"
       if log.reason_code.blank? && log.comments.blank?
         changed_str
       elsif log.reason_code.blank?

data/app/models/kaui/payment_state.rb

@@ -37,6 +37,10 @@ module Kaui::PaymentState
     refundable?
   end
 
+  def total_authed_amount_to_money
+    auth_amount_to_money + purchased_amount_to_money
+  end
+
   def paid_amount_to_money
     captured_amount_to_money + purchased_amount_to_money
   end

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

@@ -125,8 +125,11 @@
                     <td><%= transaction.transaction_type %></td>
                     <td>
                       <ul>
-                        <li><%= 'Amount:' %>&nbsp;<%= humanized_money_with_symbol Kaui::Transaction.amount_to_money(transaction) %>
-                          (<%= transaction.currency %>)
+                        <li>
+                          <% unless transaction.transaction_type == 'VOID' %>
+                            <%= 'Amount:' %>&nbsp;<%= humanized_money_with_symbol Kaui::Transaction.amount_to_money(transaction) %>
+                            (<%= transaction.currency %>)
+                          <% end %>
                         </li>
                         <li>
                           <%= colored_transaction_status(transaction.status) %>
@@ -140,8 +143,12 @@
                     <td>
                       <% if transaction.audit_logs.present? %>
                           <ul>
-                            <% transaction.audit_logs.each do |entry| %>
-                                <li><%= Kaui::AuditLog.description(entry) %></li>
+                            <% transaction.audit_logs
+                                   .map { |entry| Kaui::AuditLog.description(entry) }
+                                   .chunk { |x| x }
+                                   .map(&:first)
+                                   .each do |entry| %>
+                                <li><%= entry %></li>
                             <% end %>
                           </ul>
                       <% end %>

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

@@ -64,7 +64,17 @@
             <nav>
               <ul class="account-menu">
                 <% if user_signed_in? -%>
-                    <li><%= session[:kb_tenant_name].present? ? "#{current_user.kb_username} / #{session[:kb_tenant_name]}" : current_user.kb_username %></li>
+                    <li>
+                      <% if session[:kb_tenant_name].present? %>
+                          <% if session[:tenant_id].present? %>
+                              <%= link_to("#{current_user.kb_username} / #{session[:kb_tenant_name]}", kaui_engine.admin_tenant_path(session[:tenant_id])) %>
+                          <% else %>
+                              <%= "#{current_user.kb_username} / #{session[:kb_tenant_name]}" %>
+                          <% end %>
+                      <% else %>
+                          <%= current_user.kb_username %>
+                      <% end %>
+                    </li>
                     <li><%= link_to 'Sign Out', kaui_engine.destroy_user_session_path, :method => :delete %></li>
                 <% else %>
                     <li><%= link_to 'Login'.html_safe, kaui_engine.new_user_session_path %></li>

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

@@ -9,7 +9,8 @@
       <tr>
         <th>Number</th>
         <th>Date</th>
-        <th>Amount</th>
+        <th>Auth amount</th>
+        <th>Capture amount</th>
         <th>Refund amount</th>
         <th>Last transaction status</th>
       </tr>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '0.15.2'
+  VERSION = '0.15.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement