From 726630f3f84ca4a79a675a91d6081bbf6cdfe718 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 14 Mar 2017 11:33:56 -0400 Subject: [PATCH 1/3] Specify helper used in CustomerReturnsController Another fix to make Solidus `config.action_controller.include_all_helpers = false` compatible. See PR #1496 and PR #1714 for background. --- .../app/controllers/spree/admin/customer_returns_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/app/controllers/spree/admin/customer_returns_controller.rb b/backend/app/controllers/spree/admin/customer_returns_controller.rb index 294281292bf..eca85025a08 100644 --- a/backend/app/controllers/spree/admin/customer_returns_controller.rb +++ b/backend/app/controllers/spree/admin/customer_returns_controller.rb @@ -1,6 +1,7 @@ module Spree module Admin class CustomerReturnsController < ResourceController + helper 'spree/admin/reimbursement_type' belongs_to 'spree/order', find_by: :number before_action :parent # ensure order gets loaded to support our pseudo parent-child relationship From 4c0d19a44243404575823143bc7b705654583e59 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 14 Mar 2017 11:57:32 -0400 Subject: [PATCH 2/3] More missing helpers --- .../app/controllers/spree/admin/reimbursements_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/app/controllers/spree/admin/reimbursements_controller.rb b/backend/app/controllers/spree/admin/reimbursements_controller.rb index 6a1b5211d25..24896a1b6fa 100644 --- a/backend/app/controllers/spree/admin/reimbursements_controller.rb +++ b/backend/app/controllers/spree/admin/reimbursements_controller.rb @@ -1,6 +1,8 @@ module Spree module Admin class ReimbursementsController < ResourceController + helper 'spree/admin/reimbursement_type' + helper 'spree/admin/customer_returns' belongs_to 'spree/order', find_by: :number before_action :load_stock_locations, only: :edit From 15e643f76334473983d691793a838e56ecc3ab8d Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 14 Mar 2017 13:57:42 -0400 Subject: [PATCH 3/3] Another missing helper --- .../app/controllers/spree/admin/customer_returns_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/app/controllers/spree/admin/customer_returns_controller.rb b/backend/app/controllers/spree/admin/customer_returns_controller.rb index eca85025a08..2d9e90a8bb6 100644 --- a/backend/app/controllers/spree/admin/customer_returns_controller.rb +++ b/backend/app/controllers/spree/admin/customer_returns_controller.rb @@ -1,6 +1,7 @@ module Spree module Admin class CustomerReturnsController < ResourceController + helper 'spree/admin/reimbursements' helper 'spree/admin/reimbursement_type' belongs_to 'spree/order', find_by: :number