spree_core 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6877ed94eb40aa392d3e75311ae1c46f07d16c4
-  data.tar.gz: 86f962251bf0d966fce2dc5562a4e537b05db77c
+  metadata.gz: 2a5120849e1aaa18b3747ba821d39be5e0e22c64
+  data.tar.gz: 472557e5032544f1c53694c452989910466e7fa9
 SHA512:
-  metadata.gz: b9f99321e59660959d319148d1c7deed17c10caedb97e6d29d95dd15c195b2dac43bcfb35d5117c915bc456a1d8c0fb8f2d319971a7bd681f842f77a91ba25b6
-  data.tar.gz: 154ee0e0f7d1bd5fa2ce9bce96008951200122a3c687dfe88b6e75284987bef2c12d464c6bba83a2a97747ccd2e9dae7537b2fddc3a4fb9e9cc924c5c11c8491
+  metadata.gz: 8dec314e53c791de3fa15d96772d7b6b46771873321ff7219fe5a7a8316d61f6dfa82fc50d6b176d1186a3c1944eeb9962488570dea5f14a8fb7a40ac6fba4fe
+  data.tar.gz: 3423ee941bbce9284bad16a6137a991efe553553a87abca67585cb5bf8dc9e10a4cf4b364b456e8404f37b0649050b154ecd266fa78965a5ec9758866b53896b

data/app/helpers/spree/products_helper.rb

@@ -9,7 +9,6 @@ module Spree
       end
     end
 
-
     # returns the formatted price for the specified variant as a difference from product price
     def variant_price_diff(variant)
       diff = variant.amount_in(current_currency) - variant.product.amount_in(current_currency)
@@ -54,8 +53,9 @@ module Spree
     end
 
     def cache_key_for_products
-      max_updated_at = @products.maximum(:updated_at).to_s(:number)
-      "#{current_currency}/spree/products/all-#{params[:page]}-#{max_updated_at}"
+      count = @products.count
+      max_updated_at = (@products.maximum(:updated_at) || Date.today).to_s(:number)
+      "#{current_currency}/spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Spree
   module UserReporting
     def lifetime_value
-      orders.complete.pluck(:total).sum
+      spree_orders.complete.pluck(:total).sum
     end
 
     def display_lifetime_value
@@ -9,7 +9,7 @@ module Spree
     end
 
     def order_count
-      BigDecimal(orders.complete.count)
+      BigDecimal(spree_orders.complete.count)
     end
 
     def average_order_value

data/app/models/spree/address.rb

@@ -82,15 +82,15 @@ module Spree
       }
     end
 
-    private
-      def require_phone?
-        true
-      end
+    def require_phone?
+      true
+    end
 
-      def require_zipcode?
-        true
-      end
+    def require_zipcode?
+      true
+    end
 
+    private
       def state_validate
         # Skip state validation without country (also required)
         # or when disabled by preference

data/app/models/spree/credit_card.rb

@@ -29,12 +29,18 @@ module Spree
     }
 
     def expiry=(expiry)
-      if expiry.present?
-        self[:month], self[:year] = expiry.delete(' ').split('/')
-        self[:year] = "20" + self[:year] if self[:year].length == 2
-        self[:year] = self[:year].to_i
-        self[:month] = self[:month].to_i
+      return unless expiry.present?
+
+      self[:month], self[:year] =
+      if expiry.match(/\d\s?\/\s?\d/) # will match mm/yy and mm / yyyy
+        expiry.delete(' ').split('/')
+      elsif match = expiry.match(/(\d{2})(\d{2,4})/) # will match mmyy and mmyyyy
+        [match[1], match[2]]
       end
+
+      self[:year] = "20" + self[:year] if self[:year].length == 2
+      self[:year] = self[:year].to_i
+      self[:month] = self[:month].to_i
     end
 
     def number=(num)

data/app/models/spree/gateway.rb

@@ -64,7 +64,7 @@ module Spree
       payment_source_class.where(id: source_ids).with_payment_profile
     end
 
-    def sources_with_profile(order)
+    def reusable_sources(order)
       if order.completed?
         sources_by_order order
       else
@@ -75,5 +75,8 @@ module Spree
         end
       end
     end
+
+    # for backwards compatibility
+    alias_method :source_with_profiles, :reusable_sources
   end
 end

data/app/models/spree/item_adjustments.rb

@@ -1,6 +1,8 @@
 module Spree
   # Manage (recalculate) item (LineItem or Shipment) adjustments
   class ItemAdjustments
+    include ActiveSupport::Callbacks
+    define_callbacks :promo_adjustments, :tax_adjustments
     attr_reader :item
 
     delegate :adjustments, :order, to: :item
@@ -32,14 +34,22 @@ module Spree
       # Included tax adjustments are those which are included in the price.
       # These ones should not effect the eventual total price.
       #
-      # Additional tax adjustments are the opposite; effecting the final total. 
-      promotion_total = adjustments.promotion.reload.map(&:update!).compact.sum
-      unless promotion_total == 0
-        choose_best_promotion_adjustment
+      # Additional tax adjustments are the opposite; effecting the final total.
+      promo_total = 0
+      run_callbacks :promo_adjustments do
+        promotion_total = adjustments.promotion.reload.map(&:update!).compact.sum
+        unless promotion_total == 0
+          choose_best_promotion_adjustment
+        end
+        promo_total = best_promotion_adjustment.try(:amount).to_f
+      end
+
+      included_tax_total = 0
+      additional_tax_total = 0
+      run_callbacks :tax_adjustments do
+        included_tax_total = adjustments.tax.included.reload.map(&:update!).compact.sum
+        additional_tax_total = adjustments.tax.additional.reload.map(&:update!).compact.sum
       end
-      promo_total = best_promotion_adjustment.try(:amount).to_f
-      included_tax_total = adjustments.tax.included.reload.map(&:update!).compact.sum
-      additional_tax_total = adjustments.tax.additional.reload.map(&:update!).compact.sum
 
       item.update_columns(
         :promo_total => promo_total,

data/app/models/spree/line_item.rb

@@ -1,7 +1,7 @@
 module Spree
   class LineItem < ActiveRecord::Base
     before_validation :adjust_quantity
-    belongs_to :order, class_name: "Spree::Order", inverse_of: :line_items
+    belongs_to :order, class_name: "Spree::Order", inverse_of: :line_items, touch: true
     belongs_to :variant, class_name: "Spree::Variant", inverse_of: :line_items
     belongs_to :tax_category, class_name: "Spree::TaxCategory"
 
@@ -78,7 +78,7 @@ module Spree
     end
 
     def sufficient_stock?
-      Stock::Quantifier.new(variant_id).can_supply? quantity
+      Stock::Quantifier.new(variant).can_supply? quantity
     end
 
     def insufficient_stock?

data/app/models/spree/order.rb

@@ -48,6 +48,8 @@ module Spree
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
     has_many :shipment_adjustments, through: :shipments, source: :adjustments
     has_many :inventory_units, inverse_of: :order
+    has_many :products, through: :variants
+    has_many :variants, through: :line_items
 
     has_and_belongs_to_many :promotions, join_table: 'spree_orders_promotions'
 
@@ -87,8 +89,12 @@ module Spree
       where(number: number)
     end
 
+    scope :created_between, ->(start_date, end_date) { where(created_at: start_date..end_date) }
+    scope :completed_between, ->(start_date, end_date) { where(completed_at: start_date..end_date) }
+
     def self.between(start_date, end_date)
-      where(created_at: start_date..end_date)
+      ActiveSupport::Deprecation.warn("Order#between will be deprecated in Spree 2.3, please use either Order#created_between or Order#completed_between instead.")
+      self.created_between(start_date, end_date)
     end
 
     def self.by_customer(customer)
@@ -114,7 +120,8 @@ module Spree
     end
 
     def all_adjustments
-      Adjustment.where("order_id = :order_id OR adjustable_id = :order_id", :order_id => self.id)
+      Adjustment.where("order_id = :order_id OR (adjustable_id = :order_id AND adjustable_type = 'Spree::Order')",
+        :order_id => self.id)
     end
 
     # For compatiblity with Calculator::PriceSack
@@ -146,6 +153,10 @@ module Spree
       Spree::Money.new(additional_tax_total, { currency: currency })
     end
 
+    def display_tax_total
+      Spree::Money.new(included_tax_total + additional_tax_total, { currency: currency })
+    end
+
     def display_shipment_total
       Spree::Money.new(shipment_total, { currency: currency })
     end
@@ -197,7 +208,7 @@ module Spree
     # Returns the relevant zone (if any) to be used for taxation purposes.
     # Uses default tax zone unless there is a specific match
     def tax_zone
-      Zone.match(tax_address) || Zone.default_tax
+      @tax_zone ||= Zone.match(tax_address) || Zone.default_tax
     end
 
     # Indicates whether tax should be backed out of the price calcualtions in
@@ -205,7 +216,7 @@ module Spree
     # taxes in that case.
     def exclude_tax?
       return false unless Spree::Config[:prices_inc_tax]
-      return tax_zone != Zone.default_tax
+      tax_zone != Zone.default_tax
     end
 
     # Returns the address for taxation based on configuration
@@ -244,14 +255,16 @@ module Spree
     end
 
     # Associates the specified user with the order.
-    def associate_user!(user)
+    def associate_user!(user, override_email = true)
       self.user = user
-      self.email = user.email
-      self.created_by = user if self.created_by.blank?
+      attrs_to_set = { user_id: user.id }
+      attrs_to_set[:email] = user.email if override_email
+      attrs_to_set[:created_by_id] = user.id if self.created_by.blank?
+      assign_attributes(attrs_to_set)
 
       if persisted?
         # immediately persist the changes we just made, but don't use save since we might have an invalid address associated
-        self.class.unscoped.where(id: id).update_all(email: user.email, user_id: user.id, created_by_id: self.created_by_id)
+        self.class.unscoped.where(id: id).update_all(attrs_to_set)
       end
     end
 
@@ -395,16 +408,8 @@ module Spree
       bill_address.try(:lastname)
     end
 
-    def products
-      line_items.map(&:product)
-    end
-
-    def variants
-      line_items.map(&:variant)
-    end
-
     def insufficient_stock_lines
-     @insufficient_stock_lines ||= line_items.select(&:insufficient_stock?)
+     line_items.select(&:insufficient_stock?)
     end
 
     def merge!(order, user = nil)
@@ -422,6 +427,10 @@ module Spree
 
       self.associate_user!(user) if !self.user && !user.blank?
 
+      updater.update_item_count
+      updater.update_item_total
+      updater.persist_totals
+
       # So that the destroy doesn't take out line items which may have been re-assigned
       order.line_items.reload
       order.destroy
@@ -429,6 +438,8 @@ module Spree
 
     def empty!
       line_items.destroy_all
+      updater.update_item_count
+
       adjustments.destroy_all
       update_totals
       persist_totals
@@ -575,6 +586,11 @@ module Spree
       self.ensure_updated_shipments
     end
 
+    def reload
+      remove_instance_variable(:@tax_zone) if defined?(@tax_zone)
+      super
+    end
+
     private
 
       def link_by_email
@@ -583,7 +599,7 @@ module Spree
 
       # Determine if email is required (we don't want validation errors before we hit the checkout)
       def require_email
-        return true unless new_record? or ['cart', 'address'].include?(state)
+        true unless new_record? or ['cart', 'address'].include?(state)
       end
 
       def ensure_line_items_present
@@ -607,7 +623,7 @@ module Spree
 
       def after_cancel
         shipments.each { |shipment| shipment.cancel! }
-        payments.completed.each { |payment| payment.credit! }
+        payments.completed.each { |payment| payment.cancel! }
 
         send_cancel_email
         self.update_column(:payment_state, 'credit_owed') unless shipped?

data/app/models/spree/order/checkout.rb

@@ -38,7 +38,7 @@ module Spree
             # To avoid multiple occurrences of the same transition being defined
             # On first definition, state_machines will not be defined
             state_machines.clear if respond_to?(:state_machines)
-            state_machine :state, :initial => :cart do
+            state_machine :state, :initial => :cart, :use_transactions => false, :action => :save_state do
               klass.next_event_transitions.each { |t| transition(t.merge(:on => :next)) }
 
               # Persist the state on the order
@@ -101,6 +101,8 @@ module Spree
                 order.persist_totals
               end
             end
+
+            alias_method :save_state, :save
           end
 
           def self.go_to_state(name, options={})

data/app/models/spree/order_updater.rb

@@ -149,9 +149,15 @@ module Spree
           elsif payments.last.state == 'checkout'
             order.payment_state = 'pending'
           elsif payments.last.state == 'completed'
-            order.payment_state = 'credit_owed'
-          else
+            if line_items.empty?
+              order.payment_state = 'credit_owed'
+            else
+              order.payment_state = 'balance_due'
+            end
+          elsif payments.last.state == 'pending'
             order.payment_state = 'balance_due'
+          else
+            order.payment_state = 'credit_owed'
           end
         else
           order.payment_state = 'balance_due'

data/app/models/spree/payment.rb

@@ -113,8 +113,8 @@ module Spree
 
     # see https://github.com/spree/spree/issues/981
     def build_source
-      return if source_attributes.nil?
-      if payment_method and payment_method.payment_source_class
+      return unless new_record?
+      if source_attributes.present? && source.blank? && payment_method.try(:payment_source_class)
         self.source = payment_method.payment_source_class.new(source_attributes)
         self.source.payment_method_id = payment_method.id
         self.source.user_id = self.order.user_id if self.order

data/app/models/spree/payment/processing.rb

@@ -111,6 +111,14 @@ module Spree
         end
       end
 
+      def cancel!
+        if payment_method.respond_to?(:cancel)
+          payment_method.cancel(response_code)
+        else
+          credit!
+        end
+      end
+
       def partial_credit(amount)
         return if amount > credit_allowed
         started_processing!
@@ -118,6 +126,7 @@ module Spree
       end
 
       def gateway_options
+        order.reload
         options = { :email       => order.email,
                     :customer    => order.email,
                     :customer_id => order.user_id,

data/app/models/spree/payment_method.rb

@@ -54,6 +54,12 @@ module Spree
       true
     end
 
+    # Custom gateways should redefine this method. See Gateway implementation
+    # as an example
+    def reusable_sources(order)
+      []
+    end
+
     def auto_capture?
       self.auto_capture.nil? ? Spree::Config[:auto_capture] : self.auto_capture
     end

data/app/models/spree/price.rb

@@ -1,7 +1,7 @@
 module Spree
   class Price < ActiveRecord::Base
     acts_as_paranoid
-    belongs_to :variant, class_name: 'Spree::Variant', inverse_of: :prices
+    belongs_to :variant, class_name: 'Spree::Variant', inverse_of: :prices, touch: true
 
     validate :check_price
     validates :amount, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
@@ -29,6 +29,7 @@ module Spree
     end
 
     private
+
     def check_price
       raise "Price must belong to a variant" if variant.nil?
 
@@ -51,4 +52,3 @@ module Spree
 
   end
 end
-

data/app/models/spree/product.rb

@@ -201,7 +201,7 @@ module Spree
       if self.variants_including_master.any? { |v| !v.should_track_inventory? }
         Float::INFINITY
       else
-        self.stock_items.sum(&:count_on_hand)
+        self.stock_items.to_a.sum(&:count_on_hand)
       end
     end
 
@@ -257,8 +257,13 @@ module Spree
         self.master ||= Variant.new
       end
 
+      # Iterate through this products taxons and taxonomies and touch their timestamps in a batch
       def touch_taxons
-        self.taxons.each(&:touch)
+        taxons_to_touch = taxons.map(&:self_and_ancestors).flatten.uniq
+        Spree::Taxon.where(id: taxons_to_touch.map(&:id)).update_all(updated_at: Time.current)
+
+        taxonomy_ids_to_touch = taxons_to_touch.map(&:taxonomy_id).flatten.uniq
+        Spree::Taxonomy.where(id: taxonomy_ids_to_touch).update_all(updated_at: Time.current)
       end
   end
 end