spree_admin 5.2.0.rc2 → 5.2.0

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

@@ -33,7 +33,7 @@
   </div>
   <div class="card-body">
     <p class="text-muted">This logo is included in all email notifications such as order confirmation</p>
-    <%= render 'active_storage/upload_form', form: f, field_name: :mailer_logo, width: 204, height: 104 %>
+    <%= f.spree_file_field :mailer_logo, width: 204, height: 104 %>
     <p class="form-text mb-0 mt-2">
       We recommend images with a transparent background.
       <br />

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

@@ -1,6 +1,6 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
-  <th scope="col"><%= sort_link search_collection, :tax_code, Spree.t(:tax_code) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :tax_code, Spree.t(:tax_code) %></th>
   <th scope="col"><%= Spree.t(:description) %></th>
   <th scope="col"><%= Spree.t(:default) %></th>
   <th scope="col"></th>

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

@@ -8,16 +8,7 @@
   <div class="card-body">
     <%= f.spree_text_field :name, required: true %>
 
-    <div class="form-group">
-      <%= f.label :amount_percentage, Spree.t(:rate) %>
-      <div class="input-group">
-        <%= f.number_field :amount_percentage, class: 'form-control', min: 0, step: 0.1, required: true %>
-        <div class="input-group-append">
-          <span class="input-group-text">%</span>
-        </div>
-      </div>
-      <%= f.error_message_on :amount %>
-    </div>
+    <%= f.spree_number_field :amount_percentage, label: Spree.t(:rate), append: '%', min: 0, step: 0.1, required: true %>
 
     <%= f.spree_collection_select :zone_id, @available_zones, :id, :name, label: Spree.t(:zone) %>
     <%= f.spree_collection_select :tax_category_id, @available_categories, :id, :name, label: Spree.t(:tax_category) %>

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

@@ -1,8 +1,8 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:tax_category) %></th>
   <th scope="col"><%= Spree.t(:zone) %></th>
-  <th scope="col"><%= sort_link search_collection, :amount, Spree.t(:amount) %></th>
+  <th scope="col"><%= sort_link @search, :amount, Spree.t(:amount) %></th>
   <th scope="col"><%= Spree.t(:included_in_price) %></th>
   <th scope="col"><%= Spree.t(:show_rate_in_label) %></th>
   <th scope="col"></th>

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

@@ -1,6 +1,6 @@
 <tr data-hook="listing_taxonomies_header">
   <th class="no-border handel-head"></th>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:taxons) %></th>
   <th scope="col"></th>
 </tr>

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

@@ -81,17 +81,10 @@
         <h5 class="card-title"><%= Spree.t(:images) %></h5>
       </div>
       <div class="card-body">
-        <%= f.label :image, Spree.t(:image) %>
-        <%= render 'active_storage/upload_form', form: f, field_name: :image, width: 1920, height: 1080 %>
-        <%= f.error_message_on :image %>
+        <%= f.spree_file_field :image, width: 1920, height: 1080 %>
       </div>
       <div class="card-body">
-        <%= f.label :square_image, Spree.t(:square_image) %>
-        <p class="text-muted form-text">
-          Used for the featured image on the homepage.
-        </p>
-        <%= render 'active_storage/upload_form', form: f, field_name: :square_image, width: 400, height: 400, crop: true %>
-        <%= f.error_message_on :square_image %>
+        <%= f.spree_file_field :square_image, width: 400, height: 400, crop: true, help: "Used for the featured image on the homepage." %>
       </div>
     </div>
 

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

@@ -39,7 +39,7 @@
       <div class="d-flex justify-content-end w-100">
         <%= 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? %>
         <%= dropdown do %>
-          <%= dropdown_toggle class: 'btn-light btn-sm' do %>
+          <%= dropdown_toggle class: 'btn-light btn-sm h-100' do %>
             <%= icon('dots-vertical', class: 'mr-0') %>
           <% end %>
           <%= dropdown_menu do %>

data/app/views/spree/admin/translations/translation_rows/_permalink_field_row.html.erb

@@ -10,15 +10,4 @@
   translated_value = f.object.send("#{field}_#{locale}")&.delete_prefix(base_permalink_translated)
 %>
 
-<div class="form-group">
-  <%= f.label field, Spree.t(field) %>
-  <div class="input-group">
-    <% if base_permalink_translated.present? %>
-      <div class="input-group-prepend">
-        <span class="input-group-text"><%= base_permalink_translated %></span>
-      </div>
-    <% end %>
-
-    <%= f.text_field "#{field}_#{locale}", value: translated_value, class: 'form-control' %>
-  </div>
-</div>
+<%= f.spree_text_field "#{field}_#{locale}", label: Spree.t(field), value: translated_value, prepend: base_permalink_translated.presence %>

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

@@ -1,17 +1,22 @@
-<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap", data: {controller: "filters dropdown"} do |f| %>
-  <div class="d-flex flex-column flex-lg-row gap-2">
-    <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %>
+<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
+    <div class="d-flex flex-column flex-lg-row gap-2">
+      <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %>
 
-    <%= render "spree/admin/shared/calendar_range_picker",
-          date_from_input_name: "q[created_at_gt]",
-          date_to_input_name: "q[created_at_lt]",
-          date_from_value: params.dig(:q, :created_at_gt),
-          date_to_value: params.dig(:q, :created_at_lt),
-          dropdown_direction: "right" %>
+      <%= render "spree/admin/shared/calendar_range_picker",
+            date_from_input_name: "q[created_at_gt]",
+            date_to_input_name: "q[created_at_lt]",
+            date_from_value: params.dig(:q, :created_at_gt),
+            date_to_value: params.dig(:q, :created_at_lt) %>
 
-    <%= render 'spree/admin/shared/filters_button' %>
-  </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+      <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+        <%= icon "adjustments", class: "mr-1" %>
+        <%= Spree.t("admin.filters") %>
+      <% end %>
+    </div>
+
+  <dialog class="drawer" data-dialog-target="dialog" id="user-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
     <div class="form-group">
       <%= f.label :bill_address_firstname_i_cont_any, Spree.t(:first_name) %>
       <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-control", data: { filters_target: :input } %>
@@ -23,7 +28,7 @@
     <div class="form-group">
       <%= f.label :addresses_country_name_eq, Spree.t(:location) %>
       <%= tom_select_tag "q[addresses_country_name_eq]",
-      active_option: params[:q][:addresses_country_name_eq],
+      active_option: params.dig(:q, :addresses_country_name_eq),
       options: Spree::Country.all.to_tom_select_json,
       value_field: :name,
       select_class: "w-100",
@@ -34,7 +39,7 @@
     <div class="form-group">
       <%= f.label :tags_name_in, Spree.t(:tags) %>
       <%= tom_select_tag "q[tags_name_in]",
-      active_option: params[:q][:tags_name_in],
+      active_option: params.dig(:q, :tags_name_in),
       options: user_tags_json_array,
       multiple: true,
       value_field: :name,
@@ -46,7 +51,7 @@
     <div class="form-group">
       <%= f.label :accepts_email_marketing_eq, Spree.t(:accepts_email_marketing) %>
       <%= f.select :accepts_email_marketing_eq,
-                options_for_select([["Yes", true], ["No", false]], params[:q][:accepts_email_marketing_eq]),
+                options_for_select([["Yes", true], ["No", false]], params.dig(:q, :accepts_email_marketing_eq)),
                 { include_blank: true },
                 { class: "custom-select", data: { filters_target: :input } } %>
     </div>
@@ -63,8 +68,12 @@
       } %>
     </div>
     <%= render_admin_partials(:users_filters_partials, f: f) %>
-    <%= render 'spree/admin/shared/filter_submit' %>
-  </div>
+    </div>
+    <div class="drawer-footer">
+      <%= drawer_discard_button('dialog') %>
+      <%= render 'spree/admin/shared/filter_submit' %>
+    </div>
+  </dialog>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
 

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

@@ -63,7 +63,7 @@
           </div>
         <% end %>
       </div>
-      <%= render "spree/admin/shared/index_table_options", collection: @collection if @collection.any? %>
+      <%= render "spree/admin/shared/index_table_options", collection: @collection %>
     <% else %>
       <%= render "spree/admin/shared/no_resource_found" %>
     <% end %>