spree_core 4.3.0.rc3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fd663cedb276d7b23b137c9ff65cb153f986deee175e19672198a5ba9078707
-  data.tar.gz: d9105ced36ac4078df6963e6ca7cd9c2e45bfec3dbed2b2872ff76c99d05dfb3
+  metadata.gz: e7b01cdb9b4fae7dbc504ec200b0ac4fad4c3d6f025879bfb8ff1204a39843cf
+  data.tar.gz: aef3c6e29b38409ad11305d669b56b5dabae08d0a653783dfab0230ce89bc5c6
 SHA512:
-  metadata.gz: db4eb2dfeeca9a7acb56d3146b1e73a97485eec348e9b9537b3145f3ce1c8fc66a7b48d3a68c177fac4cf5d9c93ed7a47738487e034a9698e0eb2f5dba2025de
-  data.tar.gz: fecab76acd9f180cc9cbe79d23a11f26a2cd86c86ca83e9157b9d8dbe1e475de8d59fea914b75bcab2dc29a4edc1b40074ed056f528abbd96a2750e3088f80df
+  metadata.gz: a221ccc5207cd316ff2102787e55f22ff9ade341d0d882ae4a2a2b476c2b62d8fba6463ab71af894b28eb9edc0fa98ee63fac1b03610e419d25d2845568faf77
+  data.tar.gz: d1086b0e7216ff453df0197c6a9c7620cee71340cefed09aea7fccbcd2b5be679bb8e0d34656231209bb7dc587ab757594a64809670c898805280ee4a19567bf

data/app/models/spree/app_dependencies.rb

@@ -13,7 +13,7 @@ module Spree
       :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
       :account_create_address_service, :account_update_address_service, :account_create_service, :account_update_service,
       :address_finder, :collection_sorter, :error_handler, :current_store_finder, :cart_empty_service, :cart_destroy_service,
-      :classification_reposition_service, :credit_cards_destroy_service
+      :classification_reposition_service, :credit_cards_destroy_service, :cart_associate_service, :cart_change_currency_service
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -43,6 +43,8 @@ module Spree
       @cart_estimate_shipping_rates_service = 'Spree::Cart::EstimateShippingRates'
       @cart_empty_service = 'Spree::Cart::Empty'
       @cart_destroy_service = 'Spree::Cart::Destroy'
+      @cart_associate_service = 'Spree::Cart::Associate'
+      @cart_change_currency_service = 'Spree::Cart::ChangeCurrency'
 
       # checkout
       @checkout_next_service = 'Spree::Checkout::Next'

data/app/models/spree/cms/sections/featured_article.rb

@@ -1,6 +1,5 @@
 module Spree::Cms::Sections
   class FeaturedArticle < Spree::CmsSection
-    before_save :reset_link_attributes
     after_initialize :default_values
 
     store :content, accessors: [:title, :subtitle, :button_text, :rte_content], coder: JSON
@@ -14,12 +13,6 @@ module Spree::Cms::Sections
 
     private
 
-    def reset_link_attributes
-      if linked_resource_type_changed?
-        self.linked_resource_id = nil
-      end
-    end
-
     def default_values
       self.gutters ||= 'No Gutters'
       self.fit ||= 'Screen'

data/app/models/spree/cms/sections/hero_image.rb

@@ -1,6 +1,5 @@
 module Spree::Cms::Sections
   class HeroImage < Spree::CmsSection
-    before_save :reset_link_attributes
     after_initialize :default_values
 
     store :content, accessors: [:title, :button_text], coder: JSON
@@ -30,14 +29,6 @@ module Spree::Cms::Sections
 
     private
 
-    def reset_link_attributes
-      if linked_resource_type_changed?
-        return if linked_resource_id_was.nil?
-
-        self.linked_resource_id = nil
-      end
-    end
-
     def default_values
       self.gutters ||= 'No Gutters'
       self.fit ||= 'Screen'

data/app/models/spree/cms/sections/image_gallery.rb

@@ -1,7 +1,7 @@
 module Spree::Cms::Sections
   class ImageGallery < Spree::CmsSection
     after_initialize :default_values
-    before_save :reset_link_attributes
+    validate :reset_multiple_link_attributes
 
     LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
                              ['Spree::Taxon'].freeze
@@ -70,7 +70,7 @@ module Spree::Cms::Sections
 
     private
 
-    def reset_link_attributes
+    def reset_multiple_link_attributes
       return if Rails::VERSION::STRING < '6.0'
 
       if link_type_one_changed?

data/app/models/spree/cms/sections/side_by_side_images.rb

@@ -1,7 +1,7 @@
 module Spree::Cms::Sections
   class SideBySideImages < Spree::CmsSection
     after_initialize :default_values
-    before_save :reset_link_attributes
+    validate :reset_multiple_link_attributes
 
     LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
                              ['Spree::Taxon'].freeze
@@ -48,7 +48,7 @@ module Spree::Cms::Sections
 
     private
 
-    def reset_link_attributes
+    def reset_multiple_link_attributes
       return if Rails::VERSION::STRING < '6.0'
 
       if link_type_one_changed?

data/app/models/spree/cms_section.rb

@@ -5,6 +5,8 @@ module Spree
     acts_as_list scope: :cms_page
     belongs_to :cms_page, touch: true
 
+    validate :reset_link_attributes
+
     IMAGE_COUNT = ['one', 'two', 'three']
     IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
     IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
@@ -53,5 +55,15 @@ module Spree
     def fullscreen?
       fit == 'Screen'
     end
+
+    private
+
+    def reset_link_attributes
+      if linked_resource_type_changed?
+        return if linked_resource_id_was.nil?
+
+        self.linked_resource_id = nil
+      end
+    end
   end
 end

data/app/models/spree/product.rb

@@ -142,17 +142,17 @@ module Spree
 
     # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
     def purchasable?
-      variants_including_master.any?(&:purchasable?)
+      default_variant.purchasable? || variants.any?(&:purchasable?)
     end
 
     # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
     def in_stock?
-      variants_including_master.any?(&:in_stock?)
+      default_variant.in_stock? || variants.any?(&:in_stock?)
     end
 
     # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
     def backorderable?
-      variants_including_master.any?(&:backorderable?)
+      default_variant.backorderable? || variants.any?(&:backorderable?)
     end
 
     def find_or_build_master
@@ -301,11 +301,13 @@ module Spree
     end
 
     def total_on_hand
-      @total_on_hand ||= if any_variants_not_track_inventory?
-                           Float::INFINITY
-                         else
-                           stock_items.sum(:count_on_hand)
-                         end
+      @total_on_hand ||= Rails.cache.fetch(['product-total-on-hand', cache_key_with_version]) do
+        if any_variants_not_track_inventory?
+          Float::INFINITY
+        else
+          stock_items.sum(:count_on_hand)
+        end
+      end
     end
 
     # Master variant may be deleted (i.e. when the product is deleted)

data/app/models/spree/stock_location.rb

@@ -2,6 +2,7 @@ module Spree
   class StockLocation < Spree::Base
     has_many :shipments
     has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
+    has_many :variants, through: :stock_items
     has_many :stock_movements, through: :stock_items
 
     belongs_to :state, class_name: 'Spree::State', optional: true
@@ -14,6 +15,7 @@ module Spree
 
     after_create :create_stock_items, if: :propagate_all_variants?
     after_save :ensure_one_default
+    after_update :conditional_touch_records
 
     def state_text
       state.try(:abbr) || state.try(:name) || state_name
@@ -134,5 +136,12 @@ module Spree
         StockLocation.where(default: true).where.not(id: id).update_all(default: false)
       end
     end
+
+    def conditional_touch_records
+      return unless active_changed?
+
+      stock_items.update_all(updated_at: Time.current)
+      variants.update_all(updated_at: Time.current)
+    end
   end
 end

data/app/models/spree/taxon.rb

@@ -44,6 +44,7 @@ module Spree
     scope :for_store, ->(store) { joins(:taxonomy).where(spree_taxonomies: { store_id: store.id }) }
 
     self.whitelisted_ransackable_associations = %w[taxonomy]
+    self.whitelisted_ransackable_attributes = %w[name permalink]
 
     scope :for_stores, ->(stores) { joins(:taxonomy).where(spree_taxonomies: { store_id: stores.ids }) }
 

data/app/models/spree/variant.rb

@@ -60,7 +60,7 @@ module Spree
 
     after_touch :clear_in_stock_cache
 
-    scope :in_stock, -> { joins(:stock_items).where('count_on_hand > ? OR track_inventory = ?', 0, false) }
+    scope :in_stock, -> { joins(:stock_items).where("#{Spree::StockItem.table_name}.count_on_hand > ? OR #{Spree::Variant.table_name}.track_inventory = ?", 0, false) }
     scope :backorderable, -> { joins(:stock_items).where(spree_stock_items: { backorderable: true }) }
     scope :in_stock_or_backorderable, -> { in_stock.or(backorderable) }
 
@@ -256,7 +256,13 @@ module Spree
       end
     end
 
-    delegate :total_on_hand, :can_supply?, :backorderable?, to: :quantifier
+    def backorderable?
+      @backorderable ||= Rails.cache.fetch(['variant-backorderable', cache_key_with_version]) do
+        quantifier.backorderable?
+      end
+    end
+
+    delegate :total_on_hand, :can_supply?, to: :quantifier
 
     alias is_backorderable? backorderable?
 
@@ -291,7 +297,7 @@ module Spree
     end
 
     def backordered?
-      @backordered ||= total_on_hand <= 0 && stock_items.exists?(backorderable: true)
+      @backordered ||= !in_stock? && stock_items.exists?(backorderable: true)
     end
 
     private

data/app/presenters/spree/filters/options_presenter.rb

@@ -3,6 +3,26 @@ module Spree
     class OptionsPresenter
       FilterableOptionType = Struct.new(:option_type, :option_values, keyword_init: true) do
         delegate_missing_to :option_type
+
+        def to_h
+          {
+            id: option_type.id,
+            name: option_type.name,
+            presentation: option_type.presentation,
+            option_values: option_values.map { |e| option_value_hash(e) }
+          }
+        end
+
+        private
+
+        def option_value_hash(option_value)
+          {
+            id: option_value.id,
+            name: option_value.name,
+            presentation: option_value.presentation,
+            position: option_value.position
+          }
+        end
       end
 
       def initialize(option_values_scope:)

data/app/presenters/spree/filters/property_presenter.rb

@@ -14,9 +14,29 @@ module Spree
         property.uniq_values(product_properties_scope: product_properties)
       end
 
+      def to_h
+        {
+          id: property.id,
+          name: property.name,
+          presentation: property.presentation,
+          values: values_hash
+        }
+      end
+
       private
 
       attr_reader :property
+
+      def values_hash
+        value_hashes = uniq_values.map do |filter_param, value|
+          {
+            value: value,
+            filter_param: filter_param
+          }
+        end
+
+        value_hashes.sort_by { |e| e[:value] }
+      end
     end
   end
 end

data/app/services/spree/cart/associate.rb

@@ -0,0 +1,16 @@
+module Spree
+  module Cart
+    class Associate
+      prepend Spree::ServiceModule::Base
+
+      def call(guest_order:, user:)
+        if guest_order.user.nil?
+          guest_order.associate_user!(user)
+          success(guest_order)
+        else
+          failure(guest_order, 'Already assigned to a user')
+        end
+      end
+    end
+  end
+end

data/app/services/spree/cart/change_currency.rb

@@ -0,0 +1,27 @@
+module Spree
+  module Cart
+    class ChangeCurrency
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, new_currency:)
+        return failure('Currency not supported') unless supported_currency?(order, new_currency)
+
+        result = order.update!(currency: new_currency) rescue false
+
+        if result
+          success(order)
+        else
+          failure('Failed to update order')
+        end
+      end
+
+      private
+
+      def supported_currency?(order, currency)
+        store = order.store
+        supported_currencies = store.supported_currencies_list
+        supported_currencies.map(&:iso_code).include?(currency.upcase)
+      end
+    end
+  end
+end

data/app/sorters/spree/products/sort.rb

@@ -31,8 +31,14 @@ module Spree
       def by_sku(scope)
         return scope unless (value = sort_by?('sku'))
 
+        select_product_attributes = if scope.to_sql.include?("#{Spree::Product.table_name}.*")
+                                      ''
+                                    else
+                                      "#{Spree::Product.table_name}.*, "
+                                    end
+
         scope.joins(:master).
-          select("#{Spree::Product.table_name}.*, #{Spree::Variant.table_name}.sku").
+          select("#{select_product_attributes}#{Spree::Variant.table_name}.sku").
           where(Spree::Variant.table_name.to_s => { is_master: true }).
           order("#{Spree::Variant.table_name}.sku #{value[1]}")
       end

data/config/locales/en.yml

@@ -564,6 +564,7 @@ en:
         draft_mode: Draft Mode
         full_width: Full width
         link_to_taxon: Link to Taxon
+        link_to_product: Link to Product
         title: Title
         fit: Fit To
         info_hero_image_body: "<p>The Hero Image section adds a large image with a button and tagline text to your page.</p>
@@ -1349,6 +1350,7 @@ en:
     backordered_confirm_info: Selected item is backordered so expect delays. Are you sure you want to order it?
     overview: Overview
     package_from: package from
+    page: Page
     page_not_found: Sorry! Page you are looking can’t be found.
     pagination:
       next_page: next page &raquo;

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.3.0.rc3'.freeze
+  VERSION = '4.3.0'.freeze
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.3.0.rc3
+  version: 4.3.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -699,6 +699,8 @@ files:
 - app/services/spree/account/update.rb
 - app/services/spree/build_localized_redirect_url.rb
 - app/services/spree/cart/add_item.rb
+- app/services/spree/cart/associate.rb
+- app/services/spree/cart/change_currency.rb
 - app/services/spree/cart/create.rb
 - app/services/spree/cart/destroy.rb
 - app/services/spree/cart/empty.rb
@@ -724,7 +726,6 @@ files:
 - app/sorters/spree/products/sort.rb
 - app/validators/db_maximum_length_validator.rb
 - app/validators/email_validator.rb
-- app/views/spree/shared/_purchased_items_table.text.erb
 - config/initializers/active_storage.rb
 - config/initializers/friendly_id.rb
 - config/initializers/inflections.rb
@@ -1194,9 +1195,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.0.rc3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.0
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.3.0.rc3
+  source_code_uri: https://github.com/spree/spree/tree/v4.3.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1212,7 +1213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree

data/app/views/spree/shared/_purchased_items_table.text.erb

@@ -1,25 +0,0 @@
-<% line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>
-<% end %>
-============================================================
-<%= Spree.t('order_mailer.subtotal') %> <%= order.display_item_total %>
-<% if order.line_item_adjustments.exists? %>
-  <% if order.all_adjustments.promotion.eligible.exists? %>
-    <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
-      <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
-    <% end %>
-  <% end %>
-<% end %>
-
-<% order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
-  <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
-<% end %>
-
-<% if order.additional_tax_total != 0 %>
-  <%= Spree.t(:tax) %>: <%= order.display_additional_tax_total.to_html %>
-<% end %>
-
-<% order.adjustments.eligible.each do |adjustment| %>
-  <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
-  <%= adjustment.label %> <%= adjustment.display_amount %>
-<% end %>