spree_pag_seguro 1.0.0.rc1 → 1.0.0.rc2

data/app/controllers/spree/pag_seguro_controller.rb

@@ -10,28 +10,12 @@ module Spree
         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
       
@@ -41,31 +25,5 @@ module Spree
     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/order_decorator.rb

@@ -1,10 +1,6 @@
 Spree::Order.class_eval do
   has_many :payment_notifications
   
-  def shipment_cost
-    adjustment_total - credit_total
-  end
-  
   def payable_via_pag_seguro?
     !!self.class.pag_seguro_payment_method
   end

data/app/models/spree/pag_seguro_payment.rb

@@ -0,0 +1,34 @@
+module Spree
+  class PagSeguroPayment < ActiveRecord::Base
+    attr_accessor :order_id
+    has_one :payment, :as => :source
+    
+    def process!(payment)
+      order = payment.order
+      
+      redirect_url = Rails.env.development? ? nil : "#{root_url}pag_seguro/callback"
+
+      pag_seguro_payment = ::PagSeguro::Payment.new(
+        Order.pag_seguro_payment_method.preferred_email,
+        Order.pag_seguro_payment_method.preferred_token,
+        redirect_url: redirect_url,
+        id: order.id)
+
+      pag_seguro_payment.items = order.line_items.map do |item|
+        ::PagSeguro::Item.new(
+          id: item.id,
+          description: item.product.name,
+          amount: format("%.2f", item.price.round(2)),
+          quantity: item.quantity,
+          weight: ( item.product.weight * 1000 ).to_i
+        )
+      end
+
+      pag_seguro_payment.sender = ::PagSeguro::Sender.new(name: order.name, email: order.email, phone_number: order.ship_address.phone)
+      pag_seguro_payment.shipping = ::PagSeguro::Shipping.new(type: ::PagSeguro::Shipping::SEDEX, state: order.ship_address.state.abbr, city: order.ship_address.city, postal_code: order.ship_address.zipcode, street: order.ship_address.address1, complement: order.ship_address.address2)
+      self.code = pag_seguro_payment.code
+      self.date = pag_seguro_payment.date
+      self.save
+    end
+  end
+end

data/app/models/spree/payment_method/pag_seguro_method.rb

@@ -3,6 +3,10 @@ module Spree
     preference :email, :string
     preference :token, :string
     
+    def payment_source_class
+      PagSeguroPayment
+    end
+    
     def actions
       %w{capture void}
     end
@@ -28,9 +32,5 @@ module Spree
       payment.void
       true
     end
-
-    def source_required?
-      false
-    end
   end
 end

data/app/overrides/replace_payment_info.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  virtual_path: "spree/shared/_order_details",
+  name: "replace_payment_info",
+  insert_bottom: ".payment-info",
+  partial: "spree/checkout/payment/order_details"
+)

data/app/views/spree/checkout/payment/_order_details.html.erb

@@ -0,0 +1,8 @@
+<% if @order.payment_method.instance_of? Spree::PaymentMethod::PagSeguroMethod %>
+  <% if @order.payment.completed? %>
+    Seu pagamento foi aprovado pelo PagSeguro através da transação de código: <%= @order.payment_notifications.last.transaction_id if @order.payment_notifications.present? %>
+  <% else %>
+    Clique na imagem abaixo para realizar o pagamento através do Pag Seguro.
+    <%= link_to image_tag("pag_seguro_checkout.gif"), PagSeguro::Payment.checkout_payment_url(@order.payment.source.code) %>
+  <% end %>
+<% end %>

data/app/views/spree/checkout/payment/_pagseguromethod.html.erb

@@ -0,0 +1,2 @@
+<%= image_tag "pag_seguro_checkout.gif" %>
+<%= hidden_field "payment_source[#{payment_method.id}]", 'order_id', value: @order.id %>

data/db/migrate/20120216223731_create_db:migrate:20120216223950_create_spree_pag_seguro_payments.rb

@@ -0,0 +1,8 @@
+class CreateSpreePagSeguroPayments < ActiveRecord::Migration
+  def change
+    create_table :spree_pag_seguro_payments do |t|
+      t.string :code
+      t.datetime :date
+    end
+  end
+end

data/lib/spree_pag_seguro/engine.rb

@@ -9,10 +9,6 @@ module Spree
         end
       end
     
-      initializer "spree.pag_seguro.preferences", after: "spree.active_shipping.configuration" do |app|
-        Spree::PagSeguro::Config = Spree::PagSeguroConfiguration.new
-      end
-      
       initializer "spree.resgiter.pag_seguro_method", after: "spree.register.payment_methods" do |app|
         app.config.spree.payment_methods << Spree::PaymentMethod::PagSeguroMethod
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_pag_seguro
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &2164367840 !ruby/object:Gem::Requirement
+  requirement: &2152906320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 1.0.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *2164367840
+  version_requirements: *2152906320
 - !ruby/object:Gem::Dependency
   name: pag_seguro
-  requirement: &2164365240 !ruby/object:Gem::Requirement
+  requirement: &2152905860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *2164365240
+  version_requirements: *2152905860
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2164362080 !ruby/object:Gem::Requirement
+  requirement: &2152905400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2164362080
+  version_requirements: *2152905400
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2164359240 !ruby/object:Gem::Requirement
+  requirement: &2152905020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164359240
+  version_requirements: *2152905020
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &2164358020 !ruby/object:Gem::Requirement
+  requirement: &2152904560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164358020
+  version_requirements: *2152904560
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2164356860 !ruby/object:Gem::Requirement
+  requirement: &2152904060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2164356860
+  version_requirements: *2152904060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2164356040 !ruby/object:Gem::Requirement
+  requirement: &2152903640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164356040
+  version_requirements: *2152903640
 description: Spree extension for integration with PagSeguro payment. Based on spree_pp_website_standart
   gem
 email: tomekrs@o2.pl
@@ -100,28 +100,26 @@ files:
 - lib/generators/spree_pag_seguro/install/install_generator.rb
 - lib/spree_pag_seguro/engine.rb
 - lib/spree_pag_seguro.rb
-- lib/spree_pag_seguro_configuration.rb
 - app/assets/images/pag_seguro_checkout.gif
 - app/assets/javascripts/admin/spree_paypal_website_standard.js
 - 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
-- app/controllers/spree/checkout_controller_decorator.rb
 - app/controllers/spree/pag_seguro_controller.rb
-- app/controllers/spree/payment_notifications_controller.rb
 - app/models/spree/order_decorator.rb
+- app/models/spree/pag_seguro_payment.rb
 - app/models/spree/payment_method/pag_seguro_method.rb
 - app/models/spree/payment_notification.rb
+- app/overrides/replace_payment_info.rb
 - app/views/spree/admin/orders/_pag_seguro_txns.html.erb
-- app/views/spree/checkout/_pag_seguro_checkout.html.erb
-- app/views/spree/checkout/edit.html.erb
+- app/views/spree/checkout/payment/_order_details.html.erb
+- app/views/spree/checkout/payment/_pagseguromethod.html.erb
 - app/views/spree/pag_seguro/callback.html.haml
-- app/views/spree/pag_seguro_payments/successful.html.erb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
 - config/routes.rb
 - db/migrate/20120106043500_create_spree_payment_notifications.rb
+- db/migrate/20120216223731_create_db:migrate:20120216223950_create_spree_pag_seguro_payments.rb
 - spec/spec_helper.rb
 homepage: http://github.com/heavenstudio/spree-pag_seguro
 licenses: []

data/app/controllers/spree/base_controller_decorator.rb

@@ -1,13 +0,0 @@
-Spree::BaseController.class_eval do
-	before_filter :check_current_order
-	def check_current_order
-		if current_order or session[:order_id]
-			order = current_order
-			if (order.payment_state == "paid") or (order.payment_state == "credit_owed")
-				session[:order_id] = nil
-				order.line_items.destroy_all
-				flash[:notice] = t(:pag_seguro_payment_received)
-			end
-		end
-	end
-end

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -1,38 +0,0 @@
-Spree::CheckoutController.class_eval do  
-  def edit
-    if ((@order.state == "payment") && @order.valid?)
-      puts "valid, processing"
-      if @order.payable_via_pag_seguro?
-        puts "payable via pag_seguro, adding payment"
-        payment = Spree::Payment.new
-        payment.amount = @order.total
-        payment.payment_method = Spree::Order.pag_seguro_payment_method
-        @order.payments << payment
-        
-        redirect_url = Rails.env.development? ? nil : "#{root_url}pag_seguro/callback"
-        
-        pag_seguro_payment = PagSeguro::Payment.new(
-          Spree::Order.pag_seguro_payment_method.preferred_email,
-          Spree::Order.pag_seguro_payment_method.preferred_token,
-          redirect_url: redirect_url,
-          id: @order.id)
-       
-        pag_seguro_payment.items = @order.line_items.map do |item|
-          PagSeguro::Item.new(
-            id: item.id,
-            description: item.product.name,
-            amount: format("%.2f", item.price.round(2)),
-            quantity: item.quantity,
-            weight: ( item.product.weight * 1000 ).to_i
-          )
-        end
-       
-        pag_seguro_payment.sender = PagSeguro::Sender.new(name: @order.name, email: @order.email, phone_number: @order.ship_address.phone)
-        pag_seguro_payment.shipping = PagSeguro::Shipping.new(type: PagSeguro::Shipping::SEDEX, state: @order.ship_address.state.abbr, city: @order.ship_address.city, postal_code: @order.ship_address.zipcode, street: @order.ship_address.address1, complement: @order.ship_address.address2)
-       
-        @pag_seguro_url = pag_seguro_payment.checkout_payment_url
-        payment.started_processing
-      end
-    end
-  end
-end

data/app/controllers/spree/payment_notifications_controller.rb

@@ -1,79 +0,0 @@
-module Spree
-  class PaymentNotificationsController < BaseController
-    protect_from_forgery :except => [:create]
-    skip_before_filter :restriction_access
-    
-    def create
-      @order = Spree::Order.find_by_number(params[:invoice])
-      Spree::PaymentNotification.create!(:params => params,
-        :order_id => @order.id,
-        :status => params[:payment_status],
-        :transaction_id => params[:txn_id])
-      
-      logger.info "PagSeguro: processing payment notification for invoice #{params["invoice"]}, amount is #{params["mc_gross"]} #{params["mc_currency"]}"
-      # this logging stuff won't live here for long...
-      
-      Order.transaction do
-      # main part of hacks
-        order = @order
-        
-        #create payment for this order
-        payment = Spree::Payment.new
-        
-        # 1. Assume that if payment notification comes, it's exactly for the amount
-        # sent to paypal (safe assumption -- cart can't be edited while on paypal)
-        # 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)
-        logger.info "PagSeguro: set payment.amount to #{payment.amount} based on order's total #{order.read_attribute(:total)}"
-        
-        payment.payment_method = Spree::Order.pag_seguro_payment_method
-        order.payments << payment
-        payment.started_processing
-        
-        order.payment.complete
-        logger.info("PagSeguro: order #{order.number} (#{order.id}) -- completed payment")
-
-        until @order.state == "complete"
-          if @order.next!
-            @order.update!
-            state_callback(:after)
-          end
-        end
-
-        logger.info("PagSeguro: Order #{order.number} (#{order.id}) updated successfully")
-      end
-      
-      render :nothing => true
-    end
-    
-    private
-
-    # 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/views/spree/checkout/_pag_seguro_checkout.html.erb

@@ -1,3 +0,0 @@
-<%= link_to @pag_seguro_url do %>
-  <%= image_tag "pag_seguro_checkout.gif" %>
-<% end %>

data/app/views/spree/checkout/edit.html.erb

@@ -1,28 +0,0 @@
-<% content_for :head do %>
-  <%= javascript_include_tag '/states' %>
-<% end %>
-<div id="checkout">
-  <h1><%= t("checkout")%></h1>
-  <%= checkout_progress %>
-  <br clear="left" />
-  <%= render "spree/shared/error_messages", :target => @order %>
-  <%= hook :checkout_summary_box do %>
-    <div id="checkout-summary">
-      <%= render 'summary', :order => @order %>
-    </div>
-  <% end %>
-
-
-  <% if(@order.state == "payment") %>
-        <%= render('spree/checkout/pag_seguro_checkout') if @order.payable_via_pag_seguro?  %>
-  <% else %>
-      <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
-        <%= render @order.state, :form => form %>
-        <input id="post-final" type="submit" style="display:none"/>
-      <% end %>
-  <% end %>
-</div>
-
-<div id="payment_step">
-
-</div>

data/app/views/spree/pag_seguro_payments/successful.html.erb

@@ -1 +0,0 @@
-SUCCESS!

data/lib/spree_pag_seguro_configuration.rb

@@ -1,6 +0,0 @@
-module Spree
-  class PagSeguroConfiguration < Spree::Preferences::Configuration
-    preference :email, :string, default: "seu_email_cadastrado@pag_seguro.com.br"
-    preference :token, :string, default: "SEUTOKENNOPASEGURO"
-  end
-end