Abonnements bieten eine Möglichkeit, Ihre Preise zu segmentieren und Vorteile für reguläre Benutzer zu bieten.
Warnung: Es wird nicht empfohlen, die Abonnements zu deaktivieren, wenn mindestens ein Abonnement auf dem System aktiv ist.
" enable_plans: "Pläne aktivieren" plans_module: "Plan-Modul" + trainings: "Trainings" + trainings_info_html: "Trainings are fully integrated into the Fab-manger's agenda. If enabled, your members will be able to book and pay trainings.
Trainings provides a way to prevent members to book some machines, if they do have not taken the prerequisite course.
" + enable_trainings: "Enable the trainings" + trainings_module: "trainings module" invoicing: "Rechnungsstellung" invoicing_info_html: "Sie können das Rechnungsmodul komplett deaktivieren.
Das ist nützlich, wenn Sie über Ihr eigenes Rechnungssystem verfügen und nicht wollen, dass Fab-Manager Rechnungen generiert und an Mitglieder sendet.
Warnung: Auch wenn Sie das Rechnungsmodul deaktivieren, müssen Sie die Mehrwertsteuer konfigurieren, um Fehler in Rechnungslegung und Preisen zu vermeiden. Die Konfiguration erfolgt in der Sektion « Rechnungen > Einstellungen ».
" enable_invoicing: "Rechnungsstellung aktivieren" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index dcd33a462..7a7c23d3a 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -1097,6 +1097,10 @@ es: plans_info_html: "Subscriptions provide a way to segment your prices and provide benefits to regular users.
Warning: It is not recommended to disable plans if at least one subscription is active on the system.
" enable_plans: "Enable the plans" plans_module: "plans module" + trainings: "Trainings" + trainings_info_html: "Trainings are fully integrated into the Fab-manger's agenda. If enabled, your members will be able to book and pay trainings.
Trainings provides a way to prevent members to book some machines, if they do have not taken the prerequisite course.
" + enable_trainings: "Enable the trainings" + trainings_module: "trainings module" invoicing: "Invoicing" invoicing_info_html: "You can fully disable the invoicing module.
This is useful if you have your own invoicing system, and you don't want Fab-manager generates and sends invoices to the members.
Warning: even if you disable the invoicing module, you must to configure the VAT to prevent errors in accounting and prices. Do it from the « Invoices > Invoicing settings » section.
" enable_invoicing: "Enable invoicing" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index d17eaa3bd..d546eccbd 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -1097,6 +1097,10 @@ pt: plans_info_html: "As assinaturas fornecem uma maneira de segmentar seus preços e proporcionar benefícios aos usuários normais.
Aviso: não é recomendável desativar os planos se pelo menos uma assinatura estiver ativa no sistema.
" enable_plans: "Ativar os planos" plans_module: "módulo de planos" + trainings: "Trainings" + trainings_info_html: "Trainings are fully integrated into the Fab-manger's agenda. If enabled, your members will be able to book and pay trainings.
Trainings provides a way to prevent members to book some machines, if they do have not taken the prerequisite course.
" + enable_trainings: "Enable the trainings" + trainings_module: "trainings module" invoicing: "Faturamento" invoicing_info_html: "Você pode desativar completamente o módulo de faturamento.
Isso é útil se você tiver o seu próprio sistema de faturação, e não quer que o Fab-manager gere e envie faturas para os membros.
Aviso: mesmo se você desativar o módulo de faturação, você deve configurar o IVA para evitar erros na contabilidade e nos preços. Faça isso na seção « Faturas > Configurações de faturação ».
" enable_invoicing: "Habilitar faturamento" diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 95811a853..9356cf51e 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -1097,6 +1097,10 @@ zu: plans_info_html: "crwdns20664:0crwdne20664:0" enable_plans: "crwdns20666:0crwdne20666:0" plans_module: "crwdns20668:0crwdne20668:0" + trainings: "crwdns21436:0crwdne21436:0" + trainings_info_html: "crwdns21438:0crwdne21438:0" + enable_trainings: "crwdns21440:0crwdne21440:0" + trainings_module: "crwdns21442:0crwdne21442:0" invoicing: "crwdns20670:0crwdne20670:0" invoicing_info_html: "crwdns20672:0crwdne20672:0" enable_invoicing: "crwdns20674:0crwdne20674:0" diff --git a/config/locales/mails.de.yml b/config/locales/mails.de.yml index 7192578e3..22fb5c711 100644 --- a/config/locales/mails.de.yml +++ b/config/locales/mails.de.yml @@ -100,6 +100,7 @@ de: subject: "Ein Benutzerkonto wurde erstellt" body: new_account_created: "Ein neues Benutzerkonto wurde auf der Website erstellt:" + user_of_group_html: "The user has registered in the group %{GROUP}" account_for_organization: "Dieses Konto verwaltet eine Organisation:" notify_admin_subscribed_plan: subject: "Ein Abonnement wurde gekauft" diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml index 87709e302..8ef1132bc 100644 --- a/config/locales/mails.es.yml +++ b/config/locales/mails.es.yml @@ -100,6 +100,7 @@ es: subject: "Se ha creado una nueva cuenta" body: new_account_created: "Se ha creado un nuevo usuario en la web:" + user_of_group_html: "The user has registered in the group %{GROUP}" account_for_organization: "Esta cuenta gestiona una organización :" notify_admin_subscribed_plan: subject: "Se ha adquirido un plan de suscripción" diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml index a42b4e31e..4048e5aa1 100755 --- a/config/locales/mails.pt.yml +++ b/config/locales/mails.pt.yml @@ -100,6 +100,7 @@ pt: subject: "A conta de usuário foi criada" body: new_account_created: "Uma nova conta de usuário foi criada no site:" + user_of_group_html: "The user has registered in the group %{GROUP}" account_for_organization: "Esta conta gerencia uma organização:" notify_admin_subscribed_plan: subject: "Uma assinatura foi comprada" diff --git a/config/locales/mails.zu.yml b/config/locales/mails.zu.yml index 1a1f18bc0..ae17fa47e 100644 --- a/config/locales/mails.zu.yml +++ b/config/locales/mails.zu.yml @@ -100,6 +100,7 @@ zu: subject: "crwdns3983:0crwdne3983:0" body: new_account_created: "crwdns3985:0crwdne3985:0" + user_of_group_html: "crwdns21434:0%{GROUP}crwdne21434:0" account_for_organization: "crwdns3987:0crwdne3987:0" notify_admin_subscribed_plan: subject: "crwdns3989:0crwdne3989:0" diff --git a/yarn.lock b/yarn.lock index 7fc779bb9..fdfd131d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2041,10 +2041,10 @@ bluebird@^3.5.5: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: - version "4.11.9" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" - integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== bn.js@^5.1.1: version "5.1.3" @@ -2125,7 +2125,7 @@ braces@~3.0.2: dependencies: fill-range "^7.0.1" -brorand@^1.0.1: +brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= @@ -3404,17 +3404,17 @@ electron-to-chromium@^1.3.562: integrity sha512-WhRe6liQ2q/w1MZc8mD8INkenHivuHdrr4r5EQHNomy3NJux+incP6M6lDMd0paShP3MD0WGe5R1TWmEClf+Bg== elliptic@^6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" - integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" + integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" + bn.js "^4.11.9" + brorand "^1.1.0" hash.js "^1.0.0" - hmac-drbg "^1.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" emoji-regex@^7.0.1: version "7.0.3" @@ -4527,7 +4527,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -hmac-drbg@^1.0.0: +hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= @@ -5864,7 +5864,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: +minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=