From e4f855b64a04ed7e47b8a780fff12d7d16b50b7a Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 13 May 2016 11:56:00 +1000 Subject: [PATCH] Display calculator in payment method edit form --- .../spree/admin/payment_methods_controller_decorator.rb | 1 + .../_form/replace_form_fields.html.haml.deface | 6 +++++- config/application.rb | 5 +++++ config/initializers/spree.rb | 4 +--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/spree/admin/payment_methods_controller_decorator.rb b/app/controllers/spree/admin/payment_methods_controller_decorator.rb index 963b61fa81..fc15324d0b 100644 --- a/app/controllers/spree/admin/payment_methods_controller_decorator.rb +++ b/app/controllers/spree/admin/payment_methods_controller_decorator.rb @@ -57,6 +57,7 @@ module Spree else @providers = Gateway.providers.reject{ |p| p.name.include? "Bogus" }.sort{|p1, p2| p1.name <=> p2.name } end + @calculators = PaymentMethod.calculators.sort_by(&:name) end def load_hubs diff --git a/app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface b/app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface index 3b588a98c1..9e055ce538 100644 --- a/app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface +++ b/app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface @@ -33,4 +33,8 @@ = radio_button :payment_method, :active, false   = label_tag nil, t(:say_no) - = render 'providers' \ No newline at end of file + = render 'providers' + + .row + .omega.eleven.columns + = render partial: 'spree/admin/shared/calculator_fields', :locals => { :f => f } diff --git a/config/application.rb b/config/application.rb index 1fb6c88bbf..6ffee13160 100644 --- a/config/application.rb +++ b/config/application.rb @@ -34,6 +34,11 @@ module Openfoodnetwork Spree::Calculator::PerItem, Spree::Calculator::PriceSack, OpenFoodNetwork::Calculator::Weight] + app.config.spree.calculators.payment_methods = [Spree::Calculator::FlatPercentItemTotal, + Spree::Calculator::FlatRate, + Spree::Calculator::FlexiRate, + Spree::Calculator::PerItem, + Spree::Calculator::PriceSack] end # Register Spree payment methods diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb index a6a045222d..92ba3db249 100644 --- a/config/initializers/spree.rb +++ b/config/initializers/spree.rb @@ -40,9 +40,7 @@ module Spree module Core class Environment class Calculators - include EnvironmentExtension - - attr_accessor :enterprise_fees + attr_accessor :enterprise_fees, :payment_methods end end end