From 81f60aab46b27789f8f73da92d57826ed806e4fc Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 13 Sep 2018 11:59:34 +1000 Subject: [PATCH] Make PaymentMethod serialisable with fees https://github.com/openfoodfoundation/openfoodnetwork/issues/2655 --- app/views/spree/admin/payments/_form.html.erb | 2 +- spec/features/admin/payments_spec.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/spree/admin/payments/_form.html.erb b/app/views/spree/admin/payments/_form.html.erb index e46b2febcd..e075d1288a 100644 --- a/app/views/spree/admin/payments/_form.html.erb +++ b/app/views/spree/admin/payments/_form.html.erb @@ -1,5 +1,5 @@ <%= admin_inject_json "admin.payments", "currentOrderNumber", @order.number %> -<%= admin_inject_json_ams_array "admin.payments", "paymentMethods", @payment_methods, Api::PaymentMethodSerializer %> +<%= admin_inject_json_ams_array "admin.payments", "paymentMethods", @payment_methods, Api::PaymentMethodSerializer, current_order: @order %>
diff --git a/spec/features/admin/payments_spec.rb b/spec/features/admin/payments_spec.rb index 2a41484813..0a667e9833 100644 --- a/spec/features/admin/payments_spec.rb +++ b/spec/features/admin/payments_spec.rb @@ -27,7 +27,6 @@ feature ' end scenario "visiting the payment form" do - pending "fix usage of the PaymentMethodSerializer" quick_login_as_admin visit spree.new_admin_order_payment_path order