spree_core 4.1.0.rc2 → 4.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdc19a0196b06913c237d25f4e45315ea03abf5a5b30e5e660440339daf7e5f0
-  data.tar.gz: c5d95ff6a5ca995ae81ee67ffbfe8b17a09a24afd5f83cfa5e7fc1a3b19a1fb9
+  metadata.gz: 7062a9bb28afea833ef56e653f7f974eaf33f6d10c352c407beea07910ed2b7e
+  data.tar.gz: 0effc4f253609ec14cd29109e21161b44cb92af1c1a53840f24bd27dae5fd0d8
 SHA512:
-  metadata.gz: '098925f7a1dc32e87a5a1a0798b13a7983d86a1fe5cb8f2f20f9ffb50eb0098c79785e81c849d1137bba1362d01edfd9fe3cdf904092943c3a354f47a057ec3c'
-  data.tar.gz: 8f052c9cc5437ad254105c6e5236968a81c7dd5c1f8af4fd086f97bf684784b3b64f7aaeae317a1840225931848958f7007ae6ffc1b63b319d820062b2cb8cab
+  metadata.gz: 5024b7281e7cfa97efbb104d6f243d9783d36288d5dfe8e91a8ebe14a52e04bc61f78e7cf8a3765224d8a9a7ea4e18d218b0e9d924c12b111a629544ed36ddf9
+  data.tar.gz: dc6c98bf3679d2997e966f1efc671d87523fb994650fdff5968ed2c52523171a60c9b406f93c645bb34a52a1c5fbfc9215d1f574bc52a955082f54fba255cb3c

data/app/helpers/spree/products_helper.rb

@@ -127,8 +127,8 @@ module Spree
                              limit(Spree::Config[:products_per_page])
     end
 
-    def product_available_in_currency?(product)
-      !(product.price_in(current_currency).amount.nil? || product.price_in(current_currency).amount.zero?)
+    def product_available_in_currency?
+      !(@product_price.nil? || @product_price.zero?)
     end
 
     def common_product_cache_keys
@@ -147,7 +147,7 @@ module Spree
       @_variants_option_types_presenter ||= begin
         option_types = Spree::Variants::OptionTypesFinder.new(variant_ids: variants.map(&:id)).execute
 
-        Spree::Variants::OptionTypesPresenter.new(option_types)
+        Spree::Variants::OptionTypesPresenter.new(option_types, variants)
       end
     end
   end

data/app/models/spree/inventory_unit.rb

@@ -4,11 +4,11 @@ module Spree
       belongs_to :variant, class_name: 'Spree::Variant'
       belongs_to :order, class_name: 'Spree::Order'
       belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, optional: true
-      belongs_to :return_authorization, class_name: 'Spree::ReturnAuthorization'
+      has_many :return_items
+      has_many :return_authorizations, class_name: 'Spree::ReturnAuthorization', through: :return_items
       belongs_to :line_item, class_name: 'Spree::LineItem'
     end
 
-    has_many :return_items, inverse_of: :inventory_unit
     belongs_to :original_return_item, class_name: 'Spree::ReturnItem'
 
     scope :backordered, -> { where state: 'backordered' }

data/app/models/spree/taxon.rb

@@ -21,6 +21,7 @@ module Spree
 
     validates :name, presence: true, uniqueness: { scope: [:parent_id, :taxonomy_id], allow_blank: true, case_sensitive: false }
     validates :permalink, uniqueness: { case_sensitive: false }
+    validates :hide_from_nav, inclusion: { in: [true, false] }
     validates_associated :icon
     validate :check_for_root, on: :create
     with_options length: { maximum: 255 }, allow_blank: true do

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

@@ -1,8 +1,9 @@
 module Spree
   module Variants
     class OptionTypesPresenter
-      def initialize(option_types)
+      def initialize(option_types, variants)
         @option_types = option_types
+        @variant_ids = variants.map(&:id)
       end
 
       def default_variant
@@ -43,7 +44,7 @@ module Spree
 
       def find_variant_data(&block)
         option_types.first.option_values.each do |option_value|
-          variant = option_value.variants.find(&block)
+          variant = option_value.variants.where(id: @variant_ids).find(&block)
 
           return { variant: variant, option_value: option_value } if variant
         end
@@ -53,7 +54,7 @@ module Spree
 
       def find_first_variant_data
         option_value = option_types.first.option_values.first
-        variant = option_value.variants.first
+        variant = option_value.variants.where(id: @variant_ids).first
 
         { variant: variant, option_value: option_value }
       end
@@ -64,7 +65,7 @@ module Spree
             id: option_value.id,
             position: option_value.position,
             presentation: option_value.presentation,
-            variant_id: option_value.variants.first.id,
+            variant_id: option_value.variants.where(id: @variant_ids).first.id,
             is_default: option_value == default_variant_data[:option_value]
           }
         end

data/config/locales/en.yml

@@ -635,7 +635,7 @@ en:
     cart_page:
       add_promo_code: ADD PROMO CODE
       checkout: checkout
-      empty_info: 'Your cart is empty.<br />There are no items in your cart.'
+      empty_info: 'Your cart is empty.'
       header: Your shopping bag
       product: product
       quantity: quantity
@@ -767,7 +767,7 @@ en:
     dismiss_banner: No. Thanks! I'm not interested, do not display this message again
     display: Display
     doesnt_track_inventory: It doesn't track inventory
-    dont_have_account: Don't have an account yet?
+    dont_have_account: No account?
     edit: Edit
     editing_resource: 'Editing %{resource}'
     editing_rma_reason: Editing RMA Reason
@@ -864,6 +864,7 @@ en:
     guest_user_account: Checkout as a Guest
     has_no_shipped_units: has no shipped units
     height: Height
+    hide_from_subcategories_nav: Hide from subcategories navigation
     home: Home
     homepage:
       bestsellers: BESTSELLERS
@@ -1212,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
@@ -1350,6 +1351,7 @@ en:
     rename: Rename
     report: Report
     reports: Reports
+    required: '*'
     required_fields: required fields
     resellable: Resellable
     resend: Resend

data/db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb

@@ -0,0 +1,5 @@
+class AddHideFromNavToTaxons < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_taxons, :hide_from_nav, :boolean, default: false, index: true
+  end
+end

data/lib/generators/spree/install/templates/config/spree_storefront.yml

@@ -19,11 +19,11 @@ default:
       promo_banners:
         - subtitle: New collection
           title: Summer 2019
-          url: /t/summer-collection
+          url: /t/new-collection/summer-2019
           image: 'meganav/promo_banner_left-first-category.jpg'
         - subtitle: Special Offers
           title: Get up to 30% off
-          url: /t/special-offers
+          url: /t/special-offers/30-off
           image: 'meganav/promo_banner_right-first-category.jpg'
     - title: Men
       subtitle: Categories
@@ -40,11 +40,11 @@ default:
       promo_banners:
         - subtitle: New collection
           title: Summer 2019
-          url: /t/summer-collection
+          url: /t/new-collection/summer-2019
           image: 'meganav/promo_banner_left-second-category.jpg'
         - subtitle: Special Offers
           title: Get up to 30% off
-          url: /t/special-offers
+          url: /t/special-offers/30-off
           image: 'meganav/promo_banner_right-second-category.jpg'
     - title: Sportswear
       subtitle: Categories
@@ -59,9 +59,9 @@ default:
       promo_banners:
         - subtitle: New collection
           title: Summer 2019
-          url: /t/summer-collection
+          url: /t/new-collection/summer-2019
           image: 'meganav/promo_banner_left-third-category.jpg'
         - subtitle: Special Offers
           title: Get up to 30% off
-          url: /t/special-offers
+          url: /t/special-offers/30-off
           image: 'meganav/promo_banner_right-third-category.jpg'

data/lib/spree/core/search/base.rb

@@ -36,7 +36,7 @@ module Spree
         def extended_base_scope
           base_scope = Spree::Product.spree_base_scopes.active
           base_scope = get_products_conditions_for(base_scope, keywords)
-          base_scope = Spree::Products::Find.new(
+          base_scope = Spree::Dependencies.products_finder.constantize.new(
             scope: base_scope,
             params: {
               filter: {

data/lib/spree/core/version.rb

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

data/lib/spree/permitted_attributes.rb

@@ -105,8 +105,8 @@ module Spree
     @@taxonomy_attributes = [:name]
 
     @@taxon_attributes = [
-      :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id,
-      :meta_description, :meta_keywords, :meta_title, :child_index
+      :name, :parent_id, :position, :icon, :description, :permalink, :hide_from_nav,
+      :taxonomy_id, :meta_description, :meta_keywords, :meta_title, :child_index
     ]
 
     # TODO: Should probably use something like Spree.user_class.attributes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc2
+  version: 4.1.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -945,6 +945,7 @@ files:
 - db/migrate/20191005121504_add_store_id_to_payment_methods.rb
 - db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb
 - db/migrate/20200102141311_add_social_to_spree_stores.rb
+- db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb
 - db/seeds.rb
 - lib/friendly_id/slug_rails5_patch.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb