diff --git a/app/assets/javascripts/controllers/admin/invoices.js.erb b/app/assets/javascripts/controllers/admin/invoices.js.erb index e9c94d315..8f62f7081 100644 --- a/app/assets/javascripts/controllers/admin/invoices.js.erb +++ b/app/assets/javascripts/controllers/admin/invoices.js.erb @@ -90,13 +90,21 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I name: 'accounting_card_client_label', value: settings['accounting_card_client_label'] }, - siteClientCode: { - name: 'accounting_site_client_code', - value: settings['accounting_site_client_code'] + walletClientCode: { + name: 'accounting_wallet_client_code', + value: settings['accounting_wallet_client_code'] }, - siteClientLabel: { - name: 'accounting_site_client_label', - value: settings['accounting_site_client_label'] + walletClientLabel: { + name: 'accounting_wallet_client_label', + value: settings['accounting_wallet_client_label'] + }, + otherClientCode: { + name: 'accounting_other_client_code', + value: settings['accounting_other_client_code'] + }, + otherClientLabel: { + name: 'accounting_other_client_label', + value: settings['accounting_other_client_label'] }, walletCode: { name: 'accounting_wallet_code', @@ -153,14 +161,6 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I spaceLabel: { name: 'accounting_Space_label', value: settings['accounting_Space_label'] - }, - couponCode: { - name: 'accounting_coupon_code', - value: settings['accounting_coupon_code'] - }, - couponLabel: { - name: 'accounting_coupon_label', - value: settings['accounting_coupon_label'] } }; diff --git a/app/assets/javascripts/router.js.erb b/app/assets/javascripts/router.js.erb index ab855ef46..0c40c4d7f 100644 --- a/app/assets/javascripts/router.js.erb +++ b/app/assets/javascripts/router.js.erb @@ -901,11 +901,11 @@ angular.module('application.router', ['ui.router']) return Setting.query({ names: `['invoice_legals', 'invoice_text', 'invoice_VAT-rate', 'invoice_VAT-active', 'invoice_order-nb', 'invoice_code-value', \ 'invoice_code-active', 'invoice_reference', 'invoice_logo', 'accounting_journal_code', 'accounting_card_client_code', \ - 'accounting_card_client_label', 'accounting_site_client_code', 'accounting_site_client_label', 'accounting_wallet_code', \ - 'accounting_wallet_label', 'accounting_VAT_code', 'accounting_VAT_label', 'accounting_subscription_code', \ - 'accounting_subscription_label', 'accounting_Machine_code', 'accounting_Machine_label', 'accounting_Training_code', \ - 'accounting_Training_label', 'accounting_Event_code', 'accounting_Event_label', 'accounting_Space_code', \ - 'accounting_Space_label', 'accounting_coupon_code', 'accounting_coupon_label']` }).$promise; + 'accounting_card_client_label', 'accounting_wallet_client_code', 'accounting_wallet_client_label', \ + 'accounting_other_client_code', 'accounting_other_client_label', 'accounting_wallet_code', 'accounting_wallet_label', \ + 'accounting_VAT_code', 'accounting_VAT_label', 'accounting_subscription_code', 'accounting_subscription_label', \ + 'accounting_Machine_code', 'accounting_Machine_label', 'accounting_Training_code', 'accounting_Training_label', \ + 'accounting_Event_code', 'accounting_Event_label', 'accounting_Space_code', 'accounting_Space_label']` }).$promise; }], invoices: [ 'Invoice', function (Invoice) { return Invoice.list({ diff --git a/app/assets/templates/admin/invoices/index.html.erb b/app/assets/templates/admin/invoices/index.html.erb index 1d7b9c703..a0c04a4ed 100644 --- a/app/assets/templates/admin/invoices/index.html.erb +++ b/app/assets/templates/admin/invoices/index.html.erb @@ -228,12 +228,22 @@
- - + +
- - + + +
+
+
+
+ + +
+
+ +
diff --git a/app/models/setting.rb b/app/models/setting.rb index aac35a9b3..a7b676e7b 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -44,8 +44,10 @@ class Setting < ActiveRecord::Base accounting_journal_code accounting_card_client_code accounting_card_client_label - accounting_site_client_code - accounting_site_client_label + accounting_wallet_client_code + accounting_wallet_client_label + accounting_other_client_code + accounting_other_client_label accounting_wallet_code accounting_wallet_label accounting_VAT_code diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 602993f5f..a0273d529 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -440,10 +440,14 @@ en: card_client_code: "Accounting code for clients who paid by card" accounting_card_client_label: "Card clients label" card_client_label: "Account label for clients who paid by card" - accounting_site_client_code: "On site client code" - site_client_code: "Accounting code for clients who paid on site" - accounting_site_client_label: "On site client label" - site_client_label: "Accounting label for clients who paid on site" + accounting_wallet_client_code: "Wallet clients code" + wallet_client_code: "Accounting code for clients who paid by virtual wallet" + accounting_wallet_client_label: "Wallet clients label" + wallet_client_label: "Account label for clients who paid by virtual wallet" + accounting_other_client_code: "Other means client code" + other_client_code: "Accounting code for clients who paid using another payment means" + accounting_other_client_label: "Other means client label" + other_client_label: "Accounting label for clients who paid using another payment means" accounting_wallet_code: "Wallet code" general_wallet_code: "Accounting code for wallet credit" accounting_wallet_label: "Wallet label" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index e96f7c807..71a9d7e5d 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -440,10 +440,14 @@ es: card_client_code: "Accounting code for clients who paid by card" # translation_missing accounting_card_client_label: "Card clients label" # translation_missing card_client_label: "Account label for clients who paid by card" # translation_missing - accounting_site_client_code: "On site client code" # translation_missing - site_client_code: "Accounting code for clients who paid on site" # translation_missing - accounting_site_client_label: "On site client label" # translation_missing - site_client_label: "Accounting label for clients who paid on site" # translation_missing + accounting_wallet_client_code: "Wallet clients code" # translation_missing + wallet_client_code: "Accounting code for clients who paid by virtual wallet" # translation_missing + accounting_wallet_client_label: "Wallet clients label" # translation_missing + wallet_client_label: "Account label for clients who paid by virtual wallet" # translation_missing + accounting_other_client_code: "Other means client code" # translation_missing + other_client_code: "Accounting code for clients who paid using another payment means" # translation_missing + accounting_other_client_label: "Other means client label" # translation_missing + other_client_label: "Accounting label for clients who paid using another payment means" # translation_missing accounting_wallet_code: "Wallet code" # translation_missing general_wallet_code: "Accounting code for wallet credit" # translation_missing accounting_wallet_label: "Wallet label" # translation_missing diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 6e58acb50..5f9ab3d65 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -440,10 +440,14 @@ fr: card_client_code: "Code comptable pour les clients ayant réglé par carte bancaire" accounting_card_client_label: "Libellé clients par carte" card_client_label: "Libellé du compte pour les clients ayant réglé par carte bancaire" - accounting_site_client_code: "Code clients à l'accueil" - site_client_code: "Code comptable pour les clients ayant réglé à l'accueil" - accounting_site_client_label: "Libellé clients à l'accueil" - site_client_label: "Libellé du compte pour les clients ayant réglé à l'accueil" + accounting_wallet_client_code: "Code clients par porte-monnaie" + wallet_client_code: "Code comptable pour les clients ayant réglé par porte-monnaie virtuel" + accounting_wallet_client_label: "Libellé clients par porte-monnaie" + wallet_client_label: "Libellé du compte pour les clients ayant réglé par porte-monnaie virtuel" + accounting_other_client_code: "Code clients autre moyen" + other_client_code: "Code comptable pour les clients ayant avec un autre moyen de paiement" + accounting_other_client_label: "Libellé clients autre moyen" + other_client_label: "Libellé du compte pour les clients ayant réglé avec un autre moyen de paiement" accounting_wallet_code: "Code porte-monnaie" general_wallet_code: "Code comptable pour le crédit du porte-monnaie" accounting_wallet_label: "Libellé porte-monnaie" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 86025e5ea..be77652d3 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -440,10 +440,14 @@ pt: card_client_code: "Accounting code for clients who paid by card" # translation_missing accounting_card_client_label: "Card clients label" # translation_missing card_client_label: "Account label for clients who paid by card" # translation_missing - accounting_site_client_code: "On site client code" # translation_missing - site_client_code: "Accounting code for clients who paid on site" # translation_missing - accounting_site_client_label: "On site client label" # translation_missing - site_client_label: "Accounting label for clients who paid on site" # translation_missing + accounting_wallet_client_code: "Wallet clients code" # translation_missing + wallet_client_code: "Accounting code for clients who paid by virtual wallet" # translation_missing + accounting_wallet_client_label: "Wallet clients label" # translation_missing + wallet_client_label: "Account label for clients who paid by virtual wallet" # translation_missing + accounting_other_client_code: "Other payment client code" # translation_missing + other_client_code: "Accounting code for clients who paid using another payment means" # translation_missing + accounting_other_client_label: "Other payment client label" # translation_missing + other_client_label: "Accounting label for clients who paid using another payment means" # translation_missing accounting_wallet_code: "Wallet code" # translation_missing general_wallet_code: "Accounting code for wallet credit" # translation_missing accounting_wallet_label: "Wallet label" # translation_missing