smartkiosk-server 0.10.11 → 0.10.12

data/app/admin/terminal_builds.rb

@@ -7,15 +7,13 @@ ActiveAdmin.register TerminalBuild do
   index do
     selectable_column
     column :id
-    column :version do |tb|
-      div tb.version
-
+    column :version
+    column :gems_ready do |tb|
       if tb.gems_ready
         status_tag(I18n.t('smartkiosk.admin.terminal_build.gems_ready'), :ok)
       else
         status_tag(I18n.t('smartkiosk.admin.terminal_build.gems_not_ready'), :error)
       end
-
     end
     column :source do |tb|
       link_to File.basename(tb.source.path), tb.source.url

data/app/admin/terminals.rb

@@ -270,13 +270,15 @@ ActiveAdmin.register Terminal do
 
     unless terminal.pings.last.blank?
       panel I18n.t('smartkiosk.admin.panels.terminals.hardware') do
-        attributes_table_for terminal.pings.last do
+        attributes_table_for terminal.pings.first do
           row :cash_acceptor_model
           row :cash_acceptor_version
           row :modem_model
           row :modem_version
           row :printer_model
           row :printer_version
+          row :card_reader_model
+          row :watchdog_model
         end
       end
     end

data/app/models/terminal.rb

@@ -3,7 +3,7 @@ require_dependency 'terminal_ping'
 class Terminal < ActiveRecord::Base
   include Redis::Objects::RMap
 
-  HARDWARE = %w(cash_acceptor modem printer)
+  HARDWARE = %w(cash_acceptor modem printer card_reader watchdog)
   ORDERS   = %w(reload reboot disable enable upgrade)
 
   has_rmap({:id => lambda{|x| x.to_s}}, :keyword)

data/app/models/terminal_ping.rb

@@ -25,6 +25,9 @@ class TerminalPing
   # :error => '', :version => '', :signal_level => 4, :balance => 54.5
   attribute :modem, :default => {}
 
+  attribute :card_reader, :default => {}
+  attribute :watchdog, :default => {}
+
   # :payments => 5, :orders => 4
   attribute :queues, :default => {}
 
@@ -74,6 +77,30 @@ class TerminalPing
     banknotes.values.map{|x| x.to_i}.sum
   end
 
+  def card_reader_error
+    error(:card_reader)
+  end
+
+  def card_reader_version
+    value 'version', :card_reader
+  end
+
+  def card_reader_model
+    value 'model', :card_reader
+  end
+
+  def watchdog_error
+    error(:watchdog)
+  end
+
+  def watchdog_version
+    value 'version', :watchdog
+  end
+
+  def watchdog_model
+    value 'model', :watchdog
+  end
+
   def cash_acceptor_error
     error(:cash_acceptor)
   end

data/config/locales/activerecord.ru.yml

@@ -596,6 +596,12 @@ ru:
         updated_at: Дата изменения
         version: Версия ПО
         has_adv_monitor: Рекламный монитор
+        card_reader_error: Ошибка картоприемника
+        card_reader_model: Модель картоприемника
+        card_reader_version: Версия картоприемника
+        watchdog_error: Ошибка сторожевика
+        watchdog_model: Модель сторожевика
+        watchdog_version: Версия сторожевика
       terminal_ping:
         terminal: Терминал
         condition: Состояние
@@ -616,6 +622,12 @@ ru:
         modem_signal_level: Уровень GSM
         modem_version: Версия модема
         modem_error: Ошибка модема
+        card_reader_error: Ошибка картоприемника
+        card_reader_model: Модель картоприемника
+        card_reader_version: Версия картоприемника
+        watchdog_error: Ошибка сторожевика
+        watchdog_model: Модель сторожевика
+        watchdog_version: Версия сторожевика
         queues: Очереди
         banknotes: Купюры
       terminal_type:

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

@@ -1,6 +1,16 @@
 ru:
   smartkiosk:
     hardware:
+      watchdog:
+        abbr: W
+        title: Сторожевик
+        errors:
+          1: "Не отвечает"
+      card_reader:
+        abbr: R
+        title: Картоприемник
+        errors:
+          1: "Не отвечает"
       cash_acceptor:
         abbr: C
         title: Купюроприемник

data/db/migrate/20130216173828_add_watchdog_and_card_reader_errors_to_terminals.rb

@@ -0,0 +1,6 @@
+class AddWatchdogAndCardReaderErrorsToTerminals < ActiveRecord::Migration
+  def change
+  	add_column :terminals, :card_reader_error, :integer
+  	add_column :terminals, :watchdog_error, :integer
+  end
+end

data/lib/blueprints.rb

@@ -75,5 +75,5 @@ ProviderField.blueprint do
   title                 { Faker::HipsterIpsum.word }
   kind                  { ['phone', 'string', 'date', 'select'].sample }
   values                { Faker::HipsterIpsum.words(3).join(',') }
-  mask                  { ['1-x-2', '1-1', nil].sample }
+  mask                  { ['^1-x-^2', '^1-^1', nil].sample }
 end

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.10.11'
+    VERSION = '0.10.12'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.10.11
+  version: 0.10.12
   prerelease: 
 platform: ruby
 authors:
@@ -251,6 +251,7 @@ files:
 - db/migrate/20130104063628_create_terminal_profile_providers.rb
 - db/migrate/20130104090957_create_terminal_profile_provider_groups.rb
 - db/migrate/20130108091644_create_terminal_profile_promotions.rb
+- db/migrate/20130216173828_add_watchdog_and_card_reader_errors_to_terminals.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/receipt_templates/payment.txt
@@ -322,7 +323,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1417860119347248893
+      hash: -3869678347532437078
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -331,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1417860119347248893
+      hash: -3869678347532437078
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23