From 3db8895ac34d34421ea3233651dc59e74161fc89 Mon Sep 17 00:00:00 2001
From: oleghasjanov <oleg.phenomenon@gmail.com>
Date: Fri, 15 Mar 2024 10:26:39 +0200
Subject: [PATCH 1/4] change redirect option after domain creation

---
 app/controllers/registrant/domains_controller.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/registrant/domains_controller.rb b/app/controllers/registrant/domains_controller.rb
index 8eb5009..1f43753 100644
--- a/app/controllers/registrant/domains_controller.rb
+++ b/app/controllers/registrant/domains_controller.rb
@@ -79,13 +79,15 @@ def create
       @invoice = pending.create_invoice_by_pending_action(domain_price.price.to_f)
 
       if @invoice
-        flash.now[:notice] = t('.success')
+        flash[:notice] = t('.success')
 
-        render turbo_stream: [
-          turbo_stream.append('flash', partial: 'layouts/flash'),
-          turbo_stream.append('payment_method', partial: 'registrant/domains/payment_form',
-                                               locals: { invoice: @invoice})
-        ]
+        redirect_to registrant_domains_path, status: :see_other
+
+        # render turbo_stream: [
+        #   turbo_stream.append('flash', partial: 'layouts/flash'),
+        #   turbo_stream.append('payment_method', partial: 'registrant/domains/payment_form',
+        #                                        locals: { invoice: @invoice})
+        # ]
       else
         flash[:alert] = @invoice.errors.full_messages
         render turbo_stream: turbo_stream.replace('flash', partial: 'layouts/flash')

From 599dac2f0af43c30fc3372b6ba8375c51404bc7a Mon Sep 17 00:00:00 2001
From: oleghasjanov <oleg.phenomenon@gmail.com>
Date: Fri, 15 Mar 2024 10:38:49 +0200
Subject: [PATCH 2/4] added everypay params

---
 .../domain_creation_process/create_contacts_job.rb         | 3 ++-
 app/models/contact.rb                                      | 4 ++--
 app/services/domain_services/create_domain_service.rb      | 2 +-
 config/application.yml.example                             | 7 ++++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/jobs/estonian_tld/domain_creation_process/create_contacts_job.rb b/app/jobs/estonian_tld/domain_creation_process/create_contacts_job.rb
index 3440dc8..6cb723b 100644
--- a/app/jobs/estonian_tld/domain_creation_process/create_contacts_job.rb
+++ b/app/jobs/estonian_tld/domain_creation_process/create_contacts_job.rb
@@ -26,6 +26,7 @@ def perform(pending_action)
           next if v['contact']['_destroy'] == 'true'
   
           contact = Contact.find_by(ident: v['contact']['ident'])
+
           if contact.nil?
             contacts_what_not_exists << v
           elsif contact.code.blank?
@@ -81,7 +82,7 @@ def create_contact(contact)
       end
 
       after_perform do |job|
-        EstonianTld::DomainCreationProcess::CreateDomainJob.perform_later(@pending_action)
+        EstonianTld::DomainCreationProcess::CreateDomainJob.perform_now(@pending_action)
       end
     end
   end
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 3ec1b8e..e644bc9 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -34,11 +34,11 @@ class Contact < ApplicationRecord
   validates :name, presence: true
   validates :role, inclusion: { in: Contact.roles }
   
-  def self.create_contact_from_registrant_perform_later(registrant_user:)
+  def self.create_contact_from_registrant_perform_now(registrant_user:)
     c = Contact.find_by(ident: registrant_user.ident)
     return c if c && c.code.present?
 
-    CreateContactJob.perform_later(registrant_user)
+    CreateContactJob.perform_now(registrant_user)
   end
 
   def self.search(query)
diff --git a/app/services/domain_services/create_domain_service.rb b/app/services/domain_services/create_domain_service.rb
index 6c9fa7a..1975f7d 100644
--- a/app/services/domain_services/create_domain_service.rb
+++ b/app/services/domain_services/create_domain_service.rb
@@ -7,7 +7,7 @@ def initialize(pending_action)
     end
 
     def call
-      EstonianTld::DomainCreationProcess::CreateContactsJob.perform_later(pending_action)
+      EstonianTld::DomainCreationProcess::CreateContactsJob.perform_now(pending_action)
       # EstonianTld::DomainCreationProcess::CreateDomainJob.perform_later(pending_action)
     end
   end
diff --git a/config/application.yml.example b/config/application.yml.example
index 0ca4fb8..a3fb229 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -36,4 +36,9 @@ tara_jwks_uri: '/.well-known/jwks.json'
 tara_token_endpoint: '/oauth2/token'
 tara_auth_endpoint: '/oauth2/auth'
 tara_base_redirect_url: 'https://st-eedirekt.infra.tld.ee'
-tara_redirect_path: '/tara/callback'
\ No newline at end of file
+tara_redirect_path: '/tara/callback'
+
+everypay_key: ""
+api_username: ''
+everypay_base: https://igw-demo.every-pay.com/api/v4
+account_name: 'EUR3D1'

From 3ed10866a1e46e7c2fa028cd9cccd9ccad4bf175 Mon Sep 17 00:00:00 2001
From: oleghasjanov <oleg.phenomenon@gmail.com>
Date: Mon, 15 Apr 2024 15:36:58 +0300
Subject: [PATCH 3/4] fixed major issues, update admin settings view

---
 .DS_Store                                     | Bin 0 -> 10244 bytes
 .../form_domain_contact/component.html.erb    |   4 +-
 .../settings/array_field/component.html.erb   |  48 +++++++++++
 .../settings/array_field/component.rb         |  13 +++
 .../settings/hash_field/component.html.erb    |   8 ++
 .../settings/hash_field/component.rb          |  13 +++
 .../tech_contact_field/component.html.erb     |  79 ++++++++++++++++++
 .../settings/tech_contact_field/component.rb  |  13 +++
 .../admin/contacts/searches_controller.rb     |  21 +++++
 app/controllers/admin/settings_controller.rb  |  57 +++++++++++--
 .../registrant/domains_controller.rb          |   4 +-
 .../behaviour/auto_removeable_controller.js   |  25 ++++++
 .../behaviour/removeable_controller.js        |  21 +----
 .../form/autocomplete_controller.js           |  60 +++++++++----
 app/javascript/controllers/index.js           |   3 +
 app/models/setting.rb                         |   3 +-
 app/views/admin/settings/show.html.erb        |  43 +++++++++-
 app/views/layouts/_flash.html.erb             |   4 +-
 .../domains/_contact_fields.html.erb          |  13 +--
 app/views/registrant/domains/_form.html.erb   |   2 +-
 config/routes.rb                              |   4 +
 db/seeds.rb                                   |   9 +-
 tmp/.keep                                     |   0
 tmp/pids/.keep                                |   0
 tmp/storage/.keep                             |   0
 25 files changed, 380 insertions(+), 67 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 app/components/settings/array_field/component.html.erb
 create mode 100644 app/components/settings/array_field/component.rb
 create mode 100644 app/components/settings/hash_field/component.html.erb
 create mode 100644 app/components/settings/hash_field/component.rb
 create mode 100644 app/components/settings/tech_contact_field/component.html.erb
 create mode 100644 app/components/settings/tech_contact_field/component.rb
 create mode 100644 app/controllers/admin/contacts/searches_controller.rb
 create mode 100644 app/javascript/controllers/behaviour/auto_removeable_controller.js
 delete mode 100644 tmp/.keep
 delete mode 100644 tmp/pids/.keep
 delete mode 100644 tmp/storage/.keep

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..943ae6547a27822ff09fa6737f2a5f5293bb8394
GIT binary patch
literal 10244
zcmeHMO=}cE5UqBXB$5b0ym%W>MDT+|kGX8ZdKDoAk1_k<Ca{|wl59ZqFjv8YXF&|;
z9}xTl9t1%T!LQ#Sc=0B95MNdIZn}DAHn}Jgd%{djrmFhAc~d>R)k{QXY0#P{N{DC*
zJKNbA911q}^PbyIxGQy7gM6YEb*bI$%r7_lx#)NyDi9Tj3Pc5>0#Si~K>>Vb^ENeY
zZ9GN=q5@HYkpldFNU*c5Ih$E4uMQlf1%R#MvTQg<A0Ro2vo&WkYb6z9+U~))RO4C<
zW7FYJI2^X-Y-X)ZCu7seIAr5G6eH-!OC+33&Dwa33Pc6+3UKc}Nmr>s1KRZa_g?CP
zd4dHIy?(vk==K}%@U;7S^TV6PqNvspqSAF<Ef}K7?5%=Nhc;-(t|U0$rH5<482JJY
zZ>yh$gXdT1IlsbvF^8e$E(Mp?p+-ZY)AX}^gyxVvUp~;m8>iRznUqB-J|uijLWeD8
zLigwjR#vtt)ts(h1E+#0&1>|03L|}P<03V`48T;OHA(|cXD8nscr=gf%ehbTj9gxz
zOW;*_7o;vKP-25NwFa}Rf+wB;@0+Vjmlxm#UWG@u`2HrSNqx+UyFl$|)c3DKzs9C?
zU~55*p&1m%C>|&Fna7my*rhhAVGT3Gt+2UyaeC!)QA`P++*l=?a&d~+8K#9#@K!iW
zR<?%MHU6mTB}ZdwpTaSFj8j4FZ-hwf7<x*uTwV#9^C~<UR7UOVCvMXFwywLVh)#fa
z`}MG{o!6gJS>W~YOuEO2GpMmXv~1HV_2g{8>!`Ht*PMCq==``?&53?IvGrFvwpQiv
zc*XnYcji5T+0Sn$emYH`E6uIE4E>s4_NzCXAKn<6Q*n&XgH|6ik1D?zp_k@h=0Ezr
z0Ds@%k8%U-oL}KqYK%Jx+#NixqFKrQT!iK@dfNu$XeMP*ijPG*MZ0)YY@v#pcu#EO
zuMK`XVI|Rmd5VNF(VAyAd{d6iP&I#q48?z8j_+Us{M+&^1e&UPviGO_B^-m8LRKn9
z@vu1Y7!`;LL<OP(QGw&EK*io%!t4Jx%76bq&Jx6XiwgYr3YcnrxxNG$+}e6h5MFCf
zu;0PX8^>kVN(v6L91qK@h5Qe%3tr@NT$3;N?!4w~X04<nM$%y=9oDYq|FItf7J(l7
ie}8rM(DeepPcpIp=kg8u_JWQzh|oQ2S!e%u`v2c~D!BRp

literal 0
HcmV?d00001

diff --git a/app/components/form_domain_contact/component.html.erb b/app/components/form_domain_contact/component.html.erb
index 89e1040..ce98f01 100644
--- a/app/components/form_domain_contact/component.html.erb
+++ b/app/components/form_domain_contact/component.html.erb
@@ -23,7 +23,7 @@
       <div class='flex flex-col items-start space-y-2 p-3 hidden' data-form--add-element-target="list" data-behaviour--hiddenable-target="elements">
         <% tech_form.fields_for :contact, domain_contact.contact do |contact_form| %>
           
-          <%= render 'contact_fields', form: contact_form, remove_button: false %>
+          <%= render 'contact_fields', form: contact_form, remove_button: false, contact_type: contact_type %>
 
         <% end %>
       </div>
@@ -34,7 +34,7 @@
     <%= form.fields_for contact_type_objects.to_sym, constanicize_contact_type.new, child_index: "new_contact" do |builder| %>
       <% builder.fields_for :contact, Contact.new do |contact_form| %>
 
-        <%= render 'contact_fields', form: contact_form, remove_button: true %>
+        <%= render 'contact_fields', form: contact_form, remove_button: true, contact_type: contact_type %>
       <% end %>
     <% end %>
   </div>
diff --git a/app/components/settings/array_field/component.html.erb b/app/components/settings/array_field/component.html.erb
new file mode 100644
index 0000000..819aa7a
--- /dev/null
+++ b/app/components/settings/array_field/component.html.erb
@@ -0,0 +1,48 @@
+<div class="flex flex-col w-full" data-controller="form--add-element behaviour--hiddenable" data-form--add-element-child-index-value="new_contact"
+  data-behaviour--hiddenable-props-class='hidden' data-form--add-element-limit-of-elements=9 
+  data-form--add-element-current-elements-value="<%= @parsed_data.count %>">
+
+  <div data-form--add-element-target="list">
+    <% @parsed_data.each_with_index do |item, index| %>
+      
+      <div class='flex space-y-2 space-x-2 justify-center items-center' data-controller='behaviour--removeable'>
+        <% item.each do |k, v| %>
+          <%= form.label k, "#{k.to_s.humanize} #{index + 1}", class: 'block text-sm font-medium text-gray-700 w-64' %>
+          <%= form.text_field "settings[#{setting.id}][][#{k}]", value: v, class: 'mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' %>
+        <% end %>
+
+        <a class='cursor-pointer rounded-full p-1 bg-red-400 hover:bg-red-600 w-8 text-white' data-action="behaviour--removeable#remove">
+          delete
+        </a>
+      </div>
+    <% end %>
+  </div>
+
+
+  <div class='text-right'>
+    <a class='rounded-md bg-green-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-green-500
+              focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-green-600 cursor-pointer add-contact-button' 
+              data-action="click->form--add-element#addElement"><%= t('.add_contact') %></a>
+  </div>
+
+  <template id="new-contact-template" data-form--add-element-target="template">
+    <% if setting.code == 'default_nameserver_records' %>
+      <div class='flex space-y-2 space-x-2 justify-center items-center' data-controller='behaviour--removeable'>
+        <%= form.label :hostname, "Hostname", class: 'block text-sm font-medium text-gray-700 w-64' %>
+        <%= form.text_field "settings[#{setting.id}][][hostname]", class: 'mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' %>
+
+        <%= form.label :ipv4, "ipv4", class: 'block text-sm font-medium text-gray-700 w-64' %>
+        <%= form.text_field "settings[#{setting.id}][][ipv4]", class: 'mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' %>
+
+        <%= form.label :ipv6, "ipv6", class: 'block text-sm font-medium text-gray-700 w-64' %>      
+        <%= form.text_field "settings[#{setting.id}][][ipv6]", class: 'mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' %>
+
+        <div class='p2 w-16'>
+        <a class='cursor-pointer rounded-full p-1 bg-red-400 hover:bg-red-600 w-8 text-white' data-action="behaviour--removeable#remove">
+          delete
+        </a>
+      </div>
+      </div>
+    <% end %>
+  </template>
+</div>
diff --git a/app/components/settings/array_field/component.rb b/app/components/settings/array_field/component.rb
new file mode 100644
index 0000000..f02aa19
--- /dev/null
+++ b/app/components/settings/array_field/component.rb
@@ -0,0 +1,13 @@
+module Settings
+  module ArrayField
+    class Component < ApplicationViewComponent
+      attr_reader :setting, :form
+
+      def initialize(setting:, form:)
+        @setting = setting
+        @form = form
+        @parsed_data = eval(setting.value)
+      end
+    end
+  end
+end
diff --git a/app/components/settings/hash_field/component.html.erb b/app/components/settings/hash_field/component.html.erb
new file mode 100644
index 0000000..7f7fb00
--- /dev/null
+++ b/app/components/settings/hash_field/component.html.erb
@@ -0,0 +1,8 @@
+<div class='flex flex-col space-y-2 space-x-2 justify-center items-center'>
+
+  <% @parsed_value.each do |k, v| %>
+    <%= form.label k.to_sym, k.to_s.humanize, class: 'block text-sm font-medium text-gray-700 w-64' %>
+    <%= form.text_field "settings[#{setting.id}][#{k}]", value: v, class: 'mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' %>
+  <% end %>
+
+</div>
\ No newline at end of file
diff --git a/app/components/settings/hash_field/component.rb b/app/components/settings/hash_field/component.rb
new file mode 100644
index 0000000..7e07145
--- /dev/null
+++ b/app/components/settings/hash_field/component.rb
@@ -0,0 +1,13 @@
+module Settings
+  module HashField
+    class Component < ApplicationViewComponent
+      attr_reader :setting, :form
+
+      def initialize(setting:, form:)
+        @setting = setting
+        @form = form
+        @parsed_value = eval(setting.value)
+      end
+    end
+  end
+end
diff --git a/app/components/settings/tech_contact_field/component.html.erb b/app/components/settings/tech_contact_field/component.html.erb
new file mode 100644
index 0000000..66c024f
--- /dev/null
+++ b/app/components/settings/tech_contact_field/component.html.erb
@@ -0,0 +1,79 @@
+<style>
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 10rem;
+  padding: 0.5rem 0;
+  margin: 0.125rem 0 0;
+  font-size: 1rem;
+  color: #212529;
+  text-align: left;
+  background-color: #fff;
+  background-clip: padding-box;
+  border: 1px solid rgba(0,0,0,.15);
+  border-radius: .25rem;
+}
+
+.dropdown-menu li {
+  padding: .5rem 1rem;
+  cursor: pointer;
+}
+
+.dropdown-menu li:hover {
+  background-color: #f8f9fa;
+}
+</style>
+
+
+<div class="flex flex-col w-full" data-controller="form--add-element behaviour--hiddenable" data-form--add-element-child-index-value="new_contact"
+  data-behaviour--hiddenable-props-class='hidden' data-form--add-element-limit-of-elements=9 
+  data-form--add-element-current-elements-value="<%= @parsed_data&.count %>">
+
+  <div data-form--add-element-target="list">
+    <% @parsed_data.each_with_index do |item, index| %>
+      
+      <div class='flex space-y-2 space-x-2 justify-center items-center' data-controller='behaviour--removeable form--autocomplete' data-form--autocomplete-search-url-value="<%= admin_contacts_searches_path %>" data-form--autocomplete-set-code-value="true">
+        <%= form.label "tech contact code #{index}", class: 'block text-sm font-medium text-gray-700 w-64' %>
+
+      <%= component 'form/autocomplete_input', form: form, attribute: :value, heroicon_name: 'user', placeholder: 'ABC:123',
+          data_attributes: { action: "input->form--autocomplete#search", form__autocomplete_target: "input" },
+          value: item %>
+
+      <%= form.hidden_field "settings[#{setting.id}][]", data: { form__autocomplete_target: "hiddenInput" }, value: item %>
+
+        <a class='cursor-pointer rounded-full p-1 bg-red-400 hover:bg-red-600 w-8 text-white' data-action="behaviour--removeable#remove">
+          delete
+        </a>
+      </div>
+    <% end %>
+  </div>
+
+
+  <div class='text-right'>
+    <a class='rounded-md bg-green-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-green-500
+              focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-green-600 cursor-pointer add-contact-button' 
+              data-action="click->form--add-element#addElement"><%= t('.add_contact') %></a>
+  </div>
+
+  <template id="new-contact-template" data-form--add-element-target="template">
+    <div class='flex space-y-2 space-x-2 justify-center items-center' data-controller='behaviour--removeable form--autocomplete' data-form--autocomplete-search-url-value="<%= admin_contacts_searches_path %>" data-form--autocomplete-set-code-value="true">
+      <%= form.label "tech contact code 1", class: 'block text-sm font-medium text-gray-700 w-64' %>
+      
+      <%= component 'form/autocomplete_input', form: form, attribute: :value, heroicon_name: 'user', placeholder: 'ABC:123',
+          data_attributes: { action: "input->form--autocomplete#search", form__autocomplete_target: "input" },
+          value: nil %>
+
+      <%= form.hidden_field "settings[#{setting.id}][]", data: { form__autocomplete_target: "hiddenInput" } %>
+
+      <div class='p2 w-16'>
+      <a class='cursor-pointer rounded-full p-1 bg-red-400 hover:bg-red-600 w-8 text-white' data-action="behaviour--removeable#remove">
+        delete
+      </a>
+    </div>
+    </div>
+  </template>
+</div>
diff --git a/app/components/settings/tech_contact_field/component.rb b/app/components/settings/tech_contact_field/component.rb
new file mode 100644
index 0000000..88be1b7
--- /dev/null
+++ b/app/components/settings/tech_contact_field/component.rb
@@ -0,0 +1,13 @@
+module Settings
+  module TechContactField
+    class Component < ApplicationViewComponent
+      attr_reader :setting, :form
+
+      def initialize(setting:, form:)
+        @setting = setting
+        @form = form
+        @parsed_data = eval(setting.value)
+      end
+    end
+  end
+end
diff --git a/app/controllers/admin/contacts/searches_controller.rb b/app/controllers/admin/contacts/searches_controller.rb
new file mode 100644
index 0000000..8f581b0
--- /dev/null
+++ b/app/controllers/admin/contacts/searches_controller.rb
@@ -0,0 +1,21 @@
+module Admin
+  module Contacts
+    class SearchesController < ApplicationController
+      include Roles::AdminAbilitable
+
+      def show
+        puts '----'
+        puts params[:query]
+        puts '-----'
+
+        @contacts = Contact.search(params[:query])
+
+        puts '==== contacts'
+        puts @contacts.inspect
+        puts '====='
+
+        render json: @contacts.limit(5).map(&:as_json)
+      end
+    end
+  end
+end
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 60ebe04..770049d 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -5,13 +5,28 @@ class SettingsController < ApplicationController
     def show
       @invoice_group = Setting.with_group('invoice')
       @contact_group = Setting.with_group('contacts')
+      @registrar_group = Setting.with_group('registrar')
     end
 
     def update
-      if Setting.update(casted_settings.keys, casted_settings.values)
+      updated = true
+      errors = []
+    
+      casted_settings.each do |id, setting_params|
+        setting = Setting.find_by(id: id)
+
+        if setting.update!(setting_params)
+          next
+        else
+          updated = false
+          errors += setting.errors.full_messages
+        end
+      end
+    
+      if updated
         redirect_to root_path, status: :see_other, notice: t('.success')
       else
-        flash[:alert] = update.errors.values.uniq.join(', ')
+        flash[:alert] = errors.uniq.join(', ')
         render :show, status: :unprocessable_entity
       end
     end
@@ -19,13 +34,41 @@ def update
     private
 
     def casted_settings
-      settings = {}
-
+      settings_values = {}
+    
+      params.require(:settings).permit!
+    
       params[:settings].each do |k, v|
-        settings[k] = { value: v }
-      end
+        setting = Setting.find_by(id: k)
 
-      settings
+        next unless setting
+    
+        formatted_value = format_setting_value(v, setting.format)
+        settings_values[setting.id] = { value: formatted_value }
+      end
+    
+      settings_values
+    end
+    
+    def format_setting_value(value, format_type)
+      case format_type
+      when 'boolean'
+        (value.to_s == 'true').to_s
+      when 'integer'
+        value.to_i
+      when 'float'
+        value.to_f
+      when 'hash'
+        value.is_a?(ActionController::Parameters) ? value.to_unsafe_h.to_json : value
+      when 'array'
+        if value.is_a?(Array) && value.first.is_a?(ActionController::Parameters)
+          value.map(&:to_unsafe_h).to_json
+        else
+          value.to_json
+        end
+      else
+        value
+      end
     end
   end
 end
diff --git a/app/controllers/registrant/domains_controller.rb b/app/controllers/registrant/domains_controller.rb
index 1f43753..316ae72 100644
--- a/app/controllers/registrant/domains_controller.rb
+++ b/app/controllers/registrant/domains_controller.rb
@@ -6,8 +6,8 @@ def new
       @domain = Domain.new
 
       Tld::Estonian::MIN_DOMAIN_CONTACT_COUNT.times do |i|
-        admin_contact = Contact.find_by(code: current_user.code)
-        tech_contact = Contact.find_by(code: Setting.code_of_technical_contact)
+        admin_contact = Contact.find_by(code: current_user.code, role: :priv)
+        tech_contact = Contact.find_by(code: Setting.code_of_technical_contact || current_user.code)
 
         if i % 2 == 0
           @domain.admin_domain_contacts.build(contact: admin_contact)
diff --git a/app/javascript/controllers/behaviour/auto_removeable_controller.js b/app/javascript/controllers/behaviour/auto_removeable_controller.js
new file mode 100644
index 0000000..6594a01
--- /dev/null
+++ b/app/javascript/controllers/behaviour/auto_removeable_controller.js
@@ -0,0 +1,25 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static values = { delay: { type: Number, default: 2 } };
+
+  connect() {
+    if (this.delayValue) {
+      this.delayTid = setTimeout(() => {
+        this.hide();
+        delete this.delayTid;
+      }, this.delayValue * 1000);
+
+    }
+  }
+
+  disconnect() {
+    if (this.delayTid) {
+      clearTimeout(this.delayTid);
+    }
+  }
+
+  hide() {
+    this.element.remove();
+  }
+}
diff --git a/app/javascript/controllers/behaviour/removeable_controller.js b/app/javascript/controllers/behaviour/removeable_controller.js
index 6594a01..4363513 100644
--- a/app/javascript/controllers/behaviour/removeable_controller.js
+++ b/app/javascript/controllers/behaviour/removeable_controller.js
@@ -1,25 +1,8 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static values = { delay: { type: Number, default: 2 } };
-
-  connect() {
-    if (this.delayValue) {
-      this.delayTid = setTimeout(() => {
-        this.hide();
-        delete this.delayTid;
-      }, this.delayValue * 1000);
-
-    }
-  }
-
-  disconnect() {
-    if (this.delayTid) {
-      clearTimeout(this.delayTid);
-    }
-  }
-
-  hide() {
+  remove(event) {
+    event.preventDefault();
     this.element.remove();
   }
 }
diff --git a/app/javascript/controllers/form/autocomplete_controller.js b/app/javascript/controllers/form/autocomplete_controller.js
index 6fda4b5..367237b 100644
--- a/app/javascript/controllers/form/autocomplete_controller.js
+++ b/app/javascript/controllers/form/autocomplete_controller.js
@@ -4,7 +4,8 @@ export default class extends Controller {
   static targets = ["input", "results", "hiddenInput"]
   static values = {
     searchUrl: String,
-    initiator: { type: String, default: "registrar" }
+    initiator: { type: String, default: "registrar" },
+    setCode: { type: Boolean, default: false }
   }
 
   connect() {
@@ -46,21 +47,7 @@ export default class extends Controller {
       .then((contacts) => {
         console.log(contacts);
 
-        let html = ""
-
-        if (this.initiatorValue === "registrant") {
-          html = contacts.map(contact => `
-          <li data-action="click->form--autocomplete#select" data-value="${contact.name} - ${contact.code}" data-id="${contact.id}">
-            ${contact.name} - ${contact.ident}
-          </li>
-        `).join('')
-        } else {
-          html = contacts.map(contact => `
-            <li data-action="click->form--autocomplete#select" data-value="${contact.name} - ${contact.code}" data-id="${contact.id}">
-              ${contact.name} - ${contact.code}
-            </li>
-          `).join('')
-        }
+        let html = this.assignDropboxValue(contacts);
 
         this.resultsTarget.innerHTML = html
         this.resultsTarget.style.display = contacts.length > 0 ? 'block' : 'none';
@@ -76,6 +63,47 @@ export default class extends Controller {
     this.highlightFirstItem();
   }
 
+  assignDropboxValue(contacts) {
+    let html = ""
+
+    console.log(this.setCodeValue);
+
+    if (this.initiatorValue === "registrant") {
+      if (this.setCodeValue) {
+          html = contacts.map(contact => `
+            <li data-action="click->form--autocomplete#select" data-value="${contact.name} - ${contact.code}" data-id="${contact.code}">
+              ${contact.name} - ${contact.code}
+            </li>
+          `).join('')
+        }
+      else {
+        html = contacts.map(contact => `
+        <li data-action="click->form--autocomplete#select" data-value="${contact.name} - ${contact.code}" data-id="${contact.id}">
+          ${contact.name} - ${contact.ident}
+        </li>
+      `).join('')
+      }
+
+    } else {
+      if (this.setCodeValue) {
+        html = contacts.map(contact => `
+          <li data-action="click->form--autocomplete#select" data-value="${contact.name} - ${contact.code}" data-id="${contact.code}">
+            ${contact.name} - ${contact.code}
+          </li>
+        `).join('')
+      }
+      else {
+        html = contacts.map(contact => `
+          <li data-action="click->form--autocomplete#select" data-value="${contact.name} - ${contact.code}" data-id="${contact.id}">
+            ${contact.name} - ${contact.code}
+          </li>
+        `).join('')
+      }
+    }
+
+    return html;
+  }
+
   highlightFirstItem() {
     const firstItem = this.resultsTarget.querySelector('li');
     if (firstItem) firstItem.classList.add('bg-indigo-200');
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
index 3feb5cc..a9d157f 100644
--- a/app/javascript/controllers/index.js
+++ b/app/javascript/controllers/index.js
@@ -22,6 +22,9 @@ application.register("form--multi-select", Form__MultiSelectController);
 import Form__AddInputController from "./form/add_input_controller";
 application.register("form--add-input", Form__AddInputController);
 
+import Behaviour__AutoRemoveableController from "./behaviour/auto_removeable_controller";
+application.register("behaviour--auto-removeable", Behaviour__AutoRemoveableController);
+
 import Behaviour__RemoveableController from "./behaviour/removeable_controller";
 application.register("behaviour--removeable", Behaviour__RemoveableController);
 
diff --git a/app/models/setting.rb b/app/models/setting.rb
index ceccfb3..6b91468 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -86,6 +86,7 @@ def hash_format
   end
 
   def array_format
-    JSON.parse(value).to_a
+    # JSON.parse(value).to_a
+    eval(value)
   end
 end
diff --git a/app/views/admin/settings/show.html.erb b/app/views/admin/settings/show.html.erb
index fd8a47d..d71978a 100644
--- a/app/views/admin/settings/show.html.erb
+++ b/app/views/admin/settings/show.html.erb
@@ -24,10 +24,47 @@
         </div>
     <% end %>
 
+    <% @registrar_group.each do |setting| %>
+
+      <div class='flex items-center space-y-2'>
+        <div class='w-52'>
+        <%= form.label setting.code, class: 'block text-sm font-bold text-gray-700' %>
+        </div>
+          <% if setting.format == 'array' and setting.code == 'default_nameserver_records' %>
+            <%= component 'settings/array_field', form: form, setting: setting %>
+
+          <% elsif setting.format == 'hash' %>
+            <%= component 'settings/hash_field', form: form, setting: setting %>
+
+          <% elsif setting.format == 'boolean' %>
+
+            <fieldset class="space-y-5">
+              <%= component 'form/checkbox_with_description', form: form, attribute: "[settings][#{setting.id}", label_name: setting.code, description: setting.description, value: setting.value == 'true' %>
+            </fieldset>
+          
+          <% else %>
+
+            <div class="relative mt-1 rounded-md shadow-md border border-gray-300 w-96">
+              <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+                <%= heroicon 'cog', variant: :solid, options: { class: 'h-5 w-5 text-gray-400' } %>
+              </div>
+              <%= form.text_field "[settings][#{setting.id}", placeholder: t(".#{setting.code}"), value: setting.value, class: 'block w-full rounded-md border-gray-300 pl-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm py-2' %>
+            </div>
+
+          <% end %>
+
+          <%= form.hidden_field :id, value: "[settings][#{setting.id}" %>
+        </div>
+    <% end %>
+
     <% @contact_group.each do |setting| %>
-      <fieldset class="space-y-5">
-        <%= component 'form/checkbox_with_description', form: form, attribute: "[settings][#{setting.id}", label_name: setting.code, description: setting.description, value: setting.value == 'true' %>
-      </fieldset>
+      <% if setting.format == 'array' and setting.code == 'code_of_technical_contact' %>
+        <%= component 'settings/tech_contact_field', form: form, setting: setting %>
+      <% else %>
+        <fieldset class="space-y-5">
+          <%= component 'form/checkbox_with_description', form: form, attribute: "[settings][#{setting.id}", label_name: setting.code, description: setting.description, value: setting.value == 'true' %>
+        </fieldset>
+      <% end %>
     <% end %>
 
     <div class='w-full flex justify-end'>
diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index 5927f81..aa2d1bf 100644
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,13 +1,13 @@
 <%# locals: () -%>
 <div class="flex justify-center">
   <% if flash[:notice] %>
-    <div data-controller='behaviour--removeable' data-behaviour__removeable-delay-value="2" data-turbo-temporary class="max-w-sm opacity-95 border-t-4 border-green-600 rounded-b px-10 py-4 shadow-md bg-green-400" role="alert">
+    <div data-controller='behaviour--auto-removeable' data-behaviour__auto_removeable-delay-value="2" data-turbo-temporary class="max-w-sm opacity-95 border-t-4 border-green-600 rounded-b px-10 py-4 shadow-md bg-green-400" role="alert">
       <p class="text-small text-white"><%= flash[:notice] %></p>
     </div>
   <% end %>
 
   <% if flash[:alert] %> 
-    <div data-controller='behaviour--removeable' data-behaviour__removeable-delay-value="2" data-turbo-temporary class="max-w-sm opacity-95 border-t-4 border-red-600 rounded-b px-10 py-4 shadow-md bg-red-400" role="alert">
+    <div data-controller='behaviour--auto-removeable' data-behaviour__auto_removeable-delay-value="2" data-turbo-temporary class="max-w-sm opacity-95 border-t-4 border-red-600 rounded-b px-10 py-4 shadow-md bg-red-400" role="alert">
       <p class="text-small text-white"><%= flash[:alert] %></p>
     </div>
   <% end %>
diff --git a/app/views/registrant/domains/_contact_fields.html.erb b/app/views/registrant/domains/_contact_fields.html.erb
index cf753b8..d2e890c 100644
--- a/app/views/registrant/domains/_contact_fields.html.erb
+++ b/app/views/registrant/domains/_contact_fields.html.erb
@@ -1,23 +1,19 @@
 <div class='contact-item'>
     <div class="space-y-4 flex items-baseline space-x-4">
       <div class="flex items-center">
-        <%= form.radio_button :role, "priv", checked: form&.object&.new_record? ? true : form&.object&.role == 'priv', class: "h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500" %>
+        <%= form.radio_button :role, "priv", checked: true, class: "h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500" %>
         <%= form.label :role, t('.priv'), class: 'ml-3 block text-sm font-medium text-gray-700' %>
       </div>
 
-      <div class="flex items-center">
+      <%= tag.div class: 'flex items-center' do %>
         <%= form.radio_button :role, "org",  checked: form&.object&.role == 'org', class: "h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500" %>
         <%= form.label :role, t('.org'), class: 'ml-3 block text-sm font-medium text-gray-700' %>
-      </div>
+      <% end unless contact_type == 'admin_domain_contact' %>
     </div>
 
   <div id='private_form'>
     <b>Private contact field</b>
 
-    <%#= form.text_field :name, placeholder: 'New Contact Name' %>
-    <%#= form.text_field :email, placeholder: 'New Contact Email' %>
-    <%#= form.text_field :ident, placeholder: 'New Contact Ident' %>
-
     <div class='flex flex-row justify-evenly items-center'>
       <div class='flex flex-col space-y-4'>
         <div class='w-96'>
@@ -35,9 +31,6 @@
         </div>
 
         <div class='w-96'>
-          <%#= component 'form/text_input', form: form, attribute: :phone_code, heroicon_name: 'phone', placeholder: '+372' %>
-          <%#= component 'form/text_input', form: form, attribute: :phone, heroicon_name: 'phone', placeholder: '56722123' %>
-
           <%= component 'form/phone_input', form: form, phone_attribute: :phone, code_attribute: :phone_code,
                                             code_placeholder: '372', phone_placeholder: '56722123' %>
         </div>
diff --git a/app/views/registrant/domains/_form.html.erb b/app/views/registrant/domains/_form.html.erb
index ba1827f..fc303d1 100644
--- a/app/views/registrant/domains/_form.html.erb
+++ b/app/views/registrant/domains/_form.html.erb
@@ -33,8 +33,8 @@
       
       <%= component 'divider', label: t('.contacts') %>
 
-      <%= component 'form_domain_contact', contact_type: 'tech_domain_contact', form: form, domain: @domain %>
       <%= component 'form_domain_contact', contact_type: 'admin_domain_contact', form: form, domain: @domain %>
+      <%= component 'form_domain_contact', contact_type: 'tech_domain_contact', form: form, domain: @domain %>
 
       <%#= Nameservers %>
       <div class='flex flex-col space-y-4' data-controller="form--add-element" data-form--add-element-child-index-value="new_nameserver">
diff --git a/config/routes.rb b/config/routes.rb
index 9a631bd..193bc62 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -13,6 +13,10 @@
 
     resources :registrar_users, param: :uuid
     resources :domain_prices, param: :uuid, except: %i[show]
+
+    namespace :contacts do
+      resource :searches, only: %i[show]
+    end
   end
 
   resource :sessions, only: %i[new]
diff --git a/db/seeds.rb b/db/seeds.rb
index a3b081c..62c61fb 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -25,6 +25,10 @@
 Setting.where(code: 'show_address_customer')
        .first_or_create.update(code: 'show_address_customer', value: 'false', format: 'boolean', group: 'contacts', description: 'Show and create address on customer page')
 
+# Setting.where(code: 'code_of_technical_contact')
+#        .first_or_create.update(code: 'code_of_technical_contact', value: nil, format: 'string', group: 'registrar', description: 'Code of technical contact')
+Setting.where(code: 'code_of_technical_contact')
+       .first_or_create.update(code: 'code_of_technical_contact', value: [], format: 'array', group: 'contacts', description: 'Code of technical contact')
 
 # REGISTRAR GROUP:
 
@@ -41,7 +45,7 @@
 }
 Setting.where(code: 'default_nameserver_records')
        .first_or_create.update(
-        code: 'default_nameserver_records', value: [json_value_1.to_json, json_value_2.to_json], 
+        code: 'default_nameserver_records', value: [json_value_1, json_value_2], 
         format: 'array', group: 'registrar', description: 'Default nameserver records')
 
 dns_sec_default_value = {
@@ -63,8 +67,5 @@
 Setting.where(code: 'opt_out')
        .first_or_create.update(code: 'opt_out', value: 'false', format: 'boolean', group: 'registrar', description: 'Enable opt-out')
 
-Setting.where(code: 'code_of_technical_contact')
-       .first_or_create.update(code: 'code_of_technical_contact', value: nil, format: 'string', group: 'registrar', description: 'Code of technical contact')
-
 Setting.where(code: 'default_registration_and_renewal_period')
        .first_or_create.update(code: 'default_registration_and_renewal_period', value: '1y', format: 'integer', group: 'registrar', description: 'Default registration and renewal period')
diff --git a/tmp/.keep b/tmp/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/tmp/pids/.keep b/tmp/pids/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/tmp/storage/.keep b/tmp/storage/.keep
deleted file mode 100644
index e69de29..0000000

From 60d7f6e517c60c31c02d6d009fc3ce9548ad0c64 Mon Sep 17 00:00:00 2001
From: oleghasjanov <oleg.phenomenon@gmail.com>
Date: Wed, 17 Apr 2024 13:36:36 +0300
Subject: [PATCH 4/4] refactoring

---
 .../settings/contact_group/component.html.erb |  9 +++
 .../admin/settings/contact_group/component.rb | 14 ++++
 .../settings/invoice_group/component.html.erb | 15 +++++
 .../admin/settings/invoice_group/component.rb | 14 ++++
 .../registrar_group/component.html.erb        | 32 +++++++++
 .../settings/registrar_group/component.rb     | 14 ++++
 app/controllers/admin/settings_controller.rb  | 54 +--------------
 app/services/admin/setting_updater_service.rb | 67 +++++++++++++++++++
 app/views/admin/settings/show.html.erb        | 67 ++-----------------
 app/views/layouts/application.html.erb        |  5 +-
 db/seeds.rb                                   |  2 +-
 11 files changed, 177 insertions(+), 116 deletions(-)
 create mode 100644 app/components/admin/settings/contact_group/component.html.erb
 create mode 100644 app/components/admin/settings/contact_group/component.rb
 create mode 100644 app/components/admin/settings/invoice_group/component.html.erb
 create mode 100644 app/components/admin/settings/invoice_group/component.rb
 create mode 100644 app/components/admin/settings/registrar_group/component.html.erb
 create mode 100644 app/components/admin/settings/registrar_group/component.rb
 create mode 100644 app/services/admin/setting_updater_service.rb

diff --git a/app/components/admin/settings/contact_group/component.html.erb b/app/components/admin/settings/contact_group/component.html.erb
new file mode 100644
index 0000000..9ce45ae
--- /dev/null
+++ b/app/components/admin/settings/contact_group/component.html.erb
@@ -0,0 +1,9 @@
+<% @contact_group.each do |setting| %>
+  <% if setting.format == 'array' and setting.code == 'code_of_technical_contact' %>
+    <%= component 'settings/tech_contact_field', form: form, setting: setting %>
+  <% else %>
+    <fieldset class="space-y-5">
+      <%= component 'form/checkbox_with_description', form: form, attribute: "[settings][#{setting.id}", label_name: setting.code, description: setting.description, value: setting.value == 'true' %>
+    </fieldset>
+  <% end %>
+<% end %>
diff --git a/app/components/admin/settings/contact_group/component.rb b/app/components/admin/settings/contact_group/component.rb
new file mode 100644
index 0000000..5db6980
--- /dev/null
+++ b/app/components/admin/settings/contact_group/component.rb
@@ -0,0 +1,14 @@
+module Admin
+  module Settings
+    module ContactGroup
+      class Component < ApplicationViewComponent
+        attr_reader :contact_group, :form
+
+        def initialize(contact_group:, form:)
+          @contact_group = contact_group
+          @form = form
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/admin/settings/invoice_group/component.html.erb b/app/components/admin/settings/invoice_group/component.html.erb
new file mode 100644
index 0000000..dd58bd9
--- /dev/null
+++ b/app/components/admin/settings/invoice_group/component.html.erb
@@ -0,0 +1,15 @@
+<% @invoice_group.each do |setting| %>
+  <div class='flex items-center space-y-2'>
+
+    <div class='w-52'>
+    <%= form.label setting.code, class: 'block text-sm font-bold text-gray-700' %>
+    </div>
+      <div class="relative mt-1 rounded-md shadow-md border border-gray-300 w-96">
+        <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+          <%= heroicon 'cog', variant: :solid, options: { class: 'h-5 w-5 text-gray-400' } %>
+        </div>
+        <%= form.text_field "[settings][#{setting.id}", placeholder: t(".#{setting.code}"), value: setting.value, class: 'block w-full rounded-md border-gray-300 pl-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm py-2' %>
+      </div>
+      <%= form.hidden_field :id, value: "[settings][#{setting.id}" %>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/components/admin/settings/invoice_group/component.rb b/app/components/admin/settings/invoice_group/component.rb
new file mode 100644
index 0000000..08b9f03
--- /dev/null
+++ b/app/components/admin/settings/invoice_group/component.rb
@@ -0,0 +1,14 @@
+module Admin
+  module Settings
+    module InvoiceGroup
+      class Component < ApplicationViewComponent
+        attr_reader :invoice_group, :form
+
+        def initialize(invoice_group:, form:)
+          @invoice_group = invoice_group
+          @form = form
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/admin/settings/registrar_group/component.html.erb b/app/components/admin/settings/registrar_group/component.html.erb
new file mode 100644
index 0000000..1c49de3
--- /dev/null
+++ b/app/components/admin/settings/registrar_group/component.html.erb
@@ -0,0 +1,32 @@
+<% @registrar_group.each do |setting| %>
+
+      <div class='flex items-center space-y-2'>
+        <div class='w-52'>
+        <%= form.label setting.code, class: 'block text-sm font-bold text-gray-700' %>
+        </div>
+          <% if setting.format == 'array' and setting.code == 'default_nameserver_records' %>
+            <%= component 'settings/array_field', form: form, setting: setting %>
+
+          <% elsif setting.format == 'hash' %>
+            <%= component 'settings/hash_field', form: form, setting: setting %>
+
+          <% elsif setting.format == 'boolean' %>
+
+            <fieldset class="space-y-5">
+              <%= component 'form/checkbox_with_description', form: form, attribute: "[settings][#{setting.id}", label_name: setting.code, description: setting.description, value: setting.value == 'true' %>
+            </fieldset>
+          
+          <% else %>
+
+            <div class="relative mt-1 rounded-md shadow-md border border-gray-300 w-96">
+              <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+                <%= heroicon 'cog', variant: :solid, options: { class: 'h-5 w-5 text-gray-400' } %>
+              </div>
+              <%= form.text_field "[settings][#{setting.id}", placeholder: t(".#{setting.code}"), value: setting.value, class: 'block w-full rounded-md border-gray-300 pl-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm py-2' %>
+            </div>
+
+          <% end %>
+
+          <%= form.hidden_field :id, value: "[settings][#{setting.id}" %>
+        </div>
+    <% end %>
\ No newline at end of file
diff --git a/app/components/admin/settings/registrar_group/component.rb b/app/components/admin/settings/registrar_group/component.rb
new file mode 100644
index 0000000..d12d813
--- /dev/null
+++ b/app/components/admin/settings/registrar_group/component.rb
@@ -0,0 +1,14 @@
+module Admin
+  module Settings
+    module RegistrarGroup
+      class Component < ApplicationViewComponent
+        attr_reader :registrar_group, :form
+
+        def initialize(registrar_group:, form:)
+          @registrar_group = registrar_group
+          @form = form
+        end
+      end
+    end
+  end
+end
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 770049d..c79f69d 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -9,19 +9,7 @@ def show
     end
 
     def update
-      updated = true
-      errors = []
-    
-      casted_settings.each do |id, setting_params|
-        setting = Setting.find_by(id: id)
-
-        if setting.update!(setting_params)
-          next
-        else
-          updated = false
-          errors += setting.errors.full_messages
-        end
-      end
+      updated, errors = Admin::SettingUpdaterService.new(params).update
     
       if updated
         redirect_to root_path, status: :see_other, notice: t('.success')
@@ -30,45 +18,5 @@ def update
         render :show, status: :unprocessable_entity
       end
     end
-
-    private
-
-    def casted_settings
-      settings_values = {}
-    
-      params.require(:settings).permit!
-    
-      params[:settings].each do |k, v|
-        setting = Setting.find_by(id: k)
-
-        next unless setting
-    
-        formatted_value = format_setting_value(v, setting.format)
-        settings_values[setting.id] = { value: formatted_value }
-      end
-    
-      settings_values
-    end
-    
-    def format_setting_value(value, format_type)
-      case format_type
-      when 'boolean'
-        (value.to_s == 'true').to_s
-      when 'integer'
-        value.to_i
-      when 'float'
-        value.to_f
-      when 'hash'
-        value.is_a?(ActionController::Parameters) ? value.to_unsafe_h.to_json : value
-      when 'array'
-        if value.is_a?(Array) && value.first.is_a?(ActionController::Parameters)
-          value.map(&:to_unsafe_h).to_json
-        else
-          value.to_json
-        end
-      else
-        value
-      end
-    end
   end
 end
diff --git a/app/services/admin/setting_updater_service.rb b/app/services/admin/setting_updater_service.rb
new file mode 100644
index 0000000..09d4ca5
--- /dev/null
+++ b/app/services/admin/setting_updater_service.rb
@@ -0,0 +1,67 @@
+module Admin
+  class SettingUpdaterService
+    attr_reader :params
+
+    def initialize(params)
+      @params = params
+    end
+
+    def update
+      updated = true
+      errors = []
+    
+      casted_settings.each do |id, setting_params|
+        setting = Setting.find_by(id: id)
+
+        if setting.update!(setting_params)
+          next
+        else
+          updated = false
+          errors += setting.errors.full_messages
+        end
+      end
+
+      return updated, errors
+    end
+
+    private
+
+    def casted_settings
+      settings_values = {}
+    
+      params.require(:settings).permit!
+    
+      params[:settings].each do |k, v|
+        setting = Setting.find_by(id: k)
+
+        next unless setting
+    
+        formatted_value = format_setting_value(v, setting.format)
+        settings_values[setting.id] = { value: formatted_value }
+      end
+    
+      settings_values
+    end
+    
+    def format_setting_value(value, format_type)
+      case format_type
+      when 'boolean'
+        (value.to_s == 'true').to_s
+      when 'integer'
+        value.to_i
+      when 'float'
+        value.to_f
+      when 'hash'
+        value.is_a?(ActionController::Parameters) ? value.to_unsafe_h.to_json : value
+      when 'array'
+        if value.is_a?(Array) && value.first.is_a?(ActionController::Parameters)
+          value.map(&:to_unsafe_h).to_json
+        else
+          value.to_json
+        end
+      else
+        value
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/views/admin/settings/show.html.erb b/app/views/admin/settings/show.html.erb
index d71978a..1654159 100644
--- a/app/views/admin/settings/show.html.erb
+++ b/app/views/admin/settings/show.html.erb
@@ -8,68 +8,13 @@
   <div class="-mx-4 mt-8 overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:-mx-6 md:mx-0 md:rounded-lg p-8">
     <%= form_with url: admin_settings_path, method: :patch, class: 'w-full mt-8 space-y-4' do |form| %>
 
-    <% @invoice_group.each do |setting| %>
-      <div class='flex items-center space-y-2'>
+      <%= component 'admin/settings/invoice_group', form: form, invoice_group: @invoice_group %>
+      <%= component 'admin/settings/registrar_group', form: form, registrar_group: @registrar_group %>
+      <%= component 'admin/settings/contact_group', form: form, contact_group: @contact_group %>
 
-        <div class='w-52'>
-        <%= form.label setting.code, class: 'block text-sm font-bold text-gray-700' %>
-        </div>
-          <div class="relative mt-1 rounded-md shadow-md border border-gray-300 w-96">
-            <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
-              <%= heroicon 'cog', variant: :solid, options: { class: 'h-5 w-5 text-gray-400' } %>
-            </div>
-            <%= form.text_field "[settings][#{setting.id}", placeholder: t(".#{setting.code}"), value: setting.value, class: 'block w-full rounded-md border-gray-300 pl-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm py-2' %>
-          </div>
-          <%= form.hidden_field :id, value: "[settings][#{setting.id}" %>
-        </div>
+      <div class='w-full flex justify-end'>
+        <%= form.submit t('.submit'), class: "text-gray-600 inline-flex w-72 justify-center rounded-md border border-[#DDA77B] bg-white py-2 px-4 text-sm font-medium text-[#DDA77B] shadow-sm hover:bg-[#DDA77B] hover:text-white mt-2 cursor-pointer" %>
+      </div>
     <% end %>
-
-    <% @registrar_group.each do |setting| %>
-
-      <div class='flex items-center space-y-2'>
-        <div class='w-52'>
-        <%= form.label setting.code, class: 'block text-sm font-bold text-gray-700' %>
-        </div>
-          <% if setting.format == 'array' and setting.code == 'default_nameserver_records' %>
-            <%= component 'settings/array_field', form: form, setting: setting %>
-
-          <% elsif setting.format == 'hash' %>
-            <%= component 'settings/hash_field', form: form, setting: setting %>
-
-          <% elsif setting.format == 'boolean' %>
-
-            <fieldset class="space-y-5">
-              <%= component 'form/checkbox_with_description', form: form, attribute: "[settings][#{setting.id}", label_name: setting.code, description: setting.description, value: setting.value == 'true' %>
-            </fieldset>
-          
-          <% else %>
-
-            <div class="relative mt-1 rounded-md shadow-md border border-gray-300 w-96">
-              <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
-                <%= heroicon 'cog', variant: :solid, options: { class: 'h-5 w-5 text-gray-400' } %>
-              </div>
-              <%= form.text_field "[settings][#{setting.id}", placeholder: t(".#{setting.code}"), value: setting.value, class: 'block w-full rounded-md border-gray-300 pl-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm py-2' %>
-            </div>
-
-          <% end %>
-
-          <%= form.hidden_field :id, value: "[settings][#{setting.id}" %>
-        </div>
-    <% end %>
-
-    <% @contact_group.each do |setting| %>
-      <% if setting.format == 'array' and setting.code == 'code_of_technical_contact' %>
-        <%= component 'settings/tech_contact_field', form: form, setting: setting %>
-      <% else %>
-        <fieldset class="space-y-5">
-          <%= component 'form/checkbox_with_description', form: form, attribute: "[settings][#{setting.id}", label_name: setting.code, description: setting.description, value: setting.value == 'true' %>
-        </fieldset>
-      <% end %>
-    <% end %>
-
-    <div class='w-full flex justify-end'>
-      <%= form.submit t('.submit'), class: "text-gray-600 inline-flex w-72 justify-center rounded-md border border-[#DDA77B] bg-white py-2 px-4 text-sm font-medium text-[#DDA77B] shadow-sm hover:bg-[#DDA77B] hover:text-white mt-2 cursor-pointer" %>
-    </div>
-  <% end %>
   </div>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index bd4ac47..5bc1710 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,7 +14,10 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,400;0,700;1,400&display=swap" rel="stylesheet">
 
-    <script src="https://cdn.tailwindcss.com"></script>
+    <% if Rails.env.development? %>
+      <script src="https://cdn.tailwindcss.com"></script>
+    <% end %>
+
   </head>
 
   <body style="font-family: 'Roboto', sans-serif;">
diff --git a/db/seeds.rb b/db/seeds.rb
index 62c61fb..1b1a273 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -13,7 +13,7 @@
        .first_or_create.update(code: 'invoice_number_max', value: '199999', format: 'integer', group: 'invoice', description: 'Maximum invoice number')
 
 Setting.where(code: 'vat')
-       .first_or_create.update(code: 'vat', value: '20.0', format: 'float', group: 'invoice', description: 'VAT rate')  
+       .first_or_create.update(code: 'vat', value: '22.0', format: 'float', group: 'invoice', description: 'VAT rate')  
 
 # BILLING GROUP: