smartkiosk-server 0.11.7 → 0.11.8

data/app/admin/report_results.rb

@@ -17,7 +17,7 @@ ActiveAdmin.register ReportResult do
 
         result.each do |r|
           row = []
-          fields.each{|f| row << r[f]}
+          fields.each{|f| row << report_result.human_field_value(f, r[f])}
           ws.add_row row
         end
       end
@@ -56,7 +56,7 @@ ActiveAdmin.register ReportResult do
         result.each do |row|
           tr do
             fields.each do |field|
-              td row[field]
+              td report_result.human_field_value(field, row[field])
             end
           end
         end

data/app/admin/reports.rb

@@ -120,7 +120,7 @@ ActiveAdmin.register Report do
             result.data.each do |row|
               tr do
                 fields.each do |field|
-                  td row[field]
+                  td result.human_field_value(field, row[field])
                 end
               end
             end

data/app/models/gateway.rb

@@ -1,6 +1,8 @@
 class Gateway < ActiveRecord::Base
+  include Redis::Objects::RMap
 
   has_paper_trail
+  has_rmap({:id => lambda{|x| x.to_s}}, :title)
 
   #
   # RELATIONS

data/app/models/report_result.rb

@@ -17,4 +17,12 @@ class ReportResult < ActiveRecord::Base
       report_template.human_calculation_name field
     end
   end
+
+  def human_field_value(field, value)
+    if field.starts_with?('_')
+      report_template.report_builder.human_field_value(report.decode_field(field), value)
+    else
+      value
+    end
+  end
 end

data/app/reports/payments_report.rb

@@ -170,6 +170,12 @@ class PaymentsReport < ReportBuilder::Base
     }
   end
 
+  def field_localizations
+    {
+      'payment.state' => proc{|x| I18n.t("smartkiosk.payment_states.#{x}")}
+    }
+  end
+
   def calculations
     {
       :quantity   => lambda{|q, t| t.groupping.blank? ? q : q.project('COUNT(*) AS "quantity"') },
@@ -183,7 +189,10 @@ class PaymentsReport < ReportBuilder::Base
     {
       'payment.state' => proc { I18n.t('smartkiosk.payment_states') },
       'payment.payment_type' => proc { I18n.t('smartkiosk.payment_types') },
-      'payment.provider_id' => proc { Provider.rmap.invert }
+      'payment.provider_id' => proc { Provider.rmap.invert },
+      'payment.agent_id' => proc { Agent.rmap.invert },
+      'payment.terminal_id' => proc { Terminal.rmap.invert },
+      'payment.gateway_id' => proc { Gateway.rmap.invert }
     }
   end
 end

data/config/locales/smartkiosk.reports.ru.yml

@@ -24,6 +24,9 @@ ru:
               state: Состояние
               payment_type: Тип
               provider_id: Получатели
+              agent_id: Агенты
+              terminal_id: Терминалы
+              gateway_id: Шлюзы
         terminals:
           calculations:
             quantity: Количество

data/lib/report_builder.rb

@@ -95,6 +95,15 @@ module ReportBuilder
       title.join(': ')
     end
 
+    def human_field_value(field, value)
+      return value unless respond_to?(:field_localizations)
+
+      @localizations ||= field_localizations
+      return value unless @localizations[field]
+
+      @localizations[field].call(value)
+    end
+
     def human_calculation_name(field)
       I18n.t "smartkiosk.reports.data.#{keyword}.calculations.#{field}"
     end

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.11.7'
+    VERSION = '0.11.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.11.8
   prerelease: 
 platform: ruby
 authors:
@@ -333,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3103762174964566922
+      hash: 2701655485329085281
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: