spree_core 3.0.1 → 3.0.2

data/app/models/spree/variant.rb

@@ -1,7 +1,7 @@
 module Spree
   class Variant < Spree::Base
     acts_as_paranoid
-    acts_as_list
+    acts_as_list scope: :product
 
     include Spree::DefaultPrice
 
@@ -37,13 +37,20 @@ module Spree
     validates_uniqueness_of :sku, allow_blank: true, conditions: -> { where(deleted_at: nil) }
 
     after_create :create_stock_items
-    after_create :set_position
     after_create :set_master_out_of_stock, unless: :is_master?
 
     after_touch :clear_in_stock_cache
 
     scope :in_stock, -> { joins(:stock_items).where('count_on_hand > ? OR track_inventory = ?', 0, false) }
 
+    LOCALIZED_NUMBERS = %w(cost_price weight depth width height)
+
+    LOCALIZED_NUMBERS.each do |m|
+      define_method("#{m}=") do |argument|
+        self[m] = Spree::LocalizedNumber.parse(argument) if argument.present?
+      end
+    end
+
     def self.active(currency = nil)
       joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
     end
@@ -60,14 +67,6 @@ module Spree
       end
     end
 
-    def cost_price=(price)
-      self[:cost_price] = Spree::LocalizedNumber.parse(price) if price.present?
-    end
-
-    def weight=(weight)
-      self[:weight] = Spree::LocalizedNumber.parse(weight) if weight.present?
-    end
-
     # returns number of units currently on backorder for this variant.
     def on_backorder
       inventory_units.with_state('backordered').size
@@ -153,7 +152,7 @@ module Spree
     end
 
     def price_in(currency)
-      prices.select{ |price| price.currency == currency }.first || Spree::Price.new(variant_id: self.id, currency: currency)
+      prices.detect { |price| price.currency == currency } || Spree::Price.new(variant_id: id, currency: currency)
     end
 
     def amount_in(currency)
@@ -214,6 +213,14 @@ module Spree
       self.track_inventory? && Spree::Config.track_inventory_levels
     end
 
+    def volume
+      (width || 0) * (height || 0) * (depth || 0)
+    end
+
+    def dimension
+      (width || 0) + (height || 0) + (depth || 0)
+    end
+
     private
 
       def set_master_out_of_stock
@@ -245,10 +252,6 @@ module Spree
         end
       end
 
-      def set_position
-        self.update_column(:position, product.variants.maximum(:position).to_i + 1)
-      end
-
       def in_stock_cache_key
         "variant-#{id}-in_stock"
       end

data/app/models/spree/zone.rb

@@ -2,12 +2,10 @@ module Spree
   class Zone < Spree::Base
     has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember", inverse_of: :zone
     has_many :tax_rates, dependent: :destroy, inverse_of: :zone
-    has_many :countries, through: :zone_members, source: :zoneable,
-      source_type: "Spree::Country"
-    has_many :states, through: :zone_members, source: :zoneable,
-      source_type: "Spree::State"
+    has_many :countries, through: :zone_members, source: :zoneable, source_type: "Spree::Country"
+    has_many :states, through: :zone_members, source: :zoneable, source_type: "Spree::State"
 
-    has_and_belongs_to_many :shipping_methods, :join_table => 'spree_shipping_methods_zones'
+    has_and_belongs_to_many :shipping_methods, join_table: 'spree_shipping_methods_zones'
 
     validates :name, presence: true, uniqueness: { allow_blank: true }
 
@@ -47,10 +45,14 @@ module Spree
     # Returns the matching zone with the highest priority zone type (State, Country, Zone.)
     # Returns nil in the case of no matches.
     def self.match(address)
-      return unless address and matches = self.includes(:zone_members).
-        order('spree_zones.zone_members_count', 'spree_zones.created_at').
-        where("(spree_zone_members.zoneable_type = 'Spree::Country' AND spree_zone_members.zoneable_id = ?) OR (spree_zone_members.zoneable_type = 'Spree::State' AND spree_zone_members.zoneable_id = ?)", address.country_id, address.state_id).
-        references(:zones)
+      return unless address &&
+                    matches = includes(:zone_members).
+                              order('spree_zones.zone_members_count', 'spree_zones.created_at').
+                              where("(spree_zone_members.zoneable_type = 'Spree::Country' AND " +
+                                      "spree_zone_members.zoneable_id = ?) OR " +
+                                      "(spree_zone_members.zoneable_type = 'Spree::State' AND " +
+                                      "spree_zone_members.zoneable_id = ?)", address.country_id, address.state_id).
+                              references(:zones)
 
       ['state', 'country'].each do |zone_kind|
         if match = matches.detect { |zone| zone_kind == zone.kind }
@@ -96,9 +98,12 @@ module Spree
     # convenience method for returning the countries contained within a zone
     def country_list
       @countries ||= case kind
-                     when 'country' then zoneables
-                     when 'state' then zoneables.collect(&:country)
-                     else []
+                     when 'country' then
+                       zoneables
+                     when 'state' then
+                       zoneables.collect(&:country)
+                     else
+                       []
                      end.flatten.compact.uniq
     end
 
@@ -139,11 +144,15 @@ module Spree
     # Indicates whether the specified zone falls entirely within the zone performing
     # the check.
     def contains?(target)
-      return false if kind == 'state' && target.kind == 'country'
+      return false if state? && target.country?
       return false if zone_members.empty? || target.zone_members.empty?
 
       if kind == target.kind
-        return false if (target.countries.pluck(:id) - countries.pluck(:id)).present?
+        if state?
+          return false if (target.states.pluck(:id) - states.pluck(:id)).present?
+        elsif country?
+          return false if (target.countries.pluck(:id) - countries.pluck(:id)).present?
+        end
       else
         return false if (target.states.pluck(:country_id) - countries.pluck(:id)).present?
       end
@@ -151,24 +160,25 @@ module Spree
     end
 
     private
-      def remove_defunct_members
-        if zone_members.any?
-          zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.classify}").destroy_all
-        end
-      end
 
-      def remove_previous_default
-        Spree::Zone.where('id != ?', self.id).update_all(default_tax: false) if default_tax
+    def remove_defunct_members
+      if zone_members.any?
+        zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.classify}").destroy_all
       end
+    end
 
-      def set_zone_members(ids, type)
-        zone_members.destroy_all
-        ids.reject{ |id| id.blank? }.map do |id|
-          member = ZoneMember.new
-          member.zoneable_type = type
-          member.zoneable_id = id
-          members << member
-        end
+    def remove_previous_default
+      Spree::Zone.where('id != ?', id).update_all(default_tax: false) if default_tax
+    end
+
+    def set_zone_members(ids, type)
+      zone_members.destroy_all
+      ids.reject(&:blank?).map do |id|
+        member = ZoneMember.new
+        member.zoneable_type = type
+        member.zoneable_id = id
+        members << member
       end
+    end
   end
 end

data/app/views/spree/order_mailer/cancel_email.html.erb

@@ -18,7 +18,7 @@
               <%= raw(item.variant.product.name) %>
               <%= raw(item.variant.options_text) -%>
             </td>
-            <td>(<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %></td>
+            <td>(<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %></td>
           </tr>
         <% end %>
         <tr>

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -6,7 +6,7 @@
 <%= Spree.t('order_mailer.cancel_email.order_summary_canceled') %>
 ============================================================
 <% @order.line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
 <%= Spree.t('order_mailer.cancel_email.subtotal') %> <%= @order.display_item_total %>

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -18,7 +18,7 @@
               <%= raw(item.variant.product.name) %>
               <%= raw(item.variant.options_text) -%>
             </td>
-            <td>(<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %></td>
+            <td>(<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %></td>
           </tr>
         <% end %>
         <tr>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -6,7 +6,7 @@
 <%= Spree.t('order_mailer.confirm_email.order_summary') %>
 ============================================================
 <% @order.line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %>  <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
 <%= Spree.t('order_mailer.confirm_email.subtotal') %> <%= @order.display_item_total %>

data/config/initializers/user_class_extensions.rb

@@ -24,6 +24,10 @@ Spree::Core::Engine.config.to_prepare do
       def last_incomplete_spree_order
         orders.incomplete.order('created_at DESC').first
       end
+
+      def analytics_id
+        id
+      end
     end
   end
 end

data/config/locales/en.yml

@@ -463,6 +463,7 @@ en:
     are_you_sure: Are you sure?
     are_you_sure_delete: Are you sure you want to delete this record?
     associated_adjustment_closed: The associated adjustment is closed, and will not be recalculated. Do you want to open it?
+    at_symbol: '@'
     authorization_failure: Authorization Failure
     authorized: Authorized
     auto_capture: Auto Capture
@@ -767,6 +768,7 @@ en:
     line_item_adjustments: "Line item adjustments"
     list: List
     loading: Loading
+    loading_tree: Loading tree. Please wait…
     locale_changed: Locale Changed
     location: Location
     lock: Lock
@@ -798,6 +800,7 @@ en:
     meta_title: Meta Title
     metadata: Metadata
     minimal_amount: Minimal Amount
+    missing_return_authorization: ! 'Missing Return Authorization for %{item_name}.'
     month: Month
     more: More
     move_stock_between_locations: Move Stock Between Locations
@@ -805,7 +808,7 @@ en:
     my_orders: My Orders
     name: Name
     name_on_card: Name on card
-    name_or_sku: Name or SKU (enter at least first 4 characters of product name)
+    name_or_sku: Name or SKU (enter at least first 3 characters of product name)
     new: New
     new_adjustment: New Adjustment
     new_customer: New Customer
@@ -928,7 +931,6 @@ en:
     order_total: Order Total
     order_updated: Order Updated
     orders: Orders
-    other_items_in_other: Other Items in Order
     out_of_stock: Out of Stock
     overview: Overview
     package_from: package from
@@ -1126,7 +1128,6 @@ en:
     return_number: Return Number
     return_quantity: Return Quantity
     returned: Returned
-    returns: Returns
     review: Review
     risk: Risk
     risk_analysis: Risk Analysis

data/db/default/spree/default_reimbursement_type.rb

@@ -0,0 +1 @@
+Spree::RefundReason.find_or_create_by(name: "Return processing", mutable: false)

data/db/migrate/20150515211137_fix_adjustment_order_id.rb

@@ -0,0 +1,70 @@
+class FixAdjustmentOrderId < ActiveRecord::Migration
+  def change
+    say 'Populate order_id from adjustable_id where appropriate'
+    execute(<<-SQL.squish)
+      UPDATE
+        spree_adjustments
+      SET
+        order_id = adjustable_id
+      WHERE
+        adjustable_type = 'Spree::Order'
+      ;
+    SQL
+
+    # Submitter of change does not care about MySQL, as it is not officially supported.
+    # Still spree officials decided to provide a working code path for MySQL users, hence
+    # submitter made a AR code path he could validate on PostgreSQL.
+    #
+    # Whoever runs a big enough MySQL installation where the AR solution hurts:
+    # Will have to write a better MySQL specific equivalent.
+    if Spree::Order.connection.adapter_name.eql?('MySQL')
+      Spree::Adjustment.where(adjustable_type: 'Spree::LineItem').find_each do |adjustment|
+        adjustment.update_columns(order_id: Spree::LineItem.find(adjustment.adjustable_id).order_id)
+      end
+    else
+      execute(<<-SQL.squish)
+        UPDATE
+          spree_adjustments
+        SET
+          order_id =
+            (SELECT order_id FROM spree_line_items WHERE spree_line_items.id = spree_adjustments.adjustable_id)
+        WHERE
+          adjustable_type = 'Spree::LineItem'
+      SQL
+    end
+
+    say 'Fix schema for spree_adjustments order_id column'
+    change_table :spree_adjustments do |t|
+      t.change :order_id, :integer, null: false
+    end
+
+    # Improved schema for postgresql, uncomment if you like it:
+    #
+    # # Negated Logical implication.
+    # #
+    # # When adjustable_type is 'Spree::Order' (p) the adjustable_id must be order_id (q).
+    # #
+    # # When adjustable_type is NOT 'Spree::Order' the adjustable id allowed to be any value (including of order_id in
+    # # case foreign keys match). XOR does not work here.
+    # #
+    # # Postgresql does not have an operator for logical implication. So we need to build the following truth table
+    # # via AND with OR:
+    # #
+    # #  p q | CHECK = !(p -> q)
+    # #  -----------
+    # #  t t | t
+    # #  t f | f
+    # #  f t | t
+    # #  f f | t
+    # #
+    # # According to de-morgans law the logical implication q -> p is equivalent to !p || q
+    # #
+    # execute(<<-SQL.squish)
+    #   ALTER TABLE ONLY spree_adjustments
+    #    ADD CONSTRAINT fk_spree_adjustments FOREIGN KEY (order_id)
+    #      REFERENCES spree_orders(id) ON UPDATE RESTRICT ON DELETE RESTRICT,
+    #    ADD CONSTRAINT check_spree_adjustments_order_id CHECK
+    #      (adjustable_type <> 'Spree::Order' OR order_id = adjustable_id);
+    # SQL
+  end
+end

data/db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb

@@ -0,0 +1,6 @@
+class AddDeletedAtToFriendlyIdSlugs < ActiveRecord::Migration
+  def change
+    add_column :friendly_id_slugs, :deleted_at, :datetime
+    add_index :friendly_id_slugs, :deleted_at
+  end
+end

data/db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb

@@ -0,0 +1,16 @@
+class IncreaseScaleOnPreTaxAmounts < ActiveRecord::Migration
+  def change
+    # set pre_tax_amount on shipments to discounted_amount - included_tax_total
+    # so that the null: false option on the shipment pre_tax_amount doesn't generate
+    # errors.
+    #
+    execute(<<-SQL)
+      UPDATE spree_shipments
+      SET pre_tax_amount = (cost + promo_total) - included_tax_total
+      WHERE pre_tax_amount IS NULL;
+    SQL
+
+    change_column :spree_line_items, :pre_tax_amount, :decimal, precision: 12, scale: 4, default: 0.0, null: false
+    change_column :spree_shipments, :pre_tax_amount, :decimal, precision: 12, scale: 4, default: 0.0, null: false
+  end
+end

data/db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb

@@ -0,0 +1,6 @@
+class EnableActsAsParanoidOnCalculators < ActiveRecord::Migration
+  def change
+    add_column :spree_calculators, :deleted_at, :datetime
+    add_index :spree_calculators, :deleted_at
+  end
+end

data/lib/spree/core/controller_helpers/auth.rb

@@ -19,7 +19,7 @@ module Spree
         end
 
         def redirect_back_or_default(default)
-          redirect_to(session["spree_user_return_to"] || default)
+          redirect_to(session["spree_user_return_to"] || request.env["HTTP_REFERER"] || default)
           session["spree_user_return_to"] = nil
         end
 

data/lib/spree/core/engine.rb

@@ -102,6 +102,13 @@ module Spree
       initializer "spree.core.checking_migrations" do |app|
         Migrations.new(config, engine_name).check
       end
+
+      config.to_prepare do
+        # Load application's model / class decorators
+        Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
+        end
+      end
     end
   end
 end

data/lib/spree/core/validators/email.rb

@@ -1,7 +1,11 @@
 class EmailValidator < ActiveModel::EachValidator
-  def validate_each(record,attribute,value)
-    unless value =~ /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
-      record.errors.add(attribute, :invalid, {:value => value}.merge!(options))
+  def validate_each(record, attribute, value)
+    unless value =~ %r{\A(([A-Za-z0-9]+_+)|
+                          ([A-Za-z0-9]+\-+)|
+                          ([A-Za-z0-9]+\.+)|
+                          ([A-Za-z0-9]+\++))*[A-Za-z0-9_]+@((\w+\-+)|
+                          (\w+\.))*\w{1,63}\.[a-zA-Z]{2,6}\z}xi
+      record.errors.add(attribute, :invalid, { value: value }.merge!(options))
     end
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.0.1"
+    '3.0.2'
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -61,8 +61,8 @@ module Spree
       :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
-      :taxon_ids, :cost_currency, :cost_price,
-      option_type_ids: []
+      :cost_currency, :cost_price,
+      option_type_ids: [], taxon_ids: []
     ]
 
     @@property_attributes = [:name, :presentation]