raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Order#shipping_tax

Browse Source
This commit is contained in:
Matt-Yorkley
2021-02-19 18:30:01 +00:00
parent ead85e71de
commit 2af0afafe9
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/spree/order.rb
View File

@@ -646,7 +646,7 @@ module Spree
end
def shipping_tax
shipment_adjustments.reload.shipping.sum(:included_tax)
shipment_adjustments.reload.tax.sum(:amount)
end
def enterprise_fee_tax

15
spec/models/spree/order_spec.rb
View File

@@ -636,16 +636,19 @@ describe Spree::Order do
describe "getting the shipping tax" do
let(:order) { create(:order) }
let(:shipping_method) { create(:shipping_method_with, :flat_rate) }
let(:shipping_tax_rate) { create(:tax_rate, amount: 0.25, included_in_price: true, zone: create(:zone_with_member)) }
let(:shipping_tax_category) { create(:tax_category, tax_rates: [shipping_tax_rate]) }
let!(:shipping_method) { create(:shipping_method_with, :flat_rate, tax_category: shipping_tax_category) }
context "with a taxed shipment" do
before do
allow(Spree::Config).to receive(:shipment_inc_vat).and_return(true)
allow(Spree::Config).to receive(:shipping_tax_rate).and_return(0.25)
end
let!(:shipment) { create(:shipment_with, :shipping_method, shipping_method: shipping_method, order: order) }
before do
allow(order).to receive(:tax_zone) { shipping_tax_rate.zone }
order.reload
order.create_tax_charge!
end
it "returns the shipping tax" do
expect(order.shipping_tax).to eq(10)
end