spree_admin 5.5.3 → 5.6.0.rc1

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

@@ -5,7 +5,7 @@
     </h5>
   </div>
   <div class="card-body">
-    <%= f.spree_text_field :name, required: true, autofocus: true, help: 'Customers will see this in their cart and at checkout.' %>
+    <%= f.spree_text_field :name, required: true, autofocus: true, help: Spree.t('admin.promotions.name_help') %>
   </div>
 </div>
 
@@ -32,5 +32,5 @@
 </div>
 
 <p class="alert alert-info text-center">
-  In the next step you will be able to add actions and rules to your promotion
+  <%= Spree.t('admin.promotions.next_step_info') %>
 </p>

data/app/views/spree/admin/promotions/_sidebar.html.erb

@@ -18,7 +18,7 @@
           <%= Spree.t(:used) %>: <%= used_coupon_codes_count %> / <%= coupon_codes_count %>
         </span>
         <span class="badge badge-light">
-          Remaining: <%= coupon_codes_count - used_coupon_codes_count %>
+          <%= Spree.t(:remaining) %>: <%= coupon_codes_count - used_coupon_codes_count %>
         </span>
       </div>
     </div>

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

@@ -15,14 +15,14 @@
           <%= f.text_field :name, class: 'form-input', required: true, autofocus: true %>
           <%= f.error_message_on :name %>
           <span class="form-text mt-2">
-            Customers will see this in their cart and at checkout.
+            <%= Spree.t('admin.promotions.name_help') %>
           </span>
         </div>
 
         <% if @promotion.coupon_code? && !@promotion.multi_codes? %>
           <div class="form-group">   
             <%= f.label :code %>
-            <%= f.text_field :code, class: 'form-input uppercase', placeholder: 'Your coupon code' %>
+            <%= f.text_field :code, class: 'form-input uppercase', placeholder: Spree.t('admin.promotions.coupon_code_placeholder') %>
           </div>
         <% end %>
       </div>

data/app/views/spree/admin/promotions/form/_kind.html.erb

@@ -8,40 +8,40 @@
         <div class="custom-control custom-radio">
           <%= f.radio_button :multi_codes, false, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %>
           <%= f.label :multi_codes_false, class: 'custom-control-label flex-col items-start' do %>
-            One code for all customers
+            <%= Spree.t('admin.promotions.kind.one_code_label') %>
             <span class="form-text font-normal">
-              You can limit the number of times this code can be used.
+              <%= Spree.t('admin.promotions.kind.one_code_help') %>
             </span>
           <% end %>
         </div>
         <div data-reveal-target="item" class="mt-2 ml-6 <% if @promotion.multi_codes? %>hidden<% end %>">
-          <%= f.text_field :code, class: 'form-input uppercase', placeholder: 'Your coupon code' %>
+          <%= f.text_field :code, class: 'form-input uppercase', placeholder: Spree.t('admin.promotions.coupon_code_placeholder') %>
         </div>
 
         <div class="mt-6 custom-control custom-radio">
           <%= f.radio_button :multi_codes, true, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %>
           <%= f.label :multi_codes_true, class: 'custom-control-label flex-col items-start' do %>
-            Generate unique codes
+            <%= Spree.t('admin.promotions.kind.multi_codes_label') %>
             <span class="form-text font-normal">
-              These codes are generated automatically and can be downloaded as a CSV file. Codes are unique and can only be used once.
+              <%= Spree.t('admin.promotions.kind.multi_codes_help') %>
             </span>
           <% end %>
         </div>
         <div data-reveal-target="item" class="ml-6 mt-2 grid gap-3 <% unless @promotion.multi_codes? %>hidden<% end %>">
           <div>
-            <%= f.text_field :code_prefix, class: 'form-input uppercase', placeholder: 'Coupon Prefix (optional)' %>
+            <%= f.text_field :code_prefix, class: 'form-input uppercase', placeholder: Spree.t('admin.promotions.code_prefix_placeholder') %>
             <span class="form-text mt-1">
-              eg. <strong>ABC</strong>
+              <%= Spree.t('admin.promotions.code_prefix_example_html', example: tag.strong('ABC')) %>
             </span>
           </div>
           <div>
             <% minimum_number_of_codes = @promotion.persisted? && @promotion.coupon_codes.count.positive? ? @promotion.coupon_codes.count : 1 %>
             <% maximum_number_of_codes = ENV.fetch('PROMOTION_MAX_NUMBER_OF_CODES', 5000) %>
-            <%= f.number_field :number_of_codes, class: 'form-input', placeholder: 'Number of codes', min: minimum_number_of_codes, max: maximum_number_of_codes, step: 1 %>
+            <%= f.number_field :number_of_codes, class: 'form-input', placeholder: Spree.t('admin.promotions.number_of_codes_placeholder'), min: minimum_number_of_codes, max: maximum_number_of_codes, step: 1 %>
             <span class="form-text mt-1">
-              How many codes you want to generate.
+              <%= Spree.t('admin.promotions.number_of_codes_help') %>
               <% if @promotion.persisted? %>
-                To add more codes just increase this number
+                <%= Spree.t('admin.promotions.add_more_codes_help') %>
               <% end %>
             </span>
           </div>
@@ -55,7 +55,7 @@
     <%= f.label :kind_automatic, Spree.t(:automatic_promotion), class: 'custom-control-label flex-col items-start' do %>
       <%= Spree.t(:automatic_promotion) %>
       <span class="form-text font-normal">
-        This promotion will be automatically applied to all eligible orders.
+        <%= Spree.t('admin.promotions.kind.automatic_help') %>
       </span>
     <% end %>
 

data/app/views/spree/admin/promotions/form/_settings.html.erb

@@ -1,18 +1,17 @@
 <% unless @promotion.multi_codes? %>
-  <%= f.spree_number_field :usage_limit, min: 0, step: 1, help: 'Leave this field blank for unlimited usage.' %>
+  <%= f.spree_number_field :usage_limit, min: 0, step: 1, help: Spree.t('admin.promotions.usage_limit_help') %>
 <% end %>
 
 <%# datetime-local inputs have no timezone; render values in the store's timezone so admins see and submit values in the store's local time. %>
 <%
-  store_timezone   = ActiveSupport::TimeZone[current_store.preferred_timezone] || Time.zone
-  to_store_local   = ->(value) { value&.in_time_zone(store_timezone)&.strftime('%Y-%m-%dT%H:%M') }
+  to_store_local   = ->(value) { value&.in_time_zone(current_timezone)&.strftime('%Y-%m-%dT%H:%M') }
   starts_at_local  = to_store_local.call(@promotion.starts_at)
   expires_at_local = to_store_local.call(@promotion.expires_at)
-  tz_help          = Spree.t('admin.datetime_field_timezone_help', zone: store_timezone.name)
+  tz_help          = Spree.t('admin.datetime_field_timezone_help', zone: current_timezone.name)
 %>
 
 <%= f.spree_datetime_field :starts_at, value: starts_at_local, help: tz_help %>
 
 <%= f.spree_datetime_field :expires_at,
       value: expires_at_local,
-      help: "Leave this field blank for no expiration. #{tz_help}" %>
+      help: Spree.t('admin.promotions.expires_at_help', zone: current_timezone.name) %>

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

@@ -28,8 +28,8 @@
 
     <div class="flex gap-2">
       <%= render 'spree/admin/shared/calendar_range_picker',
-        date_from_value: params[:date_from] || 1.month.ago.in_time_zone(current_store.preferred_timezone).beginning_of_day,
-        date_to_value: params[:date_to] || Time.current.in_time_zone(current_store.preferred_timezone).end_of_day %>
+        date_from_value: params[:date_from] || 1.month.ago.in_time_zone(current_timezone).beginning_of_day,
+        date_to_value: params[:date_to] || Time.current.in_time_zone(current_timezone).end_of_day %>
 
       <div class="form-group">
         <%= select_tag :currency,

data/app/views/spree/admin/shared/_address.html.erb

@@ -23,7 +23,7 @@
         <span class="locality"><%= address.city %></span>
         <span class="region"><%= address.state_text %></span>
         <span class="postal-code"><%= address.zipcode %></span>
-        <div class="country-name"><%= address.country.try(:name) %></div>
+        <div class="country-name"><%= localized_country_name(address.country) if address.country %></div>
       </div>
     </div>
     <% unless address.phone.blank? %>

data/app/views/spree/admin/shared/_analytics_loader_skeleton.html.erb

@@ -4,7 +4,7 @@
         <div class="col-span-6 lg:col-span-4 gap-2">
           <div class="analytics-card-tab active" style="min-height: 82px;">
             <div class="flex justify-center flex-col mb-6 lg:mb-0">
-              <span class="text-sm text-gray-600">Total Sales</span>
+              <span class="text-sm text-gray-600"><%= Spree.t(:total_sales) %></span>
               <span class="text-lg text-gray-900 font-bold mt-1">
                 <%= @sales_total %>
               </span>
@@ -18,7 +18,7 @@
         <div class="col-span-6 lg:col-span-2">
           <div class="analytics-card-tab" >
             <div class="flex justify-center flex-col mb-6 lg:mb-0">
-              <span class="text-sm text-gray-600">Avg. Order Value</span>
+              <span class="text-sm text-gray-600"><%= Spree.t('admin.avg_order_value') %></span>
               <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @orders_average %></span>
               <div>
                 <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: 0 %>
@@ -30,7 +30,7 @@
         <div class="col-span-6 lg:col-span-2">
           <div class="analytics-card-tab" >
             <div class="flex justify-center flex-col mb-6 lg:mb-0">
-              <span class="text-sm text-gray-600">Total Orders</span>
+              <span class="text-sm text-gray-600"><%= Spree.t('admin.total_orders') %></span>
               <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @orders_total  %></span>
               <div>
                 <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: 0 %>
@@ -42,7 +42,7 @@
           <div class="col-span-6 lg:col-span-2">
             <div class="analytics-card-tab" >
               <div class="flex justify-center flex-col">
-                <span class="text-sm text-gray-600">Visits</span>
+                <span class="text-sm text-gray-600"><%= Spree.t(:visits) %></span>
                 <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @visits_total %></span>
                 <div>
                   <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: 0 %>
@@ -55,7 +55,7 @@
         <div class="col-span-6 lg:col-span-2">
           <div class="analytics-card-tab" >
             <div class="flex justify-center flex-col">
-              <span class="text-sm text-gray-600">Sign-ups</span>
+              <span class="text-sm text-gray-600"><%= Spree.t('admin.sign_ups') %></span>
               <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @audience_total %></span>
               <div>
                 <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: 0 %>

data/app/views/spree/admin/shared/_calendar_range_picker.html.erb

@@ -7,7 +7,17 @@
 
 <% dropdown_direction ||= 'left' %>
 
-<%= dropdown direction: dropdown_direction, data: { controller: 'dropdown calendar-range', action: 'click->calendar-range#open' }, class: 'h-full', portal: false do %>
+<%# Labels MUST match the order of presets in the easepick preset-plugin (today, yesterday, last 7, last 30, this month, last month) %>
+<% preset_labels = [
+     Spree.t('date_range_presets.today'),
+     Spree.t('date_range_presets.yesterday'),
+     Spree.t('date_range_presets.last_7_days'),
+     Spree.t('date_range_presets.last_30_days'),
+     Spree.t('date_range_presets.this_month'),
+     Spree.t('date_range_presets.last_month')
+   ] %>
+
+<%= dropdown direction: dropdown_direction, data: { controller: 'dropdown calendar-range', action: 'click->calendar-range#open', 'calendar-range-preset-labels-value': preset_labels.to_json }, class: 'h-full', portal: false do %>
   <%= dropdown_toggle class: css_classes do %>
     <%= icon('calendar') %>
     <div data-calendar-range-target="label">

data/app/views/spree/admin/shared/_content_header.html.erb

@@ -13,7 +13,7 @@
     <h3 class="page-header-title mb-0 flex items-center gap-4" id="page_title">
       <%= yield :page_title %>
     </h3>
-    <div id="page_actions" class="ml-auto page-actions flex items-center gap-2">
+    <div id="page_actions" class="ms-auto page-actions flex items-center gap-2">
       <%= yield :page_actions if content_for?(:page_actions) %>
 
       <% if action_name == 'edit' && @object %>
@@ -47,7 +47,7 @@
                   <%= hidden_field_tag :record_number, record.number, data: { clipboard_target: 'source' } %>
                   <button data-action="clipboard#copy" class="text-left dropdown-item" data-clipboard-target="button">
                     <%= icon 'copy' %>
-                    <%= 'Copy number' %>
+                    <%= Spree.t(:copy_number) %>
                   </button>
                 </div>
               <% end %>

data/app/views/spree/admin/shared/_edit_resource_links.html.erb

@@ -3,6 +3,6 @@
 <div class="form-actions">
   <%= turbo_save_button_tag Spree.t('actions.update'), data: { admin_target: 'save' } %>
   <% if f.object.can_be_deleted? && can?(:delete, f.object) %>
-    <%= link_to Spree.t('actions.destroy'), destroy_url, data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: defined?(turbo_frame) ? turbo_frame : '_top' }, class: 'btn btn-danger ml-auto' %>
+    <%= link_to Spree.t('actions.destroy'), destroy_url, data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: defined?(turbo_frame) ? turbo_frame : '_top' }, class: 'btn btn-danger ms-auto' %>
   <% end %>
 </div>

data/app/views/spree/admin/shared/_filters_search_bar.html.erb

@@ -2,7 +2,7 @@
 <% badge_name ||= label %>
 <% placeholder ||= [Spree.t(:search), controller_name.humanize.downcase].join(' ') %>
 
-<div class="form-input flex items-center py-0 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 grow max-lg:max-w-[300px] mr-auto max-lg:mb-4 transition-all duration-100 ease-in-out" id="filters-search-bar">
+<div class="form-input flex items-center py-0 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 grow max-lg:max-w-[300px] me-auto max-lg:mb-4 transition-all duration-100 ease-in-out" id="filters-search-bar">
   <%= icon "search", class: "mr-4 text-gray-600" %>
   <%= search_field_tag "q[#{param}]", params.dig(:q, param), class: "outline-none border-0 h-full focus:border-0 focus:ring-0 p-0 text-base w-full", placeholder: placeholder, data: { filters_target: :input, badge_name: badge_name } %>
 </div>

data/app/views/spree/admin/shared/_growth_rate_badge.html.erb

@@ -2,7 +2,7 @@
 
 <div class="flex">
   <% if growth_rate == 0 %>
-    <svg viewBox="0 0 11 16" height="16" width="11" role="img" class="_SVG_1ou8g_150" tabindex="-1"><title>No change</title><path d="M0.519531 1.79395H12.0039V0.249023H0.519531V1.79395Z" fill="var(--p-icon-subdued, #8c9196)" transform="translate(0, 7)"></path></svg>
+    <svg viewBox="0 0 11 16" height="16" width="11" role="img" class="_SVG_1ou8g_150" tabindex="-1"><title><%= Spree.t('admin.no_change') %></title><path d="M0.519531 1.79395H12.0039V0.249023H0.519531V1.79395Z" fill="var(--p-icon-subdued, #8c9196)" transform="translate(0, 7)"></path></svg>
   <% elsif growth_rate > 0 %>
     <span class="text-green-700">
       <%= icon 'arrow-up', class: 'mr-1 text-base' %>

data/app/views/spree/admin/shared/_head.html.erb

@@ -12,7 +12,7 @@
     <% if @order.present? && @order.persisted? %><%= @order.number %> - <% end %>
     <%= Spree.t(controller_name, default: controller_name.titleize) %>
   <% end %>
-  <% if defined?(current_store) && current_store.present? %>
+  <% if defined?(current_store) && current_store&.name.present? %>
     - <%= current_store.name.capitalize %>
   <% end %>
 </title>
@@ -20,6 +20,9 @@
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css2?family=Geist+Mono:wght@100..900&family=Geist:wght@100..900&display=swap" rel="stylesheet">
+<% if rtl_locale? %>
+<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Arabic:wght@100..900&display=swap" rel="stylesheet">
+<% end %>
 
 <%= stylesheet_link_tag 'spree/admin/application', media: :all, data: { turbo_track: "reload" } %>
 <%= tinymce_assets %>

data/app/views/spree/admin/shared/_index_table_options.html.erb

@@ -12,7 +12,7 @@
           <%= link_to icon('chevron-left', class: 'text-gray-900 mr-0'),
               url_for(request.query_parameters.merge(page: @pagy.previous)),
               class: "btn btn-light p-2",
-              'aria-label': 'Previous page' %>
+              'aria-label': Spree.t('admin.previous_page') %>
         <% else %>
           <button class="btn btn-light p-2 cursor-not-allowed opacity-50" disabled>
             <%= icon('chevron-left', class: 'text-gray-900 mr-0') %>
@@ -23,7 +23,7 @@
           <%= link_to icon('chevron-right', class: 'text-gray-900 mr-0'),
               url_for(request.query_parameters.merge(page: @pagy.next)),
               class: "btn btn-light p-2",
-              'aria-label': 'Next page' %>
+              'aria-label': Spree.t('admin.next_page') %>
         <% else %>
           <button class="btn btn-light p-2 cursor-not-allowed opacity-50" disabled>
             <%= icon('chevron-right', class: 'text-gray-900 mr-0') %>

data/app/views/spree/admin/shared/_media_asset.html.erb

@@ -3,7 +3,7 @@
     <%= check_box_tag "ids[]", asset.id, false, class: "custom-control-input", id: "#{asset.id}-checkbox", data: { media_form_target: "checkbox", action: 'media-form#showDeleteButton' } %>
     <label class="custom-control-label" for="<%= asset.id %>-checkbox"><span></span></label>
   </div>
-  <div class="move-handle text-center hidden ml-auto">
+  <div class="move-handle text-center hidden ms-auto">
     <button class="btn btn-light btn-sm px-1"><%= icon('grip-vertical', class: 'mr-0') %></button>
   </div>
 

data/app/views/spree/admin/shared/_media_form.html.erb

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag 'media-form', class: 'card mb-6', data: { controller: 'media-form', media_form_delete_url_value: spree.bulk_destroy_admin_assets_path(viewable_id: viewable&.id) } do %>
   <div class="card-header">
     <h5 class="card-title mr-2"><%= Spree.t(:media) %></h5>
-    <button type="button" data-media-form-target="deleteButton" class="btn btn-sm btn-danger btn-outline hidden ml-auto" data-action="media-form#deleteSelected">
+    <button type="button" data-media-form-target="deleteButton" class="btn btn-sm btn-danger btn-outline hidden ms-auto" data-action="media-form#deleteSelected">
       <%= icon('trash') %>
       <%= Spree.t(:delete_selected) %>
     </button>

data/app/views/spree/admin/shared/_seo.html.erb

@@ -1,7 +1,7 @@
 <div class="card mb-6 seo-form">
   <div class="card-header flex justify-between">
     <h5 class="card-title"><%= Spree.t(:search_engine_listing) %></h5>
-    <button class="btn btn-light btn-sm ml-auto" data-action="click->seo-form#toggleInputs" type="button">Edit</button>
+    <button class="btn btn-light btn-sm ms-auto" data-action="click->seo-form#toggleInputs" type="button"><%= Spree.t('actions.edit') %></button>
   </div>
   <div class="card-body flex flex-col">
     <div class="seo__preview <% if title.blank? && description.blank? %>hidden<% else %>flex flex-col<% end %>" data-seo-form-target="preview">

data/app/views/spree/admin/shared/_sidebar.html.erb

@@ -33,7 +33,7 @@
           <%= render 'spree/admin/shared/sidebar/store_dropdown' %>
         <% end %>
       <% end %>
-      <button type="button" class="btn btn-sm ml-auto" data-action="click->sidebar#closeMobile" aria-label="<%= Spree.t('admin.close_sidebar') %>">
+      <button type="button" class="btn btn-sm ms-auto" data-action="click->sidebar#closeMobile" aria-label="<%= Spree.t('admin.close_sidebar') %>">
         <%= icon('x') %>
       </button>
     </div>

data/app/views/spree/admin/shared/sidebar/_enterprise_edition_notice.html.erb

@@ -3,9 +3,9 @@
     <section class="hidden lg:block">
       <div id="enterprise-edition-notice">
         <%= link_to '', spree.admin_dismiss_enterprise_edition_notice_path, data: { turbo_method: :patch }, class: 'btn-close' %>
-        <p>Thank you for using Spree Community Edition! Please consider upgrading to Enterprise Edition for access to all features and support.</p>
+        <p><%= Spree.t('admin.enterprise_edition_notice.body') %></p>
 
-        <%= external_link_to 'Upgrade', 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-secondary btn-sm shadow-xs' %>
+        <%= external_link_to Spree.t('admin.enterprise_edition_notice.upgrade'), 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-secondary btn-sm shadow-xs' %>
       </div>
     </section>
   <% end %>

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -20,7 +20,7 @@
     </div>
   </div>
 
-  <div class="overflow-hidden text-gray-600 text-sm ml-auto">
+  <div class="overflow-hidden text-gray-600 text-sm ms-auto">
     <% if taxon.classification_count.positive? %>
       <%= pluralize(taxon.classification_count, Spree.t(:product)) %>
     <% end %>

data/app/views/spree/admin/shipping_methods/form/_display.html.erb

@@ -1,9 +1,9 @@
 <div class="card mb-6">
   <div class="card-body pb-0">
     <div class="grid grid-cols-1 md:grid-cols-2 gap-x-6 gap-y-3">
-      <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record?, help: 'This will be displayed to customers'  %>
+      <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record?, help: Spree.t('admin.shipping_methods.name_help')  %>
       <%= f.spree_select :display_on, display_on_options, { label: Spree.t(:display_on) }, { required: true } %>
-      <%= f.spree_text_field :admin_name, label: Spree.t(:internal_name), help: 'This will be displayed to admins' %>
+      <%= f.spree_text_field :admin_name, label: Spree.t(:internal_name), help: Spree.t('admin.shipping_methods.admin_name_help') %>
       <%= f.spree_text_field :code, label: Spree.t(:code)%>
     </div>
   </div>

data/app/views/spree/admin/shipping_methods/form/_estimated_transit_business_days.html.erb

@@ -6,8 +6,7 @@
   </div>
   <div class="card-body">
     <div class="alert alert-info">
-      This is the estimated number of business days it will take for the package to arrive at the customer's address.
-      It will be displayed on the checkout page.
+      <%= Spree.t('admin.shipping_methods.estimated_transit_business_days_help') %>
     </div>
     <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
       <%= f.spree_number_field :estimated_transit_business_days_min, size: 2, placeholder: Spree.t(:min), min: 1, label: Spree.t(:min) %>

data/app/views/spree/admin/shipping_methods/form/_tracking_url.html.erb

@@ -12,7 +12,7 @@
 
     <p class="form-text small mt-2">
       <code>:tracking</code>
-      <span>will be replaced with the tracking number.</span>
+      <span><%= Spree.t('admin.shipping_methods.tracking_url_token_help') %></span>
     </p>
   </div>
 </div>

data/app/views/spree/admin/shipping_methods/form/_zones.html.erb

@@ -4,7 +4,7 @@
       <%= Spree.t(:zones) %>
     </h5>
 
-    <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto') if can?(:manage, Spree::Zone) %>
+    <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ms-auto') if can?(:manage, Spree::Zone) %>
   </div>
 
   <div class="card-body">

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

@@ -11,7 +11,7 @@
 
 <% content_for :page_alerts do %>
   <div class="alert alert-info">
-    Shipping methods are options that the customer sees when they reach the checkout, they are the carriers and services used to send your products.
+    <%= Spree.t('admin.shipping_methods.checkout_info') %>
   </div>
 <% end %>
 

data/app/views/spree/admin/storefront/show.html.erb

@@ -0,0 +1,150 @@
+<div class="grid grid-cols-12 gap-6 pt-6">
+  <div class="col-span-12 lg:col-span-8 lg:col-start-3 mb-6">
+    <h2 class="page-header-title">
+      <%= onboarding_check_circle(current_store.storefront_setup?) %>
+      <%= Spree.t('admin.storefront_setup.title') %>
+    </h2>
+    <p class="mb-4">
+      <%= Spree.t('admin.storefront_setup.description') %>
+    </p>
+
+    <% if @deployment_origin.present? %>
+      <div class="card mb-6">
+        <div class="card-body flex flex-col gap-3">
+          <% if @deployment_origin_allowed %>
+            <div class="flex items-center gap-2">
+              <%= onboarding_check_circle(true) %>
+              <span>
+                <%= Spree.t('admin.storefront_setup.deployment_already_allowed') %>
+                <%= link_to @deployment_origin, @deployment_origin, target: :_blank, rel: 'noopener', class: 'font-medium' %>
+              </span>
+            </div>
+          <% else %>
+            <h5 class="font-medium">
+              🎉 <%= Spree.t('admin.storefront_setup.deployed_title') %>
+            </h5>
+            <p>
+              <%= Spree.t('admin.storefront_setup.deployed_copy') %>
+              <%= link_to @deployment_origin, @deployment_origin, target: :_blank, rel: 'noopener', class: 'font-medium' %>
+            </p>
+            <div class="flex items-center gap-2">
+              <%= form_with url: spree.admin_storefront_allow_origin_path, method: :post, data: { turbo: false } do %>
+                <%= hidden_field_tag :origin, @deployment_origin %>
+                <button type="submit" class="btn btn-primary">
+                  <%= Spree.t('admin.storefront_setup.allow_origin_button') %>
+                </button>
+              <% end %>
+              <% if @vercel_dashboard_url.present? %>
+                <%= link_to @vercel_dashboard_url, target: :_blank, rel: 'noopener', class: 'btn btn-light' do %>
+                  <%= icon('external-link') %>
+                  <%= Spree.t('admin.storefront_setup.view_on_vercel') %>
+                <% end %>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    <% if current_store.storefront_setup? %>
+      <div class="alert alert-success mb-6">
+        <%= Spree.t('admin.storefront_setup.done') %>
+        <%= link_to current_store.storefront_url, current_store.storefront_url, target: :_blank, rel: 'noopener', class: 'font-medium' %>
+      </div>
+    <% end %>
+
+    <div class="card mb-6">
+      <div class="card-header flex justify-between">
+        <h5 class="card-title"><%= Spree.t('admin.storefront_setup.deploy_title') %></h5>
+
+        <%= external_link_to Spree.t('admin.storefront_setup.see_online_demo'), 'https://demo.spreecommerce.org' %>
+      </div>
+      <div class="card-body">
+        <p class="mb-3"><%= Spree.t('admin.storefront_setup.deploy_copy') %></p>
+        <div class="mb-2">
+          <% if store_url_loopback?(current_store) %>
+            <div class="cursor-not-allowed flex gap-2 items-center">
+              <%= image_tag 'vercel-deploy-button.svg', alt: Spree.t('admin.storefront_setup.deploy_button'), height: 32, class: 'disabled opacity-25' %>
+              <span data-controller="tooltip">
+                <%= icon('alert-circle', class: 'text-yellow-500') %>
+                <%= tooltip(Spree.t('admin.storefront_setup.loopback_warning')) %>
+              </span>
+            </div>
+          <% else %>
+            <%= link_to vercel_deploy_url(current_store, @publishable_key) do %>
+              <%= image_tag 'vercel-deploy-button.svg', alt: Spree.t('admin.storefront_setup.deploy_button'), height: 32 %>
+            <% end %>
+          <% end %>
+        </div>
+        <p class="text-gray-500 text-sm mb-3"><%= Spree.t('admin.storefront_setup.deploy_finish_hint') %></p>
+        <%= external_link_to Spree.t('admin.storefront_setup.local_installation_instructions'), 'https://spreecommerce.org/docs/developer/storefront/nextjs/quickstart' %>
+      </div>
+    </div>
+
+    <div class="card mb-6">
+      <div class="card-header">
+        <h5 class="card-title"><%= Spree.t('admin.storefront_setup.connect_title') %></h5>
+      </div>
+      <div class="card-body flex flex-col gap-3">
+        <p><%= Spree.t('admin.storefront_setup.connect_copy') %></p>
+
+        <div class="form-group mb-0">
+          <label><%= Spree.t('admin.storefront_setup.api_url_label') %></label>
+          <div class="input-group gap-0 pr-1">
+            <input type="text" class="grow text-truncate" spellcheck="false" value="<%= current_store.formatted_url %>" readonly>
+            <%= clipboard_component(current_store.formatted_url,
+                  button_class: 'btn hover:bg-gray-100 p-1 rounded',
+                  icon_class: 'mr-0') %>
+          </div>
+        </div>
+
+        <div class="form-group mb-0">
+          <label><%= Spree.t('admin.storefront_setup.publishable_key_label') %></label>
+          <div data-controller="password-visibility" class="input-group gap-0 pr-1">
+            <input type="password" class="grow text-truncate" data-password-visibility-target="input" spellcheck="false" value="<%= @publishable_key.token %>" readonly>
+
+            <button type="button" class="btn hover:bg-gray-100 p-1 mr-1 rounded" data-action="password-visibility#toggle">
+              <span data-password-visibility-target="icon"><%= icon 'eye', class: 'mr-0' %></span>
+              <span data-password-visibility-target="icon" class="hidden"><%= icon 'eye-off', class: 'mr-0' %></span>
+            </button>
+
+            <%= clipboard_component(@publishable_key.token,
+                  button_class: 'btn hover:bg-gray-100 p-1 rounded',
+                  icon_class: 'mr-0') %>
+          </div>
+        </div>
+
+        <%= form_with url: spree.admin_storefront_path, method: :patch, data: { turbo: false }, class: 'flex flex-col gap-3 mt-2' do %>
+          <div class="form-group mb-0">
+            <label for="storefront_url"><%= Spree.t('admin.storefront_setup.storefront_url_label') %></label>
+            <input type="text" name="storefront_url" id="storefront_url" class="form-input" spellcheck="false"
+                   placeholder="https://myshop.com" value="<%= current_store.preferred_storefront_url %>">
+            <p class="text-gray-500 text-sm mt-1 mb-0"><%= Spree.t('admin.storefront_setup.storefront_url_help') %></p>
+          </div>
+          <div>
+            <button type="submit" class="btn btn-primary"><%= Spree.t('actions.save') %></button>
+          </div>
+        <% end %>
+      </div>
+    </div>
+
+    <% if @storefront_origins.any? %>
+      <div class="card mb-6">
+        <div class="card-header">
+          <h5 class="card-title"><%= Spree.t('admin.storefront_setup.connected_title') %></h5>
+        </div>
+        <div class="card-body flex flex-col gap-2">
+          <% @storefront_origins.each do |allowed_origin| %>
+            <div class="flex items-center gap-2">
+              <%= icon('world', class: 'text-gray-500') %>
+              <%= link_to allowed_origin.origin, allowed_origin.origin, target: :_blank, rel: 'noopener' %>
+            </div>
+          <% end %>
+          <p class="text-gray-500 text-sm mb-0 mt-2">
+            <%= link_to Spree.t('admin.storefront_setup.manage_allowed_origins'), spree.admin_allowed_origins_path %>
+          </p>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -13,7 +13,7 @@
     </p>
     <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>
 
-    <%= f.spree_file_field :logo, width: 240, height: 240, crop: true, help_bubble: "Used in the admin dashboard" %>
+    <%= f.spree_file_field :logo, width: 240, height: 240, crop: true, help_bubble: Spree.t('admin.store_form.logo_help') %>
   </div>
 </div>
 
@@ -24,7 +24,7 @@
   <div class="card-body">
     <div class="alert alert-info w-full mb-0">
       <span>
-        Currencies and locales are now managed by <%= link_to 'Markets', spree.admin_markets_path %>.
+        <%= Spree.t('admin.store_form.currencies_managed_by_markets_html', markets_link: link_to(Spree.t('admin.markets.list'), spree.admin_markets_path)) %>
       </span>
     </div>
   </div>

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

@@ -15,6 +15,10 @@
 
     <hr class="my-6">
 
+    <%= f.spree_select :preferred_storefront_access,
+        options_for_select(channel_storefront_access_options, f.object.preferred_storefront_access),
+        { label: Spree.t('admin.checkout_settings.storefront_access.label'),
+          help_bubble: Spree.t('admin.checkout_settings.storefront_access.description') } %>
     <%= f.spree_check_box :preferred_guest_checkout, label: Spree.t('admin.checkout_settings.guest_checkout.label'), help: Spree.t('admin.checkout_settings.guest_checkout.description') %>
     <%= f.spree_check_box :preferred_company_field_enabled, label: Spree.t('admin.store_form.company_field.label'), help: Spree.t('admin.store_form.company_field.description') %>
     <%= f.spree_check_box :preferred_special_instructions_enabled, label: Spree.t('admin.checkout_settings.special_instructions.label'), help: Spree.t('admin.checkout_settings.special_instructions.description') %>