kaui 0.15.0 → 0.15.1

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

@@ -0,0 +1,18 @@
+<div class="col-md-6">
+
+  <div class="column-block">
+
+    <h1>Useful links</h1>
+
+    <ul>
+      <li><%= link_to 'Parked accounts', kaui_engine.tags_path(:q => '__PARK__') %></li>
+      <li><%= link_to 'AUTO_INVOICING_OFF accounts', kaui_engine.tags_path(:q => 'AUTO_INVOICING_OFF') %></li>
+      <li><%= link_to 'AUTO_PAY_OFF accounts', kaui_engine.tags_path(:q => 'AUTO_PAY_OFF') %></li>
+      <li><%= link_to 'PENDING payments', kaui_engine.payments_path(:q => 'PENDING') %></li>
+      <li><%= link_to 'UNKNOWN payments', kaui_engine.payments_path(:q => 'UNKNOWN') %></li>
+      <li><%= link_to 'Queues', kaui_engine.queues_path %></li>
+    </ul>
+
+  </div>
+
+</div>

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

@@ -95,7 +95,6 @@
   <% end %>
 </div>
 
-
 <%= javascript_tag do %>
 
 function known_products() {

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

@@ -79,7 +79,6 @@
   <% end %>
 </div>
 
-
 <%= javascript_tag do %>
 
 

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

@@ -1,16 +1,10 @@
-<div class="column-block">
+<%= render :partial => 'tenant_details' %>
 
-  <h1>Tenant details</h1>
-
-  <b>Name:</b> <%= @tenant.name %>
-  <br/>
-  <b>Tenant ID:</b> <%= @tenant.kb_tenant_id %>
-  <br/>
-  <b>API Key:</b> <%= @tenant.api_key %>
-
-</div>
+<%= render :partial => 'useful_links' %>
 
 <% unless @allowed_users.empty? %>
+  <div class="col-md-12">
+
     <div class="search">
 
       <div class="column-block">
@@ -30,7 +24,7 @@
                 <td><%= link_to u.kb_username, admin_allowed_user_path(u.id) %></td>
                 <td><%= u.description %></td>
                 <td>
-                  <% if Kaui.root_username == current_user.kb_username %>
+                  <% if current_user.root? %>
                       <button type="button" class="btn btn-default btn-sm" id="<%= "allowed-user-remove-#{u.id}" %>">
                         <span class="fa fa-times"></span>
                       </button>
@@ -45,6 +39,8 @@
 
     </div>
 
+  </div>
+
     <%= javascript_tag do %>
       $(document).ready(function() {
         $('#allowed-users-for-tenant-table').dataTable({
@@ -62,7 +58,7 @@
 <% end %>
 
 <div class="container">
-  <ul class="nav nav-tabs">
+  <ul class="nav nav-tabs" id="tenant_tabs" active_tab="<%= @active_tab %>">
     <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>
@@ -83,6 +79,30 @@
 </div>
 
 <%= javascript_tag do %>
+
+
+   function updateBrowserHistory(target) {
+      // Check if we are already on the right tab
+      res = $.grep(location.href.split('?'), function(el) {
+        if (el.startsWith("active_tab")) {
+          return true;
+        }
+      });
+      if (res.length > 0) {
+        if (res[0].split('=')[1] == target) {
+          return;
+        }
+      }
+
+     // If not update the browser history
+     var base_url = location.href.split('?')[0]
+     var newUrl = base_url + "?active_tab=" + target
+
+     var stateObj = { tenantTab: target };
+     history.pushState(stateObj, "New tab ", newUrl);
+    }
+
+
   $(document).ready(function() {
     $('[id^=allowed-user-remove-]').click(function() {
       var allowedUser = $(this);
@@ -93,5 +113,15 @@
         error: function(request, textStatus, errorThrown) { console.log("AJAX FAILED!!!! request.status " + request.status + ", textStatus = " + textStatus); return false; }
       });
     });
+
+    $('#tenant_tabs li').on('shown.bs.tab', function (e) {
+      var target = $(e.target).attr("href");
+      updateBrowserHistory(target.split('#')[1])
+    });
+
+
+    if ($('#tenant_tabs').attr('active_tab') != "") {
+      $('#tenant_tabs a[href="#' + $('#tenant_tabs').attr('active_tab') + '"]').tab('show');
+    }
   });
 <% end %>

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

@@ -8,6 +8,13 @@
       <% end %>
 
     </div>
+    <div class="col-md-6 col-md-offset-3 legend">
+      <p class="text-center">
+        <%= link_to 'Latest accounts', kaui_engine.accounts_path %> /
+        <%= link_to 'Latest invoices', kaui_engine.invoices_path %> /
+        <%= link_to 'Latest payments', kaui_engine.payments_path %>
+      </p>
+    </div>
   </div>
-  <span class="duck_help">You can search accounts by ID, external key, name, company or email address.</span>
+  <span class="duck_help">Accounts are searched by default. Or try the <b>invoice:</b> and <b>payment:</b> and <b>transaction:</b> operators</span>
 </div>

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

@@ -1,6 +1,6 @@
 <div class="info-wrapper">
 
-  <% if can?(:credit, Kaui::Account) || can?(:charge, Kaui::Account) || (@invoice.balance > 0 && can?(:trigger, Kaui::Payment)) %>
+  <% if !dry_run && (can?(:credit, Kaui::Account) || can?(:charge, Kaui::Account) || (@invoice.balance > 0 && can?(:trigger, Kaui::Payment))) %>
       <div class="tag-bar">
         <!--<div class="tag-select">-->
         <!--<span><i class="fa fa-tag"></i><i class="fa fa-caret-down"></i></span>-->

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

@@ -27,9 +27,19 @@
 <%= javascript_tag do %>
 $(document).ready(function() {
   $('#invoices-table').dataTable({
-    "dom": "t",
-    "paging": false,
-    "order": [[ 0, "desc" ]],
+    <% if @search_query.blank? %>
+        "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+        "pagingType": "full_numbers",
+        "pageLength": <%= @limit %>,
+        "displayStart": <%= @offset %>,
+    <% else %>
+        // No paging for per-account listings
+        "dom": "t",
+        "paging": false,
+    <% end %>
+    <% unless @ordering.blank? %>
+        "order": [[ 0, "<%= @ordering %>" ]],
+    <% end %>
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},

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

@@ -4,6 +4,16 @@
 
     <h1>Invoice <%= @invoice.invoice_number %></h1>
 
+    <% dry_run = @invoice.invoice_number.blank? %>
+    <% if dry_run %>
+        <div class="alert alert-warning">
+          This is a dry-run invoice.
+          <% if can? :trigger, Kaui::Invoice %>
+              To persist it, <%= link_to 'trigger an invoice run', kaui_engine.trigger_invoice_path(:account_id => @invoice.account_id, :target_date => @invoice.target_date), :method => :post %>.
+          <% end %>
+        </div>
+    <% end %>
+
     <div class="row">
       <div class="col-md-3">
         <table class="transparent subtitle">
@@ -19,7 +29,7 @@
       </div>
     </div>
 
-    <%= render :partial => 'invoice_table' %>
+    <%= render :partial => 'kaui/invoices/invoice_table', :locals => {:dry_run => dry_run} %>
 
   </div>
 

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

@@ -8,6 +8,10 @@
     <%= 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') %>
+
+    <% if current_user.root? %>
+        <%= link_to 'Queues', kaui_engine.account_queues_path(params[:account_id]), :class => (params[:controller].ends_with?('queues') ? 'current' : 'non-current') %>
+    <% end %>
   </div>
 
 </div>

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

@@ -24,26 +24,33 @@
 
           <div id="main-menu" class="col-xs-6">
 
-            <% if user_signed_in? && tenant_selected? -%>
+            <% if user_signed_in? -%>
                 <div class="tag-bar tag-bar-no-border">
 
-                  <div class="tag-select" onclick="void(0)">
-                    <span><i class="fa fa-tags"></i><i class="fa fa-caret-down"></i></span>
+                  <% if tenant_selected? -%>
+                      <div class="tag-select" onclick="void(0)">
+                        <span><i class="fa fa-tags"></i><i class="fa fa-caret-down"></i></span>
 
-                    <div class="tag-select-box">
-                      <%= link_to 'Tags', kaui_engine.tags_path %>
-                      <%= link_to 'Tag definitions', kaui_engine.tag_definitions_path %>
-                      <%= link_to 'Custom Fields', kaui_engine.custom_fields_path %>
-                    </div>
-                  </div>
+                        <div class="tag-select-box">
+                          <%= link_to 'Tags', kaui_engine.tags_path %>
+                          <%= link_to 'Tag definitions', kaui_engine.tag_definitions_path %>
+                          <%= link_to 'Custom Fields', kaui_engine.custom_fields_path %>
+                        </div>
+                      </div>
+                  <% end %>
 
-                  <% if can? :view, Kaui::AdminTenant %>
+                  <% if current_user.root? || can?(:view, Kaui::AdminTenant) %>
                       <div class="tag-select" onclick="void(0)">
                         <span><i class="fa fa-cogs"></i><i class="fa fa-caret-down"></i></span>
 
                         <div class="tag-select-box">
-                          <%= link_to 'Users', kaui_engine.admin_allowed_users_path %>
-                          <%= link_to 'Tenants', kaui_engine.admin_tenants_path %>
+                          <% if can? :view, Kaui::AdminTenant %>
+                              <%= link_to 'Users', kaui_engine.admin_allowed_users_path %>
+                              <%= link_to 'Tenants', kaui_engine.admin_tenants_path %>
+                          <% end %>
+                          <% if current_user.root? %>
+                              <%= link_to 'Admin', kaui_engine.admin_path %>
+                          <% end %>
                         </div>
                       </div>
                   <% end %>

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

@@ -1,4 +1,4 @@
-<div class="info-wrapper">
+<div class="info-wrapper" >
 
   <% if payment.capturable? || payment.voidable? || (payment.refundable? && (can?(:refund, Kaui::Payment) || can?(:chargeback, Kaui::Payment))) %>
       <div class="tag-bar">
@@ -64,56 +64,66 @@
       </div>
   <% end %>
 
-  <table id="payment_<%= payment.payment_id %>" class="table table-condensed mobile-data">
-    <thead>
-    <tr>
-      <th>Date</th>
-      <th>Type</th>
-      <th>Amount</th>
-      <th>First id</th>
-      <th>Second id</th>
-      <th>Gateway code</th>
-      <th>Gateway message</th>
-      <th>Status</th>
-    </tr>
-    </thead>
-    <tbody>
-    <% (payment.transactions || []).each do |transaction| %>
-        <tr>
-          <td><%= format_date(transaction.effective_date, account.time_zone).html_safe %></td>
-          <td><%= transaction.transaction_type %></td>
-          <td>
-            <% if transaction.amount.present? %>
-                <%= humanized_money_with_symbol Kaui::Transaction.amount_to_money(transaction) %>
-                (<%= transaction.currency %>)
-            <% end %>
-          </td>
-          <td><%= transaction.first_payment_reference_id %></td>
-          <td><%= transaction.second_payment_reference_id %></td>
-          <td><%= transaction.gateway_error_code %></td>
-          <td><%= transaction.gateway_error_msg %></td>
-          <td>
-            <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>
+  <div style="overflow-x: auto;">
+    <table id="payment_<%= payment.payment_id %>" class="table table-condensed mobile-data">
+      <thead>
+      <tr>
+        <th>Date</th>
+        <th>Type</th>
+        <th>Amount</th>
+        <th>First id</th>
+        <th>Second id</th>
+        <th>Gateway code</th>
+        <th>Gateway message</th>
+        <th>Status</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% (payment.transactions || []).each do |transaction| %>
+          <tr>
+            <td><%= format_date(transaction.effective_date, account.time_zone).html_safe %></td>
+            <td><%= transaction.transaction_type %></td>
+            <td>
+              <% if transaction.amount.present? %>
+                  <%= humanized_money_with_symbol Kaui::Transaction.amount_to_money(transaction) %>
+                  (<%= transaction.currency %>)
               <% end %>
-            </ul>
-          </td>
-        </tr>
-    <% end %>
-    </tbody>
-  </table>
+            </td>
+            <td><%= transaction.first_payment_reference_id %></td>
+            <td><%= transaction.second_payment_reference_id %></td>
+            <td><%= transaction.gateway_error_code %></td>
+            <td><%= transaction.gateway_error_msg %></td>
+            <td>
+              <ul style="list-style: none; padding-left: 0">
+                <li>
+                  <span <% if transaction.status != 'SUCCESS' %>class='alert-danger'<% else %>class='alert-success' <% end %>><%= transaction.status %></span>
+                  <% if current_user.root? %>
+                      <%= link_to '&nbsp;<i class="fa fa-eraser"></i>'.html_safe, kaui_engine.new_account_transaction_path(payment.account_id,
+                                                                                                                           :payment_id => payment.payment_id,
+                                                                                                                           :transaction_id => transaction.transaction_id) %>
+                  <% end %>
+                </li>
+                <% if transaction.next_retry_date %>
+                    <li>
+                      Scheduled retry:
+                      <%= 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 %>
+                <% (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>
+                <% end %>
+              </ul>
+            </td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
 
 </div>
 

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

@@ -27,9 +27,19 @@
 <%= javascript_tag do %>
 $(document).ready(function() {
   $('#payments-table').dataTable({
-    "dom": "t",
-    "paging": false,
-    "order": [[ 0, "desc" ]],
+    <% if @search_query.blank? %>
+        "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+        "pagingType": "full_numbers",
+        "pageLength": <%= @limit %>,
+        "displayStart": <%= @offset %>,
+    <% else %>
+        // No paging for per-account listings
+        "dom": "t",
+        "paging": false,
+    <% end %>
+    <% unless @ordering.blank? %>
+        "order": [[ 0, "<%= @ordering %>" ]],
+    <% end %>
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},

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

@@ -12,6 +12,12 @@
                 <th>Invoice ID</th>
                 <td><%= link_to @payment.target_invoice_id, account_invoice_path(@account.account_id, @payment.target_invoice_id) %></td>
               </tr>
+              <% if @payment.payment_external_key != @payment.payment_id %>
+                  <tr>
+                    <th>External key</th>
+                    <td><%= @payment.payment_external_key %></td>
+                  </tr>
+              <% end %>
             </table>
           </div>
         </div>

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

@@ -0,0 +1,124 @@
+<p class="text-center">
+  <%= link_to 'Current or future entries', kaui_engine.queues_path(params.merge(:with_history => false)) %> /
+  <%= link_to 'Historical entries (last week)', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => @now - 1.week)) %> /
+  <%= link_to 'Historical entries (last month)', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => @now - 1.month)) %> /
+  <%= link_to 'All historical entries', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => '1970-01-01')) %>
+</p>
+
+<div class="search">
+
+  <% unless (@queues_entries['busEvents'] || []).empty? %>
+      <div class="column-block">
+
+        <h1>Bus events</h1>
+
+        <div style="overflow-x: auto;">
+          <table id="bus-table" class="table table-condensed mobile-data table-small-padding">
+            <thead>
+            <tr>
+              <th>Created date</th>
+              <th>Class name</th>
+              <th>Event</th>
+              <th>User token</th>
+              <% if @account_id.blank? %>
+                  <th>Account record id</th>
+              <% end %>
+            </tr>
+            </thead>
+            <tbody>
+            <% @queues_entries['busEvents'].each do |bus_event| %>
+                <% if bus_event['createdDate'].to_datetime < @now %>
+                    <tr class="disabled">
+                <% else %>
+                    <tr>
+                <% end %>
+                  <td><%= truncate_millis(bus_event['createdDate']) %></td>
+                  <td><%= truncate_class_name(bus_event['className']) %></td>
+                  <td><%= "<pre>#{JSON.pretty_generate(bus_event['event'])}</pre>".html_safe %></td>
+                  <td><%= truncate_uuid(bus_event['userToken']) %></td>
+                  <% if @account_id.blank? %>
+                      <td><%= bus_event['searchKey1'] %></td>
+                  <% end %>
+                </tr>
+            <% end %>
+            </tbody>
+          </table>
+        </div>
+
+      </div>
+  <% end %>
+  <% unless (@queues_entries['notifications'] || []).empty? %>
+      <div class="column-block">
+
+        <h1>Notifications</h1>
+
+        <div style="overflow-x: auto;">
+          <table id="notifications-table" class="table table-condensed mobile-data table-small-padding">
+            <thead>
+            <tr>
+              <th>Effective date</th>
+              <th>Queue name</th>
+              <th>Event</th>
+              <th>User token</th>
+              <% if @account_id.blank? %>
+                  <th>Account record id</th>
+              <% end %>
+            </tr>
+            </thead>
+            <tbody>
+            <% @queues_entries['notifications'].each do |notification| %>
+                <% if notification['effectiveDate'].to_datetime < @now %>
+                    <tr class="disabled">
+                <% else %>
+                    <tr>
+                <% end %>
+                  <td><%= truncate_millis(notification['effectiveDate']) %></td>
+                  <td>
+                    <%= notification['queueName'] %>
+                  </td>
+                  <td><%= "<pre>#{JSON.pretty_generate(notification['event'])}</pre>".html_safe %></td>
+                  <td><%= truncate_uuid(notification['userToken']) %></td>
+                  <% if @account_id.blank? %>
+                      <td><%= notification['searchKey1'] %></td>
+                  <% end %>
+                </tr>
+            <% end %>
+            </tbody>
+          </table>
+        </div>
+
+      </div>
+  <% end %>
+
+</div>
+
+<% nb_bus_entries = (@queues_entries['busEvents'] || []).size %>
+<% nb_notifications_entries = (@queues_entries['notifications'] || []).size %>
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    $('#bus-table').dataTable({
+    <% if nb_bus_entries <= 50 %>
+        "dom": "<'row'<'col-md-6'><'col-md-6'f>r>t",
+        "paging": "false",
+    <% else %>
+        "dom": "<'row'<'col-md-6'><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+        "pagingType": "full_numbers",
+        "displayStart": <%= [0, nb_bus_entries - 50].max %>,
+    <% end %>
+      "pageLength": 50,
+      "order": []
+    });
+    $('#notifications-table').dataTable({
+    <% if nb_notifications_entries <= 50 %>
+        "dom": "<'row'<'col-md-6'><'col-md-6'f>r>t",
+        "paging": "false",
+    <% else %>
+        "dom": "<'row'<'col-md-6'><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+        "pagingType": "full_numbers",
+        "displayStart": 0,
+    <% end %>
+      "pageLength": 50,
+      "order": []
+    });
+});
+<% end %>