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

Rename attributes

Browse source 
#623
This commit is contained in:
Artur Beljajev 2018-03-13 11:32:15 +02:00
parent 3d107bd198
commit b68fe6e312
16 changed files with 110 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/registrar/invoices/index.haml
View file

@ -33,11 +33,11 @@
.col-md-3
.form-group
= f.label t(:minimum_total)
= f.search_field :sum_cache_gteq, class: 'form-control', placeholder: t(:minimum_total), autocomplete: 'off'
= f.search_field :total_gteq, class: 'form-control', placeholder: t(:minimum_total), autocomplete: 'off'
.col-md-3
.form-group
= f.label t(:maximum_total)
= f.search_field :sum_cache_lteq, class: 'form-control', placeholder: t(:maximum_total), autocomplete: 'off'
= f.search_field :total_lteq, class: 'form-control', placeholder: t(:maximum_total), autocomplete: 'off'
.col-md-3{style: 'padding-top: 25px;'}
%button.btn.btn-default
 
@ -67,7 +67,7 @@
%td{class: 'text-danger'}= t(:unpaid)
%td= l(x.due_date, format: :date_long)
%td= currency(x.sum)
%td= currency(x.total)
.row
.col-md-12
= paginate @invoices

4
app/views/registrar/invoices/partials/_items.haml
View file

@ -21,7 +21,7 @@
%tr
%th{colspan: 3}
%th= t(:total_without_vat)
%td= currency(@invoice.sum_without_vat)
%td= currency(@invoice.subtotal)
%tr
%th.no-border{colspan: 3}
%th= t('vat', rate: number_to_percentage(@invoice.vat_rate, precision: 1))
@ -29,4 +29,4 @@
%tr
%th.no-border{colspan: 3}
%th= t(:total)
%td= currency(@invoice.sum)
%td= currency(@invoice.total)

4
app/views/registrar/invoices/pdf.haml
View file

@ -239,7 +239,7 @@
%tr
%th{colspan: 3}
%th= t(:total_without_vat)
%td= "#{currency(@invoice.sum_without_vat)} #{@invoice.currency}"
%td= "#{currency(@invoice.subtotal)} #{@invoice.currency}"
%tr
%th.no-border{colspan: 3}
%th= t('vat', rate: number_to_percentage(@invoice.vat_rate, precision: 1))
@ -247,7 +247,7 @@
%tr
%th.no-border{colspan: 3}
%th= t(:total)
%td= "#{currency(@invoice.sum)} #{@invoice.currency}"
%td= "#{currency(@invoice.total)} #{@invoice.currency}"
#footer
%hr