kaui 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0651238ca5895ad6646d03a02d6aea566789aecf'
-  data.tar.gz: 5f69d3a6033391e3fe1ee08e6a195a44475c33db
+  metadata.gz: 1578ab0cd55f1c59f62e95db3ce5a9fdfe490843
+  data.tar.gz: 3b998533f0aa8bb70f4030bebf7a960568a8a7eb
 SHA512:
-  metadata.gz: eb800c76bba3c7073b21418059ec15614e3e6ba65c33e61101630d4a8ffaebf289dfe92296fcfbe72dbd87a66cef1fa2442302eaa405402024afbc9b27abd5c9
-  data.tar.gz: 89cbb200e3eabc97fe3c4475603a1906d83ab0c19baad61926b696a77cf58e7b3e83061fa39edb372bf9205e78caf312232fa72f376d695b636130634e6c3e48
+  metadata.gz: 2b9a8496dde5e2919ebf43526692193a2f0c77b0b5d0c876d5c6349c9f6d1bf0032df66d31ed6b754f3f770fd82d6e29975f65ef6cbae1356602847c00299fad
+  data.tar.gz: 51c5a965fdd3791f3ae08e26153ad3e2e0319aa825d775f1ecb70c4494b2f45e0598fe86b8f52aeb6780cb55655272d8cb30b3603440ef086a3074d3bd331bc8

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -85,7 +85,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     # 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) }
 

data/app/helpers/kaui/plugin_helper.rb

@@ -49,7 +49,7 @@ module Kaui
           next if plugin.version.nil?
           # do not allow duplicate
           next if installed_plugins.any? { |p| p[:plugin_name].eql?(plugin.plugin_name) }
-          plugin_key = Kaui::AdminTenant.rewrite_plugin_key(plugin.plugin_key)
+          plugin_key = Kaui::AdminTenant.rewrite_plugin_key(plugin.plugin_key) unless plugin.plugin_key.nil?
           installed_plugins << {
               plugin_key: plugin_key,
               plugin_name: plugin.plugin_name,
@@ -71,4 +71,4 @@ module Kaui
         return nil
       end
   end
-end
+end

data/app/models/kaui/admin_tenant.rb

@@ -38,8 +38,6 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
     end
 
     def get_oss_plugin_info(plugin_directory)
-
-
       # Serialize the plugin state for the view:
       #  plugin_name#plugin_type:prop1,prop2,prop3;plugin_name#plugin_type:prop1,prop2,prop3;...
       #
@@ -51,13 +49,11 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
     end
 
     def get_tenant_plugin_config(plugin_directory, options)
-
       require 'yaml'
 
       raw_tenant_config = KillBillClient::Model::Tenant::search_tenant_config("PLUGIN_CONFIG_", options)
 
       tenant_config = raw_tenant_config.inject({}) do |hsh, e|
-
         # Strip prefix '/PLUGIN_CONFIG_'
         killbill_key = e.key.gsub!(/PLUGIN_CONFIG_/, '')
 

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

@@ -139,7 +139,6 @@
     <% else %>
         <%= f.hidden_field :is_migrated %>
     <% end %>
-    <%= f.hidden_field :is_notified_for_invoices %>
     <%= f.hidden_field :is_payment_delegated_to_parent %>
     <%= f.hidden_field :parent_account_id %>
     <div class="form-group">

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

@@ -77,7 +77,7 @@
     {{#start_installed}}<optgroup label="Installed">{{/start_installed}}
     {{#end_installed}}</optgroup>>{{/end_installed}}
     <option value="{{plugin_name}}" data-plugin-type="{{plugin_type}}" >
-      {{plugin_key}}
+      {{display_name}}
     </option>
   {{/plugin_repository}}
 </script>
@@ -142,7 +142,7 @@
         populate_plugin_name_options();
         function populate_plugin_name_options(){
             var plugin_repository = JSON.parse($("#plugin_repository").val());
-            for(var idx = 0, size = plugin_repository.length; idx < size; idx++) {
+            for (var idx = 0, size = plugin_repository.length; idx < size; idx++) {
                 if (idx == 0 && plugin_repository[idx].installed) {
                     plugin_repository[idx]['start_installed'] = true;
                 }
@@ -153,6 +153,14 @@
                 }
             }
 
+            for (var idx = 0, size = plugin_repository.length; idx < size; idx++) {
+                if (plugin_repository[idx]['plugin_key']) {
+                  plugin_repository[idx]['display_name'] = plugin_repository[idx]['plugin_key'];
+                } else {
+                  plugin_repository[idx]['display_name'] = plugin_repository[idx]['plugin_name'];
+                }
+            }
+
             var template = $("#plugin_name_options_template").html();
             var options_html = Mustache.render( template , { plugin_repository: plugin_repository});
             $("#select_plugin_name").html(options_html);

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/test/functional/kaui/accounts_controller_test.rb

@@ -124,7 +124,6 @@ class Kaui::AccountsControllerTest < Kaui::FunctionalTestHelper
     assert_equal '-06:00', assigns(:account).time_zone
     assert_equal 'AR', assigns(:account).country
     assert assigns(:account).is_migrated
-    assert !assigns(:account).is_notified_for_invoices
   end
 
   test 'should update account' do

data/test/killbill_test_helper.rb

@@ -98,7 +98,6 @@ module Kaui
       account.state                    = 'Awesome'
       account.country                  = 'LalaLand'
       account.locale                   = 'fr_FR'
-      account.is_notified_for_invoices = false
       account.parent_account_id        = parent_account_id
       account.is_payment_delegated_to_parent = !parent_account_id.nil?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails