spree_admin 5.0.4 → 5.1.0.beta2

data/app/views/spree/admin/stores/edit_emails.html.erb

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag :set_customer_support_email, class: 'w-100' do %>
   <%= form_for current_store, url: spree.admin_store_path, as: :store do |f| %>
     <div class="form-group">
-      <%= f.label :customer_support_email, 'Customer support email' %>
+      <%= f.label :customer_support_email, Spree.t(:customer_support_email) %>
       <%= f.email_field :customer_support_email, class: 'form-control', required: true %>
     </div>
     <div class="d-flex justify-content-between">

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

@@ -1,5 +1,5 @@
 <%= content_for(:page_title) do %>
-  Email settings
+  <%= Spree.t(:emails) %>
 <% end %>
 
 <div class="row">

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

@@ -12,7 +12,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:tax_code) %></th>

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

@@ -12,7 +12,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr data-hook="rate_header">
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:tax_category) %></th>

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

@@ -17,7 +17,7 @@
   <% if @taxonomies.present? %>
     <div class="table-responsive">
       <table class="table" id='listing_taxonomies'>
-        <thead class="text-muted">
+        <thead>
           <tr data-hook="listing_taxonomies_header">
             <th class="no-border handel-head"></th>
             <th><%= Spree.t(:name) %></th>

data/app/views/spree/admin/themes/_theme.html.erb

@@ -1,13 +1,15 @@
 <tr id="<%= spree_dom_id theme %>">
   <td class="w-70 p-0">
     <%= link_to theme.ready? ? spree.edit_admin_theme_path(theme) : '#', class: 'd-flex align-items-top p-3' do %>
-      <%= render 'spree/admin/themes/theme_preview_image', theme: theme %>
+      <div class="w-20">
+        <%= render 'spree/admin/themes/theme_preview_image', theme: theme, css_class: 'img-thumbnail w-100' %>
+      </div>
 
-      <div class="d-flex flex-column ml-3">
+      <div class="d-flex flex-column ml-3 w-80">
         <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>
@@ -38,7 +40,7 @@
         <%= link_to Spree.t('actions.publish'), publish_admin_theme_path(theme), class: 'btn btn-sm btn-light mr-2', data: { turbo_method: :put } unless theme.default? %>
         <div class="dropdown">
           <button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <%= icon('dots', class: 'mr-0') %>
+            <%= icon('dots-vertical', class: 'mr-0') %>
           </button>
           <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
             <%= link_to_edit theme, class: 'dropdown-item' %>

data/app/views/spree/admin/themes/_theme_preview_image.html.erb

@@ -1,15 +1,17 @@
 <% width ||= 120 %>
 <% height ||= 72 %>
+<% css_class ||= 'img-thumbnail border-0' %>
 
 <% if theme.screenshot.attached? && theme.screenshot.variable? %>
-  <%= spree_image_tag(theme.screenshot, width: width, height: height, class: 'img-thumbnail', style: "width: #{width}px; height: #{height}px", loading: :lazy) %>
+  <%= image_tag(spree_image_url(theme.screenshot, width: width, height: height), class: css_class, loading: :lazy) %>
 <% elsif theme.class.preview_image_url.present? %>
   <%= image_tag(
   theme.class.preview_image_url,
-  class: 'img-thumbnail',
-  style: "width: #{width}px; height: #{height}px",
+  class: css_class,
   loading: :lazy
 ) %>
 <% else %>
-  <%= render 'spree/admin/shared/no_image', width: width, height: height %>
+  <div class="rounded bg-light text-muted d-flex align-items-center justify-content-center img-fluid" style="height: <%= height %>px">
+    <%= icon('camera-off', class: 'text-muted opacity-50') %>
+  </div>
 <% end %>

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

@@ -29,7 +29,7 @@
 <div class="card-lg">
   <div class="table-responsive rounded-lg">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th class="bg-transparent"><%= Spree.t(:theme) %></th>
           <th class="bg-transparent"><%= Spree.t(:status) %></th>

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

@@ -15,7 +15,7 @@
     <%= turbo_frame_tag :translations_table, class: "table-responsive border rounded bg-white my-3", refresh: "morph" do %>
       <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th scope="col" class="text-center"><%= Spree.t(:field) %></th>
             <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: :en) %> (<%= Spree.t(:default) %>)</th>

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

@@ -0,0 +1,21 @@
+<% content_for(:title, Spree.t(:forgot_password)) %>
+
+<h1 class="mb-3 font-weight-light"><%= Spree.t(:change_password) %></h1>
+<%= form_for(resource, as: resource_name, url: password_path(:admin_user), html: { method: :put }, data: { turbo_frame: :_top, turbo: false }) do |f| %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: resource } %>
+  <%= f.hidden_field :reset_password_token %>
+  <div class="form-group mb-3">
+    <%= f.label :password, Spree.t(:password), required: true, class: 'form-label' %>
+    <% if @minimum_password_length %>
+      <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %>
+    <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: 'form-control form-control-lg rounded-sm', min: @minimum_password_length %>
+  </div>
+  <div class="form-group mb-3">
+    <%= f.label :password_confirmation, Spree.t(:confirm_password), required: true, class: 'form-label' %>
+    <%= f.password_field :password_confirmation, autocomplete: "new-password", class: 'form-control form-control-lg rounded-sm', min: @minimum_password_length %>
+  </div>
+  <%= render 'spree/admin/shared/devise/links', f: f %>
+  <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-100' %>
+<% end %>
+

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

@@ -0,0 +1,12 @@
+<% content_for(:title, Spree.t(:forgot_password)) %>
+
+<h1 class="mb-3 font-weight-light"><%= Spree.t(:forgot_password) %></h1>
+<%= form_for(resource, as: resource_name, url: password_path(:admin_user), data: { turbo_frame: :_top }) do |f| %>
+  <div class="form-group mb-3">
+    <%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>
+    <%= f.email_field :email, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: 'steve@apple.com', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>
+  </div>
+  <%= render 'spree/admin/shared/devise/links', f: f %>
+  <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-100' %>
+<% end %>
+

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

@@ -0,0 +1,16 @@
+<% content_for(:title, Spree.t(:login)) %>
+
+<h1 class="mb-3 font-weight-light">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-3">
+    <%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>
+    <%= f.email_field :email, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: 'steve@getvendo.com', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>
+  </div>
+  <div class="form-group mb-3">
+    <%= f.label :password, Spree.t(:password), required: true, class: 'form-label' %>
+    <%= f.password_field :password, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: '********', autocomplete: 'current-password' %>
+  </div>
+  <%= render 'spree/admin/shared/devise/links', f: f %>
+  <%= turbo_save_button_tag Spree.t(:login), class: 'btn btn-primary btn-lg w-100' %>
+<% end %>
+

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

@@ -22,13 +22,15 @@
   <%= f.label :tag_list, Spree.t(:tags) %>
   <%= tom_select_tag 'user[tag_list]', multiple: true, class: 'w-100', options: user_tags_json_array, active_option: @user.tag_list, value_field: :name, create: true %>
 </div>
-<div class="form-group">
-  <%= f.label :spree_role_ids, Spree.t(:roles) %>
-  <%= f.select :spree_role_ids,
-          options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),
-          { prompt: false },
-          { multiple: true,  data: { controller: 'autocomplete-select' } } %>          
-</div>
+<% if @user.class == Spree.admin_user_class && can?(:manage, Spree::Role) %>
+  <div class="form-group">
+    <%= f.label :spree_role_ids, Spree.t(:roles) %>
+    <%= f.select :spree_role_ids,
+            options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),
+            { prompt: false },
+            { multiple: true,  data: { controller: 'autocomplete-select' } } %>          
+  </div>
+<% end %>
 <div class="custom-control custom-checkbox mb-3">
   <%= f.check_box :accepts_email_marketing, class: 'custom-control-input' %>
   <%= f.label :accepts_email_marketing, Spree.t(:accepts_email_marketing), class: 'custom-control-label' %>

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

@@ -2,7 +2,7 @@
   <td class="pr-0 w-5">
     <%= bulk_operations_checkbox(user) %>
   </td>
-  <td class='w-50 no-wrap py-0 pl-1 pr-0'>
+  <td class='w-50 text-nowrap py-0 pl-1 pr-0'>
     <%= render 'spree/admin/shared/user', user: user %>
   </td>
   <td class="cursor-pointer" data-action="click->row-link#openLink">
@@ -12,7 +12,7 @@
     <%= customer_location_flag(user) %>
     <%= customer_location(user) %>
   </td>
-  <td class='w-10 no-wrap cursor-pointer' data-action="click->row-link#openLink"><%= user.completed_orders_for_store(current_store).count %></td>
-  <td class='w-10 no-wrap cursor-pointer' data-action="click->row-link#openLink"><%= user.display_amount_spent_in(current_currency) %></td>
-  <td class='w-10 no-wrap cursor-pointer' data-action="click->row-link#openLink"><%= local_time(user.created_at) %></td>
+  <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.completed_orders_for_store(current_store).count %></td>
+  <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.display_amount_spent_in(current_currency) %></td>
+  <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= local_time(user.created_at) %></td>
 </tr>

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

@@ -43,7 +43,7 @@
 
         <div class="table-responsive">
           <table class="table" id="listing_users">
-            <thead class="text-muted">
+            <thead>
               <tr data-hook="admin_users_index_headers">
                 <th scope="col" class="pr-0 w-5">
                   <%= bulk_operations_select_all_checkbox %>

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

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_users_path %>
-  <%= Spree.t(:new_user) %>
+  <%= Spree.t(:new_customer) %>
 <% end %>
 
 <%= form_for [:admin, @user], url: spree.admin_users_path, method: :post do |f| %>

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

@@ -1,6 +1,6 @@
 <div class="search-picker__option <% if variant.purchasable? || params[:all] %>cursor-pointer<% else %>opacity-50 disabled<% end %>" data-action="click->search-picker#toggle">
   <%= radio_button_tag "#{params[:param_name]}[variant_id]", variant.id, false, class: "custom-control-input", id: "ids_#{variant.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" }, disabled: !params[:all] && !variant.purchasable? %>
-  <label for="ids_<%= variant.id %>" class="pr-2">
+  <label for="ids_<%= variant.id %>" class="pr-2 <% unless variant.purchasable? %>cursor-not-allowed<% end %>">
     <div class="w-70 d-flex align-items-center">
       <div class="variant-image">
         <%= render 'spree/admin/shared/product_image', object: variant %>

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

@@ -1,4 +1,4 @@
-<div id="<%= spree_dom_id(asset) %>" class="media-form__image border border-gray-200" data-sortable-update-url="<%= spree.admin_asset_path(asset) %>">
+<div id="<%= spree_dom_id(asset) %>" class="media-form__image" data-sortable-update-url="<%= spree.admin_asset_path(asset) %>">
   <div class="custom-control custom-checkbox d-none">
     <%= 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>

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

@@ -8,7 +8,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:url) %></th>
             <th><%= Spree.t(:active) %></th>

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

@@ -17,26 +17,22 @@
           <%= zone_form.text_field :description, class: 'form-control' %>
         </div>
 
-        <div class="form-group checkbox">
-          <%= label_tag "zone[#{:default_tax}" do %>
-            <%= zone_form.check_box :default_tax %>
-            <%= Spree.t(:default_tax_zone) %>
-          <% end %>
+        <div class="form-group">
+          <div class="custom-control custom-checkbox">
+            <%= zone_form.check_box :default_tax, class: 'custom-control-input' %>
+            <%= zone_form.label :default_tax, Spree.t(:default_tax_zone), class: 'custom-control-label' %>
+          </div>
         </div>
 
         <div class="form-group">
           <strong><%= Spree.t(:type) %></strong>
-          <div class="radio my-2">
-            <%= label_tag :country_based do %>
-              <%= zone_form.radio_button :kind, :country, id: 'country_based', data: { action: 'auto-submit#submit' }  %>
-              <%= Spree.t(:country_based) %>
-            <% end %>
+          <div class="custom-control custom-radio my-2">
+            <%= zone_form.radio_button :kind, :country, id: 'country_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>
+            <%= label_tag :country_based, Spree.t(:country_based), class: 'custom-control-label' %>
           </div>
-          <div class="radio my-2">
-            <%= label_tag :state_based do %>
-              <%= zone_form.radio_button :kind, :state, id: 'state_based', data: { action: 'auto-submit#submit' } %>
-              <%= Spree.t(:state_based) %>
-            <% end %>
+          <div class="custom-control custom-radio my-2">
+            <%= zone_form.radio_button :kind, :state, id: 'state_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>
+            <%= label_tag :state_based, Spree.t(:state_based), class: 'custom-control-label' %>
           </div>
         </div>
       </div>

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

@@ -16,7 +16,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
         <tr>
           <th><%= sort_link @search,:name, Spree.t(:name) %></th>
           <th>

data/config/locales/en.yml

@@ -74,6 +74,9 @@ en:
       export_only_filtered_records: Export only filtered records, matching the search criteria
       filters: Filters
       getting_started: Getting started
+      integrations:
+        invalid_integration_type: This integration is not allowed
+        page_subtitle: Connect your store to third-party services to enhance customer experience.
       manage_currencies: Manage Currencies
       manage_properties: Manage Properties
       manage_stock_locations: Manage Stock Locations

data/config/routes.rb

@@ -59,10 +59,10 @@ Spree::Core::Engine.add_routes do
         post :resend
         put :cancel
       end
-      resource :shipping_address, except: [:index, :show], controller: 'orders/shipping_address'
-      resource :billing_address, except: [:index, :show], controller: 'orders/billing_address'
+      resource :shipping_address, except: [:show], controller: 'orders/shipping_address'
+      resource :billing_address, except: [:show], controller: 'orders/billing_address'
       resource :contact_information, only: [:edit, :update], controller: 'orders/contact_information'
-      resource :user, except: [:edit, :show, :index], controller: 'orders/user'
+      resource :user, except: [:edit, :show], controller: 'orders/user'
       resources :shipments, only: [:edit, :update, :create], controller: 'shipments' do
         member do
           post :ship
@@ -147,7 +147,9 @@ Spree::Core::Engine.add_routes do
       end
     end
     # setting up a new store
-    resources :stores, only: [:new, :create]
+    resources :stores, only: [:new, :create] do
+      resources :role_users, only: [:destroy]
+    end
     resources :payment_methods, except: :show
     resources :shipping_methods, except: :show
     resources :shipping_categories, except: :show
@@ -165,6 +167,9 @@ Spree::Core::Engine.add_routes do
     end
     resources :custom_domains, except: :show
 
+    # integrations
+    resources :integrations
+
     # storefront / page builder
     resource :storefront, only: [:edit, :update], controller: :storefront
     resources :themes, except: [:new, :show] do
@@ -214,6 +219,13 @@ Spree::Core::Engine.add_routes do
 
     # account management
     resources :roles, except: :show
+    resources :invitations, except: [:edit, :update] do
+      member do
+        put :accept
+        put :resend
+      end
+    end
+    resources :admin_users, except: [:destroy]
 
     # Action Text
     namespace :action_text do

data/lib/spree/admin/engine.rb

@@ -22,6 +22,7 @@ module Spree
         :store_form_partials,
         :store_nav_partials,
         :settings_nav_partials,
+        :shipping_method_form_partials,
         :store_settings_nav_partials,
         :store_orders_nav_partials,
         :store_products_nav_partials,
@@ -56,6 +57,8 @@ module Spree
         app.config.assets.paths << root.join('app/javascript')
         app.config.assets.paths << root.join('vendor/javascript')
         app.config.assets.precompile += %w[ spree_admin_manifest bootstrap.bundle.min.js jquery3.min.js ]
+        # fix for TinyMCE-rails gem to work with both propshaft and sprockets
+        app.config.assets.excluded_paths ||= []
       end
 
       initializer 'spree.admin.importmap', after: 'importmap' do |app|
@@ -97,6 +100,7 @@ module Spree
         Rails.application.config.spree_admin.store_form_partials = []
         Rails.application.config.spree_admin.store_nav_partials = []
         Rails.application.config.spree_admin.settings_nav_partials = []
+        Rails.application.config.spree_admin.shipping_method_form_partials = []
         Rails.application.config.spree_admin.store_settings_nav_partials = []
         Rails.application.config.spree_admin.store_orders_nav_partials = []
         Rails.application.config.spree_admin.store_products_nav_partials = []

data/lib/spree/admin.rb

@@ -4,6 +4,7 @@ require 'spree_api'
 require 'sprockets/railtie'
 
 require 'active_link_to'
+require 'breadcrumbs_on_rails'
 require 'chartkick'
 require 'currency_select'
 require 'groupdate'
@@ -16,8 +17,9 @@ require 'stimulus-rails'
 require 'local_time'
 require 'payment_icons'
 require 'dartsass-rails'
-require 'tinymce-rails'
 
 require 'spree/admin/action_callbacks'
 require 'spree/admin/callbacks'
 require 'spree/admin/engine'
+
+require 'tinymce-rails'