smartkiosk-server 0.11.10 → 0.11.11

data/app/admin/providers.rb

@@ -179,6 +179,7 @@ ActiveAdmin.register Provider do
             :style => ('display:none' unless fpf.object.kind == 'string')
           },
           :hint => I18n.t('smartkiosk.admin.messages.provider_fields.mask_hint')
+        fpf.input :groupping
         fpf.input :regexp
         fpf.input :values, :as => :string,
           :wrapper_html => {

data/app/models/provider.rb

@@ -52,6 +52,6 @@ class Provider < ActiveRecord::Base
   # METHODS
   #
   def fields_dump
-    provider_fields.as_json(:only => [:keyword, :title, :kind, :mask, :values, :priority])
+    provider_fields.as_json(:only => [:keyword, :title, :kind, :mask, :values, :priority, :regexp, :groupping])
   end
 end

data/config/locales/activerecord.ru.yml

@@ -499,6 +499,7 @@ ru:
         title: Название
         kind: Тип
         mask: Маска
+        groupping: Группировка
         regexp: Проверка
         priority: Приоритет
         values: Значения

data/db/migrate/20130410085714_add_groupping_to_provider_fields.rb

@@ -0,0 +1,5 @@
+class AddGrouppingToProviderFields < ActiveRecord::Migration
+  def change
+    add_column :provider_fields, :groupping, :string
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130325154559) do
+ActiveRecord::Schema.define(:version => 20130410085714) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -215,6 +215,7 @@ ActiveRecord::Schema.define(:version => 20130325154559) do
     t.integer  "priority"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
+    t.string   "groupping"
   end
 
   create_table "provider_gateways", :force => true do |t|

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.11.10'
+    VERSION = '0.11.11'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.11
   prerelease: 
 platform: ruby
 authors:
@@ -261,6 +261,7 @@ files:
 - db/migrate/20130217113617_add_last_session_started_at_to_terminals.rb
 - db/migrate/20130217113740_create_session_records.rb
 - db/migrate/20130325154559_add_externally_paid_to_payments.rb
+- db/migrate/20130410085714_add_groupping_to_provider_fields.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/receipt_templates/payment.txt
@@ -333,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -45483200909211820
+      hash: 1269099127532595486
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: