spree_core 0.40.4 → 0.50.0

data/app/models/product_property.rb

@@ -1,15 +1,15 @@
 class ProductProperty < ActiveRecord::Base
   belongs_to :product
   belongs_to :property
-  
+
   validates :property, :presence => true
-  
+
   # virtual attributes for use with AJAX completion stuff
   def property_name
     property.name if property
   end
-  
-  def property_name=(name)    
+
+  def property_name=(name)
     self.property = Property.find_by_name(name) unless name.blank?
-  end  
+  end
 end

data/app/models/product_scope.rb

@@ -16,14 +16,27 @@ class ProductScope < ActiveRecord::Base
 
   # Get all products with this scope
   def products
-    if Product.condition?(self.name)
-      Product.send(self.name, *self.arguments)
+    if Product.respond_to?(name)
+      Product.send(name, *arguments)
     end
   end
 
   # Applies product scope on Product model or another named scope
   def apply_on(another_scope)
-    another_scope.send(self.name, *self.arguments)
+    array = *self.arguments
+    if Product.respond_to?(self.name.intern)
+      relation2 = if (array.blank? || array.size < 2)
+                      Product.send(self.name.intern, array.try(:first))
+                  else
+                      Product.send(self.name.intern, *array)
+                  end
+    else
+      relation2 = Product.search({self.name.intern => array}).relation
+    end
+    unless another_scope.class == ActiveRecord::Relation
+      another_scope = another_scope.send(:relation)
+    end
+    another_scope.merge(relation2)
   end
 
   before_validation(:on => :create) {
@@ -32,12 +45,19 @@ class ProductScope < ActiveRecord::Base
       self.arguments ||= ['']*args.length
     end
   }
-  
+
   # checks validity of the named scope (if its safe and can be applied on Product)
   def check_validity_of_scope
-    errors.add(:name, "is not a valid scope name") unless Product.condition?(self.name)
+    errors.add(:name, "is not a valid scope name") unless Product.respond_to?(self.name.intern)
     apply_on(Product).limit(0) != nil
-  rescue Exception
+  rescue Exception => e
+    unless Rails.env.production?
+
+      puts "name: #{self.name}"
+      puts "arguments: #{self.arguments.inspect}"
+      puts e.message
+      puts e.backtrace
+    end
     errors.add(:arguments, "are incorrect")
   end
 

data/app/models/property.rb

@@ -6,7 +6,7 @@ class Property < ActiveRecord::Base
 
   validates :name, :presentation, :presence => true
 
-  scope :sorted, order(:name)
+  scope :sorted, lambda { order(:name) }
 
   def self.find_all_by_prototype(prototype)
     id = prototype

data/app/models/state.rb

@@ -1,9 +1,8 @@
 class State < ActiveRecord::Base
   belongs_to  :country
-  scope :order_by_name, order(:name)
 
-  has_one     :zone_member, :as => :zoneable
-  has_one     :zone,        :through => :zone_member
+  has_one :zone_member, :as => :zoneable
+  has_one :zone, :through => :zone_member
 
   validates :country, :name, :presence => true
 

data/app/models/tax_category.rb

@@ -2,6 +2,7 @@ class TaxCategory < ActiveRecord::Base
   validates :name, :presence => true, :uniqueness => true
 
   has_many :tax_rates
+
   before_save :set_default_category
 
   def set_default_category

data/app/models/tax_rate.rb

@@ -11,7 +11,6 @@ class TaxRate < ActiveRecord::Base
   # To be considered for a match, the Zone must include the supplied address.  If multiple matches are
   # found, the Zone with the highest rate will be returned.  This method will return +nil+ if no match is found.
   def self.match(address)
-    matching_rates = TaxRate.all.select { |rate| rate.zone.include? address }
-    matching_rates.max { |a, b| a.amount <=> b.amount }
+    TaxRate.all.select { |rate| rate.zone.include? address }
   end
 end

data/app/models/taxon.rb

@@ -4,7 +4,6 @@ class Taxon < ActiveRecord::Base
   belongs_to :taxonomy
   has_and_belongs_to_many :products
   before_create :set_permalink
-  before_save :ensure_trailing_slash
 
   validates :name, :presence => true
   has_attached_file :icon,
@@ -14,14 +13,16 @@ class Taxon < ActiveRecord::Base
                 :path => ":rails_root/public/assets/taxons/:id/:style/:basename.:extension",
                 :default_url => "/images/default_taxon.png"
 
+
+  include ::ProductFilters  # for detailed defs of filters
+
   # indicate which filters should be used for a taxon
   # this method should be customized to your own site
-  include ::ProductFilters  # for detailed defs of filters
   def applicable_filters
     fs = []
     # fs << ProductFilters.taxons_below(self)
     ## unless it's a root taxon? left open for demo purposes
-    
+
     fs << ProductFilters.price_filter if ProductFilters.respond_to?(:price_filter)
     fs << ProductFilters.brand_filter if ProductFilters.respond_to?(:brand_filter)
     fs
@@ -30,21 +31,22 @@ class Taxon < ActiveRecord::Base
   # Creates permalink based on .to_url method provided by stringx gem
   def set_permalink
     if parent_id.nil?
-      self.permalink = name.to_url + "/" if self.permalink.blank?
+      self.permalink = name.to_url if self.permalink.blank?
     else
       parent_taxon = Taxon.find(parent_id)
-      self.permalink = parent_taxon.permalink + (self.permalink.blank? ? name.to_url : self.permalink.split("/").last) + "/"
+      self.permalink = [parent_taxon.permalink, (self.permalink.blank? ? name.to_url : self.permalink.split("/").last)].join('/')
     end
   end
 
+  def active_products
+    scope = self.products.active
+    scope = scope.on_hand unless Spree::Config[:show_zero_stock_products]
+    scope
+  end
+
   private
   # obsolete, kept for backwards compat
   def escape(str)
     str.blank? ? "" : str.to_url
   end
-
-  def ensure_trailing_slash
-    set_permalink if self.permalink.blank?
-    self.permalink += "/" unless self.permalink[-1..-1] == "/"
-  end
 end

data/app/models/taxonomy.rb

@@ -1,17 +1,20 @@
 class Taxonomy < ActiveRecord::Base
+
+  validates :name, :presence => true
+
   has_many :taxons, :dependent => :destroy
   has_one :root, :class_name => 'Taxon', :conditions => "parent_id is null"
 
   after_save :set_name
 
+  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 })
     end
   end
+
 end

data/app/models/tracker.rb

@@ -1,5 +1,5 @@
 class Tracker < ActiveRecord::Base
   def self.current
-    Tracker.find(:first, :conditions => {:active => true, :environment => ENV['RAILS_ENV']})   
+    Tracker.find(:first, :conditions => {:active => true, :environment => ENV['RAILS_ENV']})
   end
 end

data/app/models/user.rb

@@ -4,6 +4,7 @@ class User < ActiveRecord::Base
   has_many :orders
   belongs_to :ship_address, :foreign_key => "ship_address_id", :class_name => "Address"
   belongs_to :bill_address, :foreign_key => "bill_address_id", :class_name => "Address"
+  scope :registered
 
   def anonymous?
     false
@@ -14,4 +15,7 @@ class User < ActiveRecord::Base
     User.create
   end
 
+  attr_accessor :password
+  attr_accessor :password_confirmation
+
 end

data/app/models/variant.rb

@@ -74,7 +74,7 @@ class Variant < ActiveRecord::Base
   end
 
   def options_text
-    self.option_values.map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence({:words_connector => ", ", :two_words_connector => ", "})
+    self.option_values.sort{|ov1, ov2| ov1.option_type.position <=> ov2.option_type.position}.map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence({:words_connector => ", ", :two_words_connector => ", "})
   end
 
   def gross_profit

data/app/models/zone.rb

@@ -1,6 +1,6 @@
 class Zone < ActiveRecord::Base
   has_many :zone_members
-  has_many :tax_rates
+  has_many :tax_rates, :dependent => :destroy
   has_many :shipping_methods
 
   validates :name, :presence => true, :uniqueness => true

data/app/models/zone_member.rb

@@ -1,8 +1,8 @@
 class ZoneMember < ActiveRecord::Base
   belongs_to :zone
-  belongs_to :zoneable, :polymorphic => true    
-  
-  def name   
+  belongs_to :zoneable, :polymorphic => true
+
+  def name
     return nil if zoneable.nil?
     zoneable.name
   end

data/app/views/admin/{shared → adjustments}/_adjustments_table.html.erb

@@ -5,15 +5,18 @@
     <th><%= t("amount") %></th>
     <th></th>
   </tr>
-  <% @order.adjustments.each do |adjustment| %>
+  <% @order.adjustments.each do |adjustment|
+         @edit_url = edit_admin_order_adjustment_path(@order, adjustment)
+         @delete_url = admin_order_adjustment_path(@order, adjustment)
+  %>
     <tr id="<%= dom_id(adjustment) %>">
       <td><%= adjustment.created_at.to_s(:date_time24) %></td>
       <td><%= adjustment.label %></td>
       <td><%= number_to_currency(adjustment.amount) %></td>
-      <td>
-        <%= link_to_edit adjustment %>
+      <td class='actions'>
+        <%= link_to_edit adjustment, :class => 'edit' %>
         &nbsp;
-        <%= link_to_delete adjustment %>
+        <%= link_to_delete adjustment, {}, :class => 'delete' %>
       </td>
 
     </tr>

data/app/views/admin/adjustments/edit.html.erb

@@ -3,7 +3,7 @@
 <h2><%= t("adjustment")%></h2>
 
 <%= render "shared/error_messages", :target => @adjustment %>
-<%= form_for(@adjustment, :url => object_url, :html => { :method => :put}) do |f| %>
+<%= form_for(@adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :html => { :method => :put}) do |f| %>
   <%= render :partial => "form", :locals => {:f => f} %>
 
   <p class="form-buttons">

data/app/views/admin/adjustments/index.html.erb

@@ -1,4 +1,4 @@
 <%= render 'admin/shared/new_adjustment_button' %>
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Adjustments"} %>
-<%= render 'admin/shared/adjustments_table' %>
-<%= button_link_to t('continue'), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url %>
+<%= render 'adjustments_table' %>
+<%= button_link_to t('continue'), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url %>

data/app/views/admin/adjustments/new.html.erb

@@ -3,7 +3,8 @@
 <h2><%= t("new_adjustment")%></h2>
 
 <%= render "shared/error_messages", :target => @adjustment %>
-<%= form_for @adjustment, :url => collection_url do |f| %>
+
+<%= form_for @adjustment, :url => admin_order_adjustments_path do |f| %>
   <%= render :partial => "form", :locals => {:f => f} %>
 
   <p class="form-buttons">

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

@@ -1,6 +1,6 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t('general_settings') %></h1>
+<h1><%= t('edit_general_settings') %></h1>
 
 <%= form_tag(admin_general_settings_path, :method => :put) do %>
 
@@ -11,7 +11,7 @@
   <p>
 	<label><%= t('site_url') %></label>
 	<%= text_field_tag('preferences[site_url]', Spree::Config[:site_url])%>
-  </p>	
+  </p>
   <p>
     <label>
 	  <input name="preferences[allow_ssl_in_production]" type="hidden" value="0" />
@@ -22,22 +22,14 @@
 
   <p>
     <label>
-	  <input name="preferences[allow_ssl_in_development_and_test]" type="hidden" value="0" />	
+	  <input name="preferences[allow_ssl_in_development_and_test]" type="hidden" value="0" />
       <%= check_box_tag('preferences[allow_ssl_in_development_and_test]', "1", Spree::Config[:allow_ssl_in_development_and_test]) %>
       <%= t('allow_ssl_to_be_used_when_in_developement_and_test_modes') %>
     </label>
   </p>
 
-  <p>
-    <label>
-      <input name="preferences[check_for_spree_alerts]" type="hidden" value="0" />
-      <%= check_box_tag('preferences[check_for_spree_alerts]', "1", Spree::Config[:check_for_spree_alerts]) %>
-      <%= t('spree_alert_checking') %>
-    </label>
- </p>
-
   <p class="form-buttons">
-    <%= button t('update') %> 
+    <%= button t('update') %>
     <%= t("or") %> <%= link_to t("cancel"), admin_general_settings_url %>
   </p>
 <% end %>

data/app/views/admin/general_settings/show.html.erb

@@ -21,11 +21,6 @@
 	  <%= (Spree::Config[:allow_ssl_in_development_and_test] ? t("ssl_will_be_used_in_development_and_test_modes") : t("ssl_will_not_be_used_in_development_and_test_modes")) %>
 	</td>
   </tr>
-  <tr>
-    <td colspan="2">
-      <%= (Spree::Config[:check_for_spree_alerts] ? t("spree_alert_checking") : t("spree_alert_not_checking")) %>
-    </td>
-  </tr>
 </table>
 
 <p><%= link_to_with_icon 'edit', t("edit"), edit_admin_general_settings_path, :id => 'admin_general_settings_link' %></p>

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

@@ -2,7 +2,7 @@
 
 <%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Images"} %>
 
-<table class="index">
+<table class="index sortable">
   <tr>
     <th><%= t("thumbnail") %></th>
     <% if @product.has_variants? %>
@@ -14,13 +14,16 @@
 
   <% @product.images.each do |image| %>
     <tr id="<%= dom_id(image) %>">
-      <td><%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)) %></td>
+      <td>
+        <span class="handle"></span>
+        <%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)) %>
+      </td>
       <% if @product.has_variants? %>
         <td><%= t('all') %></td>
       <% end %>
       <td><%= image.alt %></td>
       <td class="actions">
-        <%= link_to_with_icon('edit', t("edit"), edit_admin_product_image_url(@product, image)) %>
+        <%= 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) }%>
       </td>
@@ -30,7 +33,7 @@
   <% @product.variants.each do |variant| %>
     <% variant.images.each do |image| %>
       <tr id="<%= dom_id(image) %>">
-        <td><%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)) %></td>
+        <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>
         <% end %>
@@ -63,4 +66,4 @@
 
     });
   </script>
-<% end %>
+<% end %>

data/app/views/admin/inventory_settings/show.html.erb

@@ -5,5 +5,5 @@
 <h4><%= t("products_with_zero_inventory_display", :not => show_not(Spree::Config[:show_zero_stock_products])) %> </h4>
 <h4><%= t("backordering_is_allowed", :not => show_not(Spree::Config[:allow_backorders])) %></h4>
 
-<%= link_to_with_icon 'edit', t("edit"), edit_admin_inventory_settings_path %>
+<%= link_to_with_icon 'edit', t("edit"), edit_admin_inventory_settings_path, :id => 'admin_inventory_settings_link' %>
 

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

@@ -3,7 +3,7 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <%= button_link_to t("new_mail_method"), new_object_url, :icon => 'add'  %>
+      <%= button_link_to t("new_mail_method"), new_object_url, :icon => 'add', :id => 'admin_new_mail_method_link'  %>
     </li>
   </ul>
   <br class='clear' />
@@ -11,7 +11,7 @@
 
 <h1><%= t("mail_methods") %></h1>
 
-<table class="index">
+<table class="index" id='mail_methods_listing'>
   <thead>
     <%= hook :admin_mail_methods_index_headers do %>
       <th><%= t("environment") %></th>
@@ -31,11 +31,11 @@
         <% end %>
         <td width="140px">
           <%= hook :admin_mail_methods_index_row_actions, locals do %>
-            <%= link_to_edit method %> &nbsp;
+            <%= link_to_edit method, :class => 'edit' %> &nbsp;
             <%= link_to_delete method %>
           <% end %>
         </td>
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>