spree_core 1.0.7 → 1.1.0.rc1

data/app/models/spree/return_authorization.rb

@@ -9,8 +9,6 @@ module Spree
     validates :amount, :numericality => true
     validate :must_have_shipped_units
 
-    attr_accessible :amount, :reason
-
     state_machine :initial => 'authorized' do
       after_transition :to => 'received', :do => :process_return
 

data/app/models/spree/shipment.rb

@@ -5,7 +5,7 @@ module Spree
     belongs_to :order
     belongs_to :shipping_method
     belongs_to :address
-    has_many :state_events, :as => :stateful
+    has_many :state_changes, :as => :stateful
     has_many :inventory_units, :dependent => :nullify
     has_one :adjustment, :as => :source, :dependent => :destroy
 
@@ -14,8 +14,7 @@ module Spree
 
     attr_accessor :special_instructions
 
-    attr_accessible :order, :shipping_method, :special_instructions,
-                    :shipping_method_id, :tracking, :address, :inventory_units
+    attr_accessible :order, :state, :shipping_method, :special_instructions, :shipping_method_id, :tracking
 
     accepts_nested_attributes_for :address
     accepts_nested_attributes_for :inventory_units

data/app/models/spree/shipping_category.rb

@@ -3,7 +3,5 @@ module Spree
     validates :name, :presence => true
     has_many :products
     has_many :shipping_methods
-
-    attr_accessible :name
   end
 end

data/app/models/spree/shipping_method.rb

@@ -6,8 +6,7 @@ module Spree
     validates :name, :calculator, :zone, :presence => true
     belongs_to :shipping_category
 
-    attr_accessible :name, :zone_id, :display_on, :shipping_category_id,
-                    :match_none, :match_one, :match_all, :calculator_type
+    attr_accessible :name, :zone_id, :display_on, :shipping_category_id, :match_none, :match_one, :match_all, :calculator_type
 
     calculated_adjustments
 

data/app/models/spree/shipping_rate.rb

@@ -0,0 +1,9 @@
+module Spree
+  class ShippingRate < Struct.new(:id, :shipping_method, :name, :cost)
+    def initialize(attributes={})
+      attributes.each do |k,v|
+        self.send("#{k}=", v)
+      end
+    end
+  end
+end

data/app/models/spree/state.rb

@@ -7,12 +7,20 @@ module Spree
 
     validates :country, :name, :presence => true
 
-    attr_accessible :name, :abbr
-
     def self.find_all_by_name_or_abbr(name_or_abbr)
       where("name = ? OR abbr = ?", name_or_abbr, name_or_abbr)
     end
 
+    # table of { country.id => [ state.id , state.name ] }, arrays sorted by name
+    # blank is added elsewhere, if needed
+    def self.states_group_by_country_id
+      state_info = Hash.new { |h, k| h[k] = [] }
+      Spree::State.order('name ASC').each { |state|
+        state_info[state.country_id.to_s].push [state.id, state.name]
+      }
+      state_info
+    end
+
     def <=>(other)
       name <=> other.name
     end

data/app/models/spree/{state_event.rb → state_change.rb}

@@ -1,5 +1,5 @@
 module Spree
-  class StateEvent < ActiveRecord::Base
+  class StateChange < ActiveRecord::Base
     belongs_to :user
     belongs_to :stateful, :polymorphic => true
     before_create :assign_user
@@ -9,9 +9,6 @@ module Spree
     end
 
     def assign_user
-      # if Session.activated? && current_user_session = Session.find
-      #   self.user_id ||= current_user_session.user.id
-      # end
       true   # don't stop the filters
     end
   end

data/app/models/spree/tax_rate.rb

@@ -20,7 +20,7 @@ module Spree
     calculated_adjustments
     scope :by_zone, lambda { |zone| where(:zone_id => zone) }
 
-    attr_accessible :amount, :tax_category_id, :calculator, :zone_id, :included_in_price, :calculator_type
+    attr_accessible :amount, :tax_category_id, :calculator
 
     # Gets the array of TaxRates appropriate for the specified order
     def self.match(order)
@@ -52,11 +52,11 @@ module Spree
         else
           amount = -1 * calculator.compute(order)
           label = I18n.t(:refund) + label
-          order.adjustments.create(:amount => amount,
+          order.adjustments.create({:amount => amount,
                                    :source => order,
                                    :originator => self,
                                    :locked => true,
-                                   :label => label)
+                                   :label => label}, :without_protection => true)
         end
       else
         create_adjustment(label, order, order)

data/app/models/spree/taxon.rb

@@ -6,7 +6,7 @@ module Spree
     has_and_belongs_to_many :products, :join_table => 'spree_products_taxons'
     before_create :set_permalink
 
-    attr_accessible :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id
+    attr_accessible :name, :parent_id, :position
 
     validates :name, :presence => true
     has_attached_file :icon,
@@ -46,10 +46,5 @@ module Spree
       scope
     end
 
-    private
-      # obsolete, kept for backwards compat
-      def escape(str)
-        str.blank? ? '' : str.to_url
-      end
   end
 end

data/app/models/spree/taxonomy.rb

@@ -5,22 +5,19 @@ module Spree
     attr_accessible :name
 
     has_many :taxons
-    has_one :root, :conditions => { :parent_id => nil }, :class_name => 'Spree::Taxon'
+    has_one :root, :conditions => { :parent_id => nil }, :class_name => 'Spree::Taxon',
+                   :dependent => :destroy
 
     after_save :set_name
-    after_destroy :destroy_root_taxon
 
     private
       def set_name
         if self.root
           self.root.update_attribute(:name, self.name)
         else
-          self.root = Taxon.create!({ :taxonomy_id => self.id, :name => self.name })
+          self.root = Taxon.create!({ :taxonomy_id => self.id, :name => self.name }, :without_protection => true)
         end
       end
 
-      def destroy_root_taxon
-        self.root.destroy
-      end
   end
 end

data/app/models/spree/user.rb

@@ -2,6 +2,7 @@
 module Spree
   class User < ActiveRecord::Base
     include Core::UserBanners
+
     attr_accessible :email, :password, :password_confirmation
 
     has_many :orders

data/app/models/spree/variant.rb

@@ -43,10 +43,9 @@ module Spree
         # increase Inventory when
         if new_level > on_hand
           # fill backordered orders before creating new units
-          inventory_units.with_state('backordered').slice(0, new_level).each do |iu|
-            iu.fill_backorder
-            new_level -= 1
-          end
+          backordered_units = inventory_units.with_state('backordered')
+          backordered_units.slice(0, new_level).each &:fill_backorder
+          new_level -= backordered_units.length
         end
 
         self.count_on_hand = new_level

data/app/models/spree/zone.rb

@@ -13,9 +13,6 @@ module Spree
 
     attr_accessible :name, :description, :default_tax, :kind, :zone_members, :zone_members_attributes
 
-    # WARNING during tets class method .global is declared to indicate global Zone to use with tests
-
-    #attr_accessor :type
     def kind
       member = self.members.last
 
@@ -30,13 +27,6 @@ module Spree
       # do nothing - just here to satisfy the form
     end
 
-    # TODO: Remove this method after 1.0
-    # alias to the new include? method
-    def in_zone?(address)
-      ActiveSupport::Deprecation.warn '#in_zone? is deprecated and will be removed in Spree > 1.0. Use #include? instead.'
-      include?(address)
-    end
-
     def include?(address)
       return false unless address
 

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -9,7 +9,7 @@
        @edit_url = edit_admin_order_adjustment_path(@order, adjustment)
        @delete_url = admin_order_adjustment_path(@order, adjustment)
   %>
-    <tr id="<%= dom_id(adjustment) %>" data-hook="adjustment_row">
+    <tr id="<%= spree_dom_id(adjustment) %>" data-hook="adjustment_row">
       <td><%= adjustment.created_at.to_s(:date_time24) %></td>
       <td><%= adjustment.label %></td>
       <td><%= number_to_currency adjustment.amount %></td>

data/app/views/spree/admin/configurations/index.html.erb

@@ -48,6 +48,10 @@
       <td><%= link_to t(:inventory_settings), admin_inventory_settings_path %></td>
       <td><%= t(:inventory_setting_description) %></td>
     </tr>
+    <tr>
+      <td><%= link_to t(:image_settings), admin_image_settings_path %></td>
+      <td><%= t(:image_settings_description) %></td>
+    </tr>
     <tr>
       <td><%= link_to t(:tax_rates), admin_tax_rates_path %></td>
       <td><%= t(:tax_rates_description) %></td>

data/app/views/spree/admin/image_settings/edit.html.erb

@@ -0,0 +1,91 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<h1><%= t(:image_settings) %></h1>
+
+<p><span class="warning"><%= t(:image_settings_warning) %></span></p>
+
+<%= form_tag admin_image_settings_path, :method => :put do %>
+
+  <p data-hook="attachment_path">
+    <label>
+      <%= label_tag 'preferences[attachment_path]', t(:attachment_path) %>
+      <%= preference_field_tag 'preferences[attachment_path]', Spree::Config[:attachment_path], :type => :string %>
+    </label>
+  </p>
+
+  <p data-hook="attachment_default_url">
+    <label>
+      <%= label_tag 'preferences[attachment_default_url]', t(:attachment_default_url) %>
+      <%= preference_field_tag 'preferences[attachment_default_url]', Spree::Config[:attachment_default_url], :type => :string %>
+    </label>
+  </p>
+
+  <p data-hook="attachment_default_style">
+    <label>
+      <%= label_tag 'preferences[attachment_default_style]', t(:attachment_default_style) %>
+      <%= collection_select 'preferences', 'attachment_default_style', @styles, :first, :first, {:selected => Spree::Config[:attachment_default_style] } %> 
+    </label>
+  </p>
+
+  <div id="attachment_styles" data-hook="attachment_styles">
+    <h2><%= t(:attachment_styles) %></h2>
+    <ul id="styles_list">
+      <% @styles.each do |style_name, style_value| %>
+        <li>
+          <%= label_tag "attachment_styles[#{style_name}]", style_name %>
+          <%= text_field_tag "attachment_styles[#{style_name}]", style_value %>
+          <a href="#" alt="Destroy" class="destroy_style">x</a>
+        </li>
+      <% end %>
+    </ul>
+    <p><a href="#" alt="Add Style" class="add_style"><%= t(:add_new_style) %></a></p>
+  </div>
+
+  <p data-hook="use_s3">
+    <label>
+      <%= label_tag 'preferences[use_s3]', t(:use_s3) %>
+      <%= preference_field_tag 'preferences[use_s3]', Spree::Config[:use_s3], :type => :boolean %>
+    </label>
+  </p>
+
+  <div id="s3_settings" data-hook="s3_settings">
+    <h2><%= t(:configure_s3) %></h1>
+    <p data-hook="s3_access_key">
+      <label>
+        <%= label_tag 'preferences[s3_access_key]', t(:s3_access_key) %>
+        <%= preference_field_tag 'preferences[s3_access_key]', Spree::Config[:s3_access_key], :type => :string %>
+      </label>
+    </p>
+
+    <p data-hook="s3_secret">
+      <label>
+        <%= label_tag 'preferences[s3_secret]', t(:s3_secret) %>
+        <%= preference_field_tag 'preferences[s3_secret]', Spree::Config[:s3_secret], :type => :string %>
+      </label>
+    </p>
+
+    <p data-hook="s3_bucket">
+      <label>
+        <%= label_tag 'preferences[s3_bucket]', t(:s3_bucket) %>
+        <%= preference_field_tag 'preferences[s3_bucket]', Spree::Config[:s3_bucket], :type => :string %>
+      </label>
+    </p>
+
+    <h2><%= t(:s3_headers) %></h2>
+    <ul id="headers_list">
+      <% @headers.each do |header_name, header_value| %>
+        <li>
+          <%= label_tag "s3_headers[#{header_name}]", header_name %>
+          <%= text_field_tag "s3_headers[#{header_name}]", header_value %>
+          <a href="#" alt="Destroy" class="destroy_header">x</a>
+        </li>
+      <% end %>
+    </ul>
+    <p><a href="#" alt="Add Header" class="add_header"><%= t(:add_new_header) %></a></p>
+  </div>
+
+  <p class="form-buttons" data-hook="buttons">
+    <%= button t(:update) %>
+  </p>
+
+<% end %>

data/app/views/spree/admin/image_settings/show.html.erb

@@ -0,0 +1,11 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<h1><%= t(:image_settings) %></h1>
+
+<h4><%= t(:attachment_path) %>: <%= Spree::Config[:attachment_path] %></h4>
+<h4><%= t(:attachment_default_url) %>: <%= Spree::Config[:attachment_default_url] %></h4>
+<h4><%= t(:attachment_default_style) %>: <%= Spree::Config[:attachment_default_style] %></h4>
+<h4><%= t(:defined_paperclip_styles) %>: <%= @styles_list %></h4>
+<h4><%= Spree::Config[:use_s3] ? t(:s3_used_for_product_images) : t(:s3_not_used_for_product_images) %></h4>
+
+<%= link_to_with_icon 'edit', t(:edit), edit_admin_image_settings_path, :id => 'admin_image_settings_link' %>

data/app/views/spree/admin/images/index.html.erb

@@ -13,7 +13,7 @@
   </tr>
 
   <% @product.images.each do |image| %>
-    <tr id="spree_image_<%= image.id %>" data-hook="images_row">
+    <tr id="<%= spree_dom_id image %>" data-hook="images_row">
       <td>
         <span class="handle"></span>
         <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
@@ -25,14 +25,14 @@
       <td class="actions">
         <%= link_to_with_icon 'edit', t(:edit), edit_admin_product_image_url(@product, image), :class => 'edit' %>
         &nbsp;
-        <%= link_to_delete image, {:url => admin_product_image_url(@product, image) }%>
+        <%= link_to_delete image, { :url => admin_product_image_url(@product, image) }%>
       </td>
     </tr>
   <% end %>
 
   <% @product.variants.each do |variant| %>
     <% variant.images.each do |image| %>
-      <tr id="spree_image_<%= image.id %>" data-hook="images_row">
+      <tr id="<%= spree_dom_id image %>" data-hook="images_row">
         <td><span class="handle"></span><%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %></td>
         <% if @product.has_variants? %>
           <td><%= variant.options_text %></td>

data/app/views/spree/admin/mail_methods/_form.html.erb

@@ -5,7 +5,7 @@
       <p>
         <%= f.label :environment, t(:environment) %><br />
         <%= f.collection_select(:environment,
-                                Rails.configuration.database_configuration.keys.sort,
+                                Spree::Configuration.configurations.keys.sort,
                                 :to_s, :titleize,
                                 {}, {:id => 'gtwy-env'}) %>
       </p>

data/app/views/spree/admin/mail_methods/index.html.erb

@@ -20,7 +20,7 @@
   </thead>
   <tbody>
     <% @mail_methods.each do |method|%>
-      <tr id="<%= dom_id method %>" data-hook="admin_mail_methods_index_rows">
+      <tr id="<%= spree_dom_id method %>" data-hook="admin_mail_methods_index_rows">
         <td width="100px"><%= method.environment.to_s.titleize %></td>
         <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
         <td width="140px" data-hook="admin_mail_methods_index_row_actions">

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -1,4 +1,4 @@
-<tr class="option_value fields" id="<%= dom_id(f.object) %>"  data-hook="option_value">
+<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value">
   <td class="name"><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
   <td class="actions"><%= link_to_remove_fields t(:remove), f %></td>

data/app/views/spree/admin/option_types/index.html.erb

@@ -20,7 +20,7 @@
     <th></th>
   </tr>
   <% @option_types.each do |option_type| %>
-    <tr class="spree_option_type" id="spree_option_type_<%= option_type.id %>" data-hook="option_row">
+    <tr class="spree_option_type" id="<%= spree_dom_id option_type %>" data-hook="option_row">
       <td><span class="handle"></span> <%= option_type.name %></td>
       <td class="presentation"><%= option_type.presentation %></td>
       <td class="actions">

data/app/views/spree/admin/option_types/new.js.erb

@@ -1,2 +1,2 @@
-$("#new_option_type").html('<%= escape_javascript(render :template => "spree/admin/option_types/new.html.erb") %>');
+$("#new_option_type").html('<%= escape_javascript(render :template => "spree/admin/option_types/new", :formats => [:html], :handlers => [:erb]) %>');
 $("#new_option_type_link").parent().hide();

data/app/views/spree/admin/orders/_form.html.erb

@@ -43,14 +43,12 @@
   </table>
 
   <p class="form-buttons" data-hook="admin_order_form_buttons">
-    <%= button @order.complete? ? t(:update) : t(:continue) %>
-    <%= t(:or) %> <%= link_to t('actions.cancel'), admin_orders_url %>
+    <%= button t(:update) %>
+    <%= t(:or) %> <%= link_to t(:back), admin_orders_url %>
   </p>
 
 <% end %>
 
 <%= javascript_tag do -%>
-  <%= render :partial => 'spree/admin/shared/update_order_state.js' %>
+  <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
 <% end -%>
-
-<%= javascript_include_tag 'admin/orders/edit_form' %>

data/app/views/spree/admin/orders/_line_item.html.erb

@@ -1,4 +1,4 @@
-<tr id="<%= dom_id(f.object) %>" data-hook="admin_order_form_line_item_row">
+<tr id="<%= spree_dom_id(f.object) %>" data-hook="admin_order_form_line_item_row">
   <td width="300">
     <%=f.object.variant.product.name%> <%= "(#{f.object.variant.options_text}))" unless f.object.variant.option_values.empty? %>
   </td>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -43,6 +43,6 @@
 </p>
 
 <% content_for :head do %>
-  <%= javascript_include_tag states_path, 'admin/address_states.js' %>
+  <%= javascript_include_tag states_url, 'admin/address_states.js' %>
 <% end %>
 

data/app/views/spree/admin/orders/history.html.erb

@@ -10,7 +10,7 @@
     <th><%= t(:user) %></th>
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
   </tr>
-  <% @order.state_events.sort.each do |event| %>
+  <% @order.state_changes.sort.each do |event| %>
     <tr data-hook="history_row">
       <td><%=t("#{event.name}") if event.name.present? %></td>
       <td><%=t("#{event.name}_state#{'s' unless event.name == 'order'}.#{event.previous_state}") %></td>
@@ -19,7 +19,7 @@
       <td><%=event.created_at.to_s(:date_time24) %></td>
     </tr>
   <% end %>
-  <% if @order.state_events.empty? %>
+  <% if @order.state_changes.empty? %>
     <tr data-hook="history_none">
       <td colspan="5"><%= t(:none_available) %></td>
     </tr>

data/app/views/spree/admin/orders/index.html.erb

@@ -10,16 +10,16 @@
   <thead>
     <tr data-hook="admin_orders_index_headers">
       <% if @show_only_completed %>
-        <th><%= sort_link @search, :completed_at, t('activerecord.attributes.order.completed_at') %></th>
+        <th><%= sort_link @search, :completed_at, t(:completed_at, :scope => 'activerecord.attributes.spree/order') %></th>
       <% else %>
-        <th><%= sort_link @search, :created_at,   t(:order_date) %></th>
+        <th><%= sort_link @search, :created_at,   t(:created_at, :scope => 'activerecord.attributes.spree/order') %></th>
       <% end %>
-      <th><%= sort_link @search, :number,         t(:order_number) %></th>
-      <th><%= sort_link @search, :state,          t(:status) %></th>
-      <th><%= sort_link @search, :payment_state,  t(:payment_state) %></th>
-      <th><%= sort_link @search, :shipment_state, t(:shipment_state) %></th>
-      <th><%= sort_link @search, :email,          t(:customer) %></th>
-      <th><%= sort_link @search, :total,          t(:total) %></th>
+      <th><%= sort_link @search, :number,         t(:number, :scope => 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :state,          t(:state, :scope => 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :payment_state,  t(:payment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :shipment_state, t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :email,          t(:email, :scope => 'activerecord.attributes.spree/order') %></th>
+      <th><%= sort_link @search, :total,          t(:total, :scope => 'activerecord.attributes.spree/order') %></th>
       <th data-hook="admin_orders_index_header_actions"></th>
     </tr>
   </thead>
@@ -46,40 +46,40 @@
 <% content_for :sidebar do %>
   <div class="box" data-hook="admin_orders_index_search">
     <h3><%= t(:search) %></h3>
-    <%= form_for [:admin, @search] do |f| %>
+    <%= search_form_for [:admin, @search] do |f| %>
       <%= label_tag nil, t(:date_range) %><br />
       <div class="date-range-filter">
         <div class="left sub-field">
-          <%= f.text_field :created_at_greater_than, :class => 'datepicker' %><br />
+          <%= f.text_field :created_at_gt, :class => 'datepicker' %><br />
           <%= label_tag nil, t(:start), :class => 'sub' %>
         </div>
         <div class="right sub-field">
-          <%= f.text_field :created_at_less_than, :class => 'datepicker' %><br />
+          <%= f.text_field :created_at_lt, :class => 'datepicker' %><br />
           <%= label_tag nil, t(:stop), :class => 'sub' %>
         </div>
       </div>
 
       <p><%= label_tag nil, t(:status) %><br />
-      <%= f.select :state_equals, Spree::Order.state_machines[:state].states.collect {|s| [t("order_state.#{s.name}"), s.value]}, {:include_blank => true} %></p>
+      <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [t("order_state.#{s.name}"), s.value]}, {:include_blank => true} %></p>
 
       <p>
         <%= label_tag nil, t(:order_number) %><br />
-        <%= f.text_field :number_like, :size => 25 %>
+        <%= f.text_field :number_cont, :size => 25 %>
       </p>
       <p>
         <%= label_tag nil, t(:email) %><br />
-        <%= f.text_field :email_like, :size => 25 %>
+        <%= f.text_field :email_cont, :size => 25 %>
       </p>
       <p>
-        <%= label_tag nil, t(:first_name_begins_with) %><br />
-        <%= f.text_field :bill_address_firstname_starts_with, :size => 25 %>
+        <%= label_tag nil, t(:first_name_start) %><br />
+        <%= f.text_field :bill_address_firstname_start, :size => 25 %>
       </p>
       <p>
-        <%= label_tag nil, t(:last_name_begins_with) %><br />
-        <%= f.text_field :bill_address_lastname_starts_with, :size => 25 %>
+        <%= label_tag nil, t(:last_name_start) %><br />
+        <%= f.text_field :bill_address_lastname_start, :size => 25 %>
       </p>
       <p>
-        <%= f.check_box :completed_at_is_not_null, {:checked => @show_only_completed}, '1', '' %>
+        <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '' %>
         <%= label_tag nil, t(:show_only_complete_orders) %>
       </p>
       <div data-hook="admin_orders_index_search_buttons">

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -10,7 +10,7 @@
   <tr data-hook="environment">
     <td><%= label_tag nil, t(:environment) %></td>
     <td>
-      <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
+      <%= collection_select(:payment_method, :environment, Spree::Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
     </td>
   </tr>
   <tr data-hook="display">

data/app/views/spree/admin/payment_methods/index.html.erb

@@ -22,7 +22,7 @@
   </tr>
   <tbody>
     <% @payment_methods.each do |method|%>
-      <tr id="<%= dom_id method %>" data-hook="admin_payment_methods_index_rows">
+      <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
         <td width="120px"><%= method.name %></td>
         <td width="140px"><%= method.type %></td>
         <td width="100px"><%= method.environment.to_s.titleize %></td>
@@ -37,5 +37,3 @@
     <% end %>
   </tbody>
 </table>
-
-<%= render :partial => 'spree/admin/banners/gateway' %>

data/app/views/spree/admin/payments/_list.html.erb

@@ -1,7 +1,7 @@
 <table class="index">
   <tr data-hook="payments_header">
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-    <th><%= t(:amount) %></th>
+    <th><%= t(:amount, :scope => 'activerecord.attributes.spree/payment') %></th>
     <th><%= t(:payment_method) %></th>
     <th><%= t(:payment_state) %></th>
     <th><%= t(:payment_actions) %></th>

data/app/views/spree/admin/product_properties/index.html.erb

@@ -47,7 +47,7 @@
   $("#product_properties input.autocomplete").live("keydown", function(){
     already_auto_completed = $(this).is('ac_input');
     if (!already_auto_completed) {
-      $(this).autocomplete(properties);
+      $(this).autocomplete({source: properties});
       $(this).focus();
     }
   });