spree_core 6.0.0.beta2 → 6.0.0.beta3

data/app/workflows/spree/refunds/order_payments.rb

@@ -2,7 +2,8 @@
 
 module Spree
   module Refunds
-    # Gives a post-sale workflow one way to put money back on an order.
+    # Gives a post-sale workflow its two ways to put money back on an order:
+    # back to what paid for it, or as store credit.
     #
     # Returns, claims and exchanges all owe the customer money for the same
     # reason — goods that are going back, or were never right — and all three
@@ -22,6 +23,57 @@ module Spree
 
       private
 
+      # Puts `amount` back as store credit.
+      #
+      # Credit is its own ledger and writes no {Spree::Refund} row, so the
+      # credit names the order it settles — without that the order could not
+      # tell it had given anything back, and its payment status stayed `paid`
+      # on money the customer had already been made whole for.
+      #
+      # @param order [Spree::Order] the order being put right
+      # @param amount [BigDecimal] how much to give back
+      # @param record [Spree::Return, Spree::Claim, Spree::Exchange] what asked
+      #   for it; it originates the credit
+      # @param memo [String] what the customer reads on the credit
+      # @param refunder [Object, nil] whoever is issuing it
+      # @return [Array<Spree::StoreCredit>] the one credit written, shaped like
+      #   {#refund_order_payments} so both branches answer the same way
+      def issue_refund_store_credit(order:, amount:, record:, memo:, refunder: nil)
+        failure(record, :refund_exceeds_paid) if amount.to_d > refundable_balance(order)
+
+        [
+          Spree::StoreCredit.create!(
+            store: record.store,
+            customer: order.customer,
+            refunded_order: order,
+            amount: amount,
+            currency: record.currency,
+            created_by: refunder,
+            originator: record,
+            memo: memo
+          )
+        ]
+      end
+
+      # What the order can still give back, as store credit or to its
+      # payments: what its payments can still refund, less credit already
+      # issued against it. Credit writes no refund row, so without the second
+      # half every return, claim and exchange on one order could each hand back
+      # the full amount paid, and a refund to the card could follow a credit.
+      #
+      # The order row is locked first, so two settlements racing on one order
+      # cannot both read the same headroom.
+      #
+      # @param order [Spree::Order]
+      # @param shares [Hash{Spree::Payment => BigDecimal}, nil] already read
+      # @return [BigDecimal]
+      def refundable_balance(order, shares = nil)
+        Spree::Order.lock.find(order.id)
+
+        (shares || refundable_shares(order)).values.sum(0.to_d) -
+          Spree::StoreCredit.where(refunded_order: order).sum(:amount).to_d
+      end
+
       # Puts `amount` back on `order`, oldest payment first, until it is
       # covered.
       #
@@ -44,6 +96,8 @@ module Spree
         remaining = amount.to_d
         refunds = []
         shares = refundable_shares(order)
+        # With no payment to draw on the caller reports that instead.
+        failure(record, :refund_exceeds_paid) if shares.any? && remaining > refundable_balance(order, shares)
         # Resolved once rather than per payment — but only once there is
         # something to refund, since it is a find_or_create_by and a run that
         # refunds nothing should leave no reason row behind.

data/app/workflows/spree/returns/create.rb

@@ -7,6 +7,8 @@ module Spree
     # regional consumer rights. That policy is the most-customized rule in
     # commerce and deliberately does not live in core.
     class Create < Spree::Workflow
+      include Spree::Returns::ReturnableQuantity
+
       hooks :validate, :after_create
 
       # The created return — hook handlers read it (nil while :validate runs).
@@ -48,7 +50,7 @@ module Spree
       end
 
       # Quantities are validated against what is actually still returnable —
-      # units already returned on an earlier request must not come back twice.
+      # units already returned or exchanged must not come back twice.
       def normalize_items
         @normalized_items = items.map do |item|
           fulfillment_item = item[:fulfillment_item]
@@ -57,26 +59,18 @@ module Spree
           failure(order, :invalid_quantity) unless quantity.positive?
           failure(order, :item_not_on_order) unless fulfillment_item&.order_id == order.id
 
-          available = returnable_quantity_for(fulfillment_item)
-          if quantity > available
-            failure(order, "Only #{available} of #{fulfillment_item.variant.name} can be returned")
-          end
-
           { fulfillment_item: fulfillment_item, quantity: quantity }
         end
-      end
 
-      def returnable_quantity_for(fulfillment_item)
-        already_requested = Spree::ReturnLineItem.
-          joins(:return).
-          where(fulfillment_item_id: fulfillment_item.id).
-          where.not(spree_returns: { status: 'canceled' }).
-          sum(:quantity)
-
-        fulfillment_item.quantity.to_i - already_requested
+        ensure_returnable_quantities(@normalized_items, action: 'returned')
       end
 
       def build_return
+        # Again under the order's row lock, so two requests racing for the same
+        # units cannot both pass the check above.
+        Spree::Order.lock.find(order.id)
+        ensure_returnable_quantities(@normalized_items, action: 'returned')
+
         @return_record = order.returns.new(
           store: order.store,
           stock_location: stock_location || default_stock_location,

data/app/workflows/spree/returns/refund.rb

@@ -52,15 +52,14 @@ module Spree
       # original supply date rather than today's — the rate that applied then is
       # the rate to credit back.
       #
-      # Only lines that actually arrived are credited, matching what
-      # +received_total+ refunds: a customer who announced three items and sent
-      # two must not have tax credited on the third.
+      # Only lines that actually arrived are credited: a customer who announced
+      # three items and sent two must not have tax credited on the third.
       #
       # The refunded amount goes with them, because it can be less than those
       # lines are worth — a restocking fee, or an agreed part-refund. Without it
       # a provider would credit the tax on goods whose value the merchant kept.
       def refund_tax
-        received = return_record.return_line_items.select { |line| line.received_quantity.to_i.positive? }
+        received = return_record.return_line_items.select { |line| line.refund_amount.positive? }
         return if received.empty?
 
         order = return_record.order
@@ -83,34 +82,26 @@ module Spree
         failure(return_record, :not_received) unless return_record.received?
       end
 
-      # Only what actually came back is refundable — a customer who sent two
-      # of three items gets two items' worth.
+      # Only what actually came back is refundable — a customer who sent two of
+      # three items gets two items' worth. One figure serves as both the
+      # default and the ceiling, so a caller naming an amount cannot ask for
+      # more than a caller who names none would get.
       def resolve_amount
-        @amount_to_refund = (amount || received_total).to_d
+        refundable = return_record.refundable_total.to_d
+        @amount_to_refund = amount ? amount.to_d : refundable
 
         failure(return_record, :nothing_to_refund) unless @amount_to_refund.positive?
-        failure(return_record, :refund_exceeds_balance) if @amount_to_refund > return_record.refundable_total.to_d
-      end
-
-      def received_total
-        return_record.return_line_items.sum do |line|
-          next 0 if line.quantity.to_i.zero?
-
-          (line.pre_tax_amount / line.quantity) * line.received_quantity.to_i
-        end
+        failure(return_record, :refund_exceeds_balance) if @amount_to_refund > refundable
       end
 
       def issue_store_credit
-        credit = Spree::StoreCredit.create!(
-          store: return_record.store,
-          customer: return_record.order.customer,
+        @refunds = issue_refund_store_credit(
+          order: return_record.order,
           amount: @amount_to_refund,
-          currency: return_record.currency,
-          created_by: refunder,
-          originator: return_record,
-          memo: "Return #{return_record.number}"
+          record: return_record,
+          memo: "Return #{return_record.number}",
+          refunder: refunder
         )
-        @refunds = [credit]
       end
 
       # Each refund row commits, then Refund#perform! credits it at the

data/app/workflows/spree/returns/returnable_quantity.rb

@@ -0,0 +1,53 @@
+module Spree
+  module Returns
+    # How many units of a shipped item can still go back.
+    #
+    # A return and an exchange both take the same units off the customer, so
+    # each counts the other: without that, the units a customer returned could
+    # be exchanged again, and the credit for the exchange paid out a second
+    # time. Units named twice in one request count twice too.
+    module ReturnableQuantity
+      extend ActiveSupport::Concern
+
+      private
+
+      # @param fulfillment_item [Spree::FulfillmentItem]
+      # @param requested [Hash{Integer => Integer}] units already asked for in
+      #   this request, keyed by fulfillment item id
+      # @return [Integer]
+      def returnable_quantity_for(fulfillment_item, requested: {})
+        returned = Spree::ReturnLineItem.
+                   joins(:return).
+                   where(fulfillment_item_id: fulfillment_item.id).
+                   where.not(Spree::Return.table_name => { status: 'canceled' }).
+                   sum(:quantity)
+        exchanged = Spree::ExchangeLineItem.
+                    joins(:exchange).
+                    where(fulfillment_item_id: fulfillment_item.id).
+                    where.not(Spree::Exchange.table_name => { status: 'canceled' }).
+                    sum(:quantity)
+
+        fulfillment_item.quantity.to_i - returned - exchanged - requested.fetch(fulfillment_item.id, 0)
+      end
+
+      # Checks each item's quantity against what is still returnable and
+      # fails with the item's name when it is not.
+      #
+      # @param items [Array<Hash>] `[{ fulfillment_item:, quantity: }]`
+      # @param action [String] 'returned' or 'exchanged', for the message
+      def ensure_returnable_quantities(items, action:)
+        requested = Hash.new(0)
+
+        items.each do |item|
+          fulfillment_item = item[:fulfillment_item]
+          available = returnable_quantity_for(fulfillment_item, requested: requested)
+          if item[:quantity] > available
+            failure(order, "Only #{[available, 0].max} of #{fulfillment_item.variant.name} can be #{action}")
+          end
+
+          requested[fulfillment_item.id] += item[:quantity]
+        end
+      end
+    end
+  end
+end

data/app/workflows/spree/sellers/invite.rb

@@ -48,7 +48,7 @@ module Spree
       # role naming somewhere else comes back as a 422 rather than access
       # granted elsewhere.
       def send_invitation
-        @invitation = seller.invitations.new(email: email, role: role, inviter: inviter)
+        @invitation = seller.invitations.new(email: email, role: role || seller.default_user_role, inviter: inviter)
 
         failure(@invitation, @invitation.errors) unless @invitation.save
       end

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
@@ -1145,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
@@ -1331,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
@@ -1372,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
@@ -1537,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}.
@@ -1571,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
@@ -2002,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
@@ -2052,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:
@@ -2132,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/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