From 0df6e87bb07cf81b3a0d6a9c0598a12a3dcbfb60 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 25 Aug 2024 15:56:13 +0300 Subject: [PATCH] improve CDR UI --- app/admin/cdr/cdrs.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/admin/cdr/cdrs.rb b/app/admin/cdr/cdrs.rb index aaa80934e..2ed325334 100644 --- a/app/admin/cdr/cdrs.rb +++ b/app/admin/cdr/cdrs.rb @@ -740,13 +740,12 @@ def scoped_collection end column :rateplan column :destination - column :destination_rate_policy, &:destination_rate_policy_name - column :destination_fee + column :rate_policy, &:destination_rate_policy_name - column('Destination rates', sortable: 'destination_next_rate') do |cdr| - "#{cdr.destination_initial_rate}/#{cdr.destination_next_rate}".chomp('/') + column('Dest. fee and rates', sortable: 'destination_next_rate') do |cdr| + "#{cdr.destination_fee} #{cdr.destination_initial_rate}/#{cdr.destination_next_rate}".chomp('/') end - column('Destination intervals', sortable: 'destination_next_interval') do |cdr| + column('Dest. intervals', sortable: 'destination_next_interval') do |cdr| "#{cdr.destination_initial_interval}/#{cdr.destination_next_interval}".chomp('/') end @@ -759,9 +758,8 @@ def scoped_collection column :routing_tags column :dialpeer - column :dialpeer_fee - column('Dialpeer rates', sortable: 'dialpeer_next_rate') do |cdr| - "#{cdr.dialpeer_initial_rate}/#{cdr.dialpeer_next_rate}".chomp('/') + column('Dialpeer fee and rates', sortable: 'dialpeer_next_rate') do |cdr| + "#{cdr.dialpeer_fee} #{cdr.dialpeer_initial_rate}/#{cdr.dialpeer_next_rate}".chomp('/') end column('Dialpeer intervals', sortable: 'dialpeer_next_interval') do |cdr| "#{cdr.dialpeer_initial_interval}/#{cdr.dialpeer_next_interval}".chomp('/') @@ -788,8 +786,9 @@ def scoped_collection column :p_charge_info_in - column :core_version - column :yeti_version + column :yeti_version do |cdr| + "#{cdr.core_version} #{cdr.yeti_version}" + end column :lega_user_agent column :legb_user_agent column :uuid