payr 1.0 → 1.0.1

data/README.md

@@ -82,11 +82,12 @@ You can use the routes by default by adding this to your config/routes.rb
 	payr_routes
 ```
 
-This will generate 4 routes :
+This will generate 5 routes :
 
 ```sh
 $ > rake routes
 	payr_bills_pay          GET        /bills/pay(.:format)                payr/bills#pay
+	payr_bills_pay          POST       /bills/pay(.:format)                payr/bills#pay
 	payr_bills_paid         GET        /bills/paid(.:format)               payr/bills#paid
 	payr_bills_refused      GET        /bills/refused(.:format)            payr/bills#refused
 	payr_bills_cancelled    GET        /bills/cancelled(.:format)          payr/bills#cancelled
@@ -102,11 +103,12 @@ We recommand to override the controllers thoug. For that, define a custom contro
 
 If you created a app/controllers/paiement/callbacks controller.
 
-This will generate 4 routes :
+This will generate 5 routes :
 
 ```sh
 $ > rake routes
 	payr_bills_pay          GET        /paiement/callbacks/pay(.:format)                paiement/callbacks#pay
+	payr_bills_pay          POST       /paiement/callbacks/pay(.:format)                paiement/callbacks#pay
 	payr_bills_paid         GET        /paiement/callbacks/paid(.:format)               paiement/callbacks#paid
 	payr_bills_refused      GET        /paiement/callbacks/refused(.:format)            paiement/callbacks#refused
 	payr_bills_cancelled    GET        /paiement/callbacks/cancelled(.:format)          paiement/callbacks#cancelled
@@ -166,7 +168,14 @@ payr_bills_pay_path(article_id: pack.id,
 									  				 id: current_recruiter.id }, 
 									  total_price: pack.price.to_i*100 )
 ```
-
+You can also use the bill_reference parameter if you want to have a custom bill_parameter :
+```ruby
+payr_bills_pay_path(article_id: pack.id, 
+									  buyer: { email: current_recruiter.email, 
+									  				 id: current_recruiter.id }, 
+									  total_price: pack.price.to_i*100,
+									  bill_reference: "F00000001" )
+```
 This will call the bills#action and then redirect the user to the paybox paiement page.
 
 You can also override the views by creating the appropriate files :
@@ -235,4 +244,9 @@ rake
 
 i'll gladly add your work =)
 
+### TODO
+
+- add helper "after_payment_path", "after_cancelled_path" etc that can be overrided to avoid to override BillsControllers
+- improve documentation about what BillController does
+
 This project rocks and uses MIT-LICENSE.

data/app/controllers/payr/bills_controller.rb

@@ -1,52 +1,53 @@
 class Payr::BillsController < ApplicationController
-	before_filter :check_response, except: [:pay, :failure, :ipn]
-	before_filter :check_ipn_response, only: [:ipn]
+  before_filter :check_response, except: [:pay, :failure, :ipn]
+  before_filter :check_ipn_response, only: [:ipn]
 
-	UNPROCESSED = "unprocessed"
+  UNPROCESSED = "unprocessed"
   PAID = "paid"
   REFUSED = "refused"
   CANCELLED = "cancelled"
   SIGN_ERROR = "bad_signature"
   NO_ERROR = "00000"
   def pay
-  	@bill = Payr::Bill.new(buyer_id: params[:buyer][:id], 
-  								  			 amount: params[:total_price], 
-  								  			 article_id: params[:article_id], 
-  								  			 state: UNPROCESSED)
+    @bill = Payr::Bill.new(buyer_id: params[:buyer][:id], 
+                           amount: params[:total_price], 
+                           article_id: params[:article_id],
+                           state: UNPROCESSED,
+                           bill_reference: params[:bill_reference])
     @payr = Payr::Client.new
-  	if @bill.save
-			@paybox_params = @payr.get_paybox_params_from	command_id: @bill.id, 
-																										buyer_email: params[:buyer][:email], 
-																										total_price: params[:total_price],
-																										callbacks:  { 
-																																	paid: payr_bills_paid_url, 
-																																	refused: payr_bills_refused_url,   
-																																	cancelled: payr_bills_cancelled_url,
-																																	ipn: payr_bills_ipn_url
-																																}
-  	end
+    if @bill.save
+      @paybox_params = @payr.get_paybox_params_from command_id: @bill.id, 
+                                                    buyer_email: params[:buyer][:email], 
+                                                    total_price: params[:total_price],
+                                                    callbacks:  { 
+                                                                  paid: payr_bills_paid_url, 
+                                                                  refused: payr_bills_refused_url,   
+                                                                  cancelled: payr_bills_cancelled_url,
+                                                                  ipn: payr_bills_ipn_url
+                                                                }
+    end
   end
 
-	def paid
-		change_status params[:ref], PAID
-	end
+  def paid
+    change_status params[:ref], PAID
+  end
 
   def refused
-  	change_status params[:ref], REFUSED, params[:error]
+    change_status params[:ref], REFUSED, params[:error]
   end
 
   def cancelled
-  	change_status params[:ref], CANCELLED, params[:error]
+    change_status params[:ref], CANCELLED, params[:error]
   end
 
   def ipn
-  	if params[:error] == NO_ERROR
-  		change_status params[:ref], PAID
-  	else
-  		@bill = Payr::Bill.find(params[:ref])
-			@bill.update_attribute(:error_code, params[:error])
-  	end
-  	render nothing: true, :status => 200, :content_type => 'text/html'
+    if params[:error] == NO_ERROR
+      change_status params[:ref], PAID
+    else
+      @bill = Payr::Bill.find(params[:ref])
+      @bill.update_attribute(:error_code, params[:error])
+    end
+    render nothing: true, :status => 200, :content_type => 'text/html'
   end
 
   def failure
@@ -55,9 +56,9 @@ class Payr::BillsController < ApplicationController
 
   protected
   def change_status id, status, error=nil
-  	@bill = Payr::Bill.find(id)
-		@bill.update_attribute(:state, status)
-		@bill.update_attribute(:error_code, error) unless error.nil?
+    @bill = Payr::Bill.find(id)
+    @bill.update_attribute(:state, status)
+    @bill.update_attribute(:error_code, error) unless error.nil?
   end
 
 end

data/app/models/payr/bill.rb

@@ -1,3 +1,3 @@
 class Payr::Bill < ActiveRecord::Base
-  attr_accessible :amount, :article_id, :buyer_id, :state
+  attr_accessible :amount, :article_id, :buyer_id, :state, :bill_reference
 end

data/lib/generators/templates/migration.rb

@@ -6,6 +6,7 @@ class CreateBillsTable < ActiveRecord::Migration
       t.integer :amount
       t.string :state
       t.string :error_code
+      t.string :bill_reference
       t.timestamps
     end
   end

data/lib/payr/rails/routes.rb

@@ -1,11 +1,18 @@
 module ActionDispatch::Routing
 	class Mapper
-		def payr_routes(options={})			
-			["pay", "paid", "refused", "cancelled", "ipn", "failure"].each do |action|
+		def payr_routes(options={})
 				if options && options[:callback_controller]
-					get   "#{options[:callback_controller]}/#{action}", as: "payr_bills_#{action}"
+					get "#{options[:callback_controller]}/pay", as: "payr_bills_pay"
+					post "#{options[:callback_controller]}/pay", as: "payr_bills_pay"
 				else
-					get   "payr/bills/#{action}", as: "payr_bills_#{action}"
+					get "payr/bills/pay", as: "payr_bills_pay"
+					post "payr/bills/pay", as: "payr_bills_pay"
+				end
+			["paid", "refused", "cancelled", "ipn", "failure"].each do |action|
+				if options && options[:callback_controller]
+					get "#{options[:callback_controller]}/#{action}", as: "payr_bills_#{action}"
+				else
+					get "payr/bills/#{action}", as: "payr_bills_#{action}"
 				end
 			end
 		end

data/lib/payr/version.rb

@@ -1,3 +1,3 @@
 module Payr
-  VERSION = "1.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: payr
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -138,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -750663748071489907
+      hash: 2281109692306427172
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -750663748071489907
+      hash: 2281109692306427172
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24