kaui 0.15.5 → 0.16.0

data/app/models/kaui/overdue.rb

@@ -30,6 +30,8 @@ class Kaui::Overdue < KillBillClient::Model::Overdue
             state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds.unit = "DAYS"
             state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds.number = state_model["condition"]["time_since_earliest_unpaid_invoice_equals_or_exceeds"]
           end
+          state.condition.number_of_unpaid_invoices_equals_or_exceeds = state_model["condition"]["number_of_unpaid_invoices_equals_or_exceeds"]
+          state.condition.total_unpaid_invoice_balance_equals_or_exceeds = state_model["condition"]["total_unpaid_invoice_balance_equals_or_exceeds"]
           state.condition.control_tag_inclusion = format_tag_condition(state_model["condition"]["control_tag_inclusion"])
           state.condition.control_tag_exclusion = format_tag_condition(state_model["condition"]["control_tag_exclusion"])
         end
@@ -63,6 +65,8 @@ class Kaui::Overdue < KillBillClient::Model::Overdue
           state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds = KillBillClient::Model::DurationAttributes.new
           state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds.unit = "DAYS"
           state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds.number = 0
+          state.condition.number_of_unpaid_invoices_equals_or_exceeds = 0
+          state.condition.total_unpaid_invoice_balance_equals_or_exceeds = 0
           state.condition.control_tag_inclusion = :NONE
           state.condition.control_tag_exclusion = :NONE
         end

data/app/models/kaui/payment.rb

@@ -6,9 +6,6 @@ class Kaui::Payment < KillBillClient::Model::Payment
 
   TRANSACTION_STATUSES = %w(SUCCESS PENDING PAYMENT_FAILURE PLUGIN_FAILURE UNKNOWN)
 
-  SAMPLE_REASON_CODES = ['600 - Alt payment method',
-                         '699 - OTHER']
-
   def self.build_from_raw_payment(raw_payment)
     result = Kaui::Payment.new
     KillBillClient::Model::PaymentAttributes.instance_variable_get('@json_attributes').each do |attr|

data/app/models/kaui/refund.rb

@@ -1,7 +1,2 @@
 class Kaui::Refund
-
-  SAMPLE_REASON_CODES = ['500 - Courtesy',
-                         '501 - Billing Error',
-                         '502 - Alt payment method',
-                         '599 - OTHER']
 end

data/app/models/kaui/tenant.rb

@@ -1,9 +1,8 @@
 require 'symmetric-encryption'
 
 module Kaui
-  class Tenant < ActiveRecord::Base
+  class Tenant < ApplicationRecord
 
-    attr_accessible :name, :api_key, :api_secret, :kb_tenant_id
     attr_encrypted :api_secret
 
     has_many :kaui_allowed_user_tenants, :class_name => 'Kaui::AllowedUserTenant', :foreign_key => 'kaui_tenant_id'

data/app/models/kaui/user.rb

@@ -1,14 +1,12 @@
 require 'killbill_client'
 
 module Kaui
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
     devise :killbill_authenticatable, :killbill_registerable
 
     # Managed by Devise
     attr_accessor :password
 
-    attr_accessible :kb_username, :kb_session_id, :password
-
     # Called by Devise to perform authentication
     # Throws KillBillClient::API::Unauthorized on failure
     def self.find_permissions(kb_username, kb_password)

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

@@ -0,0 +1,47 @@
+<div class="search">
+
+  <div class="column-block">
+
+    <h1>Showing children results</h1>
+
+    <table id="account-children-table" class="table table-condensed mobile-data">
+      <thead>
+      <tr>
+        <th>Name</th>
+        <th>ID</th>
+        <th>External key</th>
+        <th>Balance</th>
+        <th>City</th>
+        <th>Country</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr>
+        <td colspan="1" class="dataTables_empty">Loading data from server</td>
+      </tr>
+      </tbody>
+    </table>
+
+  </div>
+
+</div>
+
+<%= javascript_tag do %>
+$(document).ready(function() {
+  $('#account-children-table').DataTable({
+    "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+    "paging": false,
+    "language": {
+        "info": "Showing _START_ to _END_ of TOTAL entries"
+    },
+    "processing": true,
+    "serverSide": true,
+    "search": {"search": "<%= @account.account_id %>"},
+    "ajax": "<%= account_children_pagination_path(:format => :json) %>",
+    "infoCallback": function( settings, start, end, max, total, pre ) {
+
+        return pre.replace('TOTAL',settings.json.data.length);
+    }
+  });
+});
+<% end %>

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

@@ -8,13 +8,24 @@
                       kaui_engine.edit_account_path(@account.account_id),
                       :class => 'btn btn-xs' %>
       <% end %>
+      <% if @children.size > 0 %>
+          <%= link_to "Children (#{@children.size})",
+                      kaui_engine.account_children_path(@account.account_id),
+                      :class => 'btn btn-xs' %>
+      <% end %>
+      <% unless @account.parent_account_id.nil? %>
+          <span class="label label-info account-child-label">Child</span>
+      <% end %>
+      <% if @children.size > 0 %>
+          <span class="label label-info account-child-label">Parent</span>
+      <% 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 %>.
+              Once the data is fixed, you can unpark it by manually <%= link_to 'triggering an invoice run', kaui_engine.trigger_invoice_path(params.to_h), :method => :post %>.
           <% end %>
         </div>
     <% end %>
@@ -35,6 +46,8 @@
           </div>
         </div>
 
+        <%= render :partial => 'kaui/custom_fields/list_bar',
+                   :locals => {:custom_fields => @custom_fields} %>
       </div>
 
       <div class="row">
@@ -73,6 +86,8 @@
                       <td>N/A</td>
                   <% end %>
               </tr>
+              <%= render :partial => 'parent',
+                         :locals => {:account_parent => @account_parent} %>
             </table>
           </div>
         </div>

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

@@ -86,19 +86,28 @@
                     <td><span class='label' id='next-invoice-date'>N/A</span></td>
                   </tr>
               <% end %>
-              <tr>
-                <th>Notified For Invoice</th>
-                <td>
-                  <span class="label text-capitalize"><%= @account.is_notified_for_invoices %></span>
-                  <% if can? :update, Kaui::Account %>&nbsp;<%= link_to '<i class="fa fa-toggle-on"></i>'.html_safe, kaui_engine.toggle_email_notifications_account_path(@account.account_id, :is_notified => !@account.is_notified_for_invoices), :method => :post %>
-                  <% end %>
-                </td>
-              </tr>
+              <% if email_notifications_plugin_available? %>
+                <tr>
+                  <th>
+                    Email Notifications
+                    <%= link_to('<i class="fa fa-cog" aria-hidden="true"></i>'.html_safe,
+                    '#configureEmailNotification',
+                    data: { name: @account.name, account_id: @account.account_id,
+                            events: @email_notification_configuration.map { |event| event[:eventType] }.join(', '),
+                            toggle: 'modal', target: '#configureEmailNotification'}) %>
+                  </th>
+                  <td>
+                    <% @email_notification_configuration.each do |configuration|%>
+                        - <%= configuration[:eventType] %><br/>
+                    <% end %>
+                  </td>
+                </tr>
+              <% end %>
             </table>
 
             <% if can? :trigger, Kaui::Invoice %>
                 <div style="padding-bottom: 50px;">
-                  <%= form_tag kaui_engine.trigger_invoice_path(params), :method => :post do %>
+                  <%= form_tag kaui_engine.trigger_invoice_path(params.to_h), :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">

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

@@ -1,5 +1,7 @@
 <% # Unclear why this url/method hack is needed %>
 <%= form_for @account, :url => @account.persisted? ? account_path(@account.account_id) : accounts_path, :method => @account.persisted? ? :put : :post, :html => {:class => 'form-horizontal'} do |f| %>
+    <%= f.hidden_field :payment_method_id %>
+
     <div class="form-group">
       <%= f.label :name, 'Name', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
@@ -7,9 +9,17 @@
       </div>
     </div>
     <div class="form-group">
-      <%= f.label :first_name_length, 'First name length', :class => 'col-sm-3 control-label' %>
+      <%= f.label :first_name_length, :class => 'col-sm-3 control-label' do %>
+          First name length
+          <%= link_to('https://www.w3.org/International/questions/qa-personal-names',target: '_blank', rel: 'nofollow') do %>
+              <i class="fa fa-question-circle-o" aria-hidden="true"></i>
+          <% end %>
+      <% end %>
       <div class="col-sm-9">
-        <%= f.text_field :first_name_length, :class => 'form-control' %>
+        <%= f.text_field :first_name_length,
+                         :pattern => '^[0-9]*$',
+                         :title => 'Format: Can only contain digits; Description: Identify where the first name ends and last name starts.',
+                         :class => 'form-control' %>
       </div>
     </div>
     <% unless @account.persisted? %>
@@ -17,6 +27,9 @@
           <%= f.label :external_key, 'External key', :class => 'col-sm-3 control-label' %>
           <div class="col-sm-9">
             <%= f.text_field :external_key, :class => 'form-control' %>
+            <div class="account_external_key_invalid_msg text-danger">
+              Warning! External key already in use.
+            </div>
           </div>
         </div>
     <% else %>
@@ -44,7 +57,7 @@
         <div class="form-group">
           <%= f.label :time_zone, 'Timezone', :class => 'col-sm-3 control-label' %>
           <div class="col-sm-9">
-            <%= f.collection_select :time_zone, ActiveSupport::TimeZone.all, :formatted_offset, :to_s, {:selected => Time.zone.formatted_offset}, :class => 'form-control' %>
+            <%= f.select :time_zone, ActiveSupport::TimeZone.all.collect { |tz| [tz.to_s, tz.tzinfo.name] }, {:selected => 'Etc/UTC'}, :class => 'form-control' %>
           </div>
         </div>
     <% else %>
@@ -53,10 +66,10 @@
         <%= f.hidden_field :time_zone %>
     <% 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>
+      <%= f.label :locale, 'Locale', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= f.select :locale, get_available_locales, {:selected => (@account.locale || 'en_US'), :disabled => '---------------'}, :class => 'form-control' %>
+      </div>
     </div>
     <div class="form-group">
       <%= f.label :address1, 'Address line 1', :class => 'col-sm-3 control-label' %>
@@ -91,13 +104,14 @@
     <div class="form-group">
       <%= f.label :state, 'State', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= f.text_field :state, :class => 'form-control' %>
+        <%= f.select :state, get_U_S_states, {:include_blank => '', :selected => @account.state}, :class => 'form-control select-state' %>
+        <%= f.text_field :state, :class => 'form-control text-state', :style => 'display: none;' %>
       </div>
     </div>
     <div class="form-group">
       <%= f.label :country, 'Country', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= f.country_select :country, {:priority => %w(US CA), :selected => @account.country}, :class => 'form-control' %>
+        <%= f.country_select :country, {:priority_countries => %w(US CA), :selected => @account.country}, :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">
@@ -125,15 +139,9 @@
     <% else %>
         <%= f.hidden_field :is_migrated %>
     <% end %>
-    <div class="form-group">
-      <div class="col-sm-offset-3 col-sm-9">
-        <div class="checkbox">
-          <%= f.label :is_notified_for_invoices do %>
-              <%= f.check_box :is_notified_for_invoices, {:checked => @account.is_notified_for_invoices} %>Notified for invoices?
-          <% end %>
-        </div>
-      </div>
-    </div>
+    <%= f.hidden_field :is_notified_for_invoices %>
+    <%= f.hidden_field :is_payment_delegated_to_parent %>
+    <%= f.hidden_field :parent_account_id %>
     <div class="form-group">
       <div class="col-sm-offset-3 col-sm-9">
         <%= submit_tag 'Save', :class => 'btn btn-default' %>

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

@@ -0,0 +1,34 @@
+<div class="modal fade" id="link_account" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content column-block">
+      <div>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h1 class="modal-title">Link to parent</h1>
+      </div>
+      <div class="modal-body">
+        <%= form_for @account, :url =>  link_to_parent_path(@account.account_id), :method => :put, :html => {:class => 'form-horizontal'} do |f| %>
+            <div class='form-group'>
+              <%= f.label :parent_account_id, 'Parent account id', :class => 'col-sm-4 control-label' %>
+              <div class="col-sm-8">
+                <%= f.text_field :parent_account_id, :class => 'form-control', :required => true %>
+              </div>
+            </div>
+            <div class="form-group">
+              <div class="col-sm-offset-4 col-sm-8">
+                <div class="checkbox">
+                  <%= f.label :is_payment_delegated_to_parent do %>
+                      <%= f.check_box :is_payment_delegated_to_parent, {:checked => @account.is_payment_delegated_to_parent} %>Is payment delegated to parent?
+                  <% end %>
+                </div>
+              </div>
+            </div>
+            <div class="form-group">
+              <div class="col-sm-offset-4 col-sm-10">
+                <%= submit_tag 'Save', :class => 'btn btn-default' %>
+              </div>
+            </div>
+        <% end %>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->

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

@@ -0,0 +1,16 @@
+<tr>
+  <th>Parent</th>
+  <td>
+    <% if account_parent.present? %>
+        <%= link_to account_parent.name, kaui_engine.account_path(@account.parent_account_id) %>
+        <% if can? :update, Kaui::Account %>
+            <%= link_to '&nbsp;<i class="fa fa-times"></i>'.html_safe, kaui_engine.unlink_to_parent_path(@account.account_id), :method => :delete %>
+        <% end %>&nbsp;
+    <% end %>
+    <% unless account_parent.present? %>
+      <% if can? :update, Kaui::Account %>
+          <button type="button" class="naked" data-toggle="modal" data-target="#link_account">&nbsp<i class="fa fa-plus"></i></button>
+      <% end %>
+    <% end %>
+  </td>
+</tr>

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

@@ -13,7 +13,9 @@
     <% unless @payment_methods.empty? %>
         <div class="info-wrapper">
 
-          <%= render :partial => 'kaui/payment_methods/payment_methods_table', :locals => {:account => @account, :payment_methods => @payment_methods} %>
+          <%= render :partial => 'kaui/payment_methods/payment_methods_table', :locals => {:account => @account,
+                                                                                           :payment_methods => @payment_methods,
+                                                                                           :last_transaction_by_payment_method_id => @last_transaction_by_payment_method_id} %>
 
         </div>
     <% end %>

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

@@ -11,6 +11,7 @@
     <table id="accounts-table" class="table table-condensed mobile-data">
       <thead>
       <tr>
+        <th></th>
         <th>Name</th>
         <th>ID</th>
         <th>External key</th>
@@ -42,12 +43,26 @@ $(document).ready(function() {
     "pageLength": <%= @limit %>,
     "displayStart": <%= @offset %>,
     <% unless @ordering.blank? %>
-        "order": [[ 0, "<%= @ordering %>" ]],
+        "order": [[ 1, "<%= @ordering %>" ]],
     <% end %>
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},
-    "ajax": "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>"
+    "ajax": "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>",
+    "rowCallback": function( row, data, index ) {
+      if ( data[0] == 1 ) {
+        $('td:eq(0)', row).html( '<span class="label label-info account-child-label">Child</span>' );
+      }else{
+        $('td:eq(0)', row).html('')
+      }
+    },
+    "columnDefs": [
+    { "orderable": false, "targets": 0, "createdCell": function (td, cellData, rowData, row, col) {
+        $(td).css('padding-left', '20px');
+        $(td).css('width', '60px');
+
+    } }
+    ]
   });
 
   <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->

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

@@ -4,6 +4,12 @@
 
 <%= render :partial => 'payment_methods' %>
 
+<%= render :partial => 'link_parent_modal' %>
+
+<% if email_notifications_plugin_available? %>
+  <%= render :partial => 'kenui/email_notifications/configure_events_modal' %>
+<% end %>
+
 <%= javascript_tag do %>
   function disableLinks() {
     $('a.btn.disabled').click(function (e) {

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

@@ -7,7 +7,7 @@
   </ul>
 
   <div>
-    <%= form_tag kaui_engine.admin_set_clock_path(params), :method => :put, :class => 'form-horizontal' do %>
+    <%= form_tag kaui_engine.admin_set_clock_path(params.to_h), :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">

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

@@ -1,5 +1,14 @@
 <% # Unclear why this url/method hack is needed %>
 <%= form_for @allowed_user, :url => @allowed_user.persisted? ? admin_allowed_user_path(@allowed_user.id) : admin_allowed_users_path, :method => @allowed_user.persisted? ? :put : :post, :html => {:class => 'form-horizontal'} do |f| %>
+    <div class='form-group'>
+      <div class="col-sm-offset-2 col-sm-9">
+        <div class="checkbox">
+          <%= label_tag :external do %>
+              <%= check_box_tag :external %>Managed externally (LDAP, Okta, etc.)?
+          <% end %>
+        </div>
+      </div>
+    </div>
     <div class="form-group">
       <%= f.label :kb_username, 'Name', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
@@ -32,3 +41,16 @@
       </div>
     </div>
 <% end %>
+
+<%= javascript_tag do %>
+    $('#external').change(function() {
+      if ($('#external').is(":checked")) {
+        $('#password').attr('disabled', true);
+        $('#roles').attr('disabled', true);
+      }
+      else {
+        $('#password').attr('disabled', false);
+        $('#roles').attr('disabled', false);
+      }
+    });
+<% end %>