kaui 4.0.18 → 4.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b226cddd4e3508c415761943d804cab4ff71e506eca8d8ffbe592fde0cbed193
-  data.tar.gz: 6b29cc16b8e32acc0fceca6f1444e3073e8bbe8cd29fbd59158c7edb05cf4796
+  metadata.gz: ef67e5aac2cf29cee71a7a52b5b87452afc410ed711d1d55c08225dc39b1d044
+  data.tar.gz: 6232e9397218afea690a6d45422623b16fb346489a380eaaa6fdba3ed6e98930
 SHA512:
-  metadata.gz: b562deca64d70f1fe3323cedd752ed20fe00202ea56e248873aeb11672a3128c45b809ff7138395dc04d301b2b35fc07b8191e0d6e653423eb18176131e3b7d2
-  data.tar.gz: 276b11b5364329227e3be9d0b121500350ced30662505dccea557c7084eaccb91508401b73c7bf1ae80e92cec06d630ee0fab7f9bbfc1c17cbead743d2b2efa1
+  metadata.gz: d2cd48b2725369b2a466e49cabbf656ce64b6bea4cdcb272f97fb7d34c909bdb56a6876c13af14328a1dcdd0d341e9d04757318d9504aeece87d55ad2ba8a6fa
+  data.tar.gz: 8abadbb98b2d800acb54b5dd7fd9bdcf20a8a49186c1b3b9b2357eb3a717ff6a79a45094aebcfaa252a11a8ca562ac5ab2812080c6abb3774ea711b57d98099b

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -47,6 +47,12 @@ module Kaui
         @overdue_xml = nil
       end
 
+      fetch_invoice_template = promise do
+        Kaui::AdminTenant.get_invoice_template(false, options)
+      rescue StandardError
+        @invoice_template = nil
+      end
+
       fetch_tenant_plugin_config = promise { Kaui::AdminTenant.get_tenant_plugin_config(options) }
 
       @catalog_versions = []
@@ -64,6 +70,12 @@ module Kaui
       @overdue = flash[:overdue_deleted] ? nil : wait(fetch_overdue)
       @overdue_xml = flash[:overdue_deleted] ? nil : wait(fetch_overdue_xml)
       @overdue_config_exists = @overdue_xml.present? || (@overdue&.overdue_states.present? && !@overdue.has_states)
+      @invoice_template = begin
+        wait(fetch_invoice_template)
+      rescue StandardError
+        nil
+      end
+
       @tenant_plugin_config = begin
         wait(fetch_tenant_plugin_config)
       rescue StandardError
@@ -367,6 +379,22 @@ module Kaui
       redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_deleted_successfully')
     end
 
+    def invoice_template
+      current_tenant = safely_find_tenant_by_id(params[:id])
+
+      options = tenant_options_for_client
+      options[:api_key] = current_tenant.api_key
+      options[:api_secret] = current_tenant.api_secret
+
+      template = Kaui::AdminTenant.get_invoice_template(false, options)
+
+      if template.present?
+        render body: template, content_type: 'text/html'
+      else
+        render plain: 'No invoice template found', status: :not_found
+      end
+    end
+
     def upload_invoice_template
       current_tenant = safely_find_tenant_by_id(params[:id])
 
@@ -380,7 +408,7 @@ module Kaui
 
       Kaui::AdminTenant.upload_invoice_template(invoice_template, is_manual_pay, true, options[:username], nil, comment, options)
 
-      redirect_to admin_tenant_path(current_tenant.id), notice: I18n.t('flashes.notices.invoice_template_uploaded_successfully')
+      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'InvoiceTemplate'), notice: I18n.t('flashes.notices.invoice_template_uploaded_successfully')
     end
 
     def upload_invoice_translation
@@ -394,9 +422,14 @@ module Kaui
       uploaded_invoice_translation = params.require(:invoice_translation)
       invoice_translation = uploaded_invoice_translation.read
 
+      if locale.blank?
+        flash[:error] = I18n.t('errors.messages.locale_required')
+        redirect_to admin_tenant_path(current_tenant.id, active_tab: 'InvoiceTranslation') and return
+      end
+
       Kaui::AdminTenant.upload_invoice_translation(invoice_translation, locale, true, options[:username], nil, comment, options)
 
-      redirect_to admin_tenant_path(current_tenant.id), notice: I18n.t('flashes.notices.invoice_translation_uploaded_successfully')
+      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'InvoiceTranslation'), notice: I18n.t('flashes.notices.invoice_translation_uploaded_successfully')
     end
 
     def upload_catalog_translation
@@ -410,9 +443,14 @@ module Kaui
       uploaded_catalog_translation = params.require(:catalog_translation)
       catalog_translation = uploaded_catalog_translation.read
 
+      if locale.blank?
+        flash[:error] = I18n.t('errors.messages.locale_required')
+        redirect_to admin_tenant_path(current_tenant.id, active_tab: 'CatalogTranslation') and return
+      end
+
       Kaui::AdminTenant.upload_catalog_translation(catalog_translation, locale, true, options[:username], nil, comment, options)
 
-      redirect_to admin_tenant_path(current_tenant.id), notice: I18n.t('flashes.notices.catalog_translation_uploaded_successfully')
+      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'CatalogTranslation'), notice: I18n.t('flashes.notices.catalog_translation_uploaded_successfully')
     end
 
     def upload_plugin_config

data/app/controllers/kaui/subscriptions_controller.rb

@@ -14,6 +14,7 @@ module Kaui
 
       @bundle, plans_details = lookup_bundle_and_plan_details(@subscription, @base_product_name)
       @plans = plans_details.map(&:plan)
+      @plan_phases = build_plan_phases_map(plans_details)
 
       return unless @plans.empty?
 
@@ -30,6 +31,7 @@ module Kaui
       _, plans_details = lookup_bundle_and_plan_details(@subscription)
       # Use a Set to deal with multiple pricelists
       @plans = Set.new.merge(plans_details.map(&:plan))
+      @plan_phases = build_plan_phases_map(plans_details)
     end
 
     def create
@@ -46,15 +48,7 @@ module Kaui
         @subscription.plan_name = plan_name
         requested_date = params[:type_change] == 'DATE' ? params[:requested_date].presence : nil
 
-        # price override?
-        override_fixed_price = begin
-          plan_details.phases.first.prices.blank?
-        rescue StandardError
-          false
-        end
-        override_recurring_price = !override_fixed_price
-        phase_type = @bundle.nil? ? plan_details.phases.first.type : @bundle.subscriptions.first.phase_type
-        overrides = price_overrides(phase_type, override_fixed_price, override_recurring_price)
+        overrides = price_overrides(plan_details)
         @subscription.price_overrides = overrides if overrides.present?
         @subscription.quantity = params[:quantity].to_i if params[:quantity].present? && params[:quantity].to_i.positive?
 
@@ -95,11 +89,9 @@ module Kaui
 
       input = { planName: plan_name }
 
-      # price override?
-      current_plan = subscription.prices.select { |price| price['phaseType'] == subscription.phase_type }
-      override_fixed_price = current_plan.last['recurringPrice'].nil?
-      override_recurring_price = !override_fixed_price
-      overrides = price_overrides(subscription.phase_type, override_fixed_price, override_recurring_price)
+      _, plans_details = lookup_bundle_and_plan_details(subscription)
+      plan_details = plans_details.find { |p| p.plan == plan_name }
+      overrides = plan_details ? price_overrides(plan_details) : nil
       input[:priceOverrides] = overrides if overrides.present?
 
       subscription.change_plan(input,
@@ -189,6 +181,7 @@ module Kaui
 
     def record_usage
       @subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
+      @unit_types = fetch_unit_types_from_subscription(@subscription)
     end
 
     def create_usage
@@ -204,16 +197,13 @@ module Kaui
       amount = Integer(amount_raw, exception: false)
       errors << 'Amount must be a positive integer' if amount.nil? || amount <= 0
       errors << 'Date/time of usage is required' if record_date.blank?
-      parsed_date = begin
-        record_date.blank? ? nil : Time.iso8601(record_date)
-      rescue ArgumentError
-        nil
-      end
-      errors << 'Date/time of usage must be a valid ISO 8601 timestamp' if record_date.present? && parsed_date.nil?
+      parsed_date = parse_usage_date(record_date) if record_date.present?
+      errors << 'Date/time of usage must be a valid date or datetime' if record_date.present? && parsed_date.nil?
 
       if errors.any?
         flash.now[:error] = errors.join('. ')
         @subscription = Kaui::Subscription.find_by_id(subscription_id, 'NONE', options_for_klient)
+        @unit_types = fetch_unit_types_from_subscription(@subscription)
         @unit_type = unit_type
         @amount = amount_raw
         @record_date = record_date
@@ -235,7 +225,7 @@ module Kaui
         usage.tracking_id = params[:tracking_id].presence
         usage.unit_usage_records = [unit_usage_record]
 
-        usage.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+        usage.create(current_user.kb_username, nil, nil, options_for_klient)
 
         subscription = Kaui::Subscription.find_by_id(subscription_id, 'NONE', options_for_klient)
         redirect_to kaui_engine.account_bundles_path(subscription.account_id), notice: 'Usage was successfully recorded'
@@ -244,6 +234,7 @@ module Kaui
         Rails.logger.error(e.backtrace.join("\n")) if e.backtrace
         flash.now[:error] = "Error while recording usage: #{as_string(e)}"
         @subscription = Kaui::Subscription.find_by_id(subscription_id, 'NONE', options_for_klient)
+        @unit_types = fetch_unit_types_from_subscription(@subscription)
         @unit_type = unit_type
         @amount = amount_raw
         @record_date = record_date
@@ -357,19 +348,126 @@ module Kaui
       plans
     end
 
-    def price_overrides(phase_type, override_fixed_price, override_recurring_price)
-      return nil if params[:price_override].blank? || params[:price_override].to_i.negative?
+    def price_overrides(plan_details)
+      raw = params[:price_overrides]
+      return nil if raw.blank?
+
+      entries = raw.respond_to?(:values) ? raw.values : Array(raw)
+      phase_meta = plan_details.respond_to?(:phases) ? (plan_details.phases || []).index_by(&:type) : {}
+
+      overrides = entries.filter_map do |entry|
+        entry = entry.to_unsafe_h if entry.respond_to?(:to_unsafe_h)
+        entry = entry.with_indifferent_access if entry.respond_to?(:with_indifferent_access)
+
+        price_str = entry[:price].to_s.strip
+        phase_type = entry[:phase_type].to_s.strip
+
+        price = BigDecimal(price_str, exception: false)
+
+        next if price.nil? || phase_type.blank? || price.negative?
+
+        phase = phase_meta[phase_type]
+        next if phase.nil?
+
+        override = KillBillClient::Model::PhasePriceAttributes.new
+        override.phase_type = phase_type
+        if phase_uses_fixed_price?(phase)
+          override.fixed_price = price.to_s('F')
+        else
+          override.recurring_price = price.to_s('F')
+        end
+        override
+      end
+
+      overrides.presence
+    end
+
+    def build_plan_phases_map(plans_details)
+      (plans_details || []).to_h do |pd|
+        # PlanDetail objects returned by available_base_plans/available_addons only expose the
+        # final phase (product/plan/priceList/finalPhaseBillingPeriod/finalPhaseRecurringPrice)
+        # and have no phases method, unlike full catalog Plan objects. Skip phase overrides for those.
+        phases = if pd.respond_to?(:phases)
+                   (pd.phases || []).map do |ph|
+                     fixed = phase_uses_fixed_price?(ph)
+                     prices = ph.prices || []
+                     price_label = if fixed
+                                     '$0.00'
+                                   elsif prices.any?
+                                     format('$%.2f', prices.first.value.to_f)
+                                   else
+                                     ''
+                                   end
+                     { type: ph.type, fixed: fixed, priceLabel: price_label }
+                   end
+                 else
+                   []
+                 end
+        [pd.plan, phases]
+      end
+    end
 
-      price_override = params[:price_override]
-      overrides = []
-      override = KillBillClient::Model::PhasePriceAttributes.new
-      override.phase_type = phase_type
-      override.fixed_price = price_override if override_fixed_price
-      override.recurring_price = price_override if override_recurring_price
+    def phase_uses_fixed_price?(phase)
+      (phase.prices || []).empty?
+    end
 
-      overrides << override
+    def fetch_unit_types_from_subscription(subscription)
+      unit_types = []
+      (subscription.prices || []).each do |phase_price|
+        usage_prices = if phase_price.is_a?(Hash)
+                         phase_price['usagePrices'] || phase_price[:usagePrices] || []
+                       elsif phase_price.respond_to?(:usage_prices)
+                         phase_price.usage_prices || []
+                       else
+                         []
+                       end
+        (usage_prices || []).each do |usage_price|
+          tier_prices = if usage_price.is_a?(Hash)
+                          usage_price['tierPrices'] || usage_price[:tierPrices] || []
+                        elsif usage_price.respond_to?(:tier_prices)
+                          usage_price.tier_prices || []
+                        else
+                          []
+                        end
+          (tier_prices || []).each do |tier_price|
+            block_prices = if tier_price.is_a?(Hash)
+                             tier_price['blockPrices'] || tier_price[:blockPrices] || []
+                           elsif tier_price.respond_to?(:block_prices)
+                             tier_price.block_prices || []
+                           else
+                             []
+                           end
+            (block_prices || []).each do |block_price|
+              unit_name = if block_price.is_a?(Hash)
+                            block_price['unitName'] || block_price[:unitName] || block_price['unit_name']
+                          elsif block_price.respond_to?(:unit_name)
+                            block_price.unit_name
+                          end
+              unit_types << unit_name if unit_name.present?
+            end
+          end
+        end
+      end
+      unit_types.uniq
+    rescue StandardError => e
+      Rails.logger.warn("Failed to extract unit types from subscription #{subscription&.subscription_id}: #{e.class}: #{e.message}")
+      []
+    end
 
-      overrides
+    def parse_usage_date(str)
+      str = str.to_s.strip
+      return nil if str.empty?
+
+      if str.match?(/^\d{4}-\d{2}-\d{2}$/)
+        year, month, day = str.split('-').map(&:to_i)
+        Time.utc(year, month, day)
+      elsif str.match?(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/)
+        Time.iso8601("#{str}:00Z")
+      else
+        Time.iso8601(str)
+      end
+    rescue ArgumentError
+      nil
     end
   end
 end

data/app/models/kaui/admin_tenant.rb

@@ -15,6 +15,10 @@ module Kaui
         KillBillClient::Model::Invoice.upload_invoice_template(invoice_template, is_manual_pay, delete_if_exists, user, reason, comment, options)
       end
 
+      def get_invoice_template(is_manual_pay, options = {})
+        KillBillClient::Model::Invoice.get_invoice_template(is_manual_pay, nil, options)
+      end
+
       def upload_invoice_translation(invoice_translation, locale, delete_if_exists, user = nil, reason = nil, comment = nil, options = {})
         KillBillClient::Model::Invoice.upload_invoice_translation(invoice_translation, locale, delete_if_exists, user, reason, comment, options)
       end

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

@@ -21,7 +21,7 @@
           <div class="form-group d-flex pb-3 border-bottom mb-3">
             <%= label_tag :translation_locale, 'Locale', :class => 'col-sm-2 control-label' %>
             <div class="col-sm-10">
-              <%= text_field_tag :translation_locale, nil, :class => 'form-control' %>
+              <%= text_field_tag :translation_locale, nil, :class => 'form-control', :required => true, :placeholder => 'e.g. en_US' %>
             </div>
           </div>
           <div class="d-flex justify-content-end">

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

@@ -1,5 +1,28 @@
 <% if can? :config_upload, Kaui::AdminTenant %>
     <div class="tab-pane fade invoice-template form-invoice-template" id="InvoiceTemplate">
+      <% if @invoice_template.present? %>
+        <div class="invoice-template-display mb-4">
+          <h5>Current Invoice Template</h5>
+          <div class="card">
+            <div class="card-body p-0">
+              <iframe src="<%= admin_tenant_invoice_template_path(@tenant.id) %>" style="width: 100%; height: 500px; border: none;" title="Invoice Template Preview"></iframe>
+            </div>
+          </div>
+          <div class="mt-2">
+            <%= render "kaui/components/button/button", {
+              label: 'View Source',
+              variant: "outline-secondary d-inline-flex align-items-center gap-1",
+              type: "button",
+              html_class: "kaui-dropdown custom-hover",
+              html_options: {
+                onclick: '$(this).toggleClass("active"); $(this).next("pre").toggle(); return false;'
+              }
+            } %>
+            <pre class="mb-0 mt-2 p-2 bg-light" style="display: none; max-height: 400px; overflow-y: auto; white-space: pre-wrap; word-break: break-all; font-family: monospace; font-size: 12px;"><%= html_escape(@invoice_template) %></pre>
+          </div>
+        </div>
+      <% end %>
+
       <%= form_tag({:action => :upload_invoice_template}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
           <%= hidden_field_tag(:id, @tenant.id) %>
 
@@ -19,8 +42,6 @@
             %>
           </div>
 
-
-
           <div class="form-group pb-3 border-bottom mb-3">
             <div class="col-sm-10">
               <div class="checkbox">

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

@@ -21,7 +21,7 @@
         <div class="form-group d-flex pb-3 border-bottom mb-3">
           <%= label_tag :translation_locale, 'Locale', :class => 'col-sm-2 control-label' %>
           <div class="col-sm-10">
-            <%= text_field_tag :translation_locale, nil, :class => 'form-control' %>
+            <%= text_field_tag :translation_locale, nil, :class => 'form-control', :required => true, :placeholder => 'e.g. en_US' %>
           </div>
         </div>
         <div class="d-flex justify-content-end">

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

@@ -61,9 +61,9 @@
           <% end %>
 
           
-          <% if @bundles.empty? %>
+          <% if @bundles.empty? && @search_query.present? %>
             <div class="custom-alert custom-alert-info mt-3">
-              <span>No bundles found<%= @search_query.present? ? " for the given search query." : "." %></span>
+              <span>No bundles found for the given search query.</span>
             </div>
           <% end %>
 

data/app/views/kaui/components/menu_dropdown/_menu_dropdown.html.erb

@@ -17,6 +17,7 @@
 
   <ul class="dropdown-menu header-menu shadow border-0 rounded-3"
       id="<%= dropdown_id %>_menu"
+      aria-labelledby="<%= dropdown_id %>_button"
       style="min-width: 6.25rem; display: none;">
     <% menu_items&.each do |item| %>
       <li>
@@ -31,28 +32,21 @@
 
 <%= javascript_tag do %>
   document.addEventListener('DOMContentLoaded', function () {
-    const button = document.getElementById('<%= dropdown_id %>_button');
-    const menu = document.getElementById('<%= dropdown_id %>_menu');
-    const wrapper = document.getElementById('<%= dropdown_id %>_wrapper');
+    var button = document.getElementById('<%= dropdown_id %>_button');
+    var menu = document.getElementById('<%= dropdown_id %>_menu');
+    var wrapper = document.getElementById('<%= dropdown_id %>_wrapper');
 
     button.addEventListener('click', function (e) {
       e.stopPropagation();
-      const isShown = menu.style.display === 'block';
-
-      // Close all other open dropdowns first (including other dots menus)
-      document.querySelectorAll('.dropdown-menu').forEach(function (m) {
-        if (m !== menu) {
-          m.style.display = 'none';
-        }
-      });
-
-      // Toggle this one
+      var isShown = menu.style.display === 'block';
       menu.style.display = isShown ? 'none' : 'block';
+      button.setAttribute('aria-expanded', !isShown);
     });
 
     document.addEventListener('click', function (e) {
-      if (!wrapper.contains(e.target)) {
+      if (!wrapper.contains(e.target) && menu.style.display === 'block') {
         menu.style.display = 'none';
+        button.setAttribute('aria-expanded', 'false');
       }
     });
   });

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

@@ -45,10 +45,7 @@
       type: "button",
       html_class: "kaui-button custom-hover",
       html_options: {
-        id: "dropdownMenu1",
-        data: {
-          bs_toggle: "dropdown"
-        }
+        id: "dropdownMenu1"
       }
     } %>
     <ul class="dropdown-menu" id="column-visibility" aria-labelledby="dropdownMenu1">
@@ -213,13 +210,15 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
-  // Initialize Bootstrap dropdown
-  var dropdownElementList = [].slice.call(document.querySelectorAll('.dropdown-toggle'));
-  var dropdownList = dropdownElementList.map(function (dropdownToggleEl) {
-    return new bootstrap.Dropdown(dropdownToggleEl);
+  // Toggle Edit Columns dropdown
+  $('#dropdownMenu1').on('click', function(e) {
+    e.stopPropagation();
+    var $menu = $('#column-visibility');
+    $menu.toggleClass('show');
+    $(this).attr('aria-expanded', $menu.hasClass('show'));
   });
 
-  $('.dropdown-menu').on('click', 'input[type="checkbox"], label', function(event) {
+  $('#column-visibility').on('click', 'input[type="checkbox"], label', function(event) {
     event.stopPropagation();
   });
 

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

@@ -45,10 +45,7 @@
       type: "button",
       html_class: "kaui-button custom-hover",
       html_options: {
-        id: "dropdownMenu1",
-        data: {
-          bs_toggle: "dropdown"
-        }
+        id: "dropdownMenu1"
       }
     } %>
     <ul class="dropdown-menu" id="column-visibility" aria-labelledby="dropdownMenu1">
@@ -213,13 +210,15 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
-  // Initialize Bootstrap dropdown
-  var dropdownElementList = [].slice.call(document.querySelectorAll('.dropdown-toggle'));
-  var dropdownList = dropdownElementList.map(function (dropdownToggleEl) {
-    return new bootstrap.Dropdown(dropdownToggleEl);
+  // Toggle Edit Columns dropdown
+  $('#dropdownMenu1').on('click', function(e) {
+    e.stopPropagation();
+    var $menu = $('#column-visibility');
+    $menu.toggleClass('show');
+    $(this).attr('aria-expanded', $menu.hasClass('show'));
   });
 
-  $('.dropdown-menu').on('click', 'input[type="checkbox"], label', function(event) {
+  $('#column-visibility').on('click', 'input[type="checkbox"], label', function(event) {
     event.stopPropagation();
   });
 

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

@@ -7,9 +7,49 @@
     </div>
 
     <div class="form-group d-flex pb-3 border-bottom mb-3">
-      <%= label_tag :price_override, 'Price Override', :class => 'col-sm-3 control-label' %>
-      <div class="col-sm-9">
-        <%= number_field_tag :price_override, nil, min: 0, :step => :any, :class => 'form-control' %>
+      <div class="col-sm-3 control-label" style="padding-top: 2px;">
+        <div id="toggle_phase_overrides" style="cursor: pointer; user-select: none;">
+          <span id="toggle_phase_overrides_caret">&#9662;</span>
+          <strong>Phase Overrides</strong>
+        </div>
+      </div>
+      <div class="col-sm-9" id="phase_overrides_section">
+        <p class="text-muted mb-2" style="font-size: 13px;">Override prices for specific phases. All other phases will use catalog pricing.</p>
+        <div id="phase_overrides_headers" class="d-flex mb-1 gap-2" style="display: none;">
+          <div style="flex: 1; padding-left: 2px;"><small><strong>Phase</strong></small></div>
+          <div style="flex: 1; padding-left: 2px;">
+            <small><strong>Override Price</strong></small>
+            <svg width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" style="vertical-align: middle; margin-left: 3px;" title="Leave blank to use catalog pricing">
+              <circle cx="8" cy="8" r="7" stroke="#A4A7AE" stroke-width="1.25"/>
+              <path d="M8 7v5M8 5.5v-.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round"/>
+            </svg>
+          </div>
+          <div style="width: 40px;"></div>
+        </div>
+        <div id="phase_overrides_rows"></div>
+        <button type="button" id="add_phase_override" class="btn w-100 mt-2 align-items-center justify-content-center gap-1"
+          style="border: 1px dashed #d0d5dd; background: white; color: #2563eb; font-size: 14px;">
+          <span style="font-size: 16px; line-height: 1;">+</span> Add another phase
+        </button>
+        <script type="application/json" id="plan_phases_data"><%= raw json_escape((@plan_phases || {}).to_json) %></script>
+        <style>.phase-override-remove:hover svg path { stroke: #D92D20; }</style>
+        <template id="phase_override_row_template">
+          <div class="phase-override-row d-flex align-items-center mb-2 gap-2">
+            <select name="price_overrides[][phase_type]" class="form-control phase-override-type" style="flex: 1;"></select>
+            <div class="input-group phase-override-price-group" style="flex: 1;">
+              <span class="input-group-text">$</span>
+              <input type="number" name="price_overrides[][price]" step="any" min="0" placeholder="0.00" class="form-control phase-override-price">
+            </div>
+            <button type="button" class="btn btn-outline-secondary phase-override-remove" style="padding: 6px 10px; flex-shrink: 0;" aria-label="Remove">
+              <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M13 3.66699L12.4093 13.4143C12.3666 14.1181 11.7834 14.667 11.0783 14.667H4.92164C4.21659 14.667 3.6334 14.1181 3.59075 13.4143L3 3.66699" stroke="#A4A7AE" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+                <path d="M2 3.66634H5.33333M5.33333 3.66634L6.16017 1.73706C6.26522 1.49194 6.50625 1.33301 6.77293 1.33301H9.22707C9.49373 1.33301 9.7348 1.49194 9.8398 1.73706L10.6667 3.66634M5.33333 3.66634H10.6667M14 3.66634H10.6667" stroke="#A4A7AE" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+                <path d="M6.33325 11V7" stroke="#A4A7AE" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+                <path d="M9.66675 11V7" stroke="#A4A7AE" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+              </svg>
+            </button>
+          </div>
+        </template>
       </div>
     </div>
     <div class="form-group d-flex pb-3" id="radio_group">
@@ -106,5 +146,109 @@ $(document).ready(function() {
     $( "input[type=radio]").on("click", function() {
         onTypeChange();
     });
+    initPhaseOverrides();
 });
+
+function initPhaseOverrides() {
+    var planPhases = {};
+    try { planPhases = JSON.parse($('#plan_phases_data').text() || '{}'); } catch (e) { planPhases = {}; }
+
+    var $section = $('#phase_overrides_section');
+    var $rows = $('#phase_overrides_rows');
+    var $addBtn = $('#add_phase_override');
+    var $headers = $('#phase_overrides_headers');
+    var $template = $('#phase_override_row_template');
+    var $planSelect = $('select[name="plan_name"]');
+
+    function currentPhases() {
+      var phases = planPhases[$planSelect.val()] || [];
+      var seen = {};
+      return phases.filter(function(p) {
+        if (!p || !p.type || seen[p.type]) return false;
+        seen[p.type] = true;
+        return true;
+      });
+    }
+
+    function phaseLabel(p) {
+        var title = p.type.charAt(0) + p.type.slice(1).toLowerCase();
+        return p.priceLabel ? title + ' (' + p.priceLabel + ')' : title;
+    }
+
+    function selectedTypes($exceptRow) {
+        return $rows.find('.phase-override-row').filter(function() {
+            return !$exceptRow || this !== $exceptRow[0];
+        }).map(function() { return $(this).find('.phase-override-type').val(); }).get();
+    }
+
+    function refreshAddBtn() {
+        var phases = currentPhases();
+        var used = selectedTypes().filter(function(type) { return type; });
+        var hasMore = phases.length > 0 && used.length < phases.length;
+        if (hasMore) {
+            $addBtn.css('display', 'flex');
+        } else {
+            $addBtn.hide();
+        }
+        $headers.css('display', $rows.find('.phase-override-row').length > 0 ? 'flex' : 'none');
+    }
+
+    function rebuildRowOptions() {
+        var phases = currentPhases();
+        $rows.find('.phase-override-row').each(function() {
+            var $row = $(this);
+            var $select = $row.find('.phase-override-type');
+            var current = $select.val();
+            var used = selectedTypes($row);
+            $select.empty();
+            phases.forEach(function(p) {
+                if (used.indexOf(p.type) === -1) {
+                    $select.append($('<option>', { value: p.type, text: phaseLabel(p) }));
+                }
+            });
+            var currentStillValid = phases.some(function(p) { return p.type === current; }) && used.indexOf(current) === -1;
+            if (currentStillValid) $select.val(current);
+        });
+        refreshAddBtn();
+    }
+
+    function addRow(preferredType) {
+        var phases = currentPhases();
+        if (phases.length === 0) return;
+        var used = selectedTypes().filter(function(type) { return type; });
+        var next = preferredType && phases.some(function(p) { return p.type === preferredType; }) && used.indexOf(preferredType) === -1
+            ? preferredType
+            : (phases.find(function(p) { return used.indexOf(p.type) === -1; }) || {}).type;
+        if (!next) return;
+
+        var $row = $($template.html());
+        $rows.append($row);
+        rebuildRowOptions();
+        $row.find('.phase-override-type').val(next);
+        rebuildRowOptions();
+    }
+
+    function resetRows() {
+        $rows.empty();
+        var phases = currentPhases();
+        if (phases.length > 0) addRow(phases[0].type);
+        refreshAddBtn();
+    }
+
+    $('#toggle_phase_overrides').on('click', function() {
+        $section.toggle();
+        $('#toggle_phase_overrides_caret').html($section.is(':visible') ? '&#9662;' : '&#9656;');
+    });
+
+    $addBtn.on('click', function() { addRow(); });
+
+    $rows.on('change', '.phase-override-type', rebuildRowOptions);
+    $rows.on('click', '.phase-override-remove', function() {
+        $(this).closest('.phase-override-row').remove();
+        refreshAddBtn();
+    });
+
+    $planSelect.on('change', resetRows);
+    resetRows();
+}
 <% end %>

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

@@ -35,9 +35,49 @@
       </div>
     </div>
     <div class="form-group d-flex pb-3">
-      <%= label_tag :price_override, 'Price Override', :class => 'col-sm-3 control-label' %>
-      <div class="col-sm-9">
-        <%= number_field_tag :price_override, nil, :step => :any, :min => 0, :class => 'form-control' %>
+      <div class="col-sm-3 control-label" style="padding-top: 2px;">
+        <div id="toggle_phase_overrides" style="cursor: pointer; user-select: none;">
+          <span id="toggle_phase_overrides_caret">&#9656;</span>
+          <strong>Price Override</strong>
+        </div>
+      </div>
+      <div class="col-sm-9" id="phase_overrides_section" style="display: none;">
+        <p class="text-muted mb-2" style="font-size: 13px;">Override prices for specific phases. All other phases will use catalog pricing.</p>
+        <div id="phase_overrides_headers" class="d-flex mb-1 gap-2" style="display: none;">
+          <div style="flex: 1; padding-left: 2px;"><small><strong>Phase</strong></small></div>
+          <div style="flex: 1; padding-left: 2px;">
+            <small><strong>Override Price</strong></small>
+            <svg width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" style="vertical-align: middle; margin-left: 3px;" title="Leave blank to use catalog pricing">
+              <circle cx="8" cy="8" r="7" stroke="#A4A7AE" stroke-width="1.25"/>
+              <path d="M8 7v5M8 5.5v-.5" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round"/>
+            </svg>
+          </div>
+          <div style="width: 40px;"></div>
+        </div>
+        <div id="phase_overrides_rows"></div>
+        <button type="button" id="add_phase_override" class="btn w-100 mt-2 align-items-center justify-content-center gap-1"
+          style="border: 1px dashed #d0d5dd; background: white; color: #2563eb; font-size: 14px;">
+          <span style="font-size: 16px; line-height: 1;">+</span> Add another phase
+        </button>
+        <script type="application/json" id="plan_phases_data"><%= raw json_escape((@plan_phases || {}).to_json) %></script>
+        <style>.phase-override-remove:hover svg path { stroke: #D92D20; }</style>
+        <template id="phase_override_row_template">
+          <div class="phase-override-row d-flex align-items-center mb-2 gap-2">
+            <select name="price_overrides[][phase_type]" class="form-control phase-override-type" style="flex: 1;"></select>
+            <div class="input-group phase-override-price-group" style="flex: 1;">
+              <span class="input-group-text">$</span>
+              <input type="number" name="price_overrides[][price]" step="any" min="0" placeholder="0.00" class="form-control phase-override-price">
+            </div>
+            <button type="button" class="btn btn-outline-secondary phase-override-remove" style="padding: 6px 10px; flex-shrink: 0;" aria-label="Remove">
+              <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M13 3.66699L12.4093 13.4143C12.3666 14.1181 11.7834 14.667 11.0783 14.667H4.92164C4.21659 14.667 3.6334 14.1181 3.59075 13.4143L3 3.66699" stroke="#A4A7AE" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+                <path d="M2 3.66634H5.33333M5.33333 3.66634L6.16017 1.73706C6.26522 1.49194 6.50625 1.33301 6.77293 1.33301H9.22707C9.49373 1.33301 9.7348 1.49194 9.8398 1.73706L10.6667 3.66634M5.33333 3.66634H10.6667M14 3.66634H10.6667" stroke="#A4A7AE" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+                <path d="M6.33325 11V7" stroke="#A4A7AE" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+                <path d="M9.66675 11V7" stroke="#A4A7AE" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+              </svg>
+            </button>
+          </div>
+        </template>
       </div>
     </div>
     <div class="form-group d-flex pb-3 border-bottom mb-3">
@@ -123,5 +163,109 @@ $(document).ready(function() {
     $( "input[type=radio]").on("click", function() {
         onTypeChange();
     });
+    initPhaseOverrides();
 });
+
+function initPhaseOverrides() {
+    var planPhases = {};
+    try { planPhases = JSON.parse($('#plan_phases_data').text() || '{}'); } catch (e) { planPhases = {}; }
+
+    var $section = $('#phase_overrides_section');
+    var $rows = $('#phase_overrides_rows');
+    var $addBtn = $('#add_phase_override');
+    var $headers = $('#phase_overrides_headers');
+    var $template = $('#phase_override_row_template');
+    var $planSelect = $('select[name="plan_name"]');
+
+    function currentPhases() {
+      var phases = planPhases[$planSelect.val()] || [];
+      var seen = {};
+      return phases.filter(function(p) {
+        if (!p || !p.type || seen[p.type]) return false;
+        seen[p.type] = true;
+        return true;
+      });
+    }
+
+    function phaseLabel(p) {
+        var title = p.type.charAt(0) + p.type.slice(1).toLowerCase();
+        return p.priceLabel ? title + ' (' + p.priceLabel + ')' : title;
+    }
+
+    function selectedTypes($exceptRow) {
+        return $rows.find('.phase-override-row').filter(function() {
+            return !$exceptRow || this !== $exceptRow[0];
+        }).map(function() { return $(this).find('.phase-override-type').val(); }).get();
+    }
+
+    function refreshAddBtn() {
+        var phases = currentPhases();
+        var used = selectedTypes().filter(function(type) { return type; });
+        var hasMore = phases.length > 0 && used.length < phases.length;
+        if (hasMore) {
+            $addBtn.css('display', 'flex');
+        } else {
+            $addBtn.hide();
+        }
+        $headers.css('display', $rows.find('.phase-override-row').length > 0 ? 'flex' : 'none');
+    }
+
+    function rebuildRowOptions() {
+        var phases = currentPhases();
+        $rows.find('.phase-override-row').each(function() {
+            var $row = $(this);
+            var $select = $row.find('.phase-override-type');
+            var current = $select.val();
+            var used = selectedTypes($row);
+            $select.empty();
+            phases.forEach(function(p) {
+                if (used.indexOf(p.type) === -1) {
+                    $select.append($('<option>', { value: p.type, text: phaseLabel(p) }));
+                }
+            });
+            var currentStillValid = phases.some(function(p) { return p.type === current; }) && used.indexOf(current) === -1;
+            if (currentStillValid) $select.val(current);
+        });
+        refreshAddBtn();
+    }
+
+    function addRow(preferredType) {
+        var phases = currentPhases();
+        if (phases.length === 0) return;
+        var used = selectedTypes().filter(function(type) { return type; });
+        var next = preferredType && phases.some(function(p) { return p.type === preferredType; }) && used.indexOf(preferredType) === -1
+            ? preferredType
+            : (phases.find(function(p) { return used.indexOf(p.type) === -1; }) || {}).type;
+        if (!next) return;
+
+        var $row = $($template.html());
+        $rows.append($row);
+        rebuildRowOptions();
+        $row.find('.phase-override-type').val(next);
+        rebuildRowOptions();
+    }
+
+    function resetRows() {
+        $rows.empty();
+        var phases = currentPhases();
+        if (phases.length > 0) addRow(phases[0].type);
+        refreshAddBtn();
+    }
+
+    $('#toggle_phase_overrides').on('click', function() {
+        $section.toggle();
+        $('#toggle_phase_overrides_caret').html($section.is(':visible') ? '&#9662;' : '&#9656;');
+    });
+
+    $addBtn.on('click', function() { addRow(); });
+
+    $rows.on('change', '.phase-override-type', rebuildRowOptions);
+    $rows.on('click', '.phase-override-remove', function() {
+        $(this).closest('.phase-override-row').remove();
+        refreshAddBtn();
+    });
+
+    $planSelect.on('change', resetRows);
+    resetRows();
+}
 <% end %>

data/app/views/kaui/subscriptions/record_usage.erb

@@ -24,7 +24,13 @@
                 <div class="form-group d-flex pb-3">
                     <%= label_tag :unit_type, 'Unit Type', class: 'col-sm-3 control-label' %>
                     <div class="col-sm-9">
-                        <%= text_field_tag :unit_type, @unit_type, required: true, maxlength: 255, class: 'form-control', placeholder: 'e.g. api-calls' %>
+                        <% if @unit_types.length == 1 %>
+                            <%= text_field_tag :unit_type, @unit_types.first, readonly: true, required: true, class: 'form-control bg-light' %>
+                        <% elsif @unit_types.length > 1 %>
+                            <%= select_tag :unit_type, options_for_select(@unit_types.map { |u| [u, u] }, @unit_type.presence || @unit_types.first), required: true, class: 'form-control', title: (@unit_type.presence || @unit_types.first) %>
+                        <% else %>
+                            <%= text_field_tag :unit_type, @unit_type, required: true, maxlength: 255, class: 'form-control', placeholder: 'e.g. api-calls' %>
+                        <% end %>
                     </div>
                 </div>
 
@@ -38,12 +44,40 @@
                 <div class="form-group d-flex pb-3">
                     <%= label_tag :record_date, 'Date/Time of Usage', class: 'col-sm-3 control-label' %>
                     <div class="col-sm-9">
-                        <%= text_field_tag :record_date,
-                                           @record_date.presence || Time.now.utc.iso8601,
-                                           required: true,
-                                           class: 'form-control',
-                                           placeholder: 'YYYY-MM-DDTHH:MM:SSZ (ISO 8601)' %>
-                        <small class="form-text text-muted">ISO 8601 format, e.g. <code>2026-06-13T15:30:00Z</code></small>
+                                                <%
+                                                    record_date_value = @record_date.to_s.strip
+                                                    record_date_date_value = Time.now.utc.strftime('%Y-%m-%d')
+                                                    record_date_time_value = '00:00'
+
+                                                    begin
+                                                        if record_date_value.match?(/^\d{4}-\d{2}-\d{2}$/)
+                                                            record_date_date_value = record_date_value
+                                                        elsif record_date_value.match?(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/)
+                                                            record_date_date_value = record_date_value[0, 10]
+                                                            record_date_time_value = record_date_value[11, 5]
+                                                        elsif !record_date_value.empty?
+                                                            parsed_record_date = Time.iso8601(record_date_value).utc
+                                                            record_date_date_value = parsed_record_date.strftime('%Y-%m-%d')
+                                                            record_date_time_value = parsed_record_date.strftime('%H:%M')
+                                                        end
+                                                    rescue ArgumentError
+                                                        record_date_date_value = Time.now.utc.strftime('%Y-%m-%d')
+                                                        record_date_time_value = '00:00'
+                                                    end
+                                                %>
+
+                                                <div class="d-flex gap-2 align-items-center">
+                                                        <%= date_field_tag :record_date_date,
+                                                                                             record_date_date_value,
+                                                                                             required: true,
+                                                                                             class: 'form-control' %>
+                                                        <%= time_field_tag :record_date_time,
+                                                                                             record_date_time_value,
+                                                                                             step: 60,
+                                                                                             class: 'form-control' %>
+                                                </div>
+                                                <%= hidden_field_tag :record_date, "#{record_date_date_value}T#{record_date_time_value}" %>
+                                                <small class="form-text text-muted">Pick a date. Time is optional and defaults to 00:00 (UTC) if unchanged.</small>
                     </div>
                 </div>
 
@@ -54,20 +88,6 @@
                     </div>
                 </div>
 
-                <div class="form-group d-flex pb-3 border-bottom mb-3">
-                    <%= label_tag :reason, 'Reason', class: 'col-sm-3 control-label' %>
-                    <div class="col-sm-9">
-                        <%= text_field_tag :reason, params[:reason], class: 'form-control' %>
-                    </div>
-                </div>
-
-                <div class="form-group d-flex pb-3 border-bottom mb-3">
-                    <%= label_tag :comment, 'Comment', class: 'col-sm-3 control-label' %>
-                    <div class="col-sm-9">
-                        <%= text_field_tag :comment, params[:comment], class: 'form-control' %>
-                    </div>
-                </div>
-
                 <div class="form-group d-flex justify-content-end pb-3">
                     <%= render "kaui/components/button/button", {
                         label: 'Close',
@@ -95,10 +115,19 @@
   document.addEventListener('DOMContentLoaded', function () {
     var form = document.getElementById('record_usage_form');
     if (!form) { return; }
+        var unitTypeSelect = document.getElementById('unit_type');
+        if (unitTypeSelect && unitTypeSelect.tagName === 'SELECT') {
+            unitTypeSelect.title = unitTypeSelect.value || '';
+            unitTypeSelect.addEventListener('change', function () {
+                unitTypeSelect.title = unitTypeSelect.value || '';
+            });
+        }
+
     form.addEventListener('submit', function (e) {
       var errors = [];
 
-      var unitType = (document.getElementById('unit_type').value || '').trim();
+            var unitTypeEl = document.getElementById('unit_type');
+            var unitType = unitTypeEl ? (unitTypeEl.value || '').trim() : '';
       if (unitType.length === 0) {
         errors.push('Unit type is required.');
       }
@@ -109,12 +138,29 @@
         errors.push('Amount must be a positive integer.');
       }
 
-      var dateStr = (document.getElementById('record_date').value || '').trim();
-      // Permissive ISO 8601 check
-      var isoRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:?\d{2})?$/;
-      var parsed = Date.parse(dateStr);
-      if (dateStr.length === 0 || isNaN(parsed) || !isoRegex.test(dateStr)) {
-        errors.push('Date/time of usage must be a valid ISO 8601 timestamp (e.g. 2026-06-13T15:30:00Z).');
+            var dateEl = document.getElementById('record_date_date');
+            var timeEl = document.getElementById('record_date_time');
+            var hiddenDateEl = document.getElementById('record_date');
+
+            var datePart = dateEl ? (dateEl.value || '').trim() : '';
+            var timePart = timeEl ? (timeEl.value || '').trim() : '';
+            if (timePart.length === 0) {
+                timePart = '00:00';
+            }
+
+            var dateRegex = /^\d{4}-\d{2}-\d{2}$/;
+            var timeRegex = /^\d{2}:\d{2}$/;
+            if (datePart.length === 0) {
+                errors.push('Date/time of usage is required.');
+            } else if (!dateRegex.test(datePart)) {
+                errors.push('Date of usage must be in YYYY-MM-DD format.');
+            } else if (!timeRegex.test(timePart)) {
+                errors.push('Time must be in HH:MM format.');
+            } else {
+                var composedDateTime = datePart + 'T' + timePart;
+                if (hiddenDateEl) {
+                    hiddenDateEl.value = composedDateTime;
+                }
       }
 
       if (errors.length > 0) {

data/config/locales/en.yml

@@ -98,6 +98,7 @@ en:
       unable_to_connect_database: "Unable to connect to the database."
       unable_to_connect_killbill: "Unable to connect to the Kill Bill server."
       error_communicating_killbill: "Error while communicating with the Kill Bill server."
+      locale_required: "Please specify a Locale (e.g. en_US) for the translation file."
   views:
     subscriptions:
       requested_date_for_billing_notice: <ul>

data/config/routes.rb

@@ -202,6 +202,7 @@ Kaui::Engine.routes.draw do
     post '/modify_overdue_config' => 'admin_tenants#modify_overdue_config', :as => 'admin_tenant_modify_overdue_config'
     post '/upload_overdue_config' => 'admin_tenants#upload_overdue_config', :as => 'admin_tenant_upload_overdue_config'
     post '/upload_invoice_template' => 'admin_tenants#upload_invoice_template', :as => 'admin_tenant_upload_invoice_template'
+    get '/:id/invoice_template' => 'admin_tenants#invoice_template', :as => 'admin_tenant_invoice_template'
     post '/upload_invoice_translation' => 'admin_tenants#upload_invoice_translation', :as => 'admin_tenant_upload_invoice_translation'
     post '/upload_catalog_translation' => 'admin_tenants#upload_catalog_translation', :as => 'admin_tenant_upload_catalog_translation'
     post '/upload_plugin_config' => 'admin_tenants#upload_plugin_config', :as => 'admin_tenant_upload_plugin_config'

data/lib/kaui/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.18
+  version: 4.0.20
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-18 00:00:00.000000000 Z
+date: 2026-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack