diff --git a/app/assets/javascripts/controllers/admin/invoices.js.erb b/app/assets/javascripts/controllers/admin/invoices.js.erb index 5993fef8d..8d5dc9c66 100644 --- a/app/assets/javascripts/controllers/admin/invoices.js.erb +++ b/app/assets/javascripts/controllers/admin/invoices.js.erb @@ -905,11 +905,12 @@ Application.Controllers.controller('ClosePeriodModalController', ['$scope', '$ui } ]); -Application.Controllers.controller('AccountingExportModalController', ['$scope', '$uibModalInstance', 'Invoice', 'AccountingExport', function ($scope, $uibModalInstance, Invoice, AccountingExport) { +Application.Controllers.controller('AccountingExportModalController', ['$scope', '$uibModalInstance', 'Invoice', 'AccountingExport', 'growl', '_t', + function ($scope, $uibModalInstance, Invoice, AccountingExport, growl, _t) { const SETTINGS = { acd: { - format: 'CSV', + format: 'csv', encoding: 'ISO-8859-1', separator: ';', dateFormat: '%d/%m/%Y', @@ -947,6 +948,7 @@ Application.Controllers.controller('AccountingExportModalController', ['$scope', */ $scope.ok = function () { AccountingExport.export($scope.exportTarget, function(res) { + growl.info(_t('invoices.export_is_running')) $uibModalInstance.close(res); }); }; diff --git a/app/controllers/api/accounting_exports_controller.rb b/app/controllers/api/accounting_exports_controller.rb index 82d14edcf..2c64e294c 100644 --- a/app/controllers/api/accounting_exports_controller.rb +++ b/app/controllers/api/accounting_exports_controller.rb @@ -16,9 +16,13 @@ class API::AccountingExportsController < API::ApiController category: 'accounting', export_type: 'accounting-software', user: current_user, - extension: params[:extension], - query: params[:query], - key: params[:separator] + extension: params[:settings][:format], + query: { + columns: params[:settings][:columns], + encoding: params[:settings][:encoding], + date_format: params[:settings][:dateFormat] + }.to_json, + key: params[:settings][:separator] ) if @export.save render json: { export_id: @export.id }, status: :ok diff --git a/app/views/notifications_mailer/notify_admin_export_complete.html.erb b/app/views/notifications_mailer/notify_admin_export_complete.html.erb index 9097d833c..03731e24e 100644 --- a/app/views/notifications_mailer/notify_admin_export_complete.html.erb +++ b/app/views/notifications_mailer/notify_admin_export_complete.html.erb @@ -5,6 +5,6 @@ <%= t(".body.#{@attached_object.category}_#{@attached_object.export_type}") %>.

- <%= t('.body.click_to_download') %> + <%= t('.body.click_to_download', TYPE: t(".body.file_type.#{@attached_object.extension}")) %> <%=link_to( t('.body.here'), "#{root_url}api/exports/#{@attached_object.id}/download", target: "_blank" )%> -

\ No newline at end of file +

diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 28d9ac04b..eb7feddaa 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -474,6 +474,7 @@ en: customization_of_SETTING_successfully_saved: "Customization of the {{SETTING}} successfully saved." # angular interpolation export_accounting_data: "Export accounting data" export_to: "Export to the accounting software" + export_is_running: "Export is running. You'll be notified when it's ready." acd: "ACD" export_form_date: "Export from" export_to_date: "Export until" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 4e78cc7d5..a574bf95d 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -474,6 +474,7 @@ es: customization_of_SETTING_successfully_saved: "Customization of the {{SETTING}} successfully saved." # angular interpolation # translation_missing export_accounting_data: "Export accounting data" # translation_missing export_to: "Export to the accounting software" # translation_missing + export_is_running: "Exportando, será notificado cuando esté listo." acd: "ACD" # translation_missing export_form_date: "Export from" # translation_missing export_to_date: "Export until" # translation_missing diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 884f204ef..a1b7f1f2d 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -474,6 +474,7 @@ fr: customization_of_SETTING_successfully_saved: "La personnalisation de {{SETTING}} a bien été enregistrée." # angular interpolation export_accounting_data: "Exporter les données comptables" export_to: "Exporter vers le logiciel comptable" + export_is_running: "L'export est en cours. Vous serez notifié lorsqu'il sera prêt." acd: "ACD" export_form_date: "Exporter depuis le" export_to_date: "Exporter jusqu'au" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 3d823bff4..4871488c6 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -471,9 +471,10 @@ pt: general_coupon_code: "Accounting code for all coupons" # translation_missing accounting_coupon_label: "Coupons label" # translation_missing general_coupon_label: "Account label for all coupons" # translation_missing - customization_of_SETTING_successfully_saved: "Customization of the {{SETTING}} successfully saved." # angular interpolation # translation_missing + customization_of_SETTING_successfully_saved: "Customization of the {{SETTING}} successfully saved." # angular interpolation # translation_missing export_accounting_data: "Export accounting data" # translation_missing export_to: "Export to the accounting software" # translation_missing + export_is_running: "A Exportação está em andamento. Você será notificado quando terminar." acd: "ACD" # translation_missing export_form_date: "Export from" # translation_missing export_to_date: "Export until" # translation_missing diff --git a/config/locales/en.yml b/config/locales/en.yml index 92280f134..7f585140f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -113,8 +113,8 @@ en: by_cheque: "by cheque" by_transfer: "by transfer" by_cash: "by cash" - no_refund: "No refund" by_wallet: "by wallet" + no_refund: "No refund" settlement_by_debit_card: "Settlement by debit card" settlement_done_at_the_reception: "Settlement done at the reception" settlement_by_wallet: "Settlement by wallet" @@ -126,6 +126,9 @@ en: subscription_of_NAME_extended_starting_from_STARTDATE_until_ENDDATE: "Subscription of %{NAME} extended (Free days) starting from %{STARTDATE} until %{ENDDATE}" and: 'and' + accounting_export: + VAT: 'VAT' + trainings: # training availabilities i_ve_reserved: "I've reserved" @@ -307,6 +310,7 @@ en: users_subscriptions: "of the subscriptions' list" users_reservations: "of the reservations' list" availabilities_index: "of the reservations availabilities" + accounting_accounting-software: "of the accounting data" is_over: "is over." download_here: "Download here" notify_member_about_coupon: diff --git a/config/locales/es.yml b/config/locales/es.yml index 26bf513ea..acd3968da 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -126,6 +126,9 @@ es: subscription_of_NAME_extended_starting_from_STARTDATE_until_ENDDATE: "Subscripción de %{NAME} extendida (Free days) empezando desde %{STARTDATE} hasta %{ENDDATE}" and: 'y' + accounting_export: + VAT: 'IVA' + trainings: # training availabilities i_ve_reserved: "he reservado" @@ -307,6 +310,7 @@ es: users_subscriptions: "de la lista de suscripciones" users_reservations: "de la lista de reservas" availabilities_index: "de las reservas disponibles" + accounting_accounting-software: "de los datos contables" is_over: "se ha acabado." download_here: "Descargar aquí" notify_member_about_coupon: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2110ff832..c7c017ddc 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -310,6 +310,7 @@ fr: users_subscriptions: "de la liste des abonnements" users_reservations: "de la liste des réservations" availabilities_index: "des disponibilités de réservations" + accounting_accounting-software: "des données comptables" is_over: "est terminé." download_here: "Téléchargez ici" notify_member_about_coupon: diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml index c37b278e5..eb53b018e 100644 --- a/config/locales/mails.en.yml +++ b/config/locales/mails.en.yml @@ -267,8 +267,12 @@ en: users_subscriptions: "of the subscriptions' list" users_reservations: "of the reservations' list" availabilities_index: "of the reservations availabilities" + accounting_accounting-software: "of the accounting data" click_to_download: "Excel file generated successfully. To download it, click" here: "here" + file_type: + xlsx: "Excel" + csv: "CSV" notify_member_about_coupon: subject: "Coupon" diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml index c001b39a1..3fe911bed 100644 --- a/config/locales/mails.es.yml +++ b/config/locales/mails.es.yml @@ -266,8 +266,12 @@ es: users_subscriptions: "de la lista de suscripciones" users_reservations: "de la lista de reservas" availabilities_index: "de las reservas disponibles" + accounting_accounting-software: "de los datos contables" click_to_download: " archivo Excel generado correctamente. Para descargarlo, haga clic " here: "aquí" + file_type: + xlsx: "Excel" + csv: "CSV" notify_member_about_coupon: subject: "Cupón" diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index f74d337e0..a21e6b179 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -267,8 +267,12 @@ fr: users_subscriptions: "de la liste des abonnements" users_reservations: "de la liste des réservations" availabilities_index: "des disponibilités de réservations" - click_to_download: "La génération est terminée. Pour télécharger le fichier Excel, cliquez" + accounting_accounting-software: "des données comptables" + click_to_download: "La génération est terminée. Pour télécharger le fichier %{TYPE}, cliquez" here: "ici" + file_type: + xlsx: "Excel" + csv: "CSV" notify_member_about_coupon: subject: "Code promo" diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml index eba1cb9de..b6a6ea03c 100755 --- a/config/locales/mails.pt.yml +++ b/config/locales/mails.pt.yml @@ -267,8 +267,12 @@ pt: users_subscriptions: "da lista de assinaturas" users_reservations: "da lista de reservas" availabilities_index: "as reservas disponíveis" + accounting_accounting-software: "de dados contábeis" click_to_download: "Arquivo do Excel gerado com êxito. Para fazer o download, clique" here: "aqui" + file_type: + xlsx: "Excel" + csv: "CSV" notify_member_about_coupon: subject: "Cupom" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 481575605..87bebdee2 100755 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -126,6 +126,9 @@ pt: subscription_of_NAME_extended_starting_from_STARTDATE_until_ENDDATE: "Assinatura de %{NAME} estendida (dias livres) a partir de% STARTDATE até %{ENDDATE}" and: 'e' + accounting_export: + VAT: 'IVA' + trainings: # training availabilities i_ve_reserved: "Eu reservei" @@ -307,6 +310,7 @@ pt: users_subscriptions: "da lista de assinaturas" users_reservations: "da lista de reservas" availabilities_index: "de reservas disponíveis" + accounting_accounting-software: "de dados contábeis" is_over: "está finalizado." download_here: "Baixe aqui" notify_member_about_coupon: