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

Merge branch 'master' of github.com:domify/registry

Browse source 
Conflicts:
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-04-14 19:01:17 +03:00
commit 2dfa65645b
9 changed files with 82 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/application.haml
View file

@ -42,7 +42,7 @@
= t('settings')
%span.caret
%ul.dropdown-menu{role: "menu"}
%li.dropdown-header= t('accounting')
%li.dropdown-header= t('billing')
%li= link_to t('bank_statements'), admin_bank_statements_path
%li.divider
%li.dropdown-header= t('system')

2
app/views/layouts/registrar/application.haml
View file

@ -39,7 +39,7 @@
- if can? :show, Invoice
- active_class = ['registrar/invoices'].include?(params[:controller]) ? 'active' :nil
%li{class: active_class}= link_to t('accounting'), registrar_invoices_path
%li{class: active_class}= link_to t('billing'), registrar_invoices_path
- if can? :view, :registrar_xml_console
- active_class = ['registrar/xml_consoles'].include?(params[:controller]) ? 'active' :nil

5
app/views/registrar/invoices/show.haml
View file

@ -4,13 +4,14 @@
= t('invoice_no', no: @invoice.id)
.col-sm-6
%h1.text-right.text-center-xs
= link_to(t('back_to_accounting'), registrar_invoices_path, class: 'btn btn-default')
= link_to(t('back_to_billing'), registrar_invoices_path, class: 'btn btn-default')
%hr
.row
.col-md-6= render 'registrar/invoices/partials/banklinks'
.col-md-6= render 'registrar/invoices/partials/details'
.row
.col-md-6= render 'registrar/invoices/partials/seller'
.col-md-6= render 'registrar/invoices/partials/buyer'
.row
.col-md-12= render 'registrar/invoices/partials/items'
.row.semifooter
.col-md-12.text-right= render 'registrar/invoices/partials/banklinks'