kaui 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f2de0a1cf9deebfbdae2781d8bfe36637ecd1bf6e01877c6d88ddbc95a77cb05
-  data.tar.gz: c8089c093f566b916137637e53b56a409d7e5bee8e74d0ed16f2bdaabf76d262
+SHA1:
+  metadata.gz: c998eb4ff14442f28a18da7cab14072cc7d19dfc
+  data.tar.gz: 660dbac2ba54d6d0c853b63c697587e486a5c2ed
 SHA512:
-  metadata.gz: d26ede3ecdbfdc270234d94c374271bbb47bb94bd90e3d4f98e93706f77b623a7a6236c00ce28d354508cd378402bc60a55a2734695f5f88b8a4d7cdf44d1692
-  data.tar.gz: 870b1a5e19fed59434aec7c4a7a1f4374c834a2e8208689301c7554f91d95ab2f8dd43efc1c989bf679b1426a5eba2365fa8d2a675376f904d3db3dd9baad3fc
+  metadata.gz: 714a6e0da369b82570551cd082b7fd9b8d62ab18e906756a4194e31dfa5f90d47dd5b8624f5ca070915e45308d31839f451cca5a343895642d50ba47c89d1716
+  data.tar.gz: bc72e0c1b8febf3d413d1191e48431a2d330aff546e84493953e0697b043258365973d3fd5d0ea6dddab244b4c9a5d4cc6a92d9ce9e60155cf9663f7acc92b60

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/invoices_controller.rb

@@ -48,6 +48,8 @@ class Kaui::InvoicesController < Kaui::EngineController
     cached_options_for_klient = options_for_klient
 
     @invoice = Kaui::Invoice.find_by_id(params.require(:id), 'FULL', cached_options_for_klient)
+    # This will put the TAX items at the bottom
+    @invoice.items.sort_by! { |ii| [ii.item_type, ii.description] }
 
     fetch_payments = promise { @invoice.payments(true, true, 'FULL', cached_options_for_klient).map { |payment| Kaui::InvoicePayment.build_from_raw_payment(payment) } }
     fetch_pms = fetch_payments.then { |payments| Kaui::PaymentMethod.payment_methods_for_payments(payments, cached_options_for_klient) }

data/app/controllers/kaui/sessions_controller.rb

@@ -18,5 +18,11 @@ module Kaui
     def after_sign_out_path_for(resource)
       kaui_path
     end
+
+    def require_no_authentication
+      super
+      # Remove the somewhat confusing message "You are already signed in."
+      flash.discard(:alert) if flash[:alert] == I18n.t("devise.failure.already_authenticated")
+    end
   end
 end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -11,9 +11,9 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
     if @plans.empty?
       if @subscription.product_category == 'BASE'
-        flash[:error] = 'No available plan'
+        flash[:error] = 'No plan available in the catalog'
       else
-        flash[:error] = "No available add-on for product #{@base_product_name}"
+        flash[:error] = "No add-on available in the catalog for product #{@base_product_name}"
       end
       redirect_to kaui_engine.account_bundles_path(@subscription.account_id), :error => 'No available plan'
     end
@@ -46,6 +46,16 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       redirect_to kaui_engine.account_bundles_path(@subscription.account_id), :notice => 'Subscription was successfully created'
     rescue => e
       @plans = plans_details.nil? ? [] : plans_details.map { |p| p.plan }
+
+      if e.is_a?(::KillBillClient::API::BadRequest) && !e.response.nil? && !e.response.body.nil?
+        error_message = JSON.parse(e.response.body) rescue nil
+        if !error_message.nil? & !error_message['code'].nil? && error_message['code'] == 2010 # CAT_NO_PRICE_FOR_CURRENCY
+          # Hack for lack of proper Kill Bill messaging (https://github.com/killbill/killbill-admin-ui/issues/266)
+          flash.now[:error] = "Unable to create the subscription: a price for this currency hasn't been specified in the catalog"
+          render :new and return
+        end
+      end
+
       flash.now[:error] = "Error while creating the subscription: #{as_string(e)}"
       render :new
     end
@@ -212,8 +222,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     else
       options = options_for_klient
 
-      catalog = Kaui::Catalog.get_tenant_catalog_json( DateTime.now.to_s, options)
-
+      catalog = Kaui::Catalog.get_tenant_catalog_json(DateTime.now.to_s, options)
       return [] if catalog.blank?
 
       plans = []

data/app/models/kaui/catalog.rb

@@ -4,9 +4,21 @@ class Kaui::Catalog < KillBillClient::Model::Catalog
 
   class << self
 
-    def get_catalog_json(latest, requested_date, options)
+    def get_tenant_catalog_json(requested_date = nil, options = {})
+      super
+    rescue ::KillBillClient::API::InternalServerError => e
+      if !e.response.nil? && !e.response.body.nil?
+        error_message = JSON.parse(e.response.body) rescue nil
+        raise e if error_message.nil? || error_message['message'].nil?
+
+        # Hack for lack of proper Kill Bill messaging (see https://github.com/killbill/killbill-admin-ui/issues/265)
+        return [] if error_message['message'].starts_with?('No existing versions')
+      end
+      raise e
+    end
 
-      catalogs = KillBillClient::Model::Catalog.get_tenant_catalog_json(requested_date, options)
+    def get_catalog_json(latest, requested_date, options)
+      catalogs = get_tenant_catalog_json(requested_date, options)
       return catalogs.length > 0 ? catalogs[catalogs.length - 1] : nil if latest
 
       # Order by latest

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

@@ -2,7 +2,7 @@
     <div class='form-group'>
       <%= f.label :email, 'Email', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.text_field :email, :class => 'form-control', :required => true %>
+        <%= f.email_field :email, :class => 'form-control', :required => true %>
       </div>
     </div>
     <div class="form-group">

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

@@ -38,7 +38,7 @@
     <div class="form-group">
       <%= f.label :email, 'Email', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= f.text_field :email, :class => 'form-control' %>
+        <%= f.email_field :email, :class => 'form-control' %>
       </div>
     </div>
     <% unless @account.persisted? %>

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/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '2.0.2'
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -879,7 +879,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Killbill Admin UI mountable engine