spree_admin 5.2.6 → 5.3.0.rc1

data/app/views/spree/admin/price_lists/_details.html.erb

@@ -0,0 +1,75 @@
+<div class="card mb-6" id="<%= spree_dom_id(@price_list) %>_details">
+  <div class="card-header flex justify-between">
+    <h5 class="card-title">
+      <%= Spree.t(:details) %>
+    </h5>
+    <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_price_list_path(@price_list),
+          class: 'btn btn-sm btn-light', data: { turbo_frame: :drawer, action: 'drawer#open' } %>
+  </div>
+  <div class="card-body p-0">
+    <ul class="list-group list-group-flush">
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:status) %>
+        </span>
+        <%= price_list_status_badge(@price_list) %>
+      </li>
+
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:name) %>
+        </span>
+        <span>
+          <%= @price_list.name %>
+        </span>
+      </li>
+
+      <% if @price_list.description.present? %>
+        <li class="list-group-item flex justify-between items-top gap-10">
+          <span class="text-gray-600">
+            <%= Spree.t(:description) %>
+          </span>
+          <span class="text-right">
+            <%= @price_list.description %>
+          </span>
+        </li>
+      <% end %>
+
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:starts_at) %>
+        </span>
+        <span>
+          <%= @price_list.starts_at.present? ? spree_time(@price_list.starts_at, format: :long) : Spree.t(:immediately) %>
+        </span>
+      </li>
+
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:ends_at) %>
+        </span>
+        <span>
+          <%= @price_list.ends_at.present? ? spree_time(@price_list.ends_at, format: :long) : Spree.t(:never) %>
+        </span>
+      </li>
+
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:created_at) %>
+        </span>
+        <span>
+          <%= spree_time(@price_list.created_at, format: :long) %>
+        </span>
+      </li>
+
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:updated_at) %>
+        </span>
+        <span>
+          <%= spree_time(@price_list.updated_at, format: :long) %>
+        </span>
+      </li>
+    </ul>
+  </div>
+</div>

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

@@ -0,0 +1,8 @@
+<div class="card mb-6">
+  <div class="card-body">
+    <%= f.spree_text_field :name, required: true, autofocus: true %>
+    <%= f.spree_text_area :description %>
+    <%= f.spree_date_field :starts_at %>
+    <%= f.spree_date_field :ends_at %>
+  </div>
+</div>

data/app/views/spree/admin/price_lists/_products_header.html.erb

@@ -0,0 +1,18 @@
+<div class="card-header flex justify-between items-center border-gray-200 pr-3" id="products_header">
+  <h5 class="card-title flex items-center gap-2">
+    <%= Spree.t(:products) %>
+    <span class="badge badge-info"><%= @price_list.products.distinct.count %></span>
+  </h5>
+  <div class="flex gap-2">
+    <%= link_to_with_icon 'plus', Spree.t(:add_products),
+        spree.bulk_new_admin_price_list_products_path(@price_list),
+        class: 'btn btn-sm btn-secondary',
+        data: { action: 'drawer#open', turbo_frame: :drawer } %>
+    <% if @price_list.prices.any? %>
+      <%= link_to_with_icon 'pencil-dollar', Spree.t(:edit_prices),
+          spree.edit_prices_admin_price_list_path(@price_list),
+          class: 'btn btn-sm btn-primary',
+          data: { turbo_frame: '_top' } %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,32 @@
+<div class="card mb-6">
+  <div class="card-header flex justify-between">
+    <h5 class="card-title">
+      <%= icon('checklist', class: 'mr-2') %>
+      <%= Spree.t(:rules) %>
+    </h5>
+    <% if can?(:create, Spree::PriceRule.new(price_list: @price_list)) %>
+      <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_price_list_price_rule_path(@price_list), class: 'btn btn-secondary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
+    <% end %>
+  </div>
+  <div class="card-body pb-0">
+    <%= form_with model: @price_list, url: spree.admin_price_list_path(@price_list), method: :put, data: { controller: 'auto-submit' }, html: { class: 'flex gap-x-6' } do |f| %>
+      <% Spree::PriceList::MATCH_POLICIES.each do |policy| %>
+        <%= f.spree_radio_button :match_policy, policy, { data: { action: 'click->auto-submit#submit' }, label: Spree.t("price_list_form.match_policies.#{policy}") } %>
+      <% end %>
+    <% end %>
+  </div>
+  <div class="card-body p-2 flex flex-col gap-2">
+    <% if @price_list.price_rules.empty? %>
+      <div class="text-gray-600 p-12 flex items-center w-full justify-center">
+        <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::PriceRule)) %>
+        <% if can?(:create, Spree::PriceRule.new(price_list: @price_list)) %>
+          <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_price_list_price_rule_path(@price_list), class: 'btn btn-secondary btn-sm ml-6', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
+        <% end %>
+      </div>
+    <% else %>
+      <%= render collection: @price_list.price_rules,
+                 partial: 'spree/admin/price_rules/price_rule',
+                 as: :price_rule %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,7 @@
+<tr>
+  <th class="no-border handel-head"></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t(:status) %></th>
+  <th scope="col"><%= Spree.t(:starts_at) %></th>
+  <th scope="col"><%= Spree.t(:ends_at) %></th>
+</tr>

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

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/edit_resource_in_drawer' %>

data/app/views/spree/admin/price_lists/edit_prices.html.erb

@@ -0,0 +1,138 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button(spree.admin_price_list_path(@price_list)) %>
+  <%= @price_list.name %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= turbo_save_button_tag Spree.t('actions.save'), form: "edit_price_list_#{@price_list.id}" %>
+<% end %>
+
+<%# Use currency's decimal mark for consistent formatting regardless of I18n locale %>
+<% currency_obj = ::Money::Currency.find(@currency) %>
+<% decimal_separator = currency_obj.decimal_mark %>
+<% thousands_separator = currency_obj.thousands_separator %>
+<%= form_with model: [:admin, @price_list],
+              method: :patch,
+              html: { class: 'relative', id: "edit_price_list_#{@price_list.id}" },
+              data: {
+                controller: 'bulk-editor',
+                action: 'keydown.ctrl+a->bulk-editor#selectAll keydown.meta+a->bulk-editor#selectAll',
+                bulk_editor_locale_value: I18n.locale,
+                bulk_editor_decimal_separator_value: decimal_separator,
+                bulk_editor_thousands_separator_value: thousands_separator,
+              } do |f| %>
+
+  <div class="card mb-6">
+    <div class="card-header flex justify-between items-center border-gray-200 pr-2">
+      <div class="flex items-center gap-4">
+        <h5 class="card-title"><%= Spree.t(:prices) %> (<%= @currency %>)</h5>
+        <span class="text-sm text-gray-500 hidden" data-bulk-editor-target="statusBar"></span>
+      </div>
+      <%= select_tag :currency,
+          options_for_select(current_store.supported_currencies_list, @currency),
+          class: 'form-select w-auto',
+          onchange: "window.Turbo.visit('#{spree.edit_prices_admin_price_list_path(@price_list)}?currency=' + this.value)" %>
+    </div>
+
+    <div class="card-body p-0">
+
+      <% if @prices.any? %>
+        <%
+          # Group prices by product for display
+          prices_by_product = @prices.group_by { |price| price.variant.product }
+          row_index = 0
+        %>
+
+        <table class="table" data-bulk-editor-target="table">
+          <thead>
+            <tr>
+              <th class="border-r rounded-none"><%= Spree.t(:title) %></th>
+              <th class="border-r"><%= Spree.t(:sku) %></th>
+              <th class="border-r w-36"><%= Spree.t(:price) %></th>
+              <th class="rounded-none"><%= Spree.t(:compare_at_price) %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% prices_by_product.each do |product, prices| %>
+              <%# Product header row %>
+              <tr class="bg-gray-50">
+                <td class="border-r">
+                  <div class="flex items-center gap-3">
+                    <%= render 'spree/admin/shared/product_image', object: product, variant: :mini, width: 32, height: 32 %>
+                    <span class="font-medium text-gray-900"><%= product.name %></span>
+                  </div>
+                </td>
+                <td class="border-r"></td>
+                <td class="border-r"></td>
+                <td></td>
+              </tr>
+              <%# Variant rows %>
+              <% prices.each do |price| %>
+                <%= f.fields_for :prices, price, child_index: row_index do |pf| %>
+                  <tr data-bulk-editor-target="row">
+                    <td class="pl-14 pr-4 py-2 text-sm text-gray-600 border-r w-40"><%= price.variant.options_text.presence %></td>
+                    <td class="px-4 py-2 text-sm text-gray-400 font-mono border-r w-30"><%= price.variant.sku %></td>
+                    <td class="p-0 border-r w-15 bulk-editor-cell">
+                      <%= pf.hidden_field :id %>
+                      <%= pf.hidden_field :variant_id %>
+                      <%= pf.hidden_field :currency %>
+                      <label class="flex items-center cursor-cell m-0">
+                        <span class="pl-4 text-gray-500 pointer-events-none"><%= @currency_symbol %></span>
+                        <% formatted_amount = price.amount.present? ? format('%.2f', price.amount).tr('.', decimal_separator) : '' %>
+                        <%= pf.text_field :amount,
+                            value: formatted_amount,
+                            placeholder: "",
+                            inputmode: 'decimal',
+                            class: 'w-full pl-1 pr-4 py-2 border-0 shadow-none outline-none text-right tabular-nums bg-transparent',
+                            data: {
+                              bulk_editor_target: 'cell',
+                              row: row_index,
+                              col: 0,
+                              action: bulk_editor_cell_actions,
+                              original_value: formatted_amount
+                            } %>
+                      </label>
+                    </td>
+                    <td class="p-0 w-15 bulk-editor-cell">
+                      <label class="flex items-center cursor-cell m-0">
+                        <span class="pl-4 text-gray-500 pointer-events-none"><%= @currency_symbol %></span>
+                        <% formatted_compare_at = price.compare_at_amount.present? ? format('%.2f', price.compare_at_amount).tr('.', decimal_separator) : '' %>
+                        <%= pf.text_field :compare_at_amount,
+                            value: formatted_compare_at,
+                            placeholder: "",
+                            inputmode: 'decimal',
+                            class: 'w-full pl-1 pr-4 py-2 border-0 shadow-none outline-none text-right tabular-nums bg-transparent',
+                            data: {
+                              bulk_editor_target: 'cell',
+                              row: row_index,
+                              col: 1,
+                              action: bulk_editor_cell_actions,
+                              original_value: formatted_compare_at
+                            } %>
+                      </label>
+                    </td>
+                  </tr>
+                  <% row_index += 1 %>
+                <% end %>
+              <% end %>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    <% else %>
+      <div class="p-8 text-center text-gray-500">
+        <p class="mb-4"><%= Spree.t(:no_products_in_price_list) %></p>
+        <%= link_to Spree.t(:add_products), spree.admin_price_list_path(@price_list), class: 'btn btn-primary' %>
+      </div>
+    <% end %>
+  </div>
+
+  <% if @prices.any? %>
+    <div class="flex gap-3 justify-end">
+      <%= link_to Spree.t('actions.discard'), spree.admin_price_list_path(@price_list), class: 'btn btn-light' %>
+      <%= f.submit Spree.t('actions.save'),
+          class: 'btn btn-primary',
+          data: { bulk_editor_target: 'saveButton' } %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,12 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:price_lists) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:price_lists_actions_partials) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_price_list), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::PriceList) %>
+<% end %>
+
+<%= render_admin_partials(:price_lists_header_partials) %>
+
+<%= render_table @collection, :price_lists, sortable: true %>

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

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/new_resource' %>

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

@@ -0,0 +1,46 @@
+<%= content_for :page_title do %>
+  <%= page_header_back_button(spree.admin_price_lists_path) %>
+  <%= @price_list.name %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <% if (@price_list.draft? || @price_list.inactive?) && can?(:activate, @price_list) %>
+    <% if @price_list.starts_at.present? %>
+      <%= link_to spree.activate_admin_price_list_path(@price_list), class: 'btn btn-primary', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_schedule'), turbo_confirm_button: Spree.t('admin.price_lists.schedule') } do %>
+        <%= icon('calendar-event', class: 'mr-1') %>
+        <%= Spree.t('admin.price_lists.schedule') %>
+      <% end %>
+    <% else %>
+      <%= link_to spree.activate_admin_price_list_path(@price_list), class: 'btn btn-primary', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_activate'), turbo_confirm_button: Spree.t('admin.price_lists.activate') } do %>
+        <%= icon('player-play', class: 'mr-1') %>
+        <%= Spree.t('admin.price_lists.activate') %>
+      <% end %>
+    <% end %>
+  <% elsif @price_list.active? && can?(:deactivate, @price_list) %>
+    <%= link_to spree.deactivate_admin_price_list_path(@price_list), class: 'btn btn-light', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_deactivate'), turbo_confirm_button: Spree.t('admin.price_lists.deactivate') } do %>
+      <%= icon('player-pause', class: 'mr-1') %>
+      <%= Spree.t('admin.price_lists.deactivate') %>
+    <% end %>
+  <% elsif @price_list.scheduled? && can?(:deactivate, @price_list) %>
+    <%= link_to spree.deactivate_admin_price_list_path(@price_list), class: 'btn btn-light', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_unschedule'), turbo_confirm_button: Spree.t('admin.price_lists.unschedule') } do %>
+      <%= icon('calendar-off', class: 'mr-1') %>
+      <%= Spree.t('admin.price_lists.unschedule') %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<div class="grid grid-cols-12 gap-6">
+  <div class="col-span-12 lg:col-span-8">
+    <%= render 'rules' %>
+    <div class="card mb-6">
+      <%= render 'products_header' %>
+      <%= turbo_frame_tag :price_list_products, src: spree.admin_price_list_products_path(@price_list) do %>
+        <%= render 'spree/admin/shared/spinner' %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="col-span-12 lg:col-span-4">
+    <%= render 'details' %>
+  </div>
+</div>

data/app/views/spree/admin/price_lists/update.turbo_stream.erb

@@ -0,0 +1,17 @@
+<% if @price_list.valid? %>
+  <%= turbo_close_drawer %>
+  <%= turbo_render_alerts %>
+
+  <%= turbo_stream.replace spree_dom_id(@price_list) + '_details' do %>
+    <%= render 'spree/admin/price_lists/details', price_list: @price_list %>
+  <% end %>
+
+  <%= turbo_stream.update 'page_title' do %>
+    <%= page_header_back_button(spree.admin_price_lists_path) %>
+    <%= @price_list.name %>
+  <% end %>
+<% else %>
+  <%= turbo_stream.replace :drawer do %>
+    <%= render 'spree/admin/shared/edit_resource_in_drawer' %>
+  <% end %>
+<% end %>

data/app/views/spree/admin/price_rules/_price_rule.html.erb

@@ -0,0 +1,28 @@
+<%= turbo_frame_tag price_rule do %>
+  <div class="card" id="<%= spree_dom_id(price_rule) %>">
+    <div class="card-header flex justify-between items-center py-3">
+      <h5 class="card-title text-base"><%= price_rule.class.human_name %></h5>
+
+      <% if can?(:update, price_rule) || can?(:destroy, price_rule) %>
+        <%= dropdown portal: false do %>
+          <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>
+            <%= icon('dots-vertical', class: 'mr-0') %>
+          <% end %>
+          <%= dropdown_menu do %>
+            <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), spree.edit_admin_price_list_price_rule_path(price_rule.price_list, price_rule), class: 'dropdown-item' if can?(:update, price_rule) %>
+            <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_price_list_price_rule_path(price_rule.price_list, price_rule), class: 'dropdown-item text-red-600 hover:bg-red-100', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top' } if can?(:destroy, price_rule) %>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+    <div class="card-body">
+      <p class="text-gray-600 mb-3">
+        <%= price_rule.class.description %>
+      </p>
+
+      <% if price_rule.preferences.present? %>
+        <%= render 'spree/admin/shared/preferences', object: price_rule %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,20 @@
+<%= turbo_frame_tag @price_rule do %>
+  <%= form_with model: @price_rule, url: spree.admin_price_list_price_rule_path(@price_list, @price_rule), method: :put, scope: :price_rule do |f| %>
+    <div class="card" id="<%= spree_dom_id(@price_rule) %>">
+      <div class="card-header flex justify-between items-center">
+        <h5 class="card-title text-base"><%= @price_rule.class.human_name %></h5>
+      </div>
+      <div class="card-body">
+        <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @price_rule } %>
+        <p class="text-gray-600 mb-3">
+          <%= @price_rule.class.description %>
+        </p>
+        <%= render "spree/admin/price_rules/forms/#{@price_rule.class.name.demodulize.underscore}", f: f %>
+      </div>
+      <div class="card-footer flex justify-between">
+        <%= turbo_save_button_tag Spree.t('actions.update') %>
+        <%= link_to Spree.t('actions.discard'), spree.admin_price_list_path(@price_list), class: 'btn btn-light' %>
+      </div>
+    </div>
+  <% end %>
+<% end %>

data/app/views/spree/admin/price_rules/forms/_customer_group_rule.html.erb

@@ -0,0 +1,9 @@
+<div class="form-group">
+  <%= f.label :preferred_customer_group_ids, Spree.t(:customer_groups) %>
+  <%= tom_select_tag "price_rule[preferred_customer_group_ids][]",
+    multiple: true,
+    url: spree.select_options_admin_customer_groups_path,
+    active_option: f.object.preferred_customer_group_ids,
+    preloaded_options: Spree::CustomerGroup.where(id: f.object.preferred_customer_group_ids).pluck(:name, :id)
+  %>
+</div>

data/app/views/spree/admin/price_rules/forms/_user_rule.html.erb

@@ -0,0 +1,7 @@
+<div class="form-group">
+  <%= f.label :preferred_user_ids, Spree.t(:users) %>
+  <%= f.select :preferred_user_ids,
+              Spree.user_class.order(:email).pluck(:email, :id),
+              { selected: f.object.preferred_user_ids },
+              { multiple: true, data: { controller: 'autocomplete-select' } } %>
+</div>

data/app/views/spree/admin/price_rules/forms/_volume_rule.html.erb

@@ -0,0 +1,11 @@
+<div class="grid grid-cols-2 gap-4">
+  <div class="form-group">
+    <%= f.label :preferred_min_quantity, Spree.t(:min_quantity) %>
+    <%= f.number_field :preferred_min_quantity, class: 'form-control', min: 1, value: f.object.preferred_min_quantity || 1 %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :preferred_max_quantity, Spree.t(:max_quantity) %>
+    <%= f.number_field :preferred_max_quantity, class: 'form-control', min: 0, value: f.object.preferred_max_quantity, placeholder: Spree.t(:unlimited) %>
+  </div>
+</div>

data/app/views/spree/admin/price_rules/forms/_zone_rule.html.erb

@@ -0,0 +1,7 @@
+<div class="form-group">
+  <%= f.label :preferred_zone_ids, Spree.t(:zones) %>
+  <%= f.select :preferred_zone_ids,
+              Spree::Zone.order(:name).pluck(:name, :id),
+              { selected: f.object.preferred_zone_ids },
+              { multiple: true, data: { controller: 'autocomplete-select' } } %>
+</div>

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

@@ -0,0 +1,36 @@
+<%= turbo_frame_tag :dialog do %>
+  <%= form_with model: @price_rule, url: spree.admin_price_list_price_rules_path(@price_list), method: :post, scope: :price_rule do |f| %>
+    <% if @price_rule.type.nil? %>
+      <%= dialog_header(Spree.t(:add_rule_of_type)) %>
+    <% else %>
+      <%= dialog_header(@price_rule.class.human_name) %>
+    <% end %>
+    <div class="dialog-body overflow-visible">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @price_rule } %>
+      <% if @price_rule.type.nil? %>
+        <% allowed_rule_types.each do |rule_class| %>
+          <% key = rule_class.name.demodulize.underscore %>
+          <%= link_to spree.new_admin_price_list_price_rule_path(@price_list, price_rule: { type: rule_class.name }), class: 'flex align-items-top w-full py-2 px-4 hover:bg-gray-100 rounded-xl mb-2 no-underline', data: { turbo_prefetch: false } do %>
+            <%= radio_button_tag :type, rule_class.name, class: 'hidden' %>
+            <div class="">
+              <h6 class="font-bold mb-1"><%= rule_class.human_name %></h6>
+              <p class="text-gray-600 mb-0"><%= rule_class.description %></p>
+            </div>
+          <% end %>
+        <% end %>
+      <% else %>
+        <p class="text-gray-600 mb-3">
+          <%= @price_rule.class.description %>
+        </p>
+        <%= f.hidden_field :type, value: @price_rule.type %>
+        <%= render "spree/admin/price_rules/forms/#{@price_rule.class.name.demodulize.underscore}", f: f %>
+      <% end %>
+    </div>
+    <% if @price_rule.type.present? %>
+      <div class="dialog-footer">
+        <%= dialog_discard_button %>
+        <%= turbo_save_button_tag Spree.t('actions.create'), data: { turbo_frame: '_top' } %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -9,16 +9,16 @@
   } do |f| %>
   <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
 
-  <div class="d-flex flex-column flex-lg-row gap-2">
+  <div class="flex flex-col lg:flex-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
     <%= render "spree/admin/products/table_filter_dropdown" %>
-    <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+    <%= button_tag type: 'button', class: 'btn btn-light flex 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="product-filters-drawer">
+  <%= drawer(id: 'product-filters-drawer', controller_name: 'dialog') do %>
     <%= drawer_header(Spree.t(:filter), 'dialog') %>
     <div class="drawer-body">
     <%= f.hidden_field :status_eq, value: params.dig(:q, :status_eq) %>
@@ -46,7 +46,7 @@
       options: tags_json_array,
       multiple: true,
       value_field: :name,
-      select_class: "w-100",
+      select_class: "w-full",
       select_data: {
         filters_target: "input",
       } %>
@@ -58,7 +58,7 @@
       <%= drawer_discard_button('dialog') %>
       <%= render 'spree/admin/shared/filter_submit' %>
     </div>
-  </dialog>
+  <% end %>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
 

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

@@ -1,5 +1,5 @@
-<div class="row" data-controller="product-form slug-form seo-form" data-seo-form-editor-value="tinymce">
-  <div class="col-md-8">
+<div class="grid grid-cols-12 gap-6" data-controller="product-form slug-form seo-form" data-seo-form-editor-value="tinymce">
+  <div class="col-span-12 md:col-span-8">
     <%= render 'spree/admin/products/form/base', f: f %>
     <%= render 'spree/admin/shared/media_form', viewable: @product.master, viewable_type: 'Spree::Variant' %>
     <%= f.fields_for :master, @product.master do |vf| %>
@@ -11,7 +11,7 @@
 
     <%= render_admin_partials(:product_form_partials, f: f, product: @product) %>
   </div>
-  <div class="col-md-4">
+  <div class="col-span-12 md:col-span-4">
     <%= render 'spree/admin/products/form/status', f: f %>
     <%= render 'spree/admin/products/form/categorization', f: f %>
     <%= render 'spree/admin/products/form/shipping', f: f %>

data/app/views/spree/admin/products/_product.html.erb

@@ -2,18 +2,18 @@
   <td class="pr-0 w-5">
     <%= bulk_operations_checkbox(product) %>
   </td>
-  <td scope="row" class="w-40 py-0 text-wrap" data-action="click->row-link#openLink">
-    <%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center w-100 text-decoration-none h-100 py-2', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>
-      <div class="mr-3">
+  <td scope="row" class="w-40 py-0 whitespace-normal" data-action="click->row-link#openLink">
+    <%= link_to spree.edit_admin_product_path(product), class: 'flex items-center w-full no-underline h-full py-2', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>
+      <div class="mr-6">
         <%= render 'spree/admin/shared/product_image', object: product %>
       </div>
-      <span class="text-dark font-weight-semibold">
+      <span class="text-gray-900 font-medium">
         <%= product.name %>
       </span>
     <% end %>
   </td>
   <%= render 'spree/admin/products/product_status', product: product %>
-  <td class="w-20 cursor-pointer text-wrap" data-action="click->row-link#openLink">
+  <td class="w-20 cursor-pointer whitespace-normal" data-action="click->row-link#openLink">
     <%= display_inventory(product) %>
   </td>
   <% if defined?(current_vendor) %>

data/app/views/spree/admin/products/_search_result.html.erb

@@ -1,8 +1,8 @@
 <div class="search-picker__option" data-action="click->search-picker#toggle">
-  <%= check_box_tag "product_ids[]", product.id, false, id: "ids_#{product.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" } %>
+  <%= check_box_tag "ids[]", product.id, false, id: "ids_#{product.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" } %>
   <label for="ids_<%= product.id %>">
     <%= render 'spree/admin/shared/product_image', object: product %>
-    <div class="ml-3">
+    <div class="ml-6">
       <%= highlight(product.name, params.dig(:q)) %>
     </div>
   </label>

data/app/views/spree/admin/products/_search_results.html.erb

@@ -2,7 +2,7 @@
   <% if products.any? %>
     <%= render collection: products, partial: 'spree/admin/products/search_result', as: :product, cached: spree_base_cache_scope %>
   <% else %>
-    <p class="text-muted text-center py-5">
+    <p class="text-gray-600 text-center py-12">
       <%= Spree.t('admin.products.search_results.no_products') %>
     </p>
   <% end %>

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

@@ -1,6 +1,6 @@
 <%= dropdown do %>
   <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
-    <span class="text-muted font-weight-normal mr-1">
+    <span class="text-gray-600 font-normal mr-1">
       <%= Spree.t(:show) %>
     </span>
     <% if product_filter_status_dropdown_value == Spree.t('admin.products.all_statuses') && product_filter_stock_dropdown_value == Spree.t('admin.products.any_stock') %>

data/app/views/spree/admin/products/form/_base.html.erb

@@ -1,11 +1,11 @@
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-body">
     <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record?, data: { seo_form_target: 'sourceTitleInput', slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %>
 
     <div class="form-group mb-0">
       <%= f.label :description, Spree.t(:description) %>
       <div class="trix-container mb-0">
-        <%= f.text_area :description, { rows: 10, class: "form-control spree-rte", data: { seo_form_target: 'sourceDescriptionInput' } } %>
+        <%= f.text_area :description, { rows: 10, class: "form-input spree-rte", data: { seo_form_target: 'sourceDescriptionInput' } } %>
       </div>
     </div>
   </div>