spree_core 5.0.7 → 5.1.0.beta

data/app/services/spree/tags/bulk_add.rb

@@ -16,7 +16,19 @@ module Spree
 
         record_class = records.first.class
 
-        taggings_to_upsert = records.pluck(:id).map do |record_id|
+        taggings_to_upsert = taggings_attributes(tags, records, context: context, record_class: record_class)
+
+        return if taggings_to_upsert.empty?
+
+        ActsAsTaggableOn::Tagging.insert_all(taggings_to_upsert)
+
+        record_class.where(id: records.pluck(:id)).touch_all
+      end
+
+      private
+
+      def taggings_attributes(tags, records, context:, record_class:)
+        records.pluck(:id).map do |record_id|
           tags.map do |tag|
             {
               taggable_id: record_id,
@@ -26,12 +38,6 @@ module Spree
             }
           end
         end.flatten.compact
-
-        return if taggings_to_upsert.empty?
-
-        ActsAsTaggableOn::Tagging.insert_all(taggings_to_upsert)
-
-        record_class.where(id: records.pluck(:id)).touch_all
       end
     end
   end

data/app/views/spree/addresses/_form.html.erb

@@ -5,7 +5,7 @@
      data-controller="address-form address-autocomplete"
      data-address-form-countries-value="<%= available_countries.to_json %>"
      data-address-form-states-value="<%= available_states.to_json %>"
-     data-address-form-current-state-id-value="<%= address.state_id || address_form.object.state_id %>"
+     data-address-form-current-state-id-value="<%= address.state_id %>"
 >
   <div id="<%= "#{address_id}country" %>">
     <div class="form-group mb-0">

data/app/views/spree/invitation_mailer/invitation_accepted.html.erb

@@ -0,0 +1,12 @@
+<h1>
+  <%= Spree.t('invitation_mailer.greeting', user_name: @invitation.inviter.first_name) %>
+</h1>
+<p>
+  <%= Spree.t('invitation_mailer.invitation_accepted.body', invitee_name: @invitation.invitee&.name, resource_name: @invitation.resource.name) %>
+</p>
+
+<p>
+  <%= Spree.t('invitation_mailer.thanks') %><br />
+  <%= current_store.name %>
+</p>
+

data/app/views/spree/invitation_mailer/invitation_email.html.erb

@@ -0,0 +1,21 @@
+<h1>
+  <%= Spree.t('invitation_mailer.greeting', user_name: @invitation.invitee&.first_name || @invitation.email) %>
+</h1>
+<p>
+  <%= Spree.t('invitation_mailer.invitation_email.body', inviter_name: @invitation.inviter.name, resource_name: @invitation.resource.name) %>
+</p>
+<p>
+  <%= Spree.t('invitation_mailer.invitation_email.link_description') %>
+</p>
+
+<% if spree.respond_to?(:admin_invitation_url) %>
+  <p>
+    <%= link_to Spree.t('invitation_mailer.invitation_email.link_text'), spree.admin_invitation_url(@invitation, token: @invitation.token, host: @invitation.store.formatted_url) %>
+  </p>
+<% end %>
+
+<p>
+  <%= Spree.t('invitation_mailer.thanks') %><br />
+  <%= current_store.name %>
+</p>
+

data/app/views/spree/shared/_payment.html.erb

@@ -30,15 +30,6 @@
     <div class="flex-shrink-0">
       <%= payment_method_icon_tag source.class.to_s.demodulize.downcase, height: 30 %>
     </div>
-    <div>
-      <% if payment.payment_method.respond_to?(:source_partial_name) %>
-        <%= render partial: "spree/payment_sources/#{payment.payment_method.source_partial_name}", locals: { payment: payment, source: source } %>
-      <% elsif source.respond_to?(:name) %>
-        <%= source.name %>
-      <% else %>
-        <%= source.class.to_s.demodulize.downcase %>
-      <% end %>
-    </div>
   <% else %>
     <div class="flex-shrink-0">
       <%= payment_method_icon_tag payment.payment_method.payment_icon_name %>

data/config/locales/en.yml

@@ -52,6 +52,9 @@ en:
         year: Year
       spree/inventory_unit:
         state: State
+      spree/invitation:
+        expires_at: Expires at
+        inviter: Inviter
       spree/line_item:
         price: Price
         quantity: Quantity
@@ -194,6 +197,10 @@ en:
       spree/zone:
         description: Description
         name: Name
+      user:
+        current_sign_in: Current sign in at
+        last_sign_in: Last sign in at
+        sign_in_count: Sign in count
     errors:
       messages:
         blank: can't be blank
@@ -334,6 +341,9 @@ en:
       spree/export:
         one: Export
         other: Exports
+      spree/integration:
+        one: Integration
+        other: Integrations
       spree/inventory_unit:
         one: Inventory Unit
         other: Inventory Units
@@ -349,6 +359,18 @@ en:
       spree/order:
         one: Order
         other: Orders
+      spree/page:
+        one: Page
+        other: Pages
+      spree/page_block:
+        one: Page Block
+        other: Page Blocks
+      spree/page_link:
+        one: Page Link
+        other: Page Links
+      spree/page_section:
+        one: Page Section
+        other: Page Sections
       spree/payment:
         one: Payment
         other: Payments
@@ -526,7 +548,6 @@ en:
     accepts_email_marketing: Accepts email marketing
     account: Account
     account_info: Account info
-    account_members: Team
     action: Action
     actions:
       approve: Approve
@@ -546,6 +567,7 @@ en:
       receive: Mark as received
       refund: Refund
       reject: Reject
+      resend: Resend
       resolve: Mark as resolved
       save: Save
       select_file: Select file
@@ -608,7 +630,6 @@ en:
       successfully_updated: Updated successfully
       unsuccessfully_saved: There was an error while trying to save your address.
       unsuccessfully_updated: There was an update while trying to update your address.
-    address_not_owned_by_user: The specified address does not belong to this user.
     addresses: Addresses
     adjustable: Adjustable
     adjustment: Adjustment
@@ -717,7 +738,6 @@ en:
     capture: Capture
     capture_events: Capture events
     card_code: Card Verification Code (CVC)
-    card_expiration_placeholder: MM/YYYY
     card_number: Card Number
     card_type: Brand
     card_type_is: Card type is
@@ -786,6 +806,7 @@ en:
     continue_as_guest: Continue as a guest
     continue_selling_when_out_of_stock: Continue selling when out of stock
     continue_shopping: Continue shopping
+    continue_without_logging_in: Continue without logging in
     copy: Copy
     copy_id: Copy ID
     copy_link: Copy link
@@ -821,14 +842,13 @@ en:
     coupon_codes: Coupon codes
     create: Create
     create_a_new_account: Create a new account
-    create_account: Create account
     create_customer: Create customer
     create_new: Create new
     create_new_order: Create new order
     create_new_team: Create new team
     create_reimbursement: Create reimbursement
-    created_at: Created At
-    created_by: Created By
+    created_at: Created at
+    created_by: Created by
     credit: Credit
     credit_allowed: Credit allowed
     credit_card: Credit Card
@@ -893,8 +913,6 @@ en:
     destroy: Destroy
     details: Details
     developers: Developers
-    didn_t_receive_confirmation_instructions: Didn't receive confirmation instructions?
-    didn_t_receive_unlock_instructions: Didn't receive unlock instructions?
     digital:
       digital_delivery: Digital Delivery
     digital_assets: Digital assets
@@ -1126,6 +1144,7 @@ en:
     internationalization: Internationalization
     invalid_credit_card: Invalid credit card.
     invalid_exchange_variant: Invalid exchange variant.
+    invalid_or_expired_invitation: Invalid or expired invitation
     invalid_payment_provider: Invalid payment provider.
     invalid_promotion_action: Invalid promotion action.
     invalid_promotion_rule: Invalid promotion rule.
@@ -1133,6 +1152,20 @@ en:
     inventory_adjustment: Inventory Adjustment
     inventory_error_flash_for_insufficient_quantity: An item in your cart has become unavailable.
     inventory_state: Inventory State
+    invitation_accepted: Invitation accepted!
+    invitation_mailer:
+      greeting: Hi %{user_name},
+      invitation_accepted:
+        body: "%{invitee_name} has accepted your invitation to join %{resource_name}"
+        subject: "%{invitee_name} has accepted your invitation to join %{resource_name}"
+      invitation_email:
+        body: "%{inviter_name} has invited you to join %{resource_name}"
+        link_description: 'To accept this invitation, please click the link below:'
+        subject: Invitation to join %{resource_name}
+      thanks: Thank you,
+    invitation_resent: Invitation resent!
+    invitations: Invitations
+    invited_by: Invited by
     is_not_available_to_shipment_address: is not available to shipment address
     iso: ISO Alpha-2
     iso3: ISO Alpha-3
@@ -1168,7 +1201,6 @@ en:
     list: List
     live: Live
     loading: Loading
-    loading_tree: Loading tree. Please wait…
     locale_changed: Locale Changed
     location: Location
     lock: Lock
@@ -1183,7 +1215,6 @@ en:
     login_failed: Login authentication failed.
     login_name: Login
     logo: Logo
-    logo_alt: Brand logo
     logout: Logout
     logs: Logs
     look_for_similar_items: Look for similar items
@@ -1212,9 +1243,6 @@ en:
     metadata: Metadata
     min: Min
     minimal_amount: Minimal Amount
-    minimum_password_length:
-      one: "(%{count} character minimum)"
-      other: "(%{count} characters minimum)"
     missing_return_authorization: Missing Return Authorization for %{item_name}.
     month: Month
     more: More
@@ -1240,7 +1268,7 @@ en:
     new_billing_address: New Billing Address
     new_country: New Country
     new_custom_domain: New Custom Domain
-    new_customer: Create new account
+    new_customer: New Customer
     new_customer_return: New Customer Return
     new_digital_asset: New digital asset
     new_domain: New domain
@@ -1469,7 +1497,6 @@ en:
       video:
         heading_1_default: Why I recommend it?
         heading_2_default: There's nothing like a soft hint of blush to add dimension and color to your look.
-    page_settings: Page settings
     pages: Pages
     pages_defaults:
       homepage:
@@ -1488,7 +1515,7 @@ en:
     password_protected: Password protected
     paste: Paste
     path: Path
-    pay: Pay
+    pay: pay
     payment: Payment
     payment_amount: Payment amount
     payment_attempts: failed attempts
@@ -1505,11 +1532,11 @@ en:
     payment_source: Payment source
     payment_state: Payment State
     payment_states:
-      balance_due: Balance Due
+      balance_due: Balance due
       checkout: Checkout
       complete: Complete
       completed: Completed
-      credit_owed: Credit Owed
+      credit_owed: Credit owed
       failed: Failed
       paid: Paid
       partially_refunded: Partially Refunded
@@ -1527,12 +1554,15 @@ en:
     percent: Percent
     percent_per_item: Percent Per Item
     permalink: Permalink
+    permissions: Permissions
     personal_details: Personal details
     phone: Phone
     place_order: Place Order
     please_check_back_soon: Please check back soon.
     please_define_payment_methods: Please define some payment methods first.
     please_enter_reasonable_quantity: Please enter a reasonable quantity.
+    please_select: Please select
+    please_select_all_options: Please select all options
     policies: Policies
     populate_get_error: Something went wrong. Please try adding the item again.
     post_categories: Post categories
@@ -1883,7 +1913,6 @@ en:
     show_store_selector:
       long: Display the Store selector in the main nav bar of Storefront and allow users to change Store and Currency
       short: Show Store selector
-    sign_in_with_provider: Sign in with %{provider}
     sign_out: Sign out
     sign_up: Sign Up
     site_name: Site name
@@ -2104,7 +2133,6 @@ en:
     timezone: Timezone
     title: Title
     title_link: Title link
-    to: To
     to_add_variants_you_must_first_define: To add variants, you must first define
     toggle_menu: Toggle menu
     top_suggestions: Top suggestions
@@ -2150,7 +2178,6 @@ en:
     update_billing_address: Update billing address
     update_contact_information: Update contact information
     update_shipping_address: Update shipping address
-    updated: Updated
     updated_at: Updated at
     updating: Updating
     upload_image: Upload image

data/db/migrate/20250407085228_create_spree_integrations.rb

@@ -0,0 +1,12 @@
+class CreateSpreeIntegrations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_integrations, if_not_exists: true do |t|
+      t.references :store, null: false, index: true
+      t.string :type, null: false, index: true
+      t.text :preferences
+      t.boolean :active, default: false, null: false, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250410061306_create_spree_invitations.rb

@@ -0,0 +1,20 @@
+class CreateSpreeInvitations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_invitations do |t|
+      t.string :email, index: true, null: false
+      t.string :token, index: { unique: true }, null: false
+      t.string :status, null: false, index: true
+
+      t.references :resource, polymorphic: true, index: true, null: false # eg. Store, Vendor, Account
+      t.references :inviter, polymorphic: true, index: true, null: false
+      t.references :invitee, polymorphic: true, index: true
+      t.references :role, null: false
+
+      t.datetime :accepted_at
+      t.datetime :expires_at, index: true
+      t.datetime :deleted_at, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250418174652_add_resource_to_spree_role_users.rb

@@ -0,0 +1,8 @@
+class AddResourceToSpreeRoleUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :spree_role_users, :resource, polymorphic: true, null: true
+    add_reference :spree_role_users, :invitation, null: true
+
+    add_index :spree_role_users, [:resource_id, :resource_type, :user_id, :user_type, :role_id], unique: true
+  end
+end

data/db/migrate/20250508060800_add_selected_locale_to_spree_admin_users.rb

@@ -0,0 +1,8 @@
+class AddSelectedLocaleToSpreeAdminUsers < ActiveRecord::Migration[7.2]
+  def change
+    if Spree.admin_user_class.present?
+      users_table_name = Spree.admin_user_class.table_name
+      add_column users_table_name, :selected_locale, :string unless column_exists?(users_table_name, :selected_locale)
+    end
+  end
+end

data/db/migrate/20250509143831_add_session_id_to_spree_assets.rb

@@ -0,0 +1,5 @@
+class AddSessionIdToSpreeAssets < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_assets, :session_id, :string
+  end
+end

data/lib/generators/spree/authentication/devise/templates/authentication_helpers.rb.tt

@@ -38,13 +38,13 @@ module Spree
     end
 
     def spree_admin_login_path(opts = {})
-      spree_login_path(opts)
+      new_session_path(Spree.admin_user_class.model_name.singular_route_key, opts)
     end
 
     def spree_admin_logout_path(opts = {})
-      spree_logout_path(opts)
+      destroy_session_path(Spree.admin_user_class.model_name.singular_route_key, opts)
     end
   end
 end
 
-ApplicationController.include Spree::AuthenticationHelpers if defined?(ApplicationController)
+ApplicationController.include Spree::AuthenticationHelpers if defined?(ApplicationController)

data/lib/spree/core/controller_helpers/auth.rb

@@ -17,12 +17,12 @@ module Spree
 
         # Needs to be overridden so that we use Spree's Ability rather than anyone else's.
         def current_ability
-          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(try_spree_current_user)
+          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(try_spree_current_user, { store: current_store })
         end
 
         def redirect_back_or_default(default)
-          redirect_to(session['spree_user_return_to'] || request.env['HTTP_REFERER'] || default)
-          session['spree_user_return_to'] = nil
+          Spree::Deprecation.warn('redirect_back_or_default is deprecated and will be removed in Spree 5.2. Please use redirect_back(fallback_location: default) instead.')
+          redirect_back(fallback_location: default)
         end
 
         def set_token
@@ -44,18 +44,19 @@ module Spree
           @current_oauth_token ||= get_last_access_token.call(user) || create_access_token.call(user)
         end
 
-        def store_location
-          # disallow return to login, logout, signup pages
-          authentication_routes = [:spree_signup_path, :spree_login_path, :spree_logout_path]
-          disallowed_urls = []
-          authentication_routes.each do |route|
-            disallowed_urls << send(route) if respond_to?(route)
-          end
+        # this will work for devise out of the box
+        # for other auth systems you will need to override this method
+        def store_location(location = nil)
+          return if try_spree_current_user
 
-          disallowed_urls.map! { |url| url[/\/\w+$/] }
-          unless disallowed_urls.include?(request.fullpath)
-            session['spree_user_return_to'] = request.fullpath.gsub('//', '/')
-          end
+          location ||= request.fullpath
+          session_key = store_location_session_key
+
+          session[session_key] = location
+        end
+
+        def store_location_session_key
+          "#{Spree.user_class.model_name.singular_route_key.to_sym}_return_to"
         end
 
         # proxy method to *possible* spree_current_user method

data/lib/spree/core/controller_helpers/currency.rb

@@ -14,6 +14,8 @@ module Spree
           end
         end
 
+        # Returns the currently selected currency.
+        # @return [String] the currently selected currency, eg. `USD`
         def current_currency
           @current_currency ||= if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])
                                   session[:currency]
@@ -26,10 +28,14 @@ module Spree
                                 end&.upcase
         end
 
+        # Returns the list of supported currencies for the current store.
+        # @return [Array<Money::Currency>] the list of supported currencies
         def supported_currencies
           @supported_currencies ||= current_store&.supported_currencies_list
         end
 
+        # Returns the list of supported currencies for all stores.
+        # @return [Array<String>] the list of supported currencies, eg. `["USD", "EUR"]`
         def supported_currencies_for_all_stores
           @supported_currencies_for_all_stores ||= begin
             (
@@ -39,12 +45,17 @@ module Spree
           end
         end
 
+        # Checks if the given currency is supported.
+        # @param currency_iso_code [String] the ISO code of the currency, eg. `USD`
+        # @return [Boolean] `true` if the currency is supported, `false` otherwise
         def supported_currency?(currency_iso_code)
           return false if supported_currencies.nil?
 
           supported_currencies.map(&:iso_code).include?(currency_iso_code.upcase)
         end
 
+        # Returns the currency parameter from the request.
+        # @return [String] the currency parameter, eg. `USD`
         def currency_param
           return if current_currency == current_store.default_currency
 

data/lib/spree/core/controller_helpers/strong_parameters.rb

@@ -33,8 +33,9 @@ module Spree
 
         def permitted_product_attributes
           permitted_attributes.product_attributes + [
-            :store_id,
-            product_properties_attributes: permitted_product_properties_attributes
+            variants_attributes: permitted_variant_attributes + ['id', :_destroy],
+            master_attributes: permitted_variant_attributes + ['id'],
+            product_properties_attributes: permitted_product_properties_attributes + ['id', :_destroy]
           ]
         end
 

data/lib/spree/core/engine.rb

@@ -21,8 +21,10 @@ module Spree
                                :page_sections,
                                :page_blocks,
                                :reports,
+                               :translatable_resources,
                                :analytics_events,
-                               :analytics_event_handlers)
+                               :analytics_event_handlers,
+                               :integrations)
       SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
       PromoEnvironment = Struct.new(:rules, :actions)
       isolate_namespace Spree
@@ -96,7 +98,6 @@ module Spree
         Rails.application.config.spree.payment_methods = [
           Spree::Gateway::Bogus,
           Spree::Gateway::BogusSimple,
-          Spree::Gateway::CustomPaymentSourceMethod,
           Spree::PaymentMethod::Check,
           Spree::PaymentMethod::StoreCredit
         ]
@@ -235,6 +236,13 @@ module Spree
           Spree::Reports::SalesTotal
         ]
 
+        Rails.application.config.spree.translatable_resources = [
+          Spree::Product,
+          Spree::Taxon,
+          Spree::Taxonomy,
+          Spree::Store
+        ]
+
         Rails.application.config.spree.analytics_events = {
           product_viewed: 'Product Viewed',
           product_list_viewed: 'Product List Viewed',
@@ -258,9 +266,11 @@ module Spree
           checkout_email_entered: 'Checkout Email Entered',
           checkout_step_viewed: 'Checkout Step Viewed',
           checkout_step_completed: 'Checkout Step Completed',
-          order_completed: 'Order Completed'
+          order_completed: 'Order Completed',
         }
         Rails.application.config.spree.analytics_event_handlers = []
+
+        Rails.application.config.spree.integrations = []
       end
 
       initializer 'spree.promo.register.promotions.actions' do |app|

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.0.7'.freeze
+  VERSION = '5.1.0.beta'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -31,6 +31,7 @@ require 'request_store'
 require 'wannabe_bool'
 require 'geocoder'
 require 'oembed'
+require 'safely_block'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.