diff --git a/app/assets/javascripts/controllers/admin/invoices.js.erb b/app/assets/javascripts/controllers/admin/invoices.js.erb index e4a3fe1b8..aab7f9fc0 100644 --- a/app/assets/javascripts/controllers/admin/invoices.js.erb +++ b/app/assets/javascripts/controllers/admin/invoices.js.erb @@ -301,11 +301,15 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I }, active () { return $scope.invoice.VAT.active; + }, + history () { + return Setting.get({ name: 'invoice_VAT-rate', history: true }).$promise; } }, - controller: ['$scope', '$uibModalInstance', 'rate', 'active', function ($scope, $uibModalInstance, rate, active) { + controller: ['$scope', '$uibModalInstance', 'rate', 'active', 'history', function ($scope, $uibModalInstance, rate, active, history) { $scope.rate = rate; $scope.isSelected = active; + $scope.history = history.setting.history; $scope.ok = function () { $uibModalInstance.close({ rate: $scope.rate, active: $scope.isSelected }); }; return $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); }; diff --git a/app/assets/templates/admin/invoices/index.html.erb b/app/assets/templates/admin/invoices/index.html.erb index 1f5288635..78baf8b7e 100644 --- a/app/assets/templates/admin/invoices/index.html.erb +++ b/app/assets/templates/admin/invoices/index.html.erb @@ -384,6 +384,26 @@ + +
+

{{ 'invoices.VAT_history' }}

+ + + + + + + + + + + + + + + +
{{ 'invoices.VAT_rate' }}{{ 'invoices.changed_at' }}{{ 'invoices.changed_by' }}
{{value.value}} %{{value.created_at | amDateFormat:'L LT'}}{{value.user.name}}
+
diff --git a/app/controllers/api/settings_controller.rb b/app/controllers/api/settings_controller.rb index 47f308a58..8dc28f73c 100644 --- a/app/controllers/api/settings_controller.rb +++ b/app/controllers/api/settings_controller.rb @@ -17,6 +17,7 @@ class API::SettingsController < API::ApiController def show @setting = Setting.find_or_create_by(name: params[:name]) + @show_history = params[:history] == 'true' && current_user.admin? end private diff --git a/app/views/api/settings/show.json.jbuilder b/app/views/api/settings/show.json.jbuilder index c0c489dbb..cb23ef39a 100644 --- a/app/views/api/settings/show.json.jbuilder +++ b/app/views/api/settings/show.json.jbuilder @@ -1,3 +1,12 @@ json.setting do json.partial! 'api/settings/setting', setting: @setting + if @show_history + json.history @setting.history_values do |value| + json.extract! value, :value, :created_at + json.user do + json.id value.user_id + json.name "#{value.user.first_name} #{value.user.last_name}" + end + end + end end diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 110ce47d7..3793ea6fc 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -364,6 +364,9 @@ en: VAT: "VAT" enable_VAT: "Enable VAT" VAT_rate: "VAT rate" + VAT_history: "VAT rates history" + changed_at: "Changed at" + changed_by: "By" refund_invoice_successfully_created: "Refund invoice successfully created." create_a_refund_on_this_invoice: "Create a refund on this invoice" creation_date_for_the_refund: "Creation date for the refund" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 8da823cc3..2e9c9f4dd 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -364,6 +364,9 @@ es: VAT: "IVA" enable_VAT: "Habilitar IVA" VAT_rate: "Ratio IVA" + VAT_history: "Historial de ratios de IVA" + changed_at: "Cambiado en" + changed_by: "Por" refund_invoice_successfully_created: "Factura de reembolso creada correctamente." create_a_refund_on_this_invoice: "Crear un reembolso en esta factura" creation_date_for_the_refund: "Fecha de creación del reembolso" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 6007c2868..0c2461789 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -364,6 +364,9 @@ fr: VAT: "TVA" enable_VAT: "Activer la TVA" VAT_rate: "Taux de TVA" + VAT_history: "Historique des taux de TVA" + changed_at: "Changé le" + changed_by: "Par" refund_invoice_successfully_created: "La facture d'avoir a bien été créée." create_a_refund_on_this_invoice: "Générer un avoir sur cette facture" creation_date_for_the_refund: "Date d'émission de l'avoir" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index e732c5e16..68b1176b6 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -364,6 +364,9 @@ pt: VAT: "VAT" enable_VAT: "Ativar VAT" VAT_rate: "VAT taxa" + VAT_history: "VAT rates history" #translation_missing + changed_at: "Changed at" #translation_missing + changed_by: "By" #translation_missing refund_invoice_successfully_created: "Restituição de fatura criada com sucesso." create_a_refund_on_this_invoice: "Criar restituição de fatura" creation_date_for_the_refund: "Criação de data de restituição"