kaui 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 435f5a3c43e225e631222f6342c14a00732cda14be90c36ea499a21a89d4f0dc
-  data.tar.gz: 733ba6cb910b17aaae7764811f1a2861ac0a6e4521fc856e777dcc055fba6e21
+  metadata.gz: f2de0a1cf9deebfbdae2781d8bfe36637ecd1bf6e01877c6d88ddbc95a77cb05
+  data.tar.gz: c8089c093f566b916137637e53b56a409d7e5bee8e74d0ed16f2bdaabf76d262
 SHA512:
-  metadata.gz: 2db883f170a25e9996a7d2378aefe648b1807c2799a88e0bdbc2b5d495f4f926030ffdce7c414c6725ca7c9e0e54d0fb8ad981f3cedd90ec06bc532abd0ce346
-  data.tar.gz: 957b7d9f5e0b90d147ed20b6c14907402a30ef4f1bd29acb0d1a70016d0773212b375ef9d81aa7c56af2005ab45e777923a7689f3d53da697e1b4e3b7f2e8db8
+  metadata.gz: d26ede3ecdbfdc270234d94c374271bbb47bb94bd90e3d4f98e93706f77b623a7a6236c00ce28d354508cd378402bc60a55a2734695f5f88b8a4d7cdf44d1692
+  data.tar.gz: 870b1a5e19fed59434aec7c4a7a1f4374c834a2e8208689301c7554f91d95ab2f8dd43efc1c989bf679b1426a5eba2365fa8d2a675376f904d3db3dd9baad3fc

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -115,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
@@ -183,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
@@ -415,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)

data/app/controllers/kaui/payment_methods_controller.rb

@@ -45,9 +45,15 @@ class Kaui::PaymentMethodsController < Kaui::EngineController
     }
 
     @plugin_properties = params[:plugin_properties].values.select{ |item| !(item['value'].blank? || item['key'].blank?) } rescue @plugin_properties = nil
-    @plugin_properties.map! do |property|
-      KillBillClient::Model::PluginPropertyAttributes.new(property)
-    end unless @plugin_properties.blank?
+    if @plugin_properties.blank?
+      # In case of error, we want the view to receive nil, not [], so that at least the first row is populated (required to make the JS work)
+      # See https://github.com/killbill/killbill-admin-ui/issues/258
+      @plugin_properties = nil
+    else
+      @plugin_properties.map! do |property|
+        KillBillClient::Model::PluginPropertyAttributes.new(property)
+      end
+    end
 
     begin
       @payment_method = @payment_method.create(@payment_method.is_default, current_user.kb_username, params[:reason], params[:comment],

data/app/helpers/kaui/subscription_helper.rb

@@ -10,12 +10,12 @@ module Kaui
     end
 
     def humanized_product_category(product_category)
-      if product_category == 'BASE'
+      if product_category.to_s == 'BASE'
         'Base'
-      elsif product_category == 'ADD_ON'
+      elsif product_category.to_s == 'ADD_ON'
         'Add-on'
       else
-        product_category.downcase.capitalize
+        product_category.to_s.downcase.capitalize
       end
     end
 
@@ -28,7 +28,8 @@ module Kaui
     end
 
     def humanized_product_name(product_name)
-        product_name.downcase.capitalize
+      # Don't change the casing to avoid confusions (could lead to different products with different casing)
+      product_name
     end
 
     def humanized_subscription_billing_period(sub)

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

@@ -106,8 +106,8 @@
                 plan['new_plan_currency_path'] = Routes.kaui_engine_admin_tenant_new_plan_currency_path(<%= @tenant.id %>, {plan_id: plan['plan_id']});
                 plan['humanized_product_name'] = function(){
                     return function (input, render) {
-                        var product_name = render(input);
-                        return product_name.toLowerCase().replace(/\b\w/g, function(l){ return l.toUpperCase() });
+                        // Keep the product name as-is to avoid confusing with casing
+                        return render(input);
                     }
                 }
 

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

@@ -11,7 +11,7 @@
       <div class="form-group" id="form_category">
         <%= f.label :product_category, 'Product Category', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :product_category, options_for_select(@product_categories.map {|p| [humanized_product_category(p), p] }, :Base), :class => 'form-control' %>
+          <%= f.select :product_category, options_for_select(@product_categories.map {|p| [humanized_product_category(p), p] }, @simple_plan.product_category), :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
@@ -47,31 +47,31 @@
       <div class="form-group">
         <%= f.label :amount, 'Amount', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.number_field :amount, :class => 'form-control', :value => 0, :step => :any %>
+          <%= f.number_field :amount, :class => 'form-control', :step => :any %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :currency, 'Currency', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :currency, currencies, {:selected => 'USD'}, :class => 'form-control' %>
+          <%= f.select :currency, currencies, {:selected => @simple_plan.currency}, :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :billing_period, 'Billing Period', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :billing_period, options_for_select(@billing_period.map {|bp| [humanized_billing_period(bp), bp] }, :MONTHLY), :class => 'form-control' %>
+          <%= f.select :billing_period, options_for_select(@billing_period.map {|bp| [humanized_billing_period(bp), bp] }, @simple_plan.billing_period), :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :trial_length, 'Trial Length', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.number_field :trial_length, :class => 'form-control', :value => 0 %>
+          <%= f.number_field :trial_length, :class => 'form-control', :type => 'number', :min => 0, :step => 1 %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :trial_time_unit, 'Trial Time Unit', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :trial_time_unit, options_for_select(@time_units.map {|tu| [humanized_time_unit(tu), tu]}, :UNLIMITED), :class => 'form-control' %>
+          <%= f.select :trial_time_unit, options_for_select(@time_units.map {|tu| [humanized_time_unit(tu), tu]}, @simple_plan.trial_time_unit), :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
@@ -111,15 +111,19 @@
 
 function known_products() {
     var result = [];
-    var selected_category = $("#simple_plan_product_category option:selected" ).text();
-    if (selected_category == 'Base') {
+    var selected_category = $("#simple_plan_product_category option:selected").val();
+    if (selected_category == 'BASE') {
         result = $('#simple_plan_product_name').attr('known_base');
-    } else if (selected_category == 'Add_on') {
+    } else if (selected_category == 'ADD_ON') {
         result = $('#simple_plan_product_name').attr('known_ao');
     } else {
         result = $('#simple_plan_product_name').attr('known_std');
     }
-    return result.split(",");
+    if (result) {
+      return result.split(",");
+    } else {
+      return [];
+    }
 }
 
 function switch_xml_config() {
@@ -128,7 +132,7 @@ function switch_xml_config() {
 }
 
 function recompute_available_base_products_for_ao() {
-    if ($("#simple_plan_product_category option:selected" ).text() != 'Add_on') {
+    if ($("#simple_plan_product_category option:selected" ).val() != 'ADD_ON') {
         return;
     }
     var product_name = $('#simple_plan_product_name').val();
@@ -147,10 +151,7 @@ function recompute_available_base_products_for_ao() {
 }
 
 function display_available_base_products_for_ao() {
-    /* Reset prodcut name value; known_products from auto completion will also be updated accordingly */
-    $('#simple_plan_product_name').val('');
-
-    if ($("#simple_plan_product_category option:selected" ).text() == 'Add_on') {
+    if ($("#simple_plan_product_category option:selected" ).val() == 'ADD_ON') {
         $('#form_base_products').show();
     } else {
         $('#form_base_products').hide();

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

@@ -5,7 +5,7 @@
     <div class="form-group">
       <%= f.label :amount, 'Amount', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.number_field :amount, :id => 'chargeback_amount', :class => 'form-control' %>
+        <%= f.number_field :amount, :step => :any, :id => 'chargeback_amount', :class => 'form-control' %>
         <p class="help-block">Currency: <%= @chargeback.currency %></p>
       </div>
     </div>

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

@@ -15,7 +15,7 @@
     <div class="form-group">
       <%= f.label :amount, 'Amount', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.number_field :amount, :id => 'charge_amount', :class => 'form-control' %>
+        <%= f.number_field :amount, :step => :any, :id => 'charge_amount', :class => 'form-control' %>
         <% if @invoice.present? %>
             <p class="help-block">Currency: <%= @invoice.currency %></p>
         <% end %>

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

@@ -14,7 +14,7 @@
     <div class="form-group">
       <%= f.label :purchased_amount, 'Amount', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= f.number_field :purchased_amount, :id => 'payment_amount', :class => 'form-control' %>
+        <%= f.number_field :purchased_amount, :step => :any, :id => 'payment_amount', :class => 'form-control' %>
         <p class="help-block">Currency: <%= @invoice.present? ? @invoice.currency : @account.currency %></p>
       </div>
     </div>

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

@@ -9,7 +9,7 @@
     <div class="form-group">
       <%= label_tag :price_override, 'Price Override', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= number_field_tag :price_override, nil, :class => 'form-control' %>
+        <%= number_field_tag :price_override, nil, :step => :any, :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">

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

@@ -37,7 +37,7 @@
     <div class="form-group">
       <%= label_tag :price_override, 'Price Override', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= number_field_tag :price_override, nil, :class => 'form-control' %>
+        <%= number_field_tag :price_override, nil, :step => :any, :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails