spree_core 3.2.9 → 3.3.0.rc1

data/app/models/spree/stock_item.rb

@@ -9,22 +9,23 @@ module Spree
     has_many :stock_movements, inverse_of: :stock_item
 
     validates :stock_location, :variant, presence: true
-    validates :variant_id, uniqueness: { scope: [:stock_location_id, :deleted_at] }, allow_blank: true
+    validates :variant_id, uniqueness: { scope: %i[stock_location_id deleted_at] }
 
     validates :count_on_hand, numericality: {
-                              greater_than_or_equal_to: 0,
-                              less_than_or_equal_to: 2**31 - 1,
-                              only_integer: true }, if: :verify_count_on_hand?
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 2**31 - 1,
+      only_integer: true
+    }, if: :verify_count_on_hand?
 
     delegate :weight, :should_track_inventory?, to: :variant
     delegate :name, to: :variant, prefix: true
     delegate :product, to: :variant
 
-    after_save :conditional_variant_touch, if: :changed?
+    after_save :conditional_variant_touch, if: :saved_changes?
     after_touch { variant.touch }
     after_destroy { variant.touch }
 
-    self.whitelisted_ransackable_attributes = ['count_on_hand', 'stock_location_id']
+    self.whitelisted_ransackable_attributes = %w[count_on_hand stock_location_id variant_id]
     self.whitelisted_ransackable_associations = ['variant']
 
     scope :with_active_stock_location, -> { joins(:stock_location).merge(Spree::StockLocation.active) }
@@ -34,7 +35,7 @@ module Spree
     end
 
     def adjust_count_on_hand(value)
-      self.with_lock do
+      with_lock do
         set_count_on_hand(count_on_hand + value)
       end
     end
@@ -43,16 +44,16 @@ module Spree
       self.count_on_hand = value
       process_backorders(count_on_hand - count_on_hand_was)
 
-      self.save!
+      save!
     end
 
     def in_stock?
-      self.count_on_hand > 0
+      count_on_hand > 0
     end
 
     # Tells whether it's available to be included in a shipment
     def available?
-      self.in_stock? || self.backorderable?
+      in_stock? || backorderable?
     end
 
     def variant
@@ -60,32 +61,44 @@ module Spree
     end
 
     def reduce_count_on_hand_to_zero
-      self.set_count_on_hand(0) if count_on_hand > 0
+      set_count_on_hand(0) if count_on_hand > 0
     end
 
     private
-      def verify_count_on_hand?
-        count_on_hand_changed? && !backorderable? && (count_on_hand < count_on_hand_was) && (count_on_hand < 0)
-      end
 
-      # Process backorders based on amount of stock received
-      # If stock was -20 and is now -15 (increase of 5 units), then we should process 5 inventory orders.
-      # If stock was -20 but then was -25 (decrease of 5 units), do nothing.
-      def process_backorders(number)
-        if number > 0
-          backordered_inventory_units.first(number).each do |unit|
-            unit.fill_backorder
-          end
+    def verify_count_on_hand?
+      count_on_hand_changed? && !backorderable? && (count_on_hand < count_on_hand_was) && (count_on_hand < 0)
+    end
+
+    # Process backorders based on amount of stock received
+    # If stock was -20 and is now -15 (increase of 5 units), then we can process atmost 5 inventory orders.
+    # If stock was -20 but then was -25 (decrease of 5 units), do nothing.
+    def process_backorders(number)
+      return unless number.positive?
+      units = backordered_inventory_units.first(number) # We can process atmost n backorders
+
+      units.each do |unit|
+        break unless number.positive?
+
+        if unit.quantity > number
+          # if required quantity is greater than available
+          # split off and fullfill that
+          split = unit.split_inventory!(number)
+          split.fill_backorder
+        else
+          unit.fill_backorder
         end
+        number -= unit.quantity
       end
+    end
 
-      def conditional_variant_touch
-        # the variant_id changes from nil when a new stock location is added
-        stock_changed = (count_on_hand_changed? && count_on_hand_change.any?(&:zero?)) || variant_id_changed?
+    def conditional_variant_touch
+      # the variant_id changes from nil when a new stock location is added
+      stock_changed = (saved_change_to_count_on_hand? &&
+                        saved_change_to_count_on_hand.any?(&:zero?)) ||
+                      saved_change_to_variant_id?
 
-        if !Spree::Config.binary_inventory_cache || stock_changed
-          variant.touch
-        end
-      end
+      variant.touch if !Spree::Config.binary_inventory_cache || stock_changed
+    end
   end
 end

data/app/models/spree/stock_location.rb

@@ -4,7 +4,7 @@ module Spree
     has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
     has_many :stock_movements, through: :stock_items
 
-    belongs_to :state, class_name: 'Spree::State'
+    belongs_to :state, class_name: 'Spree::State', optional: true
     belongs_to :country, class_name: 'Spree::Country'
 
     validates :name, presence: true
@@ -40,6 +40,10 @@ module Spree
       stock_items.where(variant_id: variant_id).order(:id).first
     end
 
+    def stocks?(variant)
+      stock_items.exists?(variant: variant)
+    end
+
     # Attempts to look up StockItem for the variant, and creates one if not found.
     # This method accepts an instance of the variant.
     # Other methods in this model attempt to pass a variant,

data/app/models/spree/stock_movement.rb

@@ -15,8 +15,7 @@ module Spree
       validates :quantity, numericality: {
         greater_than_or_equal_to: QUANTITY_LIMITS[:min],
         less_than_or_equal_to: QUANTITY_LIMITS[:max],
-        only_integer: true,
-        allow_nil: true
+        only_integer: true
       }
     end
 

data/app/models/spree/stock_transfer.rb

@@ -2,14 +2,13 @@ module Spree
   class StockTransfer < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'T')
 
-    extend FriendlyId
-    friendly_id :number, slug_column: :number, use: :slugged
-
     has_many :stock_movements, as: :originator
 
     belongs_to :source_location, class_name: 'StockLocation'
     belongs_to :destination_location, class_name: 'StockLocation'
 
+    validates :number, uniqueness: true
+
     self.whitelisted_ransackable_attributes = %w[reference source_location_id destination_location_id number]
 
     def to_param

data/app/models/spree/store.rb

@@ -3,7 +3,7 @@ module Spree
     has_many :orders, class_name: "Spree::Order"
 
     with_options presence: true do
-      validates :code, uniqueness: { allow_blank: true }
+      validates :code, uniqueness: { case_sensitive: false, allow_blank: true }
       validates :name, :url, :mail_from_address
     end
 

data/app/models/spree/store_credit.rb

@@ -13,14 +13,14 @@ module Spree
     DEFAULT_CREATED_BY_EMAIL = 'spree@example.com'.freeze
 
     belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id'
-    belongs_to :category, class_name: "Spree::StoreCreditCategory"
+    belongs_to :category, class_name: 'Spree::StoreCreditCategory'
     belongs_to :created_by, class_name: Spree.user_class.to_s, foreign_key: 'created_by_id'
     belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id'
     has_many :store_credit_events
 
-    validates_presence_of :user, :category, :credit_type, :created_by, :currency
-    validates_numericality_of :amount, greater_than: 0
-    validates_numericality_of :amount_used, greater_than_or_equal_to: 0
+    validates :user, :category, :credit_type, :created_by, :currency, presence: true
+    validates :amount, numericality: { greater_than: 0 }
+    validates :amount_used, numericality: { greater_than_or_equal_to: 0 }
     validate :amount_used_less_than_or_equal_to_amount
     validate :amount_authorized_less_than_or_equal_to_amount
 
@@ -153,7 +153,7 @@ module Spree
     end
 
     def can_void?(payment)
-      payment.pending?
+      payment.pending? || (payment.checkout? && !payment.order.completed?)
     end
 
     def can_credit?(payment)
@@ -203,7 +203,10 @@ module Spree
     end
 
     def store_event
-      return unless amount_changed? || amount_used_changed? || amount_authorized_changed? || action == ELIGIBLE_ACTION
+      return unless saved_change_to_amount? ||
+                    saved_change_to_amount_used? ||
+                    saved_change_to_amount_authorized? ||
+                    action == ELIGIBLE_ACTION
 
       event = if action
                 store_credit_events.build(action: action)

data/app/models/spree/store_credit_category.rb

@@ -1,6 +1,6 @@
 module Spree
   class StoreCreditCategory < Spree::Base
-    validates_presence_of :name
+    validates :name, presence: true
 
     GIFT_CARD_CATEGORY_NAME = 'Gift Card'.freeze
     DEFAULT_NON_EXPIRING_TYPES = [GIFT_CARD_CATEGORY_NAME]

data/app/models/spree/tax_category.rb

@@ -1,7 +1,7 @@
 module Spree
   class TaxCategory < Spree::Base
     acts_as_paranoid
-    validates :name, presence: true, uniqueness: { case_sensitive: false, scope: :deleted_at, allow_blank: true }
+    validates :name, presence: true, uniqueness: { case_sensitive: false, scope: :deleted_at }
 
     has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category
 

data/app/models/spree/tax_rate.rb

@@ -6,7 +6,7 @@ module Spree
     include Spree::AdjustmentSource
 
     with_options inverse_of: :tax_rates do
-      belongs_to :zone, class_name: "Spree::Zone"
+      belongs_to :zone, class_name: "Spree::Zone", optional: true
       belongs_to :tax_category,
                  class_name: "Spree::TaxCategory"
     end

data/app/models/spree/taxon.rb

@@ -5,7 +5,7 @@ module Spree
   class Taxon < Spree::Base
     extend FriendlyId
     friendly_id :permalink, slug_column: :permalink, use: :history
-    before_create :set_permalink
+    before_validation :set_permalink, on: :create, if: :name
 
     acts_as_nested_set dependent: :destroy
 
@@ -19,7 +19,8 @@ module Spree
     has_many :promotion_rule_taxons, class_name: 'Spree::PromotionRuleTaxon', dependent: :destroy
     has_many :promotion_rules, through: :promotion_rule_taxons, class_name: 'Spree::PromotionRule'
 
-    validates :name, presence: true
+    validates :name, presence: true, uniqueness: { scope: [:parent_id, :taxonomy_id], allow_blank: true }
+    validates :permalink, uniqueness: { case_sensitive: false }
     with_options length: { maximum: 255 }, allow_blank: true do
       validates :meta_keywords
       validates :meta_description
@@ -39,6 +40,8 @@ module Spree
     validates_attachment :icon,
       content_type: { content_type: ["image/jpg", "image/jpeg", "image/png", "image/gif"] }
 
+    self.whitelisted_ransackable_associations = %w[taxonomy]
+
     # indicate which filters should be used for a taxon
     # this method should be customized to your own site
     def applicable_filters

data/app/models/spree/taxonomy.rb

@@ -2,7 +2,7 @@ module Spree
   class Taxonomy < Spree::Base
     acts_as_list
 
-    validates :name, presence: true
+    validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
     has_many :taxons, inverse_of: :taxonomy
     has_one :root, -> { where parent_id: nil }, class_name: "Spree::Taxon", dependent: :destroy

data/app/models/spree/tracker.rb

@@ -2,7 +2,7 @@ module Spree
   class Tracker < Spree::Base
     after_commit :clear_cache
 
-    validates :analytics_id, presence: true, uniqueness: { allow_blank: true }
+    validates :analytics_id, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
     def self.current
       tracker = Rails.cache.fetch("current_tracker") do

data/app/models/spree/variant.rb

@@ -3,10 +3,8 @@ module Spree
     acts_as_paranoid
     acts_as_list scope: :product
 
-    include Spree::DefaultPrice
-
     belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :variants
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory'
+    belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
     delegate_belongs_to :product, :name, :description, :slug, :available_on,
                         :shipping_category_id, :meta_description, :meta_keywords,
@@ -16,6 +14,9 @@ module Spree
     # https://github.com/rails/rails/issues/3458
     before_destroy :ensure_no_line_items
 
+    # must include this after ensure_no_line_items to make sure price won't be deleted before validation
+    include Spree::DefaultPrice
+
     with_options inverse_of: :variant do
       has_many :inventory_units
       has_many :line_items

data/app/models/spree/zone.rb

@@ -1,25 +1,25 @@
 module Spree
   class Zone < Spree::Base
     with_options dependent: :destroy, inverse_of: :zone do
-      has_many :zone_members, class_name: "Spree::ZoneMember"
+      has_many :zone_members, class_name: 'Spree::ZoneMember'
       has_many :tax_rates
     end
     with_options through: :zone_members, source: :zoneable do
-      has_many :countries, source_type: "Spree::Country"
-      has_many :states, source_type: "Spree::State"
+      has_many :countries, source_type: 'Spree::Country'
+      has_many :states, source_type: 'Spree::State'
     end
 
     has_many :shipping_method_zones, class_name: 'Spree::ShippingMethodZone'
     has_many :shipping_methods, through: :shipping_method_zones, class_name: 'Spree::ShippingMethod'
 
-    validates :name, presence: true, uniqueness: { allow_blank: true }
+    validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
     scope :with_default_tax, -> { where(default_tax: true) }
 
     after_save :remove_defunct_members
-    after_save :remove_previous_default, if: [:default_tax?, :default_tax_changed?]
+    after_save :remove_previous_default, if: %i[default_tax? saved_change_to_default_tax?]
 
-    alias :members :zone_members
+    alias members zone_members
     accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
 
     self.whitelisted_ransackable_attributes = ['description']
@@ -31,9 +31,9 @@ module Spree
     def self.potential_matching_zones(zone)
       if zone.country?
         # Match zones of the same kind with similar countries
-        joins(countries: :zones).
-          where("zone_members_spree_countries_join.zone_id = ?", zone.id).
-          distinct
+        joins(countries: :zones)
+          .where('zone_members_spree_countries_join.zone_id = ?', zone.id)
+          .distinct
       else
         # Match zones of the same kind with similar states in AND match zones
         # that have the states countries in
@@ -52,15 +52,15 @@ module Spree
     # Returns nil in the case of no matches.
     def self.match(address)
       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|
+                    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)
+
+      %w[state country].each do |zone_kind|
         if match = matches.detect { |zone| zone_kind == zone.kind }
           return match
         end
@@ -168,9 +168,7 @@ module Spree
     private
 
     def remove_defunct_members
-      if zone_members.any?
-        zone_members.defunct_without_kind(kind).destroy_all
-      end
+      zone_members.defunct_without_kind(kind).destroy_all if zone_members.any?
     end
 
     def remove_previous_default

data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb

@@ -0,0 +1,61 @@
+<table class="row header">
+  <tr>
+    <td>
+      <p class="lede">
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer') %>
+      </p>
+      <p>
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %>
+      </p>
+      <p>
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.refund_summary') %>
+      </p>
+      <p>
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.total_refunded', total: @reimbursement.display_total) %>
+      </p>
+
+      <% if @reimbursement.return_items.exchange_requested.present? %>
+        
+        <p>
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %>
+        </p>
+
+        <table class="container">
+          <tr>
+            <td class="wrapper last">
+              <table class="twelve columns">
+
+                <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
+                  <tr>
+                    <td class="six sub-columns">
+                      <%= return_item.variant.sku %>
+                    </td>
+                    <td>
+                      <%= link_to raw(return_item.variant.product.name),
+                                  spree.product_url(return_item.variant.product) %>
+                    </td>
+                    <td>
+                      <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? -%>
+                    </td>
+                  </tr>
+                <% end %>
+
+              </table>
+            </td>
+          </tr>
+        </table>
+
+
+        <% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
+          <p>
+          <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
+          </p>
+        <% end %>
+
+      <% end %>
+      <p>
+        <%= Spree.t('reimbursement_mailer.reimbursement_email.thanks') %>
+      </p>
+    <td class="expander"></td>
+  </tr>
+</table>