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
UI fixes, consistent translations team->users
Damian Legawieca38a36226daa
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scssindex 2f8abbc635..d3eaec90eb 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss@@ -40,6 +40,16 @@ turbo-frame[loading] .spinner-border, turbo-frame[busy] .spinner-border {display: none;}+ .store-dropdown {+ border-bottom: 1px solid $border-color;+ padding-bottom: 0.5rem;+ display: flex;+ align-items: center;+ justify-content: space-between;+ padding-right: 0.5rem;+ background-color: $gray-25;+ }+.nav {padding-left: 0.75rem;padding-right: 0.75rem;diff --git a/admin/app/views/spree/admin/admin_users/edit.html.erb b/admin/app/views/spree/admin/admin_users/edit.html.erbindex 631856da29..1e77f066ec 100644--- a/admin/app/views/spree/admin/admin_users/edit.html.erb+++ b/admin/app/views/spree/admin/admin_users/edit.html.erb@@ -15,7 +15,7 @@<%= 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">+ <div class="card-body"><%= render'spree/admin/shared/error_messages', target: @admin_user %><%= render 'form', f: f %><% if can?(:manage, Spree::Role) %>diff --git a/admin/app/views/spree/admin/admin_users/show.html.erb b/admin/app/views/spree/admin/admin_users/show.html.erbindex 66e5fe430b..86de31e7cc 100644--- a/admin/app/views/spree/admin/admin_users/show.html.erb+++ b/admin/app/views/spree/admin/admin_users/show.html.erb@@ -55,7 +55,7 @@</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) %>+ <%= I18n.t('activerecord.attributes.user.sign_in_count') %><span><%= @admin_user.sign_in_count %></span>@@ -63,7 +63,7 @@<% 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) %>+ <%= I18n.t('activerecord.attributes.user.last_sign_in') %><span><% if @admin_user.last_sign_in_at %><%= local_time(@admin_user.last_sign_in_at) %>@@ -75,7 +75,7 @@<% 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) %>+ <%= I18n.t('activerecord.attributes.user.current_sign_in') %><span><% if @admin_user.current_sign_in_at %><%= local_time(@admin_user.current_sign_in_at) %>diff --git a/admin/app/views/spree/admin/invitations/new.html.erb b/admin/app/views/spree/admin/invitations/new.html.erbindex 7cabb6808b..d1d94c9524 100644--- a/admin/app/views/spree/admin/invitations/new.html.erb+++ b/admin/app/views/spree/admin/invitations/new.html.erb@@ -17,7 +17,7 @@</div><% end %><div class="form-group">- <%= f.label :expires_at, Spree.t(:expires_at) %>+ <%= f.label :expires_at %><%= f.date_field :expires_at, class: 'form-control', required: true, data: { 'enable-button-target': 'input' } %></div></div>diff --git a/admin/app/views/spree/admin/pages/index.html.erb b/admin/app/views/spree/admin/pages/index.html.erbindex a82d08c2c9..04cedf2c6a 100644--- a/admin/app/views/spree/admin/pages/index.html.erb+++ b/admin/app/views/spree/admin/pages/index.html.erb@@ -13,7 +13,7 @@<thead><tr><th><%= Spree.t(:name) %></th>- <th><%= Spree.t(:updated) %></th>+ <th><%= Spree.t(:updated_at) %></th></tr></thead><tbody>diff --git a/admin/app/views/spree/admin/shared/_team_nav.html.erb b/admin/app/views/spree/admin/shared/_team_nav.html.erbindex 6474396811..b5ed755f07 100644--- a/admin/app/views/spree/admin/shared/_team_nav.html.erb+++ b/admin/app/views/spree/admin/shared/_team_nav.html.erb@@ -1,7 +1,7 @@-<% content_for :page_title, Spree.t(:team) %>+<% content_for :page_title, Spree.t(:users) %><%= content_for(:page_tabs) do %>- <%= nav_item(Spree.t(:team), spree.admin_admin_users_path) if can?(:manage, Spree.admin_user_class) %>+ <%= nav_item(Spree.t(:users), spree.admin_admin_users_path) if can?(:manage, Spree.admin_user_class) %><%= nav_item(Spree.t(:invitations), spree.admin_invitations_path) if can?(:manage, Spree::Invitation) %><%= nav_item(Spree.t(:roles), spree.admin_roles_path) if can?(:manage, Spree::Role) %><% end %>diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erbindex 6d5284e0d3..9524d73507 100644--- a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb@@ -31,7 +31,7 @@</div><% end %>-<div class="border-bottom border-bottom-dashed pb-2 d-flex align-items-center justify-content-between pr-1" id="store-menu" data-turbo-permanent>+<div class="store-dropdown sticky-top" id="store-menu" data-turbo-permanent><div class="dropdown"><button type="button" class="btn d-flex align-items-center justify-content-between text-left dropdown-toggle d-flex align-items-center gap-2"data-toggle="dropdown" aria-expanded="false">diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erbindex 3017b30f1f..c03dec6b14 100644--- a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb@@ -6,7 +6,7 @@<% if can?(:manage, current_store) %><%= nav_item(Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), icon: 'building-store', active: params[:section] == 'general-settings') %>- <%= nav_item(Spree.t(:team), spree.admin_admin_users_path, icon: 'users', active: %w[admin_users invitations roles].include?(controller_name)) if can?(:manage, Spree.admin_user_class) %>+ <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users', active: %w[admin_users invitations roles].include?(controller_name)) if can?(:manage, Spree.admin_user_class) %><%= nav_item(Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), icon: 'send', active: params[:section] == 'emails') %><%= nav_item(Spree.t(:policies), spree.edit_admin_store_path(section: 'policies'), icon: 'list-check', active: params[:section] == 'policies') %><%= nav_item(Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), icon: 'shopping-cart', active: params[:section] == 'checkout') %>@@ -137,7 +137,7 @@<% if can?(:manage, current_store) %><li class="nav-item border-top border-top-dashed my-1"></li><%= nav_item(Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), icon: 'settings', active: params[:section] == 'general-settings') %>- <%= nav_item(Spree.t(:team), spree.admin_admin_users_path, icon: 'users') %>+ <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users') %><% end %></ul><% end %>diff --git a/admin/app/views/spree/admin/themes/_theme.html.erb b/admin/app/views/spree/admin/themes/_theme.html.erbindex 22e0707abe..d816729b7a 100644--- a/admin/app/views/spree/admin/themes/_theme.html.erb+++ b/admin/app/views/spree/admin/themes/_theme.html.erb@@ -7,7 +7,7 @@<strong><%= theme.name %></strong><p class="mb-0 mt-1"><span class="text-muted">- <%= Spree.t(:updated) %>:+ <%= Spree.t(:updated_at) %>:<%= local_time_ago(theme.updated_at, class: 'with-tip') %></span></p>diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 2d1ef32984..d5caaa40e1 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -53,8 +53,8 @@ en:spree/inventory_unit:state: Statespree/invitation:- inviter: Inviterexpires_at: Expires at+ inviter: Inviterspree/line_item:price: Pricequantity: Quantity@@ -197,6 +197,10 @@ en:spree/zone:description: Descriptionname: Name+ user:+ current_sign_in: Current sign in at+ last_sign_in: Last sign in at+ sign_in_count: Sign in counterrors:messages:blank: can't be blank@@ -832,8 +836,8 @@ en:create_new_order: Create new ordercreate_new_team: Create new teamcreate_reimbursement: Create reimbursement- created_at: Created At- created_by: Created By+ created_at: Created at+ created_by: Created bycredit: Creditcredit_allowed: Credit allowedcredit_card: Credit Card@@ -1146,8 +1150,8 @@ en:subject: Invitation to join %{resource_name}thanks: Thank you,invitation_resent: Invitation resent!- invitation_revoked: Invitation revoked!invitations: Invitations+ invited_by: Invited byis_not_available_to_shipment_address: is not available to shipment addressiso: ISO Alpha-2iso3: ISO Alpha-3@@ -1535,8 +1539,8 @@ en:pending_sale: Pending Salepercent: Percentpercent_per_item: Percent Per Item- permissions: Permissionspermalink: Permalink+ permissions: Permissionspersonal_details: Personal detailsphone: Phoneplace_order: Place Order@@ -2159,7 +2163,7 @@ en:update_billing_address: Update billing addressupdate_contact_information: Update contact informationupdate_shipping_address: Update shipping address- updated: Updated+ updated_at: Updated atupdating: Updatingupload_image: Upload imageurl: URL