spree_core 4.1.0.rc3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7062a9bb28afea833ef56e653f7f974eaf33f6d10c352c407beea07910ed2b7e
-  data.tar.gz: 0effc4f253609ec14cd29109e21161b44cb92af1c1a53840f24bd27dae5fd0d8
+  metadata.gz: 3057b4eecebae24385eed939c3236d14177222693d927f85e7fac5ac775cbdec
+  data.tar.gz: 8f5f40c80e021a02bb985b119f9c6f5e90d268392b81984df85d0f738208866e
 SHA512:
-  metadata.gz: 5024b7281e7cfa97efbb104d6f243d9783d36288d5dfe8e91a8ebe14a52e04bc61f78e7cf8a3765224d8a9a7ea4e18d218b0e9d924c12b111a629544ed36ddf9
-  data.tar.gz: dc6c98bf3679d2997e966f1efc671d87523fb994650fdff5968ed2c52523171a60c9b406f93c645bb34a52a1c5fbfc9215d1f574bc52a955082f54fba255cb3c
+  metadata.gz: a495af06eebc663bb6c69ccf12b411989f8283ac36edd633b21421bf0b152dbc91315515ea1c5189a1c4b43f45d397fd1d076ad9e35c08e35bdf8f6df573d50e
+  data.tar.gz: e559d035f7ef2359141281dbc4d42dd2f0791ac0c42f7ecc47a638ba0f1dd1bffab385e35389b70409ce1bf856c609a4dabf7edbbb428778f05545e12269b726

data/app/helpers/spree/base_helper.rb

@@ -25,6 +25,8 @@ module Spree
     def link_to_tracking(shipment, options = {})
       return unless shipment.tracking && shipment.shipping_method
 
+      options[:target] ||= :blank
+
       if shipment.tracking_url
         link_to(shipment.tracking, shipment.tracking_url, options)
       else
@@ -104,15 +106,27 @@ module Spree
       Spree::Core::Engine.frontend_available?
     end
 
+    # we should always try to render image of the default variant
+    # same as it's done on PDP
+    def default_image_for_product(product)
+      if product.default_variant.images.any?
+        product.default_variant.images.first
+      elsif product.variant_images.any?
+        product.variant_images.first
+      end
+    end
+
     def default_image_for_product_or_variant(product_or_variant)
-      if product_or_variant.images.empty?
-        if product_or_variant.is_a?(Spree::Product) && product_or_variant.variant_images.any?
-          product_or_variant.variant_images.first
-        elsif product_or_variant.is_a?(Spree::Variant) && product_or_variant.product.variant_images.any?
-          product_or_variant.product.variant_images.first
+      Rails.cache.fetch("spree/default-image/#{product_or_variant.cache_key_with_version}") do
+        if product_or_variant.is_a?(Spree::Product)
+          default_image_for_product(product_or_variant)
+        elsif product_or_variant.is_a?(Spree::Variant)
+          if product_or_variant.images.any?
+            product_or_variant.images.first
+          else
+            default_image_for_product(product_or_variant.product)
+          end
         end
-      else
-        product_or_variant.images.first
       end
     end
 

data/app/helpers/spree/products_helper.rb

@@ -31,12 +31,12 @@ module Spree
       end
     end
 
-    def default_variant(variants)
-      variants_option_types_presenter(variants).default_variant || variants.find(&:is_master)
+    def default_variant(variants, product)
+      variants_option_types_presenter(variants, product).default_variant || product.default_variant
     end
 
-    def used_variants_options(variants)
-      variants_option_types_presenter(variants).options
+    def used_variants_options(variants, product)
+      variants_option_types_presenter(variants, product).options
     end
 
     # converts line breaks in product description into <p> tags (for html display purposes)
@@ -94,10 +94,12 @@ module Spree
     end
 
     def product_images(product, variants)
-      variants = if product.variants_and_option_values(current_currency).any?
-                   variants.reject(&:is_master)
-                 else
-                   variants
+      if product.variants_and_option_values(current_currency).any?
+        variants_without_master_images = variants.reject(&:is_master).map(&:images).flatten
+
+        if variants_without_master_images.any?
+          return variants_without_master_images
+        end
       end
 
       variants.map(&:images).flatten
@@ -143,11 +145,11 @@ module Spree
       end
     end
 
-    def variants_option_types_presenter(variants)
+    def variants_option_types_presenter(variants, product)
       @_variants_option_types_presenter ||= begin
         option_types = Spree::Variants::OptionTypesFinder.new(variant_ids: variants.map(&:id)).execute
 
-        Spree::Variants::OptionTypesPresenter.new(option_types, variants)
+        Spree::Variants::OptionTypesPresenter.new(option_types, variants, product)
       end
     end
   end

data/app/models/spree/order.rb

@@ -21,7 +21,8 @@ module Spree
     extend Spree::DisplayMoney
     money_methods :outstanding_balance, :item_total,           :adjustment_total,
                   :included_tax_total,  :additional_tax_total, :tax_total,
-                  :shipment_total,      :promo_total,          :total
+                  :shipment_total,      :promo_total,          :total,
+                  :cart_promo_total
 
     alias display_ship_total display_shipment_total
     alias_attribute :ship_total, :shipment_total
@@ -631,6 +632,15 @@ module Spree
         coupons
     end
 
+    # Returns item and whole order discount amount for Order
+    # without Shipment disccounts (eg. Free Shipping)
+    # @return [BigDecimal]
+    def cart_promo_total
+      all_adjustments.eligible.nonzero.promotion.
+        where.not(adjustable_type: 'Spree::Shipment').
+        sum(:amount)
+    end
+
     private
 
     def link_by_email

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

@@ -15,6 +15,8 @@ module Spree
       end
 
       def could_use_store_credit?
+        return false if Spree::PaymentMethod::StoreCredit.available.empty?
+
         total_available_store_credit > 0
       end
 

data/app/models/spree/product.rb

@@ -75,6 +75,7 @@ module Spree
     has_many :orders, through: :line_items
 
     has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
+    has_many :variant_images_without_master, -> { order(:position) }, source: :images, through: :variants
 
     after_create :add_associations_from_prototype
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
@@ -150,10 +151,28 @@ module Spree
       variants.any?
     end
 
+    # Returns default Variant for Product
+    # If `track_inventory_levels` is enabled it will try to find the first Variant
+    # in stock or backorderable, if there's none it will return first Variant sorted
+    # by `position` attribute
+    # If `track_inventory_levels` is disabled it will return first Variant sorted
+    # by `position` attribute
+    #
+    # @return [Spree::Variant]
     def default_variant
-      has_variants? ? variants.first : master
+      track_inventory = Spree::Config[:track_inventory_levels]
+
+      Rails.cache.fetch("spree/default-variant/#{cache_key_with_version}/#{track_inventory}") do
+        if track_inventory && variants.in_stock_or_backorderable.any?
+          variants.in_stock_or_backorderable.first
+        else
+          has_variants? ? variants.first : master
+        end
+      end
     end
 
+    # Returns default Variant ID for Product
+    # @return [Integer]
     def default_variant_id
       default_variant.id
     end

data/app/models/spree/shipment.rb

@@ -40,6 +40,7 @@ module Spree
     scope :with_state, ->(*s) { where(state: s) }
     # sort by most recent shipped_at, falling back to created_at. add "id desc" to make specs that involve this scope more deterministic.
     scope :reverse_chronological, -> { order(Arel.sql('coalesce(spree_shipments.shipped_at, spree_shipments.created_at) desc'), id: :desc) }
+    scope :valid, -> { where.not(state: :canceled) }
 
     # shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine initial: :pending, use_transactions: false do

data/app/presenters/spree/variant_presenter.rb

@@ -18,6 +18,7 @@ module Spree
           display_price: display_price(variant),
           is_product_available_in_currency: @is_product_available_in_currency,
           backorderable: backorderable?(variant),
+          in_stock: in_stock?(variant),
           images: images(variant),
           option_values: option_values(variant),
         }.merge(
@@ -52,16 +53,21 @@ module Spree
     end
 
     def backorderable_variant_ids
-      @backorderable_variant_ids ||= Spree::Variant.joins(:stock_items).where(id: @variants.map(&:id)).
-        where(spree_stock_items: { backorderable: true }).merge(Spree::StockItem.with_active_stock_location).distinct.ids
+      @backorderable_variant_ids ||= Spree::Variant.where(id: @variants.map(&:id)).backorderable.ids
+    end
+
+    def in_stock?(variant)
+      in_stock_variant_ids.include?(variant.id)
+    end
+
+    def in_stock_variant_ids
+      @in_stock_variant_ids ||= Spree::Variant.where(id: @variants.map(&:id)).in_stock.ids
     end
 
     def variant_attributes(variant)
       {
         id: variant.id,
         sku: variant.sku,
-        price: variant.price,
-        in_stock: variant.in_stock?,
         purchasable: variant.purchasable?
       }
     end

data/app/presenters/spree/variants/option_types_presenter.rb

@@ -1,9 +1,10 @@
 module Spree
   module Variants
     class OptionTypesPresenter
-      def initialize(option_types, variants)
+      def initialize(option_types, variants, product)
         @option_types = option_types
         @variant_ids = variants.map(&:id)
+        @product = product
       end
 
       def default_variant
@@ -30,7 +31,7 @@ module Spree
         return {} if option_types.empty?
 
         @default_variant_data ||= begin
-          find_in_stock_variant_data || find_backorderable_variant_data || find_first_variant_data
+          try_default_variant || find_in_stock_variant_data || find_backorderable_variant_data || find_first_variant_data
         end
       end
 
@@ -44,7 +45,17 @@ module Spree
 
       def find_variant_data(&block)
         option_types.first.option_values.each do |option_value|
-          variant = option_value.variants.where(id: @variant_ids).find(&block)
+          variant = option_value.variants.where(id: @variant_ids).order(:position).find(&block)
+
+          return { variant: variant, option_value: option_value } if variant
+        end
+
+        nil
+      end
+
+      def try_default_variant
+        option_types.first.option_values.each do |option_value|
+          variant = option_value.variants.where(id: @product.default_variant_id).first
 
           return { variant: variant, option_value: option_value } if variant
         end
@@ -54,7 +65,7 @@ module Spree
 
       def find_first_variant_data
         option_value = option_types.first.option_values.first
-        variant = option_value.variants.where(id: @variant_ids).first
+        variant = option_value.variants.where(id: @variant_ids).order(:position).first
 
         { variant: variant, option_value: option_value }
       end
@@ -65,7 +76,7 @@ module Spree
             id: option_value.id,
             position: option_value.position,
             presentation: option_value.presentation,
-            variant_id: option_value.variants.where(id: @variant_ids).first.id,
+            variant_id: option_value.variants.where(id: @variant_ids).order(:position).first.id,
             is_default: option_value == default_variant_data[:option_value]
           }
         end

data/config/locales/en.yml

@@ -488,7 +488,7 @@ en:
     add_variant: Add Variant
     add_store: New Store
     add_store_credit: Add Store Credit
-    added_to_cart: Added to bag successfully!
+    added_to_cart: Added to cart successfully!
     additional_item: Additional Item
     address: Address
     address1: Address
@@ -636,7 +636,7 @@ en:
       add_promo_code: ADD PROMO CODE
       checkout: checkout
       empty_info: 'Your cart is empty.'
-      header: Your shopping bag
+      header: Your shopping cart
       product: product
       quantity: quantity
       title: Shopping Cart
@@ -1213,7 +1213,7 @@ en:
       not_found_filters2: Please try another choose.
       not_found_text1: We couldn’t find products for '%{keywords}'.
       not_found_text2: Please try another search.
-      price: Price
+      price: price
       price_high_to_low: PRICE (HIGH - LOW)
       price_low_to_high: PRICE (LOW - HIGH)
       result: RESULT
@@ -1367,6 +1367,7 @@ en:
       authorized: Authorized
       canceled: Canceled
     return_authorization_updated: Return authorization updated
+    return_authorization_canceled: Return authorization canceled
     return_authorizations: Return Authorizations
     return_item_inventory_unit_ineligible: Return item's inventory unit must be shipped
     return_item_inventory_unit_reimbursed: Return item's inventory unit is already reimbursed

data/db/default/spree/store_credit_categories.rb

@@ -0,0 +1 @@
+Spree::StoreCreditCategory.find_or_create_by!(name: 'Default')

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.0.rc3'
+    '4.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc3
+  version: 4.1.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -677,6 +677,7 @@ files:
 - db/default/spree/default_reimbursement_type.rb
 - db/default/spree/roles.rb
 - db/default/spree/states.rb
+- db/default/spree/store_credit_categories.rb
 - db/default/spree/stores.rb
 - db/default/spree/zones.rb
 - db/migrate/20120831092320_spree_one_two.rb