spree_core 1.3.2 → 1.3.3

data/app/models/spree/payment_method.rb

@@ -58,5 +58,9 @@ module Spree
     def auto_capture?
       Spree::Config[:auto_capture]
     end
+
+    def supports?(source)
+      true
+    end
   end
 end

data/app/models/spree/price.rb

@@ -8,13 +8,12 @@ module Spree
     attr_accessible :variant_id, :currency, :amount
 
     def display_amount
-      return nil if amount.nil?
-      money.to_s
+      money
     end
     alias :display_price :display_amount
 
     def money
-      Spree::Money.new(amount, { :currency => currency })
+      Spree::Money.new(amount || 0, { :currency => currency })
     end
 
     def price

data/app/models/spree/product.rb

@@ -24,7 +24,8 @@ module Spree
     has_many :product_properties, :dependent => :destroy
     has_many :properties, :through => :product_properties
 
-    has_and_belongs_to_many :taxons, :join_table => 'spree_products_taxons'
+    has_many :classifications, :dependent => :delete_all
+    has_many :taxons, :through => :classifications
 
     belongs_to :tax_category
     belongs_to :shipping_category
@@ -130,6 +131,10 @@ module Spree
       self[:on_demand] = new_on_demand
     end
 
+    def count_on_hand=(value)
+      raise I18n.t('exceptions.count_on_hand_setter')
+    end
+
     # Returns true if there are inventory units (any variant) with "on_hand" state for this product
     # Variants take precedence over master
     def has_stock?
@@ -263,9 +268,12 @@ module Spree
       end
 
       def recalculate_count_on_hand
-        product_count_on_hand = has_variants? ?
-          variants.sum(:count_on_hand) : (master ? master.count_on_hand : 0)
-        self.count_on_hand = product_count_on_hand
+        value = if has_variants?
+          variants.sum(:count_on_hand)
+        else
+          (master ? master.count_on_hand : 0)
+        end
+        self[:count_on_hand] = value
       end
 
       # the master on_hand is meaningless once a product has variants as the inventory

data/app/models/spree/product/scopes.rb

@@ -18,14 +18,18 @@ module Spree
       ]
     end
 
-    simple_scopes.each do |name|
-      # We should not define price scopes here, as they require something slightly different
-      next if name.to_s.include?("master_price")
-      parts = name.to_s.match(/(.*)_by_(.*)/)
-      order_text = "#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ?  "ASC" : "DESC"}"
-      self.scope(name.to_s, relation.order(order_text))
+    def self.add_simple_scopes(scopes)
+      scopes.each do |name|
+        # We should not define price scopes here, as they require something slightly different
+        next if name.to_s.include?("master_price")
+        parts = name.to_s.match(/(.*)_by_(.*)/)
+        order_text = "#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ?  "ASC" : "DESC"}"
+        self.scope(name.to_s, relation.order(order_text))
+      end
     end
 
+    add_simple_scopes simple_scopes
+
     add_search_scope :ascend_by_master_price do
       joins(:master => :default_price).order("#{price_table_name}.amount ASC")
     end
@@ -64,9 +68,14 @@ module Spree
     #
     #   SELECT COUNT(*) ...
     add_search_scope :in_taxon do |taxon|
-      select("DISTINCT(spree_products.id), spree_products.*").
-      joins(:taxons).
-      where(Taxon.table_name => { :id => taxon.self_and_descendants.pluck(:id) })
+      if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+        scope = select("DISTINCT ON (spree_products.id) spree_products.*")
+      else
+        scope = select("DISTINCT(spree_products.id), spree_products.*")
+      end
+
+      scope.joins(:taxons).
+      where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
     end
 
     # This scope selects products in all taxons AND all its descendants
@@ -184,7 +193,7 @@ module Spree
     end
 
     add_search_scope :not_deleted do
-      where(:deleted_at => nil)
+      where("#{Product.quoted_table_name}.deleted_at IS NULL or #{Product.quoted_table_name}.deleted_at >= ?", Time.zone.now)
     end
 
     # Can't use add_search_scope for this as it needs a default argument
@@ -211,14 +220,18 @@ module Spree
       group("spree_products.id").joins(:taxons).where(Taxon.arel_table[:name].eq(name))
     end
 
-    if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')
-      if table_exists?
-        scope :group_by_products_id, { :group => column_names.map { |col_name| "#{table_name}.#{col_name}"} }
+    # This method needs to be defined *as a method*, otherwise it will cause the
+    # problem shown in #1247.
+    def self.group_by_products_id
+      if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')
+        # Need to check, otherwise `column_names` will fail
+        if table_exists?
+          group(column_names.map { |col_name| "#{table_name}.#{col_name}"})
+        end
+      else
+        group("#{self.quoted_table_name}.id")
       end
-    else
-      scope :group_by_products_id, { :group => "#{self.quoted_table_name}.id" }
     end
-    search_scopes << :group_by_products_id
 
     private
 

data/app/models/spree/return_authorization.rb

@@ -44,7 +44,7 @@ module Spree
           next unless inventory_unit.return_authorization.nil? && count < quantity
 
           inventory_unit.return_authorization = self
-          inventory_unit.return!
+          inventory_unit.save!
 
           count += 1
         end

data/app/models/spree/shipment.rb

@@ -154,7 +154,7 @@ module Spree
       end
 
       def send_shipped_email
-        ShipmentMailer.shipped_email(self).deliver
+        ShipmentMailer.shipped_email(self.id).deliver
       end
 
       def ensure_correct_adjustment

data/app/models/spree/taxon.rb

@@ -3,11 +3,13 @@ module Spree
     acts_as_nested_set :dependent => :destroy
 
     belongs_to :taxonomy
-    has_and_belongs_to_many :products, :join_table => 'spree_products_taxons'
+    has_many :classifications, :dependent => :delete_all
+    has_many :products, :through => :classifications
 
     before_create :set_permalink
 
-    attr_accessible :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id
+    attr_accessible :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id,
+                    :meta_description, :meta_keywords, :meta_title
 
     validates :name, :presence => true
 
@@ -35,16 +37,29 @@ module Spree
       fs
     end
 
+    # Return meta_title if set otherwise generates from root name and/or taxon name
+    def seo_title
+      if meta_title
+        meta_title
+      else
+        root? ? name : "#{root.name} - #{name}"
+      end
+    end
+
     # Creates permalink based on Stringex's .to_url method
     def set_permalink
-      if parent_id.nil?
-        self.permalink = name.to_url if permalink.blank?
+      if parent.present?
+        self.permalink = [parent.permalink, (permalink.blank? ? name.to_url : permalink.split('/').last)].join('/')
       else
-        parent_taxon = Taxon.find(parent_id)
-        self.permalink = [parent_taxon.permalink, (permalink.blank? ? name.to_url : permalink.split('/').last)].join('/')
+        self.permalink = name.to_url if permalink.blank?
       end
     end
 
+    # For #2759
+    def to_param
+      permalink
+    end
+
     def active_products
       scope = products.active
       scope = scope.on_hand unless Spree::Config[:show_zero_stock_products]

data/app/models/spree/variant.rb

@@ -14,7 +14,7 @@ module Spree
     has_many :inventory_units
     has_many :line_items
     has_and_belongs_to_many :option_values, :join_table => :spree_option_values_variants
-    has_many :images, :as => :viewable, :order => :position, :dependent => :destroy
+    has_many :images, :as => :viewable, :order => :position, :dependent => :destroy, :class_name => "Spree::Image"
 
     has_one :default_price,
       :class_name => 'Spree::Price',
@@ -35,7 +35,8 @@ module Spree
     before_validation :set_cost_currency
     after_save :process_backorders
     after_save :save_default_price
-    after_save :recalculate_product_on_hand, :if => :is_master?
+    after_save :recalculate_product_on_hand
+    after_create :set_position
 
     # default variant scope only lists non-deleted variants
     scope :deleted, lambda { where('deleted_at IS NOT NULL') }
@@ -221,6 +222,10 @@ module Spree
       def set_cost_currency
         self.cost_currency = Spree::Config[:currency] if cost_currency.nil? || cost_currency.empty?
       end
+
+      def set_position
+        self.update_column(:position, product.variants.maximum(:position).to_i + 1)
+      end
   end
 end
 

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

@@ -8,14 +8,14 @@
     </tr>
   </thead>
   <tbody>
-    <% @order.adjustments.each do |adjustment|
+    <% @collection.each do |adjustment|
          @edit_url = edit_admin_order_adjustment_path(@order, adjustment)
          @delete_url = admin_order_adjustment_path(@order, adjustment)
     %>
       <tr id="<%= spree_dom_id(adjustment) %>" data-hook="adjustment_row" class="<%= cycle('odd', 'even')%>">
         <td class="align-center"><%= pretty_time(adjustment.created_at) %></td>
         <td class="align-center"><%= adjustment.label %></td>
-        <td class="align-center"><%= adjustment.display_amount %></td>
+        <td class="align-center"><%= adjustment.display_amount.to_html %></td>
         <td class='actions'>
           <%= link_to_edit adjustment, :no_text => true %>
           <%= link_to_delete adjustment, :no_text => true %>

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

@@ -27,6 +27,7 @@
         <td class="align-center"><%= country.states_required.to_s.titleize %></td>
         <td class="actions">
           <%= link_to_edit country, :no_text => true %>
+        </td>
       </tr>
     <% end %>
   </tbody>

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

@@ -52,16 +52,24 @@
               <div class="choices">
                 <ul>
                   <li>
-                    <%= radio_button_tag :currency_symbol_position, "before" %>
+                    <%= radio_button_tag :currency_symbol_position, "before", Spree::Config[:currency_symbol_position] == "before" %>
                     <%= label_tag :currency_symbol_position_before, Spree::Money.new(10, :symbol_position => "before") %>
                   </li>
                   <li class="white-space-nowrap">
-                    <%= radio_button_tag :currency_symbol_position, "after" %>
+                    <%= radio_button_tag :currency_symbol_position, "after", Spree::Config[:currency_symbol_position] == "after" %>
                     <%= label_tag :currency_symbol_position_after, Spree::Money.new(10, :symbol_position => "after") %>
                   </li>
                 </ul>
               </div>
             </div>
+            <div class="field">
+              <%= label_tag :currency_decimal_mark, t(:currency_decimal_mark) %><br>
+              <%= text_field_tag :currency_decimal_mark, Spree::Config[:currency_decimal_mark], :size => 3 %>
+            </div>
+            <div class="field">
+              <%= label_tag :currency_thousands_separator, t(:currency_thousands_separator) %><br>
+              <%= text_field_tag :currency_thousands_separator, Spree::Config[:currency_thousands_separator], :size => 3 %>
+            </div>
           </fieldset>
         </div>
       </div>

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

@@ -17,7 +17,9 @@
     <colgroup>
       <col style="width: 5%">
       <col style="width: 10%">
-      <col style="width: 25%">
+      <% if @product.has_variants? %>
+        <col style="width: 25%">
+      <% end %>
       <col style="width: 45%">
       <col style="width: 15%">
     </colgroup>
@@ -33,7 +35,7 @@
     </thead>
 
     <tbody>
-      <% (@product.images + @product.variant_images).each do |image| %>
+      <% (@product.variant_images).each do |image| %>
         <tr id="<%= spree_dom_id image %>" data-hook="images_row" class="<%= cycle('odd', 'even')%>">
           <td class="no-border">
             <span class="handle"></span>
@@ -41,7 +43,9 @@
           <td>
             <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
           </td>
-          <td><%= options_text_for(image) %></td>
+          <% if @product.has_variants? %>
+            <td><%= options_text_for(image) %></td>
+          <% end %>
           <td><%= image.alt %></td>
           <td class="actions">
             <%= link_to_with_icon 'icon-edit', t(:edit), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>

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

@@ -28,7 +28,7 @@
       <% @mail_methods.each do |method|%>
         <tr id="<%= spree_dom_id method %>" data-hook="admin_mail_methods_index_rows" class="<%= cycle('odd', 'even')%>">
           <td><%= method.environment.to_s.titleize %></td>
-          <td><%= method.active ? t(:yes) : t(:no) %></td>
+          <td><%= method.active ? t(:say_yes) : t(:say_no) %></td>
           <td data-hook="admin_mail_methods_index_row_actions" class="actions">
             <%= link_to_edit method, :no_text => true%>
             <%= link_to_delete method, :no_text => true %>
@@ -38,4 +38,4 @@
       <% end %>
     </tbody>
   </table>
-<% end%>
+<% end%>

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

@@ -31,7 +31,7 @@
         <tbody id="subtotal" data-hook="admin_order_form_subtotal" class="no-border-top">
           <tr id="subtotal-row">
             <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
-            <td class="total align-center"><span><%= @order.display_item_total %></span></td>
+            <td class="total align-center"><span><%= @order.display_item_total.to_html %></span></td>
             <td class="actions"></td>
           </tr>
         </tbody>
@@ -39,7 +39,7 @@
           <% @order.adjustments.eligible.each do |adjustment| %>
             <tr>
               <td colspan="3"><strong><%= adjustment.label %>:</strong></td>
-              <td class="total align-center"><span><%= adjustment.display_amount %></span></td>
+              <td class="total align-center"><span><%= adjustment.display_amount.to_html %></span></td>
               <td class="actions"></td>
             </tr>
           <% end %>
@@ -47,7 +47,7 @@
         <tbody id="order-total" data-hook="admin_order_form_total" class="grand-total no-border-top">
           <tr>
             <td colspan="3"><b><%= t(:order_total) %>:</b></td>
-            <td class="total align-center"><span id="order_total"><%= @order.display_total %></span></td>
+            <td class="total align-center"><span id="order_form_total"><%= @order.display_total.to_html %></span></td>
             <td class="actions"></td>
           </tr>
         </tbody>

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

@@ -1,6 +1,6 @@
 <tr id="<%= spree_dom_id(f.object) %>" data-hook="admin_order_form_line_item_row" class="<%= cycle('odd', 'even')%>">
   <td><%=f.object.variant.product.name%> <%= "(#{f.object.variant.options_text})" unless f.object.variant.option_values.empty? %></td>
-  <td class="price align-center"><%= f.object.variant.display_amount %></td>
+  <td class="price align-center"><%= f.object.single_money %></td>
   <td class="qty"><%= f.number_field :quantity, :min => 0, :class => "qty" %></td>
   <td class="total align-center"><%= f.object.display_amount %></td>
   <td data-hook="admin_order_form_line_item_actions" class="actions">

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

@@ -16,17 +16,17 @@
           <ul>
             <% if @order.completed? %>
               <li>
-                <%= @order.user.nil? ? t(:yes) : t(:no) %>
+                <%= @order.user.nil? ? t(:say_yes) : t(:say_no) %>
               </li>
             <% else %>
               <% guest = @order.user.nil? || @order.user.anonymous? %>
               <li>
                 <%= radio_button_tag :guest_checkout, true, guest %>
-                <%= t(:yes) %>
+                <%= t(:say_yes) %>
               </li>
               <li>
                 <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
-                <%= t(:no) %>  
+                <%= t(:say_no) %>
               </li>              
               <%= hidden_field_tag :user_id, @order.user_id %>
             <% end %>
@@ -63,4 +63,4 @@
   <% content_for :head do %>
     <%= javascript_include_tag states_path, 'admin/address_states.js' %>
   <% end %>
-</fieldset>
+</fieldset>

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

@@ -15,26 +15,26 @@
 <% content_for :table_filter do %>
   <div data-hook="admin_orders_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
-      <div class="field-block alpha four columns">          
+      <div class="field-block alpha four columns">
         <div class="date-range-filter field">
           <%= label_tag nil, t(:date_range) %>
           <div class="date-range-fields">
             <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => params[:q][:created_at_gt], :placeholder => t(:start) %>
-            
+
             <span class="range-divider">
               <i class="icon-arrow-right"></i>
             </span>
-              
+
             <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => params[:q][:created_at_lt], :placeholder => t(:stop) %>
           </div>
         </div>
 
         <div class="field">
           <%= label_tag nil, t(:status) %>
-          <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>  
+          <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>
         </div>
       </div>
-      
+
       <div class="four columns">
         <div class="field">
           <%= label_tag nil, t(:order_number) %>
@@ -45,7 +45,7 @@
           <%= f.email_field :email_cont %>
         </div>
       </div>
-      
+
       <div class="four columns">
         <div class="field">
           <%= label_tag nil, t(:first_name_begins_with) %>
@@ -56,7 +56,7 @@
           <%= f.text_field :bill_address_lastname_start, :size => 25%>
         </div>
       </div>
-      
+
       <div class="omega four columns">
         <div class="field checkbox">
           <label>
@@ -80,53 +80,61 @@
           <%= button t(:filter_results), 'icon-search' %>
         </div>
       </div>
-    <% end %>    
+    <% end %>
   </div>
 <% end %>
 
-<table class="index responsive" id="listing_orders" data-hook>
-  <colgroup>
-     <col style="width: 16%;">
-     <col style="width: 10%;">
-     <col style="width: 13%;">
-     <col style="width: 13%;">
-     <col style="width: 13%;">
-     <col style="width: 17%;">
-     <col style="width: 10%;">
-     <col style="width: 8%;">
-  </colgroup>
-  <thead>
-    <tr data-hook="admin_orders_index_headers">
-      <% if @show_only_completed %>
-        <th><%= sort_link @search, :completed_at, t(:completed_at, :scope => 'activerecord.attributes.spree/order') %></th>
-      <% else %>
-        <th><%= sort_link @search, :created_at,   t(:created_at, :scope => 'activerecord.attributes.spree/order') %></th>
-      <% end %>
-      <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" class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-  <% @orders.each do |order| %>
-    <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
-      <td class="align-center"><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
-      <td><%= link_to order.number, admin_order_path(order) %></td>
-      <td class="align-center"><span class="state <%= order.state.downcase %>"><%= t("order_state.#{order.state.downcase}") %></span></td>
-      <td class="align-center"><span class="state <%= order.payment_state %>"><%= link_to t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></span></td>
-      <td class="align-center"><span class="state <%= order.shipment_state %>"><%= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state %></span></td>
-      <td><%= mail_to order.email %></td>
-      <td class="align-center"><%= order.display_total %></td>
-      <td class='actions align-center' data-hook="admin_orders_index_row_actions">
-        <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true %>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
+<%= paginate @orders %>
+
+<% unless @orders.empty? %>
+  <table class="index responsive" id="listing_orders" data-hook width="100%">
+    <colgroup>
+       <col style="width: 16%;">
+       <col style="width: 10%;">
+       <col style="width: 13%;">
+       <col style="width: 13%;">
+       <col style="width: 13%;">
+       <col style="width: 17%;">
+       <col style="width: 10%;">
+       <col style="width: 8%;">
+    </colgroup>
+    <thead>
+      <tr data-hook="admin_orders_index_headers">
+        <% if @show_only_completed %>
+          <th><%= sort_link @search, :completed_at, t(:completed_at, :scope => 'activerecord.attributes.spree/order') %></th>
+        <% else %>
+          <th><%= sort_link @search, :created_at,   t(:created_at, :scope => 'activerecord.attributes.spree/order') %></th>
+        <% end %>
+        <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" class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% @orders.each do |order| %>
+      <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
+        <td class="align-center"><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
+        <td><%= link_to order.number, admin_order_path(order) %></td>
+        <td class="align-center"><span class="state <%= order.state.downcase %>"><%= t("order_state.#{order.state.downcase}") %></span></td>
+        <td class="align-center"><span class="state <%= order.payment_state %>"><%= link_to t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></span></td>
+        <td class="align-center"><span class="state <%= order.shipment_state %>"><%= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state %></span></td>
+        <td><%= mail_to order.email %></td>
+        <td class="align-center"><%= order.display_total.to_html %></td>
+        <td class='actions align-center' data-hook="admin_orders_index_row_actions">
+          <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="no-objects-found">
+    <%= t(:no_orders_found)%>
+  </div>
+<% end %>
 
 <%= paginate @orders %>