smartkiosk-server 0.11.2 → 0.11.3

data/app/controllers/payments_controller.rb

@@ -12,61 +12,32 @@ class PaymentsController < ApplicationController
   end
 
   def create
-    provider = Provider.find_by_keyword params[:provider]
-
-    if provider.blank?
-      Payment.plog :info, :web, "Provider #{params[:provider]} not found", 
-        :session_id  => params[:payment][:session_id],
-        :terminal_id => @terminal.id
-
-      render :text => nil, :status => 404
-      return
-    end
-
-    payment  = Payment.where(
-      :terminal_id => @terminal.id,
-      :session_id  => params[:payment][:session_id]
-    ).first
-
-    if payment.blank?
-      if payment = Payment.build!(@terminal, provider, params[:payment])
-        payment.plog :info, :transport, "Created"
-
-        payment.plog :info, :transport, "Checked" do
-          payment.check!
-        end
-
-        render :json => {
-          :id               => payment.id,
-          :state            => payment.state,
-          :requires_print   => provider.requires_print,
-          :limits           => Limit.for(payment, false).as_json(
-                                  :only => [:min, :max], :methods => [:weight]
-                               ),
-          :commissions      => Commission.for(payment, false).as_json(
-                                  :only => [:min, :max, :percent_fee, :static_fee, :payment_type],
-                                  :methods => [:weight]
-                               ),
-          :receipt_template => ProviderReceiptTemplate.for(payment).compile(payment)
-        }
-      else
-        Payment.plog :info, :web, "Payment was not created"
-        render :nothing => true, :status => 406
-      end
+    payment = Payment.build!(@terminal, Provider.find_by_keyword(params[:provider]), params[:payment])
+
+    if payment
+      payment.check!
+
+      render :json => {
+        :id               => payment.id,
+        :state            => payment.state,
+        :requires_print   => provider.requires_print,
+        :limits           => Limit.for(payment, false).as_json(
+                                :only => [:min, :max], :methods => [:weight]
+                             ),
+        :commissions      => Commission.for(payment, false).as_json(
+                                :only => [:min, :max, :percent_fee, :static_fee, :payment_type],
+                                :methods => [:weight]
+                             ),
+        :receipt_template => ProviderReceiptTemplate.for(payment).compile(payment)
+      }
     else
-      payment.plog :warn, :transport, "Existing payment found, declining"
-      render :nothing => true, :status => 406
+      render :text => nil, :status => 406
     end
   end
   
   def pay
     payment = @terminal.payments.find(params[:id])
-
-    unless payment.queue?
-      payment.plog :info, :transport, "Sent to queue" do
-        payment.enqueue!(params[:payment])
-      end
-    end
+    payment.enqueue!(params[:payment]) unless payment.queue?
 
     render :text => nil, :status => 200
   end

data/app/models/payment.rb

@@ -74,15 +74,17 @@ class Payment < ActiveRecord::Base
   end
 
   def enqueue!(attributes={})
-    [ :paid_amount, :receipt_number, :card_track1, :card_track2, :meta ].each do |key|
-      if attributes.include? key
-        write_attribute key, attributes[key]
+    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
       end
-    end
 
-    enqueue
-    save!
-    PayWorker.perform_async(id)
+      enqueue
+      save!
+      PayWorker.perform_async(id)
+    end
   end
 
   #
@@ -186,7 +188,7 @@ class Payment < ActiveRecord::Base
         severity,
         datetime.iso8601(12),
         data[:progname],
-        data[:payment_id],
+        "##{data[:payment_id]}",
         data[:payment_state],
         data[:session_id],
         data[:terminal_id],
@@ -245,17 +247,31 @@ class Payment < ActiveRecord::Base
 
   def self.build!(terminal, provider, attributes)
     payment = new(attributes)
+
+    if provider.blank?
+      payment.plog :warn, :model, "Provider not found"
+      return false
+    end
+    
     provider_gateway = provider.provider_gateways.enabled.order(:priority).first
 
-    return false if provider_gateway.blank?
+    if provider_gateway.blank?
+      payment.plog :info, :model, "Provider has no gateways attached"
+      return false
+    end
 
     payment.terminal = terminal
     payment.provider_gateway = provider_gateway
     payment.raw_fields = payment.fields
     payment.fields = provider_gateway.map(payment.account, payment.fields)
 
-    payment.save!
-    payment
+    if payment.save
+      payment.plog :info, :model, "Payment created"
+      payment
+    else
+      payment.plog :warn, :model, "Payment was invalidated: #{payment.errors.full_messages.join(', ')}"
+      false
+    end
   end
 
   def provider_gateway=(pg)
@@ -282,11 +298,13 @@ class Payment < ActiveRecord::Base
     result = self.gateway.librarize.check(self)
 
     if result[:success]
+      plog :info, :model, "Checked"
       self.gateway_error      = nil
       self.gateway_payment_id = result[:gateway_payment_id] unless result[:gateway_payment_id].blank?
       self.save!
       return :checked
     else
+      plog :info, :model, "Declined: #{result[:error]}"
       self.update_attribute(:gateway_error, result[:error])
       return :declined
     end
@@ -308,7 +326,7 @@ class Payment < ActiveRecord::Base
 
           self.save!
           if !transaction.confirm
-            self.plog :error, :acquirer, "unable to confirm transaction: #{transaction.error}"
+            self.plog :error, :model, "unable to confirm transaction: #{transaction.error}"
 
             # TODO: reverse on gateway if possible
           end
@@ -317,7 +335,7 @@ class Payment < ActiveRecord::Base
         else
           self.update_attribute(:gateway_error, result[:error])
           if !transaction.reverse
-            self.plog :error, :acquirer, "unable to reverse transaction: #{transaction.error}"
+            self.plog :error, :model, "unable to reverse transaction: #{transaction.error}"
           end
 
           return :error

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.11.2'
+    VERSION = '0.11.3'
   end
 end

data/spec/controllers/payments_controller_spec.rb

@@ -48,6 +48,53 @@ describe PaymentsController do
     }
   end
 
+  it "declines empty provider" do
+    post :create,
+      :terminal => 'test',
+      :payment  => {
+        :session_id   => 31337,
+        :account      => '9261111111',
+        :payment_type => Payment::TYPE_CASH
+      }
+
+    response.code.should == "404"
+  end
+
+  it "declines absent provider" do
+    post :create,
+      :terminal => 'test',
+      :provider => 'idontexist',
+      :payment  => {
+        :session_id   => 31337,
+        :account      => '9261111111',
+        :payment_type => Payment::TYPE_CASH
+      }
+
+    response.code.should == "404"
+  end
+
+  it "declines duplicating session id" do
+    post :create,
+      :terminal => 'test',
+      :provider => 'test',
+      :payment  => {
+        :session_id   => 31337,
+        :account      => '9261111111',
+        :payment_type => Payment::TYPE_CASH
+      }
+
+    post :create,
+      :terminal => 'test',
+      :provider => 'test',
+      :payment  => {
+        :session_id   => 31337,
+        :account      => '9261111111',
+        :payment_type => Payment::TYPE_CASH
+      }
+
+    response.code.should == "406"
+  end
+
   it "pays" do
     post :create,
       :terminal => 'test',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -332,7 +332,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1222065104892859917
+      hash: 2751133508454068460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: