zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-12 12:39:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2575 from internetee/2569-add-vat-id-to-pdf

Browse source 
Added vat no to invoice buyer
This commit is contained in:
Timo Võhmar 2023-05-18 11:47:28 +03:00 • committed by GitHub
commit 339c592215
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/registrar.rb
View file

@ -97,6 +97,7 @@ class Registrar < ApplicationRecord # rubocop:disable Metrics/ClassLength
buyer_phone: phone, buyer_phone: phone,
buyer_url: website, buyer_url: website,
buyer_email: billing_email, buyer_email: billing_email,
buyer_vat_no: vat_no,
reference_no: reference_no, reference_no: reference_no,
vat_rate: calculate_vat_rate, vat_rate: calculate_vat_rate,
monthly_invoice: true, monthly_invoice: true,
@ -137,6 +138,7 @@ class Registrar < ApplicationRecord # rubocop:disable Metrics/ClassLength
buyer_phone: phone, buyer_phone: phone,
buyer_url: website, buyer_url: website,
buyer_email: billing_email, buyer_email: billing_email,
buyer_vat_no: vat_no,
reference_no: reference_no, reference_no: reference_no,
vat_rate: calculate_vat_rate, vat_rate: calculate_vat_rate,
items_attributes: [ items_attributes: [

3
app/views/admin/invoices/partials/_buyer.haml
View file

@ -7,6 +7,9 @@
%dt= t(:reg_no) %dt= t(:reg_no)
%dd= @invoice.buyer_reg_no %dd= @invoice.buyer_reg_no
%dt= Registrar.human_attribute_name :vat_no
%dd= @invoice.buyer_vat_no
%dt= t(:address) %dt= t(:address)
%dd= @invoice.buyer_address %dd= @invoice.buyer_address

34
app/views/invoice/monthly_pdf.haml
View file

@ -181,25 +181,29 @@
%dt= t(:reg_no) %dt= t(:reg_no)
%dd= @invoice.buyer_reg_no %dd= @invoice.buyer_reg_no
- if @invoice.buyer_address.present? - if @invoice.buyer_vat_no.present?
%dt= Invoice.human_attribute_name :address %dt= Registrar.human_attribute_name :vat_no
%dd= @invoice.buyer_address %dd= @invoice.buyer_vat_no
- if @invoice.buyer_country.present? - if @invoice.buyer_address.present?
%dt= t(:country) %dt= Invoice.human_attribute_name :address
%dd= @invoice.buyer_country %dd= @invoice.buyer_address
- if @invoice.buyer_phone.present? - if @invoice.buyer_country.present?
%dt= t(:phone) %dt= t(:country)
%dd= @invoice.buyer_phone %dd= @invoice.buyer_country
- if @invoice.buyer_url.present? - if @invoice.buyer_phone.present?
%dt= t(:url) %dt= t(:phone)
%dd= @invoice.buyer_url %dd= @invoice.buyer_phone
- if @invoice.buyer_email.present? - if @invoice.buyer_url.present?
%dt= t(:email) %dt= t(:url)
%dd= @invoice.buyer_email %dd= @invoice.buyer_url
- if @invoice.buyer_email.present?
%dt= t(:email)
%dd= @invoice.buyer_email
.clear .clear
.row.pull-down .row.pull-down

34
app/views/invoice/pdf.haml
View file

@ -195,25 +195,29 @@
%dt= t(:reg_no) %dt= t(:reg_no)
%dd= @invoice.buyer_reg_no %dd= @invoice.buyer_reg_no
- if @invoice.buyer_address.present? - if @invoice.buyer_vat_no.present?
%dt= Invoice.human_attribute_name :address %dt= Registrar.human_attribute_name :vat_no
%dd= @invoice.buyer_address %dd= @invoice.buyer_vat_no
- if @invoice.buyer_country.present? - if @invoice.buyer_address.present?
%dt= t(:country) %dt= Invoice.human_attribute_name :address
%dd= @invoice.buyer_country %dd= @invoice.buyer_address
- if @invoice.buyer_phone.present? - if @invoice.buyer_country.present?
%dt= t(:phone) %dt= t(:country)
%dd= @invoice.buyer_phone %dd= @invoice.buyer_country
- if @invoice.buyer_url.present? - if @invoice.buyer_phone.present?
%dt= t(:url) %dt= t(:phone)
%dd= @invoice.buyer_url %dd= @invoice.buyer_phone
- if @invoice.buyer_email.present? - if @invoice.buyer_url.present?
%dt= t(:email) %dt= t(:url)
%dd= @invoice.buyer_email %dd= @invoice.buyer_url
- if @invoice.buyer_email.present?
%dt= t(:email)
%dd= @invoice.buyer_email
.clear .clear
.row.pull-down .row.pull-down