diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb index 1e9df288b..b925a8156 100644 --- a/app/controllers/admin/registrars_controller.rb +++ b/app/controllers/admin/registrars_controller.rb @@ -3,6 +3,7 @@ module Admin load_and_authorize_resource before_action :set_registrar, only: [:show, :edit, :update, :destroy] helper_method :registry_vat_rate + helper_method :iban_max_length def index @q = Registrar.joins(:accounts).ordered.search(params[:q]) @@ -73,11 +74,16 @@ module Admin :vat_rate, :accounting_customer_code, :billing_email, + :iban, :language) end def registry_vat_rate Registry.current.vat_rate end + + def iban_max_length + Iban.max_length + end end end diff --git a/app/controllers/registrar/account_controller.rb b/app/controllers/registrar/account_controller.rb index 1bcf9e468..0bb40ae3c 100644 --- a/app/controllers/registrar/account_controller.rb +++ b/app/controllers/registrar/account_controller.rb @@ -1,6 +1,7 @@ class Registrar class AccountController < BaseController skip_authorization_check + helper_method :iban_max_length def show; end @@ -18,7 +19,11 @@ class Registrar private def registrar_params - params.require(:registrar).permit(:billing_email) + params.require(:registrar).permit(:billing_email, :iban) + end + + def iban_max_length + Iban.max_length end end end \ No newline at end of file diff --git a/app/models/iban.rb b/app/models/iban.rb new file mode 100644 index 000000000..260aca827 --- /dev/null +++ b/app/models/iban.rb @@ -0,0 +1,5 @@ +class Iban + def self.max_length + 34 + end +end \ No newline at end of file diff --git a/app/views/admin/registrars/form/_billing.html.erb b/app/views/admin/registrars/form/_billing.html.erb index e9f9b5c88..91086918b 100644 --- a/app/views/admin/registrars/form/_billing.html.erb +++ b/app/views/admin/registrars/form/_billing.html.erb @@ -67,6 +67,16 @@ <% end %> + +
+
+ <%= f.label :iban %> +
+
+ <%= f.text_field :iban, maxlength: iban_max_length, class: 'form-control' %> + <%= t '.iban_hint' %> +
+
diff --git a/app/views/admin/registrars/show/_billing.html.erb b/app/views/admin/registrars/show/_billing.html.erb index 7ed9826ad..da79b9074 100644 --- a/app/views/admin/registrars/show/_billing.html.erb +++ b/app/views/admin/registrars/show/_billing.html.erb @@ -19,6 +19,9 @@
<%= Registrar.human_attribute_name :reference_no %>
<%= registrar.reference_no %>
+ +
<%= Registrar.human_attribute_name :iban %>
+
<%= registrar.iban %>
\ No newline at end of file diff --git a/app/views/registrar/account/_details.html.erb b/app/views/registrar/account/_details.html.erb index 9e35da899..185b046c8 100644 --- a/app/views/registrar/account/_details.html.erb +++ b/app/views/registrar/account/_details.html.erb @@ -7,6 +7,9 @@
<%= Registrar.human_attribute_name :billing_email %>
<%= registrar.billing_email %>
+ +
<%= Registrar.human_attribute_name :iban %>
+
<%= registrar.iban %>
diff --git a/app/views/registrar/account/_form.html.erb b/app/views/registrar/account/_form.html.erb index c2bb6aa82..ab1fb0294 100644 --- a/app/views/registrar/account/_form.html.erb +++ b/app/views/registrar/account/_form.html.erb @@ -11,6 +11,17 @@ +
+
+ <%= f.label :iban %> +
+ +
+ <%= f.text_field :iban, maxlength: iban_max_length, class: 'form-control' %> + <%= t '.iban_hint' %> +
+
+
diff --git a/app/views/registrar/account/show.html.erb b/app/views/registrar/account/show.html.erb index 53218d1f7..46813fa96 100644 --- a/app/views/registrar/account/show.html.erb +++ b/app/views/registrar/account/show.html.erb @@ -3,13 +3,13 @@
-
+
<%= render 'details', registrar: current_registrar_user.registrar %>
-
+
<%= render 'linked_users', linked_users: current_registrar_user.linked_users %>
\ No newline at end of file diff --git a/config/locales/admin/registrars.en.yml b/config/locales/admin/registrars.en.yml index 7256fabb2..88e95843e 100644 --- a/config/locales/admin/registrars.en.yml +++ b/config/locales/admin/registrars.en.yml @@ -63,6 +63,7 @@ en: registry's rate of %{registry_vat_rate} will be applied in this case. no_reference_number_hint: Reference number will be generated automatically disabled_reference_number_hint: Reference number cannot be changed + iban_hint: Used for e-invoices preferences: header: Preferences \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 066f569e1..4bb40ed5d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -692,3 +692,4 @@ en: ipv4: IPv4 ipv6: IPv6 reference_no: Reference number + iban: IBAN diff --git a/config/locales/registrar/account.en.yml b/config/locales/registrar/account.en.yml index 94d4783d5..a4f3f8f2a 100644 --- a/config/locales/registrar/account.en.yml +++ b/config/locales/registrar/account.en.yml @@ -8,6 +8,7 @@ en: header: Edit your account form: + iban_hint: Required for sending e-invoices to the bank submit_btn: Save changes update: diff --git a/db/migrate/20190515113153_add_registrars_iban.rb b/db/migrate/20190515113153_add_registrars_iban.rb new file mode 100644 index 000000000..2f1e7b50f --- /dev/null +++ b/db/migrate/20190515113153_add_registrars_iban.rb @@ -0,0 +1,5 @@ +class AddRegistrarsIban < ActiveRecord::Migration + def change + add_column :registrars, :iban, :string + end +end diff --git a/db/structure.sql b/db/structure.sql index bec0a6f55..6fd2efa2e 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2200,7 +2200,8 @@ CREATE TABLE public.registrars ( reference_no character varying NOT NULL, test_registrar boolean DEFAULT false, language character varying NOT NULL, - vat_rate numeric(4,3) + vat_rate numeric(4,3), + iban character varying ); @@ -4966,5 +4967,7 @@ INSERT INTO schema_migrations (version) VALUES ('20190510090240'); INSERT INTO schema_migrations (version) VALUES ('20190510102549'); +INSERT INTO schema_migrations (version) VALUES ('20190515113153'); + INSERT INTO schema_migrations (version) VALUES ('20190520093231'); diff --git a/test/fixtures/registrars.yml b/test/fixtures/registrars.yml index 2f5ed74cf..b0ae6d280 100644 --- a/test/fixtures/registrars.yml +++ b/test/fixtures/registrars.yml @@ -11,6 +11,7 @@ bestnames: billing_email: billing@bestnames.test website: https://bestnames.test reference_no: 13 + iban: GB33BUKB20201555555555 goodnames: name: Good Names diff --git a/test/integration/admin_area/registrars_test.rb b/test/integration/admin_area/registrars_test.rb new file mode 100644 index 000000000..009e7c6d6 --- /dev/null +++ b/test/integration/admin_area/registrars_test.rb @@ -0,0 +1,20 @@ +require 'test_helper' + +class AdminAreaRegistrarsIntegrationTest < ActionDispatch::IntegrationTest + include Devise::Test::IntegrationHelpers + + setup do + @registrar = registrars(:bestnames) + sign_in users(:admin) + end + + def test_updates_registrar_optional_attributes + new_iban = 'GB94BARC10201530093459' + assert_not_equal new_iban, @registrar.iban + + patch admin_registrar_path(@registrar), registrar: { iban: new_iban } + @registrar.reload + + assert_equal new_iban, @registrar.iban + end +end \ No newline at end of file diff --git a/test/models/iban_test.rb b/test/models/iban_test.rb new file mode 100644 index 000000000..8455c4e86 --- /dev/null +++ b/test/models/iban_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class IbanTest < ActiveSupport::TestCase + def test_returns_max_length + assert_equal 34, Iban.max_length + end +end \ No newline at end of file diff --git a/test/system/registrar_area/account_test.rb b/test/system/registrar_area/account_test.rb index 438de2629..81db3ed4b 100644 --- a/test/system/registrar_area/account_test.rb +++ b/test/system/registrar_area/account_test.rb @@ -8,15 +8,19 @@ class RegistrarAccountTest < ApplicationSystemTestCase def test_updates_account new_billing_email = 'new@registrar.test' + new_iban = 'GB77BARC20201530093459' assert_not_equal new_billing_email, @registrar.billing_email + assert_not_equal new_iban, @registrar.iban visit registrar_account_path click_on 'Edit' fill_in 'Billing email', with: new_billing_email + fill_in 'IBAN', with: new_iban click_on 'Save changes' assert_text 'Your account has been updated' assert_text new_billing_email + assert_text new_iban end end \ No newline at end of file