From 1de377c13a8818fc78cad79a12c9d108bb7b1265 Mon Sep 17 00:00:00 2001 From: viehlieb Date: Thu, 27 Jan 2022 12:42:29 +0100 Subject: [PATCH] add vat exempt option in payment_tab ~ refs #automatic_go_invoices --- app/views/admin/configs/_tab_payment.html.haml | 4 +++- config/locales/de.yml | 6 ++++-- config/locales/en.yml | 6 ++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/admin/configs/_tab_payment.html.haml b/app/views/admin/configs/_tab_payment.html.haml index de7ea627..47f77b04 100644 --- a/app/views/admin/configs/_tab_payment.html.haml +++ b/app/views/admin/configs/_tab_payment.html.haml @@ -13,9 +13,11 @@ = config_input form, :charge_members_manually, as: :boolean = config_input form, :use_iban, as: :boolean = config_input form, :use_self_service, as: :boolean +%h4= t '.group_order_invoices' = form.fields_for :group_order_invoices do |field| = config_input field, :use, as: :boolean - = config_input field, :payment_method, as: :string, input_html: {class: 'input-mini'} + = config_input field, :vat_exempt, as: :boolean + = config_input field, :payment_method, as: :string, input_html: {class: 'input-medium'} %h4= t '.schedule_title' = form.simple_fields_for :order_schedule do |fields| diff --git a/config/locales/de.yml b/config/locales/de.yml index 1512514a..e7641244 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -304,6 +304,7 @@ de: emails_title: E-Mails versenden tab_payment: schedule_title: Bestellschema + group_order_invoices: Bestellgruppenrechnungen tab_security: default_roles_title: Zugriff auf default_roles_paragraph: Jedes Mitglied der Foodcoop hat automatisch Zugriff auf folgende Bereiche. @@ -670,8 +671,9 @@ de: no_automatic_distribution: Keine automatische Verteilung use_apple_points: Apfelpunkte verwenden group_order_invoices: - use: Bestellgruppen Rechnungen automatisch bei Abrechnung einer Bestellung versenden - payment_method: Zahlungsart für Bestellgruppenrechnungen + use: Automatisch bei Abrechnung per Mail versenden + payment_method: Zahlungsart + vat_exempt: Diese Foodcoop ist MwSt. befreit use_boxfill: Kistenauffüllphase use_iban: IBAN verwenden use_nick: Benutzernamen verwenden diff --git a/config/locales/en.yml b/config/locales/en.yml index 30e864f0..2afc3afe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -304,6 +304,7 @@ en: emails_title: Sending email tab_payment: schedule_title: Ordering schedule + group_order_invoices: Group order invoices tab_security: default_roles_title: Access to default_roles_paragraph: By default every member of the foodcoop has access to the following areas. @@ -671,8 +672,9 @@ en: no_automatic_distribution: No automatic distribution use_apple_points: Apple points group_order_invoices: - use: Automatically send group order invoices when an order is settled - payment_method: Payment method for group order invoices + use: Send automatically via mail after oder settlement + payment_method: Payment method + vat_exempt: This foodcoopis VAT exempt use_boxfill: Box-fill phase use_iban: Use IBAN use_nick: Use nicknames