smartkiosk-server 0.9.0 → 0.9.1

data/Gemfile

@@ -24,7 +24,7 @@ gem 'redis-objects', :require => 'redis/objects'
 gem 'redis-objects-rmap'
 gem 'active_attr'
 
-gem 'payzilla', :git => 'git@github.com:smartkiosk/payzilla.git'
+gem 'payzilla', '0.0.2'
 
 gem 'haml'
 gem 'coffee-filter'

data/Gemfile.lock

@@ -6,21 +6,6 @@ GIT
       eventmachine
       iso8583
 
-GIT
-  remote: git@github.com:smartkiosk/payzilla.git
-  revision: df21479aeac3c1c92cb9a09e160cdcfa4d152502
-  specs:
-    payzilla (0.0.1)
-      crack
-      cyberplat_pki
-      gpgme-ffi
-      gyoku
-      json
-      rake
-      rest-client
-      savon
-      webmoney (= 0.0.15.pre)
-
 GIT
   remote: https://github.com/guard/guard-spork.git
   revision: dbaa8531850347474d5a7ee626a9a2a64f7e653c
@@ -157,6 +142,7 @@ GEM
     digest-crc (0.3.0)
     erubis (2.7.0)
     eventmachine (1.0.0)
+    eventmachine (1.0.0-java)
     execjs (1.4.0)
       multi_json (~> 1.0)
     facter (1.6.17)
@@ -183,7 +169,7 @@ GEM
     highline (1.6.15)
     hike (1.2.1)
     htmlentities (4.3.1)
-    httpi (2.0.0)
+    httpi (2.0.2)
       rack
     i18n (0.6.1)
     i18n_yaml_sorter (0.2.0)
@@ -238,6 +224,16 @@ GEM
     paper_trail (2.7.0)
       activerecord (~> 3.0)
       railties (~> 3.0)
+    payzilla (0.0.2)
+      crack
+      cyberplat_pki
+      gpgme-ffi
+      gyoku
+      json
+      rake
+      rest-client
+      savon
+      webmoney (= 0.0.15.pre)
     pg (0.14.1)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
@@ -319,13 +315,13 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    savon (2.0.2)
+    savon (2.1.0)
       akami (~> 1.2.0)
       builder (>= 2.1.2)
       gyoku (~> 1.0.0)
-      httpi (~> 2.0.0)
+      httpi (~> 2.0.2)
       nokogiri (>= 1.4.0)
-      nori (~> 2.0.0)
+      nori (~> 2.0.3)
       wasabi (~> 3.0.0)
     sidekiq (2.6.4)
       celluloid (~> 0.12.0)
@@ -415,7 +411,7 @@ DEPENDENCIES
   meta_search (>= 1.1.0)
   money
   paper_trail
-  payzilla!
+  payzilla (= 0.0.2)
   pg
   pry
   rails (= 3.2.11)

data/app/admin/terminal_profiles.rb

@@ -71,7 +71,16 @@ ActiveAdmin.register TerminalProfile do
     end
   end
 
-  member_action :sort, :title => I18n.t('smartkiosk.admin.actions.terminal_profiles.sort')
+  member_action :sort, :title => I18n.t('smartkiosk.admin.actions.terminal_profiles.sort') do
+    @terminal_profile = TerminalProfile
+      .includes(
+        {:terminal_profile_providers => :provider},
+        {:terminal_profile_provider_groups => :provider_group}
+      )
+      .find(params[:id])
+
+    @terminal_profile.actualize_links!
+  end
 
   #
   # SHOW

data/app/models/provider_group.rb

@@ -15,7 +15,7 @@ class ProviderGroup < ActiveRecord::Base
 
   belongs_to :provider_group
   has_many :provider_groups, :order => :title
-  has_many :providers, :order => :priority
+  has_many :providers
   has_many :terminal_profile_provider_groups, :dependent => :destroy
 
   accepts_nested_attributes_for :providers

data/app/models/terminal.rb

@@ -43,7 +43,7 @@ class Terminal < ActiveRecord::Base
     overload  = Hash[*terminal_profile.terminal_profile_providers.map{|x| [x.provider_id, x]}.flatten]
 
     providers.map do |x|
-      icon = overload[x.id].icon
+      icon = overload[x.id].icon rescue nil
 
       if icon.blank?
         icon = x.icon.try(:url)
@@ -72,7 +72,7 @@ class Terminal < ActiveRecord::Base
     overload = Hash[*terminal_profile.terminal_profile_provider_groups.map{|x| [x.provider_group_id, x]}.flatten]
 
     ProviderGroup.all.map do |x|
-      icon = overload[x.id].icon
+      icon = overload[x.id].icon rescue nil
 
       if icon.blank?
         icon = x.icon.try(:url)

data/app/models/terminal_profile.rb

@@ -15,37 +15,16 @@ class TerminalProfile < ActiveRecord::Base
   accepts_nested_attributes_for :terminal_profile_providers
   accepts_nested_attributes_for :terminal_profile_provider_groups
 
-  def terminal_profile_provider_groups(parent=false)
-    data = TerminalProfileProviderGroup.where(:terminal_profile_id => id).
-      includes(:provider_group => :provider_group).order(:priority)
+  def actualize_links!
+    group_ids = [-1] + terminal_profile_provider_groups.map{|x| x.provider_group_id}
+    prov_ids  = [-1] + terminal_profile_providers.map{|x| x.provider_id}
 
-    data  = data.where(:provider_groups => {:provider_group_id => parent}) unless parent === false
-    pgids = data.map{|x| x.provider_group_id}
-
-    ProviderGroup.all.each do |pg|
-      unless pgids.include?(pg.id)
-        data << TerminalProfileProviderGroup.new(:provider_group_id => pg.id, :terminal_profile_id => id)
-      end
+    ProviderGroup.where(ProviderGroup.arel_table[:id].not_in group_ids).each do |pg|
+      terminal_profile_provider_groups << TerminalProfileProviderGroup.new(:provider_group_id => pg.id, :terminal_profile_id => id)
     end
 
-    data
-  end
-
-  def terminal_profile_providers(category=nil)
-    category = category.id if !category.blank? && category.respond_to?(:id)
-    search   = category.nil? ? {} : {:provider_group_id => category}
-
-    data = TerminalProfileProvider.includes(:provider).
-      where(:terminal_profile_id => id, :providers => search).
-      order("terminal_profile_providers.priority")
-    pids = data.map{|x| x.provider_id}
-
-    Provider.where(search).all.each do |p|
-      unless pids.include?(p.id)
-        data << TerminalProfileProvider.new(:provider_id => p.id, :terminal_profile_id => id)
-      end
+    Provider.where(Provider.arel_table[:id].not_in prov_ids).each do |p|
+      terminal_profile_providers << TerminalProfileProvider.new(:provider_id => p.id, :terminal_profile_id => id)
     end
-
-    data
   end
 end

data/app/models/terminal_profile_provider_group.rb

@@ -12,8 +12,4 @@ class TerminalProfileProviderGroup < ActiveRecord::Base
   validates :terminal_profile, :presence => true
 
   delegate :title, :to => :terminal_profile
-
-  def terminal_profile_providers
-    terminal_profile.terminal_profile_providers(provider_group_id)
-  end
 end

data/app/views/admin/terminal_profiles/_tree.html.haml

@@ -1,5 +1,5 @@
 - if entry.is_a?(TerminalProfileProviderGroup)
-  %li.input{:style => 'padding-right: 0px; padding-left: 0px; cursor: move', :'data-id' => entry.provider_group.id, :'data-parent' => entry.provider_group.provider_group_id}
+  %li.input{:style => 'padding-right: 0px; padding-left: 0px; cursor: move', :'data-id' => entry.provider_group_id, :'data-parent' => entry.provider_group.provider_group_id}
     %div{:style => 'padding-left: 10px; padding-bottom: 5px; border-bottom: 1px dashed gray'}
       ⇅
       = image_tag(entry.icon.url(:thumb), :style => 'vertical-align: middle') unless entry.icon.blank?
@@ -13,9 +13,8 @@
         %input{:type => 'hidden', :name => "terminal_profile_provider_groups[][provider_group_id]", :value => entry.provider_group_id}
         %input{:type => 'hidden', :name => "terminal_profile_provider_groups[][priority]", :value => entry.priority}
     %ol{:style => 'padding-left:30px'}
-      - subs  = @terminal_profile.terminal_profile_provider_groups
-      - subs  = subs.select{|x| x.provider_group.provider_group == entry.provider_group}
-      - subs += entry.terminal_profile_providers
+      - subs  = @terminal_profile.terminal_profile_provider_groups.select{|x| x.provider_group.provider_group_id == entry.provider_group_id}
+      - subs += @terminal_profile.terminal_profile_providers.select{|x| x.provider.provider_group_id == entry.provider_group_id}
 
       - subs.sort_by{|x| x.priority}.each_with_index do |x|
         = render 'tree', :entry => x, :level => level+1

data/app/views/admin/terminal_profiles/sort.html.haml

@@ -15,7 +15,7 @@
 
 = semantic_form_for [:admin, @terminal_profile], :html => { :multipart => true } do |f|
   = f.inputs :class => 'sortable', :style => 'padding: 0px; margin: 0px' do
-    - @terminal_profile.terminal_profile_provider_groups.select{|x| x.provider_group.provider_group.blank?}.each_with_index do |g, i|
+    - @terminal_profile.terminal_profile_provider_groups.select{|x| x.provider_group.provider_group_id.blank?}.each_with_index do |g, i|
       = render 'tree', :entry => g, :level => 0
 
   = f.actions

data/config/locales/smartkiosk.ru.yml

@@ -55,7 +55,7 @@ ru:
         provider_fields:
           values_hint: Значения для списка через запятую
           keyword_hint: Не требуется для поля лицевого счета
-          mask_hint: "Маска ввода (5-4-x: три поля на 5, 4 и неогр. кол-во символов)"
+          mask_hint: "Маска ввода (5-4-8: три поля на 5, 4 и 8 символов)"
       panels:
         gateways:
           settings: Настройки

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.9.0'
+    VERSION = '0.9.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70200485752560 !ruby/object:Gem::Requirement
+  requirement: &70109942827260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70200485752560
+  version_requirements: *70109942827260
 - !ruby/object:Gem::Dependency
   name: matrioshka
-  requirement: &70200485750060 !ruby/object:Gem::Requirement
+  requirement: &70109942826720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70200485750060
+  version_requirements: *70109942826720
 description: Smartkiosk server application
 email:
 - boris@roundlake.ru
@@ -307,7 +307,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2061680246060281226
+      hash: 3459367265776858922
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2061680246060281226
+      hash: 3459367265776858922
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15