diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 836b1c3b..2396bce7 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -50,6 +50,16 @@ body { margin: 0; } +// Light tooltips without empty space below tables +.tooltip-inner { + color: #000; + background-color: rgb(245,245,245); + border: 1px solid #ccc; +} +.tooltip-inner .table { + margin-bottom: 0; +} + @mainRedColor: #ED0606; .logo { diff --git a/app/views/shared/_article_price_info.html.haml b/app/views/shared/_article_price_info.html.haml index e19d692c..00e25a3a 100644 --- a/app/views/shared/_article_price_info.html.haml +++ b/app/views/shared/_article_price_info.html.haml @@ -8,6 +8,10 @@ %tr %th= t 'activerecord.attributes.article.tax' %td.numeric= number_to_percentage article.tax + - unless article.fc_price == article.gross_price + %tr + %th= t 'activerecord.attributes.article.fc_share' + %td.numeric= number_to_currency(article.fc_price-article.gross_price) %tr %th= t 'activerecord.attributes.article.fc_price' %td.numeric= number_to_currency article.fc_price diff --git a/config/locales/de.yml b/config/locales/de.yml index 0778536e..a64de71b 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -40,6 +40,7 @@ de: availability: Artikel ist verfügbar? deposit: Pfand fc_price: Endpreis + fc_share: FC-Aufschlag gross_price: Bruttopreis price: Nettopreis tax: MwSt diff --git a/config/locales/en.yml b/config/locales/en.yml index 3892111b..d76f33a8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,7 @@ en: availability: Is article available? deposit: deposit fc_price: FC price + fc_share: FC share gross_price: gross price price: price tax: VAT