spree_core 6.0.0.beta1 → 6.0.0.beta3

data/config/locales/en.yml

@@ -375,6 +375,8 @@ en:
               greater_than_max_amount: is greater than the allowed maximum amount of %{max_amount}
         spree/price:
           attributes:
+            amount:
+              leaves_a_rising_ladder: would leave the price from %{quantity} units at %{amount}, above the %{floor} a buyer pays below that quantity
             min_quantity:
               requires_price_list: quantity breaks can only be set on a price list
               too_many_breaks: a variant can carry at most %{count} quantity breaks on one price list
@@ -385,9 +387,12 @@ en:
         spree/price_list:
           attributes:
             base:
+              duplicate_quantity: each quantity break must have its own quantity
               invalid_quantity: each quantity break must start at a whole number of units
               negative_price: a price cannot be below zero
               nothing_to_apply_to: has no rules, no catalog and no products, so it would apply to nothing. Add one before activating.
+              price_rises_with_quantity: a quantity break cannot cost more than the price a buyer pays below it
+              quantity_on_base_price: a shop price applies at every quantity, so it cannot start at one. Remove the quantity, or pick a price list to put the break on.
             ends_at:
               must_be_after_starts_at: must be after starts at
             price_adjustment_percentage:
@@ -844,15 +849,6 @@ en:
     company_invitations:
       email_mismatch: This invitation was sent to a different email address.
       not_pending: This invitation is no longer pending and cannot be revoked.
-    company_mailer:
-      invitation_email:
-        action: Accept invitation
-        expiry_notice: This invitation link will expire in 30 days.
-        greeting: Hi,
-        ignore_notice: If you were not expecting this invitation, you can safely ignore this email.
-        instructions: You have been invited to join %{company} on %{store}. Accept the invitation to start purchasing on the company's behalf.
-        subject: invitation to join %{company}
-        title: Join %{company}
     compare_at_amount: Compare at amount
     compare_at_price: Compare at price
     complete: complete
@@ -912,21 +908,6 @@ en:
       anonymize_failed: The erasure could not be completed and nothing was changed
     customer_group: Customer Group
     customer_groups: Customer Groups
-    customer_mailer:
-      data_export_email:
-        action: Download Your Data
-        expiry_notice: This download link expires on %{date}.
-        greeting: Hello,
-        ignore_notice: If you did not request a copy of your data, please contact us.
-        instructions: Your copy of the personal data we hold about you is ready. Use the button below to download it.
-        subject: Your Data Is Ready to Download
-      password_reset_email:
-        action: Reset Password
-        expiry_notice: This password reset link will expire shortly. If you did not request this, no action is needed.
-        greeting: Hi %{name},
-        ignore_notice: If you did not request a password reset, you can safely ignore this email. Your password will not be changed.
-        instructions: We received a request to reset your password. Click the button below to choose a new password.
-        subject: Password Reset Instructions
     customer_support_email: Customer Support Email
     customers: Customers
     cut: Cut
@@ -985,14 +966,6 @@ en:
     developers: Developers
     digital:
       digital_delivery: Digital Delivery
-    digital_asset_mailer:
-      files_ready_email:
-        available_until: Available until %{date}
-        dear_customer: Dear %{name},
-        instructions: The files from your order %{number} are ready to download.
-        store_team: "%{store_name} Team"
-        subject: Your files are ready
-        thanks: Thank you for your business.
     digital_assets: Digital assets
     digital_assets_attachment_must_be_private: Upload the file to private storage before attaching it
     discontinue_on: Discontinue On
@@ -1102,6 +1075,7 @@ en:
         store_is_already_set: Store is already set
         unknown_custom_field_type: 'is not a known custom field type (expected one of: %{types})'
         unknown_scopes: 'contains unknown scopes: %{scopes}'
+        unregistered_actor: is not a registered actor class
         variant_product_mismatch: must belong to the same product as the variant
       services:
         get_shipping_rates:
@@ -1144,17 +1118,6 @@ en:
     free_shipping: Free Shipping
     from: From
     front_end: Front End
-    fulfillment_mailer:
-      fulfilled_email:
-        dear_customer: Dear %{name},
-        delivery_method: 'Delivery method: %{delivery_method}'
-        fulfillment_summary: Fulfillment summary for order
-        instructions: Your order %{number} has been fulfilled
-        store_team: "%{store_name} Team"
-        subject: Fulfillment Notification
-        thanks: Thank you for your business.
-        track_information: 'Tracking Information: %{tracking}'
-        track_link: 'Tracking Link: %{url}'
     fulfillments:
       errors:
         backordered_units: This fulfillment holds backordered units and cannot be handed over yet
@@ -1330,16 +1293,6 @@ en:
     new_state: New State
     new_user: New User
     new_variant: New Variant
-    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
     next: Next
     no_cc_type: N/A
@@ -1371,34 +1324,6 @@ en:
     order: Order
     order_canceled: Order canceled
     order_cannot_be_deleted: Completed orders and orders with settled payments cannot be deleted
-    order_mailer:
-      cancel_email:
-        dear_customer: Hey %{name},
-        instructions: Your order has been CANCELED.  Please retain this cancellation information for your records.
-        order_summary_canceled: Order %{number} Summary [CANCELED]
-        subject: Cancellation of Order
-        thanks: Thank you for
-      confirm_email:
-        dear_customer: Hey %{name},
-        instructions: Please review and retain the following order information for your records.
-        order_summary: Order %{number} Summary
-        subject: Order Confirmation
-        thanks: Thank you
-      payment_link_email:
-        message: Please click the button below to pay for your order.
-        message_copy_link: 'If the button doesn''t work please copy and paste the following link to your browser:'
-        pay_for_order: Pay for order
-        subject: 'Payment link for order #%{number}'
-      po_number: 'PO Number: %{number}'
-      store_owner_notification_email:
-        heading: New Order Received
-        instructions: You have received a new order.
-        order_summary: Order %{number} Summary
-        subject: "%{store_name} received a new order"
-        thanks: Thank you
-      store_team: "%{store_name} Team"
-      subtotal: 'Subtotal:'
-      total: 'Order Total:'
     order_not_found: We couldn't find your order. Please try that action again.
     order_number: Order %{number}
     order_resumed: Order resumed
@@ -1536,6 +1461,7 @@ en:
     price_list_import_invalid_amount: "%{column} must be a number like 16.50, got %{value}."
     price_list_import_invalid_quantity: min_quantity must be a whole number of units, got %{value}.
     price_list_import_no_price_list: This import is not attached to a price list.
+    price_list_import_price_rises_with_quantity: The price from %{quantity} units must not be above %{floor}, what a buyer pays below that quantity. A file is applied a row at a time, so list the higher quantities first when lowering a whole ladder.
     price_list_import_sku_required: SKU is required.
     price_list_import_too_many_breaks: A variant can carry at most %{count} quantity breaks on one price list.
     price_list_import_unknown_sku: No product in this store has the SKU %{sku}.
@@ -1570,7 +1496,7 @@ en:
         description: Creates a promotion credit adjustment on a line item
         name: Create per-line-item adjustment
       create_line_items:
-        description: Populates the cart with the specified quantity of variant
+        description: Adds the specified quantity of a variant to the cart free of charge
         name: Create line items
       free_shipping:
         description: Makes all shipments for the order free
@@ -2001,16 +1927,6 @@ en:
     return: return
     return_errors:
       outside_window: This order is outside the %{days}-day return window
-    return_mailer:
-      refunded_email:
-        dear_customer: Dear %{name},
-        instructions: Your return for order %{number} has been refunded.
-        refund_summary: Refund Summary
-        returned_items: Returned Items
-        store_team: "%{store_name} Team"
-        subject: Return Refunded
-        thanks: Thank you for your business.
-        total_refunded: 'Total refunded: %{total}'
     return_quantity: Return Quantity
     returned: Returned
     returns: Returns
@@ -2051,22 +1967,6 @@ en:
     selected_quantity_not_available: selected of %{item} is not available.
     seller: Seller
     seller_access_denied: You do not have access to this seller.
-    seller_mailer:
-      approved_email:
-        action: Go to your dashboard
-        heading: You're approved
-        message: Your application to sell on %{store_name} has been approved. You can now list products and start taking orders.
-        subject: You're approved to sell on %{store_name}
-      get_in_touch: If you think this is a mistake, reply to this email or contact us at %{store_email}.
-      greeting: Hi %{seller_name},
-      rejected_email:
-        heading: About your application
-        message: Your application to sell on %{store_name} has not been accepted.
-        subject: Your application to sell on %{store_name}
-      suspended_email:
-        heading: Your account has been suspended
-        message: Selling on %{store_name} has been paused for your account. Your products and order history are unaffected.
-        subject: Your %{store_name} account has been suspended
     seller_membership_required: This account does not belong to any seller.
     seller_payout_nothing_to_settle: This seller has nothing to settle right now.
     seller_requirement_types:
@@ -2131,17 +2031,6 @@ en:
     ship_total: Ship Total
     shipment: Shipment
     shipment_adjustments: Shipment adjustments
-    shipment_mailer:
-      shipped_email:
-        dear_customer: Dear %{name},
-        instructions: Your order %{number} has been shipped
-        shipment_summary: Shipment Summary for order
-        shipping_method: 'Shipping method: %{shipping_method}'
-        store_team: "%{store_name} Team"
-        subject: Shipment Notification
-        thanks: Thank you for your business.
-        track_information: 'Tracking Information: %{tracking}'
-        track_link: 'Tracking Link: %{url}'
     shipment_state: Shipment State
     shipments: Shipments
     shipped: Shipped

data/db/migrate/20260916000001_add_email_delivery_flags_to_spree_order_groups.rb

@@ -0,0 +1,14 @@
+class AddEmailDeliveryFlagsToSpreeOrderGroups < ActiveRecord::Migration[8.1]
+  def change
+    # The same pair spree_orders carries, for the same reason: a confirmation
+    # is sent once, and completion is replayable — a resumed finalize
+    # re-publishes order_group.completed, so without a record of what was sent
+    # a customer gets the same email twice. These say what happened, not what
+    # the purchase is, so unlike the group's statuses they cannot be derived
+    # from the children.
+    add_column :spree_order_groups, :confirmation_delivered, :boolean, default: false
+    add_column :spree_order_groups, :store_owner_notification_delivered, :boolean, default: false
+
+    add_index :spree_order_groups, :confirmation_delivered
+  end
+end

data/db/migrate/20260916000001_order_operation_actors_polymorphic.rb

@@ -0,0 +1,30 @@
+# Makes the order-operation "who did this" associations polymorphic, so a
+# write made with a secret API key records the key rather than nobody.
+# See docs/plans/6.0-action-actors.md.
+class OrderOperationActorsPolymorphic < ActiveRecord::Migration[8.1]
+  ACTORS = {
+    spree_orders: %i[created_by approver canceler],
+    spree_refunds: %i[refunder],
+    spree_returns: %i[created_by],
+    spree_exchanges: %i[created_by],
+    spree_claims: %i[created_by],
+    spree_stock_receipts: %i[received_by]
+  }.freeze
+
+  def change
+    ACTORS.each do |table, names|
+      names.each do |name|
+        # Nullable with no default: the type is data, filled by
+        # `rake spree:upgrade:backfill_actor_types`. Until it runs, the
+        # transitional reader resolves these rows through the admin user
+        # class — the only thing they could ever have pointed at.
+        add_column table, :"#{name}_type", :string
+
+        # Named for the pair so it reads apart from the `_id` index that
+        # already exists on most of these columns.
+        add_index table, [:"#{name}_type", :"#{name}_id"],
+                  name: "index_#{table}_on_#{name}_actor"
+      end
+    end
+  end
+end

data/db/migrate/20260922000001_add_refunded_order_to_spree_store_credits.rb

@@ -0,0 +1,5 @@
+class AddRefundedOrderToSpreeStoreCredits < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :spree_store_credits, :refunded_order, index: true
+  end
+end

data/db/migrate/20260923000001_change_spree_user_identities_tokens_to_text.rb

@@ -0,0 +1,10 @@
+class ChangeSpreeUserIdentitiesTokensToText < ActiveRecord::Migration[8.1]
+  def up
+    change_column :spree_user_identities, :access_token, :text
+    change_column :spree_user_identities, :refresh_token, :text
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration, 'Encrypted tokens may not fit back into string columns'
+  end
+end

data/db/sample_data/channels.rb

@@ -1,7 +1,7 @@
 # Adds two extra channels alongside the seeded 'Online Store' so sample data
 # exercises the channel-aware code paths (publishing, channel filters,
 # channel-scoped order attribution).
-store = Spree::Store.default
+store = Spree::Current.store
 
 store.channels.find_or_create_by!(code: 'pos') do |channel|
   channel.name = 'Point of Sale'

data/db/sample_data/collections.rb

@@ -1,7 +1,7 @@
 # Three collections that between them exercise both membership models: two
 # rule-based (they regenerate themselves) and one hand-curated with a dynamic
 # sort. Runs after the product import so there is a catalog to draw from.
-store = Spree::Store.default
+store = Spree::Current.store
 
 # Each automatic collection is defined by the single rule that materializes it.
 automatic_collections = [

data/db/sample_data/custom_field_definitions.rb

@@ -1,4 +1,4 @@
-store = Spree::Store.default
+store = Spree::Current.store
 
 %w[warranty capacity voltage wattage runtime room_coverage noise_level connectivity].each do |key|
   store.custom_field_definitions.find_or_create_by!(

data/db/sample_data/digital_products.rb

@@ -3,7 +3,7 @@
 # type stamps it at creation. The one thing a CSV row cannot carry is the file
 # buyers download, so that is all this step does: attach a PDF to the imported
 # product's default variant.
-store = Spree::Store.default
+store = Spree::Current.store
 
 product = Spree::Product.find_by(store: store, slug: 'the-spree-commerce-handbook')
 

data/db/sample_data/fulfillment.rb

@@ -2,7 +2,7 @@
 # Shopify-style delivery methods on the Domestic and International zones.
 # The free international method showcases delivery-method rules — free
 # above a spend threshold, hidden below it.
-store = Spree::Store.default
+store = Spree::Current.store
 
 # The zones are created from the store's country at first-run setup, so an
 # install that has not been set up yet has none. Provision them here from

data/db/sample_data/options.rb

@@ -1,4 +1,6 @@
-color = Spree::OptionType.find_or_initialize_by(name: 'color')
+store = Spree::Current.store
+
+color = Spree::OptionType.for_store(store).find_or_initialize_by(name: 'color')
 color.label = 'Color'
 color.kind = 'color_swatch'
 color.save!
@@ -15,7 +17,7 @@ color.save!
 # sells only new goods should not find this on a fresh install. A marketplace
 # that wants its sellers to describe condition the same way loads it, or
 # creates its own.
-condition = Spree::OptionType.find_or_initialize_by(name: 'condition')
+condition = Spree::OptionType.for_store(store).find_or_initialize_by(name: 'condition')
 condition.label = 'Condition'
 condition.kind = 'buttons'
 condition.filterable = true

data/db/sample_data/orders.rb

@@ -1,8 +1,8 @@
-store = Spree::Store.default
+store = Spree::Current.store
 
 # Find products created by the product import
-product_1 = Spree::Product.find_by(name: 'Automatic Espresso Machine')
-product_2 = Spree::Product.find_by(name: 'Drip Coffee Maker 1.5L')
+product_1 = store.products.find_by(name: 'Automatic Espresso Machine')
+product_2 = store.products.find_by(name: 'Drip Coffee Maker 1.5L')
 
 unless product_1 && product_2
   puts '  Skipping orders: required products not found'
@@ -84,7 +84,7 @@ orders.each(&:rebuild_fulfillments!)
 Spree::Order.where(id: orders.map(&:id)).update_all(status: 'placed', completed_at: Time.current - 1.day)
 
 # Tax lines (zero-amount sample rows against the California rate)
-tax_rate = Spree::TaxRate.find_by(name: 'California')
+tax_rate = store.tax_rates.find_by(name: 'California')
 
 if tax_rate
   orders.each do |order|
@@ -105,7 +105,7 @@ if tax_rate
 end
 
 # Payments
-method = Spree::PaymentMethod.where(name: 'Credit Card', active: true).first
+method = store.payment_methods.where(name: 'Credit Card', active: true).first
 
 if method
   Spree::Gateway.class_eval do
@@ -114,8 +114,7 @@ if method
     end
   end
 
-  credit_card = Spree::CreditCard.find_or_initialize_by(gateway_customer_profile_id: 'BGS-1234')
-  credit_card.payment_method = method
+  credit_card = Spree::CreditCard.find_or_initialize_by(gateway_customer_profile_id: 'BGS-1234', payment_method: method)
   credit_card.cc_type = 'visa'
   credit_card.month = 12
   credit_card.year = 2.years.from_now.year
@@ -140,15 +139,15 @@ orders.each { |order| order.reload.update_statuses! }
 
 # A return in progress, so the admin has something to look at. Built through
 # the workflows rather than by direct writes — they own every transition.
-first_complete_order = Spree::Order.complete.first
+first_complete_order = store.orders.complete.first
 if first_complete_order && first_complete_order.fulfillment_items.any?
   fulfillment_item = first_complete_order.fulfillment_items.first
 
   Spree::Returns::Create.call(
     order: first_complete_order,
     items: [{ fulfillment_item: fulfillment_item, quantity: 1 }],
-    stock_location: fulfillment_item.fulfillment&.stock_location || Spree::StockLocation.first,
-    reason: Spree::ReturnReason.first,
+    stock_location: fulfillment_item.fulfillment&.stock_location || store.stock_locations.first,
+    reason: store.return_reasons.first,
     memo: 'Sample return'
   )
 end

data/db/sample_data/payment_methods.rb

@@ -1,19 +1,19 @@
-Spree::Store.all.find_each do |store|
-  cc_payment_method = store.payment_methods.find_or_initialize_by(
-    type: 'Spree::Gateway::Bogus',
-    name: 'Credit Card',
-    description: 'Bogus payment gateway.',
-    active: true
-  )
-  cc_payment_method.storefront_visible = false
-  cc_payment_method.save!
+store = Spree::Current.store
 
-  check_payment_method = store.payment_methods.find_or_initialize_by(
-    type: 'Spree::PaymentMethod::Check',
-    name: 'Check',
-    description: 'Pay by check.',
-    active: true
-  )
-  check_payment_method.storefront_visible = false
-  check_payment_method.save!
-end
+cc_payment_method = store.payment_methods.find_or_initialize_by(
+  type: 'Spree::Gateway::Bogus',
+  name: 'Credit Card',
+  description: 'Bogus payment gateway.',
+  active: true
+)
+cc_payment_method.storefront_visible = false
+cc_payment_method.save!
+
+check_payment_method = store.payment_methods.find_or_initialize_by(
+  type: 'Spree::PaymentMethod::Check',
+  name: 'Check',
+  description: 'Pay by check.',
+  active: true
+)
+check_payment_method.storefront_visible = false
+check_payment_method.save!

data/db/sample_data/product_type_categories.rb

@@ -5,7 +5,7 @@
 # categories — before it there is nothing to link to. Seeding is additive and
 # only applies to products created from here on, so linking after the fact
 # changes nothing about the imported catalog.
-store = Spree::Store.default
+store = Spree::Current.store
 
 categories_by_type = {
   'Kitchen Appliance' => 'Kitchen',

data/db/sample_data/product_types.rb

@@ -10,9 +10,9 @@
 #
 # Categories are attached afterwards by product_type_categories.rb — the import
 # is what creates them, so there is nothing to link to at this point.
-store = Spree::Store.default
+store = Spree::Current.store
 
-color_option_type = Spree::OptionType.find_by(name: 'color')
+color_option_type = Spree::OptionType.for_store(store).find_by(name: 'color')
 
 definitions = store.custom_field_definitions.where(
   namespace: 'custom',

data/db/sample_data/promotions.rb

@@ -1,8 +1,6 @@
-promotion = Spree::Promotion.where(
+promotion = Spree::Current.store.promotions.where(
   name: 'Free Shipping',
   code: 'FREESHIP'
-).first_or_create! do |promo|
-  promo.store = Spree::Store.default
-end
+).first_or_create!
 
 Spree::Promotion::Actions::FreeShipping.where(promotion: promotion).first_or_create!

data/db/sample_data/wholesale.rb

@@ -2,7 +2,7 @@
 # Spree::Seeds::Channels: an approved demo buyer and a customer-group price
 # list, so a fresh install can walk the whole B2B portal story — sign in as
 # the buyer, see wholesale prices, check out on the wholesale channel.
-store = Spree::Store.default
+store = Spree::Current.store
 
 wholesale_group = store.customer_groups.find_or_create_by!(name: Spree::Seeds::CustomerGroups::WHOLESALE_NAME)