spree_core 4.2.7 → 4.3.0.rc1

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

@@ -43,23 +43,23 @@ module Spree
       add_simple_scopes simple_scopes
 
       add_search_scope :ascend_by_master_price do
-        joins(master: :default_price).order("#{price_table_name}.amount ASC")
+        order("#{price_table_name}.amount ASC")
       end
 
       add_search_scope :descend_by_master_price do
-        joins(master: :default_price).order("#{price_table_name}.amount DESC")
+        order("#{price_table_name}.amount DESC")
       end
 
       add_search_scope :price_between do |low, high|
-        joins(master: :default_price).where(Price.table_name => { amount: low..high })
+        where(Price.table_name => { amount: low..high })
       end
 
       add_search_scope :master_price_lte do |price|
-        joins(master: :default_price).where("#{price_table_name}.amount <= ?", price)
+        where("#{price_table_name}.amount <= ?", price)
       end
 
       add_search_scope :master_price_gte do |price|
-        joins(master: :default_price).where("#{price_table_name}.amount >= ?", price)
+        where("#{price_table_name}.amount >= ?", price)
       end
 
       # This scope selects products in taxon AND all its descendants
@@ -94,6 +94,19 @@ module Spree
         taxons.first ? prepare_taxon_conditions(taxons) : where(nil)
       end
 
+      add_search_scope :ascend_by_taxons_min_position do |taxon_ids|
+        joins(:classifications).
+          where(Classification.table_name => { taxon_id: taxon_ids }).
+          select(
+            [
+              "#{Product.table_name}.*",
+              "MIN(#{Classification.table_name}.position) AS min_position"
+            ].join(', ')
+          ).
+          group(:id).
+          order(min_position: :asc)
+      end
+
       # a scope that finds all products having property specified by name, object or id
       add_search_scope :with_property do |property|
         joins(:properties).where(property_conditions(property))
@@ -107,6 +120,12 @@ module Spree
           where(property_conditions(property))
       end
 
+      add_search_scope :with_property_values do |property_filter_param, property_values|
+        joins(product_properties: :property).
+          where(Property.table_name => { filter_param: property_filter_param }).
+          where(ProductProperty.table_name => { filter_param: property_values.map(&:parameterize) })
+      end
+
       add_search_scope :with_option do |option|
         option_types = OptionType.table_name
         conditions = case option
@@ -198,18 +217,50 @@ module Spree
         end
       end
       search_scopes << :not_discontinued
+
+      def self.with_currency(currency)
+        joins(variants_including_master: :prices).
+          where(Price.table_name => { currency: currency.upcase }).
+          where.not(Price.table_name => { amount: nil }).
+          distinct
+      end
+      search_scopes << :with_currency
+
       # Can't use add_search_scope for this as it needs a default argument
-      def self.available(available_on = nil, _currency = nil)
+      def self.available(available_on = nil, currency = nil)
         available_on ||= Time.current
-        not_discontinued.joins(master: :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+
+        scope = not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+
+        unless Spree::Config.show_products_without_price
+          currency ||= Spree::Config[:currency]
+          scope = scope.with_currency(currency)
+        end
+
+        scope
       end
       search_scopes << :available
 
       def self.active(currency = nil)
-        available(nil, currency&.upcase)
+        available(nil, currency)
       end
       search_scopes << :active
 
+      def self.for_filters(currency, taxon: nil)
+        scope = active(currency)
+        scope = scope.in_taxon(taxon) if taxon.present?
+        scope
+      end
+      search_scopes << :for_filters
+
+      def self.for_user(user = nil)
+        if user.try(:has_spree_role?, 'admin')
+          with_deleted
+        else
+          not_deleted.not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", Time.current)
+        end
+      end
+
       add_search_scope :taxons_name_eq do |name|
         group('spree_products.id').joins(:taxons).where(Taxon.arel_table[:name].eq(name))
       end

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

@@ -0,0 +1,9 @@
+module Spree
+  module SingleStoreResource
+    extend ActiveSupport::Concern
+
+    included do
+      scope :for_store, ->(store) { where(store_id: store.id) }
+    end
+  end
+end

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

@@ -16,7 +16,12 @@ module Spree
       has_many :addresses, -> { where(deleted_at: nil).order('updated_at DESC') },
                            class_name: 'Spree::Address', foreign_key: :user_id
 
+      validate :address_not_associated_with_other_user, :address_not_deprecated_in_completed_order
+
       def persist_order_address(order)
+        # FIXME: we should check if the User's address is associated with country accepted by Store
+        # if not we should try to find an address with valid country in User's address book
+        # or we should call `build_bill_address`
         b_address = bill_address || build_bill_address
         b_address.attributes = order.bill_address.value_attributes
         b_address.save
@@ -30,6 +35,20 @@ module Spree
           update(ship_address_id: s_address.id)
         end
       end
+
+      private
+
+      def address_not_associated_with_other_user
+        errors.add(:bill_address_id, :belongs_to_other_user) if bill_address&.user_id && self != bill_address&.user
+        errors.add(:ship_address_id, :belongs_to_other_user) if ship_address&.user_id && self != ship_address&.user
+      end
+
+      def address_not_deprecated_in_completed_order
+        errors.add(:bill_address_id, :deprecated_in_completed_order) if
+          orders.complete.with_deleted_bill_address.where(bill_address: bill_address_id).any?
+        errors.add(:ship_address_id, :deprecated_in_completed_order) if
+          orders.complete.with_deleted_ship_address.where(ship_address: ship_address_id).any?
+      end
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Spree
       belongs_to :ship_address, class_name: 'Spree::Address', optional: true
       belongs_to :bill_address, class_name: 'Spree::Address', optional: true
 
-      self.whitelisted_ransackable_associations = %w[bill_address ship_address]
+      self.whitelisted_ransackable_associations = %w[bill_address ship_address addresses]
       self.whitelisted_ransackable_attributes = %w[id email]
 
       def self.with_email(query)
@@ -59,9 +59,10 @@ module Spree
         first
     end
 
-    def total_available_store_credit(currency = nil)
-      currency ||= Spree::Config[:currency]
-      store_credits.where(currency: currency).reload.to_a.sum(&:amount_remaining)
+    def total_available_store_credit(currency = nil, store = nil)
+      store ||= Store.default
+      currency ||= store.default_currency
+      store_credits.for_store(store).where(currency: currency).reload.to_a.sum(&:amount_remaining)
     end
 
     private

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

@@ -9,7 +9,7 @@ module Spree
       end
 
       def payment_sources
-        credit_cards.with_payment_profile.not_expired.where(payment_method: Spree::PaymentMethod.active)
+        credit_cards.with_payment_profile.not_expired.where(payment_method: Spree::PaymentMethod.active).not_removed
       end
 
       def drop_payment_source(source)

data/app/models/spree/ability.rb

@@ -61,6 +61,8 @@ module Spree
 
     def apply_user_permissions(user)
       can :read, ::Spree::Country
+      can :read, ::Spree::Menu
+      can :read, ::Spree::CmsPage
       can :read, ::Spree::OptionType
       can :read, ::Spree::OptionValue
       can :create, ::Spree::Order
@@ -71,7 +73,7 @@ module Spree
         !order.completed? && (order.user == user || order.token && token == order.token)
       end
       can :manage, ::Spree::Address, user_id: user.id
-      can :read, ::Spree::CreditCard, user_id: user.id
+      can [:read, :destroy], ::Spree::CreditCard, user_id: user.id
       can :read, ::Spree::Product
       can :read, ::Spree::ProductProperty
       can :read, ::Spree::Property

data/app/models/spree/address.rb

@@ -1,6 +1,6 @@
 module Spree
   class Address < Spree::Base
-    require 'twitter_cldr'
+    require 'validates_zipcode'
 
     if Rails::VERSION::STRING >= '6.1'
       serialize :preferences, Hash, default: {}
@@ -55,13 +55,21 @@ module Spree
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
-    self.whitelisted_ransackable_attributes = %w[firstname lastname company]
+    self.whitelisted_ransackable_attributes = ADDRESS_FIELDS
+    self.whitelisted_ransackable_associations = %w[country state user]
 
     def self.build_default
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        `Address#build_default` is deprecated and will be removed in Spree 5.0.
+        Please use standard rails `Address.new(country: current_store.default_country)`
+      DEPRECATION
       new(country: Spree::Country.default)
     end
 
     def self.default(user = nil, kind = 'bill')
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        `Address#default` is deprecated and will be removed in Spree 5.0.
+      DEPRECATION
       if user && user_address = user.public_send(:"#{kind}_address")
         user_address.clone
       else
@@ -157,6 +165,7 @@ module Spree
         super
       else
         update_column :deleted_at, Time.current
+        assign_new_default_address_to_user
       end
     end
 
@@ -214,11 +223,23 @@ module Spree
     end
 
     def postal_code_validate
-      return if country.blank? || country.iso.blank? || !require_zipcode?
-      return unless TwitterCldr::Shared::PostalCodes.territories.include?(country.iso.downcase.to_sym)
+      return if country.blank? || country_iso.blank? || !require_zipcode? || zipcode.blank?
+      return unless ::ValidatesZipcode::CldrRegexpCollection::ZIPCODES_REGEX.keys.include?(country_iso.upcase.to_sym)
 
-      postal_code = TwitterCldr::Shared::PostalCodes.for_territory(country.iso)
-      errors.add(:zipcode, :invalid) unless postal_code.valid?(zipcode.to_s.strip)
+      formatted_zip = ::ValidatesZipcode::Formatter.new(
+        zipcode: zipcode.to_s.strip,
+        country_alpha2: country_iso.upcase
+      ).format
+
+      errors.add(:zipcode, :invalid) unless ::ValidatesZipcode.valid?(formatted_zip, country_iso.upcase)
+    end
+
+    def assign_new_default_address_to_user
+      return unless user
+
+      user.bill_address = user.addresses.last if user.bill_address == self
+      user.ship_address = user.addresses.last if user.ship_address == self
+      user.save!
     end
   end
 end

data/app/models/spree/app_configuration.rb

@@ -45,6 +45,7 @@ module Spree
     preference :currency, :string, default: 'USD'
     preference :default_country_id, :integer
     preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation
+    preference :disable_store_presence_validation, :boolean, default: false # when turned off disables Store presence validation for Products and Payment Methods
     preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
     preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
     preference :layout, :string, default: 'spree/layouts/spree_application'
@@ -52,6 +53,7 @@ module Spree
     preference :mailer_logo, :string, default: 'logo/spree_50.png'
     preference :max_level_in_taxons_menu, :integer, default: 1 # maximum nesting level in taxons menu
     preference :products_per_page, :integer, default: 12
+    preference :product_wysiwyg_editor_enabled, :boolean, default: true
     preference :require_master_price, :boolean, default: true
     preference :restock_inventory, :boolean, default: true # Determines if a return item is restocked automatically once it has been received
     preference :return_eligibility_number_of_days, :integer, default: 365
@@ -62,6 +64,7 @@ module Spree
     preference :show_products_without_price, :boolean, default: false
     preference :show_raw_product_description, :boolean, default: false
     preference :tax_using_ship_address, :boolean, default: true
+    preference :taxon_wysiwyg_editor_enabled, :boolean, default: true
     preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
 
     # Store credits configurations
@@ -76,6 +79,11 @@ module Spree
       @searcher_class ||= Spree::Core::Search::Base
     end
 
+    # Sets the path used for products, taxons and pages.
+    preference :storefront_products_path, :string, default: 'products'
+    preference :storefront_taxons_path, :string, default: 't'
+    preference :storefront_pages_path, :string, default: 'pages'
+
     attr_writer :searcher_class
   end
 end

data/app/models/spree/app_dependencies.rb

@@ -6,14 +6,14 @@ module Spree
       :ability_class,
       :cart_create_service, :cart_add_item_service, :cart_remove_item_service,
       :cart_remove_line_item_service, :cart_set_item_quantity_service, :cart_recalculate_service,
-      :cart_update_service, :checkout_next_service, :checkout_advance_service, :checkout_update_service,
-      :checkout_complete_service, :checkout_add_store_credit_service,
-      :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
-      :coupon_handler, :country_finder, :current_order_finder, :credit_card_finder,
+      :cms_page_finder, :cart_update_service, :checkout_next_service, :checkout_advance_service, :checkout_update_service,
+      :checkout_complete_service, :checkout_add_store_credit_service, :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
+      :coupon_handler, :menu_finder, :country_finder, :current_order_finder, :credit_card_finder,
       :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
       :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
-      :account_create_address_service, :account_update_address_service, :address_finder,
-      :collection_sorter, :error_handler
+      :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
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -41,6 +41,8 @@ module Spree
       @cart_remove_line_item_service = 'Spree::Cart::RemoveLineItem'
       @cart_set_item_quantity_service = 'Spree::Cart::SetQuantity'
       @cart_estimate_shipping_rates_service = 'Spree::Cart::EstimateShippingRates'
+      @cart_empty_service = 'Spree::Cart::Empty'
+      @cart_destroy_service = 'Spree::Cart::Destroy'
 
       # checkout
       @checkout_next_service = 'Spree::Checkout::Next'
@@ -64,16 +66,26 @@ module Spree
       @coupon_handler = 'Spree::PromotionHandler::Coupon'
 
       # account
+      @account_create_service = 'Spree::Account::Create'
+      @account_update_service = 'Spree::Account::Update'
       @account_create_address_service = 'Spree::Account::Addresses::Create'
       @account_update_address_service = 'Spree::Account::Addresses::Update'
 
+      # credit cards
+      @credit_cards_destroy_service = 'Spree::CreditCards::Destroy'
+
+      @classification_reposition_service = 'Spree::Classifications::Reposition'
+
       @error_handler = 'Spree::ErrorReporter'
     end
 
     def set_default_finders
       @address_finder = 'Spree::Addresses::Find'
       @country_finder = 'Spree::Countries::Find'
+      @cms_page_finder = 'Spree::CmsPages::Find'
+      @menu_finder = 'Spree::Menus::Find'
       @current_order_finder = 'Spree::Orders::FindCurrent'
+      @current_store_finder = 'Spree::Stores::FindCurrent'
       @completed_order_finder = 'Spree::Orders::FindComplete'
       @credit_card_finder = 'Spree::CreditCards::Find'
       @products_finder = 'Spree::Products::Find'

data/app/models/spree/base.rb

@@ -22,6 +22,16 @@ class Spree::Base < ApplicationRecord
     false
   end
 
+  def self.for_store(store)
+    plural_model_name = model_name.plural.gsub(/spree_/, '').to_sym
+
+    if store.respond_to?(plural_model_name)
+      store.send(plural_model_name)
+    else
+      self
+    end
+  end
+
   def self.spree_base_scopes
     where(nil)
   end
@@ -30,4 +40,12 @@ class Spree::Base < ApplicationRecord
   def self.has_many_inversing
     false
   end
+
+  def self.json_api_columns
+    column_names.reject { |c| c.match(/_id$|id|preferences|(.*)password|(.*)token|(.*)api_key/) }
+  end
+
+  def self.json_api_type
+    to_s.demodulize.underscore
+  end
 end

data/app/models/spree/classification.rb

@@ -9,7 +9,10 @@ module Spree
     end
 
     validates :taxon, :product, presence: true
+    validates :position, numericality: { only_integer: true, allow_blank: true, allow_nil: true }
     # For #3494
     validates :taxon_id, uniqueness: { scope: :product_id, message: :already_linked, allow_blank: true }
+
+    self.whitelisted_ransackable_attributes = ['taxon_id', 'product_id']
   end
 end

data/app/models/spree/cms/pages/feature_page.rb

@@ -0,0 +1,7 @@
+module Spree::Cms::Pages
+  class FeaturePage < Spree::CmsPage
+    def sections?
+      true
+    end
+  end
+end

data/app/models/spree/cms/pages/homepage.rb

@@ -0,0 +1,20 @@
+module Spree::Cms::Pages
+  class Homepage < Spree::CmsPage
+    before_create :empty_slug
+    after_save :empty_slug
+
+    def sections?
+      true
+    end
+
+    def seo_meta_description
+      meta_description if meta_description.present?
+    end
+
+    private
+
+    def empty_slug
+      self.slug = nil
+    end
+  end
+end

data/app/models/spree/cms/pages/standard_page.rb

@@ -0,0 +1,4 @@
+module Spree::Cms::Pages
+  class StandardPage < Spree::CmsPage
+  end
+end

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

@@ -0,0 +1,29 @@
+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
+    store :settings, accessors: [:gutters], coder: JSON
+
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product', 'Spree::CmsPage']
+
+    def gutters?
+      gutters == 'Gutters'
+    end
+
+    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'
+      self.linked_resource_type ||= 'Spree::Taxon'
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+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
+    store :settings, accessors: [:gutters], coder: JSON
+
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product', 'Spree::CmsPage']
+
+    def gutters?
+      gutters == 'Gutters'
+    end
+
+    def img_one_sm(dimensions = '600x250>')
+      super
+    end
+
+    def img_one_md(dimensions = '1200x500>')
+      super
+    end
+
+    def img_one_lg(dimensions = '2400x1000>')
+      super
+    end
+
+    def img_one_xl(dimensions = '4800x2000>')
+      super
+    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
+
+    def default_values
+      self.gutters ||= 'No Gutters'
+      self.fit ||= 'Screen'
+      self.linked_resource_type ||= 'Spree::Taxon'
+    end
+  end
+end

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

@@ -0,0 +1,103 @@
+module Spree::Cms::Sections
+  class ImageGallery < Spree::CmsSection
+    after_initialize :default_values
+    before_save :reset_link_attributes
+
+    LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
+                             ['Spree::Taxon'].freeze
+                           else
+                             ['Spree::Taxon', 'Spree::Product'].freeze
+                           end
+
+    LAYOUT_OPTIONS = ['Default', 'Reversed'].freeze
+    LABEL_OPTIONS = ['Show', 'Hide'].freeze
+
+    store :content, accessors: [:link_type_one, :link_one, :title_one,
+                                :link_type_two, :link_two, :title_two,
+                                :link_type_three, :link_three, :title_three], coder: JSON
+
+    store :settings, accessors: [:layout_style, :display_labels], coder: JSON
+
+    #
+    # img_one sizing
+    def img_one_md(dimensions = '270x195>')
+      super
+    end
+
+    def img_one_lg(dimensions = '540x390>')
+      super
+    end
+
+    def img_one_xl(dimensions = '1080x780>')
+      super
+    end
+
+    #
+    # img_two sizing
+    def img_two_md(dimensions = '270x400>')
+      super
+    end
+
+    def img_two_lg(dimensions = '540x800>')
+      super
+    end
+
+    def img_two_xl(dimensions = '1080x1600>')
+      super
+    end
+
+    #
+    # img_three sizing
+    def img_three_md(dimensions = '270x195>')
+      super
+    end
+
+    def img_three_lg(dimensions = '540x390>')
+      super
+    end
+
+    def img_three_xl(dimensions = '1080x780>')
+      super
+    end
+
+    def default_layout?
+      layout_style == 'Default'
+    end
+
+    def show_labels?
+      display_labels == 'Show'
+    end
+
+    private
+
+    def reset_link_attributes
+      return if Rails::VERSION::STRING < '6.0'
+
+      if link_type_one_changed?
+        return if link_type_one_was.nil?
+
+        self.link_one = nil
+      end
+
+      if link_type_two_changed?
+        return if link_type_two_was.nil?
+
+        self.link_two = nil
+      end
+
+      if link_type_three_changed?
+        return if link_type_three_was.nil?
+
+        self.link_three = nil
+      end
+    end
+
+    def default_values
+      self.layout_style ||= 'Default'
+      self.fit ||= 'Container'
+      self.link_type_one ||= 'Spree::Taxon'
+      self.link_type_two ||= 'Spree::Taxon'
+      self.link_type_three ||= 'Spree::Taxon'
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Spree::Cms::Sections
+  class ProductCarousel < Spree::CmsSection
+    after_initialize :default_values
+
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon']
+
+    private
+
+    def default_values
+      self.fit ||= 'Screen'
+      self.linked_resource_type ||= 'Spree::Taxon'
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Spree::Cms::Sections
+  class RichTextContent < Spree::CmsSection
+    after_initialize :default_values
+
+    store :content, accessors: [:rte_content], coder: JSON
+
+    private
+
+    def default_values
+      self.fit ||= 'Container'
+    end
+  end
+end