spree_admin 5.0.0 → 5.0.1

data/app/views/spree/admin/orders/billing_address/edit.html.erb

@@ -1,10 +1,7 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
-      </div>
+      <%= modal_header(Spree.t(:billing_address)) %>
       <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
         <div>
           <% if @order.shipping_address.present? %>
@@ -33,8 +30,8 @@
         </div>
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

data/app/views/spree/admin/orders/billing_address/new.html.erb

@@ -1,10 +1,7 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:billing_address)) %>
       <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
         <div>
           <% if @order.shipping_address.present? %>
@@ -26,8 +23,8 @@
         </div>
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.save') %>
       </div>
     </div>

data/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb

@@ -1,10 +1,7 @@
 <%= turbo_stream.update :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_billing_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
-      </div>
+      <%= modal_header(Spree.t(:update_billing_address)) %>
       <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
         <div>
           <% if @order.shipping_address.present? %>
@@ -26,8 +23,8 @@
         </div>
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

data/app/views/spree/admin/orders/contact_information/edit.html.erb

@@ -1,18 +1,15 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @order, url: spree.admin_order_contact_information_path(@order), method: :put, data: { turbo_frame: :_top } do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_contact_information) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-      </div>
+      <%= modal_header(Spree.t(:update_contact_information)) %>
       <div class="modal-body">
         <div class="form-group">
           <%= f.label :email, Spree.t(:email) %>
           <%= f.email_field :email, class: 'form-control', required: true %>
         </div>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

data/app/views/spree/admin/orders/customer_returns/edit.html.erb

@@ -110,16 +110,7 @@
         reimbursements: @customer_return.reimbursements,
       } %>
     <% else %>
-      <div
-        class="
-          text-muted p-5 d-flex align-items-center w-100 justify-content-center
-        "
-      >
-        <%= Spree.t(
-          :no_resource_found,
-          resource: plural_resource_name(Spree::Reimbursement),
-        ) %>
-      </div>
+      <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
     <% end %>
   </div>
 </div>

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

@@ -10,7 +10,7 @@
   <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.admin_orders_path, class: "btn btn-primary", data: { turbo_method: :post } if can?(:create, Spree::Order)  %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <% if params[:frame_name].present? %>
     <%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
       <%= render 'spree/admin/orders/filters', frame_name: params[:frame_name] %>

data/app/views/spree/admin/orders/return_authorizations/_form.html.erb

@@ -1,7 +1,7 @@
 <% allow_return_item_changes = !@return_authorization.customer_returned_items? %>
 
 <div data-controller="return-items">
-  <div class="table-responsive card-lg p-0 mb-4">
+  <div class="table-responsive card-lg mb-4">
     <table class="table table-condensed return-items-table">
       <thead class="text-muted">
         <tr>

data/app/views/spree/admin/orders/return_authorizations/show.html.erb

@@ -24,51 +24,53 @@ locals: {
   </div>
 <% end %>
 
-<div class="table-responsive card-lg p-0 mb-4">
-  <table class="table table-condensed return-items-table">
-    <thead class="text-muted">
-      <tr>
-        <th><%= Spree.t(:product) %></th>
-        <th><%= Spree.t(:status) %></th>
-        <th><%= Spree.t(:purchased_quantity) %></th>
-        <th><%= Spree.t(:return_quantity) %></th>
-        <th><%= Spree.t(:total) %></th>
-        <th><%= Spree.t(:refund_amount) %></th>
-        <th><%= Spree.t(:reimbursement_type) %></th>
-        <th><%= Spree.t(:exchange_for) %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @return_authorization.return_items.each do |return_item| %>
+<div class="card-lg mb-4">
+  <div class="table-responsive">
+    <table class="table table-condensed return-items-table">
+      <thead class="text-muted">
         <tr>
-          <td>
-            <div class="variant-name">
-              <%= link_to return_item.inventory_unit.variant.name,
-              spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
-            </div>
-            <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
-          </td>
-          <td><%= return_item.inventory_unit.state.humanize %></td>
-          <td class="purchased-quantity">
-            <%= return_item.line_item.quantity %>
-          </td>
-          <td><%= return_item.return_quantity %></td>
-          <td><%= return_item.pre_tax_amount %></td>
-          <td><%= return_item.display_total %></td>
-          <td><%= if return_item.preferred_reimbursement_type.present?
-              return_item.preferred_reimbursement_type.name.humanize
-            else
-              "-"
-            end %></td>
-          <td><%= if return_item.exchange_processed?
-              return_item.exchange_variant.exchange_name
-            else
-              "-"
-            end %></td>
+          <th><%= Spree.t(:product) %></th>
+          <th><%= Spree.t(:status) %></th>
+          <th><%= Spree.t(:purchased_quantity) %></th>
+          <th><%= Spree.t(:return_quantity) %></th>
+          <th><%= Spree.t(:total) %></th>
+          <th><%= Spree.t(:refund_amount) %></th>
+          <th><%= Spree.t(:reimbursement_type) %></th>
+          <th><%= Spree.t(:exchange_for) %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @return_authorization.return_items.each do |return_item| %>
+          <tr>
+            <td>
+              <div class="variant-name">
+                <%= link_to return_item.inventory_unit.variant.name,
+                spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+              </div>
+              <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
+            </td>
+            <td><%= return_item.inventory_unit.state.humanize %></td>
+            <td class="purchased-quantity">
+              <%= return_item.line_item.quantity %>
+            </td>
+            <td><%= return_item.return_quantity %></td>
+            <td><%= return_item.pre_tax_amount %></td>
+            <td><%= return_item.display_total %></td>
+            <td><%= if return_item.preferred_reimbursement_type.present?
+                return_item.preferred_reimbursement_type.name.humanize
+              else
+                "-"
+              end %></td>
+            <td><%= if return_item.exchange_processed?
+                return_item.exchange_variant.exchange_name
+              else
+                "-"
+              end %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 </div>
 
 <% if @return_authorization.reason.present? %>

data/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb

@@ -1,15 +1,12 @@
 <%= turbo_stream.update :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {turbo_frame: :_top}, method: :post do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_shipping_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:new_shipping_address)) %>
       <div class="modal-body d-flex flex-col gap-3">
         <%= render 'form', address: @address, f: f%>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.save') %>
       </div>
     </div>

data/app/views/spree/admin/orders/shipping_address/edit.html.erb

@@ -1,15 +1,12 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_shipping_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:update_shipping_address)) %>
       <div class="modal-body d-flex flex-col gap-3">
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

data/app/views/spree/admin/orders/shipping_address/new.html.erb

@@ -1,15 +1,12 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {turbo_frame: :_top}, method: :post do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_shipping_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:new_shipping_address)) %>
       <div class="modal-body d-flex flex-col gap-3">
         <%= render 'form', address: @address, f: f%>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.save') %>
       </div>
     </div>

data/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb

@@ -1,15 +1,12 @@
 <%= turbo_stream.update :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_shipping_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:update_shipping_address)) %>
       <div class="modal-body d-flex flex-col gap-3">
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

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

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], url: spree.admin_pages_path , class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], url: spree.admin_pages_path , class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
   <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -1,15 +1,12 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_with model: @page, url: spree.admin_page_path(@page), data: { controller: 'slug-form seo-form' }, scope: :page do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:page_settings) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
-      </div>
+      <%= modal_header(Spree.t(:page_settings)) %>
       <div class="modal-body">
         <%= render 'spree/admin/shared/error_messages', target: @page %>
         <%= render 'form', f: f, vertical: true %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
+      <div class="modal-footer">
         <%= turbo_save_button_tag Spree.t('actions.save'), data: {turbo_frame: :_top} %>
         <%= link_to Spree.t('actions.destroy'), spree.admin_page_path(@page.id), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'btn btn-danger' %>
       </div>

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

@@ -5,9 +5,9 @@
   <%= link_to_with_icon 'plus', Spree.t(:add_new_page), spree.new_admin_page_path, class: "btn btn-primary" if can?(:create, Spree::Page.new) %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <%= render "spree/admin/pages/filters" %>
-  <% if @pages.any? %>
+  <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
         <thead class="text-muted">
@@ -17,10 +17,10 @@
           </tr>
         </thead>
         <tbody>
-          <%= render collection: @pages, partial: "spree/admin/pages/page", cached: spree_base_cache_scope %>
+          <%= render collection: @collection, partial: "spree/admin/pages/page", cached: spree_base_cache_scope %>
         </tbody>
       </table>
-      <%= render partial: "spree/admin/shared/index_table_options", locals: { collection: @pages } %>
+      <%= render "spree/admin/shared/index_table_options", collection: @collection %>
     </div>
   <% else %>
     <%= render 'spree/admin/shared/no_resource_found' %>

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

@@ -2,15 +2,16 @@
   <%= Spree.t(:payment_methods) %>
 <% end %>
 
-<div class="table-responsive card-lg p-0 mb-4">
-  <table class="table" id='listing_shipping_methods'>
-    <thead class="text-muted">
+<div class="card-lg">
+  <div class="table-responsive">
+    <table class="table">
+      <thead class="text-muted">
       <tr>
         <th></th>
         <th><%= Spree.t(:payment_method) %></th>
         <th><%= Spree.t(:visibility) %></th>
         <th class="text-center"><%= Spree.t(:active) %></th>
-        <th class="actions"></th>
+        <th></th>
       </tr>
     </thead>
     <tbody data-controller="sortable" data-sortable-handle-value=".move-handle" data-sortable-resource-name-value="payment_method" data-sortable-response-kind-value="turbo-stream">
@@ -21,13 +22,14 @@
 
 <% if available_payment_methods.present? && can?(:create, Spree::PaymentMethod) %>
   <h5 class="pb-2 pt-3">Available Payment Methods</h5>
-  <div class="table-responsive card-lg p-0">
-    <table class="table" id='listing_shipping_methods'>
-      <thead class="text-muted">
+  <div class="card-lg">
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
         <tr>
           <th><%= Spree.t(:name) %></th>
           <th><%= Spree.t(:description) %></th>
-          <th class="actions"></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>

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

@@ -4,8 +4,8 @@
 
 <%= render 'spree/admin/shared/posts_tabs' %>
 
-<% if @post_categories.any? %>
-  <div class="card-lg p-0">
+<% if @collection.any? %>
+  <div class="card-lg">
     <div class="table-responsive rounded-lg">
       <table class="table">
         <thead class="text-muted">
@@ -15,13 +15,11 @@
           </tr>
         </thead>
         <tbody>
-          <%= render partial: 'spree/admin/post_categories/post_category', collection: @post_categories, cached: spree_base_cache_scope %>
+          <%= render collection: @collection, partial: 'spree/admin/post_categories/post_category', cached: spree_base_cache_scope %>
         </tbody>
       </table>
     </div>
   </div>
 <% else %>
-  <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-    <%= Spree.t(:no_resource_found, resource: Spree.t(:post_categories)) %>
-  </div>
+  <%= render 'spree/admin/shared/no_resource_found' %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :search_by_title, label: Spree.t(:title) %>
 
@@ -26,12 +26,7 @@
         </div>
       </div>
     </div>
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
-        <%= icon("search") %>
-        <%= Spree.t(:filter_results) %>
-      <% end %>
-    </div>
+    <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

data/app/views/spree/admin/posts/_post.html.erb

@@ -3,17 +3,7 @@
     <%= link_to spree.edit_admin_post_path(post), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark gap-3', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>
       <% if post.image.attached? && post.image.variable? %>
         <div class="admin-product-image-container">
-          <%= image_tag(
-                main_app.cdn_image_url(
-                  post.image.variant(
-                    spree_image_variant_options(resize_to_fill: [200, 130])
-                  )
-                ),
-                class: 'img-fluid',
-                loading: :lazy,
-                width: 100,
-                height: 65
-          ) %>
+          <%= spree_image_tag(post.image, width: 100, height: 65, class: 'img-fluid', loading: :lazy) %>
         </div>
       <% else %>
         <%= render 'spree/admin/shared/no_image', width: 100, height: 65 %>

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

@@ -6,10 +6,9 @@
 
 <%= render 'spree/admin/shared/posts_tabs' %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <%= render "spree/admin/posts/filters" %>
-
-  <% if @posts.any? %>
+  <% if @collection.any? %>
     <div class="table-responsive rounded-lg">
       <table class="table">
         <thead class="text-muted">
@@ -22,15 +21,12 @@
           </tr>
         </thead>
         <tbody>
-          <%= render partial: "spree/admin/posts/post", collection: @posts, cached: spree_base_cache_scope %>
+          <%= render collection: @collection, partial: "spree/admin/posts/post", cached: spree_base_cache_scope %>
         </tbody>
       </table>
     </div>
-
-    <%= render partial: "spree/admin/shared/index_table_options", locals: { collection: @posts } %>
+    <%= render "spree/admin/shared/index_table_options", collection: @collection %>
   <% else %>
-    <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-      <%= Spree.t(:no_resource_found, resource: Spree.t(:posts)) %>
-    </div>
+    <%= render 'spree/admin/shared/no_resource_found' %>
   <% end %>
 </div>