spree_core 5.1.7 → 5.2.0.rc1

data/config/locales/en.yml

@@ -53,6 +53,13 @@ en:
       spree/gift_card:
         amount_used: Amount used
         expires_at: Expires at
+      spree/import:
+        preferred_delimiter: Delimiter
+      spree/import_mapping:
+        file_column: File Column
+        schema_field: Schema Field
+      spree/import_row:
+        row_number: Number
       spree/inventory_unit:
         state: State
       spree/invitation:
@@ -60,6 +67,8 @@ en:
       spree/line_item:
         price: Price
         quantity: Quantity
+      spree/metafield_definition:
+        namespace: Namespace
       spree/option_type:
         filterable: Filterable
         name: Name
@@ -101,6 +110,9 @@ en:
         number: Number
       spree/payment_method:
         name: Name
+      spree/policy:
+        body: Body
+        owner: Policy for
       spree/product:
         available_on: Available On
         cost_currency: Cost Currency
@@ -165,6 +177,9 @@ en:
         preferred_limit_digital_download_days: Limit digital links download days
         seo_robots: SEO Robots
         seo_title: SEO Title
+        storefront_custom_code_body_end: Custom Code before closing body tag
+        storefront_custom_code_body_start: Custom Code after opening body tag
+        storefront_custom_code_head: Custom Code in page head
         url: Site URL
       spree/store_credit:
         amount_used: Amount used
@@ -241,6 +256,12 @@ en:
             attachment:
               attachment_must_be_present: must be present
               not_allowed_content_type: has not allowed content type
+        spree/import:
+          attributes:
+            attachment:
+              content_type: has not allowed content type
+            type:
+              inclusion: is not included in the list of allowed types
         spree/legacy_user:
           attributes:
             bill_address_id:
@@ -677,6 +698,9 @@ en:
     analytics: Analytics
     and: and
     api_keys: API keys
+    apis:
+      platform: Platform API
+      storefront: Storefront API
     apply: Apply
     apply_only_on_full_priced_items: Apply only on full priced items
     apply_store_credit: Apply Store Credit
@@ -728,6 +752,7 @@ en:
     body_tag_end: Body tag end
     body_tag_start: Body tag start
     both: Both
+    brand: Brand
     breadcrumbs: Breadcrumbs
     calculated_reimbursements: Calculated Reimbursements
     calculator: Calculator
@@ -821,6 +846,7 @@ en:
     continue_selling_when_out_of_stock: Continue selling when out of stock
     continue_shopping: Continue shopping
     continue_without_logging_in: Continue without logging in
+    copied: Copied!
     copy: Copy
     copy_id: Copy ID
     copy_link: Copy link
@@ -871,7 +897,6 @@ en:
     credits: Credits
     currencies: Currencies
     currency: Currency
-    currency_and_country_help: This determines which vendors you can connect with and what customers see on your store.
     currency_settings: Currency Settings
     current: Current
     current_password: Current password
@@ -900,6 +925,7 @@ en:
     default_billing_address: Default billing address
     default_country: Default Country
     default_country_cannot_be_deleted: Default country cannot be deleted
+    default_country_help: Country that will be used for the default shipping and billing addresses on Checkout
     default_currency: Default currency
     default_locale: Default locale
     default_post_categories:
@@ -1061,6 +1087,7 @@ en:
     field: Field
     filename: Filename
     fill_in_customer_info: Please fill in customer info
+    filled: Filled
     filter: Filter
     filter_results: Filter Results
     filterable: Filterable
@@ -1143,6 +1170,7 @@ en:
     images: Images
     implement_eligible_for_return: 'Must implement #eligible_for_return? for your EligibilityValidator.'
     implement_requires_manual_intervention: 'Must implement #requires_manual_intervention? for your EligibilityValidator.'
+    import: Import
     import_payment_methods_from: Import payment methods from
     import_products_from: Import products from
     in_stock: In Stock
@@ -1165,6 +1193,8 @@ en:
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
     internal_name: Internal Name
+    internal_server_error: Internal Server Error
+    internal_server_error_message: The server encountered an internal error and was unable to complete your request.
     internationalization: Internationalization
     invalid_credit_card: Invalid credit card.
     invalid_exchange_variant: Invalid exchange variant.
@@ -1209,6 +1239,7 @@ en:
     items_reimbursed: Items reimbursed
     items_to_be_reimbursed: Items to be reimbursed
     join_slack: Join Slack
+    key: Key
     kind: Kind
     language: Language
     last_name: Last Name
@@ -1264,6 +1295,8 @@ en:
     meta_keywords: Meta Keywords
     meta_title: Meta Title
     metadata: Metadata
+    metafield_definitions: Metafield Definitions
+    metafields: Metafields
     min: Min
     minimal_amount: Minimal Amount
     minimum_password_length:
@@ -1301,7 +1334,7 @@ en:
     new_gift_card: New Gift Card
     new_image: New Image
     new_line_item: Add line item
-    new_market: New market
+    new_metafield_definition: New Metafield Definition
     new_nested_taxon: New nested taxon
     new_option_type: New Option Type
     new_order: New Order
@@ -1311,6 +1344,7 @@ en:
     new_password: New password
     new_payment: New Payment
     new_payment_method: New Payment Method
+    new_policy: New Policy
     new_post: New Post
     new_post_category: New Post Category
     new_product: New Product
@@ -1343,6 +1377,17 @@ en:
     new_user: New User
     new_variant: New Variant
     new_zone: New Zone
+    newsletter_mailer:
+      email_confirmation:
+        dear_customer: Hey,
+        ignore_disclaimer: If you didn't request this, please ignore this email.
+        instructions: Please click the button below to verify your email address.
+        message_copy_link: 'If the button doesn''t work please copy and paste the following link to your browser:'
+        store_team: "%{store_name} Team"
+        subject: Verify your email address
+        thanks: Thank you
+        verify_email_address_link: Verify email address
+    newsletter_subscribers: Newsletter Subscribers
     newsletters: Newsletters
     next: Next
     no_actions_added: No actions added
@@ -1495,6 +1540,7 @@ en:
         buy_buttons:
           display_name: Add To Cart
     page_not_found: Sorry! Page you are looking can’t be found.
+    page_not_found_message: This page just doesn't exist.
     page_sections:
       announcement_bar:
         default_text: Welcome to my Store!
@@ -1779,6 +1825,7 @@ en:
     resellable: Resellable
     resend: Resend
     reset_password: Reset my password
+    resource: Resource
     response_code: Response Code
     restore_defaults: Restore defaults
     resume: resume
@@ -1813,6 +1860,7 @@ en:
     rma_value: RMA Value
     role_id: Role ID
     roles: Roles
+    row: Row
     rules: Rules
     safe: Safe
     sale: Sale
@@ -1869,6 +1917,8 @@ en:
     seo_title: SEO Title
     server: Server
     server_error: The server returned an error
+    service_unavailable: Service Unavailable
+    service_unavailable_message: The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.
     settings: Settings
     ship: Ship
     ship_address: Ship Address
@@ -2205,6 +2255,8 @@ en:
       metric: metric
       metric_system: Metric system
     unlock: Unlock
+    unprocessable_entity: Unprocessable Entity
+    unprocessable_entity_message: Your request could not be processed. Please check the form for errors and try again.
     unrecognized_card_type: Unrecognized card type
     unshippable_items: Unshippable Items
     update: Update
@@ -2246,6 +2298,8 @@ en:
     variants_count: Variants count
     vendor: Vendor
     vendors: Vendors
+    verified: Verified
+    verified_at: Verified at
     version: Version
     view: View
     view_all: View all

data/db/migrate/20250605131334_add_missing_fields_to_users.rb

@@ -1,25 +1,35 @@
-# this fields were not present when someone used a custom user class
+# these fields were not present when someone used a custom user class
 # so we need to ensure this is setup properly
 class AddMissingFieldsToUsers < ActiveRecord::Migration[7.2]
   def change
     users_table = Spree.user_class.table_name
-    add_column users_table, :login, :string, if_not_exists: true
+    admin_users_table = Spree.admin_user_class.table_name
 
-    json_type = if respond_to?(:jsonb)
-      :jsonb
-    else
-      :json
-    end
+    change_table users_table do |t|
+      t.string :login unless column_exists?(users_table, :login)
 
-    add_column users_table, :public_metadata, json_type, if_not_exists: true
-    add_column users_table, :private_metadata, json_type, if_not_exists: true
+      if t.respond_to? :jsonb
+        t.jsonb :public_metadata unless column_exists?(users_table, :public_metadata)
+        t.jsonb :private_metadata unless column_exists?(users_table, :private_metadata)
+      else
+        t.json :public_metadata unless column_exists?(users_table, :public_metadata)
+        t.json :private_metadata unless column_exists?(users_table, :private_metadata)
+      end
+    end
 
     add_reference users_table, :bill_address, if_not_exists: true
     add_reference users_table, :ship_address, if_not_exists: true
 
-    admin_users_table = Spree.admin_user_class.table_name
-    add_column admin_users_table, :login, :string, if_not_exists: true
-    add_column admin_users_table, :public_metadata, json_type, if_not_exists: true
-    add_column admin_users_table, :private_metadata, json_type, if_not_exists: true
+    change_table admin_users_table do |t|
+      t.string :login unless column_exists?(admin_users_table, :login)
+
+      if t.respond_to? :jsonb
+        t.jsonb :public_metadata unless column_exists?(admin_users_table, :public_metadata)
+        t.jsonb :private_metadata unless column_exists?(admin_users_table, :private_metadata)
+      else
+        t.json :public_metadata unless column_exists?(admin_users_table, :public_metadata)
+        t.json :private_metadata unless column_exists?(admin_users_table, :private_metadata)
+      end
+    end
   end
 end

data/db/migrate/20250728095629_create_spree_metafields.rb

@@ -0,0 +1,27 @@
+class CreateSpreeMetafields < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_metafield_definitions do |t|
+      t.string :namespace, null: false
+      t.string :key, null: false
+      t.string :name, null: false
+      t.string :metafield_type, null: false
+      t.string :resource_type, null: false, index: true
+      t.string :display_on, null: false, default: 'both', index: true
+      t.timestamps
+
+      t.index [:namespace, :key]
+      t.index [:resource_type, :namespace, :key], unique: true
+    end
+
+    create_table :spree_metafields do |t|
+      t.string :type, null: false, index: true
+      t.references :resource, polymorphic: true, null: false, index: true
+      t.references :metafield_definition, null: false, index: true
+      t.text :value
+
+      t.timestamps
+
+      t.index [:resource_type, :resource_id, :metafield_definition_id], name: 'index_metafields_on_resource_and_definition', unique: true
+    end
+  end
+end

data/db/migrate/20250730102644_add_missing_unique_indexes_to_spree_option_types_and_values.rb

@@ -0,0 +1,40 @@
+class AddMissingUniqueIndexesToSpreeOptionTypesAndValues < ActiveRecord::Migration[7.2]
+  def change
+    # we don't need to run this migration in multi-tenant mode as it's already handled there
+    return if defined?(SpreeMultiTenant)
+
+    # Rename duplicated option types
+    duplicates = Spree::OptionType.select(:name).group(:name).having('COUNT(*) > 1').reorder('').pluck(:name)
+
+    duplicates.each do |duplicate_name|
+      option_types = Spree::OptionType.where(name: duplicate_name)
+
+      option_types.each_with_index do |option_type, index|
+        next if index == 0 # Keep the first one unchanged
+
+        new_name = "#{duplicate_name}_#{index}"
+        option_type.update_columns(name: new_name, updated_at: Time.current)
+      end
+    end
+
+    # Handle duplicates in spree_option_values
+    duplicates = Spree::OptionValue.select(:option_type_id, :name).group(:option_type_id, :name).having('COUNT(*) > 1').reorder('')
+
+    duplicates.each do |dup|
+      option_values = Spree::OptionValue.where(option_type_id: dup.option_type_id, name: dup.name)
+
+      option_values.each_with_index do |option_value, index|
+        next if index == 0 # Keep the first one unchanged
+
+        new_name = "#{option_value.name}_#{index}"
+        option_value.update_columns(name: new_name, updated_at: Time.current)
+      end
+    end
+
+    # Add indexes
+    remove_index :spree_option_types, :name, if_exists: true
+    add_index :spree_option_types, :name, unique: true, if_not_exists: true
+
+    add_index :spree_option_values, %i[option_type_id name], unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250730154601_add_unique_index_on_spree_properties_name.rb

@@ -0,0 +1,24 @@
+class AddUniqueIndexOnSpreePropertiesName < ActiveRecord::Migration[7.2]
+  def change
+    # we don't need to run this migration in multi-tenant mode as it's already handled there
+    return if defined?(SpreeMultiTenant)
+
+    # Rename duplicated properties
+    duplicates = Spree::Property.select(:name).group(:name).having('COUNT(*) > 1').reorder('').pluck(:name)
+
+    duplicates.each do |duplicate_name|
+      properties = Spree::Property.where(name: duplicate_name)
+
+      properties.each_with_index do |property, index|
+        next if index == 0 # Keep the first one unchanged
+
+        new_name = "#{duplicate_name}_#{index}"
+        property.update_columns(name: new_name, updated_at: Time.current)
+      end
+    end
+
+    # Add indexes
+    remove_index :spree_properties, :name, if_exists: true
+    add_index :spree_properties, :name, unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250811112056_create_spree_policies.rb

@@ -0,0 +1,22 @@
+class CreateSpreePolicies < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_policies do |t|
+      t.belongs_to :store, null: false
+      t.string :slug, null: false
+      t.string :name, null: false
+
+      t.timestamps
+    end
+
+    add_index :spree_policies, [:store_id, :slug], unique: true
+    create_table :spree_policy_translations do |t|
+      t.string :locale, null: false
+      t.string :name
+      t.references :spree_policy, null: false
+
+      t.timestamps
+    end
+
+    add_index :spree_policy_translations, [:spree_policy_id, :locale], unique: true
+  end
+end

data/db/migrate/20250821211705_fix_unique_index_on_spree_order_promotions.rb

@@ -0,0 +1,20 @@
+class FixUniqueIndexOnSpreeOrderPromotions < ActiveRecord::Migration[7.2]
+  def change
+    remove_index :spree_order_promotions, name: 'index_spree_order_promotions_on_promotion_id_and_order_id', if_exists: true
+
+    # Remove duplicate records before adding unique index
+    duplicates = Spree::OrderPromotion.select(:promotion_id, :order_id).group(:promotion_id, :order_id).having('COUNT(*) > 1').reorder('').pluck(:promotion_id, :order_id)
+
+    duplicates.each do |duplicate_promotion_id, duplicate_order_id|
+      order_promotions = Spree::OrderPromotion.where(promotion_id: duplicate_promotion_id, order_id: duplicate_order_id)
+
+      order_promotions.each_with_index do |order_promotion, index|
+        next if index == 0 # Keep the first one unchanged
+
+        order_promotion.destroy
+      end
+    end
+
+    add_index :spree_order_promotions, [:promotion_id, :order_id], unique: true, name: 'index_spree_order_promotions_on_promotion_id_and_order_id'
+  end
+end

data/db/migrate/20250825175217_add_missing_page_builder_indexes.rb

@@ -0,0 +1,7 @@
+class AddMissingPageBuilderIndexes < ActiveRecord::Migration[7.2]
+  def change
+    add_index :spree_themes, %w[store_id default], name: 'index_spree_themes_on_store_id_and_default', if_not_exists: true
+    add_index :spree_page_links, %w[parent_type parent_id position], name: 'index_spree_page_links_parent_with_position', if_not_exists: true
+    add_index :spree_page_blocks, :deleted_at, if_not_exists: true
+  end
+end

data/db/migrate/20250826093602_create_spree_newsletter_subscribers.rb

@@ -0,0 +1,12 @@
+class CreateSpreeNewsletterSubscribers < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_newsletter_subscribers do |t|
+      t.string :email, index: { unique: true }, null: false
+      t.references :user, index: true
+      t.datetime :verified_at, index: true
+      t.string :verification_token, index: { unique: true }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250902143122_fix_policies_store_association.rb

@@ -0,0 +1,18 @@
+class FixPoliciesStoreAssociation < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :spree_policies, :owner, polymorphic: true, index: true
+
+    Spree::Policy.reset_column_information
+    Spree::Policy.all.each do |policy|
+      policy.update(owner_id: policy.store_id, owner_type: 'Spree::Store')
+    end
+
+    remove_index :spree_policies, [:store_id, :slug], unique: true, if_exists: true
+    remove_index :spree_policies, [:store_id, :position], if_exists: true
+    remove_column :spree_policies, :store_id, if_exists: true
+    remove_column :spree_policies, :show_in_checkout_footer, if_exists: true
+    remove_column :spree_policies, :position, if_exists: true
+
+    add_index :spree_policies, [:owner_id, :owner_type, :slug], unique: true
+  end
+end

data/db/migrate/20250911205659_add_missing_index_on_spree_products_promotionable.rb

@@ -0,0 +1,5 @@
+class AddMissingIndexOnSpreeProductsPromotionable < ActiveRecord::Migration[7.2]
+  def change
+    add_index :spree_products, :promotionable, if_not_exists: true
+  end
+end

data/db/migrate/20250913130044_add_page_links_counter_cache_to_spree_stores.rb

@@ -0,0 +1,10 @@
+class AddPageLinksCounterCacheToSpreeStores < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_stores, :page_links_count, :integer, default: 0, null: false
+
+    Spree::Store.reset_column_information
+    Spree::Store.find_each do |store|
+      Spree::Store.reset_counters(store.id, :links)
+    end
+  end
+end

data/db/migrate/20250914101955_add_missing_indexes_on_spree_adjustments.rb

@@ -0,0 +1,6 @@
+class AddMissingIndexesOnSpreeAdjustments < ActiveRecord::Migration[7.2]
+  def change
+    add_index :spree_adjustments, :source_type, if_not_exists: true
+    add_index :spree_adjustments, :amount, if_not_exists: true
+  end
+end

data/db/migrate/20250915093930_add_metadata_to_spree_newsletter_subscribers.rb

@@ -0,0 +1,20 @@
+class AddMetadataToSpreeNewsletterSubscribers < ActiveRecord::Migration[7.2]
+  def up
+    change_table :spree_newsletter_subscribers do |t|
+      if t.respond_to? :jsonb
+        t.jsonb :public_metadata
+        t.jsonb :private_metadata
+      else
+        t.json :public_metadata
+        t.json :private_metadata
+      end
+    end
+  end
+
+  def down
+    change_table :spree_newsletter_subscribers do |t|
+      t.remove :public_metadata
+      t.remove :private_metadata
+    end
+  end
+end

data/db/migrate/20250923141845_create_spree_imports.rb

@@ -0,0 +1,47 @@
+class CreateSpreeImports < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_imports do |t|
+      t.belongs_to :user, null: false
+      t.belongs_to :owner, polymorphic: true, null: false
+
+      t.string :status, null: false, index: true
+
+      t.string :number, limit: 32, null: false, index: { unique: true }
+      t.string :type, null: false, index: true
+
+      t.text :processing_errors
+
+      t.text :preferences
+
+      t.integer :rows_count, null: false, default: 0
+
+      t.timestamps
+    end
+
+    create_table :spree_import_rows do |t|
+      t.belongs_to :import, null: false
+      t.belongs_to :item, polymorphic: true
+
+      t.string :status, null: false, index: true
+      t.integer :row_number, null: false
+
+      t.text :data, null: false
+      t.text :validation_errors
+
+      t.timestamps
+    end
+
+    add_index :spree_import_rows, [:import_id, :row_number], unique: true
+
+    create_table :spree_import_mappings do |t|
+      t.belongs_to :import, null: false
+
+      t.string :schema_field, null: false
+      t.string :file_column, index: true
+
+      t.timestamps
+    end
+
+    add_index :spree_import_mappings, [:import_id, :schema_field], unique: true
+  end
+end

data/lib/generators/spree/cursor_rules/cursor_rules_generator.rb

@@ -0,0 +1,19 @@
+module Spree
+  class CursorRulesGenerator < Rails::Generators::Base
+    desc 'Set up Cursor Rules - copies all Spree cursor rules to .cursor/rules directory'
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('templates', __dir__)
+      paths.flatten
+    end
+
+    def create_cursor_rules_directory
+      empty_directory '.cursor/rules'
+    end
+
+    def copy_cursor_rules
+      copy_file 'spree_rules.mdc', '.cursor/rules/spree_rules.mdc'
+    end
+  end
+end