Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Ability to view/edit admin user
Damian Legawiec140b59e63bcd
diff --git a/admin/app/views/spree/admin/admin_users/_audit_log.html.erb b/admin/app/views/spree/admin/admin_users/_audit_log.html.erbnew file mode 100644index 0000000000..8ff5efefda--- /dev/null+++ b/admin/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>diff --git a/admin/app/views/spree/admin/admin_users/_form.html.erb b/admin/app/views/spree/admin/admin_users/_form.html.erbnew file mode 100644index 0000000000..0fde51baf2--- /dev/null+++ b/admin/app/views/spree/admin/admin_users/_form.html.erb@@ -0,0 +1,20 @@+<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>+<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>\ No newline at end of filediff --git a/admin/app/views/spree/admin/admin_users/edit.html.erb b/admin/app/views/spree/admin/admin_users/edit.html.erbindex 75d86968a1..2776d701e5 100644--- a/admin/app/views/spree/admin/admin_users/edit.html.erb+++ b/admin/app/views/spree/admin/admin_users/edit.html.erb@@ -7,3 +7,20 @@<%= @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 pb-0">+ <%= render'spree/admin/shared/error_messages', target: @admin_user %>+ <%= render 'form', f: f %>+ </div>+ <div class="card-footer">+ <%= turbo_save_button_tag Spree.t('actions.update') %>+ </div>+ <% end %>+<% end%>\ No newline at end of filediff --git a/admin/app/views/spree/admin/admin_users/new.html.erb b/admin/app/views/spree/admin/admin_users/new.html.erbindex 04e00875f6..be6bcc5e9e 100644--- a/admin/app/views/spree/admin/admin_users/new.html.erb+++ b/admin/app/views/spree/admin/admin_users/new.html.erb@@ -18,26 +18,7 @@<%= @invitation.inviter.name %> has invited you to join <strong><%= @invitation.resource.name %></strong></div>- <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>- <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>+ <%= render 'form', f: f %></div><div class="card-footer"><%= turbo_save_button_tag(Spree.t('create_a_new_account')) %>diff --git a/admin/app/views/spree/admin/admin_users/show.html.erb b/admin/app/views/spree/admin/admin_users/show.html.erbindex be7692bf76..66e5fe430b 100644--- a/admin/app/views/spree/admin/admin_users/show.html.erb+++ b/admin/app/views/spree/admin/admin_users/show.html.erb@@ -5,4 +5,109 @@<%= content_for :title do %><%= @admin_user.name %>-<% end %>\ No newline at end of file+<% end %>++<div class="row">+ <div class="col-lg-8">+ <div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title">+ <%= icon 'history', class: 'mr-1' %>+ <%= Spree.t(:audit_log) %>+ </h5>+ </div>+ <div class="card-body">+ <%= render 'audit_log' %>+ </div>+ </div>+ </div>++ <div class="col-lg-4">+ <div class="card mb-4" id="user-details">+ <%= 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_with_icon 'edit', Spree.t(:edit), spree.edit_admin_admin_user_path(@admin_user), class: 'btn btn-light btn-sm', data: { turbo_frame: :edit_user } %>+ </div>+ <div class="card-body p-0">+ <ul class="list-group list-group-flush">+ <li class="list-group-item d-flex justify-content-between align-items-center">+ <%= Spree.t(:email) %>+ <span>+ <%= @admin_user.email %>+ </span>+ </li>+ <li class="list-group-item d-flex justify-content-between align-items-center">+ <%= Spree.t(:name) %>+ <span>+ <%= @admin_user.name %>+ </span>+ </li>+ <li class="list-group-item d-flex justify-content-between align-items-center">+ <%= Spree.t(:roles) %>+ <span>+ <% @admin_user.spree_roles.each do |role| %>+ <span class="tag small"><%= role.name %></span>+ <% end %>+ </span>+ </li>+ <% if @admin_user.respond_to?(:sign_in_count) %>+ <li class="list-group-item d-flex justify-content-between align-items-center">+ <%= Spree.t(:sign_in_count) %>+ <span>+ <%= @admin_user.sign_in_count %>+ </span>+ </li>+ <% end %>+ <% if @admin_user.respond_to?(:last_sign_in_at) %>+ <li class="list-group-item d-flex justify-content-between align-items-center">+ <%= Spree.t(:last_sign_in) %>+ <span>+ <% if @admin_user.last_sign_in_at %>+ <%= local_time(@admin_user.last_sign_in_at) %>+ <% else %>+ <%= Spree.t(:not_available) %>+ <% end %>+ </span>+ </li>+ <% end %>+ <% if @admin_user.respond_to?(:current_sign_in_at) %>+ <li class="list-group-item d-flex justify-content-between align-items-center">+ <%= Spree.t(:current_sign_in) %>+ <span>+ <% if @admin_user.current_sign_in_at %>+ <%= local_time(@admin_user.current_sign_in_at) %>+ <% else %>+ <%= Spree.t(:not_available) %>+ <% end %>+ </span>+ </li>+ <% end %>+ <li class="list-group-item d-flex justify-content-between align-items-center">+ <%= Spree.t(:created_at) %>+ <span>+ <%= local_time(@admin_user.created_at) %>+ </span>+ </li>+ <li class="list-group-item d-flex justify-content-between align-items-center">+ <%= Spree.t(:updated_at) %>+ <span>+ <%= local_time(@admin_user.updated_at) %>+ </span>+ </li>+ <% if @admin_user.invited_by %>+ <li class="list-group-item d-flex justify-content-between align-items-center">+ <%= Spree.t(:invited_by) %>+ <span>+ <%= @admin_user.invited_by.name %>+ </span>+ </li>+ <% end %>+ </ul>+ </div>+ <% end %>+ </div>+ </div>+</div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/invitations/_invitation.html.erb b/admin/app/views/spree/admin/invitations/_invitation.html.erbindex 53a90dba7e..18d323d512 100644--- a/admin/app/views/spree/admin/invitations/_invitation.html.erb+++ b/admin/app/views/spree/admin/invitations/_invitation.html.erb@@ -34,13 +34,13 @@<%= icon('dots', class: 'mr-0') %></button><div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<%= invitation.id %>">- <%= link_to_with_icon 'copy', Spree.t(:copy_invitation_link), '#',+ <%= link_to_with_icon 'copy', Spree.t(:copy_link), '#',class: "dropdown-item",data: { action: "clipboard#copy" } %>- <%= link_to_with_icon 'send', Spree.t(:resend_invitation), spree.resend_admin_invitation_path(invitation),+ <%= link_to_with_icon 'send', Spree.t('actions.resend'), spree.resend_admin_invitation_path(invitation),class: "dropdown-item",data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>- <%= link_to_with_icon 'trash', Spree.t(:revoke), spree.revoke_admin_invitation_path(invitation),+ <%= link_to_with_icon 'trash', Spree.t('actions.revoke'), spree.revoke_admin_invitation_path(invitation),class: "dropdown-item btn-danger",data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %></div>diff --git a/admin/app/views/spree/admin/invitations/index.html.erb b/admin/app/views/spree/admin/invitations/index.html.erbindex b11d0cad14..632e638fe1 100644--- a/admin/app/views/spree/admin/invitations/index.html.erb+++ b/admin/app/views/spree/admin/invitations/index.html.erb@@ -6,7 +6,7 @@<thead><tr><th class="rounded-lg-top-left"><%= Spree.t(:email) %></th>- <th><%= Spree.t(:inviter) %></th>+ <th><%= I18n.t('activerecord.attributes.spree/invitation.inviter') %></th><th><%= Spree.t(:roles) %></th><th><%= Spree.t(:status) %></th><th class="rounded-lg-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>diff --git a/admin/app/views/spree/admin/invitations/new.html.erb b/admin/app/views/spree/admin/invitations/new.html.erbindex c3fd1656b6..7cabb6808b 100644--- a/admin/app/views/spree/admin/invitations/new.html.erb+++ b/admin/app/views/spree/admin/invitations/new.html.erb@@ -12,7 +12,7 @@</div><% if can?(:manage, Spree::Role) %><div class="form-group">- <%= f.label :role, Spree.t(:role) %>+ <%= f.label :role, Spree.t(:roles) %><%= f.select :role_ids, @roles.map { |role| [role.name, role.id] }, {}, { data: { controller: 'autocomplete-select', 'enable-button-target': 'input' }, multiple: true, required: true } %></div><% end %>diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rbindex d328496f6f..0f3c1b5b8d 100644--- a/core/app/models/concerns/spree/user_methods.rb+++ b/core/app/models/concerns/spree/user_methods.rb@@ -116,6 +116,10 @@ module Spreeorders.complete.none?end+ def invited_by+ invitations.first&.inviter+ end+privatedef check_completed_ordersdiff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 49798090e3..2d1ef32984 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -52,6 +52,9 @@ en:year: Yearspree/inventory_unit:state: State+ spree/invitation:+ inviter: Inviter+ expires_at: Expires atspree/line_item:price: Pricequantity: Quantity@@ -529,7 +532,6 @@ en:accepts_email_marketing: Accepts email marketingaccount: Accountaccount_info: Account info- account_members: Teamaction: Actionactions:approve: Approve@@ -549,7 +551,9 @@ en:receive: Mark as receivedrefund: Refundreject: Reject+ resend: Resendresolve: Mark as resolved+ revoke: Revokesave: Saveselect_file: Select filesend_invitation: Send invitation@@ -1143,6 +1147,7 @@ en:thanks: Thank you,invitation_resent: Invitation resent!invitation_revoked: Invitation revoked!+ invitations: Invitationsis_not_available_to_shipment_address: is not available to shipment addressiso: ISO Alpha-2iso3: ISO Alpha-3@@ -1530,6 +1535,7 @@ en:pending_sale: Pending Salepercent: Percentpercent_per_item: Percent Per Item+ permissions: Permissionspermalink: Permalinkpersonal_details: Personal detailsphone: Phone