kaui 0.15.0 → 0.15.1

data/app/helpers/kaui/account_helper.rb

@@ -3,7 +3,7 @@ module Kaui
 
     def pretty_account_identifier
       return nil if @account.nil?
-      @account.name.presence || @account.email.presence || @account.external_key
+      @account.name.presence || @account.email.presence || truncate_uuid(@account.external_key)
     end
   end
 end

data/app/helpers/kaui/application_helper.rb

@@ -4,5 +4,10 @@ module Kaui
     def tenant_selected?
       session[:kb_tenant_id].present?
     end
+
+    def truncate_class_name(klass, with_abbr = false)
+      splitted = klass.split('.')
+      with_abbr ? splitted.each_with_index.map { |k, idx| idx == splitted.size - 1 ? k : k[0]+'.' }.join : splitted[-1]
+    end
   end
 end

data/app/helpers/kaui/date_helper.rb

@@ -15,5 +15,9 @@ module Kaui
       parsed_date = DateTime.parse(date.to_s).in_time_zone(timezone)
       parsed_date.to_s(:date_only)
     end
+
+    def truncate_millis(date_s)
+      DateTime.parse(date_s).strftime('%FT%T')
+    end
   end
-end
+end

data/app/helpers/kaui/payment_helper.rb

@@ -0,0 +1,9 @@
+module Kaui
+  module PaymentHelper
+
+    def transaction_statuses
+      Kaui::Payment::TRANSACTION_STATUSES
+    end
+
+  end
+end

data/app/models/kaui/admin.rb

@@ -0,0 +1,75 @@
+class Kaui::Admin < KillBillClient::Model::Resource
+
+  KILLBILL_API_ADMIN_PREFIX = "#{KILLBILL_API_PREFIX}/admin"
+  KILLBILL_API_CLOCK_PREFIX = "#{KILLBILL_API_PREFIX}/test/clock"
+  KILLBILL_API_QUEUES_PREFIX = "#{KILLBILL_API_ADMIN_PREFIX}/queues"
+
+  class << self
+
+    def get_queues_entries(account_id, options = {})
+      res = KillBillClient::API.get KILLBILL_API_QUEUES_PREFIX,
+                                    {
+                                        :accountId => account_id,
+                                        :withHistory => options[:withHistory],
+                                        :minDate => options[:minDate]
+                                    },
+                                    options
+      JSON.parse res.body
+    end
+
+    def fix_transaction_state(payment_id, transaction_id, transaction_status, user = nil, reason = nil, comment = nil, options = {})
+      res = KillBillClient::API.put "#{KILLBILL_API_ADMIN_PREFIX}/payments/#{payment_id}/transactions/#{transaction_id}",
+                                    {:transactionStatus => transaction_status}.to_json,
+                                    {},
+                                    {
+                                        :user => user,
+                                        :reason => reason,
+                                        :comment => comment,
+                                    }.merge(options)
+    end
+
+    def get_clock(time_zone, options)
+      params = {}
+      params[:timeZone] = time_zone unless time_zone.nil?
+
+      res = KillBillClient::API.get KILLBILL_API_CLOCK_PREFIX,
+                                    params,
+                                    options
+      JSON.parse res.body
+    end
+
+    def set_clock(requested_date, time_zone, options)
+      params = {}
+      params[:requestedDate] = requested_date unless requested_date.nil?
+      params[:timeZone] = time_zone unless time_zone.nil?
+
+      # The default 5s is not always enough
+      params[:timeoutSec] ||= 10
+
+      res = KillBillClient::API.post KILLBILL_API_CLOCK_PREFIX,
+                                     {},
+                                     params,
+                                     {}.merge(options)
+      JSON.parse res.body
+    end
+
+    def increment_kb_clock(days, weeks, months, years, time_zone, options)
+      params = {}
+      params[:days] = days unless days.nil?
+      params[:weeks] = weeks unless weeks.nil?
+      params[:months] = months unless months.nil?
+      params[:years] = years unless years.nil?
+      params[:timeZone] = time_zone unless time_zone.nil?
+
+      # The default 5s is not always enough
+      params[:timeoutSec] ||= 10
+
+      res = KillBillClient::API.put KILLBILL_API_CLOCK_PREFIX,
+                                    {},
+                                    params,
+                                    {}.merge(options)
+
+      JSON.parse res.body
+    end
+  end
+end

data/app/models/kaui/invoice_payment.rb

@@ -7,6 +7,14 @@ class Kaui::InvoicePayment < KillBillClient::Model::InvoicePayment
 
   class << self
 
+    def find_safely_by_id(id, options = {})
+      Kaui::InvoicePayment.find_by_id(id, true, true, options)
+    rescue => e
+      # Maybe the plugin is not registered or the plugin threw an exception
+      Rails.logger.warn(e)
+      Kaui::InvoicePayment.find_by_id(id, false, true, options)
+    end
+
     def build_from_raw_payment(raw_payment)
 
       return nil if raw_payment.nil?
@@ -39,16 +47,25 @@ class Kaui::InvoicePayment < KillBillClient::Model::InvoicePayment
 
     # For each payment transaction, compute next_retry date by joining with payment attempts
     def build_transactions_next_retry_date!
-      (transactions || []).each do |transaction|
-        # Filter attempts matching that transaction and SCHEDULED for retry
-        transaction.next_retry_date = (payment_attempts || []).select do |attempt|
-          ((attempt.transaction_id && attempt.transaction_id == transaction.transaction_id) ||
-              (attempt.transaction_external_key && attempt.transaction_external_key == transaction.transaction_external_key)) &&
-              attempt.state_name == 'SCHEDULED'
-        end.map do |attempt|
-          attempt.effective_date
-        end.first
+
+      # Filter scheduled attempts: We could have several in parallel when multiple independent transactions occur at the same time
+      # (They would have different transaction_external_key)
+      scheduled_attempts = (payment_attempts || []).select do |a|
+        a.state_name == 'SCHEDULED'
+      end
+
+      # Look for latest transaction associated with each such scheduled attempt and set retry date accordingly
+      scheduled_attempts.each do |a|
+
+        last_transaction_for_attempt = (transactions || []).select do |t|
+          t.transaction_external_key == a.transaction_external_key
+        end.sort_by do |t|
+          t.effective_date
+        end.last
+
+        last_transaction_for_attempt.next_retry_date = a.effective_date if last_transaction_for_attempt
       end
+
     end
 
   end

data/app/models/kaui/payment.rb

@@ -4,6 +4,8 @@ class Kaui::Payment < KillBillClient::Model::Payment
 
   attr_accessor :payment_date, :target_invoice_id
 
+  TRANSACTION_STATUSES = %w(SUCCESS PENDING PAYMENT_FAILURE PLUGIN_FAILURE UNKNOWN)
+
   SAMPLE_REASON_CODES = ['600 - Alt payment method',
                          '699 - OTHER']
 

data/app/models/kaui/payment_method.rb

@@ -8,13 +8,26 @@ class Kaui::PaymentMethod < KillBillClient::Model::PaymentMethod
     end
   end
 
+  def self.find_safely_by_id(id, options = {})
+    Kaui::PaymentMethod.find_by_id(id, true, options)
+  rescue => e
+    # Maybe the plugin is not registered or the plugin threw an exception
+    Rails.logger.warn(e)
+    Kaui::PaymentMethod.find_by_id(id, false, options) rescue nil # deleted pm?
+  end
+
   def self.find_all_safely_by_account_id(account_id, options = {})
-    begin
-      Kaui::PaymentMethod.find_all_by_account_id(account_id, true, options)
-    rescue KillBillClient::API::BadRequest
-      # Maybe the plugin(s) are not registered?
-      Kaui::PaymentMethod.find_all_by_account_id(account_id, false, options)
+    pms = Kaui::PaymentMethod.find_all_by_account_id(account_id, false, options)
+
+    pms.each_with_index do |pm, i|
+      begin
+        pms[i] = Kaui::PaymentMethod.find_by_id(pm.payment_method_id, true, options)
+      rescue => e
+        # Maybe the plugin is not registered or the plugin threw an exception
+        Rails.logger.warn(e)
+      end
     end
+    pms
   end
 
   def self.find_non_external_by_account_id(account_id, with_plugin_info = false, options = {})

data/app/models/kaui/transaction.rb

@@ -2,6 +2,14 @@ class Kaui::Transaction < KillBillClient::Model::Transaction
 
   attr_accessor :next_retry_date
 
+  def self.build_from_raw_transaction(raw_transaction)
+    result = Kaui::Transaction.new
+    KillBillClient::Model::PaymentTransactionAttributes.instance_variable_get('@json_attributes').each do |attr|
+      result.send("#{attr}=", raw_transaction.send(attr))
+    end
+    result
+  end
+
   def create(account_id = nil, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {})
     if transaction_type == 'AUTHORIZE'
       auth(account_id, payment_method_id, user, reason, comment, options)

data/app/models/kaui/user.rb

@@ -35,6 +35,10 @@ module Kaui
       end
     end
 
+    def root?
+      Kaui.root_username == kb_username
+    end
+
     private
 
     def self.do_find_permissions(options = {})

data/app/views/kaui/accounts/_account_info.html.erb

@@ -10,6 +10,15 @@
       <% end %>
     </h1>
 
+    <% unless @tags.find { |tag| tag.tag_definition_name == '__PARK__' }.nil? %>
+        <div class="alert alert-danger">
+          This account is parked, meaning the system detected inconsistent state which could lead to mis-billing. For safety, no more invoices will be generated.
+          <% if can? :trigger, Kaui::Invoice %>
+              Once the data is fixed, you can unpark it by manually <%= link_to 'triggering an invoice run', kaui_engine.trigger_invoice_path(params), :method => :post %>.
+          <% end %>
+        </div>
+    <% end %>
+
     <div class="info-wrapper">
 
       <div class="tag-bar tag-bar-breathe">
@@ -49,8 +58,20 @@
                 <td><%= @account.currency %></td>
               </tr>
               <tr>
-                <th>Timezone</th>
-                <td><%= @account.time_zone %></td>
+                  <th>Timezone</th>
+                  <td><%= @account.time_zone %></td>
+              </tr>
+              <tr>
+                  <th>Locale</th>
+                  <td><%= @account.locale %></td>
+              </tr>
+              <tr>
+                  <th>Notes</th>
+                  <% if @account.notes %>
+                      <td><textarea rows="3" class="form-control" readonly="true"><%= @account.notes %></textarea></td>
+                  <% else %>
+                      <td>N/A</td>
+                  <% end %>
               </tr>
             </table>
           </div>

data/app/views/kaui/accounts/_billing_info.html.erb

@@ -95,6 +95,27 @@
                 </td>
               </tr>
             </table>
+
+            <% if can? :trigger, Kaui::Invoice %>
+                <div style="padding-bottom: 50px;">
+                  <%= form_tag kaui_engine.trigger_invoice_path(params), :method => :post do %>
+                      <div class="form-group">
+                        <%= label_tag :target_date, 'Trigger invoice generation', :class => 'col-sm-6 control-label', :style => 'padding-left: 0;' %>
+                        <div class="col-sm-3">
+                          <input class="form-control" name="target_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true">
+                        </div>
+                        <div style="width: 14.5%; float: left; padding: 0;">
+                          <%= label_tag :dry_run do %>
+                              <%= check_box_tag :dry_run, '1', true %>&nbsp;<small>Dry-run</small>
+                          <% end %>
+                        </div>
+                        <div class="col-xs-1" style="padding: 0;">
+                          <%= button_tag '<i class="fa fa-magic"></i>'.html_safe, :class => 'btn btn-xs' %>
+                        </div>
+                      </div>
+                  <% end %>
+                </div>
+            <% end %>
           </div>
       </div>
 

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

@@ -46,6 +46,12 @@
           </div>
         </div>
     <% end %>
+    <div class="form-group">
+        <%= f.label :locale, 'Locale', :class => 'col-sm-3 control-label' %>
+        <div class="col-sm-9">
+            <%= f.text_field :locale, :class => 'form-control' %>
+        </div>
+    </div>
     <div class="form-group">
       <%= f.label :address1, 'Address line 1', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
@@ -89,16 +95,16 @@
       </div>
     </div>
     <div class="form-group">
-      <%= f.label :locale, 'Locale', :class => 'col-sm-3 control-label' %>
-      <div class="col-sm-9">
-        <%= f.text_field :locale, :class => 'form-control' %>
-      </div>
+        <%= f.label :phone, 'Phone', :class => 'col-sm-3 control-label' %>
+        <div class="col-sm-9">
+            <%= f.text_field :phone, :class => 'form-control' %>
+        </div>
     </div>
     <div class="form-group">
-      <%= f.label :phone, 'Phone', :class => 'col-sm-3 control-label' %>
-      <div class="col-sm-9">
-        <%= f.text_field :phone, :class => 'form-control' %>
-      </div>
+        <%= f.label :notes, 'Notes', :class => 'col-sm-3 control-label' %>
+        <div class="col-sm-9">
+            <%= f.text_field :notes, :class => 'form-control' %>
+        </div>
     </div>
     <% unless @account.persisted? %>
         <div class="form-group">

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

@@ -35,8 +35,11 @@ $(document).ready(function() {
   $('#accounts-table').dataTable({
     "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
     "pagingType": "full_numbers",
-    "pageLength": 50,
-    "order": [[ 0, "asc" ]],
+    "pageLength": <%= @limit %>,
+    "displayStart": <%= @offset %>,
+    <% unless @ordering.blank? %>
+        "order": [[ 0, "<%= @ordering %>" ]],
+    <% end %>
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},

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

@@ -0,0 +1,39 @@
+<div class="column-block">
+
+  <h1>Clock</h1>
+
+  <ul>
+    <li>Current date/time: <span id="kb_clock"><%= @clock['currentUtcTime'] %></span></li>
+  </ul>
+
+  <div>
+    <%= form_tag kaui_engine.admin_set_clock_path(params), :method => :put, :class => 'form-horizontal' do %>
+        <div class="form-group">
+          <%= label_tag :new_date, 'Set new date', :class => 'col-sm-2 control-label' %>
+          <div class="col-sm-2">
+            <input class="form-control" name="new_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value="<%= @clock['localDate'] %>">
+          </div>
+        </div>
+        <div class="form-group">
+          <div class="col-sm-offset-2 col-sm-10">
+            <%= submit_tag 'Submit', :class => 'btn btn-default' %>
+            <%= button_tag 'Reset', :class => 'btn btn-danger' %>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>
+
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    scheduleRefresh();
+  });
+
+  function scheduleRefresh() {
+    setTimeout(refreshClock, 1000);
+  }
+
+  function refreshClock() {
+    $.ajax({url: "<%= admin_path(:format => :js) %>"});
+  }
+<% end %>

data/app/views/kaui/admin/index.js.erb

@@ -0,0 +1,3 @@
+$('#kb_clock').html("<%= @clock['currentUtcTime'] %>");
+
+scheduleRefresh();

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

@@ -22,14 +22,14 @@
                   <% @tenants.each do |tenant| %>
                       <div class="checkbox">
                         <label>
-                          <%= check_box_tag "tenant_#{tenant.id}", tenant.id, @allowed_user.kaui_tenants.map(&:id).include?(tenant.id), :disabled => Kaui.root_username != current_user.kb_username %>
+                          <%= check_box_tag "tenant_#{tenant.id}", tenant.id, @allowed_user.kaui_tenants.map(&:id).include?(tenant.id), :disabled => !current_user.root? %>
                           <span><%= tenant.name || tenant.api_key %></span>
                         </label>
                       </div>
                   <% end %>
                 </div>
               </div>
-              <% unless Kaui.root_username != current_user.kb_username %>
+              <% unless !current_user.root? %>
                   <div class="form-group">
                     <div class="col-sm-offset-2 col-sm-10">
                       <%= f.submit 'Save', :class => 'btn btn-default' %>

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

@@ -0,0 +1,15 @@
+<div class="col-md-6">
+
+  <div class="column-block">
+
+    <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>
+
+</div>