easypay 1.0.0 → 1.0.1

data/app/controllers/easypay/notifications_controller.rb

@@ -36,23 +36,24 @@ module Easypay
       #ep_cin=8103&ep_user=OUTITUDE&ep_doc=TESTOUTITUDE0088690520120712152503
       payment_detail = Easypay::Client.new.get_payment_detail("", params[:ep_doc])
       
-      payment_reference = PaymentReference.find_by_ep_reference_and_ep_key(payment_detail[:ep_reference], payment_detail[:t_key])
+      @payment_reference = PaymentReference.find_by_ep_reference_and_ep_key(payment_detail[:ep_reference], payment_detail[:t_key])
       
-      payment_reference.update_attributes(:ep_doc => payment_detail[:ep_doc],
-                                          :ep_payment_type => payment_detail[:ep_payment_type],
-                                          :ep_value_fixed => payment_detail[:ep_value_fixed],
-                                          :ep_value_var => payment_detail[:ep_value_var],
-                                          :ep_value_tax => payment_detail[:ep_value_tax],
-                                          :ep_value_transf => payment_detail[:ep_value_transf],
-                                          :ep_date_transf => payment_detail[:ep_date_transf],
-                                          :ep_date_read => payment_detail[:ep_date_read],
-                                          :ep_status_read => payment_detail[:ep_status_read],
-                                          :o_obs => payment_detail[:o_obs],
-                                          :ep_date => payment_detail[:ep_date],
-                                          :ep_status => 'finalized') unless payment_reference.nil?
-      
-      respond_to do |format|
-        format.xml
+      if @payment_reference.present? and !@payment_reference.ep_status.match('finalized')
+        
+        @payment_reference.update_attributes(:ep_doc => payment_detail[:ep_doc],
+                                            :ep_payment_type => payment_detail[:ep_payment_type],
+                                            :ep_value_fixed => payment_detail[:ep_value_fixed],
+                                            :ep_value_var => payment_detail[:ep_value_var],
+                                            :ep_value_tax => payment_detail[:ep_value_tax],
+                                            :ep_value_transf => payment_detail[:ep_value_transf],
+                                            :ep_date_transf => payment_detail[:ep_date_transf],
+                                            :ep_date_read => payment_detail[:ep_date_read],
+                                            :ep_status_read => payment_detail[:ep_status_read],
+                                            :o_obs => payment_detail[:o_obs],
+                                            :ep_date => payment_detail[:ep_date],
+                                            :ep_status => 'finalized') 
+                                            
+        redirect_to payment_notify_url(:payable_id => @payment_reference.payable_id)
       end
     end
     

data/app/controllers/easypay/payments_controller.rb

@@ -8,5 +8,14 @@ module Easypay
         format.html
       end
     end
+    
+    def notify
+      # After payment success
+      @payment_reference = PaymentReference.find_by_payable_id(params[:payable_id])
+      
+      respond_to do |format|
+        format.html
+      end
+    end
   end
 end

data/app/models/easypay/payment_reference.rb

@@ -20,8 +20,13 @@ module Easypay
                                 :ep_link => payment_reference[:payment_link],
                                 :ep_last_status => payment_reference[:ep_status],
                                 :request_log => payment_reference[:raw],
-                                :item_description => payment_reference[:item_description],
-                                :item_quantity => payment_reference[:item_quantity])
+                                :item_description => self.item_description,
+                                :item_quantity => self.item_quantity,
+                                :o_name  => self.o_name,
+                                :o_description  => self.o_description, 
+                                :o_obs => self.o_obs,
+                                :o_email => self.o_email,
+                                :o_mobile  => self.o_mobile)
                                 
         return payment_reference
       else

data/app/views/easypay/notifications/notification_from_payment.xml.builder

@@ -1,4 +1,14 @@
 xml.instruct! :xml, :version => "1.0", :encoding => "ISO-8859-1"
 xml.get_detail do
-  xml.ep_status "ok"
+  if @payment_reference.nil?
+    xml.ep_status "err1"
+    xml.ep_message "payment reference not found"
+  else
+    xml.ep_status "ok0"
+    xml.ep_message "doc gerado"
+    xml.ep_cin @payment_reference.ep_cin
+    xml.ep_user @payment_reference.ep_user
+    xml.ep_doc @payment_reference.ep_doc
+    xml.ep_key @payment_reference.ep_key
+  end
 end

data/app/views/easypay/payments/notify.html.erb

@@ -0,0 +1,3 @@
+<div>
+  You just received payment notification, refers to this <%=@payment_reference.id%>
+</div>

data/config/routes.rb

@@ -4,5 +4,6 @@ Rails.application.routes.draw do
   match Easypay::Engine.config.easypay_forward_path => 'easypay/notifications#notification_to_forward'
   match Easypay::Engine.config.easypay_payment_path => 'easypay/notifications#notification_from_payment'
   match Easypay::Engine.config.redirect_after_payment_path => 'easypay/payments#complete', :as => :payment_redirect
+  match Easypay::Engine.config.redirect_payment_notification_path => 'easypay/payments#notify', :as => :payment_notify
   
 end

data/easypay.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "easypay"
-  s.version     = "1.0.0"
+  s.version     = "1.0.1"
   s.authors     = ["Guilherme Pereira"]
   s.email       = ["guiferrpereira@gmail.com"]
   s.homepage    = ""

data/lib/easypay/client.rb

@@ -40,7 +40,7 @@ module Easypay
         :o_name =>  object.o_name.nil? ? "" : URI.escape(object.o_name),
         :o_description => object.o_description.nil? ? "" : URI.escape(object.o_description),
         :o_obs => object.o_obs.nil? ? "" : URI.escape(object.o_obs),
-        :o_mobile => object.o_mobile.nil? ? "" : object.o_mobile,
+        :o_mobile => object.o_mobile.nil? ? "" : URI.escape(object.o_mobile),
         :o_email => object.o_email.nil? ? "" : URI.escape(object.o_email)
         # :ep_rec => "yes", # Reccurrence stuff
         # :ep_rec_freq => recurrence,

data/lib/engine.rb

@@ -11,6 +11,8 @@ module Easypay
     config.easypay_forward_path = '/easypay/forwards.:format'
     config.easypay_payment_path = '/easypay/payments.:format'
     config.redirect_after_payment_path = '/easypay/completed'
+    config.redirect_payment_notification_path = '/easypay/payment_completed'
+    
     config.cin = 'cin provided by Easypay'
     config.user = 'user provided by Easypay'
     config.entity = 'entity provided by Easypay'
@@ -29,6 +31,7 @@ module Easypay
       config.easypay_forward_path += '/'  unless config.easypay_forward_path.last == '/'
       config.easypay_payment_path += '/'  unless config.easypay_payment_path.last == '/'
       config.redirect_after_payment_path += '/'  unless config.redirect_after_payment_path.last == '/'
+      config.redirect_payment_notification_path += '/'  unless config.redirect_payment_notification_path.last == '/'
     end
     
     initializer "static assets" do |app|

data/lib/rails/generators/easypay/templates/initializer.rb

@@ -5,6 +5,8 @@ module Easypay
     config.easypay_forward_path = '/easypay/forwards.:format'
     config.easypay_payment_path = '/easypay/payments.:format'
     config.redirect_after_payment_path = '/easypay/completed'
+    config.redirect_payment_notification_path = '/easypay/payment_completed'
+        
     config.cin = 'cin provided by Easypay'
     config.user = 'user provided by Easypay'
     config.entity = 'entity provided by Easypay'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: easypay
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Guilherme Pereira
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-12 00:00:00 Z
+date: 2012-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -53,6 +53,7 @@ files:
 - app/views/easypay/notifications/notification_from_payment.xml.builder
 - app/views/easypay/notifications/simple_notification.xml.builder
 - app/views/easypay/payments/complete.html.erb
+- app/views/easypay/payments/notify.html.erb
 - config/routes.rb
 - easypay.gemspec
 - lib/acts_as_payable/base.rb