spree_admin 5.0.4 → 5.1.0.beta

data/app/controllers/spree/admin/themes_controller.rb

@@ -3,6 +3,9 @@ module Spree
     class ThemesController < ResourceController
       layout :choose_layout
 
+      include StorefrontBreadcrumbConcern
+      add_breadcrumb Spree.t(:themes), :admin_themes_path
+
       def edit
         @theme_preview = params[:theme_preview_id].present? ? @theme.previews.find(params[:theme_preview_id]) : @theme.create_preview
         @page = if params[:page_id].present?
@@ -70,6 +73,10 @@ module Spree
       def collection
         super.without_previews.order(default: :desc).includes(screenshot_attachment: :blob)
       end
+
+      def permitted_resource_params
+        params.require(:theme).permit(permitted_theme_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" })
+      end
     end
   end
 end

data/app/controllers/spree/admin/translations_controller.rb

@@ -36,7 +36,15 @@ module Spree
       end
 
       def resource_class
-        @resource_class ||= params[:resource_type].constantize
+        @resource_class ||= begin
+          klass = params[:resource_type]
+          allowed_resource_class.find { |allowed_class| allowed_class.to_s == klass } ||
+            raise(ActiveRecord::RecordNotFound, "Resource type not found")
+        end
+      end
+
+      def allowed_resource_class
+        Rails.application.config.spree.translatable_resources
       end
 
       def set_resource

data/app/controllers/spree/admin/user_passwords_controller.rb

@@ -0,0 +1,22 @@
+module Spree
+  module Admin
+    class UserPasswordsController < defined?(Devise::PasswordsController) ? Devise::PasswordsController : Spree::Admin::BaseController
+      layout 'spree/minimal'
+
+      def create
+        self.resource = resource_class.send_reset_password_instructions(resource_params)
+        yield resource if block_given?
+
+        set_flash_message(:notice, :send_instructions) if is_navigational_format?
+        # Don't not show error message that the email was not found
+        respond_with({}, location: after_sending_reset_password_instructions_path_for(resource_name))
+      end
+
+      protected
+
+      def translation_scope
+        'devise.user_passwords'
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/user_sessions_controller.rb

@@ -0,0 +1,23 @@
+module Spree
+  module Admin
+    class UserSessionsController < defined?(Devise::SessionsController) ? Devise::SessionsController : Spree::Admin::BaseController
+      layout 'spree/minimal'
+
+      # We need to overwrite this action because `return_to` url may be in a different domain
+      # So we need to pass `allow_other_host` option to `redirect_to` method
+      def create
+        self.resource = warden.authenticate!(auth_options)
+        set_flash_message!(:notice, :signed_in)
+        sign_in(resource_name, resource)
+        yield resource if block_given?
+        redirect_to after_sign_in_path_for(resource), allow_other_host: true
+      end
+
+      protected
+
+      def translation_scope
+        'devise.user_sessions'
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/users_controller.rb

@@ -10,7 +10,12 @@ module Spree
       before_action :load_last_order_data, only: :show
       before_action :remove_empty_params, only: :update
 
-      def show; end
+      add_breadcrumb_icon 'users'
+      add_breadcrumb Spree.t(:customers), :admin_users_path
+
+      def show
+        add_breadcrumb @user.name, spree.admin_user_path(@user)
+      end
 
       def create
         @user = Spree.user_class.new(user_params)
@@ -52,7 +57,7 @@ module Spree
         params[:q][:s] ||= 'created_at desc'
         params[:q][:created_at_not_null] ||= 1
 
-        @collection = super
+        @collection = model_class.accessible_by(current_ability, :index)
         @search = @collection.ransack(params[:q])
         @collection = @search.result(distinct: true).
                       includes(
@@ -64,6 +69,10 @@ module Spree
                       page(params[:page]).per(params[:per_page])
       end
 
+      def find_resource
+        model_class.accessible_by(current_ability, :show).find(params[:id])
+      end
+
       private
 
       def user_params

data/app/controllers/spree/admin/variants_controller.rb

@@ -3,9 +3,12 @@ module Spree
     class VariantsController < ResourceController
       include StockLocationsHelper
 
+      include ProductsBreadcrumbConcern
+
       belongs_to 'spree/product', find_by: :slug
       before_action :load_data, only: [:edit, :update]
       before_action :strip_attributes, only: [:update]
+      before_action :add_breadcrumbs
 
       edit_action.before :build_prices
       edit_action.before :build_stock_items
@@ -85,6 +88,16 @@ module Spree
         params[:variant].delete(:prices_attributes) unless can?(:manage, @variant.prices.first)
         params[:variant].delete(:stock_items_attributes) unless can?(:manage, @variant.stock_items.first)
       end
+
+      def add_breadcrumbs
+        if @variant.present? && @variant.persisted?
+          add_breadcrumb @variant.human_name, spree.edit_admin_product_variant_path(@product, @variant)
+        end
+      end
+
+      def permitted_resource_params
+        params.require(:variant).permit(permitted_variant_attributes)
+      end
     end
   end
 end

data/app/controllers/spree/admin/webhooks_subscribers_controller.rb

@@ -6,6 +6,9 @@ module Spree
       create.before :process_subscriptions
       update.before :process_subscriptions
 
+      add_breadcrumb Spree.t(:developers), :admin_oauth_applications_path
+      add_breadcrumb Spree.t(:webhooks), :admin_webhooks_subscribers_path
+
       def show
         @webhooks_subscriber = Webhooks::Subscriber.find(params[:id])
         @events = @webhooks_subscriber.events.order(created_at: :desc).page(params[:page]).per(params[:per_page])

data/app/controllers/spree/admin/zones_controller.rb

@@ -1,6 +1,7 @@
 module Spree
   module Admin
     class ZonesController < ResourceController
+      add_breadcrumb Spree.t(:zones), :admin_zones_path
       before_action :load_data, except: :index
 
       def new
@@ -32,6 +33,10 @@ module Spree
         @states = @selected_country&.states&.order(:name) || Spree::State.none
         @zones = Zone.order(:name)
       end
+
+      def permitted_resource_params
+        params.require(:zone).permit(permitted_zone_attributes)
+      end
     end
   end
 end

data/app/helpers/spree/admin/base_helper.rb

@@ -25,12 +25,10 @@ module Spree
       # this is used to display different sidebar navigation for settings pages
       # @return [Boolean]
       def settings_active?
-        @settings_active || %w[stores zones shipping_methods oauth_applications
-                               payment_methods refund_reasons reimbursement_types
-                               shipping_categories store_credit_categories
-                               syncs tax_categories tax_rates webhooks accounts
-                               custom_domains audits exports imports return_authorization_reasons
-                               documents stripe_tax_registrations members subscriptions stock_locations webhooks_subscribers].include?(controller_name)
+        @settings_active || %w[admin_users audits custom_domains exports imports invitations oauth_applications
+                               payment_methods refund_reasons reimbursement_types return_authorization_reasons roles
+                               shipping_categories shipping_methods stock_locations store_credit_categories
+                               stores tax_categories tax_rates webhooks webhooks_subscribers zones].include?(controller_name)
       end
 
       # @return [Array<String>] the available countries for checkout
@@ -199,37 +197,40 @@ module Spree
       # renders all the preference fields for an object
       # @param object [Spree::TaxRate, Spree::Calculator, Spree::PaymentMethod, Spree::ShippingMethod, Spree::Store] the object to render the preference fields for
       # @param form [ActionView::Helpers::FormBuilder] the form builder
+      # @param i18n_scope [String] the i18n scope for the preference fields
       # @return [String] the preference fields
-      def preference_fields(object, form)
+      def preference_fields(object, form, i18n_scope: '')
         return unless object.respond_to?(:preferences)
 
-        fields = object.preferences.keys.map do |key|
-          if object.has_preference?(key)
-            case key
-            when :currency
-              content_tag(:div, form.label("preferred_#{key}", Spree.t(key)) +
-                form.currency_select("preferred_#{key}", current_store.supported_currencies.split(','), {}, { class: 'custom-select', disabled: current_store.supported_currencies.split(',').count == 1 }),
-                          class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
-            else
-              if object.preference_type(key).to_sym == :boolean
-                content_tag(:div, class: 'form-group custom-control custom-checkbox') do
-                  preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)) +
-                    form.label(
-                      "preferred_#{key}",
-                      Spree.t(key),
-                      class: 'custom-control-label',
-                      id: [object.class.to_s.parameterize, 'preference', key].join('-')
-                    )
-                end
-              else
-                content_tag(:div, form.label("preferred_#{key}", Spree.t(key)) +
-                  preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)),
-                            class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
-              end
+        fields = object.preferences.keys.map { |key| preference_field(object, form, key, i18n_scope: i18n_scope) }
+        safe_join(fields)
+      end
+
+      def preference_field(object, form, key, i18n_scope: '')
+        return unless object.has_preference?(key)
+
+        case key
+        when :currency
+          content_tag(:div, form.label("preferred_#{key}", Spree.t(key, scope: i18n_scope)) +
+            form.currency_select("preferred_#{key}", current_store.supported_currencies.split(','), {}, { class: 'custom-select', disabled: current_store.supported_currencies.split(',').count == 1 }),
+                      class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
+        else
+          if object.preference_type(key).to_sym == :boolean
+            content_tag(:div, class: 'form-group custom-control custom-checkbox') do
+              preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)) +
+                form.label(
+                  "preferred_#{key}",
+                  Spree.t(key, scope: i18n_scope),
+                  class: 'custom-control-label',
+                  id: [object.class.to_s.parameterize, 'preference', key].join('-')
+                )
             end
+          else
+            content_tag(:div, form.label("preferred_#{key}", Spree.t(key, scope: i18n_scope)) +
+              preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)),
+                        class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
           end
         end
-        safe_join(fields)
       end
 
       def spree_dom_id(record)

data/app/helpers/spree/admin/bulk_operations_helper.rb

@@ -51,7 +51,13 @@ module Spree
         options[:class] ||= 'btn btn-light'
 
         if options[:icon]
-          text = icon(options[:icon]) + ' ' + text
+          if options[:only_icon]
+            options[:title] = text
+            text = icon(options[:icon], class: 'mr-0')
+            options[:class] += ' with-tip'
+          else
+            text = icon(options[:icon]) + ' ' + text
+          end
         end
 
         content_tag :span, data: { toggle: 'modal', target: '#bulk-modal' } do
@@ -76,7 +82,7 @@ module Spree
       # render a counter for the bulk operations
       # @return [String]
       def bulk_operations_counter
-        content_tag(:span, class: 'bulk-operations-counter ml-1') do
+        content_tag(:span, class: 'bulk-operations-counter') do
           content_tag(:strong, '', data: { bulk_operation_target: 'counter' }) +
           Spree.t("admin.selected")
         end

data/app/helpers/spree/admin/modal_helper.rb

@@ -20,7 +20,7 @@ module Spree
       # render a discard button for the modal
       # @return [String]
       def modal_discard_button
-        button_tag(type: 'button', class: 'btn btn-light', data: { dismiss: 'modal' }) do
+        button_tag(type: 'button', class: 'btn btn-light mr-auto', data: { dismiss: 'modal' }) do
           Spree.t('actions.discard')
         end.html_safe
       end

data/app/helpers/spree/admin/navigation_helper.rb

@@ -52,11 +52,9 @@ module Spree
       # @param per_page [Integer] the number of items per page
       # @return [Hash] the params to apply per page
       def per_page_dropdown_params(per_page)
-        args = params.permit!.to_h.clone
-        args.delete(:page)
-        args.delete(:per_page)
-        args.merge!(per_page: per_page)
-        args
+        # Keep only safe query params that should survive pagination changes
+        safe_params = request.query_parameters.slice(:q)
+        safe_params.merge(per_page: per_page, page: nil)
       end
 
       # render a button link to edit a resource
@@ -268,6 +266,14 @@ module Spree
         css ||= 'text-muted'
         content_tag :small, icon('info-square-rounded', class: css), data: { placement: placement }, class: "with-tip #{css}", title: text
       end
+
+      def render_breadcrumb_icon
+        if settings_active?
+          icon('settings')
+        elsif @breadcrumb_icon
+          icon(@breadcrumb_icon)
+        end
+      end
     end
   end
 end

data/app/helpers/spree/admin/orders_helper.rb

@@ -25,10 +25,8 @@ module Spree
             icon('credit-card-refund') + Spree.t('payment_states.refunded')
           elsif order.partially_refunded?
             icon('credit-card-refund') + Spree.t('payment_states.partially_refunded')
-          elsif order.payment_state == 'failed'
+          elsif order.payment_state == 'failed' || order.payment_state == 'void'
             icon('cancel') + Spree.t('payment_states.failed')
-          elsif order.payment_state == 'void'
-            icon('cancel') + Spree.t('payment_states.void')
           elsif order.payment_state == 'paid'
             icon('check') + Spree.t('payment_states.paid')
           else

data/app/helpers/spree/admin/posts_helper.rb

@@ -2,7 +2,7 @@ module Spree
   module Admin
     module PostsHelper
       def post_authors_select_options
-        current_store.admin_users.map { |user| [user.name, user.id] }
+        current_store.users.map { |user| [user.name, user.id] }
       end
     end
   end

data/app/helpers/spree/admin/session_assets_helper.rb

@@ -7,7 +7,7 @@ module Spree
 
       def store_uploaded_asset_in_session(asset)
         ensure_session_uploaded_assets_uuid
-        asset.update(session_uploaded_assets_uuid: session['spree.admin.uploaded_assets.uuid'])
+        asset.update(session_id: session['spree.admin.uploaded_assets.uuid'])
       end
 
       def session_uploaded_assets

data/app/helpers/spree/admin/stores_helper.rb

@@ -4,7 +4,7 @@ module Spree
       include Spree::ImagesHelper
 
       def available_stores
-        @available_stores ||= Spree::Store.accessible_by(current_ability)
+        @available_stores ||= Spree::Store.accessible_by(current_ability).includes(:logo_attachment, :favicon_image_attachment, :default_custom_domain)
       end
 
       DEFAULT_ICON_SIZE = 40
@@ -36,23 +36,6 @@ module Spree
         opts[:class] += ' rounded text-dark d-flex align-items-center justify-content-center bg-gray-200'
         content_tag(:span, name[0].upcase, class: opts[:class], style: "height: #{opts[:height]}px; width: #{opts[:width]}px;")
       end
-
-      def store_logo(store = nil, options = {})
-        store ||= current_store
-        return unless store
-
-        opts = { width: 30, height: 30, crop: :fit, quality: :auto, fetch_format: :auto, alt: store.name, title: store.name, class: 'with-tip' }
-        opts.merge!(options)
-
-        if store.is_a?(Spree::Store) && store.logo&.attached? && store.logo&.variable?
-          spree_image_tag(store.logo, class: opts[:class], width: opts[:width], height: opts[:height])
-        else
-          initials = store.name.split.map(&:first).join.upcase
-          content_tag(:div, initials, class: "avatar rounded with-tip bg-light",
-                     style: "width: #{opts[:height]}px; height: #{opts[:height]}px;",
-                     title: store.name)
-        end
-      end
     end
   end
 end

data/app/helpers/spree/admin/tags_helper.rb

@@ -12,7 +12,7 @@ module Spree
       def post_tags_scope
         @post_tags_scope ||= ActsAsTaggableOn::Tag.
                              joins(:taggings).
-                             where("#{ActsAsTaggableOn.taggings_table}.taggable_type = ?", 'Spree::Post').
+                             where(ActsAsTaggableOn.taggings_table => { taggable_type: 'Spree::Post' }).
                              for_context(:tags).for_tenant(current_store.id)
       end
 
@@ -23,7 +23,7 @@ module Spree
       def user_tags_scope
         @user_tags_scope ||= ActsAsTaggableOn::Tag.
                              joins(:taggings).
-                             where("#{ActsAsTaggableOn.taggings_table}.taggable_type = ?", Spree.user_class.to_s).
+                             where(ActsAsTaggableOn.taggings_table => { taggable_type: Spree.user_class.to_s }).
                              for_context(:tags)
       end
 

data/app/javascript/spree/admin/application.js

@@ -80,6 +80,7 @@ import UnitSystemController from 'spree/admin/controllers/unit_system_controller
 import VariantsFormController from 'spree/admin/controllers/variants_form_controller'
 import AddressAutocompleteController from 'spree/core/controllers/address_autocomplete_controller'
 import AddressFormController from 'spree/core/controllers/address_form_controller'
+import DisableSubmitButtonController from 'spree/core/controllers/disable_submit_button_controller'
 import EnableButtonController from 'spree/core/controllers/enable_button_controller'
 
 application.register('active-storage-upload', ActiveStorageUpload)
@@ -98,6 +99,7 @@ application.register('checkbox-select-all', CheckboxSelectAll)
 application.register('clipboard', Clipboard)
 application.register('color-palette', ColorPaletteController)
 application.register('color-picker', ColorPickerController)
+application.register('disable-submit-button', DisableSubmitButtonController)
 application.register('enable-button', EnableButtonController)
 application.register('filters', FiltersController)
 application.register('font-picker', FontPickerController)

data/app/javascript/spree/admin/helpers/bootstrap.js

@@ -4,11 +4,11 @@ import { lockScroll, unlockScroll } from 'spree/core/helpers/scroll_lock'
 
 
 const initTooltips = () => {
-  $('.with-tip, .trix-button').each(function() {
+  $('.with-tip, .trix-button, .uppy-Dashboard-close, time').each(function() {
     $(this).tooltip()
   })
 
-  $('.with-tip, .trix-button').on('show.bs.tooltip', function(event) {
+  $('.with-tip, .trix-button, .uppy-Dashboard-close, time').on('show.bs.tooltip', function(event) {
     if (('ontouchstart' in window)) {
       event.preventDefault()
     }
@@ -16,7 +16,7 @@ const initTooltips = () => {
 }
 
 const removeTooltips = () => {
-  $('.with-tip, .trix-button').each(function() {
+  $('.with-tip, .trix-button, .uppy-Dashboard-close, time').each(function() {
     $(this).tooltip('dispose')
   })
 }

data/app/views/active_storage/_upload_form.html.erb

@@ -22,7 +22,7 @@
           form.object.send(field_name),
           width: width,
           height: height,
-          class: 'img-fluid rounded-lg',
+          class: 'img-fluid rounded',
           data: { active_storage_upload_target: 'thumb' },
           loading: :lazy
         ) %>

data/app/views/layouts/spree/minimal.html.erb

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="<%= I18n.locale %>">
+  <head>
+    <%= render "spree/admin/shared/head" %>
+  </head>
+  <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>">
+    <div class="container-fluid">
+      <div class="row bg-white">
+        <div
+          class="col-lg-5 d-none d-lg-flex bg-light min-vh-100"
+          style="background-image: url('<%= asset_path('login_sidebar_background.png') %>');background-repeat: no-repeat;background-size: cover;background-position: center')"
+        >
+        </div>
+        <div class="col-lg-6 col-xl-4 offset-xl-1 py-3 d-flex flex-column justify-content-center vh-100">
+          <%= yield %>
+        </div>
+      </div>
+    </div>
+    <%= render "spree/admin/shared/modal" %>
+    <%= render "spree/admin/shared/alerts" %>
+  </body>
+</html>

data/app/views/spree/admin/admin_users/_admin_user.html.erb

@@ -0,0 +1,19 @@
+<tr id="<%= spree_dom_id admin_user %>" class="cursor-pointer" data-controller="row-link">
+  <td class="w-50" data-action="click->row-link#openLink">
+    <%= link_to spree.admin_admin_user_path(admin_user), data: { row_link_target: :link }, class: 'd-flex align-items-center' do %>
+      <%= render_avatar(admin_user, width: 48, height: 48, class: 'mr-3 avatar') %>
+      <div class="d-flex flex-column">
+        <%= admin_user.name %>
+        <span class="text-muted"><%= admin_user.email %></span>
+      </div>
+    <% end %>
+  </td>
+  <td class="w-30" data-action="click->row-link#openLink">
+    <% admin_user.role_users.each do |role_user| %>
+      <span class="badge badge-light"><%= role_user.role.name %></span>
+    <% end %>
+  </td>
+  <td class="w-20">
+    <%= local_time(admin_user.created_at) %>
+  </td>
+</tr>

data/app/views/spree/admin/admin_users/_audit_log.html.erb

@@ -0,0 +1,5 @@
+<div class="text-muted text-center py-5">
+  <p>Audit log is part of the Spree Enterprise offering.</p>
+
+  <%= external_link_to 'Upgrade to Spree Enterprise', 'https://spreecommerce.org/pricing', class: 'btn btn-primary' %>
+</div>

data/app/views/spree/admin/admin_users/_form.html.erb

@@ -0,0 +1,12 @@
+<div class="form-group">
+  <%= f.label :email %>
+  <%= f.email_field :email, class: 'form-control', required: true, autofocus: true %>
+</div>
+<div class="form-group">
+  <%= f.label :first_name %>
+  <%= f.text_field :first_name, class: 'form-control', required: true %>
+</div>
+<div class="form-group">
+  <%= f.label :last_name %>
+  <%= f.text_field :last_name, class: 'form-control', required: true %>
+</div>

data/app/views/spree/admin/admin_users/edit.html.erb

@@ -0,0 +1,35 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_admin_users_path %>
+  <%= @admin_user.name %>
+<% end %>
+
+<%= content_for :title do %>
+  <%= @admin_user.name %>
+<% end %>
+
+<%= turbo_frame_tag :edit_user do %>
+  <div class="card-header d-flex align-items-center justify-content-between">
+    <h5 class="card-title">
+      <%= Spree.t(:details) %>
+    </h5>
+    <%= link_to Spree.t('actions.discard'), spree.admin_admin_user_path(@admin_user), class: 'btn btn-light btn-sm' %>
+  </div>
+  <%= form_for [:admin, @admin_user], as: :admin_user, url: spree.admin_admin_user_path(@admin_user), method: :put do |f| %>
+    <div class="card-body">    
+      <%= render'spree/admin/shared/error_messages', target: @admin_user %>
+      <%= render 'form', f: f %>
+      <% if can?(:manage, Spree::Role) && @roles.any? %>
+        <div class="form-group">
+          <%= f.label :spree_role_ids, Spree.t(:roles) %>
+          <%= f.select :spree_role_ids,
+                  options_from_collection_for_select(@roles, 'id', 'name', @admin_user.spree_roles.pluck(:id)),
+                  { prompt: false },
+                  { multiple: true,  data: { controller: 'autocomplete-select' } } %>          
+        </div>
+      <% end %>
+    </div>
+    <div class="card-footer">
+      <%= turbo_save_button_tag Spree.t('actions.update') %>
+    </div>
+  <% end %>
+<% end%>

data/app/views/spree/admin/admin_users/index.html.erb

@@ -0,0 +1,18 @@
+<%= render 'spree/admin/shared/team_nav' %>
+
+<div class="card-lg">
+  <div class="table-responsive">
+    <table class="table">
+      <thead>
+        <tr>
+          <th class="rounded-lg-top-left"><%= Spree.t(:user) %></th>
+          <th><%= Spree.t(:roles) %></th>
+          <th class="rounded-lg-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <%= render partial: 'spree/admin/admin_users/admin_user', collection: @collection %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/app/views/spree/admin/admin_users/new.html.erb

@@ -0,0 +1,21 @@
+<%= form_with model: @admin_user, url: spree.admin_admin_users_path(token: @invitation.token), method: :post, scope: :admin_user do |f| %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @admin_user } %>
+
+      <div class="rounded border p-3 mb-3 d-flex align-items-center gap-2">
+        <%= render_avatar(@invitation.inviter, height: 32, width: 32) %>
+        <%= @invitation.inviter.name %> has invited you to join <strong><%= @invitation.resource.name %></strong>
+      </div>
+
+      <%= render 'form', f: f %>
+      <div class="form-group">
+        <%= f.label :password %>
+        <%= f.password_field :password, class: 'form-control', required: true %>
+      </div>
+      <div class="form-group">
+        <%= f.label :password_confirmation %>
+        <%= f.password_field :password_confirmation, class: 'form-control', required: true %>
+      </div>
+
+    <%= turbo_save_button_tag(Spree.t('create_a_new_account')) %>
+<% end %>
+