rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

configure accounting codes & labels for wallet clients and other means clients

Browse Source
This commit is contained in:
Sylvain 2019-09-19 11:51:14 +02:00
parent c76563f22f
commit 7d26932f6c
8 changed files with 69 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/assets/javascripts/controllers/admin/invoices.js.erb
View File

@ -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']
}
};

10
app/assets/javascripts/router.js.erb
View File

@ -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({

18
app/assets/templates/admin/invoices/index.html.erb
View File

@ -228,12 +228,22 @@
</div>
<div class="row">
<div class="col-md-6">
<label for="siteClientCode" translate>{{ 'invoices.accounting_site_client_code' }}</label>
<input type="text" id="siteClientCode" ng-model="settings.siteClientCode.value" class="form-control" placeholder="{{ 'invoices.site_client_code' | translate }}" />
<label for="walletClientCode" translate>{{ 'invoices.accounting_wallet_client_code' }}</label>
<input type="text" id="walletClientCode" ng-model="settings.walletClientCode.value" class="form-control" placeholder="{{ 'invoices.wallet_client_code' | translate }}" />
</div>
<div class="col-md-6">
<label for="siteClientLabel" translate>{{ 'invoices.accounting_site_client_label' }}</label>
<input type="text" id="siteClientLabel" ng-model="settings.siteClientLabel.value" class="form-control" placeholder="{{ 'invoices.site_client_label' | translate }}"/>
<label for="walletClientLabel" translate>{{ 'invoices.accounting_wallet_client_label' }}</label>
<input type="text" id="walletClientLabel" ng-model="settings.walletClientLabel.value" class="form-control" placeholder="{{ 'invoices.wallet_client_label' | translate }}"/>
</div>
</div>
<div class="row">
<div class="col-md-6">
<label for="otherClientCode" translate>{{ 'invoices.accounting_other_client_code' }}</label>
<input type="text" id="otherClientCode" ng-model="settings.otherClientCode.value" class="form-control" placeholder="{{ 'invoices.other_client_code' | translate }}" />
</div>
<div class="col-md-6">
<label for="otherClientLabel" translate>{{ 'invoices.accounting_other_client_label' }}</label>
<input type="text" id="otherClientLabel" ng-model="settings.otherClientLabel.value" class="form-control" placeholder="{{ 'invoices.other_client_label' | translate }}"/>
</div>
</div>
<div class="row">

6
app/models/setting.rb
View File

@ -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

12
config/locales/app.admin.en.yml
View File

@ -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"

12
config/locales/app.admin.es.yml
View File

@ -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

12
config/locales/app.admin.fr.yml
View File

@ -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"

12
config/locales/app.admin.pt.yml
View File

@ -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