spree_admin 5.0.2 → 5.1.0.beta

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

@@ -1,54 +1,65 @@
+<% content_for :title do %>
+  <%= @webhooks_subscriber.url %>
+<% end %>
+
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_webhooks_subscribers_path %>
   <%= @webhooks_subscriber.url %>
 <% end %>
-<fieldset class="card mb-4">
-  <table class="table card-body pb-0">
-    <tr>
-      <td><strong class="text-uppercase"><%= Spree.t(:url) %></strong></td>
-      <td><%= external_link_to @webhooks_subscriber.url, @webhooks_subscriber.url %></td>
-    </tr>
-    <tr>
-      <td><strong><%= Spree.t(:active) %></strong></td>
-      <td><%= active_badge(@webhooks_subscriber.active) %></td>
-    </tr>
-    <tr>
-      <td><strong><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></strong></td>
-      <td>
-        <% @webhooks_subscriber.subscriptions&.sort&.each do |subscription| %>
-          <span class="badge badge-light"><%= subscription %></span>
-        <% end %>
-      </td>
-    </tr>
-  </table>
-</fieldset>
-<% if @events.any? %>
-  <div class="card mb-4">
-    <div class="card-header">
-      <h5 class="card-title">
-        <%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
-      </h5>
+
+<% content_for :page_actions do %>
+  <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_webhooks_subscriber_path(@webhooks_subscriber), class: 'btn btn-primary' %>
+<% end %>
+
+<ul class="list-group bg-white mb-4 rounded-lg">
+  <li class="list-group-item d-flex justify-content-between">
+    <strong class="text-uppercase"><%= Spree.t(:url) %></strong>
+    <%= external_link_to @webhooks_subscriber.url, @webhooks_subscriber.url, class: 'text-blue text-decoration-none' %>
+  </li>
+  <li class="list-group-item d-flex justify-content-between">
+    <strong><%= Spree.t(:active) %></strong>
+    <%= active_badge(@webhooks_subscriber.active) %>
+  </li>
+  <li class="list-group-item d-flex justify-content-between">
+    <strong><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></strong>
+    <div>
+      <% @webhooks_subscriber.subscriptions&.sort&.each do |subscription| %>
+        <span class="badge badge-light"><%= subscription %></span>
+      <% end %>
     </div>
-    <table class="table card-body pb-0">
-      <thead class="text-muted">
+  </li>
+</ul>
+
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
+    </h5>
+  </div>
+  <table class="table card-body pb-0">
+    <thead>
+      <tr>
+        <th><%= Spree.t('admin.name') %></th>
+        <th><%= Spree.t('admin.successful') %></th>
+        <th><%= Spree.t('admin.created_at') %></th>
+        <th><%= Spree.t('admin.response_code') %></th>
+        <th><%= Spree.t('admin.execution_time') %></th>
+        <th><%= Spree.t('admin.errors') %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% if @events.any? %>
+        <%= render partial: 'spree/admin/webhook_events/webhook_event', collection: @events, cached: spree_base_cache_scope %>
+      <% else %>
         <tr>
-          <th><%= Spree.t('admin.name') %></th>
-          <th><%= Spree.t('admin.successful') %></th>
-          <th><%= Spree.t('admin.created_at') %></th>
-          <th><%= Spree.t('admin.response_code') %></th>
-          <th><%= Spree.t('admin.execution_time') %></th>
-          <th><%= Spree.t('admin.errors') %></th>
-          <th></th>
+          <td colspan="7" class="text-center">
+            <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil, model_class: Spree::Webhooks::Event %>
+          </td>
         </tr>
-      </thead>
-      <tbody>
-        <%= render partial: 'spree/admin/webhook_events/webhook_event', collection: @events, cached: spree_base_cache_scope %>
-      </tbody>
-    </table>
-    <%= render 'spree/admin/shared/index_table_options', collection: @events %>
-  </div>
-<% else %>
-  <div class="text-center no-objects-found m-5">
-    <%= Spree.t('admin.webhooks_subscribers.no_events') %>
-  </div>
-<% end %>
+      <% end %>
+    </tbody>
+  </table>
+  <%= render 'spree/admin/shared/index_table_options', collection: @events %>
+</div>
+

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/importmap.rb

@@ -15,8 +15,8 @@ pin 'Chart.bundle', to: 'Chart.bundle.js', preload: ['application-spree-admin']
 pin 'local-time', preload: ['application-spree-admin'] # @3.0.2
 pin 'mapkick/bundle', to: 'mapkick.bundle.js', preload: ['application-spree-admin']
 pin "jquery", to: 'jquery.min.js', preload: ['application-spree-admin'] # @3.7.1
-pin 'bootstrap', to: 'bootstrap--dist--js--bootstrap.bundle.min.js.js', preload: ['application-spree-admin'] # @4.6.1
-pin 'dompurify', preload: ['application-spree-admin'] # @3.2.3
+pin 'bootstrap', to: 'bootstrap--dist--js--bootstrap.bundle.min.js.js', preload: ['application-spree-admin'] # @4.6.2
+pin 'dompurify', preload: ['application-spree-admin'] # @3.2.5
 
 # Stimulus components
 pin '@stimulus-components/rails-nested-form', to: '@stimulus-components--rails-nested-form.js', preload: ['application-spree-admin'] # @5.0.0

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
@@ -224,7 +227,7 @@ en:
       taxon_type: Taxon type
       taxon_types:
         automatic: Automatic
-        automatic_info: Automatically match products to this taxon based on the conditions you set.
+        automatic_info: Automatically add products to this taxon if they match the rules you set.
         manual: Manual
         manual_info: Curate products manually. You can add or remove them in bulk.
       upload_new_asset: Upload new asset

data/config/routes.rb

@@ -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

@@ -21,9 +21,14 @@ module Spree
         :orders_filters_partials,
         :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
+        :store_products_nav_partials,
+        :storefront_nav_partials,
+        :tax_nav_partials,
+        :user_dropdown_partials
       )
 
       # accessible via Rails.application.config.spree_admin
@@ -92,9 +97,14 @@ module Spree
         Rails.application.config.spree_admin.orders_filters_partials = []
         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 = []
+        Rails.application.config.spree_admin.storefront_nav_partials = []
+        Rails.application.config.spree_admin.tax_nav_partials = []
+        Rails.application.config.spree_admin.user_dropdown_partials = []
       end
     end
   end

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'