opay 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 747aa37e7c6ff0a8eeb4390278429281ef59c10e
-  data.tar.gz: daee2818c97f3f244a910ea6e3c4352d772843ee
+  metadata.gz: 1e8f928442b8ec8574bf991b8cb84f432db244dc
+  data.tar.gz: d2e823a50f0fb5bfeb025e85585cfd4c3092528b
 SHA512:
-  metadata.gz: d293a80d291ed13cce69aaeab38f5b0ac585f8802c01f10504dfa5701e14e739cc2e1559038afed62ec5414fa1891e6de153c862e58e1f080042d85db8f73e3f
-  data.tar.gz: ea0d95847596742c92461c221e7b8f284f3c1067589545251aa36ac8c0968e52afeac7e52de3348fd4b2ff4feb649372a9cdc6712fe047262d15fefe201bc402
+  metadata.gz: bff5fbf5fcbe35af5d6d488a60db457da8ea020b5de434be6baae7254a4e36c5b1c43eea565b96a1a7c175eb6551e51fa58d37b6c46be741e4c8d81d50c2fc91
+  data.tar.gz: 4efcc5b64ec2b30ccac4158eef60cf6c72d2e67bf353a30393359ccb6ecca570c8ad9b335021808770779ee9ff38be7a0f964bbbc916981906b94a2c41e4cfd4

data/README.md

@@ -2,7 +2,11 @@
 
 # Opay
 
-Opay is a payu.pl payment provider for Rails apps.
+Opay is a payment solution for Rails apps.
+
+Currently supported engines:
+* payu
+* paypal express payment
 
 ## Installation
 
@@ -28,6 +32,9 @@ then add the following to your routes.rb file:
 
 ``` ruby
 # config/routes.rb
+get 'success' => 'controller#success', as: :success_payment
+get 'cancel' => 'controller#cancel', as: :cancel_payment
+
 mount Opay::Engine => '/opay'
 ```
 
@@ -36,15 +43,29 @@ declare which of your models recive payments
 ``` ruby
 class ModelName < ActiveRecord::Base
   include Opay::Payable
+
+  after_payment do
+    # optional after payment callback
+  end
+
+  def amount
+    100
+  def
 end
 ```
 
 create payment form
 
 ``` haml
-= opay_form_for(@model_name) do |f|
+= opay_form_for(@model_name, provider: :payu) do |f|
   = f.payment_info first_name: 'Jan', last_name: 'Kowalski', email: 'kowalski@gmail.com', desc: 'Payment description'
   = f.submit 'pay with payu'
 ```
 
+``` haml
+= opay_form_for(@model_name, provider: :paypal) do |f|
+  = f.payment_info desc: 'Test payment', client_ip: '127.0.0.1'
+  = f.submit 'pay with payu'
+```
+
 set up online url in payu.pl to: `/opay/payu/online`

data/app/controllers/opay/paypal_controller.rb

@@ -4,15 +4,20 @@ module Opay
   class PaypalController < ApplicationController
     def new
       unless Opay.config.process_payments_localy
-        redirect_to Providers::Paypal.create_payment(params[:session_id], params[:desc], params[:client_ip])
+        redirect_to Providers::Paypal.create_payment(
+          params[:session_id],
+          params[:desc],
+          params[:client_ip],
+          params[:confirm_url],
+          params[:cancel_url],
+        )
       end
     end
 
-    def create
-      if Providers::Paypal.confirm_payment(params[:token], params[:PayerID], request.remote_ip)
+    def confirm
+      if Providers::Paypal.process(params[:token], params[:PayerID], request.remote_ip)
         redirect_to main_app.root_path, notice: I18n.t('opay.payment.success')
       end
-      # render text: Providers::Payu.process(params[:pos_id], params[:session_id], params[:ts], params[:sig]) ? 'OK' : ''
     end
   end
 end

data/config/routes.rb

@@ -11,8 +11,8 @@ Opay::Engine.routes.draw do
 
   # paypal
   scope 'paypal' do
-    patch 'new' => 'paypal#new', as: :new_paypal_payment
-    get 'create' => 'paypal#create', as: :paypals_path
+    patch 'new' => 'paypal#new', as: :paypal_new_payment
+    get 'confirm' => 'paypal#confirm', as: :paypal_confirm_payment
   end
 
   if Opay.config.process_payments_localy

data/lib/generators/opay/templates/opay_config.rb

@@ -4,6 +4,9 @@ Opay.configure do |config|
   config.test_mode = true
   # config.process_payments_localy = true if Rails.env.development?
 
+  config.success_url = :success_payment_url
+  config.cancel_url = :cancel_payment_url
+
   # payu configuration
   config.payu_pos_id = ENV['PAYU_POS_ID']
   config.payu_pos_auth_key = ENV['PAYU_POS_AUTH_KEY']

data/lib/opay/configuration.rb

@@ -21,8 +21,8 @@ module Opay
       config_accessor :test_mode
       config_accessor :process_payments_localy
 
-      config_accessor :success_path
-      config_accessor :cancel_path
+      config_accessor :success_url
+      config_accessor :cancel_url
 
       reset_config
     end
@@ -38,6 +38,9 @@ module Opay
         configure do |config|
           config.providers = [:payu, :paypal]
 
+          config.success_url = :success_payment_url
+          config.cancel_url = :cancel_payment_url
+
           # payu configuration
           config.payu_pos_id = ENV['PAYU_POS_ID']
           config.payu_pos_auth_key = ENV['PAYU_POS_AUTH_KEY']

data/lib/opay/helpers/form_helper.rb

@@ -5,11 +5,28 @@ module Opay
 
       def opay_form_for(record, options = {}, &block)
         # for future purposes
-        payu_form_for(record, options, &block)
+        @payment_provider = options[:provider]
+
+        raise ArgumentError, 'Empty payment provider' if @payment_provider.blank? || Opay.config.providers.include?(@payment_provider) == false
+
+        case @payment_provider
+        when :payu
+          return payu_form_for(record, options, &block)
+        when :paypal
+          return paypal_form_for(record, options, &block)
+        end
+
       end
 
       def payment_info(options = {})
-        payu_payment_info(options)
+        raise ArgumentError, 'Empty payment provider' if @options[:provider].blank? || Opay.config.providers.include?(@options[:provider]) == false
+
+        case @options[:provider]
+        when :payu
+          payu_payment_info(options)
+        when :paypal
+          paypal_payment_info(options)
+        end
       end
 
     end

data/lib/opay/helpers/paypal_helper.rb

@@ -7,13 +7,15 @@ module Opay
         record.prepare_payment
 
         options[:builder] ||= Opay::FormBuilder
-        options[:url]  = opay.new_paypal_payment_path
+        options[:url]  = opay.paypal_new_payment_path
         options[:html] = { id: "paypal_payment_form_#{record.id}", class: 'opay-form opay-paypal-form' }
 
         form_for(record, options, &block)
       end
 
       def paypal_payment_info(options = {})
+        options[:confirm_url] ||= @template.opay.paypal_confirm_payment_url
+        options[:cancel_url] ||= @template.main_app.send(Opay.config.cancel_url)
         options[:session_id] ||= object.payment_session_id
         options[:amount]     ||= object.amount
 

data/lib/opay/providers/paypal.rb

@@ -2,20 +2,14 @@ module Opay
   module Providers
 
     class Paypal
-      PAYU_URL = 'https://www.platnosci.pl/paygw/UTF'
-
-      def self.process(pos_id, session_id, ts, sig)
-        return false
-      end
-
-      def self.create_payment(session_id, description, ip)
+      def self.create_payment(session_id, description, ip, confirm_url, cancel_url)
         # for future items list
         payment = Opay::Payment.where(session_id: session_id).first!
 
         response = geteway.setup_purchase(payment.amount.to_i,
           ip: ip,
-          return_url: 'http://localhost:3000/opay/paypal/create',
-          cancel_return_url: 'http://localhost:3000/?cancel',
+          return_url: confirm_url,
+          cancel_return_url: cancel_url,
           order_id: session_id,
           items: [{
             name: description,
@@ -31,7 +25,7 @@ module Opay
         end
       end
 
-      def self.confirm_payment(token, payer_id, ip)
+      def self.process(token, payer_id, ip)
         payment = Opay::Payment.where(session_id: token).first!
 
         if Opay.config.process_payments_localy

data/lib/opay/version.rb

@@ -1,3 +1,3 @@
 module Opay
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/dummy/config/initializers/opay_config.rb

@@ -3,6 +3,9 @@
 Opay.configure do |config|
   config.providers = [:payu, :paypal]
 
+  # config.success_url = :success_payment_path
+  # config.cancel_url = :cancel_payment_path
+
   # payu configuration
   config.payu_pos_id = 123456
   config.payu_pos_auth_key = 'DiEKzTD'

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '208a3c5620024393a948003c0ac3e620bb8c623adc1b6bbe6921584a4c3fd358712c5cea0e56451b71c811dcd3b8fd5bbf5327c062c9b45f5540b897991bd4c2'
+Dummy::Application.config.secret_key_base = '208a3c5620024393a948003c0ac3e620bb8c623adc1b6bbe6921584a4c3fd358712c5cea0e56451b71c811dcd3b8fd5bbf5327c062c9b45f5540b897991bd4c2'

data/spec/dummy/config/routes.rb

@@ -1,5 +1,9 @@
 Rails.application.routes.draw do
   root to: 'orders#index'
   resources :orders
+
+  get 'success' => 'payments#success', as: :success_payment
+  get 'cancel' => 'payments#cancel', as: :cancel_payment
+
   mount Opay::Engine => '/opay'
 end