spree_pag_seguro 1.0.0.beta22 → 1.0.0.beta23

data/app/controllers/spree/{base_controller_decorator.rb.rb → base_controller_decorator.rb}

@@ -6,7 +6,7 @@ Spree::BaseController.class_eval do
 			if (order.payment_state == "paid") or (order.payment_state == "credit_owed")
 				session[:order_id] = nil
 				order.line_items.destroy_all
-				flash[:notice] = t(:pp_ws_payment_received)
+				flash[:notice] = t(:pag_seguro_payment_received)
 			end
 		end
 	end

data/app/controllers/spree/pag_seguro_controller.rb

@@ -1,26 +1,70 @@
 module Spree
-  class PagSeguroController < Spree::BaseController
+  class PagSeguroController < BaseController
     protect_from_forgery :except => [:notify]
     
     def notify
-      email = Spree::PagSeguro::Config.email
-      token = Spree::PagSeguro::Config.token
-      notification_code = params[:notificationCode]
-      notification = ::PagSeguro::Notification.new(email, token, notification_code)
-      
-      logger.info "PagSeguro Notification code: #{notification_code}\n\n\n"
-      logger.info "PagSeguro Notification inspect:\n#{notification.inspect}"
+      notification = Spree::PaymentNotification.create_from_params(params)
       
       if notification.approved?
-        order = Spree::Order.find(notification.id)
-        order.next while order.state != 'confirm'
-        order.payment.complete
-        order.next while order.state != 'complete'
+        Order.transaction do
+          order = Spree::Order.find(notification.id)
+          
+          #create payment for this order
+          payment = Spree::Payment.new
+          
+          # 1. Assume that if payment notification comes, it's exactly for the amount
+          # sent to pagseguro (safe assumption -- cart can't be edited while on pagseguro)
+          # 2. Can't use Order#total, as it's intercepted by spree-multi-currency
+          # which might lead to lots of false "credit owed" payment states
+          # (when they should be "complete")
+          payment.amount = order.read_attribute(:total)
+          
+          payment.payment_method = Spree::Order.pag_seguro_payment_method
+          order.payments << payment
+          payment.started_processing
+          
+          order.payment.complete
+          
+          until @order.state == "complete"
+            if @order.next!
+              @order.update!
+              state_callback(:after)
+            end
+          end
+        end
       end
+      
       render nothing: true, head: :ok
     end
     
     def callback
     end
+    
+    protected
+      # those methods are copy-pasted from CheckoutController
+      # we cannot inherit from that class unless we want to skip_before_filter
+      # half of calls in SpreeBase module
+      def state_callback(before_or_after = :before)
+        method_name = :"#{before_or_after}_#{@order.state}"
+        send(method_name) if respond_to?(method_name, true)
+      end
+    
+      def before_address
+        @order.bill_address ||= Address.new
+        @order.ship_address ||= Address.new
+      end
+    
+      def before_delivery
+        @order.shipping_method ||= (@order.rate_hash.first && @order.rate_hash.first[:shipping_method])
+      end
+    
+      def before_payment
+        current_order.payments.destroy_all if request.put?
+      end
+    
+  		#This isn't working here in payment_nofitications_controller since IPN will run on a different session
+      def after_complete
+        session[:order_id] = nil
+      end    
   end
 end

data/app/models/spree/payment_notification.rb

@@ -2,15 +2,22 @@ module Spree
   class PaymentNotification < ActiveRecord::Base
     belongs_to :order
     serialize :params
-    after_create :mark_order_as_paid
     
-    private
-    
-    def mark_order_as_paid
-      if(status == "Completed")
-        logger.info "Order #{order.number} should be marked as paid now -- IPN status 'Completed'"
-        #order.update_attributes({:paid_on => Date.today, :status_id => Status.PAID.id})
-      end
+    def self.create_from_params(params)
+      email = Spree::PagSeguro::Config.email
+      token = Spree::PagSeguro::Config.token
+      notification_code = params[:notificationCode]
+      notification = ::PagSeguro::Notification.new(email, token, notification_code)
+
+      self.create!(
+        params: params,
+        order_id: notification.id,
+        status: notification.status,
+        transaction_id: notification.transaction_id,
+        notification_code: notification_code
+      )
+      
+      notification
     end
   end
 end

data/config/locales/pt-BR.yml

@@ -4,7 +4,7 @@ pt-BR:
   please_enter_valid_zip: "Por favor, coloque seu código postal."
   zip_code_if_you_have_one: "Código postal" 
   payment_failure: "Falha no Pagamento"
-  payment_pending: "Payment Pendente"
+  payment_pending: "Pagamento Pendente"
   check_out_with_pag_seguro: "Compre com o PagSeguro"
   pag_seguro_payment_received: "Obrigado. Nós recebemos seu pagamento para a órdem de compra. Sua compra será entregue em breve."
   pag_seguro_order_processed_successfully: "Obrigado. Sua compra foi processada com sucesso. Você será notificado assim que recebermos o comprovante de pagamento do PagSeguro"

data/db/migrate/20120106043500_create_spree_payment_notifications.rb

@@ -1,15 +1,12 @@
 class CreateSpreePaymentNotifications < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :spree_payment_notifications do |t|
       t.text :params
       t.string :status
       t.string :transaction_id
       t.integer :order_id
+      t.string :notification_code
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :spree_payment_notifications
-  end
 end

data/lib/generators/spree_pag_seguro/install/install_generator.rb

@@ -1,4 +1,4 @@
-module SpreePaypalWebsiteStandard
+module SpreePagSeguro
   module Generators
     class InstallGenerator < Rails::Generators::Base
       def add_migrations

metadata

@@ -1,96 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_pag_seguro
-version: !ruby/object:Gem::Version 
-  version: 1.0.0.beta22
+version: !ruby/object:Gem::Version
+  version: 1.0.0.beta23
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Gregg Pollack, Sean Schofield, Tomasz Stachewicz, Buddhi DeSilva
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-16 00:00:00 -02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: &2153101560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.rc1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: pag_seguro
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: *2153101560
+- !ruby/object:Gem::Dependency
+  name: pag_seguro
+  requirement: &2153100880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153100880
+- !ruby/object:Gem::Dependency
   name: capybara
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  requirement: &2153100140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  version_requirements: *2153100140
+- !ruby/object:Gem::Dependency
   name: factory_girl
+  requirement: &2153099680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2153099680
+- !ruby/object:Gem::Dependency
   name: ffaker
+  requirement: &2153099220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2153099220
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: &2153098720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.7"
-    version: 
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: *2153098720
+- !ruby/object:Gem::Dependency
   name: sqlite3
+  requirement: &2153098260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: Spree extension for integration with PagSeguro payment. Based on spree_pp_website_standart gem
+  prerelease: false
+  version_requirements: *2153098260
+description: Spree extension for integration with PagSeguro payment. Based on spree_pp_website_standart
+  gem
 email: tomekrs@o2.pl
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - LICENSE
 - lib/generators/spree_pag_seguro/install/install_generator.rb
@@ -102,7 +106,7 @@ files:
 - app/assets/javascripts/store/spree_paypal_website_standard.js
 - app/assets/stylesheets/admin/spree_paypal_website_standard.css
 - app/assets/stylesheets/store/spree_paypal_website_standard.css
-- app/controllers/spree/base_controller_decorator.rb.rb
+- app/controllers/spree/base_controller_decorator.rb
 - app/controllers/spree/checkout_controller_decorator.rb
 - app/controllers/spree/pag_seguro_controller.rb
 - app/controllers/spree/payment_notifications_controller.rb
@@ -118,33 +122,29 @@ files:
 - config/routes.rb
 - db/migrate/20120106043500_create_spree_payment_notifications.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/heavenstudio/spree-pag_seguro
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
-  version: 
-requirements: 
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Spree extension for integration with PagSeguro payment
 test_files: []
-