smartkiosk-server 0.10.3 → 0.10.4

data/Gemfile

@@ -68,4 +68,4 @@ group :development do
   gem 'i18n_yaml_sorter'
 end
 
-gem 'iso8583-mkb', '0.0.1'
+gem 'iso8583-mkb', '0.0.2'

data/Gemfile.lock

@@ -169,7 +169,7 @@ GEM
       has_scope (~> 0.5.0)
       responders (~> 0.6)
     iso8583 (0.1.4)
-    iso8583-mkb (0.0.1)
+    iso8583-mkb (0.0.2)
       eventmachine
       iso8583
     jdbc-postgres (9.2.1002)
@@ -397,7 +397,7 @@ DEPENDENCIES
   guard-spork!
   haml
   i18n_yaml_sorter
-  iso8583-mkb (= 0.0.1)
+  iso8583-mkb (= 0.0.2)
   jquery-rails
   jruby-openssl
   liquid

data/app/acquirers/cards_mkb_acquirer.rb

@@ -19,29 +19,81 @@ class CardsMkbAcquirer
     end
   end
 
-  class Authorization
-    def initialize(auth)
-      @auth = auth
+  class Transaction
+    attr_reader :error
+
+    def initialize(payment, config)
+      @payment = payment
+      @auth = nil
+      @config = config
+      @transaction = nil
+      @error = nil
+      @auth = nil
     end
 
-    def success?
-      @auth.success?
+    def id
+      @transaction.id
     end
 
-    def error
-      @auth.status_description
+    def transact(&block)
+      CardsMkbAcquirer.gateway.transaction do |transaction|
+        @transaction = transaction
+        begin
+          yield self
+        ensure
+          @transaction = nil
+        end
+      end
     end
 
-    def confirm
+    def authorize
+      auth = ISO8583::MKB::Authorization.new(@transaction)
+      auth.processing_code = @config[:processing_code]
+      auth.merchant_type = @config[:merchant_type]
+      auth.acquirer_country = @config[:acquirer_country]
+      auth.entry_mode = @config[:entry_mode]
+      auth.condition_code = @config[:condition_code]
+      auth.acquirer = @config[:acquirer]
+      auth.terminal_id = @config[:terminal_id]
+      auth.acceptor_id = @config[:acceptor_id]
+
+      auth.track2 = @payment.card_track2
+
+      delimiter = auth.track2.index '='
+      auth.pan = auth.track2.slice(0, delimiter)
+      auth.expiry = auth.track2.slice(delimiter + 1, 4)
+
+      terminal = "OOOMKB TERM#{@payment.terminal.keyword}"
+      city = "Moscow"
+      country = "RU"
 
+      auth.acceptor_name = sprintf("%-25s%-13s%-2s", terminal, city, country)
+
+      # TODO: implement currency handling
+      auth.amount = (@payment.paid_amount * 100).to_i
+      auth.currency = 643
+
+      # TODO: build additional data
+      auth.additional = "USRDT, <cm>#{@payment.commission_amount}</cm>, <ses>#{@payment.session_id}</ses>backend data"
+
+      CardsMkbAcquirer.gateway.execute auth
+
+      @auth = auth
+      @error = auth.status_description
+
+      auth.success?
     end
 
     def reverse
       reversal = @auth.reverse
-      # TODO: set reason code
-
       CardsMkbAcquirer.gateway.execute reversal
-      # TODO: possibly report failure
+
+      @error = reversal.status_description
+      reversal.success?
+    end
+
+    def confirm
+      true
     end
   end
 
@@ -50,38 +102,9 @@ class CardsMkbAcquirer
     CardsMkbAcquirer.ensure_running @config
   end
 
-  def authorize(payment)
-    auth = ISO8583::MKB::Authorization.new
-    auth.processing_code = @config[:processing_code]
-    auth.merchant_type = @config[:merchant_type]
-    auth.acquirer_country = @config[:acquirer_country]
-    auth.entry_mode = @config[:entry_mode]
-    auth.condition_code = @config[:condition_code]
-    auth.acquirer = @config[:acquirer]
-    auth.terminal_id = @config[:terminal_id]
-    auth.acceptor_id = @config[:acceptor_id]
-
-    auth.track2 = payment.card_track2
-
-    delimiter = auth.track2.index '='
-    auth.pan = auth.track2.slice(0, delimiter)
-    auth.expiry = auth.track2.slice(delimiter + 1, 4)
-
-    terminal = "OOOMKB TERM#{payment.terminal.keyword}"
-    city = "Moscow"
-    country = "RU"
-
-    auth.acceptor_name = sprintf("%-25s%-13s%-2s", terminal, city, country)
-
-    # TODO: implement currency handling
-    auth.amount = (payment.paid_amount * 100).to_i
-    auth.currency = 643
-
-    # TODO: build additional data
-    auth.additional = "USRDT, <cm>#{payment.commission_amount}</cm>, <ses>#{payment.session_id}</ses>backend data"
-
-    CardsMkbAcquirer.gateway.execute auth
-
-    Authorization.new auth
+  def transaction(payment, &block)
+    transaction = Transaction.new(payment, @config)
+    transaction.transact(&block)
   end
 end
+

data/app/acquirers/cash_acquirer.rb

@@ -1,22 +1,34 @@
 class CashAcquirer
   def initialize(*args)
   end
-  
-  class Authorization
-    def success?
-      true
+
+  class Transaction
+    def initialize(payment)
+      @payment = payment
     end
 
-    def confirm
+    def id
+      "0"
+    end
 
+    def authorize
+      true
     end
 
     def reverse
+      true
+    end
+
+    def confirm
+      true
+    end
 
+    def error
+      nil
     end
   end
 
-  def authorize(payment)
-    Authorization.new
+  def transaction(payment, &block)
+    yield Transaction.new(payment)
   end
 end

data/app/models/payment.rb

@@ -291,28 +291,38 @@ class Payment < ActiveRecord::Base
 
   def pay?
     acquirer      = Payment.acquirer(self.payment_type)
-    authorization = acquirer.authorize(self)
+    acquirer.transaction(self) do |transaction|
+      self.update_attribute(:acquirer_transaction, transaction.id)
 
-    if authorization.success?
-      result = self.gateway.librarize.pay(self)
+      if transaction.authorize
+        result = self.gateway.librarize.pay(self)
 
-      if result[:success]
-        self.gateway_error      = nil
-        self.gateway_payment_id = result[:gateway_payment_id] unless result[:gateway_payment_id].blank?
-        self.paid_at            = DateTime.now
-        self.meta[:gateway]     = self.gateway.serialize_options
+        if result[:success]
+          self.gateway_error      = nil
+          self.gateway_payment_id = result[:gateway_payment_id] unless result[:gateway_payment_id].blank?
+          self.paid_at            = DateTime.now
+          self.meta[:gateway]     = self.gateway.serialize_options
 
-        self.save!
-        authorization.confirm
-        return :paid
+          self.save!
+          if !transaction.confirm
+            self.plog :error, :acquirer, "unable to confirm transaction: #{transaction.error}"
+
+            # TODO: reverse on gateway if possible
+          end
+
+          return :paid
+        else
+          self.update_attribute(:gateway_error, result[:error])
+          if !transaction.reverse
+            self.plog :error, :acquirer, "unable to reverse transaction: #{transaction.error}"
+          end
+
+          return :error
+        end
       else
-        self.update_attribute(:gateway_error, result[:error])
-        authorization.reverse
+        self.update_attribute(:acquirer_error, transaction.error)
         return :error
       end
-    else
-      self.update_attribute(:acquirer_error, authorization.error)
-      return :error
     end
   end
 

data/db/migrate/20120825083305_create_payments.rb

@@ -25,6 +25,7 @@ class CreatePayments < ActiveRecord::Migration
       t.string          :state, :null => false, :default => 'new'
       t.string          :acquirer_error
       t.integer         :gateway_error
+      t.string          :acquirer_transaction
       t.string          :gateway_provider_id
       t.string          :gateway_payment_id
       t.datetime        :hour

data/db/schema.rb

@@ -177,7 +177,9 @@ ActiveRecord::Schema.define(:version => 20130108091644) do
     t.decimal  "enrolled_amount",      :precision => 38, :scale => 2
     t.decimal  "rebate_amount",        :precision => 38, :scale => 2
     t.string   "state",                                               :default => "new", :null => false
+    t.string   "acquirer_error"
     t.integer  "gateway_error"
+    t.string   "acquirer_transaction"
     t.string   "gateway_provider_id"
     t.string   "gateway_payment_id"
     t.datetime "hour"

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.10.3'
+    VERSION = '0.10.4'
   end
 end

data/smartkiosk-server.gemspec

@@ -5,8 +5,8 @@ require 'smartkiosk/server/version'
 Gem::Specification.new do |gem|
   gem.name          = 'smartkiosk-server'
   gem.version       = Smartkiosk::Server::VERSION
-  gem.authors       = ['Boris Staal']
-  gem.email         = ['boris@roundlake.ru']
+  gem.authors       = ['Boris Staal', 'Sergey Gridasov']
+  gem.email         = ['boris@roundlake.ru', 'grindars@gmail.com']
   gem.description   = %q{Smartkiosk server application}
   gem.summary       = gem.description
   gem.homepage      = 'https://github.com/smartkiosk/smartkiosk-server'

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
   prerelease: 
 platform: ruby
 authors:
 - Boris Staal
+- Sergey Gridasov
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -13,18 +14,23 @@ date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70215271531040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70215271531040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: matrioshka
-  requirement: &70215271565160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +38,16 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70215271565160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: Smartkiosk server application
 email:
 - boris@roundlake.ru
+- grindars@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -111,6 +123,8 @@ files:
 - app/helpers/application_helper.rb
 - app/mailers/.gitkeep
 - app/models/.gitkeep
+- app/models/.terminal_ping.rb.kate-swp
+- app/models/.terminal_profile.rb.kate-swp
 - app/models/ability.rb
 - app/models/agent.rb
 - app/models/collection.rb
@@ -307,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 852346977884785449
+      hash: 1639411805563885975
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -316,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Smartkiosk server application