kaui 2.0.4 → 3.0.1

data/app/models/kaui/tag_definition.rb

@@ -1,54 +1,59 @@
-class Kaui::TagDefinition < KillBillClient::Model::TagDefinition
-
-  # See org.killbill.billing.ObjectType in killbill-api
-  ALL_OBJECT_TYPES = %w(ACCOUNT
-     ACCOUNT_EMAIL
-     BLOCKING_STATES
-     BUNDLE
-     CUSTOM_FIELD
-     INVOICE
-     PAYMENT
-     TRANSACTION
-     INVOICE_ITEM
-     INVOICE_PAYMENT
-     SUBSCRIPTION
-     SUBSCRIPTION_EVENT
-     PAYMENT_ATTEMPT
-     PAYMENT_METHOD
-     REFUND
-     TAG
-     TAG_DEFINITION
-     TENANT
-     TENANT_KVS)
-
-  ALL_OBJECT_TYPES.each do |object_type|
-    define_singleton_method "all_for_#{object_type.downcase}" do |options_for_klient|
-      (self.all('NONE', options_for_klient).delete_if { |tag_definition| !tag_definition.applicable_object_types.include? object_type || tag_definition.is_control_tag }).sort
+# frozen_string_literal: true
+
+module Kaui
+  class TagDefinition < KillBillClient::Model::TagDefinition
+    # See org.killbill.billing.ObjectType in killbill-api
+    ALL_OBJECT_TYPES = %w[ACCOUNT
+                          ACCOUNT_EMAIL
+                          BLOCKING_STATES
+                          BUNDLE
+                          CUSTOM_FIELD
+                          INVOICE
+                          PAYMENT
+                          TRANSACTION
+                          INVOICE_ITEM
+                          INVOICE_PAYMENT
+                          SUBSCRIPTION
+                          SUBSCRIPTION_EVENT
+                          PAYMENT_ATTEMPT
+                          PAYMENT_METHOD
+                          REFUND
+                          TAG
+                          TAG_DEFINITION
+                          TENANT
+                          TENANT_KVS].freeze
+
+    ALL_OBJECT_TYPES.each do |object_type|
+      define_singleton_method "all_for_#{object_type.downcase}" do |options_for_klient|
+        (all('NONE', options_for_klient).delete_if { |tag_definition| !tag_definition.applicable_object_types.include?(object_type) || tag_definition.is_control_tag }).sort
+      end
     end
-  end
 
-  def is_system_tag?
-    return false unless id.present?
-    last_group = id.split('-')[4]
+    def system_tag?
+      return false unless id.present?
+
+      last_group = id.split('-')[4]
 
-    is_system_tag = true
-    last_group.split(//).each_with_index do |c, i|
-      unless (c == '0' and i < 11) or (c.to_i > 0 and i == 11)
-        is_system_tag = false
-        break
+      is_system_tag = true
+      last_group.chars.each_with_index do |c, i|
+        unless ((c == '0') && (i < 11)) || (c.to_i.positive? && (i == 11))
+          is_system_tag = false
+          break
+        end
       end
+      is_system_tag
     end
-    is_system_tag
-  end
 
-  def <=>(tag_definition)
-    # System tags last
-    return 1 if is_system_tag? and !tag_definition.is_system_tag?
-    return -1 if !is_system_tag? and tag_definition.is_system_tag?
-    name <=> tag_definition.name
-  end
+    def <=>(other)
+      # System tags last
+      return 1 if system_tag? && !other.system_tag?
+      return -1 if !system_tag? && other.system_tag?
 
-  def pretty_applicable_object_types
-    applicable_object_types == ALL_OBJECT_TYPES ? 'Any' : applicable_object_types.join(', ')
+      name <=> other.name
+    end
+
+    def pretty_applicable_object_types
+      applicable_object_types == ALL_OBJECT_TYPES ? 'Any' : applicable_object_types.join(', ')
+    end
   end
 end

data/app/models/kaui/tenant.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require 'symmetric-encryption'
 
 module Kaui
   class Tenant < ApplicationRecord
+    attribute :encrypted_api_secret, :encrypted, random_iv: false
+    alias_attribute :api_secret, :encrypted_api_secret
 
-    attr_encrypted :api_secret
-
-    has_many :kaui_allowed_user_tenants, :class_name => 'Kaui::AllowedUserTenant', :foreign_key => 'kaui_tenant_id'
-    has_many :kaui_allowed_users, :through => :kaui_allowed_user_tenants, :source => :kaui_allowed_user
-
+    has_many :kaui_allowed_user_tenants, class_name: 'Kaui::AllowedUserTenant', foreign_key: 'kaui_tenant_id'
+    has_many :kaui_allowed_users, through: :kaui_allowed_user_tenants, source: :kaui_allowed_user
   end
 end

data/app/models/kaui/transaction.rb

@@ -1,40 +1,52 @@
-class Kaui::Transaction < KillBillClient::Model::Transaction
+# frozen_string_literal: true
 
-  attr_accessor :next_retry_date
+module Kaui
+  class 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))
+    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
-    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)
-    elsif transaction_type == 'CAPTURE'
-      capture(user, reason, comment, options)
-    elsif transaction_type == 'CHARGEBACK'
-      chargeback(user, reason, comment, options)
-    elsif transaction_type == 'CREDIT'
-      credit(account_id, payment_method_id, user, reason, comment, options)
-    elsif transaction_type == 'PURCHASE'
-      purchase(account_id, payment_method_id, user, reason, comment, options)
-    elsif transaction_type == 'REFUND'
-      refund(user, reason, comment, options)
-    elsif transaction_type == 'VOID'
-      void(user, reason, comment, options)
-    else
-      raise ArgumentError.new("Unknown transaction type #{transaction_type}")
+    def create(account_id = nil, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {})
+      case transaction_type
+      when 'AUTHORIZE'
+        auth(account_id, payment_method_id, user, reason, comment, options)
+      when 'CAPTURE'
+        capture(user, reason, comment, options)
+      when 'CHARGEBACK'
+        chargeback(user, reason, comment, options)
+      when 'CREDIT'
+        credit(account_id, payment_method_id, user, reason, comment, options)
+      when 'PURCHASE'
+        purchase(account_id, payment_method_id, user, reason, comment, options)
+      when 'REFUND'
+        refund(user, reason, comment, options)
+      when 'VOID'
+        void(user, reason, comment, options)
+      else
+        raise ArgumentError, "Unknown transaction type #{transaction_type}"
+      end
     end
-  end
 
-  def amount_to_money
-    Kaui::Base.to_money(amount, currency)
-  end
+    def amount_to_money
+      Kaui::Base.to_money(amount, currency)
+    end
 
-  def self.amount_to_money(transaction)
-    self.new(:amount => transaction.amount, :currency => transaction.currency).amount_to_money
+    def processed_amount_to_money
+      Kaui::Base.to_money(processed_amount, processed_currency)
+    end
+
+    def self.amount_to_money(transaction)
+      new(amount: transaction.amount, currency: transaction.currency).amount_to_money
+    end
+
+    def self.processed_amount_to_money(transaction)
+      new(processed_amount: transaction.processed_amount, processed_currency: transaction.processed_currency).processed_amount_to_money
+    end
   end
 end

data/app/models/kaui/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'killbill_client'
 
 module Kaui
@@ -9,36 +11,28 @@ module Kaui
 
     # Called by Devise to perform authentication
     # Throws KillBillClient::API::Unauthorized on failure
-    def self.find_permissions(kb_username, kb_password)
-      do_find_permissions :username => kb_username,
-                          :password => kb_password
+    def self.find_permissions(options)
+      do_find_permissions(options)
     end
 
     # Called by CanCan to perform authorization
     # Throws KillBillClient::API::Unauthorized on failure
     def permissions
-      User.do_find_permissions :session_id => kb_session_id
+      User.do_find_permissions session_id: kb_session_id
     end
 
-    # Verify the Kill Bill session hasn't timed-out
+    # Verify the Kill Bill session hasn't timed-out (ran as part of Warden::Proxy#set_user)
     def authenticated_with_killbill?
-      begin
-        subject = KillBillClient::Model::Security.find_subject :session_id => kb_session_id
-        result = subject.is_authenticated
-        return result
-      rescue Errno::ECONNREFUSED => e
-        false
-      rescue KillBillClient::API::Unauthorized => e
-        false
-      end
+      subject = KillBillClient::Model::Security.find_subject session_id: kb_session_id
+      subject.is_authenticated
+    rescue Errno::ECONNREFUSED, KillBillClient::API::Unauthorized => _e
+      false
     end
 
     def root?
       Kaui.root_username == kb_username
     end
 
-    private
-
     def self.do_find_permissions(options = {})
       KillBillClient::Model::Security.find_permissions options
     end

data/app/models/kaui/user_role.rb

@@ -1,8 +1,11 @@
-class Kaui::UserRole < KillBillClient::Model::UserRoles
+# frozen_string_literal: true
 
-  def self.find_roles_by_username(username, options = {})
-    user_role = Kaui::UserRole.new
-    user_role.username = username
-    user_role.list(options).roles
+module Kaui
+  class UserRole < KillBillClient::Model::UserRoles
+    def self.find_roles_by_username(username, options = {})
+      user_role = Kaui::UserRole.new
+      user_role.username = username
+      user_role.list(options).roles
+    end
   end
 end

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

@@ -25,6 +25,10 @@
                       <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Create charge'.html_safe,
                                   kaui_engine.new_account_charge_path(@account.account_id, :currency => @account.currency) %>
                   <% end %>
+                  <% if deposit_plugin_available? %>
+                      <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Create deposit'.html_safe,
+                                  deposit_engine.collection_index_path(:account_id => @account.account_id, :currency => @account.currency) %>
+                  <% end %>
                 </div>
               </div>
             </div>
@@ -112,7 +116,7 @@
                       <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">
+                          <input class="form-control" id="target_date" name="target_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true">
                         </div>
                         <% if can? :dry_run, Kaui::Invoice %>
                           <div style="width: 14.5%; float: left; padding: 0;">

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

@@ -68,7 +68,7 @@
     <div class="form-group">
       <%= 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' %>
+        <%= f.select :locale, all_available_locales, {:selected => (@account.locale || 'en_US'), :disabled => '---------------'}, :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">
@@ -104,7 +104,7 @@
     <div class="form-group">
       <%= f.label :state, 'State', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= f.select :state, get_U_S_states, {:include_blank => '', :selected => @account.state}, :class => 'form-control select-state' %>
+        <%= f.select :state, all_us_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>

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

@@ -7,6 +7,9 @@
           <%= link_to '<i class="fa fa-plus-square"></i>'.html_safe,
                       kaui_engine.new_payment_method_path(:account_id => @account.account_id),
                       :class => 'btn btn-xs' %>
+          <%= form_tag kaui_engine.refresh_payment_methods_path(params.to_h), :method => :post, :class => 'form-force-inline form-right' do %>
+              <%= button_tag '<i class="fa fa-refresh"></i>'.html_safe, :class => 'btn btn-xs' %>
+          <% end %>
       <% end %>
     </h1>
 

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

@@ -13,8 +13,9 @@
       <tr>
         <th></th>
         <th>ID</th>
-        <th>External key</th>
-        <th>Balance</th>
+        <% Kaui.account_search_columns.call()[0].each do |title| %>
+          <th><%= title %></th>
+        <% end %>
       </tr>
       </thead>
       <tbody>
@@ -30,6 +31,7 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
+
   var table = $('#accounts-table').DataTable({
     "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
     "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
@@ -39,8 +41,10 @@ $(document).ready(function() {
     },
     "pageLength": <%= @limit %>,
     "displayStart": <%= @offset %>,
-    <% unless @ordering.blank? %>
-        "order": [[ 1, "<%= @ordering %>" ]],
+    <% if @search_query.blank? %>
+      "ordering": false,
+    <% elsif !@ordering.blank? %>
+      "order": [[ 1, "<%= @ordering %>" ]],
     <% end %>
     "processing": true,
     "serverSide": true,
@@ -61,6 +65,7 @@ $(document).ready(function() {
   <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->
   <% if @max_nb_records.nil? %>
     $('#accounts-table').on('draw.dt', function() {
+      $.noConflict();
       var noMoreData = table.column(0)
                             .data()
                             .length == 0;

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

@@ -4,7 +4,7 @@
     <div class='form-group'>
       <div class="col-sm-offset-2 col-sm-9">
         <div class="checkbox">
-          <%= label_tag :external do %>
+          <%= f.label :external do %>
                   <%= check_box_tag :external, '1', false, { :disabled => !@allowed_user.id.blank? } %>Managed externally (LDAP, Okta, etc.)?
           <% end %>
         </div>
@@ -17,9 +17,9 @@
       </div>
     </div>
     <div class="form-group">
-      <%= f.label_tag :password, 'Password', :class => 'col-sm-2 control-label' %>
+      <%= f.label  :password, 'Password', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.password_field_tag :password, '', :class => 'form-control' %>
+        <%= password_field_tag :password, nil, class:'form-control' %>
       </div>
     </div>
     <div class="form-group">

data/app/views/kaui/admin_tenants/_form_catalog_translation.erb

@@ -5,7 +5,7 @@
 
           <div class="form-group">
             <div class="col-sm-10">
-              <%= file_field_tag 'catalog_translation', :class => 'form-control' %>
+              <%= file_field_tag 'catalog_translation', :class => 'form-control', :required => true %>
             </div>
           </div>
           <div class="form-group">

data/app/views/kaui/admin_tenants/_form_invoice_template.erb

@@ -5,7 +5,7 @@
 
           <div class="form-group">
             <div class="col-sm-10">
-              <%= file_field_tag 'invoice_template', :class => 'form-control' %>
+              <%= file_field_tag 'invoice_template', :class => 'form-control', :required => true %>
             </div>
           </div>
           <div class="form-group">

data/app/views/kaui/admin_tenants/_form_invoice_translation.erb

@@ -5,7 +5,7 @@
 
           <div class="form-group">
             <div class="col-sm-10">
-              <%= file_field_tag 'invoice_translation', :class => 'form-control' %>
+              <%= file_field_tag 'invoice_translation', :class => 'form-control', :required => true %>
             </div>
           </div>
           <div class="form-group">

data/app/views/kaui/admin_tenants/_form_plugin_config.erb

@@ -44,8 +44,8 @@
           </div>
           <div class="form-group">
             <%= label_tag :configuration, 'Configuration', :class => 'col-sm-2 control-label' %>
-            <div class="col-sm-4">
-              <textarea name="plugin_properties[raw_config]" id="raw_config" rows="10" class="form-control"></textarea>
+            <div class="col-sm-6">
+              <textarea name="plugin_properties[raw_config]" id="raw_config" rows="20" class="form-control"></textarea>
             </div>
           </div>
 
@@ -170,9 +170,19 @@
             /* Retrieve existing plugin properties for this tenant */
             var existing_props = get_existing_tenant_plugin_properties(plugin_key);
 
-            // try by plugin name for proprietary plugins
+            // Try by plugin name for proprietary plugins
             if (isBlank(existing_props) && !isBlank(plugin_name)) {
                 existing_props = get_existing_tenant_plugin_properties(plugin_name);
+                if (isBlank(existing_props)) {
+                    // For proprietary plugins, the killbill- prefix likely doesn't exist (see Kaui::PluginHelper discussion)
+                    plugin_name = plugin_name.replace('killbill-', '');
+                    existing_props = get_existing_tenant_plugin_properties(plugin_name);
+                    if (isBlank(existing_props)) {
+                        // For proprietary plugins, our docs suggest acme:foo as the format for the plugin key, and often the plugin name becomes acme-foo
+                        plugin_name = plugin_name.replace(':', '-');
+                        existing_props = get_existing_tenant_plugin_properties(plugin_name);
+                    }
+                }
             }
 
             return existing_props;

data/app/views/kaui/admin_tenants/_show_catalog_simple.erb

@@ -30,12 +30,13 @@
 
     <thead>
     <tr>
-      <th>Plan Id</th>
-      <th>Product</th>
-      <th>Category</th>
-      <th>Billing Period</th>
+      <th><%= I18n.translate('views.catalogs.show.plan_table.plan_id') %></th>
+      <th><%= I18n.translate('views.catalogs.show.plan_table.product') %></th>
+      <th><%= I18n.translate('views.catalogs.show.plan_table.category') %></th>
+      <th><%= I18n.translate('views.catalogs.show.plan_table.billing_period') %></th>
       <th id="currency_select"></th>
-      <th>Trial</th>
+      <th><%= I18n.translate('views.catalogs.show.plan_table.trial') %></th>
+      <th><%= I18n.translate('views.catalogs.show.plan_table.final_phase_duration') %></th>
       <th></th>
     </tr>
     </thead>
@@ -72,6 +73,11 @@
             {{#trial_length}} {{trial_length}} {{#humanized_time_unit}}{{trial_time_unit}}{{/humanized_time_unit}} {{/trial_length}}
             {{^trial_length}} N/A {{/trial_length}}
           </td>
+
+          <td>
+            {{final_phase_duration}}
+          </td>
+
           <td><a class="btn btn-xs"
                  href="{{new_plan_currency_path}}"><i class="fa fa-plus-square"></i> currency</a></td>
         </tr>

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

@@ -7,7 +7,7 @@
   </div>
   <%= form_for @simple_plan, :url => {:action => :create_simple_plan}, :html => {:class => 'form-horizontal'} do |f| %>
 
-      <%= f.hidden_field_tag(:id, @tenant.id) %>
+      <%= hidden_field_tag(:id, @tenant.id) %>
       <div class="form-group" id="form_category">
         <%= f.label :product_category, 'Product Category', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
@@ -96,7 +96,7 @@
 
       <div class="form-group">
         <div class="col-sm-10">
-          <%= file_field_tag 'catalog', :class => 'form-control' %>
+          <%= file_field_tag 'catalog', :class => 'form-control', :required => true %>
         </div>
       </div>
       <div class="form-group">

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

@@ -27,7 +27,7 @@
           </tr>
           </thead>
           <tbody>
-          <%= f.hidden_field_tag(:id, @tenant.id) %>
+          <%= hidden_field_tag(:id, @tenant.id) %>
 
           <% @overdue.overdue_states.reverse.each_with_index do |state, idx| %>
               <tr class="overdue_state_<%= state %>" id="tr_state_<%= idx %>">
@@ -71,7 +71,7 @@
 
           <div class="form-group">
             <div class="col-sm-10">
-              <%= file_field_tag 'overdue', :class => 'form-control' %>
+              <%= file_field_tag 'overdue', :class => 'form-control', :required => true %>
             </div>
           </div>
           <div class="form-group">

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

@@ -6,7 +6,7 @@
   </div>
   <%= form_for @simple_plan, :url => {:action => :create_simple_plan}, :html => {:class => 'form-horizontal'} do |f| %>
 
-      <%= f.hidden_field_tag(:id, @tenant.id) %>
+      <%= hidden_field_tag(:id, @tenant.id) %>
       <div class="form-group">
         <%= f.label :plan_id, 'Plan ID', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">

data/app/views/kaui/bundles/_bundle_details.html.erb

@@ -0,0 +1,12 @@
+<table class="transparent subtitle">
+  <tr>
+    <th>Bundle ID</th>
+    <td><%= bundle.bundle_id %></td>
+  </tr>
+  <% unless bundle.bundle_id == bundle.external_key %>
+    <tr>
+      <th>Bundle key</th>
+      <td><%= bundle.external_key %></td>
+    </tr>
+  <% end %>
+</table>

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

@@ -10,19 +10,8 @@
 
   <% @bundles.each_with_index do |bundle, idx| %>
       <div class="row">
-        <div class="col-md-5">
-          <table class="transparent subtitle">
-            <tr>
-              <th>Bundle ID</th>
-              <td><%= bundle.bundle_id %></td>
-            </tr>
-            <% unless bundle.bundle_id == bundle.external_key %>
-                <tr>
-                  <th>Bundle key</th>
-                  <td><%= bundle.external_key %></td>
-                </tr>
-            <% end %>
-          </table>
+        <div class="col-md-6">
+          <%= render :partial => Kaui.bundle_details_partial, :locals => { :bundle => bundle, :account => @account, :catalog => @catalog } %>
         </div>
       </div>
 
@@ -48,7 +37,7 @@
           <%= render :partial => 'kaui/custom_fields/list_bar',
                      :locals => {:custom_fields => @custom_fields_per_bundle[bundle.bundle_id] || []} %>
 
-          <% if !is_subscription_cancelled?(@subscription[bundle.bundle_id]) &&
+          <% if !subscription_cancelled?(@subscription[bundle.bundle_id]) &&
               (can?(:create, Kaui::Subscription) || can?(:transfer, Kaui::Subscription) || can?(:pause_resume, Kaui::Subscription)) %>
               <div class="tag-select" onclick="void(0)">
                 <span><i class="fa fa-gift"></i><i class="fa fa-caret-down"></i></span>

data/app/views/kaui/bundles/transfer.html.erb

@@ -2,24 +2,32 @@
   <div class="col-md-8 col-md-offset-2">
 
     <div class="column-block">
-      <h1>Transfer</h1>
+      <h1> <%= I18n.translate('transfer') %></h1>
 
       <%= form_tag do_transfer_bundle_path(@bundle_id), :class => 'form-horizontal', :method => :put do %>
           <div class="form-group">
-            <%= label_tag :new_account_key, 'New Account', :class => 'col-sm-2 control-label' %>
+            <%= label_tag :new_account_key, I18n.translate('new_account'), :class => 'col-sm-2 control-label' %>
             <div class="col-sm-10">
-              <%= text_field_tag :new_account_key, nil, :class => 'form-control', :placeholder => 'New account id or external key' %>
+              <%= text_field_tag :new_account_key, nil, :class => 'form-control', :placeholder => I18n.translate('new_account_id_or_external_key') %>
             </div>
           </div>
+
+          <div class="form-group">
+            <%= label_tag :billing_policy, I18n.translate('billing_policy'), :class => 'col-sm-2 control-label' %>
+            <div class="col-sm-10">
+              <%= select_tag :billing_policy, options_for_select(Kaui::Bundle.list_transfer_policy_params, selected: "IMMEDIATE") %>
+            </div>
+          </div>
+
           <div class="form-group">
-            <%= label_tag :comment, 'Comment', :class => 'col-sm-2 control-label' %>
+            <%= label_tag :comment, I18n.translate('comment'), :class => 'col-sm-2 control-label' %>
             <div class="col-sm-10">
               <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
             </div>
           </div>
           <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
-              <%= submit_tag 'Change', :class => 'btn btn-default' %>
+              <%= submit_tag I18n.translate('change'), :class => 'btn btn-default' %>
             </div>
           </div>
       <% end %>