kaui 0.15.5 → 0.16.0

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

@@ -30,7 +30,7 @@
     <div class="form-group">
       <%= label_tag :reason, 'Reason', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= select_tag :reason, options_for_select(Kaui::Payment::SAMPLE_REASON_CODES), :class => 'form-control' %>
+        <%= select_tag :reason, options_for_select(Kaui.payment_reason_codes), :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">

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

@@ -1,19 +1,22 @@
 <div class="info-wrapper" >
 
-  <% if payment.capturable? || payment.voidable? || (payment.refundable? && (can?(:refund, Kaui::Payment) || can?(:chargeback, 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>-->
-        <!--<div class="tag-select-box">-->
-        <!--<strong>Tag As:</strong>-->
-        <!--</div>-->
-        <!--</div>-->
+  <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>-->
 
-        <div class="tag-select" onclick="void(0)">
-          <span><i class="fa fa-credit-card"></i><i class="fa fa-caret-down"></i></span>
+    <%= render :partial => 'kaui/custom_fields/list_bar',
+               :locals => {:custom_fields => custom_fields} %>
 
-          <div class="tag-select-box">
+    <div class="tag-select" onclick="void(0)">
+      <span><i class="fa fa-credit-card"></i><i class="fa fa-caret-down"></i></span>
 
+      <div class="tag-select-box">
+
+        <% if payment.capturable? || payment.voidable? || (payment.refundable? && (can?(:refund, Kaui::Payment) || can?(:chargeback, Kaui::Payment))) %>
             <% if payment.refundable? %>
                 <% if can? :refund, Kaui::Payment %>
                     <% if payment.target_invoice_id.present? %>
@@ -57,12 +60,18 @@
                                                                                                                                  :payment_method_id => payment.payment_method_id,
                                                                                                                                  :transaction_type => 'VOID') %>
             <% end %>
-          </div>
+        <% end %>
+      </div>
 
-        </div>
+    </div>
 
-      </div>
-  <% end %>
+    <% gateway_url = gateway_url(payment_method, payment) %>
+    <% unless gateway_url.nil? %>
+        <div class="gateway-link">
+          <span><%= link_to 'See in gateway', gateway_url, :target => '_blank' %></span>
+        </div>
+    <% end %>
+  </div>
 
   <div style="overflow-x: auto;">
     <table id="payment_<%= payment.payment_id %>" class="table table-condensed mobile-data">

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

@@ -24,7 +24,10 @@
     <% end %>
 
     <%= render :partial => 'kaui/payments/payment_table',
-               :locals => {:payment => @payment, :account => @account} %>
+               :locals => {:payment_method => @payment_method,
+                           :payment => @payment,
+                           :account => @account,
+                           :custom_fields => @custom_fields} %>
 
   </div>
 

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

@@ -1,10 +1,10 @@
 <p class="text-center">
-  <%= link_to 'Current or future entries', kaui_engine.queues_path(params.merge(:with_history => false, :max_date => @now + 1.week)) %> /
+  <%= link_to 'Current or future entries', kaui_engine.queues_path(params.to_h.merge(:with_history => false, :max_date => @now + 1.week)) %> /
   <% unless params[:account_id].present? -%>
-    <%= link_to 'Historical entries (last week)', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => @now - 1.week, :max_date => @now + 1.week)) %> /
-    <%= link_to 'Historical entries (last month)', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => @now - 1.month, :max_date => @now + 1.week)) %> /
+    <%= link_to 'Historical entries (last week)', kaui_engine.queues_path(params.to_h.merge(:with_history => true, :min_date => @now - 1.week, :max_date => @now + 1.week)) %> /
+    <%= link_to 'Historical entries (last month)', kaui_engine.queues_path(params.to_h.merge(:with_history => true, :min_date => @now - 1.month, :max_date => @now + 1.week)) %> /
   <% end -%>
-  <%= link_to 'All historical entries', kaui_engine.queues_path(params.merge(:with_history => true)) %>
+  <%= link_to 'All historical entries', kaui_engine.queues_path(params.to_h.merge(:with_history => true)) %>
 </p>
 
 <div class="search">

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

@@ -28,9 +28,10 @@
               <div id=<%= "div_#{ii.invoice_item_id}" %> class="form-group">
                 <label class="col-sm-2 control-label"></label>
 
+                <% bundle = @bundles.find { |bundle| bundle.bundle_id == ii.bundle_id } %>
                 <div class="col-sm-10">
                   <input type="checkbox" id=<%= "cb_adj_#{ii.invoice_item_id}" %>>
-                  <%= "Item #{index + 1} : #{ii.description} " %>
+                  <%= "Item #{index + 1} : #{ii.description} #{"(bundle #{bundle.external_key})" unless bundle.nil?}" %>
                   <%= text_field_tag "adjustments[#{ii.invoice_item_id}]", index, :id => "tf_adj_#{ii.invoice_item_id}", :value => ii.amount, :class => 'form-control' %>
                 </div>
               </div>
@@ -48,7 +49,7 @@
     <div class="form-group">
       <%= label_tag :reason, 'Reason', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= select_tag :reason, options_for_select(Kaui::Refund::SAMPLE_REASON_CODES), :class => 'form-control' %>
+        <%= select_tag :reason, options_for_select(Kaui.refund_reason_codes), :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">

data/app/views/kaui/subscriptions/_edit_form.html.erb

@@ -10,8 +10,8 @@
       <div class="col-sm-offset-2 col-sm-10">
         <div class="radio">
           <%= label_tag :type_change do %>
-              <%= radio_button_tag :type_change, 'IMM', :checked => true %>
-              Immediate Change
+              <%= radio_button_tag :type_change, 'DEFAULT', :checked => true %>
+              Default policy
           <% end %>
         </div>
         <div class="radio">
@@ -52,7 +52,7 @@
 
 function onTypeChange() {
     var value = $("input[type=radio]:checked").val();
-        if (value == "IMM") {
+        if (value == "DEFAULT") {
             $("#form_requested_date").hide();
             $("#form_policy").hide();
         } else if (value == "POLICY")  {

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

@@ -16,6 +16,9 @@
           <%= f.label :external_key, 'Key', :class => 'col-sm-2 control-label' %>
           <div class="col-sm-10">
             <%= f.text_field :external_key, :class => 'form-control', :id => 'external_key' %>
+            <div class="subscription_external_key_invalid_msg text-danger">
+              Warning! External key already in use.
+            </div>
           </div>
         </div>
         <div class="form-group">

data/app/views/kaui/subscriptions/_subscriptions_table.html.erb

@@ -20,7 +20,7 @@
         <td><%= humanized_subscription_charged_through_date(sub, account) %></td>
         <td><%= humanized_subscription_cancelled_date(sub, account) %></td>
         <td class="text-center">
-            <% if is_subscription_future_cancelled?(sub) %>
+            <% if is_subscription_future_cancelled?(sub, account) %>
                 <%= link_to 'Reinstate', kaui_engine.reinstate_path(:id => sub.subscription_id), :method => :put, :class => 'btn btn-xs' %>
             <% elsif !is_subscription_cancelled?(sub) %>
                 <% if can? :change_plan, Kaui::Subscription %>

data/app/views/kaui/transactions/_control_plugin_names.html.erb

@@ -0,0 +1,66 @@
+<div id="control_plugin_names" class="row">
+  <a class='btn btn-xs' href="javascript:void(0);" onclick="new_control_plugin_name();" id="new_control_plugin_names"><%= '<i class="fa fa-plus-square"></i>'.html_safe + " add control plugin names" %></a>
+  <table id="control_plugin_names_table" class="table table-condensed">
+    <thead>
+    <tr>
+      <th>Control plugin name</th>
+      <th></th>
+    </tr>
+    </thead>
+    <tbody>
+    <% (@control_plugin_names || ['']).each_with_index do |control_plugin_name, index| %>
+      <tr id="control_plugin_name_<%= index %>" >
+        <td><%= text_field_tag 'control_plugin_names[]', control_plugin_name, class: 'form-control' %></td>
+        <td>
+          <a class='btn btn-xs' href="javascript:void(0);" onclick="delete_control_plugin_name(this);" id="delete_control_plugin_name_<%= index %>"><%= '<i class="fa fa-times"></i>'.html_safe %></a>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+  <hr/>
+</div>
+
+<%= javascript_tag do %>
+
+    function new_control_plugin_name() {
+      /* Compute max index value to assign new rows with unsued index */
+      var max_idx = $.map($('[id^=delete_control_plugin_name_]'), function(e, i) {
+        return e.id.split("delete_control_plugin_name_")[1] }
+      ).sort(function(a, b) {
+        return b - a
+      })[0];
+
+      /* Clone existing row and reset id based on max_idx */
+      var row = $('#control_plugin_names_table tbody>tr:last').clone(true);
+      var row_idx = (parseInt(max_idx) + 1).toString();
+      row.attr('id', "control_plugin_name_" + row_idx);
+      row.children("td:last").children('a').attr('id', "delete_control_plugin_name_" + row_idx);
+
+      /* reset value on content */
+      row.find('td').each(function(){
+        $(this).contents().each(function(){
+            $(this).val('');
+        });
+      });
+
+      /* Attach row into dom */
+      row.insertAfter('#control_plugin_names_table tbody>tr:last');
+    }
+
+    function delete_control_plugin_name(obj) {
+      var idx = obj.id.split("delete_control_plugin_name_")[1];
+      var rowCount = $('#control_plugin_names_table tr').size();
+
+      if ( rowCount > 2 ){
+        $("#control_plugin_name_" + idx).remove();
+      } else {
+        $("#control_plugin_name_" + idx).find('td').each(function(){
+          $(this).contents().each(function(){
+            $(this).val('');
+          });
+        });
+      }
+    }
+
+<% end %>

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

@@ -50,7 +50,7 @@
     <div class="form-group">
       <%= label_tag :reason, 'Reason', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= select_tag :reason, options_for_select(Kaui::Payment::SAMPLE_REASON_CODES), :class => 'form-control' %>
+        <%= select_tag :reason, options_for_select(Kaui.payment_reason_codes), :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">
@@ -59,6 +59,12 @@
         <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
       </div>
     </div>
+    <div id="control_plugins" class="col-sm-offset-3 col-sm-9">
+      <%= render :partial => 'control_plugin_names' %>
+    </div>
+    <div id="properties" class="col-sm-offset-3 col-sm-9">
+      <%= render :partial => 'kaui/payment_methods/plugin_properties' %>
+    </div>
     <div class="form-group">
       <div class="col-sm-offset-3 col-sm-9">
         <%= submit_tag 'Save', :class => 'btn btn-default' %>

data/config/initializers/asset.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( kaui/*.png )

data/config/initializers/devise.rb

@@ -21,16 +21,22 @@ module Devise
   class FailureApp < ActionController::Metal
     def scope_url
       opts  = {}
-      route = :"new_#{scope}_session_url"
-      opts[:format] = request_format unless skip_format?
 
-      config = Rails.application.config
+      # Initialize script_name with nil to prevent infinite loops in
+      # authenticated mounted engines in rails 4.2 and 5.0
+      opts[:script_name] = nil
 
-      if config.respond_to?(:relative_url_root) && config.relative_url_root.present?
-        opts[:script_name] = config.relative_url_root
-      end
+      route = route(scope)
+
+      opts[:format] = request_format unless skip_format?
+
+      # Fix for Rails 5.1
+      # See https://github.com/rails/rails/pull/29898/files (merge_script_names)
+      #opts[:script_name] = relative_url_root if relative_url_root?
+      opts[:script_name] = relative_url_root + '/' if relative_url_root?
 
-      context = send(Devise.available_router_name)
+      router_name = Devise.mappings[scope].router_name || Devise.available_router_name
+      context = send(router_name)
 
       if context.respond_to?(route)
         context.send(route, opts)

data/config/initializers/killbill_authenticatable.rb

@@ -20,7 +20,7 @@ module Devise
           # Tell warden to halt the strategy and set the user in the appropriate scope
           success!(resource)
         end
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED => _
         return fail(:killbill_not_available)
       end
     end

data/config/locales/devise.en.yml

@@ -15,7 +15,7 @@ en:
       not_found_in_database: "Invalid username or password."
       killbill_not_available: "Kill Bill is unavailable"
       timeout: "Your session expired, please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
+      unauthenticated: "You need to sign in before continuing."
       unconfirmed: "You have to confirm your account before continuing."
     mailer:
       confirmation_instructions:

data/config/routes.rb

@@ -24,10 +24,18 @@ Kaui::Engine.routes.draw do
 
   scope '/accounts' do
     match '/pagination' => 'accounts#pagination', :via => :get, :as => 'accounts_pagination'
+    match '/validate_external_key' => 'accounts#validate_external_key', :via => :get, :as => 'accounts_validate_external_key'
+
+    scope '/email_notifications' do
+      match '/' => 'accounts#set_email_notifications_configuration', :via => :post, :as => 'email_notifications_configuration'
+      match '/events_to_consider' => 'accounts#events_to_consider', :via => :get, :as => 'email_notification_events_to_consider'
+    end
 
     scope '/:account_id' do
       match '/next_invoice_date' => 'accounts#next_invoice_date', :via => :get, :as => 'next_invoice_date'
       match '/trigger_invoice' => 'accounts#trigger_invoice', :via => :post, :as => 'trigger_invoice'
+      match '/link_to_parent' => 'accounts#link_to_parent', :via => :put, :as => 'link_to_parent'
+      match '/unlink_to_parent' => 'accounts#unlink_to_parent', :via => :delete, :as => 'unlink_to_parent'
 
       scope '/account_tags' do
         match '/edit' => 'account_tags#edit', :via => :get, :as => 'edit_account_tags'
@@ -40,6 +48,10 @@ Kaui::Engine.routes.draw do
       scope '/timeline' do
         match '/' => 'account_timelines#show', :via => :get, :as => 'account_timeline'
       end
+      scope '/account_children' do
+        match '/' => 'account_children#index', :via => :get, :as => 'account_children'
+        match '/pagination' => 'account_children#pagination', :via => :get, :as => 'account_children_pagination'
+      end
     end
   end
   resources :accounts, :only => [ :index, :new, :create, :edit, :update, :show ], :param => :account_id do
@@ -64,12 +76,16 @@ Kaui::Engine.routes.draw do
     resources :queues, :only => [:index]
   end
 
+  scope '/payment_methods' do
+    match '/validate_external_key' => 'payment_methods#validate_external_key', :via => :get, :as => 'payment_methods_validate_external_key'
+  end
   resources :payment_methods, :only => [:new, :create, :show, :destroy]
 
   scope '/invoices' do
     match '/pagination' => 'invoices#pagination', :via => :get, :as => 'invoices_pagination'
     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'
   end
   resources :invoices, :only => [ :index ]
 
@@ -95,12 +111,13 @@ Kaui::Engine.routes.draw do
     match '/:id' => 'bundles#restful_show', :via => :get, :as => 'bundle'
   end
 
-  resources :subscriptions, :only => [:new, :create, :show, :edit, :update, :destroy]
   scope '/subscriptions' do
     match '/:id/edit_bcd' => 'subscriptions#edit_bcd', :via => :get, :as => 'edit_bcd'
     match '/:id/update_bcd' => 'subscriptions#update_bcd', :via => :put, :as => 'update_bcd'
     match '/:id/reinstate' => 'subscriptions#reinstate', :via => :put, :as => 'reinstate'
+    match '/validate_external_key' => 'subscriptions#validate_external_key', :via => :get, :as => 'subscriptions_validate_external_key'
   end
+  resources :subscriptions, :only => [:new, :create, :show, :edit, :update, :destroy]
 
   scope '/tags' do
     match '/pagination' => 'tags#pagination', :via => :get, :as => 'tags_pagination'
@@ -140,6 +157,7 @@ Kaui::Engine.routes.draw do
   resources :admin_tenants, :only => [ :index, :new, :create, :show ]
   scope '/admin_tenants' do
     match '/:id/new_catalog' => 'admin_tenants#new_catalog', :via => :get, :as => 'admin_tenant_new_catalog'
+    match '/:id/delete_catalog' => 'admin_tenants#delete_catalog', :via => :delete, :as => 'admin_tenant_delete_catalog'
     match '/:id/new_plan_currency' => 'admin_tenants#new_plan_currency', :via => :get, :as => 'admin_tenant_new_plan_currency'
     match '/:id/new_overdue_config' => 'admin_tenants#new_overdue_config', :via => :get, :as => 'admin_tenant_new_overdue_config'
     match '/upload_catalog' => 'admin_tenants#upload_catalog', :via => :post, :as => 'admin_tenant_upload_catalog'

data/config/symmetric-encryption.yml

@@ -6,7 +6,7 @@
 # can be placed directly in the source code.
 # And therefore no RSA private key is required
 development:   &development_defaults
-  key:         1234567890ABCDEF1234567890ABCDEF
+  key:         1234567890ABCDEF
   iv:          1234567890ABCDEF
   cipher_name: aes-128-cbc
   encoding:    :base64strict

data/db/ddl.sql

@@ -1,44 +1,44 @@
-CREATE TABLE `kaui_users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `kb_username` varchar(255) NOT NULL,
-  `kb_session_id` varchar(255) DEFAULT NULL,
-  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `index_kaui_users_on_kb_username` (`kb_username`)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+CREATE TABLE kaui_users (
+  id serial unique,
+  kb_username varchar(255) NOT NULL,
+  kb_session_id varchar(255) DEFAULT NULL,
+  created_at datetime NOT NULL,
+  updated_at datetime NOT NULL,
+  PRIMARY KEY (id)
+) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
+CREATE UNIQUE INDEX index_kaui_users_on_kb_username ON kaui_users(kb_username);
 
-CREATE TABLE `kaui_tenants` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `kb_tenant_id` varchar(255) DEFAULT NULL,
-  `api_key` varchar(255) DEFAULT NULL,
-  `encrypted_api_secret` varchar(255) DEFAULT NULL,
-  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `kaui_tenants_kb_name` (`name`),
-  UNIQUE KEY `kaui_tenants_kb_tenant_id` (`kb_tenant_id`),
-  UNIQUE KEY `kaui_tenants_kb_api_key` (`api_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE kaui_tenants (
+  id serial unique,
+  name varchar(255) NOT NULL,
+  kb_tenant_id varchar(255) DEFAULT NULL,
+  api_key varchar(255) DEFAULT NULL,
+  encrypted_api_secret varchar(255) DEFAULT NULL,
+  created_at datetime NOT NULL,
+  updated_at datetime NOT NULL,
+  PRIMARY KEY (id)
+) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
+CREATE UNIQUE INDEX kaui_tenants_kb_name ON kaui_tenants(name);
+CREATE UNIQUE INDEX kaui_tenants_kb_tenant_id ON kaui_tenants(kb_tenant_id);
+CREATE UNIQUE INDEX kaui_tenants_kb_api_key ON kaui_tenants(api_key);
 
-CREATE TABLE `kaui_allowed_users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `kb_username` varchar(255) DEFAULT NULL,
-  `description` varchar(255) DEFAULT NULL,
-  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `kaui_allowed_users_idx` (`kb_username`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE kaui_allowed_users (
+  id serial unique,
+  kb_username varchar(255) DEFAULT NULL,
+  description varchar(255) DEFAULT NULL,
+  created_at datetime NOT NULL,
+  updated_at datetime NOT NULL,
+  PRIMARY KEY (id)
+) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
+CREATE UNIQUE INDEX kaui_allowed_users_idx ON kaui_allowed_users(kb_username);
 
-CREATE TABLE `kaui_allowed_user_tenants` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `kaui_allowed_user_id` int(11) DEFAULT NULL,
-  `kaui_tenant_id` int(11) DEFAULT NULL,
-  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `kaui_allowed_users_tenants_uniq` (`kaui_allowed_user_id`,`kaui_tenant_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE kaui_allowed_user_tenants (
+  id serial unique,
+  kaui_allowed_user_id bigint /*! unsigned */ DEFAULT NULL,
+  kaui_tenant_id bigint /*! unsigned */ DEFAULT NULL,
+  created_at datetime NOT NULL,
+  updated_at datetime NOT NULL,
+  PRIMARY KEY (id)
+) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
+CREATE UNIQUE INDEX kaui_allowed_users_tenants_uniq ON kaui_allowed_user_tenants(kaui_allowed_user_id,kaui_tenant_id);