@@ -4,8 +4,8 @@ class Admin::ConfigurationsController < Admin::BaseController def add_ps_spree_own_cart_link @extension_links << { :link => admin_pagseguro_settings_path , - :link_text => Globalite.localize(:ext_ps_spree_own_cart), - :description => Globalite.localize(:ext_ps_spree_own_cart_description) + :link_text => t('ext.ps_spree_own_cart.extension_name'), + :description => t('ext.ps_spree_own_cart.extension_description') } end end app/controllers/admin/configurations_controller.rb @@ -1,4 +1,4 @@ -class OrdersController < Admin::BaseController +class OrdersController < Spree::BaseController # before_filter :associate_order, :only => :show # # private @@ -52,20 +52,7 @@ class OrdersController < Admin::BaseController 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 :inline => response -# end - render :layout => false + render :layout => false end def finished app/controllers/orders_controller.rb @@ -3,7 +3,7 @@ class PagseguroPaymentsController < Spree::BaseController #before_filter :load_object, :only => :notification layout 'application' - resource_controller :singleton + resource_controller #belongs_to :order create.response do |wants| app/controllers/pagseguro_payments_controller.rb @@ -45,8 +45,8 @@ class Notification < ActiveRecord::Base validates_format_of :CliCEP, :with => /\A[0-9]{8}\Z/i, :message => "%s deve conter exatamente oito dígitos numéricos sem o traço" - validates_numericality_of :NumItens, :only_integer => true, :message => :is_not_an_integer.l - validates_numericality_of :NumItens, :greater_than_or_equal_to => 1, :message => :is_not_a_positive_number.l + validates_numericality_of :NumItens, :only_integer => true, :message => I18n.translate('is_not_an_integer') + validates_numericality_of :NumItens, :greater_than_or_equal_to => 1, :message => I18n.translate('is_not_a_positive_number') # (1..25).to_a.each do |i| # validates_numericality_of "ProdQuantidade_#{i}".to_sym @@ -60,7 +60,7 @@ class Notification < ActiveRecord::Base def validate # Validates if it is unique. unless transaction_id_unique? - errors.add(:TransacaoID, :error_message_taken.l) + errors.add(:TransacaoID, :error_message_taken) end # Validates if the seller e-mail is correct. unless self.VendedorEmail == Spree::Pagseguro::Config[:account] app/models/notification.rb @@ -1,28 +1,11 @@ class Order < ActiveRecord::Base + has_many :pagseguro_payments + # Modify the transitions in core. fsm = Order.state_machines['state'] - # Delete transitions that should not be used. - fsm.events['next'].transitions.delete_if { |t| t.options[:to] == "creditcard_payment" && t.options[:from] == "shipment" } - fsm.events['previous'].transitions.delete_if { |t| t.options[:to] == "shipment" && t.options[:from] == "creditcard_payment" } - fsm.events['next'].transitions.delete_if { |t| t.options[:to] == "authorized" && t.options[:from] == "creditcard_payment" } - fsm.events['edit'].transitions.delete_if { |t| t.options[:to] == "in_progress" && t.options[:from] == "creditcard_payment" } - fsm.events['capture'].transitions.delete_if { |t| t.options[:to] == "captured" && t.options[:from] == "authorized" } - fsm.events['ship'].transitions.delete_if { |t| t.options[:to] == "shipped" && t.options[:from] == "captured" } - - # Delete states that should not be used. - fsm.states.delete('creditcard_payment') - fsm.states.delete('authorized') - fsm.states.delete('captured') - - has_one :pagseguro_payment - fsm.event :next do - transition :to => 'ready_to_transmit', :from => 'shipment' - end - - fsm.event :previous do - transition :to => 'shipment', :from => 'ready_to_transmit' + transition :to => 'ready_to_transmit', :from => 'shipping_method' end fsm.event :edit do app/models/order.rb @@ -1,22 +1,22 @@ <% form_tag(admin_pagseguro_settings_path, :method => :put) do -%> -<h2><%= t('pagseguro_setting') %></h2> +<h2><%= t('ext.ps_spree_own_cart.pagseguro_settings') %></h2> <div> <p> - <strong><%= t('account') %></strong> + <strong><%= t('ext.ps_spree_own_cart.account') %></strong> <%= text_field_tag('preferences[account]', Spree::Pagseguro::Config[:account])%> </p> <p> - <strong><%= t('token') %></strong> + <strong><%= t('ext.ps_spree_own_cart.token') %></strong> <%= text_field_tag('preferences[token]', Spree::Pagseguro::Config[:token])%> </p> <p> - <strong><%= t('always_use_sandbox') %></strong> + <strong><%= t('ext.ps_spree_own_cart.always_use_sandbox') %></strong> <%= check_box_tag('preferences[always_use_sandbox]', "1", Spree::Pagseguro::Config[:always_use_sandbox]) %> <input name="preferences[always_use_sandbox]" type="hidden" value="0" /> </p> </div> -<%= submit_tag t('save_preferences') %> +<%= submit_tag t('update') %> <% end -%> app/views/admin/pagseguro_settings/edit.html.erb @@ -1,14 +1,14 @@ -<h2><%= t('pagseguro_setting') %></h2> +<h2><%= t('ext.ps_spree_own_cart.pagseguro_settings') %></h2> <div id="pagseguro_settings"> <div> - <strong><%= t('account') %>:</strong> <%= Spree::Pagseguro::Config[:account] %> + <strong><%= t('ext.ps_spree_own_cart.account') %>:</strong> <%= Spree::Pagseguro::Config[:account] %> </div> <div> - <strong><%= t('token') %>:</strong> <%= Spree::Pagseguro::Config[:token] %> + <strong><%= t('ext.ps_spree_own_cart.token') %>:</strong> <%= Spree::Pagseguro::Config[:token] %> </div> <div> - <strong><%= t('always_use_sandbox') %>:</strong> <%= Spree::Pagseguro::Config[:always_use_sandbox] %> + <strong><%= t('ext.ps_spree_own_cart.always_use_sandbox') %>:</strong> <%= Spree::Pagseguro::Config[:always_use_sandbox] %> </div> <%= link_to t('edit'), edit_admin_pagseguro_settings_path %> </div> app/views/admin/pagseguro_settings/show.html.erb @@ -1,4 +1,4 @@ -<h1><%= t("confirmation") %></h1> +<h1><%= t("ext.ps_spree_own_cart.confirmation") %></h1> <div class="site_retreat"> app/views/orders/confirmation.html.erb @@ -5,4 +5,5 @@ map.resources :orders, :member => {:confirmation => :get, :transmit => :post, :f map.namespace :admin do |admin| admin.resource :pagseguro_settings + admin.resources :orders, :has_many => :pagseguro_payments end config/routes.rb @@ -7,10 +7,18 @@ class PsSpreeOwnCartExtension < Spree::Extension url "http://github.com/edmundo/spree-ps-spree-own-cart/tree/master" def activate + # Modify the transitions in core. + fsm = Order.state_machines['state'] - # Add support for internationalization to this extension. - Globalite.add_localization_source(File.join(RAILS_ROOT, 'vendor/extensions/ps_spree_own_cart/lang/ui')) + # Delete transitions that should not be used. + fsm.events['ship'].transitions.delete_if { |t| t.options[:to] == "shipped" && t.options[:from] == "charged" } + fsm.events['next'].transitions.delete_if { |t| t.options[:to] == "creditcard" && t.options[:from] == "shipping_method" } + fsm.events['next'].transitions.delete_if { |t| t.options[:to] == "charged" && t.options[:from] == "creditcard" } + fsm.events['edit'].transitions.delete_if { |t| t.options[:to] == "in_progress" && t.options[:from] == "creditcard" } + # Delete states that should not be used. + fsm.states.delete('creditcard') + fsm.states.delete('charged') end def self.require_gems(config) ps_spree_own_cart_extension.rb app/controllers/admin/orders_controller.rb app/views/admin/orders/_ps_own_cart_txns.html.erb lang/ui/en-US.yml lang/ui/pt-BR.yml 4079a12e3bc90dd84c09bc22ff646938e79142e6 Edmundo Valle Neto edmundo.vn@gmail.com http://github.com/edmundo/spree-ps-spree-own-cart/commit/e29c098be7f04f9525463e35b4adf2cfc8a896f0 e29c098be7f04f9525463e35b4adf2cfc8a896f0 2009-01-20T11:56:44-08:00 2009-01-20T11:56:44-08:00 Updated to work with latest i18n code. 151f0501f471fcb10e33ac8b16bd576a5a1c0609 Edmundo Valle Neto edmundo.vn@gmail.com