spree_admin 5.2.6 → 5.3.0.rc1

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

@@ -1,5 +1,5 @@
 <div id="country_members">
-  <div class="card mb-4">
+  <div class="card mb-6">
     <div class="card-header">
       <h5 class="card-title">
         <%= Spree.t(:countries) %>
@@ -9,7 +9,7 @@
     <div class="card-body">
       <div class="form-group">
         <%= zone_form.label :country_ids, Spree.t(:countries) %>
-        <%= tom_select_tag 'zone[country_ids]', multiple: true, class: 'w-100', options: Spree::Country.all.to_tom_select_json, active_option: @zone.country_ids %>
+        <%= tom_select_tag 'zone[country_ids]', multiple: true, class: 'w-full', options: Spree::Country.all.to_tom_select_json, active_option: @zone.country_ids %>
       </div>
     </div>
   </div>

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

@@ -1,4 +1,4 @@
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:general_settings) %></h5>
   </div>
@@ -10,7 +10,7 @@
 
     <%= f.spree_check_box :default_tax, label: Spree.t(:default_tax_zone) %>
 
-    <h6 class="mb-2 mt-3"><%= Spree.t(:type) %></h6>
+    <h6 class="mb-2 mt-4"><%= Spree.t(:type) %></h6>
     <%= f.spree_radio_button :kind, :country, id: 'country_based', data: { action: 'auto-submit#submit' }, label: Spree.t(:country_based) %>
     <%= f.spree_radio_button :kind, :state, id: 'state_based', data: { action: 'auto-submit#submit' }, label: Spree.t(:state_based) %>
   </div>

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

@@ -1,5 +1,5 @@
 <div id="state_members">
-  <div class="card mb-4">
+  <div class="card mb-6">
     <div class="card-header">
       <h5 class="card-title">
         <%= Spree.t(:states) %>
@@ -9,12 +9,12 @@
     <div class="card-body">
       <div class="form-group">
         <%= label_tag :states_country_id, Spree.t(:country) %>
-        <%= tom_select_tag :states_country_id, class: 'w-100', options: Spree::Country.joins(:states).to_tom_select_json, active_option: @selected_country&.id, select_data: {action: "auto-submit#submit"} %>
+        <%= tom_select_tag :states_country_id, class: 'w-full', options: Spree::Country.joins(:states).to_tom_select_json, active_option: @selected_country&.id, select_data: {action: "auto-submit#submit"} %>
       </div>
 
       <div class="form-group">
         <%= zone_form.label :state_ids, Spree.t(:states) %>
-        <%= tom_select_tag 'zone[state_ids]', multiple: true, class: 'w-100', options: @states.to_tom_select_json, active_option: @zone.state_ids %>
+        <%= tom_select_tag 'zone[state_ids]', multiple: true, class: 'w-full', options: @states.to_tom_select_json, active_option: @zone.state_ids %>
       </div>
     </div>
   </div>

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

@@ -1,6 +1,6 @@
 <tr id="<%= spree_dom_id zone %>" class="cursor-pointer" data-controller="row-link">
-  <td class="w-25" data-action="click->row-link#openLink"><%= zone.name %></td>
-  <td class="w-40 text-muted text-wrap" data-action="click->row-link#openLink"><%= zone.description %></td>
+  <td class="w-1/4" data-action="click->row-link#openLink"><%= zone.name %></td>
+  <td class="w-40 text-gray-600 whitespace-normal" data-action="click->row-link#openLink"><%= zone.description %></td>
   <td class="w-10" data-action="click->row-link#openLink"><%= active_badge(zone.default_tax?) %></td>
   <td class="w-10 actions">
     <%= link_to_edit(zone, data: { row_link_target: :link, turbo_frame: '_top' }) if can? :edit, zone %>

data/config/importmap.rb

@@ -14,8 +14,6 @@ pin 'chartkick', to: 'chartkick.js', preload: ['application-spree-admin']
 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.2
 pin 'dompurify', preload: ['application-spree-admin'] # @3.2.5
 
 # Stimulus components

data/config/initializers/spree_admin_navigation.rb

@@ -40,7 +40,20 @@ Rails.application.config.after_initialize do
     # Orders to Fulfill submenu
     orders.add :orders_to_fulfill,
               label: 'admin.orders.orders_to_fulfill',
-              url: -> { spree.admin_orders_path(q: {shipment_state_not_in: [:shipped, :canceled]}) },
+              url: -> {
+                query_state = {
+                  id: 'root',
+                  combinator: 'and',
+                  filters: [
+                    { id: 'f1', field: 'shipment_state', operator: 'not_in', value: [
+                      { id: 'shipped', name: I18n.t('spree.shipment_states.shipped', default: 'Shipped') },
+                      { id: 'canceled', name: I18n.t('spree.shipment_states.canceled', default: 'Canceled') }
+                    ] }
+                  ],
+                  groups: []
+                }.to_json
+                spree.admin_orders_path(q: { shipment_state_not_in: ['shipped', 'canceled'] }, query_state: query_state)
+              },
               position: 10,
               active: -> { controller_name == 'orders' && params.dig(:q, :shipment_state_not_in).present? },
               if: -> {
@@ -81,11 +94,19 @@ Rails.application.config.after_initialize do
           icon: 'package',
           position: 30,
           if: -> { can?(:manage, Spree::Product) } do |products|
+
+    # Price Lists
+    products.add :price_lists,
+                label: :price_lists,
+                url: :admin_price_lists_path,
+                position: 10,
+                active: -> { %w[price_lists price_rules].include?(controller_name) },
+                if: -> { can?(:manage, Spree::PriceList) }
     # Stock
     products.add :stock,
                 label: :stock,
                 url: :admin_stock_items_path,
-                position: 10,
+                position: 20,
                 active: -> { %w[stock_items stock_transfers].include?(controller_name) },
                 if: -> { can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) }
 
@@ -93,7 +114,7 @@ Rails.application.config.after_initialize do
     products.add :taxonomies,
                 label: :taxonomies,
                 url: :admin_taxonomies_path,
-                position: 20,
+                position: 30,
                 active: -> { %w[taxonomies taxons].include?(controller_name) },
                 if: -> { can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) }
 
@@ -101,7 +122,7 @@ Rails.application.config.after_initialize do
     products.add :options,
                 label: :options,
                 url: :admin_option_types_path,
-                position: 30,
+                position: 40,
                 active: -> { %w[option_types option_values].include?(controller_name) },
                 if: -> { can?(:manage, Spree::OptionType) }
 
@@ -109,21 +130,10 @@ Rails.application.config.after_initialize do
     products.add :properties,
                 label: :properties,
                 url: :admin_properties_path,
-                position: 40,
+                position: 50,
                 if: -> { can?(:manage, Spree::Property) && Spree::Config.product_properties_enabled }
   end
 
-  # Vendors (Enterprise Edition)
-  sidebar_nav.add :vendors,
-          label: :vendors,
-          url: 'https://spreecommerce.org/marketplace-ecommerce/',
-          icon: 'heart-handshake',
-          position: 35,
-          if: -> { can?(:manage, current_store) && !defined?(SpreeEnterprise) },
-          badge: 'Enterprise',
-          tooltip: 'Multi-Vendor Marketplace is available in the Enterprise Edition',
-          target: '_blank'
-
   # Customers with submenu
   sidebar_nav.add :customers,
           label: :customers,
@@ -131,6 +141,14 @@ Rails.application.config.after_initialize do
           icon: 'users',
           position: 40,
           if: -> { can?(:manage, Spree.user_class) } do |customers|
+    # Customer Groups
+    customers.add :customer_groups,
+                  label: :customer_groups,
+                  url: :admin_customer_groups_path,
+                  position: 5,
+                  active: -> { %w[customer_groups customer_group_users].include?(controller_name) },
+                  if: -> { can?(:manage, Spree::CustomerGroup) }
+
     # Newsletter Subscribers
     customers.add :newsletter_subscribers,
                   label: :newsletter_subscribers,
@@ -161,36 +179,14 @@ Rails.application.config.after_initialize do
           position: 60,
           if: -> { can?(:manage, Spree::Report) }
 
-  # Storefront with submenu
-  sidebar_nav.add :storefront,
-          label: 'admin.storefront',
-          url: :admin_themes_path,
-          icon: 'building-store',
+  # Posts (Blog)
+  sidebar_nav.add :posts,
+          label: :posts,
+          url: :admin_posts_path,
+          icon: 'article',
           position: 70,
-          if: -> { can?(:manage, Spree::Theme) } do |storefront|
-
-    # Pages
-    storefront.add :pages,
-                  label: :pages,
-                  url: :admin_pages_path,
-                  position: 20,
-                  if: -> { can?(:manage, Spree::Page) }
-
-    # Posts (Blog)
-    storefront.add :posts,
-                  label: :posts,
-                  url: :admin_posts_path,
-                  position: 30,
-                  active: -> { %w[posts post_categories].include?(controller_name) },
-                  if: -> { can?(:manage, Spree::Post) }
-
-    # Storefront Settings
-    storefront.add :storefront_settings,
-                  label: :settings,
-                  url: :edit_admin_storefront_path,
-                  position: 40,
-                  if: -> { can?(:manage, current_store) }
-  end
+          active: -> { %w[posts post_categories].include?(controller_name) },
+          if: -> { can?(:manage, Spree::Post) }
 
   # Integrations
   sidebar_nav.add :integrations,
@@ -262,15 +258,6 @@ Rails.application.config.after_initialize do
           active: -> { controller_name == 'policies' },
           if: -> { can?(:manage, Spree::Policy) }
 
-  # Checkout
-  settings_nav.add :checkout,
-          label: :checkout,
-          url: -> { spree.edit_admin_store_path(section: 'checkout') },
-          icon: 'shopping-cart',
-          position: 50,
-          active: -> { controller_name == 'stores' && params[:section] == 'checkout' },
-          if: -> { can?(:manage, current_store) }
-
   # Domains
   settings_nav.add :domains,
           label: :domains,
@@ -362,7 +349,7 @@ Rails.application.config.after_initialize do
           url: :admin_oauth_applications_path,
           icon: 'terminal',
           position: 150,
-          active: -> { %w[oauth_applications webhooks_subscribers].include?(controller_name) },
+          active: -> { %w[oauth_applications webhooks_subscribers webhook_endpoints webhook_deliveries].include?(controller_name) },
           if: -> { can?(:manage, Spree::OauthApplication) }
 
   # Edit Profile
@@ -477,12 +464,12 @@ Rails.application.config.after_initialize do
           active: -> { controller_name == 'oauth_applications' },
           if: -> { can?(:manage, Spree::OauthApplication) }
 
-  developers_tabs_nav.add :webhooks,
-          label: :webhooks,
-          url: :admin_webhooks_subscribers_path,
+  developers_tabs_nav.add :webhook_endpoints,
+          label: :webhook_endpoints,
+          url: :admin_webhook_endpoints_path,
           position: 20,
-          active: -> { controller_name == 'webhooks_subscribers' },
-          if: -> { can?(:manage, Spree::Webhooks::Subscriber) }
+          active: -> { %w[webhook_endpoints webhook_deliveries].include?(controller_name) },
+          if: -> { can?(:manage, Spree::WebhookEndpoint) }
 
   # Audit Tab Navigation
   audit_tabs_nav = Spree.admin.navigation.audit_tabs