Currency2 (#1983)

* currencies step2

Author: dmitry-sinina

TODO.md

@@ -0,0 +1,14 @@
+# TODO
+
+## Rate Management Project form - nullable boolean fields with include_blank: false
+
+`app/admin/rate_management/projects.rb` has `include_blank: false` on:
+- `reverse_billing` — nullable in DB (`default(FALSE)`, no NOT NULL constraint)
+- `routing_tag_mode_id` — nullable in DB (`default(0)`, no NOT NULL constraint), validation uses `allow_nil: true`
+
+Check whether these fields should actually allow nil (user should be able to clear them),
+in which case `include_blank: false` is wrong and should be removed.
+
+Compare with:
+- `enabled` — NOT NULL in DB, validates inclusion without allow_nil → `include_blank: false` is correct
+- `exclusive_route` — NOT NULL in DB → `include_blank: false` is correct

app/admin/billing/accounts.rb

@@ -252,8 +252,7 @@ def scoped_collection
     f.inputs form_title do
       f.input :name
       f.contractor_input :contractor_id
-      f.input :currency_id, as: :select, input_html: { class: 'tom-select', disabled: !f.object.new_record? },
-                            collection: Billing::Currency.order(:name).map { |c| [c.name, c.id] }
+      f.input :currency_id, as: :select, required: true, include_blank: false, collection: Billing::Currency.order(:name), input_html: { class: 'tom-select', disabled: !f.object.new_record? }
       f.input :min_balance
       f.input :max_balance
       f.input :vat
@@ -265,7 +264,7 @@ def scoped_collection
       f.input :termination_capacity
       f.input :total_capacity
 
-      f.input :timezone, as: :select, input_html: { class: 'tom-select' }, collection: Yeti::TimeZoneHelper.all
+      f.input :timezone, as: :select, required: true, include_blank: false, input_html: { class: 'tom-select' }, collection: Yeti::TimeZoneHelper.all
       f.input :uuid, as: :string
     end
 

app/admin/cdr/cdrs.rb

@@ -393,7 +393,7 @@ def try_cdr_replica(&)
 
           column :vendor_price, &:decorated_vendor_price
           column :vendor_duration, &:decorated_vendor_duration
-          column :profit
+          column :profit, &:decorated_profit
           column('Orig call', &:orig_call_id)
           column :local_tag
           column :legb_local_tag
@@ -580,7 +580,7 @@ def try_cdr_replica(&)
           row :customer_duration, &:decorated_customer_duration
           row :vendor_price, &:decorated_vendor_price
           row :vendor_duration, &:decorated_vendor_duration
-          row :profit
+          row :profit, &:decorated_profit
 
           row :rateplan
           row :destination
@@ -799,7 +799,7 @@ def try_cdr_replica(&)
 
     column :vendor_price, &:decorated_vendor_price
     column :vendor_duration, &:decorated_vendor_duration
-    column :profit
+    column :profit, &:decorated_profit
     column :orig_call_id
     column :local_tag
     column :legb_local_tag

app/admin/routing/destinations.rb

@@ -44,6 +44,7 @@
                  :initial_interval, :next_interval,
                  :use_dp_intervals,
                  :initial_rate, :next_rate, :connect_fee,
+                 [:currency_name, proc { |row| row.currency.name }],
                  :dp_margin_fixed, :dp_margin_percent,
                  :profit_control_mode_name,
                  :valid_from, :valid_till,
@@ -108,7 +109,7 @@
                 :dp_margin_percent, :rate_policy_id, :reverse_billing, :initial_rate,
                 :reject_calls, :use_dp_intervals, :test, :profit_control_mode_id,
                 :valid_from, :valid_till, :asr_limit, :acd_limit, :short_calls_limit, :batch_prefix,
-                :reverse_billing, :routing_tag_mode_id, :allow_package_billing, :scheduler_id, routing_tag_ids: []
+                :reverse_billing, :routing_tag_mode_id, :allow_package_billing, :scheduler_id, :currency_id, routing_tag_ids: []
 
   action_item :show_rates, only: [:show] do
     link_to 'Show Rates', destination_destination_next_rates_path(resource.id)
@@ -136,7 +137,7 @@ def update
     #
     # preload have more controllable behavior, but sorting by associated tables not possible
     def scoped_collection
-      super.preload(:rate_group, network_prefix: %i[country network])
+      super.preload(:rate_group, :currency, network_prefix: %i[country network])
     end
   end
 
@@ -176,15 +177,11 @@ def scoped_collection
     column :valid_till, &:decorated_valid_till
 
     column :rate_policy, &:rate_policy_name
-    column :reverse_billing
     column :allow_package_billing
 
     ## fixed price
-    column :initial_interval
-    column :initial_rate
-    column :next_interval
-    column :next_rate
-    column :connect_fee
+    column :rates, &:decorated_rates
+    column :intervals, &:decorated_intervals
     column :use_dp_intervals
 
     # cost + X ( $ or % )
@@ -241,6 +238,7 @@ def scoped_collection
       end
     end
     f.inputs 'Fixed rating configuration' do
+      f.input :currency, as: :select, include_blank: false, input_html: { class: 'tom-select' }
       f.input :initial_rate
       f.input :next_rate
       f.input :connect_fee
@@ -301,6 +299,9 @@ def scoped_collection
         end
         panel 'Fixed rating configuration' do
           attributes_table_for s do
+            row :currency do
+              status_tag s.currency.name
+            end
             row :initial_rate
             row :next_rate
             row :connect_fee

app/admin/routing/dialpeers.rb

@@ -27,6 +27,7 @@
                  [:scheduler_name, proc { |row| row.scheduler.try(:name) }],
                  :prefix, :priority, :force_hit_rate, :exclusive_route,
                  :initial_interval, :initial_rate, :next_interval, :next_rate, :connect_fee,
+                 [:currency_name, proc { |row| row.currency.name }],
                  :lcr_rate_multiplier,
                  [:gateway_name, proc { |row| row.gateway.try(:name) }],
                  [:gateway_group_name, proc { |row| row.gateway_group.try(:name) }],
@@ -67,7 +68,7 @@ def update
     # preload have more controllable behavior, but sorting by associated tables not possible
     def scoped_collection
       super.preload(:gateway, :gateway_group, :routing_group, :vendor, :account, :statistic,
-                    :routeset_discriminator, network_prefix: %i[country network])
+                    :currency, :routeset_discriminator, network_prefix: %i[country network])
     end
   end
 
@@ -102,15 +103,10 @@ def scoped_collection
     end
     column :routing_group
     column :routing_tags
-    column :priority
+    column :priority, &:decorated_priority
     column :force_hit_rate
-    column :exclusive_route
-    column :initial_interval
-    column :initial_rate
-    column :next_interval
-    column :next_rate
-    column :connect_fee
-    column :reverse_billing
+    column :rates, &:decorated_rates
+    column :intervals, &:decorated_intervals
     column :lcr_rate_multiplier
     column :gateway do |c|
       auto_link(c.gateway, c.gateway.decorated_termination_display_name) unless c.gateway.nil?
@@ -254,13 +250,14 @@ def scoped_collection
       f.input :priority
       f.input :force_hit_rate
       f.input :exclusive_route
-      f.input :initial_interval
       f.input :initial_rate
-      f.input :next_interval
       f.input :next_rate
-      f.input :lcr_rate_multiplier
       f.input :connect_fee
+      f.input :currency, as: :select, include_blank: false, input_html: { class: 'tom-select' }
       f.input :reverse_billing
+      f.input :lcr_rate_multiplier
+      f.input :initial_interval
+      f.input :next_interval
 
       f.association_ajax_input :gateway_id,
                                label: 'Gateway',
@@ -329,6 +326,9 @@ def scoped_collection
           row :initial_rate
           row :next_interval
           row :next_rate
+          row :currency do
+            status_tag s.currency.name
+          end
           row :lcr_rate_multiplier
           row :connect_fee
           row :reverse_billing

app/assets/javascripts/tom-select.js

@@ -32,11 +32,12 @@ function initTomSelect(parent, options = {}) {
     parent.find('select.tom-select, select.tom-select-wide').each(function () {
         if (this.tomselect) return
 
-        var plugins = ['clear_button', 'dropdown_input']
+        var plugins = ['dropdown_input']
         var el = this
         var $el = $(el)
         var isMultiple = !!$el.attr('multiple')
         var allowEmptyOption = !!$el.data('allow-empty-option')
+        if (hasBlankOption(el)) plugins.push('clear_button')
         if (isMultiple) plugins.push('remove_button')
         new TomSelect(this, {
             plugins: plugins,

app/decorators/cdr_decorator.rb

@@ -81,19 +81,31 @@ def decorated_vendor_duration
   end
 
   def decorated_customer_price
+    currency_name = h.currencies_map[customer_currency_id]
     h.safe_join([
                   customer_price,
+                  *(h.tag.span(currency_name, class: 'status_tag') if currency_name),
                   *(h.tag.span('R', class: 'status_tag red') if destination_reverse_billing)
                 ], ' ')
   end
 
   def decorated_vendor_price
+    currency_name = h.currencies_map[vendor_currency_id]
     h.safe_join([
                   vendor_price,
+                  *(h.tag.span(currency_name, class: 'status_tag') if currency_name),
                   *(h.tag.span('R', class: 'status_tag red') if dialpeer_reverse_billing)
                 ], ' ')
   end
 
+  def decorated_profit
+    system_currency_name = h.currencies_map[0]
+    h.safe_join([
+                  profit,
+                  *(h.tag.span(system_currency_name, class: 'status_tag') if system_currency_name)
+                ], ' ')
+  end
+
   def decorated_destination_rates
     h.safe_join([
                   "#{destination_fee} #{destination_initial_rate}/#{destination_next_rate}".chomp('/'),

app/decorators/destination_decorator.rb

@@ -23,6 +23,18 @@ def decorated_display_name
     end
   end
 
+  def decorated_rates
+    h.safe_join([
+                  "#{connect_fee} #{initial_rate}/#{next_rate}".chomp('/'),
+                  h.tag.span(currency.name, class: 'status_tag'),
+                  *(h.tag.span('R', class: 'status_tag red') if reverse_billing)
+                ], ' ')
+  end
+
+  def decorated_intervals
+    "#{initial_interval}/#{next_interval}"
+  end
+
   def decorated_valid_from
     is_valid_from? ? valid_from : h.content_tag(:font, valid_from, color: :red)
   end

app/decorators/dialpeer_decorator.rb

@@ -27,6 +27,25 @@ def decorated_display_name
     end
   end
 
+  def decorated_priority
+    h.safe_join([
+                  priority.to_s,
+                  *(h.tag.span('exclusive', class: 'status_tag orange') if exclusive_route)
+                ], ' ')
+  end
+
+  def decorated_intervals
+    "#{initial_interval}/#{next_interval}"
+  end
+
+  def decorated_rates
+    h.safe_join([
+                  "#{connect_fee} #{initial_rate}/#{next_rate}".chomp('/'),
+                  h.tag.span(currency.name, class: 'status_tag'),
+                  *(h.tag.span('R', class: 'status_tag red') if reverse_billing)
+                ], ' ')
+  end
+
   def decorated_valid_from
     is_valid_from? ? valid_from : h.content_tag(:font, valid_from, color: :red)
   end

app/helpers/application_helper.rb

@@ -60,6 +60,10 @@ def routing_tags_map
     @routing_tags_map ||= Routing::RoutingTag.all.pluck(:id, :name).to_h
   end
 
+  def currencies_map
+    @currencies_map ||= Billing::Currency.pluck(:id, :name).to_h
+  end
+
   def tag_action_value_options
     @tag_action_value_options ||= Routing::RoutingTag.all.map { |record| [record.display_name, record.id] }
   end