spree_core 3.0.10 → 3.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98a5a5c79265f2125a9c5584ce40b196039fee23
-  data.tar.gz: 4bc4f9ffc3e6e2e0daa5fac9c6646a0c839c0a55
+  metadata.gz: f9219224ab5da53304d7ad652d631ab7b0d010b3
+  data.tar.gz: 20e8d4a23103d61d0495758998f4909aae5f3968
 SHA512:
-  metadata.gz: fbd2cce0d8ad6f8c74a9d2fb52062c969ede898949b317bfcf2ca129a614ccaea616c270060f24c49a4cc8415d49855679859f3a5a372f53971c360db4e03346
-  data.tar.gz: d28fa3c2f4781f2879cf56fd08991d01a4f20e333ea2eccf0e6a55aca74935e35258820fa7e03246e041590c7e63ac7fa0f1601a1e05ddee8ea39204e0fda8bb
+  metadata.gz: f2f0bb0ccba4cf1bbee4db6545d530b7d42dc73ce10421eb9ec75ad0e55a26db33f353f2af95838d50340cf3158462561213704da6d57347dbeaca27da921b74
+  data.tar.gz: 56bc2c126244a948cf1c2b951161fcabf7604f07551df8451833f65499005e841f193c87248998f5825bb4c6323d4073989fefd86aeaf648d6daad2bfe9bfa1b

data/app/assets/javascripts/spree.js.coffee.erb

@@ -10,9 +10,15 @@ class window.Spree
   @mountedAt: ->
     "<%= Rails.application.routes.url_helpers.spree_path(trailing_slash: true) %>"
 
+  @adminPath: ->
+    '<%= Spree.admin_path.gsub(/\A(\/)?(.*[^\/])(\/)?\z/, '\\2/') %>'
+
   @pathFor: (path) ->
     locationOrigin = "#{window.location.protocol}//#{window.location.hostname}" + (if window.location.port then ":#{window.location.port}" else "")
-    "#{locationOrigin}#{@mountedAt()}#{path}"
+    @url("#{locationOrigin}#{@mountedAt()}#{path}", @url_params).toString()
+
+  @adminPathFor: (path) ->
+    @pathFor("#{@adminPath()}#{path}")
 
   # Helper function to take a URL and add query parameters to it
   # Uses the JSUri library from here: https://github.com/derek-watson/jsUri
@@ -45,6 +51,9 @@ class window.Spree
       $.ajax(Spree.url(url).toString(), url_or_settings)
 
   @routes:
-    states_search: @pathFor('api/states')
+    states_search: @pathFor('api/v1/states')
     apply_coupon_code: (order_id) ->
-      Spree.pathFor("api/orders/#{order_id}/apply_coupon_code")
+      Spree.pathFor("api/v1/orders/#{order_id}/apply_coupon_code")
+
+  @url_params:
+    {}

data/app/helpers/spree/base_helper.rb

@@ -17,7 +17,10 @@ module Spree
     end
 
     def display_price(product_or_variant)
-      product_or_variant.price_in(current_currency).display_price.to_html
+      product_or_variant.
+        price_in(current_currency).
+        display_price_including_vat_for(current_price_options).
+        to_html
     end
 
     def link_to_tracking(shipment, options = {})

data/app/helpers/spree/products_helper.rb

@@ -30,11 +30,12 @@ module Spree
 
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
-      if Spree::Config[:show_raw_product_description]
-        raw(product.description)
-      else
-        raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
-      end
+      description = if Spree::Config[:show_raw_product_description]
+                      product.description
+                    else
+                      product.description.to_s.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>')
+                    end
+      description.blank? ? Spree.t(:product_has_no_description) : raw(description)
     end
 
     def line_item_description(variant)
@@ -54,7 +55,37 @@ module Spree
     def cache_key_for_products
       count = @products.count
       max_updated_at = (@products.maximum(:updated_at) || Date.today).to_s(:number)
-      "#{I18n.locale}/#{current_currency}/spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
+      products_cache_keys = "spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
+      (common_product_cache_keys + [products_cache_keys]).compact.join("/")
+    end
+
+    def cache_key_for_product(product = @product)
+      (common_product_cache_keys + [product.cache_key, product.possible_promotions]).compact.join("/")
+    end
+
+    def available_status(product) # will return a human readable string
+      return Spree.t(:discontinued)  if product.discontinued?
+      return Spree.t(:deleted)  if product.deleted?
+
+      if product.available?
+        Spree.t(:available)
+      elsif product.available_on && product.available_on.future?
+        Spree.t(:pending_sale)
+      else
+        Spree.t(:no_available_date_set)
+      end
+    end
+
+    private
+
+    def common_product_cache_keys
+      [I18n.locale, current_currency] + price_options_cache_key
+    end
+
+    def price_options_cache_key
+      current_price_options.sort.map(&:last).map do |value|
+        value.try(:cache_key) || value
+      end
     end
   end
 end

data/app/mailers/spree/base_mailer.rb

@@ -1,6 +1,5 @@
 module Spree
   class BaseMailer < ActionMailer::Base
-
     def from_address
       Spree::Store.current.mail_from_address
     end
@@ -10,9 +9,19 @@ module Spree
     end
     helper_method :money
 
-    def mail(headers={}, &block)
+    def mail(headers = {}, &block)
+      ensure_default_action_mailer_url_host
       super if Spree::Config[:send_core_emails]
     end
 
+    private
+
+    # this ensures that ActionMailer::Base.default_url_options[:host] is always set
+    # this is only a fail-safe solution if developer didn't set this in environment files
+    # http://guides.rubyonrails.org/action_mailer_basics.html#generating-urls-in-action-mailer-views
+    def ensure_default_action_mailer_url_host
+      ActionMailer::Base.default_url_options ||= {}
+      ActionMailer::Base.default_url_options[:host] ||= Spree::Store.current.url
+    end
   end
 end

data/app/models/concerns/spree/adjustment_source.rb

@@ -14,7 +14,7 @@ module Spree
       return if amount == 0
       adjustments.new(order: order,
                       adjustable: adjustable,
-                      label: label(amount),
+                      label: label,
                       amount: amount,
                       included: included).save
     end
@@ -41,20 +41,13 @@ module Spree
     end
 
     def deals_with_adjustments_for_deleted_source
-      adjustment_scope = adjustments.includes(:order).references(:spree_orders)
-
       # For incomplete orders, remove the adjustment completely.
-      adjustment_scope.where("spree_orders.completed_at IS NULL").destroy_all
+      adjustments.for_incomplete_order.destroy_all
 
       # For complete orders, the source will be invalid.
       # Therefore we nullify the source_id, leaving the adjustment in place.
       # This would mean that the order's total is not altered at all.
-      adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
-        adjustment.update_columns(
-          source_id: nil,
-          updated_at: Time.now,
-        )
-      end
+      adjustments.for_complete_order.update_all(source_id: nil, updated_at: Time.current)
     end
   end
 end

data/app/models/concerns/spree/default_price.rb

@@ -8,7 +8,13 @@ module Spree
         class_name: 'Spree::Price',
         dependent: :destroy
 
-      delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency
+      delegate_belongs_to :default_price,
+                          :display_price,
+                          :display_amount,
+                          :price,
+                          :price=,
+                          :price_including_vat_for,
+                          :currency
 
       after_save :save_default_price
 

data/app/models/concerns/spree/named_type.rb

@@ -6,7 +6,7 @@ module Spree
       scope :active, -> { where(active: true) }
       default_scope { order("LOWER(#{self.table_name}.name)") }
 
-      validates :name, presence: true, uniqueness: { case_sensitive: false }
+      validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
     end
   end
 end

data/app/models/concerns/spree/user_api_authentication.rb

@@ -1,7 +1,7 @@
 module Spree
   module UserApiAuthentication
     def generate_spree_api_key!
-      self.spree_api_key = SecureRandom.hex(24)
+      self.spree_api_key = generate_spree_api_key
       save!
     end
 
@@ -9,5 +9,11 @@ module Spree
       self.spree_api_key = nil
       save!
     end
+
+    private
+
+    def generate_spree_api_key
+      SecureRandom.hex(24)
+    end
   end
 end

data/app/models/concerns/spree/user_methods.rb

@@ -0,0 +1,47 @@
+module Spree
+  module UserMethods
+    extend ActiveSupport::Concern
+
+    include Spree::UserApiAuthentication
+    include Spree::UserPaymentSource
+    include Spree::UserReporting
+    include Spree::RansackableAttributes
+
+    included do
+      has_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, dependent: :destroy
+      has_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role
+
+      has_many :promotion_rule_users, class_name: 'Spree::PromotionRuleUser', foreign_key: :user_id, dependent: :destroy
+      has_many :promotion_rules, through: :promotion_rule_users, class_name: 'Spree::PromotionRule'
+
+      has_many :orders, foreign_key: :user_id, class_name: "Spree::Order"
+      has_many :store_credits, foreign_key: :user_id, class_name: 'Spree::StoreCredit'
+
+      belongs_to :ship_address, class_name: 'Spree::Address'
+      belongs_to :bill_address, class_name: 'Spree::Address'
+
+      self.whitelisted_ransackable_associations = %w[bill_address ship_address]
+      self.whitelisted_ransackable_attributes = %w[id email]
+    end
+
+    # has_spree_role? simply needs to return true or false whether a user has a role or not.
+    def has_spree_role?(role_in_question)
+      spree_roles.any? { |role| role.name == role_in_question.to_s }
+    end
+
+    def last_incomplete_spree_order
+      orders.incomplete.
+        includes(line_items: [variant: [:images, :option_values, :product]]).
+        order('created_at DESC').
+        first
+    end
+
+    def analytics_id
+      id
+    end
+
+    def total_available_store_credit
+      store_credits.reload.to_a.sum(&:amount_remaining)
+    end
+  end
+end

data/app/models/concerns/spree/user_reporting.rb

@@ -4,11 +4,11 @@ module Spree
     money_methods :lifetime_value, :average_order_value
 
     def lifetime_value
-      orders.complete.pluck(:total).sum
+      orders.complete.sum(:total)
     end
 
     def order_count
-      BigDecimal(orders.complete.count)
+      BigDecimal(orders.complete.size)
     end
 
     def average_order_value

data/app/models/concerns/spree/vat_price_calculation.rb

@@ -0,0 +1,47 @@
+module Spree
+  module VatPriceCalculation
+    def gross_amount(amount, price_options)
+      return amount unless outside_default_vat_zone?(price_options)
+      round_to_two_places(add_foreign_vat_for(amount, price_options))
+    end
+
+    private
+
+    def add_foreign_vat_for(amount, price_options)
+      amount = net_amount(amount, price_options[:tax_category])
+      amount_with_foreign_vat(amount, price_options)
+    end
+
+    def net_amount(amount, tax_category)
+      amount / (1 + default_vat(tax_category))
+    end
+
+    def default_vat(tax_category)
+      included_tax_amount(tax_zone: default_zone, tax_category: tax_category)
+    end
+
+    def foreign_vat(price_options)
+      included_tax_amount(price_options)
+    end
+
+    def amount_with_foreign_vat(amount, price_options)
+      amount * (1 + foreign_vat(price_options))
+    end
+
+    def outside_default_vat_zone?(price_options)
+      price_options[:tax_zone] && default_zone && price_options[:tax_zone] != default_zone
+    end
+
+    def included_tax_amount(price_options)
+      Spree::TaxRate.included_tax_amount_for(price_options).to_f
+    end
+
+    def default_zone
+      @_default_zone ||= Spree::Zone.default_tax
+    end
+
+    def round_to_two_places(amount)
+      BigDecimal.new(amount.to_s).round(2, BigDecimal::ROUND_HALF_UP)
+    end
+  end
+end

data/app/models/spree/address.rb

@@ -7,16 +7,17 @@ module Spree
 
     has_many :shipments, inverse_of: :address
 
-    validates :firstname, :lastname, :address1, :city, :country, presence: true
-    validates :zipcode, presence: true, if: :require_zipcode?
-    validates :phone, presence: true, if: :require_phone?
+    with_options presence: true do
+      validates :firstname, :lastname, :address1, :city, :country
+      validates :zipcode, if: :require_zipcode?
+      validates :phone, if: :require_phone?
+    end
 
     validate :state_validate, :postal_code_validate
 
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
-
     self.whitelisted_ransackable_attributes = %w[firstname lastname company]
 
     def self.build_default
@@ -25,7 +26,7 @@ module Spree
     end
 
     def self.default(user = nil, kind = "bill")
-      if user && user_address = user.send(:"#{kind}_address")
+      if user && user_address = user.public_send(:"#{kind}_address")
         user_address.clone
       else
         build_default
@@ -64,13 +65,13 @@ module Spree
       self_attrs = self.attributes
       other_attrs = other_address.respond_to?(:attributes) ? other_address.attributes : {}
 
-      [self_attrs, other_attrs].each { |attrs| attrs.except!('id', 'created_at', 'updated_at', 'order_id') }
+      [self_attrs, other_attrs].each { |attrs| attrs.except!('id', 'created_at', 'updated_at') }
 
       self_attrs == other_attrs
     end
 
     def empty?
-      attributes.except('id', 'created_at', 'updated_at', 'order_id', 'country_id').all? { |_, v| v.nil? }
+      attributes.except('id', 'created_at', 'updated_at', 'country_id').all? { |_, v| v.nil? }
     end
 
     # Generates an ActiveMerchant compatible address hash

data/app/models/spree/adjustable/adjuster/base.rb

@@ -0,0 +1,25 @@
+module Spree
+  module Adjustable
+    module Adjuster
+      class Base
+        def self.adjust(adjustable, totals)
+          new(adjustable, totals).update
+        end
+
+        def initialize(adjustable, totals)
+          @adjustable = adjustable
+          @totals = totals
+        end
+
+        def update
+          raise NotImplementedError, "Please implement 'update' in your adjuster: #{self.class.name}"
+        end
+
+        private
+
+        attr_reader :adjustable
+        delegate :adjustments, to: :adjustable
+      end
+    end
+  end
+end

data/app/models/spree/adjustable/adjuster/promotion.rb

@@ -0,0 +1,41 @@
+module Spree
+  module Adjustable
+    module Adjuster
+      class Promotion < Spree::Adjustable::Adjuster::Base
+        def update
+          promo_adjustments = adjustments.competing_promos.reload.map { |a| a.update!(adjustable) }
+          promos_total = promo_adjustments.compact.sum
+          choose_best_promo_adjustment unless promos_total == 0
+          promo_total = best_promo_adjustment.try(:amount).to_f if best_promo_adjustment.try(:promotion?)
+
+          update_totals(promo_total)
+        end
+
+        private
+
+        # Picks one (and only one) competing discount to be eligible for
+        # this order. This adjustment provides the most discount, and if
+        # two adjustments have the same amount, then it will pick the
+        # latest one.
+        def choose_best_promo_adjustment
+          if best_promo_adjustment
+            other_promotions = adjustments.competing_promos.where.not(id: best_promo_adjustment.id)
+            other_promotions.update_all(eligible: false)
+          end
+        end
+
+        def best_promo_adjustment
+          @best_promo_adjustment ||= begin
+            adjustments.competing_promos.eligible.reorder("amount ASC, created_at DESC, id DESC").first
+          end
+        end
+
+        def update_totals(promo_total)
+          promo_total ||= 0.0
+          @totals[:promo_total] = promo_total
+          @totals[:taxable_adjustment_total] += promo_total
+        end
+      end
+    end
+  end
+end