spree_pag_seguro 1.0.0.beta25 → 1.0.0.rc1

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -8,19 +8,22 @@ Spree::CheckoutController.class_eval do
         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::PagSeguro::Config.email,
-          Spree::PagSeguro::Config.token,
-          redirect_url: "#{root_url}/pag_seguro/callback",
+          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.collect do |item|
+        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,
+            weight: ( item.product.weight * 1000 ).to_i
           )
         end
        

data/app/models/spree/order_decorator.rb

@@ -6,11 +6,10 @@ Spree::Order.class_eval do
   end
   
   def payable_via_pag_seguro?
-    # !!self.class.pag_seguro_payment_method
-    true
+    !!self.class.pag_seguro_payment_method
   end
   
   def self.pag_seguro_payment_method
-    Spree::PaymentMethod.select{ |pm| pm.name.downcase =~ /pag_seguro/}.first
+    Spree::PaymentMethod.where(type: "Spree::PaymentMethod::PagSeguroMethod").first
   end
 end

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

@@ -1,5 +1,8 @@
 module Spree
   class PaymentMethod::PagSeguroMethod < PaymentMethod
+    preference :email, :string
+    preference :token, :string
+    
     def actions
       %w{capture void}
     end

data/app/models/spree/payment_notification.rb

@@ -4,8 +4,8 @@ module Spree
     serialize :params
     
     def self.create_from_params(params)
-      email = Spree::PagSeguro::Config.email
-      token = Spree::PagSeguro::Config.token
+      email = Order.pag_seguro_payment_method.preferred_email
+      token = Order.pag_seguro_payment_method.preferred_token
       notification_code = params[:notificationCode]
       notification = ::PagSeguro::Notification.new(email, token, notification_code)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_pag_seguro
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta25
+  version: 1.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &2165222840 !ruby/object:Gem::Requirement
+  requirement: &2164367840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *2165222840
+  version_requirements: *2164367840
 - !ruby/object:Gem::Dependency
   name: pag_seguro
-  requirement: &2165222380 !ruby/object:Gem::Requirement
+  requirement: &2164365240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165222380
+  version_requirements: *2164365240
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2165221880 !ruby/object:Gem::Requirement
+  requirement: &2164362080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2165221880
+  version_requirements: *2164362080
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2165221480 !ruby/object:Gem::Requirement
+  requirement: &2164359240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165221480
+  version_requirements: *2164359240
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &2165220940 !ruby/object:Gem::Requirement
+  requirement: &2164358020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165220940
+  version_requirements: *2164358020
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2165220360 !ruby/object:Gem::Requirement
+  requirement: &2164356860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2165220360
+  version_requirements: *2164356860
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2165219680 !ruby/object:Gem::Requirement
+  requirement: &2164356040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165219680
+  version_requirements: *2164356040
 description: Spree extension for integration with PagSeguro payment. Based on spree_pp_website_standart
   gem
 email: tomekrs@o2.pl