kaui 4.0.7 → 4.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 890fbf5edb1c2f67edab9875e0c07d68bbdd5dad5403c190b63c5c783fbaa7a0
-  data.tar.gz: 994a37d01dc5bb7784730e960e7014b351f638a5b06fe2f22e96aff3e79a0738
+  metadata.gz: b2c56656e3f87a1f9ec78f971f9fad26c7b91c774ca073325dae08f5b8a047cb
+  data.tar.gz: a1bb18736365bcbd1178dc061de7bb49af25fd354260f51889aa86cfa50615dc
 SHA512:
-  metadata.gz: d1910b8162699e1d0171bdfefb3188c92df44867082b624f1e90ce33822dffdec283c2e562e6c853aaacdcd40a79ed8949d2b3da42e3de3aa099e961ab3670dd
-  data.tar.gz: c0fbfd5a9541304d384afca229c3c53e22d749c887812a754adf464b49a570f92bc2f74c1a887485a2883735b274c943dbbbfd9030561a1431fccef6d417a8fe
+  metadata.gz: 4c4fd476791af712ce1be6f3f92e1152b13884f422511f58cedd52a15958428ea78c4ab3b7184555cb938d1d17faaf0673d7e55df8863bc0b6762230b95d3cc5
+  data.tar.gz: bc90a81429952f5d1db664f9e8531e6a18aa5096814bc0008e16f37282fd89c015e2a614e81857ec09cb65f2b6a0366311e65e9960fae106028e404781d125b3

data/app/controllers/kaui/accounts_controller.rb

@@ -173,6 +173,7 @@ module Kaui
         ops
       end
       fetch_available_tags = promise { Kaui::TagDefinition.all_for_account(cached_options_for_klient) }
+      fetch_bundles = promise { @account.bundles(cached_options_for_klient) }
 
       @overdue_state = wait(fetch_overdue_state)
       @tags = wait(fetch_account_tags)
@@ -184,6 +185,7 @@ module Kaui
       @children = wait(fetch_children)
       @account_parent = @account.parent_account_id.nil? ? nil : wait(fetch_parent)
       @email_notification_configuration = is_email_notifications_plugin_available ? wait(fetch_email_notification_configuration) : []
+      @bundles = wait(fetch_bundles)
 
       @last_transaction_by_payment_method_id = {}
       wait(fetch_payments).each do |payment|

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -114,7 +114,7 @@ module Kaui
       end
 
       @latest_version = begin
-        @catalog_versions[@catalog_versions.length - 1][:version_date]
+        @catalog_versions[-1][:version_date]
       rescue StandardError
         nil
       end
@@ -199,6 +199,7 @@ module Kaui
 
       is_plan_id_found = false
       plan_id = params[:plan_id]
+      product = nil
 
       options = tenant_options_for_client
       options[:api_key] = @tenant.api_key
@@ -207,9 +208,12 @@ module Kaui
       catalog = Kaui::Catalog.get_catalog_json(true, nil, nil, options)
 
       # seek if plan id exists
-      catalog.products.each do |product|
-        product.plans.each { |plan| is_plan_id_found |= plan.name == plan_id }
-        break if is_plan_id_found
+      catalog.products.each do |p|
+        p.plans.each { |plan| is_plan_id_found |= plan.name == plan_id }
+        if is_plan_id_found
+          product = p
+          break
+        end
       end
 
       unless is_plan_id_found
@@ -219,6 +223,7 @@ module Kaui
 
       @simple_plan = Kaui::SimplePlan.new
       @simple_plan.plan_id = params[:plan_id]
+      @simple_plan.product_name = product.name if product
     end
 
     def create_simple_plan

data/app/controllers/kaui/subscriptions_controller.rb

@@ -237,7 +237,7 @@ module Kaui
       return [] if catalog.blank?
 
       plans = []
-      catalog[catalog.size - 1].products.each do |product|
+      catalog[-1].products.each do |product|
         next if product.type == 'ADD_ON' || (!product_category.nil? && product.type != product_category)
 
         product.plans.each do |plan|

data/app/helpers/kaui/account_helper.rb

@@ -69,5 +69,27 @@ module Kaui
       style = "style='#{style}'" unless style.empty?
       style
     end
+
+    # Get the effective BCD for an account
+    # If there's an active subscription with its own BCD, return that
+    # Otherwise return the account-level BCD
+    def effective_bcd(account, bundles = nil)
+      # If bundles are provided, check for subscription BCD
+      if bundles.present?
+        bundles.each do |bundle|
+          next unless bundle.subscriptions.present?
+
+          bundle.subscriptions.each do |subscription|
+            # Skip cancelled subscriptions
+            next if subscription.state == 'CANCELLED'
+            # If subscription has a BCD set, return it (subscription BCD takes precedence)
+            return subscription.bill_cycle_day_local if subscription.bill_cycle_day_local.present? && subscription.bill_cycle_day_local.positive?
+          end
+        end
+      end
+
+      # Fall back to account BCD
+      account.bill_cycle_day_local
+    end
   end
 end

data/app/models/kaui/catalog.rb

@@ -37,7 +37,7 @@ module Kaui
 
       def get_catalog_json(latest, requested_date, account_id, options)
         catalogs = get_tenant_catalog_json(requested_date, account_id, options)
-        return catalogs.length.positive? ? catalogs[catalogs.length - 1] : nil if latest
+        return catalogs.length.positive? ? catalogs[-1] : nil if latest
 
         # Order by latest
         result = []

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

@@ -110,8 +110,9 @@
         <div class="col-md-4">
           <div class="info-item">
             <b>Bill cycle day</b>
-            <% if @account.bill_cycle_day_local > 0  %>
-              <p><%= @account.bill_cycle_day_local %> (user timezone)</p>
+            <% effective_bcd_value = effective_bcd(@account, @bundles) %>
+            <% if effective_bcd_value.present? && effective_bcd_value > 0  %>
+              <p><%= effective_bcd_value %> (user timezone)</p>
             <% else %>
               <p>N/A</p>
             <% end %>

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

@@ -78,8 +78,9 @@
               <tr>
                 <th>Bill cycle day</th>
                 <td>
-                  <% if @account.bill_cycle_day_local > 0  %>
-                      <span class='label'><%= @account.bill_cycle_day_local %> (user timezone)</span>
+                  <% effective_bcd_value = effective_bcd(@account, @bundles) %>
+                  <% if effective_bcd_value.present? && effective_bcd_value > 0  %>
+                      <span class='label'><%= effective_bcd_value %> (user timezone)</span>
                   <% else %>
                       <span class='label'>N/A</span>
                   <% end %>

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

@@ -21,7 +21,7 @@
         <div class="form-group d-flex pb-3">
           <%= f.label :amount, 'Amount', :class => 'col-sm-3 control-label' %>
           <div class="col-sm-9 d-flex currency-select">
-            <%= f.text_field :amount, :class => 'form-control w-100 amount-input' %>
+            <%= f.text_field :amount, :class => 'form-control w-100 amount-input', :required => true %>
             <%= f.select :currency, currencies, {:selected => 'USD'}, :class => 'form-control' %>
           </div>
         </div>

data/app/views/kaui/components/breadcrumb/_breadcrumb.html.erb

@@ -6,6 +6,8 @@
   # Try to determine root path dynamically
   if request.path.start_with?('/kaui')
     dynamic_root = '/kaui'
+  elsif request.path.start_with?('/aviate')
+    dynamic_root = '/aviate'
   else
     dynamic_root = '/'
   end
@@ -90,11 +92,12 @@
       <% end %>
     <% end %>
 
-    <%# Process remaining segments (excluding root "kaui" segment) %>
+    <%# Process remaining segments (excluding root segments like "kaui" or "aviate") %>
     <% sanitized_segments = segments.map { |segment| CGI.escapeHTML(segment) } %>
     <% 
-      # Skip the first segment if it's "kaui" since we already handled home
-      display_segments = sanitized_segments.first == "kaui" ? sanitized_segments[1..-1] : sanitized_segments
+      # Skip the first segment if it's a root mount point since we already handled home
+      root_segments = %w[kaui aviate]
+      display_segments = root_segments.include?(sanitized_segments.first) ? sanitized_segments[1..-1] : sanitized_segments
     %>
     
     <% display_segments.each_with_index do |segment, index| %>

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

@@ -142,7 +142,7 @@
                   } %>
                 <% end %>
 
-                <% if can?(:create, Kaui::Subscription) && @subscription[bundle.bundle_id].present? %>
+                <% if can?(:create, Kaui::Subscription) && @subscription[bundle.bundle_id].present? && sub.product_category != 'ADD_ON' %>
                   <% menu_items << {
                     label: @subscription[bundle.bundle_id].product_category == 'BASE' ? 'Add add-on' : 'Add standalone subscription',
                     path: kaui_engine.new_subscription_path(

data/lib/kaui/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.0.8
 platform: ruby
 authors:
 - Kill Bill core team