spree_admin 5.1.7 → 5.2.0.rc1

data/app/views/spree/admin/promotions/_actions.html.erb

@@ -1,13 +1,11 @@
-<div class="card mb-4 bg-transparent">
-  <div class="card-header d-flex justify-content-between border-0 px-2">
+<div class="card mb-4">
+  <div class="card-header d-flex justify-content-between px-3 border-0">
     <h5 class="card-title">
       <%= icon('bolt', class: 'mr-2') %>
       <%= Spree.t(:promotion_actions) %>
     </h5>
     <% if can?(:create, Spree::PromotionAction.new(promotion: @promotion)) %>
-      <span data-toggle="modal" data-target="#modal">
-        <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-primary btn-sm', data: { turbo_frame: 'dialog_modal' } %>
-      </span>
+      <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-primary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
     <% end %>
   </div>
   <div class="card-body d-flex flex-column gap-2 px-2 pt-0 pb-2">
@@ -15,9 +13,7 @@
       <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::PromotionAction)) %>
         <% if can?(:create, Spree::PromotionAction.new(promotion: @promotion)) %>
-          <span data-toggle="modal" data-target="#modal">
-            <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-light btn-sm ml-3', data: { turbo_frame: 'dialog_modal' } %>
-          </span>
+          <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-light btn-sm ml-3', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
         <% end %>
       </div>
     <% else %>

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

@@ -1,17 +1,13 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], 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: :name_cont, label: Spree.t(:name) %>
     <%= render "spree/admin/promotions/table_filter_dropdown" %>
     <%= render 'spree/admin/shared/filters_button' %>
   </div>
-  <div data-reveal-target="item" class="d-none" id="table-filter">
-    <div class="row">
-      <div class="col-12 col-lg-6">
-        <div class="form-group">
-          <%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>
-          <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-control", data: { filters_target: :input } %>
-        </div>
-      </div>
+  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+    <div class="form-group">
+      <%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>
+      <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-control", data: { filters_target: :input } %>
     </div>
     <%= render_admin_partials(:promotions_filters_partials, f: f) %>
     <%= render 'spree/admin/shared/filter_submit' %>

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

@@ -0,0 +1,36 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:details) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <%= f.spree_text_field :name, required: true, autofocus: true, help: 'Customers will see this in their cart and at checkout.' %>
+  </div>
+</div>
+
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:kind) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <%= render 'spree/admin/promotions/form/kind', f: f %>
+  </div>
+</div>
+
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:settings) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <%= render 'spree/admin/promotions/form/settings', f: f %>
+  </div>
+</div>
+
+<p class="alert alert-info text-center">
+  In the next step you will be able to add actions and rules to your promotion
+</p>

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -1,13 +1,11 @@
-<div class="card mb-4 bg-transparent">
-  <div class="card-header d-flex justify-content-between px-2">
+<div class="card mb-4">
+  <div class="card-header d-flex justify-content-between px-3">
     <h5 class="card-title">
       <%= icon('checklist', class: 'mr-2') %>
       <%= Spree.t(:rules) %>
     </h5>
     <% if can?(:create, Spree::PromotionRule.new(promotion: @promotion)) %>
-      <span data-toggle="modal" data-target="#modal">
-        <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-primary btn-sm', data: { turbo_frame: 'dialog_modal' } %>
-      </span>
+      <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-primary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
     <% end %>
   </div>
   <div class="card-body">
@@ -29,9 +27,7 @@
       <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::PromotionRule)) %>
         <% if can?(:create, Spree::PromotionRule.new(promotion: @promotion)) %>
-          <span data-toggle="modal" data-target="#modal">
-            <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-light btn-sm ml-3', data: { turbo_frame: 'dialog_modal' } %>
-          </span>
+          <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-light btn-sm ml-3', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
         <% end %>
       </div>
     <% else %>

data/app/views/spree/admin/promotions/_sidebar.html.erb

@@ -49,7 +49,7 @@
             <%= Spree.t(:created_at) %>
           </span>
           <span>
-            <%= local_time(@promotion.created_at, format: :long) %>
+            <%= spree_time(@promotion.created_at, format: :long) %>
           </span>
         </li>
 
@@ -58,7 +58,7 @@
             <%= Spree.t(:updated_at) %>
           </span>
           <span>
-            <%= local_time(@promotion.updated_at, format: :long) %>
+            <%= spree_time(@promotion.updated_at, format: :long) %>
           </span>
         </li>
 
@@ -106,7 +106,7 @@
             <%= I18n.t('activerecord.attributes.spree/promotion.starts_at') %>
           </span>
           <% if @promotion.starts_at %>
-            <span><%= local_time(@promotion.starts_at) %></span>
+            <span><%= spree_time(@promotion.starts_at) %></span>
           <% else %>
             <span class="text-muted"><%= Spree.t(:not_available) %></span>
           <% end %>
@@ -116,7 +116,7 @@
             <%= Spree.t(:expires_at) %>
           </span>
           <% if @promotion.expires_at %>
-            <span><%= local_time(@promotion.expires_at) %></span>
+            <span><%= spree_time(@promotion.expires_at) %></span>
           <% else %>
             <span class="text-muted"><%= Spree.t(:not_available) %></span>
           <% end %>

data/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb

@@ -1,11 +1,11 @@
-<div class="dropdown">
-  <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+<%= dropdown do %>
+  <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
     <span class="text-muted font-weight-normal mr-1">
       <%= Spree.t(:status) %>
-    </span> 
+    </span>
     <%= promotion_filter_dropdown_value %>
-  </button>
-  <div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">
+  <% end %>
+  <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' do %>
     <%= active_link_to 'All Promotions', params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[expired active] ).all?(&:blank?) %>
     <%= link_to Spree.t(:expired),
       params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: true}}),
@@ -13,5 +13,5 @@
     <%= link_to Spree.t(:active),
       params.to_unsafe_h.deep_merge({page: nil, q: {active: true, expired: false}}),
       class: "dropdown-item #{'active' if params[:q][:active]}" %>
-  </div>
-</div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,7 @@
+<tr>
+  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t(:code) %></th>
+  <th scope="col"><%= Spree.t(:kind) %></th>
+  <th scope="col"><%= Spree.t(:usage_limit) %></th>
+  <th scope="col"><%= Spree.t(:status) %></th>
+</tr>

data/app/views/spree/admin/promotions/{_promotion.html.erb → _table_row.html.erb}

@@ -1,6 +1,6 @@
 <tr id="<%= spree_dom_id promotion %>" data-controller="row-link">
-  <td class="w-20 p-0">
-    <%= link_to promotion.name, spree.admin_promotion_path(promotion), class: 'font-weight-bold d-block py-2 px-3 w-100 h-100', data: { row_link_target: :link } %>
+  <td class="w-30 p-0">
+    <%= link_to promotion.name, spree.admin_promotion_path(promotion), class: 'font-weight-bold d-block py-2 px-3 w-100 h-100', data: { row_link_target: :link, turbo_frame: '_top' } %>
   </td>
     <td class="w-20 cursor-pointer" data-action="click->row-link#openLink">
       <% if promotion.coupon_code? && promotion.code.present? %>
@@ -28,7 +28,4 @@
   <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
     <%= render 'spree/admin/promotions/status', promotion: promotion %>
   </td>
-  <td class="actions w-10">
-    <%= link_to_with_icon 'edit', Spree.t(:edit), spree.admin_promotion_path(promotion), icon: 'pencil', class: 'btn btn-sm btn-light' %>
-  </td>
 </tr>

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

@@ -14,7 +14,7 @@
           <%= f.label :name %>
           <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>
           <%= f.error_message_on :name %>
-          <span class="form-text text-muted mt-2">
+          <span class="form-text mt-2">
             Customers will see this in their cart and at checkout.
           </span>
         </div>

data/app/views/spree/admin/promotions/form/_kind.html.erb

@@ -1,57 +1,61 @@
-<div class="custom-control custom-radio">
-  <%= f.radio_button :kind, :coupon_code, data: { toggle: :collapse, target: '#coupon-code' }, class: 'custom-control-input' %>
-  <%= f.label :kind_coupon_code, Spree.t(:coupon_code), class: 'custom-control-label' %>
+<div data-controller="reveal" data-reveal-hidden-class="hidden">
+  <div class="custom-control custom-radio">
+    <%= f.radio_button :kind, :coupon_code, data: { action: 'change->reveal#show' }, class: 'custom-control-input' %>
+    <%= f.label :kind_coupon_code, Spree.t(:coupon_code), class: 'custom-control-label' %>
 
-  <div id="coupon-code" class="rounded p-3 bg-gray-25 mt-3 collapse <% unless @promotion.automatic? %>show<% end %>">
-    <div class="d-flex align-items-start custom-control custom-radio">
-      <%= f.radio_button :multi_codes, false, data: { toggle: :collapse, target: '#single-code' }, class: 'custom-control-input' %>
-      <%= f.label :multi_codes_false, class: 'custom-control-label' do %>
-        One code for all customers
-        <span class="form-text text-muted font-weight-normal mr-1">
-          You can limit the number of times this code can be used.
-        </span>
-      <% end %>
-    </div>
-    <div id="single-code" class="mb-4 mt-2 ml-4 collapse <% unless @promotion.multi_codes? %>show<% end %>" data-parent="#coupon-code">
-      <%= f.text_field :code, class: 'form-control text-uppercase', placeholder: 'Your coupon code' %>
-    </div>
+    <div data-reveal-target="item" class="rounded p-3 bg-light mt-3 <% if @promotion.automatic? %>hidden<% end %>">
+      <div data-controller="reveal" data-reveal-hidden-class="hidden">
+        <div class="d-flex align-items-start custom-control custom-radio">
+          <%= f.radio_button :multi_codes, false, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %>
+          <%= f.label :multi_codes_false, class: 'custom-control-label' do %>
+            One code for all customers
+            <span class="form-text font-weight-normal mr-1">
+              You can limit the number of times this code can be used.
+            </span>
+          <% end %>
+        </div>
+        <div data-reveal-target="item" class="mb-4 mt-2 ml-4 <% if @promotion.multi_codes? %>hidden<% end %>">
+          <%= f.text_field :code, class: 'form-control text-uppercase', placeholder: 'Your coupon code' %>
+        </div>
 
-    <div class="mt-2 d-flex align-items-start custom-control custom-radio">
-      <%= f.radio_button :multi_codes, true, data: { toggle: :collapse, target: '#multi-codes' }, class: 'custom-control-input' %>
-      <%= f.label :multi_codes_true, class: 'custom-control-label' do %>
-        Generate unique codes
-        <span class="form-text text-muted font-weight-normal mr-1">
-          These codes are generated automatically and can be downloaded as a CSV file. Codes are unique and can only be used once.
-        </span>
-      <% end %>
-    </div>
-    <div id="multi-codes" class="ml-3 mt-2 row collapse <% if @promotion.multi_codes? %>show<% end %>" data-parent="#coupon-code">
-      <div class="col-6">
-        <%= f.text_field :code_prefix, class: 'form-control text-uppercase', placeholder: 'Coupon Prefix (optional)' %>
-        <span class="form-text text-muted">
-          eg. <strong>ABC</strong>
-        </span>
-      </div>
-      <div class="col-6">
-        <% minimum_number_of_codes = @promotion.persisted? && @promotion.coupon_codes.count.positive? ? @promotion.coupon_codes.count : 1 %>
-        <% maximum_number_of_codes = ENV.fetch('PROMOTION_MAX_NUMBER_OF_CODES', 5000) %>
-        <%= f.number_field :number_of_codes, class: 'form-control', placeholder: 'Number of codes', min: minimum_number_of_codes, max: maximum_number_of_codes, step: 1 %>
-        <span class="form-text text-muted">
-          How many codes you want to generate.
-          <% if @promotion.persisted? %>
-            To add more codes just increase this number
+        <div class="mt-2 d-flex align-items-start custom-control custom-radio">
+          <%= f.radio_button :multi_codes, true, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %>
+          <%= f.label :multi_codes_true, class: 'custom-control-label' do %>
+            Generate unique codes
+            <span class="form-text font-weight-normal mr-1">
+              These codes are generated automatically and can be downloaded as a CSV file. Codes are unique and can only be used once.
+            </span>
           <% end %>
-        </span>
+        </div>
+        <div data-reveal-target="item" class="ml-3 mt-2 row <% unless @promotion.multi_codes? %>hidden<% end %>">
+          <div class="col-6">
+            <%= f.text_field :code_prefix, class: 'form-control text-uppercase', placeholder: 'Coupon Prefix (optional)' %>
+            <span class="form-text">
+              eg. <strong>ABC</strong>
+            </span>
+          </div>
+          <div class="col-6">
+            <% minimum_number_of_codes = @promotion.persisted? && @promotion.coupon_codes.count.positive? ? @promotion.coupon_codes.count : 1 %>
+            <% maximum_number_of_codes = ENV.fetch('PROMOTION_MAX_NUMBER_OF_CODES', 5000) %>
+            <%= f.number_field :number_of_codes, class: 'form-control', placeholder: 'Number of codes', min: minimum_number_of_codes, max: maximum_number_of_codes, step: 1 %>
+            <span class="form-text">
+              How many codes you want to generate.
+              <% if @promotion.persisted? %>
+                To add more codes just increase this number
+              <% end %>
+            </span>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-</div>
 
-<div class="mt-4 custom-control custom-radio">
-  <%= f.radio_button :kind, :automatic, data: { toggle: :collapse, target: '#coupon-code' }, class: 'custom-control-input' %>
-  <%= f.label :kind_automatic, Spree.t(:automatic_promotion), class: 'custom-control-label' %>
+  <div class="mt-4 custom-control custom-radio">
+    <%= f.radio_button :kind, :automatic, data: { action: 'change->reveal#hide' }, class: 'custom-control-input' %>
+    <%= f.label :kind_automatic, Spree.t(:automatic_promotion), class: 'custom-control-label' %>
 
-  <p class="form-text text-muted mt-2 mb-0">
-    This promotion will be automatically applied to all eligible orders.
-  </p>
+    <p class="form-text mt-2 mb-0">
+      This promotion will be automatically applied to all eligible orders.
+    </p>
+  </div>
 </div>

data/app/views/spree/admin/promotions/form/_settings.html.erb

@@ -1,11 +1,5 @@
 <% unless @promotion.multi_codes? %>
-  <div class="form-group">
-    <%= f.label :usage_limit, Spree.t('limit_usage_to') %>
-    <%= f.number_field :usage_limit, min: 0, step: 1, class: 'form-control' %>
-    <span class="form-text text-muted mt-2">
-      Leave this field blank for unlimited usage.
-    </span>
-  </div>
+  <%= f.spree_number_field :usage_limit, min: 0, step: 1, help: 'Leave this field blank for unlimited usage.' %>
 <% end %>
 
 <div class="form-group">
@@ -18,7 +12,7 @@
   <%= f.label :expires_at %>
   <%= f.datetime_field :expires_at, class: 'form-control' %>
   <%= f.error_message_on :expires_at %>
-  <span class="form-text text-muted mt-2">
+  <span class="form-text mt-2">
     Leave this field blank for no expiration.
   </span>
 </div>

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

@@ -9,29 +9,4 @@
 
 <%= render_admin_partials(:promotions_header_partials) %>
 
-<div class="card-lg">
-  <%= render 'filters' %>
-
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <tr>
-            <th><%= Spree.t(:name) %></th>
-            <th><%= Spree.t(:code) %></th>
-            <th><%= Spree.t(:kind) %></th>
-            <th><%= Spree.t(:usage_limit) %></th>
-            <th><%= Spree.t(:status) %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <%= render collection: @collection, partial: "spree/admin/promotions/promotion", cached: spree_base_cache_scope %>
-        </tbody>
-      </table>
-    </div>
-    <%= render "spree/admin/shared/index_table_options", collection: @collection %>
-  <% else %>
-    <%= render "spree/admin/shared/no_resource_found" %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table' %>

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

@@ -1,57 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_promotions_path, @promotion %>
-  <%= Spree.t(:new_promotion) %>
-<% end %>
-<%= form_for :promotion, url: collection_url do |f| %>
-
-  <div class="row">
-    <div class="col-12 col-lg-6 offset-lg-3">
-      <%= render 'spree/admin/shared/error_messages', target: @promotion %>
-
-      <div class="card mb-4">
-        <div class="card-header">
-          <h5 class="card-title">
-            <%= Spree.t(:details) %>
-          </h5>
-        </div>
-        <div class="card-body">
-          <div class="form-group">
-            <%= f.label :name %>
-            <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>
-            <%= f.error_message_on :name %>
-            <span class="form-text text-muted mt-2">
-              Customers will see this in their cart and at checkout.
-            </span>
-          </div>
-        </div>
-      </div>
-
-      <div class="card mb-4">
-        <div class="card-header">
-          <h5 class="card-title">
-            <%= Spree.t(:kind) %>
-          </h5>
-        </div>
-        <div class="card-body">
-          <%= render 'spree/admin/promotions/form/kind', f: f %>
-        </div>
-      </div>
-
-      <div class="card mb-4">
-        <div class="card-header">
-          <h5 class="card-title">
-            <%= Spree.t(:settings) %>
-          </h5>
-        </div>
-        <div class="card-body">
-          <%= render 'spree/admin/promotions/form/settings', f: f %>
-        </div>
-      </div>
-
-      <p class="alert alert-info text-center">
-        In the next step you will be able to add actions and rules to your promotion
-      </p>
-      <%= render 'spree/admin/shared/new_resource_links' %>
-    </div>
-  </div>
-<% end %>
+<%= render 'spree/admin/shared/new_resource' %>

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

@@ -0,0 +1,5 @@
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters"} do |f| %>
+  <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
+  <%= render "spree/admin/shared/filter_badge_template" %>
+  <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
+<% end %>

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

@@ -1,22 +1,8 @@
-<div data-controller="slug-form">
-  <div class="form-group">
-    <%= f.label :presentation, raw(Spree.t(:presentation) + required_span_tag) %>
-    <%= f.text_field :presentation, class: 'form-control', data: { slug_form_target: :name, action: 'input->slug-form#updateUrlFromName' }, required: true, autofocus: f.object.new_record? %>
-    <%= f.error_message_on :presentation %>
-  </div>
-  <div class="form-group">
-    <%= f.label :name, Spree.t(:internal_name) %>
-    <%= f.text_field :name, class: 'form-control', data: { slug_form_target: :url }, required: true %>
-    <%= f.error_message_on :name %>
-  </div>
-  <div class="form-group">
-    <%= f.label :kind, Spree.t(:kind) %>
-    <%= f.select :kind, options_for_select(Spree::Property.kinds.map{ |k| [k.first.humanize, k.first.to_sym] }, @object.kind), {}, { class: 'custom-select' } %>
-    <%= f.error_message_on :kind %>
-  </div>
-  <div class="form-group">
-    <%= f.label :display_on, Spree.t(:display_on) %>
-    <%= f.select :display_on, display_on_options, {}, { class: 'custom-select' } %>
-    <%= f.error_message_on :display_on %>
-  </div>
-</div>
+<div data-controller="slug-form" class="card mb-4">
+  <div class="card-body">
+    <%= f.spree_text_field :presentation, data: { slug_form_target: :name, action: 'input->slug-form#updateUrlFromName' }, required: true, autofocus: f.object.new_record? %>
+    <%= f.spree_text_field :name, label: Spree.t(:internal_name), data: { slug_form_target: :url }, required: true %>
+    <%= f.spree_select :kind, options_for_select(Spree::Property.kinds.map{ |k| [k.first.humanize, k.first.to_sym] }, @object.kind) %>
+    <%= f.spree_select :display_on, display_on_options, { label: Spree.t(:display_on) } %>
+  </div>
+</div>

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

@@ -0,0 +1,9 @@
+<tr>
+  <th class="no-border handel-head"></th>
+  <th scope="col"><%= Spree.t(:internal_name) %></th>
+  <th scope="col"><%= Spree.t(:presentation) %></th>
+  <th scope="col"><%= Spree.t(:kind) %></th>
+  <th scope="col"><%= Spree.t(:products) %></th>
+  <th scope="col"><%= Spree.t(:visibility) %></th>
+  <th scope="col"></th>
+</tr>

data/app/views/spree/admin/properties/{_property.html.erb → _table_row.html.erb}

@@ -6,7 +6,7 @@
     <code><%= property.name %></code>
   </td>
   <td class="w-20 cursor-pointer" data-action="click->row-link#openLink">
-    <%= link_to property.presentation, spree.edit_admin_property_path(property), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link } %>
+    <%= link_to property.presentation, spree.edit_admin_property_path(property), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, turbo_frame: '_top' } %>
   </td>
   <td class="w-20 cursor-pointer" data-action="click->row-link#openLink">
     <span class="badge badge-light"><%= property.kind.humanize %></span>
@@ -20,6 +20,6 @@
     <% end %>
   </td>
   <td class="w-10 actions">
-    <%= link_to_edit(property, class: 'btn btn-light btn-sm') if can?(:edit, property) %>
+    <%= link_to_edit(property, class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' }) if can?(:edit, property) %>
   </td>
 </tr>

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

@@ -1,22 +1,2 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button admin_properties_url %>
-  <%= @property.presentation %>
-<% end %>
 
-<% content_for :page_actions_dropdown do %>
-  <%= link_to_edit_translations(@property) %>
-<% end %>
-
-<%= form_for [:admin, @property] do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <div class="card mb-4">
-        <div class="card-body">
-          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
-          <%= render 'form', f: f %>
-        </div>
-      </div>
-      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-    </div>
-  </div>
-<% end %>
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -10,47 +10,12 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:properties_actions_partials) %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_property), new_object_url, class: "btn btn-primary" %>
-<% end if can?(:create, Spree::Property)  %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_property), new_object_url, class: "btn btn-primary" if can?(:create, Spree::Property) %>
+<% end  %>
 
 <%= render_admin_partials(:properties_header_partials) %>
 
-<div class="card-lg">
-  <%= search_form_for [:admin, @search], 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" %>
-    <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-  <% end %>
-
-  <% if @properties.present? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <tr>
-            <th class="no-border handel-head"></th>
-            <th><%= Spree.t(:internal_name) %></th>
-            <th><%= Spree.t(:presentation) %></th>
-            <th><%= Spree.t(:kind) %></th>
-            <th><%= Spree.t(:products) %></th>
-            <th><%= Spree.t(:visibility) %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody
-          data-controller="sortable"
-          data-sortable-handle-value=".move-handle"
-          data-sortable-resource-name-value="property"
-          data-sortable-response-kind-value="turbo-stream"
-        >
-          <%= render partial: "spree/admin/properties/property", collection: @collection, cached: spree_base_cache_scope %>
-        </tbody>
-      </table>
-      <%= render "spree/admin/shared/index_table_options", collection: @collection %>
-    </div>
-  <% else %>
-    <%= render "spree/admin/shared/no_resource_found" %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table', sortable: true %>
 
 <p class="documentation-link-container">
   <%= external_link_to "Learn more about properties", "https://spreecommerce.org/docs/user/manage-products/product-properties" %>

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

@@ -1,18 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_properties_path %>
-  <%= Spree.t(:new_property) %>
-<% end %>
-
-<%= form_for [:admin, @property] do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <div class="card mb-4">
-        <div class="card-body">
-          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
-          <%= render 'form', f: f %>
-        </div>
-      </div>
-      <%= render 'spree/admin/shared/new_resource_links' %>
-    </div>
-  </div>
-<% end %>
+<%= render 'spree/admin/shared/new_resource' %>

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

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/named_types/form', f: f %>

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

@@ -0,0 +1,6 @@
+<tr>
+  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t(:status) %></th>
+  <th scope="col"><%= Spree.t(:mutable) %></th>
+  <th scope="col"></th>
+</tr>