Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/pdfs/01_messvertrag.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class MeteringPointOperatorContract < Generator

attr_reader :contract

def initialize(contract)
def initialize(contract, *)
super
@contract = contract
end
Expand Down
2 changes: 1 addition & 1 deletion app/pdfs/02_abwicklungsvertrag.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class LocalpoolProcessingContract < Generator

attr_reader :contract

def initialize(contract)
def initialize(contract, *)
super
@contract = contract
end
Expand Down
9 changes: 5 additions & 4 deletions app/pdfs/a0x_general.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ class A0xGeneral < Generator

attr_reader :contract

def initialize(contract)
def initialize(contract, vat)
super
@contract = contract
@vat = vat
end

protected
Expand Down Expand Up @@ -73,10 +74,10 @@ def build_meters

def build_tariff(tariff)
{
baseprice_euro_netto: german_div(tariff.baseprice_cents_per_month_before_taxes),
baseprice_euro_brutto: german_div(tariff.baseprice_cents_per_month_after_taxes),
baseprice_euro_brutto: german_div(tariff.baseprice_cents_per_month_before_taxes * 100 * @vat.amount),
baseprice_euro_netto: german_div(tariff.baseprice_cents_per_month_before_taxes * 100 * @vat.amount),
energyprice_cents_netto: german_div(tariff.energyprice_cents_per_kwh_before_taxes*100),
energyprice_cents_brutto: german_div(tariff.energyprice_cents_per_kwh_after_taxes*100),
energyprice_cents_brutto: german_div(tariff.energyprice_cents_per_kwh_before_taxes*100),
}
end

Expand Down
2 changes: 1 addition & 1 deletion app/pdfs/generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def respond_to_missing?(*)

include Import.reader['services.pdf_html_generator']

def initialize(root_object, **)
def initialize(root_object, *)
@logger = Buzzn::Logger.new(self)
@root = root_object
@builder = Builders::StructBuilder.new(PdfStruct)
Expand Down
5 changes: 4 additions & 1 deletion lib/buzzn/transactions/admin/contract/document.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ def check_generator_name(generator_names:, params:, **)
end

def generator(generator_names:, params:, resource:)
generator_names[params[:template]].new(resource.object)
# TODO replace by `Vat.current` there is a requirement to have here the previous,
# vat in the timespan between July and Dezember 2020
# Dont ask why.
generator_names[params[:template]].new(resource.object, Vat.all[-2])
end

def generate_document(resource:, params:, generator:, **)
Expand Down
5 changes: 5 additions & 0 deletions spec/requests/admin/contract_shared.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

let(:person2) { create(:person, :with_bank_account) }

before(:all) do
create(:vat, amount: 0.19, begin_date: Date.new(2000, 1, 1))
create(:vat, amount: 0.16, begin_date: Date.new(2020, 7, 1))
end

let(:organization) do
org = create(:organization, :with_address, :with_legal_representation)
org.contact = person
Expand Down
2 changes: 1 addition & 1 deletion spec/requests/admin/contract_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ def app
{ template: send(contract).pdf_generators.first.name.split("::").last.underscore }
end

it '201' do
it '201', :thisone => true do
POST path, $admin, params
expect(response).to have_http_status(201)
end
Expand Down
5 changes: 5 additions & 0 deletions spec/transactions/admin/contract/document_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
let!(:localpoolr) { Admin::LocalpoolResource.all(operator).retrieve(localpool.id) }
let(:result) { Transactions::Admin::Contract::Document.new.(params: params, resource: resource) }

before(:all) do
create(:vat, amount: 0.19, begin_date: Date.new(2000, 1, 1))
create(:vat, amount: 0.16, begin_date: Date.new(2020, 7, 1))
end

context 'localpool power taker' do

let(:contract) { create(:contract, :localpool_powertaker, :with_tariff, localpool: localpool) }
Expand Down
10 changes: 5 additions & 5 deletions spec/transactions/shared_nested_person.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@
preferred_language: 'de'
}
},
resource: resource}.merge(eextra_args)).value!
resource: resource}.merge(eextra_args))
end

it { expect(result2).to be_a resource.class }
it { expect(result2.send(method).first_name).to eq 'Elvis' }
it { expect(result2.send(method)).to be_a PersonResource }

it { expect(result2.value!).to be_a resource.class }
it { expect(result2).to be_success }
it { expect(result2.value!.send(method)).to be_a PersonResource }
it { expect(result2.value!.send(method).first_name).to eq 'Elvis' }
end
end

Expand Down