mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-19 13:54:25 +01:00
provide additional settings to export api
This commit is contained in:
parent
02d28e0b8c
commit
f06bdaaf21
@ -922,6 +922,9 @@ Application.Controllers.controller('AccountingExportModalController', ['$scope',
|
||||
encoding: 'ISO-8859-1',
|
||||
separator: ';',
|
||||
dateFormat: '%d/%m/%Y',
|
||||
labelMaxLength: 50,
|
||||
decimalSeparator: ',',
|
||||
exportInvoicesAtZero: false,
|
||||
columns: ['journal_code', 'date', 'account_code', 'account_label', 'piece', 'line_label', 'debit_origin', 'credit_origin', 'debit_euro', 'credit_euro', 'lettering']
|
||||
}
|
||||
};
|
||||
@ -1029,7 +1032,10 @@ Application.Controllers.controller('AccountingExportModalController', ['$scope',
|
||||
encoding: $scope.exportTarget.settings.encoding,
|
||||
date_format: $scope.exportTarget.settings.dateFormat,
|
||||
start_date: $scope.exportTarget.startDate,
|
||||
end_date: $scope.exportTarget.endDate
|
||||
end_date: $scope.exportTarget.endDate,
|
||||
label_max_length: $scope.exportTarget.labelMaxLength,
|
||||
decimal_separator: $scope.exportTarget.decimalSeparator,
|
||||
export_invoices_at_zero: $scope.exportTarget.exportInvoicesAtZero
|
||||
})
|
||||
};
|
||||
}
|
||||
|
@ -61,6 +61,12 @@
|
||||
<div class="col-md-8">
|
||||
<a href="https://apidock.com/ruby/DateTime/strftime" class="help-cursor" target="_blank">{{ exportTarget.settings.dateFormat }}</a>
|
||||
</div>
|
||||
<div class="col-md-4 font-bold" translate>{{ 'invoices.labelMaxLength' }}</div>
|
||||
<div class="col-md-8">{{ exportTarget.settings.labelMaxLength }}</div>
|
||||
<div class="col-md-4 font-bold" translate>{{ 'invoices.decimalSeparator' }}</div>
|
||||
<div class="col-md-8">{{ exportTarget.settings.decimalSeparator }}</div>
|
||||
<div class="col-md-4 font-bold" translate>{{ 'invoices.exportInvoicesAtZero' }}</div>
|
||||
<div class="col-md-8" translate>{{ exportTarget.settings.exportInvoicesAtZero ? 'yes' : 'no' }}</div>
|
||||
<div class="col-md-4 font-bold" translate>{{ 'invoices.columns' }}</div>
|
||||
<table class="col-md-12 export-table-template">
|
||||
<thead>
|
||||
|
@ -4,7 +4,7 @@
|
||||
class AccountingExportService
|
||||
attr_reader :encoding, :format, :separator, :journal_code, :date_format, :columns, :vat_service
|
||||
|
||||
def initialize(columns, encoding = 'UTF-8', format = 'CSV', separator = ';', date_format = '%d/%m/%Y')
|
||||
def initialize(columns, encoding: 'UTF-8', format: 'CSV', separator: ';', date_format: '%d/%m/%Y')
|
||||
@encoding = encoding
|
||||
@format = format
|
||||
@separator = separator
|
||||
|
@ -10,7 +10,10 @@ class AccountingExportWorker
|
||||
raise SecurityError, 'Not allowed to export' unless export.user.admin?
|
||||
|
||||
data = JSON.parse(export.query)
|
||||
service = AccountingExportService.new(data['columns'], data['encoding'], export.extension, export.key, data['date_format'])
|
||||
service = AccountingExportService.new(
|
||||
data['columns'],
|
||||
encoding: data['encoding'], format: export.extension, separator: export.key, date_format: data['date_format']
|
||||
)
|
||||
|
||||
service.export(data['start_date'], data['end_date'], export.file)
|
||||
|
||||
|
@ -482,6 +482,9 @@ en:
|
||||
encoding: "Encoding"
|
||||
separator: "Separator"
|
||||
dateFormat: "Date format"
|
||||
labelMaxLength: "Label (max)"
|
||||
decimalSeparator: "Decimal separator"
|
||||
exportInvoicesAtZero: "Export invoices equal to 0"
|
||||
columns: "Columns"
|
||||
exportColumns:
|
||||
journal_code: "Journal code"
|
||||
|
@ -482,6 +482,9 @@ es:
|
||||
encoding: "Encoding" # translation_missing
|
||||
separator: "Separator" # translation_missing
|
||||
dateFormat: "Date format" # translation_missing
|
||||
labelMaxLength: "Label maximum length" # translation_missing
|
||||
decimalSeparator: "Decimal separator" # translation_missing
|
||||
exportInvoicesAtZero: "Export invoices equal to 0" # translation_missing
|
||||
columns: "Columns" # translation_missing
|
||||
exportColumns: # translation_missing
|
||||
journal_code: "Journal code" # translation_missing
|
||||
|
@ -482,6 +482,9 @@ fr:
|
||||
encoding: "Encodage"
|
||||
separator: "Séparateur"
|
||||
dateFormat: "Format de date"
|
||||
labelMaxLength: "Étiquette (max)"
|
||||
decimalSeparator: "Séparateur décimal"
|
||||
exportInvoicesAtZero: "Exporter les factures à 0"
|
||||
columns: "Colonnes"
|
||||
exportColumns:
|
||||
journal_code: "Code journal"
|
||||
|
@ -482,6 +482,9 @@ pt:
|
||||
encoding: "Encoding" # translation_missing
|
||||
separator: "Separator" # translation_missing
|
||||
dateFormat: "Date format" # translation_missing
|
||||
labelMaxLength: "Label maximum length" # translation_missing
|
||||
decimalSeparator: "Decimal separator" # translation_missing
|
||||
exportInvoicesAtZero: "Export invoices equal to 0" # translation_missing
|
||||
columns: "Columns" # translation_missing
|
||||
exportColumns: # translation_missing
|
||||
journal_code: "Journal code" # translation_missing
|
||||
|
Loading…
x
Reference in New Issue
Block a user