Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixed: added missing admin breadcrumbs for refunds (#12813)

Damian Legawiec22fe7fa79004
diff --git a/admin/app/controllers/concerns/spree/admin/order_breadcrumb_concern.rb b/admin/app/controllers/concerns/spree/admin/order_breadcrumb_concern.rb
new file mode 100644
index 0000000000..9a363c979c
--- /dev/null
+++ b/admin/app/controllers/concerns/spree/admin/order_breadcrumb_concern.rb
@@ -0,0 +1,12 @@
+module Spree
+ module Admin
+ module OrderBreadcrumbConcern
+ extend ActiveSupport::Concern
+
+ included do
+ add_breadcrumb Spree.t(:orders), :admin_orders_path
+ add_breadcrumb_icon 'inbox'
+ end
+ end
+ end
+end
diff --git a/admin/app/controllers/spree/admin/orders_controller.rb b/admin/app/controllers/spree/admin/orders_controller.rb
index b35d2b0a02..dec4cabf39 100644
--- a/admin/app/controllers/spree/admin/orders_controller.rb
+++ b/admin/app/controllers/spree/admin/orders_controller.rb
@@ -3,6 +3,7 @@ module Spree
class OrdersController < Spree::Admin::BaseController
include Spree::Admin::OrderConcern
include Spree::Admin::OrdersFiltersHelper
+ include Spree::Admin::OrderBreadcrumbConcern
before_action :initialize_order_events
before_action :load_order, only: %i[edit cancel resend]
@@ -11,9 +12,6 @@ module Spree
helper_method :model_class
- add_breadcrumb Spree.t(:orders), :admin_orders_path
- add_breadcrumb_icon 'inbox'
-
def create
@order = Spree::Order.create(created_by: try_spree_current_user, store: current_store)
diff --git a/admin/app/controllers/spree/admin/refunds_controller.rb b/admin/app/controllers/spree/admin/refunds_controller.rb
index e8422c781b..9dc79dc3c3 100644
--- a/admin/app/controllers/spree/admin/refunds_controller.rb
+++ b/admin/app/controllers/spree/admin/refunds_controller.rb
@@ -1,6 +1,8 @@
module Spree
module Admin
class RefundsController < ResourceController
+ include Spree::Admin::OrderBreadcrumbConcern
+
belongs_to 'spree/payment', find_by: :number
before_action :load_order
@@ -18,6 +20,8 @@ module Spree
def load_order
@order = @payment.order if @payment
+
+ add_breadcrumb @order.number, spree.edit_admin_order_path(@order)
end
def refund_reasons
diff --git a/admin/app/views/spree/admin/refunds/new.html.erb b/admin/app/views/spree/admin/refunds/new.html.erb
index 52a916505d..5e8b3809d9 100644
--- a/admin/app/views/spree/admin/refunds/new.html.erb
+++ b/admin/app/views/spree/admin/refunds/new.html.erb
@@ -1,7 +1,5 @@
-<%= render 'spree/admin/orders/header' %>
-
-<div class="row">
- <div class="col-lg-6">
+<div class="row mt-4">
+ <div class="col-lg-6 offset-lg-3">
<%= render 'spree/admin/shared/error_messages', target: @refund %>
<%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb
index 6b89fe451d..dd929bfa95 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb
@@ -1,4 +1,4 @@
-<% orders_active = %[orders checkouts].include?(controller_name) || @order %>
+<% orders_active = %[orders checkouts].include?(controller_name) || @order&.present? || @parent&.is_a?(Spree::Order) %>
<% if can?(:manage, Spree::Order) %>
<% orders_label = Spree.t(:orders) %>
<% if ready_to_ship_orders_count&.positive? %>
diff --git a/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb
index ecde519e76..180752cf10 100644
--- a/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb
@@ -12,6 +12,13 @@ RSpec.describe Spree::Admin::PageSectionsController, type: :controller do
before do
session[:page_preview_id] = page.id
session[:theme_preview_id] = theme.id
+
+ allow(controller).to receive(:current_store).and_return(store)
+ end
+
+ after do
+ session.delete(:page_preview_id)
+ session.delete(:theme_preview_id)
end
describe '#new' do
diff --git a/core/lib/spree/testing_support/factories/theme_factory.rb b/core/lib/spree/testing_support/factories/theme_factory.rb
index 4aad754fc3..5bca6b8948 100644
--- a/core/lib/spree/testing_support/factories/theme_factory.rb
+++ b/core/lib/spree/testing_support/factories/theme_factory.rb
@@ -8,7 +8,7 @@ FactoryBot.define do
end
trait :preview do
- parent { create(:theme) }
+ parent { Spree::Store.default.default_theme || create(:theme, store: store) }
end
end
end