smartkiosk-server 0.11.11 → 0.12

data/app/admin/terminals.rb

@@ -305,8 +305,9 @@ ActiveAdmin.register Terminal do
         row :rent_finish_date
         row :collection_zone
         row :check_phone_number
-        row :address do |t|
-          div t.address
+        row :address
+        row :address_details do |t|
+          div t.address_details
           unless t.address.blank?
             div(:class => 'terminal_map', :id => 'map')
             script(:type => 'text/javascript') do
@@ -420,6 +421,7 @@ ActiveAdmin.register Terminal do
       f.input :collection_zone
       f.input :check_phone_number
       f.input :address
+      f.input :address_details
     end
     f.actions
   end

data/app/controllers/payments_controller.rb

@@ -34,11 +34,32 @@ class PaymentsController < ApplicationController
       render :text => nil, :status => 406
     end
   end
+
+  def offline
+    payment = Payment.build!(@terminal, Provider.find_by_keyword(params[:provider]), params[:payment])
+    payment.check!
+    payment.enqueue! if payment.checked?
+
+    render :json => payment.as_json
+  end
   
   def pay
+    payment = @terminal.payments.find(params[:id])
+    payment.pay!(params[:payment])
+
+    render :json => payment.as_json
+  end
+
+  def enqueue
     payment = @terminal.payments.find(params[:id])
     payment.enqueue!(params[:payment]) unless payment.queue?
 
     render :text => nil, :status => 200
   end
+
+  def show
+    payment = @terminal.payments.find(params[:id])
+
+    render :json => payment.as_json
+  end
 end

data/app/models/payment.rb

@@ -73,20 +73,31 @@ class Payment < ActiveRecord::Base
     )
   end
 
-  def enqueue!(attributes={})
-    plog :info, :model, "Sent to queue" do
-      [ :paid_amount, :receipt_number, :card_track1, :card_track2, :meta ].each do |key|
-        if attributes.include? key
-          write_attribute key, attributes[key]
-        end
+  def assign_payment_attributes(attributes)
+    [ :paid_amount, :receipt_number, :card_track1, :card_track2, :meta ].each do |key|
+      if attributes.include? key
+        write_attribute key, attributes[key]
       end
+    end
+  end
 
+  def enqueue!(attributes={})
+    plog :info, :model, "Sent to queue" do
+      assign_payment_attributes attributes
       enqueue
       save!
       PayWorker.perform_async(id)
     end
   end
 
+  def pay!(attributes={})
+    plog :info, :model, "Paid" do
+      assign_payment_attributes attributes
+      pay
+      save!
+    end
+  end
+
   #
   # RELATIONS
   #

data/config/locales/activerecord.ru.yml

@@ -562,6 +562,7 @@ ru:
         foreign_id: Внешний ID
         terminal_orders: Команды
         address: Адрес
+        address_details: Детали расположения
         agent: Агент
         agent_id: Агент
         agent_title: Название агента

data/config/routes.rb

@@ -46,9 +46,11 @@ Rails.application.class.routes.draw do
   resources :payments do
     collection do
       get :limits
+      post :offline
     end
     member do
       post :pay
+      post :enqueue
     end
   end
 

data/db/migrate/20130410142059_add_address_details_to_terminals.rb

@@ -0,0 +1,5 @@
+class AddAddressDetailsToTerminals < ActiveRecord::Migration
+  def change
+    add_column :terminals, :address_details, :text
+  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 => 20130410085714) do
+ActiveRecord::Schema.define(:version => 20130410142059) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -463,6 +463,7 @@ ActiveRecord::Schema.define(:version => 20130410085714) do
     t.integer  "card_reader_error"
     t.integer  "watchdog_error"
     t.integer  "last_session_started_at", :default => 0,         :null => false
+    t.text     "address_details"
   end
 
   add_index "terminals", ["agent_id"], :name => "index_terminals_on_agent_id"

data/lib/smartkiosk/server/version.rb

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

data/spec/controllers/payments_controller_spec.rb

@@ -95,6 +95,40 @@ describe PaymentsController do
     response.code.should == "406"
   end
 
+  it "enqueues" do
+    post :create,
+      :terminal => 'test',
+      :provider => 'test',
+      :payment  => {
+        :session_id   => 31337,
+        :account      => '9261111111',
+        :payment_type => Payment::TYPE_CASH
+      }
+
+    result = ActiveSupport::JSON.decode(response.body)
+    result.should == {
+      "id"               => 1,
+      "state"            => "checked",
+      "requires_print"   => true,
+      "limits"           => [{"max"=>"9999.0", "min"=>"0.0", "weight"=>1}],
+      "commissions"      => [{"max"=>"9999.0", "min"=>"0.0", "payment_type"=>nil, "percent_fee"=>"0.0", "static_fee"=>"0.0", "weight"=>1}],
+      "receipt_template" => "{{ payment_enrolled_amount }}"
+    }
+
+    post :enqueue,
+      :terminal => 'test',
+      :id => 1,
+      :payment => {
+        :paid_amount => 100
+      }
+    response.status.should == 200
+
+    PayWorker.new.perform 1
+    payment = Payment.find 1
+    payment.state.should == "paid"
+    payment.externally_paid.should == true
+  end
+
   it "pays" do
     post :create,
       :terminal => 'test',
@@ -123,12 +157,28 @@ describe PaymentsController do
       }
     response.status.should == 200
 
-    PayWorker.new.perform 1
     payment = Payment.find 1
     payment.state.should == "paid"
     payment.externally_paid.should == true
   end
 
+  it "pays offline" do
+    post :offline,
+      :terminal => 'test',
+      :provider => 'test',
+      :payment  => {
+        :session_id   => 31337,
+        :account      => '9261111111',
+        :payment_type => Payment::TYPE_CASH,
+        :paid_amount  => 100
+      }
+
+    response.status.should == 200
+    result = ActiveSupport::JSON.decode(response.body)
+    result['id'].should == 1
+    result['state'].should == 'queue'
+  end
+
   xit "pays with card" do
     post :create,
       :terminal => 'test',
@@ -148,7 +198,7 @@ describe PaymentsController do
       "commissions"      => [{"max"=>"9999.0", "min"=>"0.0", "payment_type"=>nil, "percent_fee"=>"0.0", "static_fee"=>"0.0", "weight"=>1}],
       "receipt_template" => "{{ payment_enrolled_amount }}"
     }
-    post :pay,
+    post :enqueue,
       :terminal => 'test',
       :id => 1,
       :payment => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: '0.12'
   prerelease: 
 platform: ruby
 authors:
@@ -262,6 +262,7 @@ files:
 - 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/migrate/20130410142059_add_address_details_to_terminals.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/receipt_templates/payment.txt
@@ -334,7 +335,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1269099127532595486
+      hash: 4599455729740215178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: