spree_core 5.1.8 → 5.2.0.rc1

data/lib/spree/core/dependencies.rb

@@ -41,6 +41,7 @@ module Spree
         # order
         order_approve_service: 'Spree::Orders::Approve',
         order_cancel_service: 'Spree::Orders::Cancel',
+        order_updater: 'Spree::OrderUpdater',
 
         # shipment
         shipment_change_state_service: 'Spree::Shipments::ChangeState',
@@ -56,6 +57,7 @@ module Spree
         collection_sorter: 'Spree::BaseSorter',
         order_sorter: 'Spree::BaseSorter',
         products_sorter: 'Spree::Products::Sort',
+        posts_sorter: 'Spree::Posts::Sort',
 
         # paginator
         collection_paginator: 'Spree::Shared::Paginate',
@@ -102,6 +104,7 @@ module Spree
         completed_order_finder: 'Spree::Orders::FindComplete',
         credit_card_finder: 'Spree::CreditCards::Find',
         products_finder: 'Spree::Products::Find',
+        posts_finder: 'Spree::Posts::Find',
         taxon_finder: 'Spree::Taxons::Find',
         line_item_by_variant_finder: 'Spree::LineItems::FindByVariant',
         variant_finder: 'Spree::Variants::Find'

data/lib/spree/core/engine.rb

@@ -15,6 +15,7 @@ module Spree
                                :line_item_comparison_hooks,
                                :data_feed_types,
                                :export_types,
+                               :import_types,
                                :taxon_rules,
                                :themes,
                                :theme_layout_sections,
@@ -23,6 +24,8 @@ module Spree
                                :page_blocks,
                                :reports,
                                :translatable_resources,
+                               :metafield_types,
+                               :metafield_enabled_resources,
                                :analytics_events,
                                :analytics_event_handlers,
                                :integrations)
@@ -150,7 +153,14 @@ module Spree
 
         Rails.application.config.spree.export_types = [
           Spree::Exports::Products,
-          Spree::Exports::Orders
+          Spree::Exports::Orders,
+          Spree::Exports::Customers,
+          Spree::Exports::GiftCards,
+          Spree::Exports::NewsletterSubscribers
+        ]
+
+        Rails.application.config.spree.import_types = [
+          Spree::Imports::Products,
         ]
 
         Rails.application.config.spree.taxon_rules = [
@@ -189,6 +199,7 @@ module Spree
         ]
 
         Rails.application.config.spree.page_sections = [
+          Spree::PageSections::Breadcrumbs,
           Spree::PageSections::FeaturedPosts,
           Spree::PageSections::TaxonGrid,
           Spree::PageSections::ImageWithText,
@@ -245,7 +256,51 @@ module Spree
           Spree::Property,
           Spree::Taxon,
           Spree::Taxonomy,
-          Spree::Store
+          Spree::Store,
+          Spree::Policy
+        ]
+
+        Rails.application.config.spree.metafield_types = [
+          Spree::Metafields::ShortText,
+          Spree::Metafields::LongText,
+          Spree::Metafields::RichText,
+          Spree::Metafields::Number,
+          Spree::Metafields::Boolean,
+          Spree::Metafields::Json
+        ]
+
+        Rails.application.config.spree.metafield_enabled_resources = [
+          Spree::Address,
+          Spree::Asset,
+          Spree::CreditCard,
+          Spree::CustomDomain,
+          Spree::CustomerReturn,
+          Spree::GiftCard,
+          Spree::Image,
+          Spree::LineItem,
+          Spree::NewsletterSubscriber,
+          Spree::OptionType,
+          Spree::OptionValue,
+          Spree::Order,
+          Spree::Payment,
+          Spree::PaymentMethod,
+          Spree::PaymentSource,
+          Spree::Post,
+          Spree::PostCategory,
+          Spree::Product,
+          Spree::Promotion,
+          Spree::Refund,
+          Spree::Shipment,
+          Spree::ShippingMethod,
+          Spree::StockItem,
+          Spree::StockTransfer,
+          Spree::Store,
+          Spree::StoreCredit,
+          Spree::TaxRate,
+          Spree::Taxon,
+          Spree::Taxonomy,
+          Spree::Variant,
+          Spree.user_class
         ]
 
         Rails.application.config.spree.analytics_events = {

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.1.8'.freeze
+  VERSION = '5.2.0.rc1'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -6,10 +6,10 @@ require 'active_model/railtie'
 require 'active_record/railtie'
 require 'active_storage/engine'
 require 'action_text/engine'
+require 'action_cable/engine'
 
 require 'mail'
 require 'action_mailer/railtie'
-require 'sprockets/railtie'
 
 require 'active_merchant'
 require 'acts_as_list'
@@ -98,6 +98,8 @@ module Spree
     @@queues ||= OpenStruct.new(
       default: :default,
       exports: :default,
+      images: :default,
+      imports: :default,
       reports: :default,
       variants: :default,
       taxons: :default,

data/lib/spree/permitted_attributes.rb

@@ -15,12 +15,16 @@ module Spree
       :gift_card_attributes,
       :gift_card_batch_attributes,
       :image_attributes,
+      :import_attributes,
+      :import_mapping_attributes,
       :integration_attributes,
       :inventory_unit_attributes,
       :invitation_attributes,
       :line_item_attributes,
       :menu_attributes,
       :menu_item_attributes,
+      :metafield_attributes,
+      :metafield_definition_attributes,
       :option_type_attributes,
       :option_value_attributes,
       :page_attributes,
@@ -29,6 +33,7 @@ module Spree
       :page_section_attributes,
       :payment_attributes,
       :payment_method_attributes,
+      :policy_attributes,
       :post_attributes,
       :post_category_attributes,
       :product_attributes,
@@ -83,7 +88,7 @@ module Spree
 
     @@checkout_attributes = [
       :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,
-      :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account
+      :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account, :currency
     ]
 
     @@classification_attributes = [
@@ -107,12 +112,16 @@ module Spree
 
     @@export_attributes = [:type, :format, :record_selection, :search_params]
 
-    @@gift_card_attributes = [:code, :amount, :expires_at, :user_id]
+    @@gift_card_attributes = [:code, :amount, :expires_at, :user_id, :currency]
 
-    @@gift_card_batch_attributes = [:prefix, :codes_count, :amount, :expires_at]
+    @@gift_card_batch_attributes = [:prefix, :codes_count, :amount, :expires_at, :currency]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
+    @@import_attributes = [:type, :attachment, :delimiter]
+
+    @@import_mapping_attributes = [:file_column]
+
     @@integration_attributes = [:type, :active]
 
     @@inventory_unit_attributes = [:shipment, :shipment_id, :variant_id]
@@ -126,6 +135,10 @@ module Spree
     @@menu_item_attributes = [:name, :subtitle, :destination, :new_window, :item_type,
                               :linked_resource_type, :linked_resource_id, :code, :menu_id]
 
+    @@metafield_attributes = [:id, :value, :type, :metafield_definition_id, :_destroy]
+
+    @@metafield_definition_attributes = [:key, :name, :namespace, :metafield_type, :resource_type, :display_on]
+
     @@option_type_attributes = [:name, :presentation, :position, :filterable,
                                 option_values_attributes: [:id, :name, :presentation, :position, :_destroy]]
 
@@ -143,6 +156,8 @@ module Spree
 
     @@payment_method_attributes = [:name, :type, :description, :active, :display_on, :auto_capture, :position]
 
+    @@policy_attributes = [:name, :slug, :body]
+
     @@post_attributes = [:title, :meta_title, :meta_description, :slug, :author_id, :post_category_id, :published_at, :content, :excerpt, :image, tag_list: []]
 
     @@post_category_attributes = [:title, :slug, :description]

data/lib/spree/testing_support/capybara_config.rb

@@ -19,11 +19,18 @@ end
 
 Capybara.register_driver :selenium_chrome_headless do |app|
   options = ::Selenium::WebDriver::Chrome::Options.new
-  options.add_argument '--headless'
+
+  options.add_argument '--headless=new'
   options.add_argument '--disable-gpu'
-  options.add_argument '--window-size=1440,900'
+
+  # Larger window size helps with dialog rendering in headless mode
+  options.add_argument '--window-size=1920,1080'
   options.add_argument '--disable-search-engine-choice-screen'
 
+  # Required for running in Docker containers (CircleCI)
+  options.add_argument '--no-sandbox'
+  options.add_argument '--disable-dev-shm-usage'
+
   # Disable timers being throttled in background pages/tabs. Useful for parallel test runs.
   options.add_argument '--disable-background-timer-throttling'
 
@@ -34,6 +41,5 @@ Capybara.register_driver :selenium_chrome_headless do |app|
   # This disables non-foreground tabs from getting a lower process priority. Useful for parallel test runs.
   options.add_argument '--disable-renderer-backgrounding'
 
-
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
 end

data/lib/spree/testing_support/factories/export_factory.rb

@@ -1,24 +1,8 @@
-# == Schema Information
-#
-# Table name: spree_exports
-#
-#  id            :uuid             not null, primary key
-#  format        :integer          not null
-#  number        :string(32)       not null
-#  search_params :jsonb
-#  type          :string           not null
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
-#  project_id    :uuid             not null
-#  store_id      :uuid             not null
-#  user_id       :uuid
-#  vendor_id     :uuid
-#
 FactoryBot.define do
   factory :export, class: 'Spree::Export' do
     store { create(:store) }
     user { create(:admin_user) }
-    type { 'Spree::Export::Products' }
+    type { 'Spree::Exports::Products' }
     format { 'csv' }
 
     factory :product_export, class: 'Spree::Exports::Products', parent: :export do
@@ -28,5 +12,9 @@ FactoryBot.define do
     factory :order_export, class: 'Spree::Exports::Orders', parent: :export do
       type { 'Spree::Exports::Orders' }
     end
+
+    factory :customer_export, class: 'Spree::Exports::Customers', parent: :export do
+      type { 'Spree::Exports::Customers' }
+    end
   end
 end

data/lib/spree/testing_support/factories/import_factory.rb

@@ -0,0 +1,20 @@
+FactoryBot.define do
+  factory :import, class: 'Spree::Import' do
+    owner { Spree::Store.default || create(:store) }
+    user { create(:admin_user) }
+    type { 'Spree::Imports::Products' }
+
+    factory :product_import, class: 'Spree::Imports::Products', parent: :import do
+      type { 'Spree::Imports::Products' }
+      # attachment { Rack::Test::UploadedFile.new(Spree::Core::Engine.root.join('spec', 'fixtures', 'files', 'products_import.csv'), 'text/csv') }
+
+      after(:create) do |import|
+        import.attachment.attach(
+          io: File.open(Spree::Core::Engine.root.join('spec', 'fixtures', 'files', 'products_import.csv')),
+          filename: 'products_import.csv',
+          content_type: 'text/csv'
+        )
+      end
+    end
+  end
+end

data/lib/spree/testing_support/factories/import_mapping_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :import_mapping, class: 'Spree::ImportMapping' do
+    import { create(:product_import) }
+    schema_field { 'name' }
+    file_column { 'name' }
+  end
+end

data/lib/spree/testing_support/factories/import_row_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :import_row, class: 'Spree::ImportRow' do
+    import { create(:product_import) }
+    data { { 'slug' => 'test-product', 'name' => 'Test Product', 'price' => '10.00' }.to_json }
+    row_number { import.rows_count + 1 }
+  end
+end

data/lib/spree/testing_support/factories/metafield_definition_factory.rb

@@ -0,0 +1,72 @@
+FactoryBot.define do
+  factory :metafield_definition, class: 'Spree::MetafieldDefinition' do
+    namespace { 'custom' }
+    sequence(:key) { |n| "custom_field_#{n}" }
+    name { 'Custom Field' }
+    metafield_type { 'Spree::Metafields::ShortText' }
+    resource_type { 'Spree::Product' }
+    display_on { 'both' }
+
+    trait :front_end_only do
+      display_on { 'front_end' }
+    end
+
+    trait :back_end_only do
+      display_on { 'back_end' }
+    end
+
+    trait :short_text_field do
+      metafield_type { 'Spree::Metafields::ShortText' }
+      key { 'title' }
+      name { 'Title' }
+    end
+
+    trait :long_text_field do
+      metafield_type { 'Spree::Metafields::LongText' }
+      key { 'description' }
+      name { 'Description' }
+    end
+
+    trait :rich_text_field do
+      metafield_type { 'Spree::Metafields::RichText' }
+      key { 'content' }
+      name { 'Content' }
+    end
+
+    trait :number_field do
+      metafield_type { 'Spree::Metafields::Number' }
+      key { 'priority' }
+      name { 'Priority' }
+    end
+
+    trait :boolean_field do
+      metafield_type { 'Spree::Metafields::Boolean' }
+      key { 'featured' }
+      name { 'Featured' }
+    end
+
+    trait :json_field do
+      metafield_type { 'Spree::Metafields::Json' }
+      key { 'metadata' }
+      name { 'Metadata' }
+    end
+
+    trait :for_variant do
+      resource_type { 'Spree::Variant' }
+      key { 'variant_custom' }
+      name { 'Variant Custom Field' }
+    end
+
+    trait :for_order do
+      resource_type { 'Spree::Order' }
+      key { 'order_notes' }
+      name { 'Order Notes' }
+    end
+
+    trait :for_user do
+      resource_type { Spree.user_class.name }
+      key { 'user_preference' }
+      name { 'User Preference' }
+    end
+  end
+end

data/lib/spree/testing_support/factories/metafield_factory.rb

@@ -0,0 +1,68 @@
+FactoryBot.define do
+  factory :metafield, class: 'Spree::Metafield' do
+    value { 'test_value' }
+    type { 'Spree::Metafields::ShortText' }
+
+    association :resource, factory: :product
+    association :metafield_definition
+
+    trait :front_end_only do
+      association :metafield_definition, :front_end_only
+    end
+
+    trait :back_end_only do
+      association :metafield_definition, :back_end_only
+    end
+
+    trait :short_text do
+      type { 'Spree::Metafields::ShortText' }
+      association :metafield_definition, :short_text_field
+      value { 'Short text value' }
+    end
+
+    trait :long_text do
+      type { 'Spree::Metafields::LongText' }
+      association :metafield_definition, :long_text_field
+      value { 'This is a longer text value with more detailed information.' }
+    end
+
+    trait :number do
+      type { 'Spree::Metafields::Number' }
+      association :metafield_definition, :number_field
+      value { 42 }
+    end
+
+    trait :rich_text do
+      type { 'Spree::Metafields::RichText' }
+      association :metafield_definition, :rich_text_field
+      value { '<p>Rich text with <strong>formatting</strong></p>' }
+    end
+
+    trait :boolean do
+      type { 'Spree::Metafields::Boolean' }
+      association :metafield_definition, :boolean_field
+      value { true }
+    end
+
+    trait :json do
+      type { 'Spree::Metafields::Json' }
+      association :metafield_definition, :json_field
+      value { '{"key": "value"}' }
+    end
+
+    trait :for_variant do
+      association :resource, factory: :variant
+      association :metafield_definition, :for_variant
+    end
+
+    trait :for_order do
+      association :resource, factory: :order
+      association :metafield_definition, :for_order
+    end
+
+    trait :for_user do
+      association :resource, factory: :user
+      association :metafield_definition, :for_user
+    end
+  end
+end

data/lib/spree/testing_support/factories/newsletter_subscriber_factory.rb

@@ -0,0 +1,18 @@
+FactoryBot.define do
+  factory :newsletter_subscriber, class: Spree::NewsletterSubscriber do
+    email { FFaker::Internet.unique.email }
+    verified_at { nil }
+
+    trait :with_user do
+      association :user, factory: :user
+    end
+
+    trait :verified do
+      verified_at { Time.current }
+    end
+
+    trait :unverified do
+      verified_at { nil }
+    end
+  end
+end

data/lib/spree/testing_support/factories/policy_factory.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :policy, class: 'Spree::Policy' do
+    owner { Spree::Store.default }
+    slug { 'my-policy' }
+    name { 'My Policy' }
+    body { 'This is the my policy' }
+  end
+end

data/lib/spree/testing_support/factories/post_factory.rb

@@ -10,5 +10,13 @@ FactoryBot.define do
     trait :with_image do
       image { Rack::Test::UploadedFile.new(Spree::Core::Engine.root.join('spec/fixtures/thinking-cat.jpg'), 'image/jpeg') }
     end
+
+    trait :published do
+      published_at { Time.current }
+    end
+
+    trait :unpublished do
+      published_at { nil }
+    end
   end
 end

data/lib/spree/testing_support/store.rb

@@ -1,5 +1,16 @@
 # setup default store, to be always present
 RSpec.configure do |config|
+  config.before(:suite) do
+    if defined?(ActiveSupport::SafeBuffer)
+      ActiveSupport::SafeBuffer.class_eval do
+        # Make Psych serialize SafeBuffer as a plain string
+        def encode_with(coder)
+          coder.represent_scalar(nil, to_s)
+        end
+      end
+    end
+  end
+
   config.before(:all) do
     unless self.class.metadata[:without_global_store]
       @default_country = Spree::Country.find_by(iso: 'US') || FactoryBot.create(:country_us)

data/lib/tasks/core.rake

@@ -191,6 +191,116 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
       role_user.update_columns(resource_type: default_store.class.name, resource_id: default_store.id)
     end
   end
+
+  desc 'Migrate policies to store policies'
+  task migrate_policies: :environment do |_t, _args|
+    # Helper to consistently derive policy name
+    derive_policy_name = lambda do |name_str|
+      name_str.to_s.gsub(/customer_/, '').gsub(/_policy$/, '')
+    end
+
+    # Check if migration has already been run
+    if Spree::Policy.any?
+      puts "Policies already exist. Skipping migration to prevent duplicates."
+      exit
+    end
+
+    Spree::Store.all.each do |store|
+      %w[customer_terms_of_service customer_privacy_policy customer_returns_policy customer_shipping_policy].each do |policy_slug|
+        policy = store.send(policy_slug)
+        next unless policy.present?
+
+        store.policies.create(
+          name: Spree.t(derive_policy_name.call(policy_slug)),
+          body: policy.body
+        )
+
+        puts "Migrated #{policy_slug} to store #{store.id}"
+      end
+    end
+
+    Spree::PageLink.where(linkable_type: 'ActionText::RichText').each do |page_link|
+      # Check if this page link is attached to ActionText content
+      # Find the ActionText record
+      action_text = ActionText::RichText.find_by(id: page_link.linkable_id)
+      next unless action_text
+
+      # Check if the ActionText belongs to a store policy
+      if action_text.record_type == 'Spree::Store' && action_text.name.to_s.include?('policy')
+        # Find the corresponding policy in the new policies system
+        store = action_text.record
+        policy_name = derive_policy_name.call(action_text.name)
+
+        policy = store.policies.find_by(name: Spree.t(policy_name))
+
+        if policy
+          # Update the page link to point to the policy instead
+          page_link.update!(
+            linked_resource_type: 'Spree::Policy',
+            linked_resource_id: policy.id
+          )
+
+          puts "Migrated #{policy_name} to store #{store.id}"
+        end
+      end
+    end
+  end
+
+  desc 'Migrate product properties to metafields'
+  task migrate_product_properties_to_metafields: :environment do |_t, _args|
+    Spree::Property.find_each do |property|
+      metafield_definition = Spree::MetafieldDefinition.find_or_initialize_by(
+        namespace: 'properties',
+        key: property.name,
+        resource_type: 'Spree::Product'
+      )
+      metafield_definition.assign_attributes(
+        metafield_type: property.kind_to_metafield_type,
+        display_on: property.display_on
+      )
+      metafield_definition.save!
+
+      property.product_properties.includes(:product).find_each do |product_property|
+        product_property.product.set_metafield("properties.#{property.name}", product_property.value)
+        puts "Migrated #{property.name} to product #{product_property.product.id}"
+      end
+    end
+  end
+
+  desc 'Migrate product details sections to PDP 2.0 with blocks and metafields'
+  task migrate_product_details_pages: :environment do |_t, _args|
+    Spree::PageSections::ProductDetails.find_each do |section|
+      next if section.blocks.any?
+
+      if defined?(SpreeMultiTenant)
+        SpreeMultiTenant.with_tenant(section.tenant) do
+          section.send(:create_blocks)
+        end
+      else
+        section.send(:create_blocks)
+      end
+    end
+
+    Spree::Pages::ProductDetails.find_each do |page|
+      next if page.sections.exists?(type: 'Spree::PageSections::Breadcrumbs')
+
+      block = proc do
+        breadcrumbs = page.sections.create!(type: 'Spree::PageSections::Breadcrumbs')
+        breadcrumbs.move_to_top
+
+        page_details = page.sections.find_by(type: 'Spree::PageSections::ProductDetails')
+        if page_details.present?
+          page_details.update!(preferred_top_padding: 0, preferred_top_border_width: 0)
+        end
+      end
+
+      if defined?(SpreeMultiTenant)
+        SpreeMultiTenant.with_tenant(page.tenant, &block)
+      else
+        block.call
+      end
+    end
+  end
 end
 
 namespace :core do
@@ -216,4 +326,22 @@ namespace :core do
     puts '... done'
     puts "... migrated #{pluralize(total, 'record')}"
   end
+
+  desc 'Migrate newsletter subscribers'
+  task migrate_newsletter_subscribers: :environment do |_t, _args|
+    Spree.user_class.where(accepts_email_marketing: true).in_batches(of: 500) do |user_batch|
+      subscriber_attributes = user_batch.pluck(:id, :email, :updated_at).map do |id, email, updated_at|
+        {
+          email: Spree::NewsletterSubscriber.new(email: email).email, # normalized email
+          user_id: id,
+          verified_at: updated_at,
+          verification_token: nil,
+          updated_at: DateTime.current,
+          created_at: DateTime.current
+        }
+      end
+
+      Spree::NewsletterSubscriber.insert_all(subscriber_attributes.uniq { |attrs| attrs[:email] })
+    end
+  end
 end