spree_admin 5.0.0.rc1

data/app/views/spree/admin/shared/sidebar/_store_nav.html.erb

@@ -0,0 +1,176 @@
+<% if settings_active? %>
+  <ul class="nav flex-column">
+    <li class="nav-item mb-1 py-2 border-bottom border-bottom-dashed">
+      <%= active_link_to_with_icon('chevron-left', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'nav-link') %>
+    </li>
+
+    <% if can?(:manage, current_store) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('building-store', Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), class: 'nav-link', active: params[:section] == 'general-settings') %>
+      </li>
+    <% end %>
+
+    <% if defined?(current_account) && current_account.present? && can?(:manage, current_account) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon 'receipt', Spree.t(:account), main_app.edit_account_path(current_account), class: 'nav-link' %>
+      </li>
+      <li class="nav-item">
+        <%= active_link_to_with_icon 'users', Spree.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link rounded-lg ' %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, current_store) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('send', Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), class: 'nav-link', active: params[:section] == 'emails') %>
+      </li>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('list-check', Spree.t(:policies), spree.edit_admin_store_path(section: 'policies'), class: 'nav-link', active: params[:section] == 'policies') %>
+      </li>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('shopping-cart', Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), class: 'nav-link', active: params[:section] == 'checkout') %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::CustomDomain) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('world-www', Spree.t(:domains), spree.admin_custom_domains_path, class: 'nav-link') %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::PaymentMethod) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('credit-card', Spree.t(:payments), spree.admin_payment_methods_path, class: 'nav-link') %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::Zone) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('world', Spree.t(:zones), spree.admin_zones_path, { active: %w[zones countries states].include?(controller_name), class: 'nav-link' }) %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::ShippingMethod) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('truck', Spree.t(:shipping), spree.admin_shipping_methods_path, { active: %w[shipping_methods shipping_categories].include?(controller_name), class: 'nav-link' }) %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::TaxRate) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('receipt-tax', Spree.t(:tax), spree.admin_tax_rates_path, active: %w[tax_rates tax_categories stripe_tax_registrations].include?(controller_name), class: 'nav-link')  %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::ReturnAuthorizationReason) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('receipt-refund', Spree.t(:returns), spree.admin_return_authorization_reasons_path, active: %w[refund_reasons reimbursement_types return_authorization_reasons].include?(controller_name), class: 'nav-link')  %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::StockLocation) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('map-pin', Spree.t(:stock_locations), spree.admin_stock_locations_path, class: 'nav-link')  %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::Store) %>
+      <% if enterprise_edition? %>
+        <li class="nav-item">
+          <%= active_link_to_with_icon('history', Spree.t('admin.audit_log'), spree.admin_audits_path, class: 'nav-link w-auto', active: %w[audits exports imports].include?(controller_name)) %>
+        </li>
+      <% else %>
+        <li class="nav-item">
+          <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
+            <%= icon 'history' %>
+            <%= Spree.t('admin.audit_log') %>
+
+            <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
+          <% end %>
+        </li>
+      <% end %>
+    <% end %>
+
+    <% if can?(:manage, Spree::OauthApplication) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon('terminal', Spree.t(:developers), spree.admin_oauth_applications_path, class: 'nav-link', active: %w[oauth_applications webhooks_subscribers].include?(controller_name)) %>
+      </li>
+    <% end %>
+  </ul>
+<% else %>
+  <%= render 'spree/admin/shared/sidebar/store_dropdown' %>
+
+  <ul class="nav flex-column">
+    <% unless current_store.setup_completed? %>
+      <li class="nav-item">
+        <%= active_link_to spree.admin_getting_started_path, class: 'nav-link'  do %>
+          <%= icon 'map' %>
+          <%= Spree.t('admin.getting_started') %>
+        <% end %>
+      </li>
+    <% end %>
+
+    <li class="nav-item">
+      <%= active_link_to spree.admin_path, class: 'nav-link', active: controller_name == 'dashboard' && action_name == 'show' do %>
+        <%= icon 'home' %>
+        <%= Spree.t(:home) %>
+      <% end %>
+    </li>
+
+    <%= render 'spree/admin/shared/sidebar/orders_nav' %>
+    <%= render 'spree/admin/shared/sidebar/returns_nav' %>
+    <%= render 'spree/admin/shared/sidebar/products_nav' %>
+    <%= render 'spree/admin/shared/sidebar/vendors_nav' %>
+
+    <% if can?(:manage, Spree.user_class) %>
+      <li class="nav-item">
+        <%= active_link_to spree.admin_users_path, class: 'nav-link' do %>
+          <%= icon 'users' %>
+          <%= Spree.t(:customers) %>
+        <% end %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::Promotion) %>
+      <% discounts_active = %w[promotions gift_cards gift_card_batches coupon_codes].include?(controller_name) %>
+      <li class="nav-item">
+        <%= active_link_to spree.admin_promotions_path, class: 'nav-link', active: discounts_active do %>
+          <%= icon 'discount' %>
+          <%= Spree.t(:promotions) %>
+        <% end %>
+
+        <% if discounts_active && defined?(Spree::GiftCard) && spree.respond_to?(:admin_gift_cards_path) && can?(:manage, Spree::GiftCard) %>
+          <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+            <li class="nav-item">
+              <%= active_link_to Spree.t(:gift_cards), spree.admin_gift_cards_path, class: 'nav-link', active: %w[gift_cards gift_card_batches].include?(controller_name) %>
+            </li>
+          </ul>
+        <% end %>
+      </li>
+    <% end %>
+
+    <% if can?(:manage, Spree::Report) %>
+      <li class="nav-item">
+        <%= active_link_to spree.admin_reports_path, class: 'nav-link' do %>
+          <%= icon 'chart-bar' %>
+          <%= Spree.t(:reports) %>
+        <% end %>
+      </li>
+    <% end %>
+
+    <%= render 'spree/admin/shared/sidebar/custom_nav' %>
+
+    <li class="nav-item border-top border-top-dashed my-1"></li>
+    <%= render 'spree/admin/shared/sidebar/storefront_nav' %>
+    <%= render 'spree/admin/shared/sidebar/integrations_nav' %>
+
+    <li class="nav-item border-top border-top-dashed my-1"></li>
+    <li class="nav-item">
+      <%= active_link_to_with_icon('settings', Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), class: 'nav-link', active: params[:section] == 'general-settings') %>
+    </li>
+    <% if defined?(current_account) && current_account.present? && can?(:manage, current_account) %>
+      <li class="nav-item">
+        <%= active_link_to_with_icon 'users', Spree.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link' %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

data/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb

@@ -0,0 +1,29 @@
+<% if can?(:manage, Spree::Theme) %>
+  <li class="nav-item">
+    <% storefront_active = %w[themes posts post_categories pages storefront].include?(controller_name) %>
+    <%= active_link_to_with_icon('building-store', Spree.t('admin.storefront'), spree.admin_themes_path, class: 'nav-link', active: storefront_active) %>
+
+    <% if storefront_active %>
+      <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+        <li class="nav-item">
+          <%= active_link_to Spree.t(:themes), spree.admin_themes_path, class: 'nav-link' %>
+        </li>
+        <% if can?(:manage, Spree::Page) %>
+          <li class="nav-item">
+            <%= active_link_to Spree.t(:pages), spree.admin_pages_path, class: 'nav-link' %>
+          </li>
+        <% end %>
+        <% if can?(:manage, Spree::Post) %>
+          <li class="nav-item">
+          <%= active_link_to Spree.t(:posts), spree.admin_posts_path, class: 'nav-link', active: %w[posts post_categories].include?(controller_name) %>
+          </li>
+        <% end %>
+        <% if can?(:manage, current_store) %>
+          <li class="nav-item">
+            <%= active_link_to Spree.t(:settings), spree.edit_admin_storefront_path, class: 'nav-link' %>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
+  </li>
+<% end %>

data/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb

@@ -0,0 +1,8 @@
+<li class="nav-item">
+  <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
+    <%= icon 'heart-handshake' %>
+    <%= Spree.t(:vendors) %>
+
+    <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
+  <% end %>
+</li>

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -0,0 +1,66 @@
+<% taxonomy = parent_resource %>
+<% taxon = child_resource %>
+
+
+<div class="sortable-tree-item-row d-flex align-items-center w-100 rounded-lg hover-light border" data-controller="row-link">
+  <div class="move-handle mr-3 ml-2">
+    <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>
+  </div>
+
+  <div class="flex-grow-1 cursor-pointer" data-action="click->row-link#openLink">
+    <div class="d-flex align-items-center overflow-hidden w-100 <% if taxon.square_image&.attached? || taxon.image&.attached? %>py-2<% else %>py-3<% end %>">
+      <% if taxon.square_image&.attached? && taxon.square_image.variable? %>
+        <%= image_tag(
+              main_app.cdn_image_url(
+                taxon.square_image.variant(
+                  spree_image_variant_options(resize_to_fill: [96, 96])
+                )
+              ),
+              class: 'rounded mr-3',
+              width: 48,
+              height: 48,
+              loading: :lazy
+        ) %>
+      <% elsif taxon.image&.attached? && taxon.image.variable? %>
+        <%= image_tag(
+              main_app.cdn_image_url(
+                taxon.image.variant(
+                  spree_image_variant_options(resize_to_fill: [96, 96])
+                )
+              ),
+              class: 'rounded mr-3',
+              width: 48,
+              height: 48,
+              loading: :lazy
+        ) %>
+      <% end %>
+      <div class="overflow-hidden">
+        <%= taxon.name %>
+      </div>
+    </div>
+  </div>
+
+  <div class="overflow-hidden text-muted font-size-sm ml-auto">
+    <% if taxon.classifications.count > 0 %>
+      <%= pluralize(taxon.classifications.count, Spree.t(:product)) %>
+    <% end %>
+  </div>
+
+  <div class="d-flex align-items-center px-3 ml-3">
+    <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link }) %>
+
+    <div class="dropdown ml-2 h-100">
+      <button class="btn btn-light btn-sm px-1 h-100" type="button" id="dropdownMenuButton-<%= taxon.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <%= icon('dots', class: 'mr-0') %>
+      </button>
+      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<%= taxon.id %>">
+        <% if can?(:create, Spree::Taxon) %>
+          <%= link_to_with_icon 'plus', Spree.t(:new_nested_taxon), spree.new_admin_taxonomy_taxon_path(taxonomy, taxon: { parent_id: taxon.id }), class: 'dropdown-item' %>
+          <div class="dropdown-divider"></div>
+        <% end %>
+        <%= link_to_delete(taxon, icon: 'trash', url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id), class: 'dropdown-item btn-danger') if can?(:destroy, taxon) %>
+      </div>
+    </div>
+  </div>
+</div>
+

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

@@ -0,0 +1,28 @@
+<%= turbo_frame_tag dom_id(@shipment, :shipping_method) do %>
+  <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-100 d-flex justify-content-between align-items-center" do |f| %>
+    <div>
+      <%= f.select :selected_shipping_rate_id, options_for_select(@shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, @shipment.selected_shipping_rate_id),
+        {},  class: 'custom-select', autofocus: true %>
+    </div>
+    <div class="d-flex h-100 align-items-center">
+      <% if can? :update, @shipment %>
+        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>
+        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
+<%= turbo_frame_tag dom_id(@shipment, :tracking) do %>
+  <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-100 py-1 d-flex justify-content-between align-items-center" do |f| %>
+    <div class="form-inline">
+      <%= f.label :tracking, Spree.t(:tracking_number) %>
+      <%= f.text_field :tracking, class: 'form-control ml-3', required: true, autofocus: true %>
+    </div>
+    <div class="d-flex h-100 align-items-center">
+      <% if can? :update, @shipment %>
+        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>
+        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/spree/admin/shipments/split.html.erb

@@ -0,0 +1,16 @@
+<%= turbo_frame_tag dom_id(@variant, :shipment_item), class: "border-bottom py-2 px-3 shipment-line-items__row" do %>
+  <%= form_with url: transfer_admin_order_shipment_path(@order, @shipment), class: "shipment-line-items__form" do |f| %>
+    <%= hidden_field_tag :variant_id, @variant.id %>
+    <div class="d-flex flex-row gap-2 align-items-center w-full form-group mb-0">
+      <%= label_tag :destination, Spree.t(:move_variant_to), class: 'mb-0 text-muted font-size-sm font-weight-bold' %>
+      <%= tom_select_tag :destination, grouped_options: { Spree.t('existing_shipments') => shipments_for_transfer(@shipment), Spree.t('new_shipment_at_location') => stock_locations_for_split(@variant) }, class: "flex-grow-1" %>
+    </div>
+    <%= number_field_tag :quantity, 1, max: @max_quantity, class: "form-control", style: "grid-column-start: quantity", min: 0, data: { test_id: :move_quantity} %>
+    <span class="d-flex justify-content-end align-items-center gap-2 w-100"  style="grid-column: quantity/-1">
+      <% if can?(:split, @shipment) %>
+        <%= turbo_save_button_tag Spree.t(:move), data: { turbo_frame: '_top' }, type: :submit, class: 'btn btn-primary text-center btn-sm' %>
+      <% end %>
+      <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+    </span>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,9 @@
+<div class="card mb-4">
+  <div class="card-body">
+    <div class="form-group">
+      <%= f.label :name, Spree.t(:name) %>
+      <%= f.text_field :name, class: 'form-control', autofocus: f.object.new_record?, required: true %>
+      <%= f.error_message_on :name %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_shipping_categories_url %>
+  <%= @shipping_category.name %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>
+
+<%= form_for [:admin, @shipping_category] do |f| %>
+  <%= render 'form',  f: f %>
+  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+<% end %>

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

@@ -0,0 +1,36 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:shipping) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-primary", icon: 'plus.svg' %>
+<% end if can? :create, Spree::ShippingCategory %>
+
+<%= render partial: 'spree/admin/shared/shipping_nav' %>
+
+<% if @shipping_categories.any? %>
+  <div class="table-responsive border rounded bg-white shadow-xs">
+    <table class="table">
+      <thead class="text-muted">
+        <tr>
+          <th><%= Spree.t(:name) %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @shipping_categories.each do |shipping_category| %>
+          <tr id="<%= spree_dom_id shipping_category %>" class="cursor-pointer" data-controller="row-link">
+            <td data-action="click->row-link#openLink"><%= shipping_category.name %></td>
+            <td class="actions">
+              <span class="d-flex justify-content-end">
+                <%= link_to_edit(shipping_category, data: { row_link_target: :link }) if can? :edit, shipping_category %>
+              </span>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% else %>
+  <%= render 'spree/admin/shared/no_resource_found' %>
+<% end %>

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

@@ -0,0 +1,13 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_shipping_categories_url %>
+  <%= Spree.t(:new_shipping_category) %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>
+
+<%= form_for [:admin, @shipping_category] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% content_for :page_actions do %>
+  <% if can?(:create, Spree::ShippingMethod) %>
+    <%= button_link_to Spree.t(:new_shipping_method), new_object_url, class: "btn-primary", icon: 'plus' %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,141 @@
+<div class="row">
+  <div class="col-lg-6">
+    <div class="card mb-4">
+      <div class="card-body">
+        <div class="row">
+          <div class="col-lg-6">
+            <div class="form-group">
+              <%= f.label :name, Spree.t(:name) %>
+              <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>
+              <%= f.error_message_on :name %>
+            </div>
+
+            <p class="form-text text-muted small mt-2">
+              This will be displayed to customers.
+            </p>
+          </div>
+
+          <div class="col-lg-6">
+            <div class="form-group">
+              <%= f.label :display_on %>
+              <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select' } %>
+              <%= f.error_message_on :display_on %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="card mb-4">
+      <div class="card-header">
+        <h5 class="card-title">
+          <%= Spree.t(:tracking_url) %>
+        </h5>
+      </div>
+      <div class="card-body">
+        <div class="form-group">
+          <%= f.url_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
+          <%= f.error_message_on :tracking_url %>
+        </div>
+
+        <p class="form-text text-muted small mt-2">
+          <code>:tracking</code>
+          <span>will be replaced with the tracking number.</span>
+        </p>
+      </div>
+    </div>
+
+    <div class="card mb-4">
+      <div class="card-header d-flex align-items-center">
+        <h5 class="card-title">
+          <%= Spree.t(:zones) %>
+        </h5>
+
+        <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto h-100') if can?(:manage, Spree::Zone) %>
+      </div>
+
+      <div class="card-body">
+        <div class="form-group">
+          <% @available_zones.each do |zone| %>
+            <div class="custom-control custom-checkbox mb-2">
+              <%= check_box_tag('shipping_method[zone_ids][]', zone.id, @shipping_method.zone_ids.include?(zone.id), id: "shipping_method_zones_#{zone.id}", class: 'custom-control-input') %>
+              <%= label_tag "shipping_method_zones_#{zone.id}", class: 'custom-control-label' do %>
+                <span ><%= zone.name.gsub('_',  ' ') %></span>
+                <p class="text-muted small mb-0">
+                  <%= zone.zone_members.map {|zone_member| zone_member.zoneable.name }.join(', ') %>
+                </p>
+              <% end %>
+            </div>
+          <% end %>
+          <%= f.error_message_on :zone_id %>
+        </div>
+      </div>
+    </div>
+
+    <div class="card mb-4">
+      <div class="card-header">
+        <h5 class="card-title">
+          <%= Spree.t(:shipping_categories) %>
+        </h5>
+      </div>
+
+      <div class="card-body">
+        <div class="form-group">
+          <% @shipping_categories.each do |category| %>
+            <div class="custom-control custom-checkbox mb-2">
+              <%= check_box_tag('shipping_method[shipping_category_ids][]', category.id, @shipping_method.shipping_categories.include?(category), id: "shipping_method_categories_#{category.id}", class: 'custom-control-input') %>
+              <%= label_tag "shipping_method_categories_#{category.id}", class: 'custom-control-label' do %>
+                <%= category.name.gsub('_',  ' ') %>
+              <% end %>
+            </div>
+          <% end %>
+          <%= f.error_message_on :shipping_category_id %>
+        </div>
+      </div>
+    </div>
+
+    <% if can?(:manage, Spree::TaxCategory) %>
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5 class="card-title">
+            <%= Spree.t(:tax_category) %>
+          </h5>
+        </div>
+
+        <div class="card-body">
+          <div class="form-group">
+            <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
+            <%= f.error_message_on :tax_category %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+  <div class="col-lg-6">
+    <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f, calculators: @calculators } %>
+
+    <div class="card mb-4 tax_categories">
+      <div class="card-header">
+        <h5 class="card-title">
+          <%= Spree.t(:estimated_transit_business_days) %>
+        </h5>
+      </div>
+      <div class="card-body">
+        <div class="alert alert-info">
+          This is the estimated number of business days it will take for the package to arrive at the customer's address.
+          It will be displayed on the checkout page.
+        </div>
+        <div class="row">
+          <div class="col">
+            <%= f.label :estimated_transit_business_days_min, Spree.t(:min) %>
+            <%= f.number_field :estimated_transit_business_days_min, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:min), min: 1 %>
+          </div>
+          <div class="col">
+            <%= f.label :estimated_transit_business_days_max, Spree.t(:max) %>
+            <%= f.number_field :estimated_transit_business_days_max, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:max), min: 1 %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/shipping_methods/_shipping_method.html.erb

@@ -0,0 +1,33 @@
+<tr id="<%= spree_dom_id shipping_method %>" class="cursor-pointer" data-controller="row-link">
+  <td data-action="click->row-link#openLink" class="w-15">
+    <strong><%= shipping_method.name %></strong>
+    <% if shipping_method.admin_name.present? %>
+      <span class="badge badge-light border ml-2">
+        <%= shipping_method.admin_name %>
+      </span>
+    <% end %>
+  </td>
+  <td data-action="click->row-link#openLink" class="w-25 text-wrap">
+    <% shipping_method.zones.each do |zone| %>
+      <% if can?(:manage, zone) %>
+        <%= link_to zone.name, spree.edit_admin_zone_path(zone), class: 'badge badge-light border mb-2' %>
+      <% else %>
+        <span class="badge badge-light border mb-2"><%= zone.name %></span>
+      <% end %>
+    <% end %>
+  </td>
+  <td data-action="click->row-link#openLink" class="w-10">
+    <%= Spree.t(:display_delivery_range, delivery_range: shipping_method.delivery_range) if shipping_method.delivery_range.present? %>
+  </td>
+  <td data-action="click->row-link#openLink" class="w-10">
+    <%= shipping_method.display_estimated_price.presence || 'Not set' %>
+  </td>
+  <td class="w-10">
+    <%= form_with model: shipping_method, url: spree.admin_shipping_method_path(shipping_method), method: :patch, data: { controller: 'auto-submit' } do |f| %>
+      <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select-sm w-auto', data: { action: 'auto-submit#submit' } } %>
+    <% end %>
+  </td>
+  <td class="actions w-10">
+    <%= link_to_edit(shipping_method, data: { row_link_target: :link }) if can? :edit, shipping_method %>
+  </td>
+</tr>

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

@@ -0,0 +1,12 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_shipping_methods_url, @shipping_method %>
+  <%= @shipping_method.name %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_method } %>
+
+
+<%= form_for [:admin, @shipping_method] do |f| %>
+  <%= render 'form', f: f %>
+  <%= render 'spree/admin/shared/edit_resource_links', f: f, turbo_frame: :_top %>
+<% end %>

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

@@ -0,0 +1,34 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:shipping) %>
+<% end %>
+
+<%= render partial: 'spree/admin/shipping_methods/actions' %>
+<%= render partial: 'spree/admin/shared/shipping_nav' %>
+
+<% content_for :page_alerts do %>
+  <div class="alert alert-info">
+    Shipping methods are options that the customer sees when they reach the checkout, they are the carriers and services used to send your products.
+  </div>
+<% end %>
+
+<% if @shipping_methods.any? %>
+  <div class="table-responsive card-lg p-0">
+    <table class="table" id='listing_shipping_methods'>
+      <thead class="text-muted">
+        <tr>
+          <th><%= Spree.t(:name) %></th>
+          <th><%= Spree.t(:zone) %></th>
+          <th><%= Spree.t(:estimated_delivery_time) %></th>
+          <th><%= Spree.t(:amount) %></th>
+          <th><%= Spree.t(:visibility) %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <%= render partial: 'spree/admin/shipping_methods/shipping_method', collection: @shipping_methods.includes(:zones, :calculator), as: :shipping_method %>
+      </tbody>
+    </table>
+  </div>
+<% else %>
+  <%= render 'spree/admin/shared/no_resource_found' %>
+<% end %>

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

@@ -0,0 +1,13 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_shipping_methods_url %>
+  <%= Spree.t(:new_shipping_method) %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_method } %>
+
+<div>
+  <%= form_for [:admin, @shipping_method] do |f| %>
+    <%= render 'form', f: f %>
+    <%= render 'spree/admin/shared/new_resource_links' %>
+  <% end %>
+</div>

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

@@ -0,0 +1 @@
+<%= turbo_render_alerts %>