db/migrate/20081225222501_add_address_fields.rb @@ -37,7 +37,7 @@ task :stats => "spec:statsetup" desc "Run all specs in spec directory" Spec::Rake::SpecTask.new(:spec) do |t| t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] - t.spec_files = FileList['spec/**/*_spec.rb'] + t.spec_files = FileList["#{extension_root}/spec/**/*_spec.rb"] end namespace :spec do Rakefile @@ -80,7 +80,7 @@ class Notification < ActiveRecord::Base self.items_total = self.items_price + self.items_shipping_price + self.items_extras # Verify if the total order value in the notification is the same as in the order. unless self.items_total == self.order.total - errors.add(:order, "total não confere com a notificação, pedido: #{self.order.total}, notificação: #{self.items_price}.") + errors.add(:order, "total não confere com a notificação, pedido: #{self.order.total}, notificação: #{self.items_total}.") end end end @@ -139,7 +139,7 @@ class Notification < ActiveRecord::Base self.order = Order.find_by_number(self.Referencia) # Define the shipping type as defined by the store if nothing was received. - self.TipoFrete = "FR" if self.TipoFrete.empty? + self.TipoFrete = "FR" if self.TipoFrete.nil? || self.TipoFrete.empty? return true end app/models/notification.rb @@ -28,7 +28,7 @@ module Spree #:nodoc: order.line_items.each_with_index do |item, index| data_to_transmit.merge!( - "item_id_#{index + 1}" => item.variant.product.sku, + "item_id_#{index + 1}" => item.variant.sku, "item_descr_#{index + 1}" => item.variant.product.name, "item_quant_#{index + 1}" => item.quantity.to_s, "item_valor_#{index + 1}" => (item.price*100).to_i.to_s @@ -41,7 +41,6 @@ module Spree #:nodoc: end string = data_to_transmit.map {|k,v| "#{CGI::escape(k.to_s)}=#{CGI::escape(v.to_s)}" }.join('&') - end module_function :data_to_send lib/spree/pagseguro/checkout_data.rb @@ -7,6 +7,12 @@ class PsSpreeOwnCartExtension < Spree::Extension url "http://github.com/edmundo/spree-ps-spree-own-cart/tree/master" def activate + Address.class_eval do + validates_presence_of :number + validates_presence_of :borough + validates_presence_of :area_code + validates_numericality_of :area_code, :integer_only => true + end # Add a partial for PagSeguro Payment txns Admin::OrdersController.class_eval do @@ -31,20 +37,40 @@ class PsSpreeOwnCartExtension < Spree::Extension # end # end + OrdersHelper.class_eval do + def to_iso(text) + Iconv.iconv('iso-8859-1', 'utf-8', text).to_s + end + + def to_utf(text) + Iconv.iconv('utf-8', 'iso-8859-1', text).to_s + end + end + OrdersController.class_eval do + before_filter :set_charset, :only => :transmit + def set_charset + headers["Content-Type"] = "text/html; charset=ISO-8859-1" + end + include Spree::Pagseguro::PostsData before_filter :load_object, :only => [:checkout, :confirmation, :transmit, :finished] skip_before_filter :verify_authenticity_token, :only => [:transmit] +# skip_before_filter :verify_authenticity_token, :only => [:confirmation] + def confirmation # Mark the order as "ready to transmit" if @order.state == "shipment" @order.next! end + end def transmit + require 'iconv' + if Spree::Pagseguro::Config[:always_use_sandbox] || RAILS_ENV == 'development' pagseguro_url = Spree::Pagseguro::Config[:sandbox_billing_url] else @@ -64,20 +90,20 @@ class PsSpreeOwnCartExtension < Spree::Extension session[:order_id] = nil end - payload = Spree::Pagseguro::CheckoutData.data_to_send(@order) - - # If we are waiting for payment response the checkout is complete - if object.checkout_complete - # Transmit the form to PagSeguro - if Spree::Pagseguro::Config[:always_use_sandbox] || RAILS_ENV == 'development' - response = post(pagseguro_url, payload, 'Content-Length' => "#{payload.size}") - else - response = ssl_post(pagseguro_url, payload, 'Content-Length' => "#{payload.size}") - end - - # Render the payment screen. - render :inline => response - end +# payload = Spree::Pagseguro::CheckoutData.data_to_send(@order) + +# # If we are waiting for payment response the checkout is complete +# if object.checkout_complete +# # Transmit the form to PagSeguro +# if Spree::Pagseguro::Config[:always_use_sandbox] || RAILS_ENV == 'development' +# response = post(pagseguro_url, payload, 'Content-Length' => "#{payload.size}") +# else +# response = ssl_post(pagseguro_url, payload, 'Content-Length' => "#{payload.size}") +# end + +# render :inline => response +# end + render :layout => false end def finished ps_spree_own_cart_extension.rb @@ -6,13 +6,12 @@ module NotificationSpecHelper Spree::Pagseguro::Config.set({:account => "test@example.com"}) order = mock_model(Order, :null_object => true) - order.stub!(:total).and_return(5.23 * 2) + order.stub!(:total).and_return((5.23 * 2) + 10.99) { :VendedorEmail => "test@example.com", :TransacaoID => "123XYZ", :Referencia => "1", :TipoFrete => "FR", - :ValorFrete => 10.99, :Anotacao => "Here goes some notes.", :DataTransacao => "01/01/2008 12:30:10", :TipoPagamento => "Cartão de Crédito", @@ -31,8 +30,8 @@ module NotificationSpecHelper :ProdDescricao_1 => "Nothing", :ProdValor_1 => 5.23, :ProdQuantidade_1 => 2, - :ProdFrete_1 => 2.30, - :ProdExtras_1 => 1.20, + :ProdExtras_1 => 0, + :ProdFrete_1 => 10.99, :NumItens => 1, :order => order } @@ -117,7 +116,7 @@ describe Notification do @notification.attributes = valid_notification_attributes @notification.order.stub!(:total).and_return(99) @notification.should_not be_valid - @notification.errors.full_messages.should include("#{'order'.intern.l('order').humanize} total não confere com a notificação, pedido: #{@notification.order.total}, notificação: #{@notification.items_price}.") + @notification.errors.full_messages.should include("#{'order'.intern.l('order').humanize} total não confere com a notificação, pedido: #{@notification.order.total}, notificação: #{@notification.items_total}.") end end spec/models/notification_spec.rb @@ -68,18 +68,18 @@ describe PagseguroPayment do @pagseguro_payment.state.should == "status_definition_expired" end + # We cannot approve a payment that was never being done. + it "should transition to payment_approved when called approve_payment" do + @pagseguro_payment.approve_payment + @pagseguro_payment.state.should == "payment_approved" + end + # We cannot cancel a payment that was never being done. it "should not transition to payment_canceled when called cancel_payment" do @pagseguro_payment.cancel_payment @pagseguro_payment.state.should == "waiting_for_status_definition" end - # We cannot approve a payment that was never being done. - it "should not transition to payment_approved when called approve_payment" do - @pagseguro_payment.approve_payment - @pagseguro_payment.state.should == "waiting_for_status_definition" - end - # We cannot say the payment was credited in our gateway account if it was never being done. it "should not transition to payment_completed when called complete_payment" do @pagseguro_payment.complete_payment spec/models/pagseguro_payment_spec.rb @@ -1,6 +1,4 @@ --colour --format specdoc ---loadby -mtime --reverse spec/spec.opts 07923ed54b6ae75c8161ca86f9f37f00a0ec945f Edmundo Valle Neto edmundo.vn@gmail.com http://github.com/edmundo/spree-ps-spree-own-cart/commit/2be5cbefd256af78d35611a3defd4c7d46295961 2be5cbefd256af78d35611a3defd4c7d46295961 2008-12-31T11:46:19-08:00 2008-12-31T11:46:19-08:00 Changed the way address is handled and some charset conversions. e9a9ba94f6c6e9db86346282a91e5c1eb51cdb4f Edmundo Valle Neto edmundo.vn@gmail.com