kaui 1.4.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b872df3f942d9f2a4e5efc1f1fd93ebb8e37e956
-  data.tar.gz: f25ca3f933403dea99fd1c776330ec7966c190c4
+  metadata.gz: c998eb4ff14442f28a18da7cab14072cc7d19dfc
+  data.tar.gz: 660dbac2ba54d6d0c853b63c697587e486a5c2ed
 SHA512:
-  metadata.gz: 65ae3a7873e00c75ff89a88b0b44fc9bbd8c02f5e68ced24a4f1eb9a696dbfe9b6c0522d360afc2dde9af93fff0c04f8acb9c717a4e6f8a8b6ba18febda005aa
-  data.tar.gz: 7e1f005312d0697fb899dee663e7d89af286b2e22242c4ee66488dc2e92d0a873883a67ca7ba158916e6366fa7c462b2f05cac4762ff3af0883593d0d262647c
+  metadata.gz: 714a6e0da369b82570551cd082b7fd9b8d62ab18e906756a4194e31dfa5f90d47dd5b8624f5ca070915e45308d31839f451cca5a343895642d50ba47c89d1716
+  data.tar.gz: bc72e0c1b8febf3d413d1191e48431a2d330aff546e84493953e0697b043258365973d3fd5d0ea6dddab244b4c9a5d4cc6a92d9ce9e60155cf9663f7acc92b60

data/README.md

@@ -11,7 +11,8 @@ Kill Bill compatibility
 | 0.14.y       | 0.16.z            |
 | 0.15.y       | 0.18.z (Rails 4)  |
 | 0.16.y       | 0.18.z (Rails 5)  |
-| 1.x.y        | 0.20.z            |
+| 1.x.y        | 0.20.z (Rails 5)  |
+| 2.x.y        | 0.22.z (Rails 5)  |
 
 Dependencies
 ------------
@@ -25,10 +26,32 @@ You can run Kaui locally by using the test/dummy app provided:
 
 ```
 export RAILS_ENV=development
+export DATABASE_URL=mysql://root:killbill@<MySQL Host IP>/killbill
 bundle install
 rails db:migrate
 rails s
 ```
+If you experience an error of;
+
+```
+You must use Bundler 2 or greater with this lockfile.
+```
+
+Then run the following commands to update your environment.
+
+Update Rubygems;
+
+```
+gem update --system
+```
+Update bundler;
+```
+gem install bundler
+```
+Update the Gemfile.lock file;
+```
+bundler update --bundler
+```
 
 The Kill Bill URL can be configured through the `KILLBILL_URL` environment variable, e.g.
 

data/app/assets/javascripts/kaui/kaui.js

@@ -144,6 +144,7 @@ jQuery(document).ready(function ($) {
     const VALIDATE_EXTERNAL_KEY = {
         account: { url: Routes.kaui_engine_accounts_validate_external_key_path(), invalid_msg_class_name: '.account_external_key_invalid_msg' },
         payment_method: {url: Routes.kaui_engine_payment_methods_validate_external_key_path(), invalid_msg_class_name: '.payment_method_external_key_invalid_msg'},
+        bundle: {url: Routes.kaui_engine_subscriptions_validate_bundle_external_key_path(), invalid_msg_class_name: '.subscription_bundle_external_key_invalid_msg'},
         subscription: {url: Routes.kaui_engine_subscriptions_validate_external_key_path(), invalid_msg_class_name: '.subscription_external_key_invalid_msg'}
     }
 
@@ -157,8 +158,13 @@ jQuery(document).ready(function ($) {
         validate_external_key($(this).val(),'payment_method');
     });
 
-    validate_external_key($('#external_key').val(),'subscription');
-    $('#external_key').on('change', function(e){
+    validate_external_key($('#bundle_external_key').val(),'bundle');
+    $('#bundle_external_key').on('change', function(e){
+        validate_external_key($(this).val(),'bundle');
+    });
+
+    validate_external_key($('#subscription_external_key').val(),'subscription');
+    $('#subscription_external_key').on('change', function(e){
         validate_external_key($(this).val(),'subscription');
     });
 

data/app/assets/stylesheets/kaui/common.less

@@ -717,4 +717,47 @@ form[id^="new_tag_definition"] {
 
 .switch-tenant-active {
     color: #00919d;
-}
+}
+
+/* Required for https://github.com/killbill/killbill-admin-ui/issues/262 */
+.ui-autocomplete {
+  position: absolute;
+  z-index: 1000;
+  float: left;
+  display: none;
+  min-width: 160px;
+  padding: 4px 0;
+  margin: 2px 0 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 1px;
+  border-radius: 5px;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  background-clip: padding-box;
+
+  .ui-menu-item {
+    display: block;
+    padding: 3px 15px;
+    clear: both;
+    font-weight: normal;
+    line-height: 18px;
+    color: #555555;
+    white-space: nowrap;
+
+    .ui-state-active, .ui-state-hover {
+      color: #ffffff;
+      text-decoration: none;
+      background-color: #0088cc;
+      border-radius: 0px;
+      -webkit-border-radius: 0px;
+      -moz-border-radius: 0px;
+      background-image: none;
+    }
+  }
+}
+
+.ui-helper-hidden-accessible {
+  display: none;
+}

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -81,12 +81,7 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     fetch_overdue = promise { Kaui::Overdue::get_overdue_json(options) rescue @overdue = nil }
     fetch_overdue_xml = promise { Kaui::Overdue::get_tenant_overdue_config('xml', options) rescue @overdue_xml = nil }
 
-    plugin_repository = Kaui::AdminTenant::get_plugin_repository
-    # hack:: replace paypal key with paypal_express, to set configuration and allow the ui to find the right configuration inputs
-    plugin_repository = plugin_repository.inject({}) { |p, (k,v)| p[k.to_s.sub(/\Apaypal/, 'paypal_express').to_sym] = v; p }
-
-    fetch_plugin_config = promise { Kaui::AdminTenant::get_oss_plugin_info(plugin_repository) }
-    fetch_tenant_plugin_config = promise { Kaui::AdminTenant::get_tenant_plugin_config(plugin_repository, options) }
+    fetch_tenant_plugin_config = promise { Kaui::AdminTenant::get_tenant_plugin_config(options) }
 
     @catalog_versions = []
     wait(fetch_catalog_versions).each_with_index do |effective_date, idx|
@@ -98,7 +93,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
     @overdue = wait(fetch_overdue)
     @overdue_xml = wait(fetch_overdue_xml)
-    @plugin_config = wait(fetch_plugin_config) rescue ''
     @tenant_plugin_config = wait(fetch_tenant_plugin_config) rescue ''
 
     # When reloading page from the view, it sends the last tab that was active
@@ -121,27 +115,15 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   end
 
   def new_catalog
-    @tenant = safely_find_tenant_by_id(params[:id])
-
     options = tenant_options_for_client
-    options[:api_key] = @tenant.api_key
-    options[:api_secret] = @tenant.api_secret
-
-    latest_catalog = Kaui::Catalog::get_catalog_json(true, nil, options)
-
-    @ao_mapping = Kaui::Catalog::build_ao_mapping(latest_catalog)
-
-    @available_base_products = latest_catalog && latest_catalog.products ?
-        latest_catalog.products.select { |p| p.type == 'BASE' }.map { |p| p.name } : []
-    @available_ao_products = latest_catalog && latest_catalog.products ?
-        latest_catalog.products.select { |p| p.type == 'ADD_ON' }.map { |p| p.name } : []
-    @available_standalone_products = latest_catalog && latest_catalog.products ?
-        latest_catalog.products.select { |p| p.type == 'STANDALONE' }.map { |p| p.name } : []
-    @product_categories = [:BASE, :ADD_ON, :STANDALONE]
-    @billing_period = [:DAILY, :WEEKLY, :BIWEEKLY, :THIRTY_DAYS, :MONTHLY, :QUARTERLY, :BIANNUAL, :ANNUAL, :BIENNIAL]
-    @time_units = [:UNLIMITED, :DAYS, :WEEKS, :MONTHS, :YEARS]
-
-    @simple_plan = Kaui::SimplePlan.new
+    fetch_state_for_new_catalog_screen(options)
+    @simple_plan = Kaui::SimplePlan.new({
+                                         :product_category => 'BASE',
+                                         :amount => 0,
+                                         :trial_length => 0,
+                                         :currency => 'USD',
+                                         :billing_period => 'MONTHLY'
+                                        })
   end
 
   def delete_catalog
@@ -189,21 +171,55 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   end
 
   def create_simple_plan
-    current_tenant = safely_find_tenant_by_id(params[:id])
-
     options = tenant_options_for_client
-    options[:api_key] = current_tenant.api_key
-    options[:api_secret] = current_tenant.api_secret
+    fetch_state_for_new_catalog_screen(options)
 
     simple_plan = params.require(:simple_plan).delete_if { |e, value| value.blank? }
     # Fix issue in Rails where first entry in the multi-select array is an empty string
     simple_plan["available_base_products"].reject!(&:blank?) if simple_plan["available_base_products"]
 
-    simple_plan = KillBillClient::Model::SimplePlanAttributes.new(simple_plan)
-
-    Kaui::Catalog.add_tenant_catalog_simple_plan(simple_plan, options[:username], nil, comment, options)
+    @simple_plan = Kaui::SimplePlan.new(simple_plan)
+
+    valid = true
+    # Validate new simple plan
+    # https://github.com/killbill/killbill-admin-ui/issues/247
+    if @available_base_products.include?(@simple_plan.plan_id)
+      flash.now[:error] = "Error while creating plan: invalid plan name (#{@simple_plan.plan_id} is a BASE product already)"
+      valid = false
+    elsif @available_ao_products.include?(@simple_plan.plan_id)
+      flash.now[:error] = "Error while creating plan: invalid plan name (#{@simple_plan.plan_id} is an ADD_ON product already)"
+      valid = false
+    elsif @available_standalone_products.include?(@simple_plan.plan_id)
+      flash.now[:error] = "Error while creating plan: invalid plan name (#{@simple_plan.plan_id} is a STANDALONE product already)"
+      valid = false
+    elsif @all_plans.include?(@simple_plan.product_name)
+      flash.now[:error] = "Error while creating plan: invalid product name (#{@simple_plan.product_name} is a plan name already)"
+      valid = false
+    elsif @all_plans.include?(@simple_plan.plan_id)
+      flash.now[:error] = "Error while creating plan: plan #{@simple_plan.plan_id} already exists"
+      valid = false
+    elsif @available_base_products.include?(@simple_plan.product_name) && @simple_plan.product_category != 'BASE'
+      flash.now[:error] = "Error while creating plan: product #{@simple_plan.product_name} is a BASE product"
+      valid = false
+    elsif @available_ao_products.include?(@simple_plan.product_name) && @simple_plan.product_category != 'ADD_ON'
+      flash.now[:error] = "Error while creating plan: product #{@simple_plan.product_name} is an ADD_ON product"
+      valid = false
+    elsif @available_standalone_products.include?(@simple_plan.product_name) && @simple_plan.product_category != 'STANDALONE'
+      flash.now[:error] = "Error while creating plan: product #{@simple_plan.product_name} is a STANDALONE product"
+      valid = false
+    end
 
-    redirect_to admin_tenant_path(current_tenant.id), :notice => 'Catalog plan was successfully added'
+    if valid
+      begin
+        Kaui::Catalog.add_tenant_catalog_simple_plan(@simple_plan, options[:username], nil, comment, options)
+        redirect_to admin_tenant_path(@tenant.id), :notice => 'Catalog plan was successfully added'
+      rescue => e
+        flash.now[:error] = "Error while creating plan: #{as_string(e)}"
+        render :action => :new_catalog
+      end
+    else
+      render :action => :new_catalog
+    end
   end
 
   def new_overdue_config
@@ -307,6 +323,8 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
     if plugin_properties.blank?
       flash[:error] = 'Plugin properties cannot be blank'
+    elsif plugin_name.blank?
+      flash[:error] = 'Plugin name cannot be blank'
     else
       plugin_config = Kaui::AdminTenant.format_plugin_config(plugin_key, plugin_type, plugin_properties)
 
@@ -314,7 +332,7 @@ class Kaui::AdminTenantsController < Kaui::EngineController
       flash[:notice] = 'Config for plugin was successfully uploaded'
     end
 
-    redirect_to admin_tenant_path(current_tenant.id)
+    redirect_to admin_tenant_path(current_tenant.id, :active_tab => 'PluginConfig')
   end
 
   def remove_allowed_user
@@ -406,28 +424,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     end
   end
 
-  def suggest_plugin_name
-    json_response do
-      message = nil
-      entered_plugin_name = params.require(:plugin_name)
-      plugin_repository = view_context.plugin_repository
-
-      found_plugin, weights = fuzzy_match(entered_plugin_name, plugin_repository)
-
-      if weights.size > 0
-        plugin_anchor = view_context.link_to(weights[0][:plugin_name], '#', id: 'suggested',
-                                            data: {
-                                                plugin_name: weights[0][:plugin_name],
-                                                plugin_key: weights[0][:plugin_key],
-                                                plugin_type: weights[0][:plugin_type],
-                                            })
-        message = "Similar plugin already installed: '#{plugin_anchor}'" if weights[0][:worth_weight].to_f >= 1.0 && weights[0][:installed]
-        message = "Did you mean '#{plugin_anchor}'?" if weights[0][:worth_weight].to_f < 1.0 || !weights[0][:installed]
-      end
-      { suggestion: message, plugin: found_plugin }
-    end
-  end
-
   def switch_tenant
     tenant = Kaui::Tenant.find_by_kb_tenant_id(params.require(:kb_tenant_id))
 
@@ -441,6 +437,29 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
   private
 
+  # Share code to handle render on error
+  def fetch_state_for_new_catalog_screen(options)
+    @tenant = safely_find_tenant_by_id(params[:id])
+
+    options[:api_key] = @tenant.api_key
+    options[:api_secret] = @tenant.api_secret
+
+    latest_catalog = Kaui::Catalog::get_catalog_json(true, nil, options)
+    @all_plans = latest_catalog ? (latest_catalog.products || []).map(&:plans).flatten.map(&:name) : []
+
+    @ao_mapping = Kaui::Catalog::build_ao_mapping(latest_catalog)
+
+    @available_base_products = latest_catalog && latest_catalog.products ?
+        latest_catalog.products.select { |p| p.type == 'BASE' }.map { |p| p.name } : []
+    @available_ao_products = latest_catalog && latest_catalog.products ?
+        latest_catalog.products.select { |p| p.type == 'ADD_ON' }.map { |p| p.name } : []
+    @available_standalone_products = latest_catalog && latest_catalog.products ?
+        latest_catalog.products.select { |p| p.type == 'STANDALONE' }.map { |p| p.name } : []
+    @product_categories = [:BASE, :ADD_ON, :STANDALONE]
+    @billing_period = [:DAILY, :WEEKLY, :BIWEEKLY, :THIRTY_DAYS, :MONTHLY, :QUARTERLY, :BIANNUAL, :ANNUAL, :BIENNIAL]
+    @time_units = [:UNLIMITED, :DAYS, :WEEKS, :MONTHS, :YEARS]
+  end
+
   def safely_find_tenant_by_id(tenant_id)
     tenant = Kaui::Tenant.find_by_id(tenant_id)
     raise ActiveRecord::RecordNotFound.new('Could not find tenant ' + tenant_id) unless retrieve_tenants_for_current_user.include?(tenant.kb_tenant_id)
@@ -473,54 +492,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     data.to_s.split(/(?=[A-Z])|(?=[_])|(?=[-])|(?=[ ])/).select {|member| !member.gsub(/[_-]/,'').strip.empty?}.map { |member| member.gsub(/[_-]/,'').strip.downcase }
   end
 
-  def fuzzy_match(entered_plugin_name, plugin_repository)
-    splitted_entered_plugin_name = split_camel_dash_underscore_space(entered_plugin_name)
-    worth_of_non_words = 0.5 / splitted_entered_plugin_name.size.to_i
-
-    weights = []
-
-    plugin_repository.each do |plugin|
-      return plugin, [] if plugin[:plugin_name] == entered_plugin_name || plugin[:plugin_key] == entered_plugin_name
-      weight = { :plugin_name => plugin[:plugin_name], :plugin_key => plugin[:plugin_key],
-                 :plugin_type => plugin[:plugin_type], :installed => plugin[:installed], :worth_weight => 0.0 }
-
-      splitted_plugin_name = split_camel_dash_underscore_space(plugin[:plugin_name])
-      splitted_entered_plugin_name.each do |entered|
-        if splitted_plugin_name.include?(entered)
-          weight[:worth_weight] = weight[:worth_weight] + 1.0
-        end
-
-        splitted_plugin_name.each do |splitted|
-          if entered.chars.all? { |ch| splitted.include?(ch) }
-            weight[:worth_weight] = weight[:worth_weight] + worth_of_non_words
-            break
-          end
-        end
-
-        # perform a plugin key search, if weight is zero
-        next unless weight[:worth_weight] == 0
-        splitted_plugin_key = split_camel_dash_underscore_space(plugin[:plugin_key])
-
-        if splitted_plugin_key.include?(entered)
-          weight[:worth_weight] = weight[:worth_weight] + 1.0
-        end
-
-        splitted_plugin_key.each do |splitted|
-          if entered.chars.all? { |ch| splitted.include?(ch) }
-            weight[:worth_weight] = weight[:worth_weight] + worth_of_non_words
-            break
-          end
-        end
-      end
-
-      weights << weight if weight[:worth_weight] > 0
-
-    end
-
-    weights.sort! { |a,b| b[:worth_weight] <=> a[:worth_weight] } if weights.size > 1
-    return nil, weights
-  end
-
   def fetch_catalog_xml(tenant_id, effective_date)
     current_tenant = safely_find_tenant_by_id(tenant_id)
 

data/app/controllers/kaui/audit_logs_controller.rb

@@ -1,5 +1,5 @@
 class Kaui::AuditLogsController < Kaui::EngineController
-  OBJECT_WITH_HISTORY = %w[ACCOUNT ACCOUNT_EMAIL CUSTOM_FIELD PAYMENT_ATTEMPT PAYMENT PAYMENT_METHOD TRANSACTION TAG TAG_DEFINITION]
+  OBJECT_WITH_HISTORY = %w[ACCOUNT ACCOUNT_EMAIL BLOCKING_STATES BUNDLE CUSTOM_FIELD INVOICE INVOICE_ITEM PAYMENT_ATTEMPT PAYMENT PAYMENT_METHOD SUBSCRIPTION SUBSCRIPTION_EVENT TRANSACTION TAG TAG_DEFINITION]
 
   def index
     cached_options_for_klient = options_for_klient
@@ -57,8 +57,25 @@ class Kaui::AuditLogsController < Kaui::EngineController
         elsif object_type == 'ACCOUNT_EMAIL'
           account = Kaui::Account::find_by_id_or_key(account_id, false, false, cached_options_for_klient)
           audit_logs_with_history = account.email_audit_logs_with_history(object_id, cached_options_for_klient)
+        elsif object_type == 'BLOCKING_STATES'
+          audit_logs_with_history = Kaui::Account::blocking_state_audit_logs_with_history(object_id, cached_options_for_klient)
+        elsif object_type == 'BUNDLE'
+          bundle = Kaui::Bundle::find_by_id(object_id, cached_options_for_klient)
+          audit_logs_with_history = bundle.audit_logs_with_history(cached_options_for_klient)
         elsif object_type == 'CUSTOM_FIELD'
           audit_logs_with_history = Kaui::CustomField.new({:custom_field_id => object_id}).audit_logs_with_history(cached_options_for_klient)
+        elsif object_type == 'INVOICE'
+          invoice = Kaui::Invoice::find_by_id(object_id, false, "NONE", cached_options_for_klient)
+          audit_logs_with_history = invoice.audit_logs_with_history(cached_options_for_klient)
+        elsif object_type == 'INVOICE_ITEM'
+          invoice_item = Kaui::InvoiceItem.new
+          invoice_item.invoice_item_id = object_id
+          audit_logs_with_history = invoice_item.audit_logs_with_history(cached_options_for_klient)
+=begin See https://github.com/killbill/killbill/issues/1104
+        elsif object_type == 'INVOICE_PAYMENT'
+          invoice_payment = Kaui::InvoicePayment::find_by_id(object_id, false, false, cached_options_for_klient)
+=end
+          audit_logs_with_history = invoice_payment.audit_logs_with_history(cached_options_for_klient)
         elsif object_type == 'PAYMENT_ATTEMPT'
           audit_logs_with_history = Kaui::Payment::attempt_audit_logs_with_history(object_id, cached_options_for_klient)
         elsif object_type == 'PAYMENT'
@@ -67,6 +84,11 @@ class Kaui::AuditLogsController < Kaui::EngineController
         elsif object_type == 'PAYMENT_METHOD'
           payment_method = Kaui::PaymentMethod::find_by_id(object_id, false, cached_options_for_klient)
           audit_logs_with_history = payment_method.audit_logs_with_history(cached_options_for_klient)
+        elsif object_type == 'SUBSCRIPTION'
+          subscription = Kaui::Subscription::find_by_id(object_id, cached_options_for_klient)
+          audit_logs_with_history = subscription.audit_logs_with_history(cached_options_for_klient)
+        elsif object_type == 'SUBSCRIPTION_EVENT'
+          audit_logs_with_history = Kaui::Subscription::event_audit_logs_with_history(object_id, cached_options_for_klient)
         elsif object_type == 'TRANSACTION'
           audit_logs_with_history = Kaui::Transaction::new({:transaction_id => object_id}).audit_logs_with_history(cached_options_for_klient)
         elsif object_type == 'TAG'

data/app/controllers/kaui/charges_controller.rb

@@ -5,7 +5,7 @@ class Kaui::ChargesController < Kaui::EngineController
     amount = params[:amount]
 
     if invoice_id.present?
-      @invoice = Kaui::Invoice.find_by_id(invoice_id, true, 'NONE', options_for_klient)
+      @invoice = Kaui::Invoice.find_by_id(invoice_id, 'NONE', options_for_klient)
       amount ||= @invoice.balance
       currency = @invoice.currency
     else

data/app/controllers/kaui/credits_controller.rb

@@ -5,7 +5,7 @@ class Kaui::CreditsController < Kaui::EngineController
     amount = params[:amount]
 
     if invoice_id.present?
-      @invoice = Kaui::Invoice.find_by_id(invoice_id, true, 'NONE', options_for_klient)
+      @invoice = Kaui::Invoice.find_by_id(invoice_id, 'NONE', options_for_klient)
       amount ||= @invoice.balance
       currency = @invoice.currency
     else
@@ -13,7 +13,7 @@ class Kaui::CreditsController < Kaui::EngineController
       currency = params[:currency] || 'USD'
     end
 
-    @credit = Kaui::Credit.new(:account_id => params.require(:account_id), :invoice_id => invoice_id, :credit_amount => amount, :currency => currency)
+    @credit = Kaui::Credit.new(:account_id => params.require(:account_id), :invoice_id => invoice_id, :amount => amount, :currency => currency)
   end
 
   def create
@@ -23,13 +23,13 @@ class Kaui::CreditsController < Kaui::EngineController
     # No need to show the newly created invoice for account level credits
     should_redirect_to_invoice = credit.invoice_id.present?
 
-    credit = credit.create(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    credits = credit.create(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
     flash[:notice] = 'Credit was successfully created'
 
     if should_redirect_to_invoice
-      redirect_to kaui_engine.account_invoice_path(credit.account_id, credit.invoice_id)
+      redirect_to kaui_engine.account_invoice_path(credits[0].account_id, credits[0].invoice_id)
     else
-      redirect_to kaui_engine.account_path(credit.account_id)
+      redirect_to kaui_engine.account_path(credits[0].account_id)
     end
   end
 end