From a624a57bfb1696fe92d7a3249d02f8fb2b31161c Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 25 May 2016 17:12:47 +1000 Subject: [PATCH] Pass current order to PaymentMethodSerializer --- app/helpers/injection_helper.rb | 2 +- spec/models/spree/payment_method_spec.rb | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/helpers/injection_helper.rb b/app/helpers/injection_helper.rb index c6be5dc63e..2d42d43429 100644 --- a/app/helpers/injection_helper.rb +++ b/app/helpers/injection_helper.rb @@ -24,7 +24,7 @@ module InjectionHelper def inject_available_payment_methods inject_json_ams "paymentMethods", current_order.available_payment_methods, - Api::PaymentMethodSerializer + Api::PaymentMethodSerializer, current_order: current_order end def inject_taxons diff --git a/spec/models/spree/payment_method_spec.rb b/spec/models/spree/payment_method_spec.rb index 0e7c61592b..70808c231e 100644 --- a/spec/models/spree/payment_method_spec.rb +++ b/spec/models/spree/payment_method_spec.rb @@ -27,11 +27,16 @@ module Spree end it "computes the amount of fees" do - pickup = create(:payment_method, name: 'pickup') + pickup = create(:payment_method) order = create(:order) expect(pickup.compute_amount(order)).to eq 0 - delivery = create(:payment_method, name: 'delivery', calculator: Calculator::FlatRate.new(preferred_amount: 10)) - expect(delivery.compute_amount(order)).to eq 10 + transaction = create(:payment_method, calculator: Calculator::FlatRate.new(preferred_amount: 10)) + expect(transaction.compute_amount(order)).to eq 10 + transaction = create(:payment_method, calculator: Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10)) + expect(transaction.compute_amount(order)).to eq 0 + product = create(:product) + order.add_variant(product.master) + expect(transaction.compute_amount(order)).to eq 2.0 end end end