przelewy24_payment 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aa23c51b2fc7ce0a5473ea3e0d9b03c9119f16e
-  data.tar.gz: 67ffb0fb988389227b9d7b256181506df26a5634
+  metadata.gz: ef6372b0ee892f95bae1a5cbd55216b1a8ef1422
+  data.tar.gz: 24ac8d0e94cbdb452fc8b451fa450fb637b4248d
 SHA512:
-  metadata.gz: cbd474207677c1be874d8ad24d4880835763371d4149227be8f354d2b603cd5319942336a9c6eebaa82d90341bff62736a9f54443a547f20ed2a7c2fa2fcecf9
-  data.tar.gz: c88d2e401e92c1269eb310c3fc570ea03ad4e5bcd7fb2301e521f0796a30e84b8bf97e66659f338f2c60175bf1319ac3922b6cc5d90aedd0a7f02dc3a5f87cdd
+  metadata.gz: ca83a8e926443b7df9690f4a3e6190248b63157b051a87e87ee5345be32131541072875e9fc26081e2e3b51e557e28c59bf529699d108e704966126c7ec97a26
+  data.tar.gz: 663cc01f72c1ebf01ce4a34b4d4664a98850a2d5437afdc4b93b0b576a51705bb65b9a2eedab9d8051e243a597d9df6230130fdd2265d27f6b656e2a3f31bf12

data/README.md

@@ -24,19 +24,28 @@ And you can there "config/initializers/przelewy24_payment.rb" setup your setting
 
 ```ruby
 Przelewy24Payment.setup do |config|
-  config.seller_id = 'your_seller_id'
+  config.merchant_id = 'your_merchant_id'
+  config.pos_id = 'your_shop_id_default_merchant_id'
+  config.crc_key = 'crc_key'
   config.language = 'pl'
-  config.mode = Rails.env.to_sym  # or just put :development or :production symbol
-  config.error_url = '/your_controller/comeback'
-  config.comeback_url = '/your_controller/comeback'
+  config.currency = 'PLN'
+  config.country = 'PL'
+  config.mode = :development
+  config.url_status = '/your_controller/comeback'
+  config.url_return = '/your_controller/comeback'
   config.hostname = {
-      :development => "http://localhost:3000",
+      :development => "http://127.0.0.1:3000",
       :production => "your.domain",
       :staging => "staging.domain"
   }
 end
+
 ```
 
+Test connection
+```
+rake przelewy24_payment:test_connection
+```
 ## Usage
 
 Your controller e.g 'PaymentController' should only include:
@@ -58,12 +67,16 @@ class YourPaymentController < ApplicationController
   # so you can do whatever you want
   def payment_success(payment_params)
     # payment_params returns hash with:
+    # p24_merchant_id
+    # p24_pos_id
     # p24_session_id
     # p24_order_id
-    # p24_kwota
+    # p24_amount
+    # p24_currency
+    # p24_method
+    # p24_sign
     # p24_karta
-    # p24_order_id_full
-    # p24_crc
+    # payment_id
 
     # e.g
     # payment = Payment.find_by_session_id(payment_params[:p24_session_id])
@@ -73,12 +86,16 @@ class YourPaymentController < ApplicationController
   # so you can do whatever you want
   def payment_error(payment_params, code, description)
     # payment_params returns hash with:
+    # p24_merchant_id
+    # p24_pos_id
     # p24_session_id
     # p24_order_id
-    # p24_kwota
-    # p24_error_code
-    # p24_order_id_full
-    # p24_crc
+    # p24_amount
+    # p24_currency
+    # p24_method
+    # p24_sign
+    # p24_karta
+    # payment_id
     #
     # code return error code
     # description return error description
@@ -88,15 +105,13 @@ class YourPaymentController < ApplicationController
   # so you can do whatever you want
   def payment_verify(response_params)
     # e.g:
-    # payment = Payment.find_by_session_id(response_params[:p24_session_id])
-
-    # you must return hash with amount which was save in your db and optional if you use your crc_key
-    return data = { :amount => payment.value }
-
-    #or
-
-    # optional variant:
-    return data = { :amount => your_payment_value, :crc_key => your_crc_key }
+    # you must return hash with amount which was save in your db and your crc_key
+    payment = Payment::Payment.where(session_id: response_params['p24_session_id']).first
+    if payment
+      { amount: payment.amount, crc_key: Przelewy24Payment.crc_key }
+    else
+      {}
+    end
   end
 ```
 
@@ -114,21 +129,37 @@ class YourPaymentController < ApplicationController
   ...
 
   def your_payment
-    session_id = Przelewy24Payment.friendly_token[0,20]
-    value = give_your_amount
+    session_id = Przelewy24Payment.friendly_token[0,20] # assign this to payment
     @data = { :session_id =>  session_id,
-              :description => "opis",           # optional param
-              :value => value,
-              :client => 'Adam Nowak',          # optional param
-              :address => 'Powstancow 22/2',    # optional param
-              :zipcode => '53-456',             # optional param
-              :city => 'Wroclaw',               # optional param
-              :country => 'Polska',             # optional param
+              :description => "opis",
+              :amount => 1.23,
               :email => 'payment@example.com',
+              :country => 'PL',
               # adding this params, you overwrite your config settings so this param is optional
-              # :language => 'pl',
-              # :crc => your_crc_key,
-              # :seller_id => seller_id
+              # :merchant_id => merchant_id
+              # :pos_id => pos_id
+              # :api_version => api_version,
+              # :crc_key => crc_key,
+              # :currency => currency,
+              # :country => country,
+              # :url_return => url_return,
+              # :url_status => url_status,
+
+              # other optional params
+              # :language => pl/en/de/es/it
+              # :method => method,
+              # :client => 'Adam Nowak',
+              # :address => 'Powstancow 22/2',
+              # :zipcode => '53-456',
+              # :city => 'Wroclaw',
+              # :phone => '481321132123',
+              # :time_limit => INT,
+              # :wait_for_result => INT,
+              # :channel => INT,
+              # :shipping => INT,
+              # :transfer_label => STRING(20)
+              # :encoding => ISO-8859-2/UTF-8/Windows-1250
+
             }
   end
 

data/Rakefile

@@ -1 +1,2 @@
 require "bundler/gem_tasks"
+import "./lib/tasks/test_connection.rake"

data/app/helpers/przelewy24_payment/payment_helper.rb

@@ -1,5 +1,5 @@
 module Przelewy24Payment::PaymentHelper
-  def payment_button(date)
-    render :partial => 'przelewy24_payment/payment_form', :locals => { :data => date }
+  def payment_button(data)
+    render :partial => 'przelewy24_payment/payment_form', :locals => { :data => Przelewy24Payment.prepare_form(data)}
   end
 end

data/app/views/przelewy24_payment/_payment_form.html.haml

@@ -1,45 +1,28 @@
-= form_tag Przelewy24Payment.post_url, :method => "post" do
+= form_tag Przelewy24Payment.transaction_request_url, :method => "post" do
+  = hidden_field_tag 'p24_merchant_id', data[:merchant_id]
+  = hidden_field_tag 'p24_pos_id',  data[:pos_id]
   = hidden_field_tag 'p24_session_id', data[:session_id]
-  = hidden_field_tag 'p24_id_sprzedawcy', data.has_key?(:seller_id) ? data[:seller_id] : Przelewy24Payment.seller_id
-  = hidden_field_tag 'p24_kwota', Przelewy24Payment.p24_price(data[:value])
-  = hidden_field_tag 'p24_klient', data[:client_name]
-  = hidden_field_tag 'p24_adres', data[:address]
-  = hidden_field_tag 'p24_kod', data[:zipcode]
-  = hidden_field_tag 'p24_miasto', data[:city]
-  = hidden_field_tag 'p24_kraj', data[:country]
+  = hidden_field_tag 'p24_amount', data[:p24_amount]
+  = hidden_field_tag 'p24_currency', data[:currency]
+  = hidden_field_tag 'p24_description', data[:description]
   = hidden_field_tag 'p24_email', data[:email]
-  = hidden_field_tag 'p24_return_url_ok', data.has_key?(:comeback_url) ? data[:comeback_url] : Przelewy24Payment.get_comeback_url
-  = hidden_field_tag 'p24_return_url_error', data.has_key?(:error_url) ? data[:error_url] : Przelewy24Payment.get_error_url
-  = hidden_field_tag 'p24_opis', data[:description]
-  = hidden_field_tag 'p24_language', data.has_key?(:language) ? data[:language] : Przelewy24Payment.language
-  = hidden_field_tag 'p24_crc', data[:crc]
-  = button_tag( t("activerecord.models.p24_payment.buy"))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  = hidden_field_tag 'p24_client', data[:client]
+  = hidden_field_tag 'p24_address', data[:address]
+  = hidden_field_tag 'p24_zip', data[:zip]
+  = hidden_field_tag 'p24_city', data[:city]
+  = hidden_field_tag 'p24_country', data[:country]
+  = hidden_field_tag 'p24_phone', data[:phone]
+  = hidden_field_tag 'p24_language',data[:language]
+  = hidden_field_tag 'p24_method', data[:method]
+  = hidden_field_tag 'p24_url_return', data[:url_return]
+  = hidden_field_tag 'p24_url_status', data[:url_status]
+  = hidden_field_tag 'p24_time_limit', data[:time_limit]
+  = hidden_field_tag 'p24_wait_for_result', data[:wait_for_result]
+  = hidden_field_tag 'p24_channel', data[:channel]
+  = hidden_field_tag 'p24_shipping', data[:shipping]
+  = hidden_field_tag 'p24_transfer_label', data[:transfer_label]
+  = hidden_field_tag 'p24_sign',  data[:p24_sign]
+  = hidden_field_tag 'p24_encoding', data[:encoding]
+  = hidden_field_tag 'p24_api_version', data[:api_version]
 
+  = button_tag( t("activerecord.models.p24_payment.buy"))

data/lib/generators/przelewy24_payment/install/templates/przelewy24_payment.rb

@@ -1,11 +1,15 @@
 Przelewy24Payment.setup do |config|
-  config.seller_id = 'your_seller_id'
+  config.merchant_id = 'your_merchant_id'
+  config.pos_id = 'your_shop_id_default_merchant_id'
+  config.crc_key = 'crc_key'
   config.language = 'pl'
+  config.currency = 'PLN'
+  config.country = 'PL'
   config.mode = :development
-  config.error_url = '/your_controller/comeback'
-  config.comeback_url = '/your_controller/comeback'
+  config.url_status = '/your_controller/comeback'
+  config.url_return = '/your_controller/comeback'
   config.hostname = {
-      :development => "http://localhost:3000",
+      :development => "http://127.0.0.1:3000",
       :production => "your.domain",
       :staging => "staging.domain"
   }

data/lib/przelewy24_payment.rb

@@ -4,74 +4,197 @@ require "przelewy24_payment/przelewy24_payment_controller"
 
 module Przelewy24Payment
 
-  mattr_accessor :seller_id
-  @@seller_id = ''
+  mattr_accessor :merchant_id
+  @@merchant_id = ''
+
+  mattr_accessor :pos_id
+  @@pos_id = ''
 
   mattr_accessor :language
   @@language = 'pl'
 
+  mattr_accessor :currency
+  @@language = 'PLN'
+
   mattr_accessor :mode
   @@mode = :development
 
-  mattr_accessor :error_url
-  @@error_url = ''
+  mattr_accessor :url_status
+  @@url_status = ''
+
+  mattr_accessor :url_return
+  @@url_return = ''
 
-  mattr_accessor :comeback_url
-  @@comeback_url = ''
+  mattr_accessor :api_version
+  @@api_version = '3.2'
 
   mattr_accessor :crc_key
   @@crc_key = ''
 
+  mattr_accessor :allowed_ips
+  @@allowed_ips = %w(91.216.191.181 91.216.191.182 91.216.191.183 91.216.191.184 91.216.191.185)
+
+  mattr_accessor :allowed_languages
+  @@allowed_languages = %w(pl en de es it)
+
+  mattr_accessor :country
+  @@country = 'PL'
+
+  mattr_accessor :allowed_countries
+  @@allowed_countries = %w(AD AT BE CY CZ DK EE FI FR EL ES NO PL PT SM SK SI CH SE HU GB IT NL IE IS LT LV LU MT US CA JP UA BY RY RU)
+
   mattr_accessor :hostname
-  @@hostname = { :development => "http://localhost:3000" }
+  @@hostname = { :development => "http://127.0.0.1:3000" }
 
   def self.setup
     yield self
   end
 
+  def self.check_ip(ip)
+    if @@mode == :production
+      allowed_ips.include?(ip)
+    else
+      true
+    end
+  end
+
   def self.complete_url(params)
     params
   end
 
-  def self.post_url
+  def self.test_connection_url
     if @@mode == :production
-      'https://secure.przelewy24.pl/index.php'
+      'https://secure.przelewy24.pl/testConnection'
     else
-      'https://sandbox.przelewy24.pl/index.php'
+      'https://sandbox.przelewy24.pl/testConnection'
     end
   end
 
-  def self.transaction_url
+  def self.transaction_request_url
     if @@mode == :production
-      'https://secure.przelewy24.pl/transakcja.php'
+      'https://secure.przelewy24.pl/trnDirect'
     else
-      'https://sandbox.przelewy24.pl/transakcja.php'
+      'https://sandbox.przelewy24.pl/trnDirect'
     end
   end
 
-  def self.p24_price(price)
-    price.present? ? (price.to_f.round(2) * 100) : 0
+  def self.verification_request_url
+    if @@mode == :production
+      'https://secure.przelewy24.pl/trnVerify'
+    else
+      'https://sandbox.przelewy24.pl/trnVerify'
+    end
   end
 
   def self.friendly_token
     SecureRandom.base64(15).tr('+/=lIO0', 'aqrsxyz')
   end
 
-  def self.calculate_crc(value,session_id, crc_key=nil)
-    calc_md5 = Digest::MD5.hexdigest(session_id.to_s + "|" + (seller_id).to_s + "|" + (p24_price(value)).to_s + "|" + (crc_key.nil? ? "" : crc_key.to_s))
-    return calc_md5
+  def self.calculate_sign(session,merchant,amount,currency,crc)
+    Digest::MD5.hexdigest(session.to_s + "|" + merchant.to_s + "|" + amount.to_s + "|" + currency.to_s + "|" + crc.to_s)
   end
 
   def self.get_hostname
     @@hostname[@@mode]
   end
 
-  def self.get_comeback_url
-    get_hostname + @@comeback_url
+  def self.get_url_status
+    get_hostname + @@url_status
+  end
+
+  def self.get_url_return
+    get_hostname + @@url_return
+  end
+
+  def self.make_p24_amount(price)
+    price.present? ? (price.to_f.round(2) * 100).to_i : 0
+  end
+
+  def self.make_p24_language(data_language)
+    lang = (data_language || language)
+    if allowed_languages.include?(lang)
+      lang
+    else
+      'pl'
+    end
+  end
+
+  def self.make_p24_country(data_country)
+    country_code = (data_country || country)
+    if allowed_countries.include?(country_code)
+      country_code
+    else
+      'PL'
+    end
+  end
+
+  def self.make_p24_currency(data_currency)
+    (data_currency || currency).upcase
   end
 
-  def self.get_error_url
-    get_hostname + @@error_url
+  def self.prepare_form(data)
+    #prepare mandatory fields
+    data[:merchant_id] ||=  merchant_id
+    data[:pos_id] ||= pos_id
+    data[:api_version] ||= api_version
+    data[:p24_amount] = make_p24_amount(data[:amount])
+    data[:currency] =  make_p24_currency (data[:currency])
+    data[:language] = make_p24_language(data[:language]) if data[:language]
+    data[:country] = make_p24_country(data[:country])
+    data[:url_return] ||= get_url_return
+    data[:url_status] ||= get_url_status
+    data[:crc_key] ||= crc_key
+    data[:encoding] ||= 'UTF-8'
+    data[:p24_sign] = calculate_sign(data[:session_id],data[:merchant_id],data[:p24_amount],data[:currency], data[:crc_key])
+    data
+  end
+
+  def self.test_connection_params(data={})
+    data[:p24_merchant_id] ||=  merchant_id
+    data[:p24_pos_id] ||= pos_id
+    data[:p24_sign] = Digest::MD5.hexdigest(data[:p24_pos_id].to_s + "|" + crc_key.to_s)
+    data
+  end
+
+  def self.verify_sign(data,params_new)
+    Digest::MD5.hexdigest(params_new[:p24_session_id].to_s+"|"+params_new[:p24_order_id].to_s+"|"+make_p24_amount(data[:amount]).to_s+"|"+params_new[:p24_currency].to_s+"|"+data[:crc_key].to_s)
+  end
+
+  def self.parse_response(response)
+    ret = OpenStruct.new
+    response.split("&").each do |arg|
+      line = arg.split('=')
+      ret[line[0].strip] = line[1].force_encoding("ISO-8859-2").encode!("UTF-8")
+    end
+    ret
   end
 
+  ## P24 Error codes
+  # err00: Incorrect call
+  # err01: Authorization answer confirmation was not received.
+  # err02: Authorization answer was not received.
+  # err03: This query has been already processed.
+  # err04: Authorization query incomplete or incorrect.
+  # err05: Store configuration cannot be read.
+  # err06: Saving of authorization query failed.
+  # err07: Another payment is being concluded.
+  # err08: Undetermined store connection status.
+  # err09: Permitted corrections amount has been exceeded.
+  # err10: Incorrect transaction value!
+  # err49: To high transaction risk factor.
+  # err51: Incorrect reference method.
+  # err52: Incorrect feedback on session information!
+  # err53: Transaction error !: err54: Incorrect transaction value!
+  # err55: Incorrect transaction id!
+  # err56: Incorrect card
+  # err57: Incompatibility of TEST flag
+  # err58: Incorrect sequence number !
+  # err101: Incorrect call
+  # err102: Allowed transaction time has expired
+  # err103: Incorrect transfer value.
+  # err104: Transaction awaits confirmation.
+  # err105: Transaction finished after allowed time.
+  # err106: Transaction result verification error
+  # err161: Transaction request terminated by user
+  # err162: Transaction request terminated by user
 end

data/lib/przelewy24_payment/przelewy24_payment_controller.rb

@@ -19,41 +19,46 @@ module Przelewy24PaymentController
     end
 
     def payment_verify(response_params)
-      return data = { :amount => 100.0, :crc_key => '' }
+      return data = { :amount => 100.0, :crc_key => Przelewy24Payment.crc_key }
     end
 
     def comeback
-      @response = przelewy24_verify(params)
-      result = @response.split("\r\n")
-      if result[1] == "TRUE"
+      result = przelewy24_verify(params,request.remote_ip)
+      if result.error == "0"
         payment_success(params)
       else
-        payment_error(params, :error_code => result[2], :error_descr => result[3])
+        payment_error(params, result.error, result.errorMessage)
       end
     end
 
     private
 
-    def przelewy24_verify(params)
+    def przelewy24_verify(params,ip)
+      return '' unless Przelewy24Payment.check_ip(ip)
       require 'net/https'
       require 'net/http'
       require 'open-uri'
       require 'openssl'
 
       data = payment_verify(params)
-      params_new = {:p24_session_id => params[:p24_session_id], :p24_order_id => params[:p24_order_id], :p24_id_sprzedawcy => Przelewy24Payment.seller_id, :p24_kwota => Przelewy24Payment.p24_price(data[:amount]).to_s}
-      if data[:crc_key].present?
-        params_new[:p24_crc] = Digest::MD5.hexdigest(params[:p24_session_id]+"|"+params[:p24_order_id]+"|"+params[:p24_kwota]+"|"+data[:crc_key])
-      end
+      params_new = {
+        :p24_merchant_id => params[:p24_merchant_id],
+        :p24_pos_id => params[:p24_pos_id],
+        :p24_session_id => params[:p24_session_id],
+        :p24_amount => Przelewy24Payment.make_p24_amount(data[:amount]),
+        :p24_currency => params[:p24_currency],
+        :p24_order_id => params[:p24_order_id]
+      }
+      params_new[:p24_sign] = Przelewy24Payment.verify_sign(data,params_new)
 
-      url = URI.parse(Przelewy24Payment.transaction_url)
+      url = URI.parse(Przelewy24Payment.verification_request_url)
       req = Net::HTTP::Post.new(url.path,{"User-Agent" => "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.10) Gecko/20100915 Ubuntu/10.04 (lucid) Firefox/3.6.10"})
       req.form_data = params_new
       con = Net::HTTP.new(url.host, 443)
       con.use_ssl = true
       con.verify_mode = OpenSSL::SSL::VERIFY_NONE
       response = con.start {|http| http.request(req)}
-      return response.body
+      return  Przelewy24Payment.parse_response response.body
     end
 
   end # InstanceMethods

data/lib/przelewy24_payment/version.rb

@@ -1,3 +1,3 @@
 module Przelewy24Payment
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/tasks/test_connection.rake

@@ -0,0 +1,18 @@
+require 'net/https'
+require 'net/http'
+require 'open-uri'
+require 'openssl'
+namespace :przelewy24_payment do
+  desc "Test if the connection with Przelewy24 is correct"
+  task :test_connection => :environment do
+    url = URI.parse(Przelewy24Payment.test_connection_url)
+    req = Net::HTTP::Post.new(url.path,{"User-Agent" => "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.10) Gecko/20100915 Ubuntu/10.04 (lucid) Firefox/3.6.10"})
+    req.form_data = Przelewy24Payment.test_connection_params
+    con = Net::HTTP.new(url.host, 443)
+    con.use_ssl = true
+    con.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    response = con.start {|http| http.request(req)}
+    puts Przelewy24Payment.parse_response response.body
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: przelewy24_payment
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Jakub Cieślar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies: []
 description: 'Integration with polish payment method: Przelewy24'
 email:
@@ -31,6 +31,7 @@ files:
 - lib/przelewy24_payment/engine.rb
 - lib/przelewy24_payment/przelewy24_payment_controller.rb
 - lib/przelewy24_payment/version.rb
+- lib/tasks/test_connection.rake
 - przelewy24_payment.gemspec
 homepage: https://github.com/jcieslar/przelewy24_payment
 licenses: []