smartkiosk-server 0.10.11 → 0.10.12
Sign up to get free protection for your applications and to get access to all the features.
- data/app/admin/terminal_builds.rb +2 -4
- data/app/admin/terminals.rb +3 -1
- data/app/models/terminal.rb +1 -1
- data/app/models/terminal_ping.rb +27 -0
- data/config/locales/activerecord.ru.yml +12 -0
- data/config/locales/smartkiosk.hardware.ru.yml +10 -0
- data/db/migrate/20130216173828_add_watchdog_and_card_reader_errors_to_terminals.rb +6 -0
- data/lib/blueprints.rb +1 -1
- data/lib/smartkiosk/server/version.rb +1 -1
- metadata +4 -3
@@ -7,15 +7,13 @@ ActiveAdmin.register TerminalBuild do
|
|
7
7
|
index do
|
8
8
|
selectable_column
|
9
9
|
column :id
|
10
|
-
column :version
|
11
|
-
|
12
|
-
|
10
|
+
column :version
|
11
|
+
column :gems_ready do |tb|
|
13
12
|
if tb.gems_ready
|
14
13
|
status_tag(I18n.t('smartkiosk.admin.terminal_build.gems_ready'), :ok)
|
15
14
|
else
|
16
15
|
status_tag(I18n.t('smartkiosk.admin.terminal_build.gems_not_ready'), :error)
|
17
16
|
end
|
18
|
-
|
19
17
|
end
|
20
18
|
column :source do |tb|
|
21
19
|
link_to File.basename(tb.source.path), tb.source.url
|
data/app/admin/terminals.rb
CHANGED
@@ -270,13 +270,15 @@ ActiveAdmin.register Terminal do
|
|
270
270
|
|
271
271
|
unless terminal.pings.last.blank?
|
272
272
|
panel I18n.t('smartkiosk.admin.panels.terminals.hardware') do
|
273
|
-
attributes_table_for terminal.pings.
|
273
|
+
attributes_table_for terminal.pings.first do
|
274
274
|
row :cash_acceptor_model
|
275
275
|
row :cash_acceptor_version
|
276
276
|
row :modem_model
|
277
277
|
row :modem_version
|
278
278
|
row :printer_model
|
279
279
|
row :printer_version
|
280
|
+
row :card_reader_model
|
281
|
+
row :watchdog_model
|
280
282
|
end
|
281
283
|
end
|
282
284
|
end
|
data/app/models/terminal.rb
CHANGED
@@ -3,7 +3,7 @@ require_dependency 'terminal_ping'
|
|
3
3
|
class Terminal < ActiveRecord::Base
|
4
4
|
include Redis::Objects::RMap
|
5
5
|
|
6
|
-
HARDWARE = %w(cash_acceptor modem printer)
|
6
|
+
HARDWARE = %w(cash_acceptor modem printer card_reader watchdog)
|
7
7
|
ORDERS = %w(reload reboot disable enable upgrade)
|
8
8
|
|
9
9
|
has_rmap({:id => lambda{|x| x.to_s}}, :keyword)
|
data/app/models/terminal_ping.rb
CHANGED
@@ -25,6 +25,9 @@ class TerminalPing
|
|
25
25
|
# :error => '', :version => '', :signal_level => 4, :balance => 54.5
|
26
26
|
attribute :modem, :default => {}
|
27
27
|
|
28
|
+
attribute :card_reader, :default => {}
|
29
|
+
attribute :watchdog, :default => {}
|
30
|
+
|
28
31
|
# :payments => 5, :orders => 4
|
29
32
|
attribute :queues, :default => {}
|
30
33
|
|
@@ -74,6 +77,30 @@ class TerminalPing
|
|
74
77
|
banknotes.values.map{|x| x.to_i}.sum
|
75
78
|
end
|
76
79
|
|
80
|
+
def card_reader_error
|
81
|
+
error(:card_reader)
|
82
|
+
end
|
83
|
+
|
84
|
+
def card_reader_version
|
85
|
+
value 'version', :card_reader
|
86
|
+
end
|
87
|
+
|
88
|
+
def card_reader_model
|
89
|
+
value 'model', :card_reader
|
90
|
+
end
|
91
|
+
|
92
|
+
def watchdog_error
|
93
|
+
error(:watchdog)
|
94
|
+
end
|
95
|
+
|
96
|
+
def watchdog_version
|
97
|
+
value 'version', :watchdog
|
98
|
+
end
|
99
|
+
|
100
|
+
def watchdog_model
|
101
|
+
value 'model', :watchdog
|
102
|
+
end
|
103
|
+
|
77
104
|
def cash_acceptor_error
|
78
105
|
error(:cash_acceptor)
|
79
106
|
end
|
@@ -596,6 +596,12 @@ ru:
|
|
596
596
|
updated_at: Дата изменения
|
597
597
|
version: Версия ПО
|
598
598
|
has_adv_monitor: Рекламный монитор
|
599
|
+
card_reader_error: Ошибка картоприемника
|
600
|
+
card_reader_model: Модель картоприемника
|
601
|
+
card_reader_version: Версия картоприемника
|
602
|
+
watchdog_error: Ошибка сторожевика
|
603
|
+
watchdog_model: Модель сторожевика
|
604
|
+
watchdog_version: Версия сторожевика
|
599
605
|
terminal_ping:
|
600
606
|
terminal: Терминал
|
601
607
|
condition: Состояние
|
@@ -616,6 +622,12 @@ ru:
|
|
616
622
|
modem_signal_level: Уровень GSM
|
617
623
|
modem_version: Версия модема
|
618
624
|
modem_error: Ошибка модема
|
625
|
+
card_reader_error: Ошибка картоприемника
|
626
|
+
card_reader_model: Модель картоприемника
|
627
|
+
card_reader_version: Версия картоприемника
|
628
|
+
watchdog_error: Ошибка сторожевика
|
629
|
+
watchdog_model: Модель сторожевика
|
630
|
+
watchdog_version: Версия сторожевика
|
619
631
|
queues: Очереди
|
620
632
|
banknotes: Купюры
|
621
633
|
terminal_type:
|
data/lib/blueprints.rb
CHANGED
@@ -75,5 +75,5 @@ ProviderField.blueprint do
|
|
75
75
|
title { Faker::HipsterIpsum.word }
|
76
76
|
kind { ['phone', 'string', 'date', 'select'].sample }
|
77
77
|
values { Faker::HipsterIpsum.words(3).join(',') }
|
78
|
-
mask { ['1-x
|
78
|
+
mask { ['^1-x-^2', '^1-^1', nil].sample }
|
79
79
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: smartkiosk-server
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.10.
|
4
|
+
version: 0.10.12
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -251,6 +251,7 @@ files:
|
|
251
251
|
- db/migrate/20130104063628_create_terminal_profile_providers.rb
|
252
252
|
- db/migrate/20130104090957_create_terminal_profile_provider_groups.rb
|
253
253
|
- db/migrate/20130108091644_create_terminal_profile_promotions.rb
|
254
|
+
- db/migrate/20130216173828_add_watchdog_and_card_reader_errors_to_terminals.rb
|
254
255
|
- db/schema.rb
|
255
256
|
- db/seeds.rb
|
256
257
|
- db/seeds/receipt_templates/payment.txt
|
@@ -322,7 +323,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
322
323
|
version: '0'
|
323
324
|
segments:
|
324
325
|
- 0
|
325
|
-
hash: -
|
326
|
+
hash: -3869678347532437078
|
326
327
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
327
328
|
none: false
|
328
329
|
requirements:
|
@@ -331,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
331
332
|
version: '0'
|
332
333
|
segments:
|
333
334
|
- 0
|
334
|
-
hash: -
|
335
|
+
hash: -3869678347532437078
|
335
336
|
requirements: []
|
336
337
|
rubyforge_project:
|
337
338
|
rubygems_version: 1.8.23
|