spree_backend 4.4.1 → 4.5.0

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

@@ -1,18 +1,13 @@
-<%= render partial: 'spree/admin/users/sidebar', locals: { current: :items } %>
+<%= render partial: 'spree/admin/users/tabs', locals: { current: :items } %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<% content_for :page_title do %>
-  <%= link_to @user.email, spree.edit_admin_user_url(@user) %> /
-  <%= Spree.t(:"admin.user.items_purchased") %>
-<% end %>
-
 <fieldset data-hook="admin_user_items_purchased">
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
-    <div class="table-responsive">
-    <table class="table table-condensed table-bordered stock-contents" id="listing_items" data-hook="stock-contents">
-      <thead>
+    <div class="table-responsive border rounded bg-white">
+    <table class="table table-condensed stock-contents" id="listing_items" data-hook="stock-contents">
+      <thead class="text-muted">
         <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
         <th colspan=2><%= Spree.t(:description) %></th>
         <th><%= I18n.t(:price, scope: 'activerecord.attributes.spree/line_item') %></th>
@@ -56,7 +51,7 @@
     </table>
     </div>
   <% else %>
-    <div class="alert alert-info no-objects-found">
+    <div class="text-center no-objects-found m-5">
       <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>,
       <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
     </div>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:users), spree.admin_users_url %> /
+  <%= page_header_back_button spree.admin_users_path %>
   <%= Spree.t(:new_user) %>
 <% end %>
 

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

@@ -1,18 +1,13 @@
-<%= render partial: 'spree/admin/users/sidebar', locals: { current: :orders } %>
+<%= render partial: 'spree/admin/users/tabs', locals: { current: :orders } %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<% content_for :page_title do %>
-  <%= link_to @user.email, spree.edit_admin_user_url(@user) %> /
-  <%= Spree.t(:"admin.user.order_history") %>
-<% end %>
-
 <fieldset data-hook="admin_user_order_history">
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
-    <div class="table-responsive">
-      <table class="table table-condensed table-bordered" id="listing_orders" data-hook>
-        <thead>
+    <div class="table-responsive border rounded bg-white">
+      <table class="table table-condensed" id="listing_orders" data-hook>
+        <thead class="text-muted">
           <tr data-hook="admin_orders_index_headers">
             <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
             <th><%= sort_link @search, :number,         I18n.t(:number, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_number_title'} %></th>
@@ -41,7 +36,7 @@
     </table>
     </div>
   <% else %>
-    <div class="alert alert-info no-objects-found">
+    <div class="text-center no-objects-found m-5">
       <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>,
       <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
     </div>

data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb

@@ -2,8 +2,8 @@
 
   <label><%= Spree.t(:select_stock) %></label>
 
-  <table class="stock-levels table table-bordered" data-hook="stock-levels">
-    <thead>
+  <table class="stock-levels table border rounded" data-hook="stock-levels">
+    <thead class="text-muted">
       <th><%= Spree.t(:name) %></th>
       <th class="text-center"><%= Spree.t(:count_on_hand) %></th>
       <th class="text-center"><%= Spree.t(:quantity) %></th>
@@ -23,7 +23,7 @@
             </td>
             <td class="actions">
               <span class="d-flex justify-content-center">
-                <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                <button class="btn btn-sm btn-success add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                    <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                 </button>
               </span>
@@ -39,7 +39,7 @@
               </td>
               <td class="actions">
                 <span class="d-flex justify-content-center">
-                  <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                  <button class="btn btn-sm btn-success add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                      <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                   </button>
                 </span>
@@ -57,7 +57,7 @@
           </td>
           <td class="actions">
             <span class="d-flex justify-content-center">
-              <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+              <button class="btn btn-sm btn-success add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                 <%= svg_icon name: "add.svg", width: '16', height: '16' %>
               </button>
             </span>

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -1,8 +1,8 @@
 <script type='text/template' id='variant_autocomplete_stock_template'>
 
   <label><%= Spree.t(:select_stock) %></label>
-  <table class="table table-condensed table-bordered stock-levels mb-0" data-hook="stock-levels">
-    <thead>
+  <table class="table table-condensed border rounded stock-levels mb-0" data-hook="stock-levels">
+    <thead class="text-muted">
       <th><%= Spree.t(:location) %></th>
       <th><%= Spree.t(:count_on_hand) %></th>
       <th width="15%"><%= Spree.t(:quantity) %></th>
@@ -35,8 +35,8 @@
               </td>
               <td class="actions">
                 <span class="d-flex justify-content-center">
-                  <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                    <%= svg_icon name: "add", width: '16', height: '16' %>
+                  <button class="btn btn-sm btn-success add_variant with-tip icon-link" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                    <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                   </button>
                 </span>
               </td>

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

@@ -48,7 +48,7 @@
             <%= f.text_field :discontinue_on,
                              value: datepicker_field_value(@variant.discontinue_on),
                              placeholder: Spree.t(:select_a_date),
-                             class: 'form-control shadow-none',
+                             class: 'form-control',
                              'data-input':'' %>
 
             <%= render partial: 'spree/admin/shared/cal_close' %>

data/app/views/spree/admin/variants/_split.js.erb

@@ -23,7 +23,7 @@
     </td>
     <td class='actions'>
       <span class='d-flex justify-content-center'>
-        <a href='#' class='cancel-split with-tip btn btn-sm btn-outline-secondary' title='Cancel'>
+        <a href='#' class='cancel-split with-tip btn btn-sm btn-light' title='Cancel'>
           <%= svg_icon name: "cancel", classes: 'icon-cancel', width: '16', height: '16' %>
         </a>
         <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>

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

@@ -3,11 +3,15 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
-  <fieldset>
-    <div data-hook="admin_variant_edit_form">
+  <div class="card mb-0">
+    <div class="card-header">
+      <h5 class="mb-0"><%= @variant.sku || @variant.options_text %></h5>
+    </div>
+    <div class="card-body" data-hook="admin_variant_edit_form">
       <%= render partial: 'form', locals: { f: f } %>
     </div>
-
-    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
+    <div class="card-body">
+      <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+    </div>
+  </div>
 <% end %>

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

@@ -4,15 +4,14 @@
 <div id="new_variant" data-hook></div>
 
 <% if @variants.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
-    <thead data-hook="variants_header">
+    <thead data-hook="variants_header" class="text-muted">
       <tr>
         <th></th>
-        <th><%= Spree.t('admin.digitals.digital') %></th>
+        <th><%= sort_link @search, :sku, Spree.t(:sku) %></th>
         <th><%= Spree.t(:options) %></th>
         <th><%= Spree.t(:price) %></th>
-        <th><%= sort_link @search, :sku, Spree.t(:sku) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -21,13 +20,12 @@
       <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
         <td class="move-handle">
           <% if can? :edit, variant %>
-            <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
           <% end %>
         </td>
-        <td><%= active_badge(variant.digital?) %></td>
+        <td><%= variant.sku %></td>
         <td><%= variant.options_text %></td>
         <td><%= display_price(variant) %></td>
-        <td><%= variant.sku %></td>
         <td class="actions">
           <span class="d-flex justify-content-end">
             <%= link_to_edit(variant, no_text: true) if can?(:edit, variant) && !variant.deleted? %>
@@ -45,17 +43,17 @@
   </table>
 </div>
 <% else %>
-  <div class="no-objects-found alert alert-info">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Variant)) %>
-    <% if can?(:create, Spree::Variant) && !@product.empty_option_values? %>
-      - <%= link_to(Spree.t(:add_one), spree.new_admin_product_variant_path(@product)) %>!
+    <% if can?(:create, Spree::Variant) && !@product.empty_option_values? && params.dig(:q, :deleted_at_null).nil? %>
+      - <%= link_to(Spree.t(:add_one), spree.new_admin_product_variant_path(@product)) %>
     <% end %>
   </div>
 <% end %>
 
 <% if @product.empty_option_values? %>
   <% if can?(:modify, Spree::ProductOptionType) %>
-    <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
+    <p class='text-center no-objects-found m-5 first_add_option_types' data-hook="first_add_option_types">
       <%= Spree.t(:to_add_variants_you_must_first_define) %>
       <%= link_to(Spree.t(:option_types), spree.admin_product_url(@product)) %>
       <% if can?(:read, Spree::OptionType) && can?([:create, :read], Spree::OptionValue) %>
@@ -66,9 +64,9 @@
   <% end %>
 <% else %>
   <% content_for :page_actions do %>
-    <%= product_preview_link(@product) %>
+    <%= external_page_preview_link(@product) %>
     <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add.svg', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
-    <%= button_link_to (@deleted == '1' ? Spree.t(:show_active) : Spree.t(:show_deleted)), spree.admin_product_variants_url(@product, { q: { deleted_at_null: @deleted == '1' ? "0" : "1" } }), { class: 'btn-outline-secondary', icon: 'filter.svg' } %>
+    <%= button_link_to (@deleted == '1' ? Spree.t(:show_active) : Spree.t(:show_deleted)), spree.admin_product_variants_url(@product, { q: { deleted_at_null: @deleted == '1' ? "0" : "1" } }), { class: 'btn-light', icon: 'filter.svg' } %>
   <% end %>
 <% end %>
 <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>

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

@@ -3,13 +3,15 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
-  <div class="card mb-3 bg-light">
+  <div class="card mb-3">
+    <div class="card-header">
+      <h5 class="mb-0"><%= Spree.t(:new_variant) %></h5>
+    </div>
     <div class="card-body">
-      <fieldset data-hook="admin_variant_new_form">
-        <legend class="border-bottom"><%= Spree.t(:new_variant) %></legend>
+      <div data-hook="admin_variant_new_form">
         <%= render partial: 'form', locals: { f: f } %>
         <%= render partial: 'spree/admin/shared/new_resource_links' %>
-      </fieldset>
+      </div>
     </div>
   </div>
 <% end %>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_webhooks_subscriber_form_fields">
   <%= f.field_container :url, class: ['form-group'] do %>
-    <%= f.label :url, Spree.t('admin.url') %>
+    <%= f.label :url, raw(Spree.t('admin.url') + required_span_tag) %>
     <%= f.text_field :url, class: 'form-control', placeholder: 'https://example.com/endpoint' %>
     <%= f.error_message_on :url %>
   <% end %>
@@ -94,6 +94,7 @@
         </div>
         <div class="row">
           <%= event_checkbox_for(:zone, f) %>
+          <%= event_checkbox_for(:vendor, f) if defined?(Spree::Vendor) %>
         </div>
       </div>
     <% end %>

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

@@ -7,11 +7,14 @@
 <% end if can?(:create, Spree::Webhooks::Subscriber) %>
 
 <% if @webhooks_subscribers.any? %>
-  <div class="table-responsive">
+  <div class="table-responsive border rounded bg-white">
     <table class="table">
-      <thead>
+      <thead class="text-muted">
       <tr>
         <th><%= Spree.t('admin.url') %></th>
+        <% if defined?(Spree::Vendor) && can?(:manage, Spree::Vendor) && !current_spree_vendor %>
+          <th><%= Spree.t(:vendor) %></th>
+        <% end %>
         <th><%= Spree.t('admin.active') %></th>
         <th><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></th>
         <th><%= Spree.t('admin.webhooks_subscribers.time_of_last_event') %></th>
@@ -22,7 +25,12 @@
       <tbody>
       <% @webhooks_subscribers.each do |webhooks_subscriber| %>
         <tr id="<%= spree_dom_id webhooks_subscriber %>">
-          <td><%= webhooks_subscriber.url %></td>
+          <td><code><%= webhooks_subscriber.url %></code></td>
+          <% if defined?(Spree::Vendor) && can?(:manage, Spree::Vendor) && !current_spree_vendor %>
+            <td>
+              <%= link_to webhooks_subscriber.vendor.name, spree.admin_vendor_path(webhooks_subscriber.vendor) if webhooks_subscriber.vendor.present? %>
+            </td>
+          <% end %>
           <td><%= active_badge(webhooks_subscriber.active) %></td>
           <td><%= webhooks_subscriber.subscriptions&.join(', ') %></td>
           <td><%= webhooks_subscriber.events.order(:created_at).last&.created_at %></td>
@@ -40,7 +48,7 @@
   </div>
   <%= render 'spree/admin/shared/index_table_options', collection: @webhooks_subscribers, simple: true %>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Webhooks::Subscriber)) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Webhooks::Subscriber %>!
   </div>

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

@@ -4,8 +4,8 @@
 <% end %>
 
 <fieldset>
-  <div class="table-responsive">
-    <table class="table table-bordered">
+  <div class="table-responsive border rounded bg-white">
+    <table class="table border rounded">
       <tr>
         <td><strong><%= Spree.t('admin.url') %></strong></td>
         <td><%= @webhooks_subscriber.url %></td>
@@ -23,9 +23,9 @@
 </fieldset>
 
 <% if @events.any? %>
-  <div class="table-responsive">
+  <div class="table-responsive border rounded bg-white">
     <table class="table">
-      <thead>
+      <thead class="text-muted">
       <tr>
         <th><%= Spree.t('admin.name') %></th>
         <th><%= Spree.t('admin.successful') %></th>
@@ -53,7 +53,7 @@
   <%= render 'spree/admin/shared/index_table_options', collection: @events, simple: true %>
 
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t('admin.webhooks_subscribers.no_events') %>
   </div>
 <% end %>

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

@@ -1,9 +1,9 @@
 <div id="country_members" data-hook="member">
   <div class="card mb-3">
     <div class="card-header">
-      <h1 class="card-title mb-0 h5">
+      <h5 class="card-title mb-0 h6">
         <%= Spree.t(:countries) %>
-      </h1>
+      </h5>
     </div>
 
     <div class="card-body">

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

@@ -2,7 +2,7 @@
   <div class="col-12 col-lg-6" data-hook="admin_zone_form_fields">
     <div class="card mb-3">
       <div class="card-header">
-        <h1 class="card-title mb-0 h5"><%= Spree.t(:general_settings) %></h1>
+        <h5 class="card-title mb-0 h6"><%= Spree.t(:general_settings) %></h5>
       </div>
 
       <div class="card-body">

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

@@ -1,9 +1,9 @@
 <div id="state_members" data-hook="member">
   <div class="card mb-3">
     <div class="card-header">
-      <h1 class="card-title mb-0 h5">
+      <h5 class="card-title mb-0 h6">
         <%= Spree.t(:states) %>
-      </h1>
+      </h5>
     </div>
 
     <div class="card-body">

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

@@ -7,9 +7,9 @@
 <% end if can? :create, Spree::Zone %>
 
 <% if @zones.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_zones' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="zones_header">
         <th><%= sort_link @search,:name, Spree.t(:name), title: 'zones_order_by_name_title' %></th>
         <th>
@@ -37,7 +37,7 @@
   </table>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Zone)) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Zone %>!
   </div>

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

@@ -34,7 +34,7 @@
         <%# Content                                         %>
         <%#-------------------------------------------------%>
         <main class="col-12 col-lg-9 col-xl-10 offset-lg-3 offset-xl-2 main pt-2" id="main-part">
-          <div class="container-lg">
+          <div class="px-lg-4 px-md-2 px-2">
 
             <%#-------------------------------------------------%>
             <%# Content header (page title/actions)             %>
@@ -46,8 +46,10 @@
               <%# Main content                                    %>
               <%#-------------------------------------------------%>
               <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-12 col-lg-9 px-0' : 'col-12 px-0' %>" id="content" data-hook>
-                <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter) %>
-                <%= yield %>
+                <div class="<%= content_for?(:sidebar) ? 'pr-3' : '' %>">
+                  <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter) %>
+                  <%= yield %>
+                </div>
               </div>
 
               <%#-------------------------------------------------%>

data/config/initializers/assets.rb

@@ -2,4 +2,5 @@ Rails.application.config.assets.precompile << 'spree_backend_manifest.js'
 
 Rails.application.config.assets.configure do |env|
   env.export_concurrent = false
+  Rails.application.config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess]
 end

data/config/locales/en.yml

@@ -9,6 +9,9 @@ en:
       response_code: Response Code
       execution_time: Execution Time
       request_errors: Request Errors
+      filters: Filters
+      kind: Kind
+      home: Home
       cms:
         all_pages: All Pages
         add_new_page: Add New Page
@@ -104,6 +107,9 @@ en:
           digital_asset_link_expire_time:
             download_link_expire_time: Download Link Expire Time
             link_expire_time: Set the expire time of each download link. (seconds).
+      product_kinds:
+        physical: Physical
+        digital: Digital
       tab:
         configuration: Configuration
         content: Content
@@ -144,7 +150,13 @@ en:
           resume: resume
           resend: Resend
       orders:
+        all: All
+        unpaid: Unpaid
+        unfulfilled: Unfulfilled
         cart: Cart
+        all_orders: All Orders
+        draft_orders: Draft Orders
+        abandoned_checkouts: Abandoned Checkouts
       oauth_applications:
         list: oAuth applications
         new: New oAuth application
@@ -154,6 +166,20 @@ en:
         for: For %{store_name}
       return_authorization:
         product: Product
+      store_form:
+        look_and_feel: Look and feel
+        code_help: "Store unique identifier, which is an abbreviated version of the store’s name (used as the layout directory name, and also helpful for separating templates by store)"
+        checkout_zone_help: "Selecting zone will limit to which Countries or States products are shipped.
+          For more information <a href='https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones' target='_blank' class='alert-link'>please see documentation</a>"
+        currencies_help: "You can accept payments in multiple currencies. Each product and product variant can have different price in different currency"
+        locales_help: "Install <a href='https://github.com/spree-contrib/spree_i18n' target='_blank' class='alert-link'>Spree I18n extension</a> to add more locales"
+        social_help: "If you want to link to your social accounts in the footer part of your website please fill below fields"
+        default_country_help: "This is the Country that will be pre-selected on the Checkout Address form"
+        footer_help: "This content is visible in the footer section of your Store"
+        mail_from_address_help: "This is the email which will be the sender of all your Store emails (Order Confirmation, Shipment notification etc)"
+        customer_support_email_help: "This email is visible to your Store visitors in the Footer section"
+        new_order_notifications_email_help: "If you want to receive an email notification every time someone places an Order please provide an email address for that notification to be sent to"
+        seo_robots: "Please check <a href='https://developers.google.com/search/reference/robots_meta_tag' target='_blank'>this page for more help</a>"
       user:
         account: Account
         addresses: Addresses
@@ -216,6 +242,7 @@ en:
         used_in: Used In
         you_have_no_menus: You have no Menus, click the Add New Menu button to create your first Menu.
         this_link_takes_you_to_your_stores_home_page: This link takes you to your stores home page.
+      settings: Settings
       utilities:
         preview: Preview %{name}
       webhooks_subscribers:
@@ -271,3 +298,14 @@ en:
         wished_items: Wished Items
         wishlists: Wishlists
         zones: Zones
+      display_on:
+        both: All
+        front_end: Storefront
+        back_end: Admin Panel
+      product:
+        all: All
+        active: Active
+        archived: Archived
+        deleted: Deleted
+        draft: Draft
+        pre_order: Pre-order

data/config/routes.rb

@@ -12,11 +12,7 @@ Spree::Core::Engine.add_routes do
 
     resources :zones
 
-    resources :stores do
-      member do
-        put :set_default
-      end
-    end
+    resources :stores, except: %i[index show]
 
     resources :countries do
       resources :states
@@ -126,12 +122,6 @@ Spree::Core::Engine.add_routes do
     get '/return_authorizations', to: 'return_index#return_authorizations', as: :return_authorizations
     get '/customer_returns', to: 'return_index#customer_returns', as: :customer_returns
 
-    resource :general_settings do
-      collection do
-        post :clear_cache
-      end
-    end
-
     resources :return_items, only: [:update]
 
     resources :taxonomies do
@@ -203,8 +193,10 @@ Spree::Core::Engine.add_routes do
     resources :webhooks_subscribers
 
     get '/forbidden', to: 'errors#forbidden', as: :forbidden
+    resource :dashboard, controller: 'dashboard'
+
+    root to: 'dashboard#show'
   end
 
-  spree_path = Rails.application.routes.url_helpers.try(:spree_path, trailing_slash: true) || '/'
-  get Spree.admin_path, to: redirect((spree_path + Spree.admin_path + '/orders').gsub('//', '/')), as: :admin
+  get Spree.admin_path, to: 'admin/dashboard#show', as: :admin
 end

data/lib/generators/spree/backend/install/templates/app/javascript/spree-dashboard.js

@@ -1,7 +1,6 @@
 // Entry point for the build script in your package.json
 
+import "./application" // Load the default rails Turbo setup from application.js
 import "@spree/dashboard"
 
 new SpreeDashboard.Dashboard()
-
-// window.Turbo = SpreeDashboard.Turbo

data/lib/spree/backend/configuration.rb

@@ -0,0 +1,37 @@
+module Spree
+  module Backend
+    class Configuration < Preferences::Configuration
+      preference :admin_path, :string, default: '/admin'
+      preference :admin_products_per_page, :integer, default: Kaminari.config.default_per_page
+      preference :admin_orders_per_page, :integer, default: Kaminari.config.default_per_page
+      preference :admin_properties_per_page, :integer, default: Kaminari.config.default_per_page
+      preference :admin_promotions_per_page, :integer, default: Kaminari.config.default_per_page
+      preference :admin_customer_returns_per_page, :integer, default: Kaminari.config.default_per_page
+      preference :admin_users_per_page, :integer, default: Kaminari.config.default_per_page
+      preference :admin_show_version, :boolean, default: true
+      preference :locale, :string
+      preference :variants_per_page, :integer, default: Kaminari.config.default_per_page
+      preference :menus_per_page, :integer, default: Kaminari.config.default_per_page
+      preference :product_wysiwyg_editor_enabled, :boolean, default: true
+      preference :taxon_wysiwyg_editor_enabled, :boolean, default: true
+      preference :show_only_complete_orders_by_default, :boolean, default: true
+
+      ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
+                              :shipments, :credit_cards, :return_authorizations,
+                              :customer_returns, :adjustments, :customer_details]
+      PRODUCT_TABS       ||= [:products, :option_types, :properties, :prototypes,
+                              :variants, :product_properties, :taxonomies,
+                              :taxons]
+      REPORT_TABS        ||= [:reports]
+      CONFIGURATION_TABS ||= [:configurations, :general_settings, :tax_categories,
+                              :tax_rates, :zones, :countries, :states,
+                              :payment_methods, :shipping_methods,
+                              :shipping_categories, :stock_transfers,
+                              :stock_locations, :trackers, :refund_reasons,
+                              :reimbursement_types, :return_authorization_reasons,
+                              :stores]
+      PROMOTION_TABS     ||= [:promotions, :promotion_categories]
+      USER_TABS          ||= [:users]
+    end
+  end
+end

data/lib/spree/backend/engine.rb

@@ -1,10 +1,12 @@
+require_relative 'configuration'
+
 module Spree
   module Backend
     class Engine < ::Rails::Engine
       config.middleware.use 'Spree::Backend::Middleware::SeoAssist'
 
       initializer 'spree.backend.environment', before: :load_config_initializers do |_app|
-        Spree::Backend::Config = Spree::BackendConfiguration.new
+        Spree::Backend::Config = Spree::Backend::Configuration.new
       end
 
       # filter sensitive information during logging