smartkiosk-server 0.11.4 → 0.11.5

data/app/acquirers/cash_acquirer.rb

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

data/app/acquirers/empty_acquirer.rb

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

data/app/models/payment.rb

@@ -121,6 +121,10 @@ class Payment < ActiveRecord::Base
   before_validation do
     self.meta  = {} unless self.meta.is_a?(Hash)
     self.agent = self.terminal.agent unless self.terminal.blank?
+
+    if [ TYPE_CASH, TYPE_IBANK, TYPE_MBANK, TYPE_PURSE, TYPE_ACCOUNT ].include?(self.payment_type)
+      self.externally_paid = true
+    end
   end
 
   before_save do
@@ -157,21 +161,25 @@ class Payment < ActiveRecord::Base
   #
   # METHODS
   #
-  def self.acquirer(payment_type)
-    unless @acquiring_settings
-      @acquiring_settings = YAML::load File.read(Rails.root.join 'config/acquiring.yml')
-      @acquiring_settings.each do |x|
-        x['type'] = x['type'].split(',').map do |t|
-          Payment.const_get "TYPE_#{t.strip.upcase}"
+  def self.acquirer(payment)
+    unless payment.externally_paid
+      unless @acquiring_settings
+        @acquiring_settings = YAML::load File.read(Rails.root.join 'config/acquiring.yml')
+        @acquiring_settings.each do |x|
+          x['type'] = x['type'].split(',').map do |t|
+            Payment.const_get "TYPE_#{t.strip.upcase}"
+          end
+          x['class'] = x['class'].constantize
         end
-        x['class'] = x['class'].constantize
       end
-    end
 
-    acquirer = @acquiring_settings.find{|x| x['type'].include?(payment_type)}
-    raise "unsupported payment type: #{payment_type}" unless acquirer
+      acquirer = @acquiring_settings.find{|x| x['type'].include?(payment.payment_type)}
+      raise "unsupported payment type: #{payment.payment_type}" unless acquirer
 
-    acquirer['class'].new(acquirer)
+      acquirer['class'].new(acquirer)
+    else
+      EmptyAcquirer.new
+    end
   end
 
   def self.plogger
@@ -311,7 +319,7 @@ class Payment < ActiveRecord::Base
   end
 
   def pay?
-    acquirer      = Payment.acquirer(self.payment_type)
+    acquirer = Payment.acquirer(self)
     acquirer.transaction(self) do |transaction|
       self.update_attribute(:acquirer_transaction, transaction.id)
 

data/db/migrate/20130325154559_add_externally_paid_to_payments.rb

@@ -0,0 +1,5 @@
+class AddExternallyPaidToPayments < ActiveRecord::Migration
+  def change
+    add_column :payments, :externally_paid, :boolean, :null => false, :default => false
+  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 => 20130217113740) do
+ActiveRecord::Schema.define(:version => 20130325154559) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -194,6 +194,7 @@ ActiveRecord::Schema.define(:version => 20130217113740) do
     t.string   "card_track2"
     t.datetime "created_at",                                                             :null => false
     t.datetime "updated_at",                                                             :null => false
+    t.boolean  "externally_paid",                                     :default => false, :null => false
   end
 
   add_index "payments", ["agent_id"], :name => "index_payments_on_agent_id"

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.11.4'
+    VERSION = '0.11.5'
   end
 end

data/spec/controllers/payments_controller_spec.rb

@@ -126,6 +126,7 @@ describe PaymentsController do
     PayWorker.new.perform 1
     payment = Payment.find 1
     payment.state.should == "paid"
+    payment.externally_paid.should == true
   end
 
   xit "pays with card" do
@@ -163,6 +164,7 @@ describe PaymentsController do
       payment = Payment.find 1
 
       payment.state.should == "paid"
+      payment.externally_paid.should == false
     ensure
       CardsMkbAcquirer.stop
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
   prerelease: 
 platform: ruby
 authors:
@@ -65,6 +65,7 @@ files:
 - Rakefile
 - app/acquirers/cards_mkb_acquirer.rb
 - app/acquirers/cash_acquirer.rb
+- app/acquirers/empty_acquirer.rb
 - app/admin/agents.rb
 - app/admin/collections.rb
 - app/admin/commissions.rb
@@ -260,6 +261,7 @@ files:
 - db/migrate/20130216173828_add_watchdog_and_card_reader_errors_to_terminals.rb
 - 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/schema.rb
 - db/seeds.rb
 - db/seeds/receipt_templates/payment.txt
@@ -332,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -235060270240721140
+      hash: -2336776553200624072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: