kaui 1.4.0 → 2.0.3

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

@@ -18,7 +18,7 @@
             </tr>
             <% unless bundle.bundle_id == bundle.external_key %>
                 <tr>
-                  <th>External key</th>
+                  <th>Bundle key</th>
                   <td><%= bundle.external_key %></td>
                 </tr>
             <% end %>

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/credits/_form.html.erb

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

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

@@ -105,7 +105,6 @@
     $('#invoice-table').dataTable({
       "dom": "t",
       "paging": false,
-      "order": [[ 1, "asc" ]],
       "columns": [
         null,
         null,

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/payments/_payment_table.html.erb

@@ -126,8 +126,8 @@
                 <% end %>
                 <% (transaction.properties || []).sort_by { |p| p.key }.each do |property| %>
                     <% next if property.value.blank? %>
-                    <li><%= property.key %>
-                      : <%= is_json?(property.value) ? "<pre>#{JSON.pretty_generate(JSON.parse(property.value))}</pre>".html_safe : property.value %></li>
+                    <li><strong><%= property.key %>:</strong>
+                        <%= is_json?(property.value) ? "<pre>#{JSON.pretty_generate(JSON.parse(property.value))}</pre>".html_safe : property.value %></li>
                 <% end %>
               </ul>
             </td>

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

@@ -7,15 +7,27 @@
         <%= hidden_field_tag :base_product_name, @base_product_name %>
     <% elsif @subscription.product_category == 'BASE' %>
         <div class="form-group">
-          <%= f.label :external_key, 'Key', :class => 'col-sm-2 control-label' %>
+          <%= f.label :bundle_external_key, 'Bundle 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">
+            <%= f.text_field :bundle_external_key, :class => 'form-control', :id => 'bundle_external_key' %>
+            <div class="subscription_bundle_external_key_invalid_msg text-danger">
               Warning! External key already in use.
             </div>
           </div>
         </div>
     <% end %>
+
+    <div class="form-group">
+      <%= f.label :subscription_external_key, 'Subscription Key', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :external_key, :class => 'form-control', :id => 'subscription_external_key' %>
+        <div class="subscription_external_key_invalid_msg text-danger">
+          Warning! External key already in use.
+        </div>
+      </div>
+    </div>
+
+
     <div class="form-group">
       <%= label_tag :plan_name, 'Plan', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
@@ -25,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/config/routes.rb

@@ -128,6 +128,7 @@ Kaui::Engine.routes.draw do
     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'
+    match '/validate_bundle_external_key' => 'subscriptions#validate_bundle_external_key', :via => :get, :as => 'subscriptions_validate_bundle_external_key'
   end
   resources :subscriptions, :only => [:new, :create, :show, :edit, :update, :destroy]
 
@@ -185,7 +186,6 @@ Kaui::Engine.routes.draw do
     match '/add_allowed_user' => 'admin_tenants#add_allowed_user', :via => :put, :as => 'add_allowed_user'
     match '/allowed_users' => 'admin_tenants#allowed_users', :via => :get, :as => 'admin_tenant_allowed_users'
     match '/catalog_by_effective_date' => 'admin_tenants#catalog_by_effective_date', :via => :get, :as => 'catalog_by_effective_date'
-    match '/suggest_plugin_name' => 'admin_tenants#suggest_plugin_name', :via => :get, :as => 'suggest_plugin_name'
     match '/switch' => 'admin_tenants#switch_tenant', :via => :get, :as => 'switch_tenant'
     match '/:id/download_catalog' => 'admin_tenants#download_catalog_xml', :via => :get, :as => 'download_catalog_xml'
   end

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '1.4.0'
+  VERSION = '2.0.3'
 end

data/test/dummy/config/initializers/cookies_serializer.rb

@@ -2,4 +2,4 @@
 
 # Specify a serializer for the signed and encrypted cookie jars.
 # Valid options are :json, :marshal, and :hybrid.
-Rails.application.config.action_dispatch.cookies_serializer = :marshal
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid

data/test/functional/kaui/admin_tenants_controller_test.rb

@@ -94,7 +94,7 @@ class Kaui::AdminTenantsControllerTest < Kaui::FunctionalTestHelper
     stripe_yml.each { |k, v| stripe_yml[k] = v.to_s }
     post :upload_plugin_config, :id => tenant.id, :plugin_name => 'killbill-stripe', :plugin_key => 'stripe', :plugin_type => 'ruby', :plugin_properties => stripe_yml
 
-    assert_redirected_to admin_tenant_path(tenant.id)
+    assert_redirected_to admin_tenant_path(tenant.id, :active_tab => 'PluginConfig')
     assert_equal 'Config for plugin was successfully uploaded', flash[:notice]
   end
 
@@ -284,26 +284,6 @@ class Kaui::AdminTenantsControllerTest < Kaui::FunctionalTestHelper
 
   end
 
-  test 'should suggest a plugin name' do
-    plugin_anchor = "'<a id=\"suggested\" data-plugin-name=\"killbill-paypal-express\" data-plugin-key=\"paypal_express\" data-plugin-type=\"ruby\" href=\"#\">killbill-paypal-express</a>'"
-
-    # Similar plugin already installed test will run, if there are plugin installed
-    installed_plugins = installed_plugins()
-    unless installed_plugins.blank?
-      installed_plugins.each do |plugin|
-        installed_plugin_anchor = "'<a id=\"suggested\" data-plugin-name=\"#{plugin[:plugin_name]}\" data-plugin-key=\"#{plugin[:plugin_key]}\".*href=\"#\">#{plugin[:plugin_name]}</a>'"
-
-        get :suggest_plugin_name, :plugin_name => plugin[:plugin_name][0, plugin[:plugin_name].length - 1]
-        assert_response :success
-        assert_match /Similar plugin already installed: #{installed_plugin_anchor}/, JSON[@response.body]['suggestion']
-      end
-    end
-
-    get :suggest_plugin_name, :plugin_name => 'pypl'
-    assert_response :success
-    assert_equal "Did you mean #{plugin_anchor}?", JSON[@response.body]['suggestion']
-  end
-
   test 'should switch tenant' do
     other_tenant = setup_and_create_test_tenant(1)
     other_tenant_kaui = Kaui::Tenant.find_by_kb_tenant_id(other_tenant.tenant_id)
@@ -362,7 +342,7 @@ class Kaui::AdminTenantsControllerTest < Kaui::FunctionalTestHelper
       next if plugin.plugin_key.nil? || plugin.version.nil?
       next if installed_plugins.any? { |p| p[:plugin_name].eql?(plugin.plugin_name) }
       installed_plugins << {
-          plugin_key: Kaui::AdminTenant.rewrite_plugin_key(plugin.plugin_key),
+          plugin_key: plugin.plugin_key,
           plugin_name: plugin.plugin_name
       }
     end

data/test/functional/kaui/credits_controller_test.rb

@@ -25,7 +25,7 @@ class Kaui::CreditsControllerTest < Kaui::FunctionalTestHelper
          :account_id => @account.account_id,
          :credit => {
              :invoice_id => invoice_id,
-             :credit_amount => 5.34
+             :amount => 5.34
          }
     assert_redirected_to account_path(@account.account_id)
     assert_equal "Error while communicating with the Kill Bill server: Error 404: Object id=#{invoice_id} type=INVOICE doesn't exist!", flash[:error]
@@ -35,7 +35,7 @@ class Kaui::CreditsControllerTest < Kaui::FunctionalTestHelper
     post :create,
          :account_id => @account.account_id,
          :credit => {
-             :credit_amount => 5.34
+             :amount => 5.34
          }
     assert_redirected_to account_path(@account.account_id)
     assert_equal 'Credit was successfully created', flash[:notice]
@@ -46,7 +46,7 @@ class Kaui::CreditsControllerTest < Kaui::FunctionalTestHelper
          :account_id => @account.account_id,
          :credit => {
              :invoice_id => @invoice_item.invoice_id,
-             :credit_amount => 5.34
+             :amount => 5.34
          }
     assert_redirected_to account_invoice_path(@account.account_id, @invoice_item.invoice_id)
     assert_equal 'Credit was successfully created', flash[:notice]

data/test/functional/kaui/home_controller_test.rb

@@ -188,7 +188,7 @@ class Kaui::HomeControllerTest < Kaui::FunctionalTestHelper
     dummy_uuid = SecureRandom.uuid.to_s
     credit = create_credit
     # search by ID
-    get :search, :q => query_builder('CREDIT',credit.credit_id, 'ID')
+    get :search, :q => query_builder('CREDIT',credit.invoice_item_id, 'ID')
     assert_redirected_to account_invoice_path(credit.account_id, credit.invoice_id)
 
     # search by ID and fails
@@ -202,11 +202,11 @@ class Kaui::HomeControllerTest < Kaui::FunctionalTestHelper
     assert_equal "\"CREDIT\": Search by \"EXTERNAL KEY\" is not supported.", flash[:error]
 
     # search by BLANK only first
-    get :search, :q => query_builder('CREDIT',credit.credit_id, nil, '1')
+    get :search, :q => query_builder('CREDIT',credit.invoice_item_id, nil, '1')
     assert_redirected_to account_invoice_path(credit.account_id, credit.invoice_id)
 
     # search by BLANK
-    get :search, :q => query_builder('CREDIT',credit.credit_id)
+    get :search, :q => query_builder('CREDIT',credit.invoice_item_id)
     assert_redirected_to account_invoice_path(credit.account_id, credit.invoice_id)
 
     # search by BLANK and fails
@@ -376,9 +376,9 @@ class Kaui::HomeControllerTest < Kaui::FunctionalTestHelper
   end
 
   def create_credit
-    credit = KillBillClient::Model::Credit.new(:invoice_id => nil, :account_id => @account.account_id, :credit_amount => 2.22)
+    credit = KillBillClient::Model::Credit.new(:invoice_id => nil, :account_id => @account.account_id, :amount => 2.22)
     credit = credit.create(true, 'kaui search test', nil, nil, build_options(@tenant, USERNAME, PASSWORD))
-    credit
+    credit.first
   end
 
   def create_custom_field

data/test/functional/kaui/subscriptions_controller_test.rb

@@ -96,7 +96,7 @@ class Kaui::SubscriptionsControllerTest < Kaui::FunctionalTestHelper
 
     post :update, :id => @bundle.subscriptions.first.subscription_id, :plan_name => 'not-exists'
     assert_redirected_to edit_subscription_path(@bundle.subscriptions.first.subscription_id)
-    assert_equal "Error while changing subscription: Error 400: Could not find a plan matching spec: (plan: 'not-exists', product: 'undefined', billing period: 'undefined', pricelist 'undefined')", flash[:error]
+    assert_equal "Error while changing subscription: Error 400: Could not find any plans named 'not-exists'", flash[:error]
   end
 
   test 'should update' do

data/test/killbill_test_helper.rb

@@ -28,7 +28,7 @@ module Kaui
       @bundle            = create_bundle(@account, @tenant)
       @invoice_item      = create_charge(@account, @tenant)
       @paid_invoice_item = create_charge(@account, @tenant, true)
-      @bundle_invoice    = @account.invoices(true, build_options(@tenant)).first
+      @bundle_invoice    = @account.invoices(build_options(@tenant)).first
       @payment_method    = create_payment_method(true, @account, @tenant)
       @payment           = create_payment(@paid_invoice_item, @account, @tenant)
 
@@ -159,15 +159,15 @@ module Kaui
       tenant  = create_tenant(user, reason, comment) if tenant.nil?
       account = create_account(tenant, username, password, user, reason, comment) if account.nil?
 
-      credit = KillBillClient::Model::Credit.new(:invoice_id => invoice_id, :account_id => account.account_id, :credit_amount => 23.22)
-      credit = credit.create(true, user, reason, comment, build_options(tenant, username, password))
+      credit = KillBillClient::Model::Credit.new(:invoice_id => invoice_id, :account_id => account.account_id, :amount => 23.22)
+      credit = credit.create(true, user, reason, comment, build_options(tenant, username, password)).first
 
-      invoice = KillBillClient::Model::Invoice.find_by_id(credit.invoice_id, true, 'NONE', build_options(tenant, username, password))
-      invoice.items.find { |ii| ii.amount == -credit.credit_amount }
+      invoice = KillBillClient::Model::Invoice.find_by_id(credit.invoice_id, 'NONE', build_options(tenant, username, password))
+      invoice.items.find { |ii| ii.amount == -credit.amount }
     end
 
     def commit_invoice(invoice_id, tenant, username = USERNAME, password = PASSWORD, user = 'Kaui test', reason = nil, comment = nil)
-      invoice = KillBillClient::Model::Invoice.find_by_id(invoice_id, false, 'NONE', build_options(tenant, username, password))
+      invoice = KillBillClient::Model::Invoice.find_by_id(invoice_id, 'NONE', build_options(tenant, username, password))
       invoice.commit(user, reason, comment, build_options(tenant, username, password))
     end
 

data/test/unit/helpers/kaui/payment_method_helper_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class PaymentMethodHelperTest < ActionView::TestCase
+
+  include Kaui::PaymentMethodHelper
+
+  test 'is_json?' do
+    assert !is_json?(5)
+    assert !is_json?('true')
+    assert !is_json?(false)
+    assert !is_json?("")
+    assert !is_json?(nil)
+    assert is_json?('[1, 2, 3]')
+    assert is_json?('{"value": "New", "onclick": "CreateNewDoc()"}')
+    assert !is_json?('{"value" => "New", "onclick": "CreateNewDoc()"}')
+  end
+end

data/test/unit/kaui/admin_tenant_test.rb

@@ -62,40 +62,6 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     assert_split(splitted)
   end
 
-  test 'can do a fuzzy match of a plugin to suggest a plugin' do
-    plugins_info = plugins_repo
-    adminTenantController = Kaui::AdminTenantsController.new
-
-    %w(killbill-paypal express paypal pay).each do |plugin_name|
-      found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-      assert_nil(found_plugin)
-      assert_equal weights[0][:plugin_name], 'killbill-paypal-express'
-    end
-
-    plugin_name = 'email'
-    found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-    assert_nil(found_plugin)
-    assert_equal weights[0][:plugin_name], 'killbill-email-notifications'
-
-    %w(first firstdata firstdata_e4).each do |plugin_name|
-      found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-      assert_nil(found_plugin)
-      assert_equal weights[0][:plugin_name], 'killbill-firstdata-e4'
-    end
-
-    %w(braintree brain).each do |plugin_name|
-      found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-      assert_nil(found_plugin)
-      assert_equal weights[0][:plugin_name], 'killbill-braintree_blue'
-    end
-
-    # if found weights should be empty
-    plugin_name = 'avatax'
-    found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-    assert_equal weights.size, 0
-    assert_equal found_plugin[:plugin_name], 'killbill-avatax'
-  end
-
   test 'should fetch proprietary plugin config' do
     tenant = create_tenant()
     assert_not_nil(tenant)
@@ -106,12 +72,11 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     plugin_config = 'key=value'
     Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, nil, options)
 
-    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config({}, options)
+    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config(options)
     assert_not_nil(plugins_config)
 
-    plugin_info = plugins_config.split('::')
-    assert_equal plugin_name, plugin_info[0]
-    assert_equal 'key=value|_raw=key=value', plugin_info[1].gsub('raw_config=','')
+    assert_equal plugin_name, plugins_config.keys.first
+    assert_equal 'key=value', plugins_config[plugin_name]
   end
 
   test 'should fetch plugin config' do
@@ -130,15 +95,13 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     plugin_config = Kaui::AdminTenant.format_plugin_config(plugin_key, 'ruby', plugin_properties)
     Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, nil, options)
 
-    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config({ :paypal_express => { 'type' => 'ruby',
-                                                                  'artifact_id' => 'paypal-express-plugin'} }, options)
+    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config(options)
     assert_not_nil(plugins_config)
-    plugin_info = plugins_config.split('::')
-    assert_equal plugin_key, plugin_info[0]
-    response_plugin_properties = plugin_info[1].split('|')
-    assert_equal plugin_properties[:signature], response_plugin_properties[0].split('=')[1]
-    assert_equal plugin_properties[:login], response_plugin_properties[1].split('=')[1]
-    assert_equal plugin_properties[:password], response_plugin_properties[2].split('=')[1]
+    assert_equal plugin_name, plugins_config.keys.first
+    response_plugin_properties = plugins_config[plugin_name].split
+    assert_equal plugin_properties[:signature], response_plugin_properties[3]
+    assert_equal plugin_properties[:login], response_plugin_properties[5]
+    assert_equal plugin_properties[:password], response_plugin_properties[7]
   end
 
   private
@@ -166,4 +129,4 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     assert_equal 'to', splitted[4]
     assert_equal 'split', splitted[5]
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -844,6 +844,7 @@ files:
 - test/test_helper.rb
 - test/unit/helpers/kaui/admin_allowed_users_helper_test.rb
 - test/unit/helpers/kaui/admin_tenants_helper_test.rb
+- test/unit/helpers/kaui/payment_method_helper_test.rb
 - test/unit/helpers/kaui/tenants_helper_test.rb
 - test/unit/helpers/kaui/uuid_helper_test.rb
 - test/unit/kaui/account_email_test.rb
@@ -905,6 +906,7 @@ test_files:
 - test/unit/kaui/tenant_test.rb
 - test/unit/kaui/money_helper_test.rb
 - test/unit/helpers/kaui/tenants_helper_test.rb
+- test/unit/helpers/kaui/payment_method_helper_test.rb
 - test/unit/helpers/kaui/admin_tenants_helper_test.rb
 - test/unit/helpers/kaui/admin_allowed_users_helper_test.rb
 - test/unit/helpers/kaui/uuid_helper_test.rb