spree_admin 5.5.3 → 5.6.0.rc1

data/app/views/spree/admin/stores/form/_emails.html.erb

@@ -14,11 +14,11 @@
 
 <div class="card mb-6">
   <div class="card-header">
-    <h5 class="card-title">Email addresses</h5>
+    <h5 class="card-title"><%= Spree.t('admin.store_form.email_addresses') %></h5>
   </div>
   <div class="card-body">
     <p class="text-gray-600">
-      Please provide the email address that will be used as the sender of all emails sent from your store.
+      <%= Spree.t('admin.store_form.mail_from_address_help') %>
     </p>
 
     <%= f.spree_email_field :mail_from_address, required: true %>
@@ -32,12 +32,10 @@
     <h5 class="card-title"><%= Spree.t(:logo) %></h5>
   </div>
   <div class="card-body">
-    <p class="text-gray-600">This logo is included in all email notifications such as order confirmation</p>
+    <p class="text-gray-600"><%= Spree.t('admin.store_form.mailer_logo_help') %></p>
     <%= f.spree_file_field :mailer_logo, width: 204, height: 104 %>
     <p class="form-text mb-0 mt-2">
-      We recommend images with a transparent background.
-      <br />
-      Only JPEG and PNG formats are supported.
+      <%= Spree.t('admin.store_form.mailer_logo_format_hint') %>
     </p>
   </div>
 </div>

data/app/views/spree/admin/tables/_table.html.erb

@@ -3,7 +3,8 @@
 <% columns = table.visible_columns(selected_columns, self) %>
 <% current_sort = params.dig(:q, :s) %>
 <% search_param = table.respond_to?(:search_param) ? table.search_param : :name_cont %>
-<% search_placeholder = (table.respond_to?(:search_placeholder) && table.search_placeholder) || [Spree.t(:search), controller_name.humanize.downcase].join(' ') %>
+<% resource_name = table.model_class ? table.model_class.model_name.human(count: 2) : controller_name.humanize %>
+<% search_placeholder = (table.respond_to?(:search_placeholder) && table.search_placeholder) || Spree.t('admin.search_placeholder', resource: resource_name) %>
 <% date_range_param = table.date_range_param %>
 
 <%= turbo_frame_tag frame_name, data: { turbo_action: 'advance' } do %>
@@ -15,7 +16,7 @@
       <div class="flex flex-col lg:flex-row gap-3 items-start lg:items-center justify-between">
         <div class="flex gap-2 items-center flex-wrap">
           <%= search_form_for @search, url: url_for, html: { data: { turbo_frame: frame_name, turbo_action: 'advance', controller: 'auto-submit search-clear', auto_submit_delay_value: 300 } } do |f| %>
-            <div class="form-input flex items-center py-0 pr-1 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 lg:w-[300px] mr-auto h-[2rem] transition-all duration-100 ease-in-out">
+            <div class="form-input flex items-center py-0 pr-1 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 lg:w-[300px] me-auto h-[2rem] transition-all duration-100 ease-in-out">
               <%= icon "search", class: "mr-4 text-gray-600 shrink-0" %>
               <%= search_field_tag "q[#{search_param}]",
                                    params.dig(:q, search_param),

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

@@ -85,7 +85,7 @@
         <%= f.spree_file_field :image, width: 1920, height: 1080 %>
       </div>
       <div class="card-body">
-        <%= f.spree_file_field :square_image, width: 400, height: 400, crop: true, help: "Used for the featured image on the homepage." %>
+        <%= f.spree_file_field :square_image, width: 400, height: 400, crop: true, help: Spree.t('admin.taxons.square_image_help') %>
       </div>
     </div>
 
@@ -113,6 +113,6 @@
           slug_attribute_name: :permalink_part,
           slug: @permalink_part,
           slug_path: ['t', @parent_permalink.presence].compact.join('/'),
-          placeholder: 'Add a title and description to see how this taxon might appear in a search engine listing' %>
+          placeholder: Spree.t('admin.taxons.seo.placeholder') %>
   </div>
 </div>

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

@@ -1,10 +1,10 @@
 <% content_for(:title, Spree.t(:login)) %>
 
-<h1 class="mb-4 font-light">Welcome back</h1>
+<h1 class="mb-4 font-light"><%= Spree.t('admin.user_sessions.welcome_back') %></h1>
 <%= form_for resource, as: resource_name, url: session_path(resource_name), data: { controller: 'enable-button', turbo: false } do |f| %>
   <div class="form-group mb-4">
     <%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>
-    <%= f.email_field :email, required: true, class: 'form-input form-input-lg', placeholder: 'steve@getvendo.com', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>
+    <%= f.email_field :email, required: true, class: 'form-input form-input-lg', placeholder: Spree.t('admin.user_sessions.email_placeholder'), data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>
   </div>
   <div class="form-group mb-4">
     <%= f.label :password, Spree.t(:password), required: true, class: 'form-label' %>
@@ -14,3 +14,12 @@
   <%= turbo_save_button_tag Spree.t(:login), class: 'btn btn-primary btn-lg w-full' %>
 <% end %>
 
+<% if admin_locales_options.many? %>
+  <%= form_tag new_session_path(resource_name), method: :get, class: 'form-group mt-4', data: { turbo: false } do %>
+    <%= label_tag :locale, Spree.t(:language), class: 'form-label' %>
+    <%= select_tag :locale,
+          options_for_select(admin_locales_options, params[:locale] || I18n.locale.to_s),
+          onchange: 'this.form.requestSubmit()', class: 'form-select' %>
+  <% end %>
+<% end %>
+

data/app/views/spree/admin/users/_tabs.html.erb

@@ -2,7 +2,7 @@
   <ul class="nav nav-pills mb-4" role="tablist">
     <% if spree.respond_to?(:admin_user_visits_path) %>
       <li class="nav-item" role="presentation">
-        <a class="nav-link active" id="pills-overview-tab" data-tabs-target="tab" data-action="click->tabs#select" role="tab" aria-controls="pills-overview" aria-selected="true">Timeline</a>
+        <a class="nav-link active" id="pills-overview-tab" data-tabs-target="tab" data-action="click->tabs#select" role="tab" aria-controls="pills-overview" aria-selected="true"><%= Spree.t('admin.users.timeline') %></a>
       </li>
     <% end %>
 

data/app/views/spree/admin/variants/_search_result.html.erb

@@ -17,7 +17,7 @@
     <div class="w-20">
       <% if params[:stock_location_id].present? %>
         <% stock_item = variant.stock_items.find { |si| si.stock_location_id == params[:stock_location_id] } %>
-        <span><%= stock_item&.count_on_hand || 0 %> at location</span>
+        <span><%= Spree.t('admin.variants.count_at_location', count: stock_item&.count_on_hand || 0) %></span>
         <% if stock_item&.backorderable? %> <span class="text-gray-600"><%= Spree.t(:backorderable) %></span><% end %>
       <% else %>
         <%= display_inventory(variant) %>

data/app/views/spree/admin/variants/_variant.html.erb

@@ -5,7 +5,7 @@
     <% variant_url = spree.edit_admin_product_variant_path(variant.product, variant) %>
   <% end %>
 
-  <%= link_to variant_url, id: dom_id(variant, 'spree'), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'flex items-center justify-start no-underline' do %>
+  <%= link_to variant_url, id: dom_id(variant, 'spree'), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'flex items-center justify-start no-underline gap-2' do %>
     <%= render "spree/admin/shared/product_image", object: variant %>
     <div class="ml-6">
       <strong><%= variant.name %></strong>

data/app/views/spree/admin/variants/form/_inventory.html.erb

@@ -7,6 +7,23 @@
   <div class="card-body p-0" data-controller="reveal" data-reveal-hidden-class="hidden!">
     <div class="p-3">
       <%= f.spree_check_box :track_inventory, data: { action: 'change->reveal#toggle' } %>
+      <div class="mt-2">
+        <%= f.spree_check_box :preorderable, label: Spree.t('admin.variants_form.preorderable_label') %>
+        <small class="text-muted text-xs d-block"><%= Spree.t('admin.variants_form.preorderable_hint') %></small>
+      </div>
+      <div class="mt-2">
+        <%# datetime-local inputs have no timezone; render in the store's timezone so admins see and submit store-local times (parsed back in VariantsController#permitted_resource_params). %>
+        <% preorder_ships_at_local = f.object.preorder_ships_at&.in_time_zone(current_timezone)&.strftime('%Y-%m-%dT%H:%M') %>
+        <%= f.spree_datetime_field :preorder_ships_at,
+              value: preorder_ships_at_local,
+              label: Spree.t('admin.variants_form.preorder_ships_at_label'),
+              help: "#{Spree.t('admin.variants_form.preorder_ships_at_hint')} #{Spree.t('admin.datetime_field_timezone_help', zone: current_timezone.name)}" %>
+      </div>
+      <div class="mt-2">
+        <%= f.spree_number_field :backorder_limit, min: 0,
+              label: Spree.t('admin.variants_form.backorder_limit_label'),
+              help: Spree.t('admin.variants_form.backorder_limit_hint') %>
+      </div>
     </div>
 
     <table class="table border-t <%= 'hidden!' unless f.object.track_inventory? %>" data-reveal-target="item">

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

@@ -3,8 +3,8 @@
     <h5 class="card-title"><%= Spree.t('admin.webhook_endpoints.endpoint_settings') %></h5>
   </div>
   <div class="card-body">
-    <%= f.spree_text_field :name, placeholder: 'e.g. Storefront emails, Fulfillment service' %>
-    <%= f.spree_text_field :url, required: true, autofocus: f.object.new_record?, placeholder: 'https://example.com/webhooks' %>
+    <%= f.spree_text_field :name, placeholder: Spree.t('admin.webhook_endpoints.name_placeholder') %>
+    <%= f.spree_text_field :url, required: true, autofocus: f.object.new_record?, placeholder: Spree.t('admin.webhook_endpoints.url_placeholder') %>
     <%= f.spree_check_box :active %>
   </div>
 </div>

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

@@ -9,7 +9,7 @@
 
 <% content_for :page_alerts do %>
   <div class="alert alert-info">
-    Zones are geographical groupings, they represent collections of either states or countries.
+    <%= Spree.t('admin.zones.info') %>
   </div>
 <% end %>
 

data/config/i18n-tasks.yml

@@ -156,9 +156,12 @@ ignore_unused:
   - 'spree.admin.bulk_ops.users.title.*'
   - 'spree.admin.display_on_options.*'
   - 'spree.admin.order.events.*'
+  - 'spree.admin.orders.avs_responses.*'
+  - 'spree.admin.orders.cvv_responses.*'
   - 'spree.admin.orders.no_email_present'
   - 'spree.admin.orders.payment_link_sent'
   - 'spree.admin.store_setup_tasks.*'
+  - 'spree.admin.table.operators.*'
   - 'spree.admin.taxon_rules.*'
   - 'spree.admin.webhooks_subscribers.*'
 

data/config/initializers/spree_admin_navigation.rb

@@ -251,6 +251,15 @@ Rails.application.config.after_initialize do
           active: -> { controller_name == 'policies' },
           if: -> { can?(:manage, Spree::Policy) }
 
+  # Storefront setup
+  settings_nav.add :storefront,
+          label: 'admin.storefront',
+          url: :admin_storefront_path,
+          icon: 'building-store',
+          position: 60,
+          active: -> { controller_name == 'storefront' },
+          if: -> { can?(:update, current_store) }
+
   # Channels
   settings_nav.add :channels,
           label: :channels,

data/config/initializers/spree_admin_tables.rb

@@ -35,9 +35,9 @@ Rails.application.config.after_initialize do
                                         position: 20,
                                         partial: 'spree/admin/tables/columns/product_status',
                                         value_options: [
-                                          { value: 'draft', label: 'Draft' },
-                                          { value: 'active', label: 'Active' },
-                                          { value: 'archived', label: 'Archived' }
+                                          { value: 'draft', label: 'admin.products.draft' },
+                                          { value: 'active', label: 'admin.products.active' },
+                                          { value: 'archived', label: 'admin.products.archived' }
                                         ]
 
   # Inventory display (custom partial)
@@ -90,7 +90,7 @@ Rails.application.config.after_initialize do
 
   # Stock filter (filter-only, not displayed as column)
   Spree.admin.tables.products.add :in_stock,
-                                        label: 'In Stock',
+                                        label: 'admin.products.in_stock',
                                         type: :boolean,
                                         filter_type: :boolean,
                                         sortable: false,
@@ -293,7 +293,7 @@ Rails.application.config.after_initialize do
                                       default: false,
                                       position: 90,
                                       operators: %i[eq not_eq in not_in],
-                                      value_options: -> { Spree::Order.state_machine(:state).states.map { |s| { value: s.name.to_s, label: s.name.to_s.humanize } } }
+                                      value_options: -> { Spree::Order.state_machine(:state).states.map { |s| { value: s.name.to_s, label: Spree.t("state_machine_states.#{s.name}", default: s.name.to_s.humanize) } } }
 
   Spree.admin.tables.orders.add :email,
                                       label: :email,
@@ -414,7 +414,7 @@ Rails.application.config.after_initialize do
                                         default: true,
                                         position: 40,
                                         operators: %i[eq not_eq in not_in],
-                                        value_options: -> { Spree::Order.state_machine(:state).states.map { |s| { value: s.name.to_s, label: s.name.to_s.humanize } } }
+                                        value_options: -> { Spree::Order.state_machine(:state).states.map { |s| { value: s.name.to_s, label: Spree.t("state_machine_states.#{s.name}", default: s.name.to_s.humanize) } } }
 
   Spree.admin.tables.checkouts.add :item_count,
                                         label: :item_count,
@@ -489,6 +489,7 @@ Rails.application.config.after_initialize do
                                      ransack_attribute: 'addresses_country_name',
                                      operators: %i[eq],
                                      search_url: ->(view_context) { view_context.spree.select_options_admin_countries_path(format: :json) },
+                                     preload_options: true,
                                      partial: 'spree/admin/tables/columns/user_location'
 
   # Number of orders
@@ -1295,8 +1296,8 @@ Rails.application.config.after_initialize do
                                                  position: 20,
                                                  filter_type: :select,
                                                  value_options: [
-                                                   { value: 'true', label: 'Active' },
-                                                   { value: 'false', label: 'Inactive' }
+                                                   { value: 'true', label: 'price_list_statuses.active' },
+                                                   { value: 'false', label: 'price_list_statuses.inactive' }
                                                  ]
 
   Spree.admin.tables.webhook_endpoints.add :health,
@@ -1439,8 +1440,8 @@ Rails.application.config.after_initialize do
                                         partial: 'spree/admin/tables/columns/api_key_type',
                                         filter_type: :select,
                                         value_options: [
-                                          { value: 'publishable', label: 'Publishable' },
-                                          { value: 'secret', label: 'Secret' }
+                                          { value: 'publishable', label: 'admin.api_keys.key_types.publishable' },
+                                          { value: 'secret', label: 'admin.api_keys.key_types.secret' }
                                         ]
 
   Spree.admin.tables.api_keys.add :status,
@@ -1499,10 +1500,10 @@ Rails.application.config.after_initialize do
                                            position: 20,
                                            partial: 'spree/admin/tables/columns/price_list_status',
                                            value_options: [
-                                             { value: 'draft', label: 'Draft' },
-                                             { value: 'active', label: 'Active' },
-                                             { value: 'scheduled', label: 'Scheduled' },
-                                             { value: 'inactive', label: 'Inactive' }
+                                             { value: 'draft', label: 'price_list_statuses.draft' },
+                                             { value: 'active', label: 'price_list_statuses.active' },
+                                             { value: 'scheduled', label: 'price_list_statuses.scheduled' },
+                                             { value: 'inactive', label: 'price_list_statuses.inactive' }
                                            ]
 
   Spree.admin.tables.price_lists.add :starts_at,
@@ -1561,7 +1562,7 @@ Rails.application.config.after_initialize do
                                                    position: 20,
                                                    partial: 'spree/admin/tables/columns/product_status',
                                                    ransack_attribute: 'status',
-                                                   value_options: -> { Spree::Product::STATUSES.map { |s| { value: s, label: s.humanize } } }
+                                                   value_options: -> { Spree::Product::STATUSES.map { |s| { value: s, label: Spree.t("admin.products.#{s}", default: s.humanize) } } }
 
   Spree.admin.tables.price_list_products.add :inventory,
                                                    label: :inventory,
@@ -1713,7 +1714,8 @@ Rails.application.config.after_initialize do
                                        type: :string,
                                        sortable: true,
                                        default: true,
-                                       position: 30
+                                       position: 30,
+                                       format: 'locale_display_label'
 
   Spree.admin.tables.markets.add :default,
                                        label: :default,
@@ -1745,8 +1747,8 @@ Rails.application.config.after_initialize do
                                             default: true,
                                             position: 20,
                                             value_options: [
-                                              { value: 'unused', label: 'Unused' },
-                                              { value: 'used', label: 'Used' }
+                                              { value: 'unused', label: 'admin.coupon_codes.unused' },
+                                              { value: 'used', label: 'admin.coupon_codes.used' }
                                             ]
 
   Spree.admin.tables.coupon_codes.add :created_at,