spree_core 5.1.8 → 5.2.0.rc1

data/app/models/spree/page_sections/image_banner.rb

@@ -1,12 +1,15 @@
 module Spree
   module PageSections
     class ImageBanner < Spree::PageSection
+      include Spree::HasImageAltText
+      
       TOP_PADDING_DEFAULT = 0
       BOTTOM_PADDING_DEFAULT = 0
 
       preference :overlay_transparency, :integer, default: 40
       preference :height, :integer, default: 384
       preference :vertical_alignment, :string, default: :middle
+      preference :image_alt, :string
 
       def default_blocks
         [
@@ -45,6 +48,8 @@ module Spree
       def icon_name
         'slideshow'
       end
+
+
     end
   end
-end
+end

data/app/models/spree/page_sections/image_with_text.rb

@@ -1,11 +1,14 @@
 module Spree
   module PageSections
     class ImageWithText < Spree::PageSection
+      include Spree::HasImageAltText
+      
       TOP_PADDING_DEFAULT = 16
       BOTTOM_PADDING_DEFAULT = 16
 
       preference :desktop_image_alignment, :string, default: 'right'
       preference :vertical_alignment, :string, default: :middle
+      preference :image_alt, :string
 
       has_one :link, ->(ps) { ps.links }, class_name: 'Spree::PageLink', as: :parent, dependent: :destroy, inverse_of: :parent
       accepts_nested_attributes_for :link
@@ -55,6 +58,8 @@ module Spree
       def icon_name
         'photo'
       end
+
+
     end
   end
 end

data/app/models/spree/page_sections/newsletter.rb

@@ -1,7 +1,10 @@
 module Spree
   module PageSections
     class Newsletter < Spree::PageSection
+      include Spree::HasImageAltText
+      
       preference :overlay_transparency, :integer, default: 40
+      preference :image_alt, :string
 
       def default_blocks
         @default_blocks.presence || [
@@ -27,6 +30,10 @@ module Spree
         'footer'
       end
 
+      def lazy?
+        !Rails.env.test?
+      end
+
       def blocks_available?
         true
       end

data/app/models/spree/page_sections/product_details.rb

@@ -1,7 +1,8 @@
 module Spree
   module PageSections
     class ProductDetails < Spree::PageSection
-      TOP_PADDING_DEFAULT = 20
+      TOP_BORDER_WIDTH_DEFAULT = 0
+      TOP_PADDING_DEFAULT = 0
       BOTTOM_PADDING_DEFAULT = 40
 
       def icon_name
@@ -11,6 +12,42 @@ module Spree
       def self.role
         'system'
       end
+
+      def default_blocks
+        product_metafield_definition_ids = Spree::MetafieldDefinition.where(resource_type: 'Spree::Product').ids
+
+        [
+          Spree::PageBlocks::Products::Brand.new,
+          Spree::PageBlocks::Products::Title.new,
+          Spree::PageBlocks::Products::Price.new(text: Spree.t(:price), preferred_text_alignment: 'left'),
+          Spree::PageBlocks::Products::VariantPicker.new,
+          Spree::PageBlocks::Products::QuantitySelector.new,
+          Spree::PageBlocks::Products::BuyButtons.new,
+          Spree::PageBlocks::Products::Description.new,
+          Spree::PageBlocks::Metafields.new(preferred_metafield_definition_ids: product_metafield_definition_ids),
+        ]
+      end
+
+      def blocks_available?
+        true
+      end
+
+      def can_sort_blocks?
+        true
+      end
+
+      def available_blocks_to_add
+        [
+          Spree::PageBlocks::Products::Brand,
+          Spree::PageBlocks::Products::Title,
+          Spree::PageBlocks::Products::Price,
+          Spree::PageBlocks::Products::VariantPicker,
+          Spree::PageBlocks::Products::QuantitySelector,
+          Spree::PageBlocks::Products::BuyButtons,
+          Spree::PageBlocks::Products::Description,
+          Spree::PageBlocks::Metafields,
+        ]
+      end
     end
   end
 end

data/app/models/spree/pages/account.rb

@@ -10,6 +10,10 @@ module Spree
       def icon_name
         'user'
       end
+
+      def linkable?
+        true
+      end
     end
   end
 end

data/app/models/spree/pages/cart.rb

@@ -1,9 +1,19 @@
 module Spree
   module Pages
     class Cart < Spree::Page
+      def page_builder_url
+        return unless page_builder_url_exists?(:cart_path)
+
+        Spree::Core::Engine.routes.url_helpers.cart_path
+      end
+
       def icon_name
         'shopping-cart'
       end
+
+      def linkable?
+        true
+      end
     end
   end
 end

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

@@ -1,6 +1,12 @@
 module Spree
   module Pages
     class Checkout < Spree::Page
+      def page_builder_url
+        return unless page_builder_url_exists?(:checkout_path)
+
+        Spree::Core::Engine.routes.url_helpers.checkout_path
+      end
+
       def icon_name
         'credit-card'
       end

data/app/models/spree/pages/custom.rb

@@ -5,6 +5,10 @@ module Spree
         true
       end
 
+      def linkable?
+        true
+      end
+
       def page_builder_url
         return unless page_builder_url_exists?(:page_path)
 

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

@@ -11,6 +11,10 @@ module Spree
         'home'
       end
 
+      def linkable?
+        true
+      end
+
       def default_sections
         sections = [
           Spree::PageSections::ImageWithText.new(

data/app/models/spree/pages/login.rb

@@ -10,6 +10,10 @@ module Spree
 
         Spree::Core::Engine.routes.url_helpers.login_path
       end
+
+      def linkable?
+        true
+      end
     end
   end
 end

data/app/models/spree/pages/password.rb

@@ -2,6 +2,8 @@ module Spree
   module Pages
     class Password < Spree::Page
       def page_builder_url
+        return unless page_builder_url_exists?(:password_path)
+
         Spree::Core::Engine.routes.url_helpers.password_path
       end
 

data/app/models/spree/pages/post_list.rb

@@ -27,6 +27,10 @@ module Spree
       def customizable?
         true
       end
+
+      def linkable?
+        true
+      end
     end
   end
 end

data/app/models/spree/pages/product_details.rb

@@ -16,6 +16,7 @@ module Spree
 
       def default_sections
         [
+          Spree::PageSections::Breadcrumbs.new,
           Spree::PageSections::ProductDetails.new,
           Spree::PageSections::RelatedProducts.new
         ]

data/app/models/spree/pages/shop_all.rb

@@ -31,6 +31,10 @@ module Spree
       def customizable?
         true
       end
+
+      def linkable?
+        true
+      end
     end
   end
 end

data/app/models/spree/pages/wishlist.rb

@@ -6,6 +6,10 @@ module Spree
 
         Spree::Core::Engine.routes.url_helpers.account_wishlist_path
       end
+
+      def linkable?
+        true
+      end
     end
   end
 end

data/app/models/spree/payment.rb

@@ -5,6 +5,7 @@ module Spree
     include Spree::Core::NumberGenerator.new(prefix: 'P', letters: true, length: 7)
     include Spree::NumberIdentifier
     include Spree::NumberAsParam
+    include Spree::Metafields
     include Spree::Metadata
     if defined?(Spree::Security::Payments)
       include Spree::Security::Payments

data/app/models/spree/payment_method.rb

@@ -4,6 +4,7 @@ module Spree
     acts_as_list
 
     include Spree::MultiStoreResource
+    include Spree::Metafields
     include Spree::Metadata
     include Spree::DisplayOn
     if defined?(Spree::Security::PaymentMethods)
@@ -22,12 +23,10 @@ module Spree
     has_many :store_payment_methods, class_name: 'Spree::StorePaymentMethod'
     has_many :stores, class_name: 'Spree::Store', through: :store_payment_methods
 
-    with_options dependent: :restrict_with_error do
-      has_many :payments, class_name: 'Spree::Payment', inverse_of: :payment_method
-      has_many :credit_cards, class_name: 'Spree::CreditCard'
-    end
+    has_many :payments, class_name: 'Spree::Payment', inverse_of: :payment_method, dependent: :nullify
+    has_many :credit_cards, class_name: 'Spree::CreditCard', dependent: :destroy # CCs are soft deleted
 
-    has_many :gateway_customers, class_name: 'Spree::GatewayCustomer'
+    has_many :gateway_customers, class_name: 'Spree::GatewayCustomer', dependent: :destroy
 
     def self.providers
       Rails.application.config.spree.payment_methods

data/app/models/spree/payment_source.rb

@@ -1,6 +1,7 @@
 # This model is used to store payment sources for non-credit card payments, eg wallet, account, etc.
 module Spree
   class PaymentSource < Spree.base_class
+    include Spree::Metafields
     include Spree::Metadata
     include Spree::PaymentSourceConcern
 

data/app/models/spree/policy.rb

@@ -0,0 +1,70 @@
+module Spree
+  class Policy < Spree.base_class
+    extend FriendlyId
+    include Spree::TranslatableResource
+    include Spree::Linkable
+
+    UNIQUENESS_SCOPE = %i[owner_id owner_type].freeze
+
+    #
+    # FriendlyId
+    #
+    friendly_id :slug_candidates, use: %i[slugged scoped history], scope: UNIQUENESS_SCOPE
+
+    #
+    # Associations
+    #
+    belongs_to :owner, polymorphic: true, touch: true # can be a store or a vendor or organization
+
+    #
+    # Translations
+    #
+    TRANSLATABLE_FIELDS = %i[name body].freeze
+    translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
+
+    #
+    # ActionText
+    #
+    translates :body, backend: :action_text
+
+    #
+    # Validations
+    #
+    validates :slug, presence: true, uniqueness: { scope: UNIQUENESS_SCOPE }
+    validates :name, presence: true
+    validates :owner, presence: true
+
+    #
+    # Scopes
+    #
+    scope :with_body,    -> { joins(:rich_text_body).distinct }
+    scope :without_body, -> { where.missing(:rich_text_body) }
+
+    #
+    #  Ransack
+    #
+    self.whitelisted_ransackable_attributes = %w[name owner_type owner_id]
+
+    before_destroy :really_destroy_slugs!
+
+    # For policies, store.policies returns all policies owned by the store
+    # We don't want to filter out other policies in requests that use `for_store` when they have a different owner type
+    def self.for_store(store)
+      store.policies.or(where.not(owner_type: 'Spree::Store'))
+    end
+
+    def page_builder_url
+      return unless Spree::Core::Engine.routes.url_helpers.respond_to?(:policy_path)
+
+      Spree::Core::Engine.routes.url_helpers.policy_path(self)
+    end
+
+    def with_body?
+      body.present?
+    end
+
+    def really_destroy_slugs!
+      slugs.with_deleted.each(&:really_destroy!)
+    end
+  end
+end

data/app/models/spree/post.rb

@@ -1,6 +1,8 @@
 module Spree
   class Post < Spree.base_class
     include Spree::SingleStoreResource
+    include Spree::Linkable
+    include Spree::Metafields
     extend FriendlyId
 
     friendly_id :slug_candidates, use: %i[slugged scoped history], scope: %i[store_id deleted?]
@@ -36,7 +38,7 @@ module Spree
     #
     # Associations
     #
-    belongs_to :author, class_name: Spree.admin_user_class.to_s
+    belongs_to :author, class_name: Spree.admin_user_class.to_s, optional: true
     belongs_to :store, class_name: 'Spree::Store'
     belongs_to :post_category, class_name: 'Spree::PostCategory', optional: true
     alias category post_category
@@ -44,7 +46,7 @@ module Spree
     #
     # Validations
     #
-    validates :title, :store, :author, presence: true
+    validates :title, :store, presence: true
     validates :slug, presence: true, uniqueness: { scope: :store_id, conditions: -> { where(deleted_at: nil) } }
     validates :meta_title, length: { maximum: 160 }, allow_blank: true
     validates :meta_description, length: { maximum: 320 }, allow_blank: true

data/app/models/spree/post_category.rb

@@ -1,6 +1,7 @@
 module Spree
   class PostCategory < Spree.base_class
     include Spree::SingleStoreResource
+    include Spree::Metafields
     extend FriendlyId
 
     friendly_id :slug_candidates, use: %i[slugged scoped history], scope: %i[store_id]

data/app/models/spree/product.rb

@@ -28,7 +28,9 @@ module Spree
     include Spree::MultiStoreResource
     include Spree::TranslatableResource
     include Spree::MemoizedData
+    include Spree::Metafields
     include Spree::Metadata
+    include Spree::Linkable
     include Spree::Product::Webhooks
     include Spree::Product::Slugs
     if defined?(Spree::VendorConcern)
@@ -118,8 +120,6 @@ module Spree
     has_many :stores, through: :store_products, class_name: 'Spree::Store'
     has_many :digitals, through: :variants_including_master
 
-    has_many :page_links, as: :linkable, class_name: 'Spree::PageLink', dependent: :destroy
-
     after_initialize :ensure_master
     after_initialize :assign_default_tax_category
 
@@ -618,11 +618,18 @@ module Spree
 
     def to_csv(store = nil)
       store ||= stores.default || stores.first
-      properties_for_csv ||= Spree::Property.order(:position).flat_map do |property|
-        [
-          property.name,
-          product_properties.find { |pp| pp.property_id == property.id }&.value
-        ]
+      properties_for_csv = if Spree::Config[:product_properties_enabled]
+        Spree::Property.order(:position).flat_map do |property|
+          [
+            property.name,
+            product_properties.find { |pp| pp.property_id == property.id }&.value
+          ]
+        end
+      else
+        []
+      end
+      metafields_for_csv ||= Spree::MetafieldDefinition.for_resource_type('Spree::Product').order(:namespace, :key).map do |mf_def|
+        metafields.find { |mf| mf.metafield_definition_id == mf_def.id }&.csv_value
       end
       taxons_for_csv ||= taxons.manual.reorder(depth: :desc).first(3).pluck(:pretty_name)
       taxons_for_csv.fill(nil, taxons_for_csv.size...3)
@@ -631,10 +638,10 @@ module Spree
 
       if has_variants?
         variants_including_master.each_with_index do |variant, index|
-          csv_lines << Spree::CSV::ProductVariantPresenter.new(self, variant, index, properties_for_csv, taxons_for_csv, store).call
+          csv_lines << Spree::CSV::ProductVariantPresenter.new(self, variant, index, properties_for_csv, taxons_for_csv, store, metafields_for_csv).call
         end
       else
-        csv_lines << Spree::CSV::ProductVariantPresenter.new(self, master, 0, properties_for_csv, taxons_for_csv, store).call
+        csv_lines << Spree::CSV::ProductVariantPresenter.new(self, master, 0, properties_for_csv, taxons_for_csv, store, metafields_for_csv).call
       end
 
       csv_lines

data/app/models/spree/promotion/actions/free_shipping.rb

@@ -18,12 +18,12 @@ module Spree
         def create_adjustment(order, adjustable, included = false)
           amount = compute_amount(adjustable)
 
-          adjustments.new(
-            adjustable: adjustable,
+          adjustable.adjustments.new(
             amount: amount,
             included: included,
             label: label,
-            order: order
+            order: order,
+            source: self
           ).save
         end
       end

data/app/models/spree/promotion.rb

@@ -1,6 +1,7 @@
 module Spree
   class Promotion < Spree.base_class
     include Spree::MultiStoreResource
+    include Spree::Metafields
     include Spree::Metadata
     if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
@@ -49,7 +50,7 @@ module Spree
     before_validation :downcase_code, if: -> { code.present? }
     before_validation :set_starts_at_to_current_time, if: -> { starts_at.blank? }
     after_commit :generate_coupon_codes, if: -> { multi_codes? }, on: [:create, :update]
-    after_commit :remove_coupons, unless: -> { multi_codes? }, on: :update
+    after_commit :remove_coupons, on: :update
     before_destroy :not_used?
 
     #
@@ -147,8 +148,8 @@ module Spree
       if action_taken
         # connect to the order
         # create the join_table entry.
-        orders << order
-        save
+        order.promotions << self unless order.promotions.include?(self)
+        order.save
       end
 
       action_taken
@@ -174,8 +175,8 @@ module Spree
       if action_taken
         # connect to the order
         # create the join_table entry.
-        orders << order
-        save
+        order.promotions << self unless order.promotions.include?(self)
+        order.save
       end
 
       action_taken
@@ -188,14 +189,26 @@ module Spree
       !!eligible_rules(promotable, options)
     end
 
+    # We cache the rules to avoid multiple database queries
+    # this is useful for orders with many line items
+    #
+    # @return [Array<Spree::PromotionRule>]
+    def cached_rules
+      Rails.cache.fetch("#{cache_key_with_version}/rules") do
+        rules.to_a
+      end
+    rescue TypeError # when using null_store in test environment
+      rules.to_a
+    end
+
     # eligible_rules returns an array of promotion rules where eligible? is true for the promotable
     # if there are no such rules, an empty array is returned
     # if the rules make this promotable ineligible, then nil is returned (i.e. this promotable is not eligible)
     def eligible_rules(promotable, options = {})
       # Promotions without rules are eligible by default.
-      return [] if rules.none?
+      return [] if cached_rules.none?
 
-      specific_rules = rules.select { |rule| rule.applicable?(promotable) }
+      specific_rules = cached_rules.select { |rule| rule.applicable?(promotable) }
       return [] if specific_rules.none?
 
       rule_eligibility = Hash[specific_rules.map do |rule|
@@ -329,6 +342,9 @@ module Spree
     end
 
     def remove_coupons
+      return unless (previous_changes.key?('kind') && previous_changes['kind'][0] == 'coupon_code' && kind == 'automatic') ||
+                    (previous_changes.key?('multi_codes') && previous_changes['multi_codes'][0] == true && multi_codes == false)
+
       coupon_codes.where(deleted_at: nil).update_all(deleted_at: Time.current)
     end
 
@@ -337,7 +353,7 @@ module Spree
       when Spree::LineItem
         !promotable.product.promotionable?
       when Spree::Order
-        promotable.line_items.any? &&
+        (promotable.item_count.positive? || promotable.line_items.any?) &&
           promotable.line_items.joins(:product).where(spree_products: { promotionable: true }).none?
       end
     end

data/app/models/spree/promotion_action.rb

@@ -4,7 +4,7 @@ module Spree
   class PromotionAction < Spree.base_class
     acts_as_paranoid
 
-    belongs_to :promotion, class_name: 'Spree::Promotion'
+    belongs_to :promotion, class_name: 'Spree::Promotion', touch: true
 
     validates :promotion, :type, presence: true
 

data/app/models/spree/promotion_handler/cart.rb

@@ -39,7 +39,7 @@ module Spree
       end
 
       def promotion_scope
-        ::Spree::Promotion.for_store(store)
+        store.promotions
       end
     end
   end

data/app/models/spree/promotion_handler/coupon.rb

@@ -62,7 +62,7 @@ module Spree
         promotion = order.promotions.with_coupon_code(coupon_code)
         if promotion.present?
           # Order promotion has to be destroyed before line item removing
-          order.order_promotions.where(promotion_id: promotion.id).destroy_all
+          order.promotions.delete(promotion)
 
           if promotion.multi_codes?
             coupon_code = promotion.coupon_codes.find_by(order: order)

data/app/models/spree/promotion_rule.rb

@@ -1,7 +1,7 @@
 # Base class for all promotion rules
 module Spree
   class PromotionRule < Spree.base_class
-    belongs_to :promotion, class_name: 'Spree::Promotion', inverse_of: :promotion_rules
+    belongs_to :promotion, class_name: 'Spree::Promotion', inverse_of: :promotion_rules, touch: true
 
     delegate :stores, to: :promotion
 

data/app/models/spree/property.rb

@@ -3,6 +3,7 @@ module Spree
     include Spree::FilterParam
     include Spree::Metadata
     include Spree::ParameterizableName
+    include Spree::UniqueName
     include Spree::DisplayOn
     include Spree::TranslatableResource
     if defined?(Spree::Webhooks::HasWebhooks)
@@ -49,6 +50,23 @@ module Spree
       end
     end
 
+    # Returns the metafield type for the property kind
+    # @return [String] eg. 'Spree::Metafields::ShortText'
+    def kind_to_metafield_type
+      case kind
+      when 'short_text'
+        'Spree::Metafields::ShortText'
+      when 'long_text'
+        'Spree::Metafields::LongText'
+      when 'number'
+        'Spree::Metafields::Number'
+      when 'rich_text'
+        'Spree::Metafields::RichText'
+      else
+        'Spree::Metafields::ShortText'
+      end
+    end
+
     private
 
     def touch_all_products

data/app/models/spree/refund.rb

@@ -1,5 +1,6 @@
 module Spree
   class Refund < Spree.base_class
+    include Spree::Metafields
     include Spree::Metadata
     if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
@@ -13,7 +14,7 @@ module Spree
       belongs_to :reimbursement, optional: true
     end
     belongs_to :reason, class_name: 'Spree::RefundReason', foreign_key: :refund_reason_id
-    belongs_to :refunder, class_name: "::#{Spree.admin_user_class}", optional: true
+    belongs_to :refunder, class_name: Spree.admin_user_class.to_s, optional: true
 
     has_many :log_entries, as: :source
 

data/app/models/spree/role_user.rb

@@ -6,7 +6,7 @@ module Spree
     belongs_to :role, class_name: 'Spree::Role', foreign_key: :role_id
     belongs_to :user, polymorphic: true
     belongs_to :resource, polymorphic: true
-    belongs_to :invitation, class_name: 'Spree::Invitation', optional: true
+    belongs_to :invitation, class_name: 'Spree::Invitation', optional: true, inverse_of: :role_user
 
     #
     # Validations