kaui 4.0.17 → 4.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98e5dfbab802d1505c3e5c5e85dcde9ee8c98724f35ad5a007acd2849f75eb6e
-  data.tar.gz: 5cdcd79cdc9a95951c09bed2b2cbda90f3fe750e59d2adb93e1b83196f0a91a9
+  metadata.gz: b226cddd4e3508c415761943d804cab4ff71e506eca8d8ffbe592fde0cbed193
+  data.tar.gz: 6b29cc16b8e32acc0fceca6f1444e3073e8bbe8cd29fbd59158c7edb05cf4796
 SHA512:
-  metadata.gz: fde50f9e9a89e44b0370a9c2b31713735fc3603accab084bede5bf03ca8586da3f12809be9cdf6a098d272ae02e5f7ee5a531d5cd056b5ed1820944f1fd72071
-  data.tar.gz: 4539ef5e1f52389fb34d1905e31fd58d3c4d9941dc491b0d79fe31db83c1b431fdb5268b6bbe47a652c1f15edb69d0d6e4012898a06f650dc5af516b1470c530
+  metadata.gz: b562deca64d70f1fe3323cedd752ed20fe00202ea56e248873aeb11672a3128c45b809ff7138395dc04d301b2b35fc07b8191e0d6e653423eb18176131e3b7d2
+  data.tar.gz: 276b11b5364329227e3be9d0b121500350ced30662505dccea557c7084eaccb91508401b73c7bf1ae80e92cec06d630ee0fab7f9bbfc1c17cbead743d2b2efa1

data/app/assets/javascripts/kaui/kaui_override.js

@@ -392,69 +392,12 @@ function isBlank(value) {
 //      data-id = content of the popover,object id; required
 //      title = title of the popover; not required
 //      id = (must be {{id}}-popover) used to close popover when the copy image is clicked; if present; if not present a timeout of 5s will apply; not required
+//
+// Deprecated: the underlying Bootstrap 4 popover('destroy') API was removed in
+// Bootstrap 5 and this implementation has been superseded by setObjectIdTooltip().
+// Kept as a thin shim so existing call sites continue to work.
 function setObjectIdPopover(){
-    $(".object-id-popover").each(function(idx, e){
-        $(this).popover('destroy');
-        $(this).off("shown.bs.popover");
-        $(this).data("index", idx);
-
-        $(this).popover({
-            html: true,
-            content: function() {
-                var template = '<div class="{{id}}-content" >' +
-                    '{{id}}&emsp;<i id="{{id}}-copy" class="fa fa-clipboard copy-icon" aria-hidden="true"></i> ' +
-                    '</div>';
-
-                var popover_html = Mustache.render( template , { id: $(this).data("id") });
-                return popover_html;
-            },
-            container: 'body',
-            trigger: 'hover',
-            delay: { "show": 100, "hide": 4000 }
-        });
-
-        $(this).on("show.bs.popover", function(e) {
-            var currentPopoverIndex = $(this).data('index');
-            $(".object-id-popover").each(function(idx, e){
-                var index = $(this).data('index');
-
-                if (currentPopoverIndex != index) {
-                    $(this).popover('hide');
-                }
-            });
-        });
-
-        $(this).on("shown.bs.popover", function(e) {
-            var objectId = $(this).data('id');
-            var copyIdImg = $("#" + objectId + "-copy");
-
-            copyIdImg.data("popover",$(this).attr("id"));
-            copyIdImg.click(function(e){
-                var id = ($(this).attr("id")).replace('-copy','');
-                navigator.clipboard.writeText(id);
-                ajaxInfoAlert("Id [" + id + "] was copied into the clipboard!", 4000);
-
-                if (!isBlank(popover)) {
-                    popover.popover('hide');
-                }
-
-            });
-
-        });
-
-    });
-
-    // close all object id popover on modal show
-    $(".modal").on('show.bs.modal',function(e){
-        $(".object-id-popover").each(function(idx, e) {
-            $(this).popover('destroy');
-        });
-    });
-
-    // check if object id must be restored
-    $(".modal").on('hide.bs.modal',function(e){
-        setObjectIdPopover();
-    });
+    setObjectIdTooltip();
 }
 
 // Custom tooltip function for object IDs

data/app/controllers/kaui/subscriptions_controller.rb

@@ -158,11 +158,114 @@ module Kaui
       redirect_to kaui_engine.account_bundles_path(input_subscription['account_id']), notice: 'Subscription BCD was successfully changed'
     end
 
+    def edit_quantity
+      @subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
+    end
+
+    def update_quantity
+      id = params.require(:id)
+      input_subscription = params.require(:subscription)
+
+      quantity_raw = input_subscription['quantity'].to_s.strip
+      quantity = Integer(quantity_raw, exception: false)
+      if quantity.nil? || quantity <= 0
+        flash.now[:error] = 'Quantity must be a positive integer'
+        @subscription = Kaui::Subscription.find_by_id(id, 'NONE', options_for_klient)
+        @subscription.quantity = quantity_raw
+        render :edit_quantity and return
+      end
+
+      subscription = Kaui::Subscription.new
+      subscription.subscription_id = id
+      subscription.quantity = quantity
+
+      effective_from_date = params['effective_from_date']
+
+      subscription.update_quantity(current_user.kb_username, params[:reason], params[:comment], effective_from_date, nil, options_for_klient)
+      redirect_to kaui_engine.account_bundles_path(input_subscription['account_id']), notice: 'Subscription quantity was successfully changed'
+    rescue ActionController::ParameterMissing
+      redirect_to kaui_engine.edit_quantity_path(params[:id]), flash: { error: 'Required parameter missing: subscription' }
+    end
+
+    def record_usage
+      @subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
+    end
+
+    def create_usage
+      subscription_id = params.require(:id)
+      unit_type = params[:unit_type].to_s.strip
+      amount_raw = params[:amount].to_s.strip
+      record_date = params[:record_date].to_s.strip
+
+      # Input validation
+      errors = []
+      errors << 'Unit type is required' if unit_type.blank?
+      errors << 'Amount is required' if amount_raw.blank?
+      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?
+
+      if errors.any?
+        flash.now[:error] = errors.join('. ')
+        @subscription = Kaui::Subscription.find_by_id(subscription_id, 'NONE', options_for_klient)
+        @unit_type = unit_type
+        @amount = amount_raw
+        @record_date = record_date
+        @tracking_id = params[:tracking_id]
+        render :record_usage and return
+      end
+
+      begin
+        usage_record = KillBillClient::Model::UsageRecordAttributes.new
+        usage_record.record_date = parsed_date.utc.iso8601
+        usage_record.amount = amount
+
+        unit_usage_record = KillBillClient::Model::UnitUsageRecordAttributes.new
+        unit_usage_record.unit_type = unit_type
+        unit_usage_record.usage_records = [usage_record]
+
+        usage = Kaui::Usage.new
+        usage.subscription_id = subscription_id
+        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)
+
+        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'
+      rescue StandardError => e
+        Rails.logger.error("Failed to record usage for subscription #{subscription_id}: #{e.class}: #{e.message}")
+        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_type = unit_type
+        @amount = amount_raw
+        @record_date = record_date
+        @tracking_id = params[:tracking_id]
+        render :record_usage
+      end
+    end
+
     def restful_show
       subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
       redirect_to kaui_engine.account_bundles_path(subscription.account_id)
     end
 
+    def show_json
+      raw_body = Kaui::Subscription.find_raw_by_id(params.require(:id), 'NONE', options_for_klient)
+      render body: raw_body, content_type: 'application/json'
+    rescue KillBillClient::API::ResponseError => e
+      render body: e.response.body, content_type: 'application/json', status: e.code
+    rescue StandardError => e
+      render json: { error: e.message }, status: :internal_server_error
+    end
+
     def validate_bundle_external_key
       json_response do
         external_key = params.require(:external_key)

data/app/helpers/kaui/subscription_helper.rb

@@ -189,6 +189,34 @@ module Kaui
       sub.present? and sub.billing_end_date.present?
     end
 
+    def subscription_has_usage?(sub, catalog = nil)
+      return false if sub.blank?
+
+      # First try the subscription's resolved per-phase prices
+      # (populated by GET /subscriptions/{id} but not by the bundles listing endpoint).
+      (sub.prices || []).each do |phase_price|
+        usage_prices = if phase_price.is_a?(Hash)
+                         phase_price['usagePrices'] || phase_price[:usagePrices] ||
+                           phase_price['usage_prices'] || phase_price[:usage_prices]
+                       elsif phase_price.respond_to?(:usage_prices)
+                         phase_price.usage_prices
+                       end
+        return true if usage_prices.present?
+      end
+
+      # Fall back to the catalog plan definition
+      return false if catalog.blank? || sub.plan_name.blank?
+
+      product = catalog.products&.find { |p| p.name == sub.product_name }
+      plan = product&.plans&.find { |p| p.name == sub.plan_name }
+      return false if plan.nil?
+
+      (plan.phases || []).any? do |phase|
+        usages = phase.respond_to?(:usages) ? phase.usages : nil
+        usages.present?
+      end
+    end
+
     def paging_button_class(num, current_page)
       num == current_page ? 'btn btn-primary' : 'btn btn-custom'
     end

data/app/models/kaui/usage.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Kaui
+  class Usage < KillBillClient::Model::UsageRecord
+  end
+end

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

@@ -20,7 +20,7 @@
       style="min-width: 6.25rem; display: none;">
     <% menu_items&.each do |item| %>
       <li>
-        <%= link_to item[:path], class: "dropdown-item d-flex align-items-center gap-2" do %>
+        <%= link_to item[:path], class: "dropdown-item d-flex align-items-center gap-2", data: (item[:data] || {}), method: item[:method] do %>
           <%= image_tag(item[:icon], alt: "#{item[:label]} Icon", size: "16x16") if item[:icon].present? %>
           <span class="text-black-700 fs-6 text-normal" style="font-weight: 500; font-size: 0.875rem !important; line-height: 1.25rem;"><%= item[:label] %></span>
         <% end %>

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

@@ -111,8 +111,26 @@
           </span>
         </td>
         <td><span class="phase-type"><%= humanized_subscription_phase_type(sub).downcase %></span></td>
-        <td><%= humanized_subscription_start_date(sub, account) %></td>
-        <td><%= humanized_subscription_cancelled_information(sub, account) %></td>
+        <td>
+          <% if sub.start_date.present? %>
+            <span class="object-id-popover" data-id="<%= sub.start_date %>" data-title="Start Date (ISO)">
+              <%= humanized_subscription_start_date(sub, account) %>
+            </span>
+          <% end %>
+        </td>
+        <td>
+          <% if sub.cancelled_date.present? %>
+            <span class="object-id-popover" data-id="<%= sub.cancelled_date %>" data-title="Entitlement Date (ISO)">
+              <%= humanized_subscription_cancelled_date(sub, account) %>
+            </span>
+            <% if sub.billing_end_date.present? %>
+              <br>
+              <span class="object-id-popover" data-id="<%= sub.billing_end_date %>" data-title="Billing End Date (ISO)">
+                <%= humanized_subscription_billing_end_date(sub, account) %>
+              </span>
+            <% end %>
+          <% end %>
+        </td>
         <td><%= humanized_subscription_charged_through_date(sub, account) %></td>
         <td><%= sub.quantity || 1 %></td>
         <td class="text-center">
@@ -141,9 +159,9 @@
                 </div>
               <% end %>
 
-              <% if can?(:create, Kaui::Subscription) || can?(:pause_resume, Kaui::Subscription) || can?(:change_plan, Kaui::Subscription) || can?(:transfer, Kaui::Bundle) %>
-                <% menu_items = [] %>
+              <% menu_items = [] %>
 
+              <% if can?(:create, Kaui::Subscription) || can?(:pause_resume, Kaui::Subscription) || can?(:change_plan, Kaui::Subscription) || can?(:transfer, Kaui::Bundle) || (can?(:record, Kaui::Usage) && subscription_has_usage?(sub, catalog_for_subscription(sub, catalogs))) %>
                 <% if can?(:change_plan, Kaui::Subscription) %>
                   <% menu_items << {
                     label: "Change Plan",
@@ -183,6 +201,22 @@
                   } %>
                 <% end %>
 
+                <% if can?(:create, Kaui::Subscription) %>
+                  <% menu_items << {
+                    label: "Update Quantity",
+                    path: kaui_engine.edit_quantity_path(id: sub.subscription_id),
+                    icon: "kaui/subscription/change.svg"
+                  } %>
+                <% end %>
+
+                <% if can?(:record, Kaui::Usage) && subscription_has_usage?(sub, catalog_for_subscription(sub, catalogs)) %>
+                  <% menu_items << {
+                    label: "Record Usage",
+                    path: kaui_engine.record_usage_path(id: sub.subscription_id),
+                    icon: "kaui/subscription/change.svg"
+                  } %>
+                <% end %>
+
                 <% if can?(:transfer, Kaui::Bundle) && sub.product_category != 'ADD_ON' %>
                   <% menu_items << {
                     label: I18n.translate('transfer'),
@@ -190,7 +224,18 @@
                     icon: "kaui/subscription/transfer.svg"
                   } %>
                 <% end %>
+              <% end %>
+
+              <% if can?(:read, Kaui::Subscription) %>
+                <% menu_items << {
+                  label: "View JSON",
+                  path: "#view_subscription_json_modal",
+                  icon: "kaui/view-doc.svg",
+                  data: { bs_toggle: 'modal', id: sub.subscription_id }
+                } %>
+              <% end %>
 
+              <% if menu_items.any? %>
                 <%= render partial: "kaui/components/menu_dropdown/menu_dropdown", locals: {
                     variant: "btn-light",
                     label: "",
@@ -210,6 +255,7 @@
 </table>
 
 <%= render :partial => 'kaui/subscriptions/cancel_by_date_modal' %>
+<%= render :partial => 'kaui/subscriptions/view_json_modal' %>
 
 <%= javascript_tag do %>
   $(document).ready(function() {

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

@@ -0,0 +1,100 @@
+<div class="modal fade view_subscription_json_modal" id="view_subscription_json_modal" tabindex="-1" role="dialog" aria-labelledby="viewSubscriptionJsonLabel" aria-hidden="true">
+  <div class="modal-dialog modal-lg modal-dialog-scrollable" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title d-flex align-items-center gap-3" id="viewSubscriptionJsonLabel">
+          <span class="icon-container">
+            <%= image_tag("kaui/view-doc.svg", width: 20, height: 20) %>
+          </span>
+          Subscription JSON
+        </h5>
+        <button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">
+            <%= image_tag("kaui/modal/close.svg", width: 20, height: 20) %>
+          </span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div id="view_subscription_json_loading">Loading...</div>
+        <div id="view_subscription_json_error" class="text-danger" style="display: none;"></div>
+        <pre id="view_subscription_json_content" style="display: none; max-height: 60vh; overflow: auto; background-color: #f8f9fa; padding: 1rem; border-radius: 0.375rem; font-size: 0.8125rem; line-height: 1.4;"></pre>
+      </div>
+      <div class="modal-footer">
+        <%= 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",
+          html_options: {
+            data: {
+              bs_dismiss: "modal"
+            }
+          }
+        } %>
+        <%= render "kaui/components/button/button", {
+          label: 'Copy JSON',
+          variant: "outline-secondary d-inline-flex align-items-center gap-1",
+          type: "button",
+          html_class: "kaui-dropdown custom-hover",
+          html_options: {
+            id: "copy_subscription_json_btn"
+          }
+        } %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    var $modal = $('#view_subscription_json_modal');
+    if (!$modal.length) return;
+
+    $modal.on('show.bs.modal', function (e) {
+      var subId = e.relatedTarget && e.relatedTarget.dataset ? e.relatedTarget.dataset['id'] : null;
+      var $loading = $('#view_subscription_json_loading');
+      var $error = $('#view_subscription_json_error');
+      var $content = $('#view_subscription_json_content');
+
+      $loading.show();
+      $error.hide().text('');
+      $content.hide().text('');
+
+      if (!subId) {
+        $loading.hide();
+        $error.text('Missing subscription id').show();
+        return;
+      }
+
+      $.ajax({
+        url: Routes.kaui_engine_show_subscription_json_path(subId),
+        type: 'GET',
+        dataType: 'json'
+      })
+      .done(function (data) {
+        $content.text(JSON.stringify(data, null, 2)).show();
+        $loading.hide();
+      })
+      .fail(function (xhr) {
+        $loading.hide();
+        var message = 'Failed to load subscription JSON';
+        if (xhr && xhr.responseText) {
+          message += ': ' + xhr.responseText;
+        }
+        $error.text(message).show();
+      });
+    });
+
+    $('#copy_subscription_json_btn').on('click', function () {
+      var text = $('#view_subscription_json_content').text();
+      if (!text) return;
+      if (navigator.clipboard && navigator.clipboard.writeText) {
+        navigator.clipboard.writeText(text).then(function () {
+          if (typeof ajaxInfoAlert === 'function') {
+            ajaxInfoAlert('JSON copied to clipboard!', 3000);
+          }
+        });
+      }
+    });
+  });
+<% end %>

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

@@ -0,0 +1,59 @@
+<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="M9.16675 11.6665H13.3334M6.66675 11.6665H6.67423M10.8334 14.9998H6.66675M13.3334 14.9998H13.3259" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                      <path d="M13.75 1.6665V4.99984M6.25 1.6665V4.99984" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                      <path d="M15.8333 3.3335H4.16667C3.24619 3.3335 2.5 4.07969 2.5 5.00016V16.6668C2.5 17.5873 3.24619 18.3335 4.16667 18.3335H15.8333C16.7538 18.3335 17.5 17.5873 17.5 16.6668V5.00016C17.5 4.07969 16.7538 3.3335 15.8333 3.3335Z" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                      <path d="M2.5 8.3335H17.5" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                    </svg>
+                </span>
+                Update Subscription Quantity
+            </h5>
+            <%= form_for @subscription, :as => :subscription, :url => update_quantity_path(@subscription.subscription_id), :html => {:method => :put, :class => 'form-horizontal'} do |f| %>
+                <%= f.hidden_field :account_id %>
+
+                <div class="form-group d-flex pb-3">
+                    <%= f.label :quantity, 'Quantity', :class => 'col-sm-3 control-label' %>
+                    <div class="col-sm-9">
+                        <%= f.number_field :quantity, { :min => 1, :required => true, :class => 'form-control'} %>
+                    </div>
+                </div>
+                <div class="form-group d-flex pb-3 border-bottom mb-3" id="form_effective_from_date">
+                    <%= label_tag :effective_from_date, 'Effective Date', :class => 'col-sm-3 control-label' %>
+                    <div class="col-sm-9">
+                        <div class="custom-date-input-wrapper kaui-button custom-hover">
+                            <svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M14.9167 12.5V18.3333M17.8333 15.4167H12" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                                <path d="M14.0833 1.66675V5.00008M6.58325 1.66675V5.00008" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                                <path d="M17.8333 10.8333V4.99992C17.8333 4.07944 17.0871 3.33325 16.1666 3.33325H4.49992C3.57944 3.33325 2.83325 4.07944 2.83325 4.99992V16.6666C2.83325 17.5871 3.57944 18.3333 4.49992 18.3333H10.3333" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                                <path d="M2.83325 8.33325H17.8333" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                            <input class="form-control" value="<%= Time.zone.today.strftime('%Y-%m-%d') %>" id="effective_from_date" name="effective_from_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true">
+                        </div>
+                    </div>
+                </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: 'Save Subscription',
+                        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/subscriptions/record_usage.erb

@@ -0,0 +1,126 @@
+<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="M9.16675 11.6665H13.3334M6.66675 11.6665H6.67423M10.8334 14.9998H6.66675M13.3334 14.9998H13.3259" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                      <path d="M13.75 1.6665V4.99984M6.25 1.6665V4.99984" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                      <path d="M15.8333 3.3335H4.16667C3.24619 3.3335 2.5 4.07969 2.5 5.00016V16.6668C2.5 17.5873 3.24619 18.3335 4.16667 18.3335H15.8333C16.7538 18.3335 17.5 17.5873 17.5 16.6668V5.00016C17.5 4.07969 16.7538 3.3335 15.8333 3.3335Z" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                      <path d="M2.5 8.3335H17.5" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+                    </svg>
+                </span>
+                Record Usage
+            </h5>
+
+            <p class="text-muted small mb-3">
+                Record usage for subscription
+                <strong><%= @subscription.plan_name %></strong>
+                (<code><%= @subscription.subscription_id %></code>).
+            </p>
+
+            <%= form_tag create_usage_path(@subscription.subscription_id), method: :post, id: 'record_usage_form', class: 'form-horizontal' do %>
+
+                <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' %>
+                    </div>
+                </div>
+
+                <div class="form-group d-flex pb-3">
+                    <%= label_tag :amount, 'Amount', class: 'col-sm-3 control-label' %>
+                    <div class="col-sm-9">
+                        <%= number_field_tag :amount, @amount, required: true, min: 1, step: 1, class: 'form-control', placeholder: 'Positive integer' %>
+                    </div>
+                </div>
+
+                <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>
+                    </div>
+                </div>
+
+                <div class="form-group d-flex pb-3">
+                    <%= label_tag :tracking_id, 'Tracking ID', class: 'col-sm-3 control-label' %>
+                    <div class="col-sm-9">
+                        <%= text_field_tag :tracking_id, @tracking_id, maxlength: 255, class: 'form-control', placeholder: 'Optional, used for idempotency' %>
+                    </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',
+                        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: 'Record Usage',
+                        variant: "outline-secondary d-inline-flex align-items-center gap-1",
+                        type: "submit",
+                        html_class: "kaui-dropdown custom-hover"
+                    } %>
+                </div>
+            <% end %>
+        </div>
+    </div>
+</div>
+
+<%= javascript_tag do %>
+  document.addEventListener('DOMContentLoaded', function () {
+    var form = document.getElementById('record_usage_form');
+    if (!form) { return; }
+    form.addEventListener('submit', function (e) {
+      var errors = [];
+
+      var unitType = (document.getElementById('unit_type').value || '').trim();
+      if (unitType.length === 0) {
+        errors.push('Unit type is required.');
+      }
+
+      var amountStr = (document.getElementById('amount').value || '').trim();
+      var amount = parseInt(amountStr, 10);
+      if (amountStr.length === 0 || isNaN(amount) || amount <= 0 || String(amount) !== amountStr) {
+        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).');
+      }
+
+      if (errors.length > 0) {
+        e.preventDefault();
+        alert(errors.join('\n'));
+      }
+    });
+  });
+<% end %>

data/config/routes.rb

@@ -141,7 +141,12 @@ Kaui::Engine.routes.draw do
     post '/:id/tags' => 'subscriptions#update_tags', :as => 'update_subscriptions_tags'
     get '/:id/edit_bcd' => 'subscriptions#edit_bcd', :as => 'edit_bcd'
     put '/:id/update_bcd' => 'subscriptions#update_bcd', :as => 'update_bcd'
+    get '/:id/edit_quantity' => 'subscriptions#edit_quantity', :as => 'edit_quantity'
+    put '/:id/update_quantity' => 'subscriptions#update_quantity', :as => 'update_quantity'
+    get '/:id/record_usage' => 'subscriptions#record_usage', :as => 'record_usage'
+    post '/:id/record_usage' => 'subscriptions#create_usage', :as => 'create_usage'
     put '/:id/reinstate' => 'subscriptions#reinstate', :as => 'reinstate'
+    get '/:id/show_json' => 'subscriptions#show_json', :as => 'show_subscription_json'
     get '/validate_external_key' => 'subscriptions#validate_external_key', :as => 'subscriptions_validate_external_key'
     get '/validate_bundle_external_key' => 'subscriptions#validate_bundle_external_key', :as => 'subscriptions_validate_bundle_external_key'
   end

data/lib/kaui/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.17
+  version: 4.0.18
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-03 00:00:00.000000000 Z
+date: 2026-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -507,6 +507,7 @@ files:
 - app/models/kaui/tag_definition.rb
 - app/models/kaui/tenant.rb
 - app/models/kaui/transaction.rb
+- app/models/kaui/usage.rb
 - app/models/kaui/user.rb
 - app/models/kaui/user_role.rb
 - app/services/dependencies/kenui.rb
@@ -649,9 +650,12 @@ files:
 - app/views/kaui/subscriptions/_edit_form.html.erb
 - app/views/kaui/subscriptions/_form.html.erb
 - app/views/kaui/subscriptions/_subscriptions_table.html.erb
+- app/views/kaui/subscriptions/_view_json_modal.html.erb
 - app/views/kaui/subscriptions/edit.html.erb
 - app/views/kaui/subscriptions/edit_bcd.erb
+- app/views/kaui/subscriptions/edit_quantity.erb
 - app/views/kaui/subscriptions/new.html.erb
+- app/views/kaui/subscriptions/record_usage.erb
 - app/views/kaui/tag_definitions/_form.html.erb
 - app/views/kaui/tag_definitions/index.html.erb
 - app/views/kaui/tag_definitions/new.html.erb