-
Details
-
- <%= event.phase %>
-
+ <% if event.event_type == 'SERVICE_STATE_CHANGE' %>
+
+
+ <% if event.effective_date.present? %>
+ <%= format_date(event.effective_date, @account.time_zone).html_safe %>
+ <% else %>
+ [unknown]
+ <% end %>
+
+
+
+ <%= image_tag("kaui/timeline/block.svg", width: 20, height: 20) %>
+
+
+
+
BLOCKING STATE
+
+
+
+
+
Service / State
+
+ <%= event.service_name %> / <%= event.service_state_name %>
+
+
-
-
-
-
-
Bundle
-
- <%= truncate_uuid(@bundle_names[bundle.external_key]) %>
-
+
+
+
Blocked
+
+ <%= 'Billing' if event.is_blocked_billing %>
+ <%= 'Entitlement' if event.is_blocked_entitlement %>
+
+
+
+
Bundle
+
+ <%= truncate_uuid(@bundle_names[bundle.external_key]) %>
+
+
+
+
+
+
Reason Code / Comments
+
+ <% if event.audit_logs.present? %>
+ <% event.audit_logs.each do |entry| %>
+ <%= Kaui::AuditLog.description(entry) %>
+ <% end %>
+ <% end %>
+
+
-
-
-
Reason Code / Comments
-
- <% if event.audit_logs.present? %>
- <% event.audit_logs.each do |entry| %>
- <%= Kaui::AuditLog.description(entry) %>
+
+
+
+
+ <% else %>
+ <% event_category = %w[START_BILLING PAUSE_BILLING RESUME_BILLING STOP_BILLING].include?(event.event_type) ? 'billing' : 'subscription' %>
+
+
+ <% if event.effective_date.present? %>
+ <%= format_date(event.effective_date, @account.time_zone).html_safe %>
+ <% else %>
+ [unknown]
+ <% end %>
+
+
+
+ <%= image_tag("kaui/timeline/invoice.svg", width: 20, height: 20) %>
+
+
+
+
<%= event.event_type %>
+
+
+
+
+
Details
+
+ <% if event.is_blocked_billing || event.is_blocked_entitlement %>
+ <%= event.service_name %> / <%= event.service_state_name %>
<% end %>
- <% end %>
-
+ <%= event.phase %>
+
+
+
+
+
+
+
Bundle
+
+ <%= truncate_uuid(@bundle_names[bundle.external_key]) %>
+
+
+
+
+
+
Reason Code / Comments
+
+ <% if event.audit_logs.present? %>
+ <% event.audit_logs.each do |entry| %>
+ <%= Kaui::AuditLog.description(entry) %>
+ <% end %>
+ <% end %>
+
+
-
+ <% end %>
<% end %>
<% end %>
<% end %>
+
+ <% (@account_blocking_states || []).each do |blocking_state| %>
+
+
+ <% if blocking_state.effective_date.present? %>
+ <%= format_date(blocking_state.effective_date, @account.time_zone).html_safe %>
+ <% else %>
+ [unknown]
+ <% end %>
+
+
+
+ <%= image_tag("kaui/timeline/block.svg", width: 20, height: 20) %>
+
+
+
+
BLOCKING STATE
+
+
+
+
+
Service / State
+
+ <%= blocking_state.service %> / <%= blocking_state.state_name %>
+
+
+
+
+
+
Blocked
+
+ <%= 'Change' if blocking_state.is_block_change %>
+ <%= 'Billing' if blocking_state.is_block_billing %>
+ <%= 'Entitlement' if blocking_state.is_block_entitlement %>
+
+
+
+
+
+
Reason Code / Comments
+
+ <% if blocking_state.audit_logs.present? %>
+ <% blocking_state.audit_logs.each do |entry| %>
+ <%= Kaui::AuditLog.description(entry) %>
+ <% end %>
+ <% end %>
+
+
+
+
+
+
+
+
+ <% end %>
<% end %>
@@ -305,7 +422,7 @@
}
var eventsOrder = ["START_ENTITLEMENT", "START_BILLING", "PAUSE_ENTITLEMENT", "PAUSE_BILLING", "RESUME_ENTITLEMENT",
- "RESUME_BILLING", "PHASE", "CHANGE", "STOP_ENTITLEMENT", "STOP_BILLING", "INVOICE", "AUTHORIZE", "PURCHASE", "CAPTURE",
+ "RESUME_BILLING", "PHASE", "CHANGE", "STOP_ENTITLEMENT", "STOP_BILLING", "SERVICE_STATE_CHANGE", "INVOICE", "AUTHORIZE", "PURCHASE", "CAPTURE",
"CREDIT", "REFUND", "VOID", "CHARGEBACK"];
jQuery.fn.dataTableExt.oSort['timeline-event-asc'] = function(e1,e2) {
@@ -359,92 +476,95 @@
});
}
- var originalTimelineEntriesOrder = null;
-
- function sortTimelineEntries(sortByDate) {
+ function sortTimelineEntries() {
var $container = $('#timeline-entries');
var $entries = $container.children('[data-event-type]');
- if (originalTimelineEntriesOrder === null) {
- // Cache the initial (grouped-by-object-type) DOM order the first time we need it
- originalTimelineEntriesOrder = $entries.get();
- }
-
- var orderedEntries;
- if (sortByDate) {
- orderedEntries = $entries.get().sort(function (a, b) {
- var x = parseInt($(a).attr('data-timestamp'), 10);
- var y = parseInt($(b).attr('data-timestamp'), 10);
- x = isNaN(x) ? -Infinity : x;
- y = isNaN(y) ? -Infinity : y;
- // Most recent first; entries without a usable timestamp sort last
+ var orderedEntries = $entries.get().sort(function (a, b) {
+ var x = parseInt($(a).attr('data-timestamp'), 10);
+ var y = parseInt($(b).attr('data-timestamp'), 10);
+ x = isNaN(x) ? -Infinity : x;
+ y = isNaN(y) ? -Infinity : y;
+ if (y !== x) {
return y - x;
- });
- } else {
- orderedEntries = originalTimelineEntriesOrder;
- }
+ }
+ var typeX = eventsOrder.indexOf($(a).attr('data-event-type'));
+ var typeY = eventsOrder.indexOf($(b).attr('data-event-type'));
+ typeX = typeX === -1 ? Infinity : typeX;
+ typeY = typeY === -1 ? Infinity : typeY;
+ return typeX - typeY;
+ });
$.each(orderedEntries, function (_, entry) {
$container.append(entry);
});
- // Re-apply any active filters, since the DOM order just changed
filterTimeline();
}
function filterTimeline() {
var selectedBundle = $("#bundles").val();
- var selectedPayment = $('#payment_filter').val().toUpperCase();
- var selectedSubscription = $('#subscription_filter').val().toUpperCase();
- var selectedBilling = $('#billing_filter').val().toUpperCase();
var searchQuery = $('#search').val().toLowerCase();
-
- // Show all cards initially
- $('.account-timeline-card').parent().show();
-
- // Apply all filters to each card
+ var blockingStateFilter = $('#blocking_state_filter').val().toUpperCase();
+
+ var categoryFilters = {
+ payment: { value: $('#payment_filter').val().toUpperCase(), categories: ['payment'] },
+ subscription: { value: $('#subscription_filter').val().toUpperCase(), categories: ['subscription'] },
+ billing: { value: $('#billing_filter').val().toUpperCase(), categories: ['billing', 'invoice'] }
+ };
+
$('.account-timeline-card').parent().each(function() {
var $card = $(this);
- var eventType = $card.data('event-type');
+ var eventType = ($card.attr('data-event-type') || '').toUpperCase();
+ var eventCategory = $card.attr('data-event-category') || '';
var bundleTitle = $card.attr('title');
var cardText = $card.text().toLowerCase();
-
+
var shouldShow = true;
-
+
if (selectedBundle && selectedBundle !== '' && selectedBundle !== 'All') {
if (!bundleTitle || bundleTitle.indexOf(selectedBundle) === -1) {
shouldShow = false;
}
}
-
- // Filter by payment events if not "ALL"
- if (selectedPayment !== "ALL" && shouldShow) {
- if (!eventType || eventType !== selectedPayment) {
- shouldShow = false;
- }
- }
-
- // Filter by subscription events if not "ALL"
- if (selectedSubscription !== "ALL" && shouldShow) {
- if (!eventType || eventType !== selectedSubscription) {
- shouldShow = false;
- }
- }
-
- // Filter by billing events if not "ALL"
- if (selectedBilling !== "ALL" && shouldShow) {
- if (!eventType || eventType !== selectedBilling) {
- shouldShow = false;
+
+ if (shouldShow) {
+ if (blockingStateFilter === 'NONE') {
+ if (eventCategory === 'blocking_state') {
+ shouldShow = false;
+ }
+ } else if (blockingStateFilter !== 'ALL') {
+ // Specific type selected: show only events matching that exact type
+ if (eventType !== blockingStateFilter) {
+ shouldShow = false;
+ }
+ } else {
+ // Blocking state filter is ALL — apply per-category filters
+ var governingFilter = null;
+ $.each(categoryFilters, function(_, f) {
+ if (f.categories.indexOf(eventCategory) !== -1) {
+ governingFilter = f;
+ }
+ });
+ if (governingFilter) {
+ if (governingFilter.value === 'NONE') {
+ shouldShow = false;
+ } else if (governingFilter.value !== 'ALL') {
+ if (eventType !== governingFilter.value) {
+ shouldShow = false;
+ }
+ }
+ }
}
}
-
+
// Apply search filter if query exists
if (searchQuery && shouldShow) {
if (cardText.indexOf(searchQuery) === -1) {
shouldShow = false;
}
}
-
+
// Show or hide the card based on all filters
if (shouldShow) {
$card.show();
@@ -456,22 +576,15 @@
$(document).ready(function() {
disableLinks();
-
+
// Initialize filters with debounce for search
var searchTimeout;
- $("#bundles, #payment_filter, #subscription_filter, #billing_filter").on('change', filterTimeline);
+ $("#bundles, #payment_filter, #subscription_filter, #billing_filter, #blocking_state_filter").on('change', filterTimeline);
$('#search').on('keyup', function() {
clearTimeout(searchTimeout);
searchTimeout = setTimeout(filterTimeline, 300);
});
- $('#group-by').on('change', function() {
- sortTimelineEntries($(this).val() === 'date');
- });
-
-
-
-
// Clear all filters button
$('#clear-all-filters').click(function() {
$('#search').val('');
@@ -479,10 +592,11 @@
$('#payment_filter').val('all');
$('#subscription_filter').val('all');
$('#billing_filter').val('all');
+ $('#blocking_state_filter').val('all');
filterTimeline();
});
-
- // Apply initial filters if any are selected
- filterTimeline();
+
+ // Sort by date first, event type second, then apply filters
+ sortTimelineEntries();
});
<% end %>
\ No newline at end of file
diff --git a/app/views/kaui/accounts/_billing_details.html.erb b/app/views/kaui/accounts/_billing_details.html.erb
index 7de9572a1..626237cbb 100644
--- a/app/views/kaui/accounts/_billing_details.html.erb
+++ b/app/views/kaui/accounts/_billing_details.html.erb
@@ -3,7 +3,7 @@