kaui 4.0.9 → 4.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f193d330400858d2b943a2b2e4e356366ebd03fa1099d1279612c40c1f7666
-  data.tar.gz: 61d17f6e690ca34e6ef8972ba185cf589a0deca6c22159409c040147146d8955
+  metadata.gz: 7328709e0c330b84f3e47b4041cf55aa61bf98c7ac80dbb9b2d199b71c3d1f7a
+  data.tar.gz: 27b7f69cdb1e950cd327ac7c31141a76ae6c07e7e063d5ccd6d66c020a4fe612
 SHA512:
-  metadata.gz: 040f78a63f17a79983d6382eb1547636cdc1274309f72f96ff8fa737a950427940121c7a711c05e2d3a96a752f1cf6bca720c6371625452d371e190aebeecc69
-  data.tar.gz: 0d54dce07e8dbed25c0e997018d3b9fef5184387003775d6f1b88f6891eec414837e6e0ac6848c2d66b4b3620a5d44b6c03dcf65fbdafa9eed36774a209978c3
+  metadata.gz: e7e3008686fb14493dca39a5adcda76d6032c0a8ba23cbf76971dac4829d59ae275a34779d3450aaf7babead74924a66a968cfc07579e74bcd6669763681a632
+  data.tar.gz: 9195fcbb008a972b2a8e4b6dbee1b471662e5f30623910ea5b4abe290957f726b8c620c56c82df742ef43587b08f006a7c9d65825833938f01e98a666e3605fe

data/app/assets/images/kaui/subscription/transfer.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2.6665 5.3332H13.3332M13.3332 5.3332L10.6665 2.6665M13.3332 5.3332L10.6665 7.9999M13.3332 10.6665H2.6665M2.6665 10.6665L5.3332 7.9999M2.6665 10.6665L5.3332 13.3332" stroke="#A4A7AE" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

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

@@ -687,6 +687,84 @@ form[id^="new_tag_definition"] #object_types div .tag-definition-select {
   color: #00919d;
 }
 
+/* Modern toggle switch */
+.toggle-switch {
+  position: relative;
+  display: inline-block;
+  width: 70px;
+  height: 26px;
+}
+
+.toggle-switch input {
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.toggle-slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: gray;
+  transition: .3s;
+  border-radius: 26px;
+  box-shadow: inset 0 1px 3px rgba(0,0,0,0.2);
+}
+
+.toggle-slider:before {
+  position: absolute;
+  content: "";
+  height: 20px;
+  width: 20px;
+  left: 3px;
+  bottom: 3px;
+  background-color: white;
+  transition: .3s;
+  border-radius: 50%;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.2);
+}
+
+.toggle-slider:after {
+  content: 'OFF';
+  color: white;
+  display: block;
+  position: absolute;
+  transform: translate(-50%,-50%);
+  top: 50%;
+  left: 70%;
+  font-size: 10px;
+  font-weight: bold;
+}
+
+.toggle-switch input:checked + .toggle-slider {
+  background-color: #1570ef;
+}
+
+.toggle-switch input:checked + .toggle-slider:before {
+  transform: translateX(24px);
+}
+
+.toggle-switch input:checked + .toggle-slider:after {
+  content: 'ON';
+  left: 30%;
+}
+
+.toggle-switch input:disabled + .toggle-slider {
+  cursor: not-allowed;
+  opacity: 0.8;
+}
+
+.toggle-switch input:not(:checked) + .toggle-slider:hover {
+  background-color: #1570ef;
+}
+
+.toggle-switch input:checked:not(:disabled) + .toggle-slider:hover {
+  background-color: #1570ef;
+}
+
 /* Required for https://github.com/killbill/killbill-admin-ui/issues/262 */
 .ui-autocomplete {
   position: absolute;

data/app/controllers/kaui/admin_allowed_users_controller.rb

@@ -15,8 +15,16 @@ module Kaui
     def new
       @allowed_user = Kaui::AllowedUser.new
       @is_killbill_managed = true
-
       @roles = []
+
+      # Restore form state if returning from role creation
+      return unless params[:user_context].present?
+
+      context = params[:user_context]
+      @allowed_user.kb_username = context[:kb_username]
+      @allowed_user.description = context[:description]
+      @roles = context[:roles].to_s.split(',').reject(&:blank?)
+      @external_checked = context[:external] == '1'
     end
 
     def create
@@ -59,7 +67,14 @@ module Kaui
       @allowed_user = Kaui::AllowedUser.find(params.require(:id))
       @is_killbill_managed = killbill_managed?(@allowed_user, options_for_klient)
 
-      @roles = roles_for_user(@allowed_user)
+      # Use roles from context if returning from role creation, otherwise fetch from KB
+      if params[:user_context].present?
+        context = params[:user_context]
+        @roles = context[:roles].to_s.split(',').reject(&:blank?)
+        @allowed_user.description = context[:description] if context[:description].present?
+      else
+        @roles = roles_for_user(@allowed_user)
+      end
     end
 
     def update

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -76,6 +76,10 @@ module Kaui
       @tenant = safely_find_tenant_by_id(params[:id])
       @allowed_users = @tenant.kaui_allowed_users & retrieve_allowed_users_for_current_user
 
+      # Get available users that can be added to this tenant
+      actual_allowed_users_ids = (@tenant.kaui_allowed_users || []).map(&:id)
+      @available_users = retrieve_allowed_users_for_current_user.reject { |au| actual_allowed_users_ids.include? au.id }
+
       configure_tenant_if_nil(@tenant)
 
       # Fetch clock data for the clock component

data/app/controllers/kaui/refunds_controller.rb

@@ -28,6 +28,7 @@ module Kaui
 
           item = KillBillClient::Model::InvoiceItem.new
           item.invoice_item_id = ii[0]
+          item.description = params.dig(:descriptions, ii[0])
           # If we tried to do a partial item adjustment, we pass the value, if not we don't send any value and let the system
           # decide what is the maximum amount we can have on that item
           item.amount = ii[1].to_f == original_item.amount ? nil : ii[1]

data/app/controllers/kaui/role_definitions_controller.rb

@@ -4,6 +4,17 @@ module Kaui
   class RoleDefinitionsController < Kaui::EngineController
     def new
       @role_definition = Kaui::RoleDefinition.new
+
+      # Store user form context if coming from user creation/edit
+      return unless params[:return_to_user].present?
+
+      session[:role_return_context] = {
+        kb_username: params[:kb_username],
+        description: params[:description],
+        roles: params[:roles],
+        external: params[:external],
+        allowed_user_id: params[:allowed_user_id]
+      }
     end
 
     def create
@@ -13,7 +24,26 @@ module Kaui
 
       begin
         @role_definition = @role_definition.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
-        redirect_to admin_allowed_users_path, notice: 'Role was successfully created'
+
+        # Check if we need to return to user form with the new role
+        return_context = session.delete(:role_return_context)
+        if return_context.present?
+          # Add the new role to the existing roles
+          existing_roles = return_context[:roles].to_s.split(',').reject(&:blank?)
+          existing_roles << @role_definition.role unless existing_roles.include?(@role_definition.role)
+          return_context[:roles] = existing_roles.join(',')
+
+          # Redirect back to user form (new or edit)
+          if return_context[:allowed_user_id].present? && return_context[:allowed_user_id] != ''
+            redirect_to edit_admin_allowed_user_path(return_context[:allowed_user_id], user_context: return_context),
+                        notice: "Role '#{@role_definition.role}' was successfully created"
+          else
+            redirect_to new_admin_allowed_user_path(user_context: return_context),
+                        notice: "Role '#{@role_definition.role}' was successfully created"
+          end
+        else
+          redirect_to admin_allowed_users_path, notice: 'Role was successfully created'
+        end
       rescue StandardError => e
         flash.now[:error] = "Error while creating role: #{as_string(e)}"
         render action: :new

data/app/models/kaui/bundle.rb

@@ -48,14 +48,14 @@ module Kaui
 
     def self.list_transfer_policy_params
       @policy_params = [
-        [I18n.translate('start_of_term'), 'START_OF_TERM'],
+        # [I18n.translate('start_of_term'), 'START_OF_TERM'], Temporarily removed as it is not supported by Kill Bill
         [I18n.translate('end_of_term'), 'END_OF_TERM'],
         [I18n.translate('immediate'), 'IMMEDIATE']
       ]
     end
 
     def self.list_transfer_policy_params_keys
-      @policy_params = %w[START_OF_TERM END_OF_TERM IMMEDIATE]
+      @policy_params = %w[END_OF_TERM IMMEDIATE]
     end
   end
 end

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

@@ -1,9 +1,9 @@
 
 <div class="filter-bar-container">
   <div class="filter-bar">
-    <button class="btn btn-default download-button-right" data-toggle="modal" data-target="#advanceSearchModal">
+    <button class="btn btn-default download-button-right" data-toggle="modal" data-target="#advancedSearchModal">
       <i class="glyphicon glyphicon-search"></i>
-      <strong>Advance Search</strong>
+      <strong>Advanced Search</strong>
     </button>
 
     <div id="search-labels-container" class="ml-2">

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

@@ -5,7 +5,7 @@
       <div class="col-sm-9">
         <div class="checkbox">
           <label for="external" class="d-flex align-items-center gap-2 control-label">
-            <%= check_box_tag :external, '1', false, disabled: !@allowed_user.id.blank?, id: 'external', class: "pt-2" %>
+            <%= check_box_tag :external, '1', @external_checked || false, disabled: !@allowed_user.id.blank?, id: 'external', class: "pt-2" %>
             Managed externally (LDAP, Okta, etc.)?
           </label>
         </div>
@@ -38,7 +38,7 @@
         </div>
         <%= hidden_field_tag :roles, @roles.join(','), id: 'roles-hidden' %>
 
-        <%= link_to new_role_definition_path, class: "border-button custom-hover add-role-button" do %>
+        <%= link_to '#', class: "border-button custom-hover add-role-button", id: "add-role-link", data: { base_url: new_role_definition_path } do %>
           <%= image_tag("kaui/modal/plus.svg", width: 16, height: 16) %>
         <% end %>
       </div>
@@ -78,6 +78,22 @@
 <%= javascript_tag do %>
     $(document).ready(function() {
 
+        // Handle add role button click - pass current form state
+        $('#add-role-link').click(function(e) {
+            e.preventDefault();
+            var baseUrl = $(this).data('base-url');
+            var params = {
+                return_to_user: '1',
+                kb_username: $('#allowed_user_kb_username').val(),
+                description: $('#allowed_user_description').val(),
+                roles: $('#roles-hidden').val(),
+                external: $('#external').is(':checked') ? '1' : '0',
+                allowed_user_id: '<%= @allowed_user.id %>'
+            };
+            var queryString = $.param(params);
+            window.location.href = baseUrl + '?' + queryString;
+        });
+
         $('#external').change(function() {
             is_killbill_managed();
         });

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

@@ -16,10 +16,10 @@
       </div>
       <div class="modal-body">
         <%= form_for :allowed_user, :url =>  add_allowed_user_path, :method => :put, :html => {:class => 'form-horizontal', :id => 'tenantAllowedUserForm'} do |f| %>
-            <div class='form-group d-flex align-items-center p-3'>
-              <%= f.label :kb_username, 'User Name', :class => 'col-sm-3 control-label' %>
+            <div class='form-group row align-items-center p-3'>
+              <%= f.label :kb_username, 'User Name', :class => 'col-sm-3 col-form-label text-center' %>
               <div class="col-sm-9">
-                <%= f.text_field :kb_username, :class => 'form-control', :required => true %>
+                <%= f.select :kb_username, options_for_select(@available_users.map { |u| [u.kb_username, u.kb_username] }), { prompt: 'Select a user' }, { class: 'form-control', required: true } %>
               </div>
             </div>
             <input type="hidden" name="tenant_id" value="<%= @tenant.id %>" />
@@ -54,38 +54,9 @@
 
 <%= javascript_tag do %>
     $(document).ready(function() {
-        function loadAllowedUser() {
-            $.ajax(
-            {
-                url: Routes.kaui_engine_admin_tenant_allowed_users_path(),
-                type: "GET",
-                dataType: "json",
-                data: {tenant_id: <%= @tenant.id %>},
-                success: function(data) {
-                    var availableAllowedUser = [];
-                    for (var i=0; i < data.length ; i++) {
-                        availableAllowedUser.push(data[i].kb_username);
-                    }
-
-                    $( "#allowed_user_kb_username" ).autocomplete({
-                        source: availableAllowedUser,
-                        appendTo: "#tenantAllowedUserForm",
-                        classes: {
-                            "ui-autocomplete": "autocomplete-allowed-user"
-                        },
-                    });
-
-                }
-            });
-        }
-
         $('#addAllowedUserModal').on('show.bs.modal', function (e) {
             // reset field
-            $( "#allowed_user_kb_username" ).val('');
-
+            $('#allowed_user_kb_username').prop('selectedIndex', 0);
         });
-
-        loadAllowedUser();
-
     });
 <% end %>

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

@@ -74,7 +74,6 @@
             <th id="currency_select"></th>
             <th><%= I18n.translate('views.catalogs.show.plan_table.trial') %></th>
             <th><%= I18n.translate('views.catalogs.show.plan_table.final_phase_duration') %></th>
-            <th></th>
             </tr>
             </thead>
             <tbody id="catalog_detail">
@@ -117,18 +116,6 @@
           <td>
             <span class="phase-duration">{{final_phase_duration}}</span>
           </td>
-
-          <td>
-            <%= link_to "{{new_plan_currency_path}}", class:"text-decoration-none" do %>
-                <%= render "kaui/components/button/button", {
-                    label: "Currency",
-                    icon: "kaui/setting/plus.svg",
-                    variant: "outline-secondary d-inline-flex align-items-center",
-                    type: "button",
-                    html_class: "currency-button kaui-button",
-                } %>
-            <% end %>
-          </td>
         </tr>
       {{/plans}}
     {{/catalog}}

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

@@ -11,11 +11,20 @@
       <div class="row tenant-details">
         <div class="col-sm-3">
           <b>Name:</b> 
-          <p><%= @tenant.name %>&nbsp; 
+          <p class="d-flex align-items-center gap-2">
+            <%= @tenant.name %> 
             <% if session[:kb_tenant_name] == @tenant.name %>
-              <i class="fa fa-toggle-on switch-tenant-active" title="Currently selected"></i>
+              <label class="toggle-switch">
+                <input type="checkbox" checked disabled>
+                <span class="toggle-slider"></span>
+              </label>
             <% else %>
-              <%= link_to("<i class=\"fa fa-toggle-off\" aria-hidden=\"true\"></i>".html_safe, switch_tenant_path(:kb_tenant_id => @tenant.kb_tenant_id), title: 'Click the toggle to switch tenant') %>
+              <%= link_to switch_tenant_path(:kb_tenant_id => @tenant.kb_tenant_id), method: :get, title: "Click to switch to this tenant", style: "text-decoration: none;" do %>
+                <label class="toggle-switch" style="cursor: pointer;">
+                  <input type="checkbox">
+                  <span class="toggle-slider"></span>
+                </label>
+              <% end %>
             <% end %>
           </p>
         </div>

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

@@ -34,7 +34,7 @@
                 </div>
                 <span>
                   <%= render "kaui/components/button/button", {
-                    label: "Allow Tenant Access",
+                    label: "Add Allowed User",
                     icon: "kaui/plus.svg",
                     variant: "outline-secondary d-inline-flex align-items-center gap-1",
                     type: "button",

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

@@ -1,38 +1,56 @@
-<div class="register">
-  <div class="col-md-8 col-md-offset-2">
-
-    <div class="column-block">
-      <h1> <%= I18n.translate('transfer') %></h1>
+<div class="register kaui-subscription-new">
+  <div class="">
+    <div class="mx-auto" style="max-width: 37.5rem;">
+      <h5 class="add-account-title border-bottom pb-3 mb-3">
+        <span class="icon-container">
+          <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M3.33325 6.6665H16.6666M16.6666 6.6665L13.3333 3.33317M16.6666 6.6665L13.3333 9.99984M16.6666 13.3332H3.33325M3.33325 13.3332L6.66659 9.99984M3.33325 13.3332L6.66659 16.6665" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+          </svg>
+        </span>
+        <%= I18n.translate('transfer') %>
+      </h5>
 
       <%= form_tag do_transfer_bundle_path(@bundle_id), :class => 'form-horizontal', :method => :put do %>
-          <div class="form-group">
-            <%= label_tag :new_account_key, I18n.translate('new_account'), :class => 'col-sm-2 control-label' %>
-            <div class="col-sm-10">
-              <%= text_field_tag :new_account_key, nil, :class => 'form-control', :placeholder => I18n.translate('new_account_id_or_external_key') %>
-            </div>
+        <div class="form-group d-flex pb-3">
+          <%= label_tag :new_account_key, I18n.translate('new_account'), :class => 'col-sm-3 control-label' %>
+          <div class="col-sm-9">
+            <%= text_field_tag :new_account_key, nil, :class => 'form-control', :placeholder => I18n.translate('new_account_id_or_external_key') %>
           </div>
+        </div>
 
-          <div class="form-group">
-            <%= label_tag :billing_policy, I18n.translate('billing_policy'), :class => 'col-sm-2 control-label' %>
-            <div class="col-sm-10">
-              <%= select_tag :billing_policy, options_for_select(Kaui::Bundle.list_transfer_policy_params, selected: "IMMEDIATE") %>
-            </div>
+        <div class="form-group d-flex pb-3">
+          <%= label_tag :billing_policy, I18n.translate('billing_policy'), :class => 'col-sm-3 control-label' %>
+          <div class="col-sm-9">
+            <%= select_tag :billing_policy, options_for_select(Kaui::Bundle.list_transfer_policy_params, selected: "END_OF_TERM"), :class => 'form-control' %>
           </div>
+        </div>
 
-          <div class="form-group">
-            <%= label_tag :comment, I18n.translate('comment'), :class => 'col-sm-2 control-label' %>
-            <div class="col-sm-10">
-              <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
-            </div>
-          </div>
-          <div class="form-group">
-            <div class="col-sm-offset-2 col-sm-10">
-              <%= submit_tag I18n.translate('change'), :class => 'btn btn-default' %>
-            </div>
+        <div class="form-group d-flex pb-3 border-bottom mb-3">
+          <%= label_tag :comment, I18n.translate('comment'), :class => 'col-sm-3 control-label' %>
+          <div class="col-sm-9">
+            <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
           </div>
-      <% end %>
+        </div>
 
+        <div class="form-group d-flex justify-content-end pb-3">
+          <%= render "kaui/components/button/button", {
+            label: 'Close',
+            variant: "outline-secondary d-inline-flex align-items-center gap-1",
+            type: "button",
+            html_class: "kaui-button custom-hover mx-2",
+            html_options: {
+              id: "closeButton",
+              onclick: "window.history.back();"
+            }
+          } %>
+          <%= render "kaui/components/button/button", {
+            label: I18n.translate('transfer'),
+            variant: "outline-secondary d-inline-flex align-items-center gap-1",
+            type: "submit",
+            html_class: "kaui-dropdown custom-hover"
+          } %>
+        </div>
+      <% end %>
     </div>
-
   </div>
 </div>

data/app/views/kaui/components/search_input/_search_input.html.erb

@@ -33,15 +33,15 @@
         <div class="mb-1 fw-semibold text-muted mb-2">Suggested search queries</div>
         <div class="mb-3">
             <div class="inline-block me-2 my-4">
-                <span class="me-2 header-tag custom-hover text-black-900 fw-500 align-items-center gap-2 border-secondary px-2 py-2 border-2 rounded-4 ">account:</span>
+                <span class="me-2 header-tag custom-hover text-black-900 fw-500 align-items-center gap-2 border-secondary px-2 py-2 border-2 rounded-4 search-suggestion-term" data-term="account:" style="cursor: pointer;">account:</span>
                 <span>account: Flavio Ruggiero</span>
             </div>
             <div class="inline-block me-2 my-4">
-                <span class="me-2 header-tag custom-hover text-black-900 fw-500 align-items-center gap-2 border-secondary px-2 py-2 border-2 rounded-4 ">invoice:</span>
+                <span class="me-2 header-tag custom-hover text-black-900 fw-500 align-items-center gap-2 border-secondary px-2 py-2 border-2 rounded-4 search-suggestion-term" data-term="invoice:" style="cursor: pointer;">invoice:</span>
                 <span>invoice: af58a92c-bdc4-...</span>
             </div>
             <div class="inline-block me-2 my-4">
-                <span class="me-2 header-tag custom-hover text-black-900 fw-500 align-items-center gap-2 border-secondary px-2 py-2 border-2 rounded-4 ">payment:</span>
+                <span class="me-2 header-tag custom-hover text-black-900 fw-500 align-items-center gap-2 border-secondary px-2 py-2 border-2 rounded-4 search-suggestion-term" data-term="payment:" style="cursor: pointer;">payment:</span>
                 <span>payment: 3c4c0263-b06f-...</span>
             </div>
         </div>
@@ -49,7 +49,7 @@
         <div class="fw-semibold text-muted mb-2">Other search queries</div>
         <div class="d-flex flex-wrap gap-2">
             <% %w[bundle: custom\ field: subscription: tag:].each do |term| %>
-            <span class="badge text-dark border border-secondary rounded-3 px-3 py-2 custom-hover"><%= term %></span>
+            <span class="badge text-dark border border-secondary rounded-3 px-3 py-2 custom-hover search-suggestion-term" data-term="<%= term %>" style="cursor: pointer;"><%= term %></span>
             <% end %>
         </div>
     </div>
@@ -64,12 +64,27 @@
             dropdown.classList.remove("d-none");
         });
 
+        input.addEventListener("focus", () => {
+            dropdown.classList.remove("d-none");
+        });
+
         document.addEventListener("click", (e) => {
             if (!dropdown.contains(e.target) && e.target !== input) {
                 dropdown.classList.add("d-none");
             }
         });
 
+        // Handle clicks on search suggestion terms
+        document.querySelectorAll(".search-suggestion-term").forEach((element) => {
+            element.addEventListener("click", (e) => {
+                e.preventDefault();
+                const term = element.getAttribute("data-term");
+                input.value = term;
+                input.focus();
+                // Keep dropdown open so user can continue typing
+            });
+        });
+
         // Optional: shortcut CMD+K
         document.addEventListener("keydown", (e) => {
             if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === "k") {

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

@@ -47,7 +47,7 @@
                     <div class="col-sm-9 checkbox-label">
                         <label for="<%= "cb_adj_#{ii.invoice_item_id}" %>" class="d-flex align-items-center gap-2 mb-1">
                             <input type="checkbox" id="<%= "cb_adj_#{ii.invoice_item_id}" %>">
-                            <%= Kaui.refund_invoice_description.call(index, ii, bundle_result) %>
+                            <%= text_field_tag "descriptions[#{ii.invoice_item_id}]", Kaui.refund_invoice_description.call(index, ii, bundle_result), id: "desc_#{ii.invoice_item_id}", class: 'form-control' %>
                         </label>
                         <%= text_field_tag "adjustments[#{ii.invoice_item_id}]", index, id: "tf_adj_#{ii.invoice_item_id}", value: ii.amount, class: 'form-control checkbox-label' %>
                     </div>

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

@@ -131,7 +131,7 @@
                 </div>
               <% end %>
 
-              <% if can?(:create, Kaui::Subscription) || can?(:pause_resume, Kaui::Subscription) || can?(:change_plan, Kaui::Subscription) %>
+              <% if can?(:create, Kaui::Subscription) || can?(:pause_resume, Kaui::Subscription) || can?(:change_plan, Kaui::Subscription) || can?(:transfer, Kaui::Bundle) %>
                 <% menu_items = [] %>
 
                 <% if can?(:change_plan, Kaui::Subscription) %>
@@ -173,6 +173,14 @@
                   } %>
                 <% end %>
 
+                <% if can?(:transfer, Kaui::Bundle) && sub.product_category != 'ADD_ON' %>
+                  <% menu_items << {
+                    label: I18n.translate('transfer'),
+                    path: kaui_engine.transfer_bundle_path(bundle.bundle_id),
+                    icon: "kaui/subscription/transfer.svg"
+                  } %>
+                <% end %>
+
                 <%= render partial: "kaui/components/menu_dropdown/menu_dropdown", locals: {
                     variant: "btn-light",
                     label: "",

data/config/locales/en.yml

@@ -18,9 +18,9 @@ en:
   custom_field_uuid_exist_in_invoice_payment_db: "UUID do exist in INVOICE PAYMENT object database."
   custom_field_uuid_do_not_exist_in_db: "UUID do not exist in object database."
   custom_field_uuid_exist_in_invoice_item_db: "UUID do exist in INVOICE ITEMS object database."
-  immediate: "Immediate"
-  start_of_term: "Start of term"
-  end_of_term: "End of term"
+  immediate: "IMMEDIATE"
+  start_of_term: "START_OF_TERM"
+  end_of_term: "END_OF_TERM"
   billing_policy: "Billing Policy"
   new_account_id_or_external_key: "New account id or external key"
   object_invalid_dont_exist: "Object type INVALID or object id do not exist."

data/lib/kaui/error_handler.rb

@@ -7,31 +7,41 @@ module Kaui
 
     included do
       rescue_from(StandardError) do |error|
-        flash[:error] = "Error: #{as_string(error)}"
+        error_message = "Error: #{as_string(error)}"
         try_to_redirect_to_account_path = !params[:controller].ends_with?('accounts')
-        perform_redirect_after_error(redirect: try_to_redirect_to_account_path)
+        perform_redirect_after_error(redirect: try_to_redirect_to_account_path, error:, error_message:)
       end
 
       rescue_from(ActionController::ParameterMissing) do |parameter_missing_exception|
         log_rescue_error parameter_missing_exception
-        flash[:error] = "Required parameter missing: #{parameter_missing_exception.param}"
-        perform_redirect_after_error
+        error_message = "Required parameter missing: #{parameter_missing_exception.param}"
+        perform_redirect_after_error(error: parameter_missing_exception, error_message:)
       end
 
       rescue_from(KillBillClient::API::ResponseError) do |killbill_exception|
-        flash[:error] = "Error while communicating with the Kill Bill server: #{as_string(killbill_exception)}"
+        error_message = "Error while communicating with the Kill Bill server: #{as_string(killbill_exception)}"
         try_to_redirect_to_account_path = !killbill_exception.is_a?(KillBillClient::API::Unauthorized) && !(killbill_exception.is_a?(KillBillClient::API::NotFound) && params[:controller].ends_with?('accounts'))
-        perform_redirect_after_error(redirect: try_to_redirect_to_account_path)
+        perform_redirect_after_error(redirect: try_to_redirect_to_account_path, error: killbill_exception, error_message:)
       end
     end
 
-    def perform_redirect_after_error(redirect: true)
+    def perform_redirect_after_error(error:, error_message:, redirect: true)
       account_id = nested_hash_value(params.permit!.to_h, :account_id)
-      if redirect && account_id.present?
-        redirect_to kaui_engine.account_path(account_id)
-      else
-        redirect_to kaui_engine.home_path
-      end
+      home_path = kaui_engine.home_path
+      redirect_path = if redirect && account_id.present?
+                        kaui_engine.account_path(account_id)
+                      else
+                        home_path
+                      end
+
+      redirect_path_without_query = redirect_path.to_s.split('?').first
+      already_on_redirect_target = request.path == redirect_path_without_query
+      already_on_home = params[:controller].to_s.ends_with?('home') && action_name == 'index'
+
+      raise error if already_on_redirect_target || (redirect_path == home_path && already_on_home)
+
+      flash[:error] = error_message
+      redirect_to redirect_path
     end
   end
 end

data/lib/kaui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kaui
-  VERSION = '4.0.9'
+  VERSION = '4.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.9
+  version: 4.0.11
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-06 00:00:00.000000000 Z
+date: 2026-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -373,6 +373,7 @@ files:
 - app/assets/images/kaui/subscription/change.svg
 - app/assets/images/kaui/subscription/date.svg
 - app/assets/images/kaui/subscription/pause.svg
+- app/assets/images/kaui/subscription/transfer.svg
 - app/assets/images/kaui/timeline/authorize.svg
 - app/assets/images/kaui/timeline/capture.svg
 - app/assets/images/kaui/timeline/chargeback.svg