From d53a7f9c47587e5592483aea3a9b1d9b78cb998d Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Thu, 8 Mar 2018 14:22:28 +0200
Subject: [PATCH] Revert "Extract partial"

This reverts commit 955dc10
---
 app/views/admin/registrars/_billing.html.erb | 20 --------------------
 app/views/admin/registrars/show.html.erb     | 19 ++++++++++++++++++-
 config/locales/admin/registrars.en.yml       |  3 ---
 config/locales/en.yml                        |  2 +-
 4 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 app/views/admin/registrars/_billing.html.erb

diff --git a/app/views/admin/registrars/_billing.html.erb b/app/views/admin/registrars/_billing.html.erb
deleted file mode 100644
index 7ba778d08..000000000
--- a/app/views/admin/registrars/_billing.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <%= t '.header' %>
-    </div>
-    <div class="panel-body">
-        <dl class="dl-horizontal">
-            <dt><%= Registrar.human_attribute_name :vat_no %></dt>
-            <dd><%= registrar.vat_no %></dd>
-
-            <dt><%= Registrar.human_attribute_name :vat_rate %></dt>
-            <dd><%= number_to_percentage registrar.vat_rate, precision: 1 %></dd>
-
-            <dt><%= Registrar.human_attribute_name :accounting_customer_code %></dt>
-            <dd><%= registrar.accounting_customer_code %></dd>
-
-            <dt><%= Registrar.human_attribute_name :billing_email %></dt>
-            <dd><%= registrar.billing_email %></dd>
-        </dl>
-    </div>
-</div>
diff --git a/app/views/admin/registrars/show.html.erb b/app/views/admin/registrars/show.html.erb
index ef75e4a64..2b1515fa0 100644
--- a/app/views/admin/registrars/show.html.erb
+++ b/app/views/admin/registrars/show.html.erb
@@ -57,6 +57,12 @@
                     <dd>
                         <%= @registrar.reg_no %>
                     </dd>
+                    <dt>
+                        <%= t(:vat_no) %>
+                    </dt>
+                    <dd>
+                        <%= @registrar.vat_no %>
+                    </dd>
                     <dt>
                         <%= t(:reference_no) %>
                     </dt>
@@ -81,6 +87,12 @@
                     <dd>
                         <%= @registrar.website %>
                     </dd>
+                    <dt>
+                        <%= Registrar.human_attribute_name :accounting_customer_code %>
+                    </dt>
+                    <dd>
+                        <%= @registrar.accounting_customer_code %>
+                    </dd>
                 </dl>
             </div>
         </div>
@@ -124,10 +136,15 @@
                     <dd>
                         <%= @registrar.billing_address %>
                     </dd>
+                    <dt>
+                        <%= t(:billing_email) %>
+                    </dt>
+                    <dd>
+                        <%= @registrar.billing_email %>
+                    </dd>
                 </dl>
             </div>
         </div>
-        <%= render 'billing', registrar: @registrar %>
         <%= render 'admin/registrars/show/preferences', registrar: registrar %>
     </div>
 </div>
diff --git a/config/locales/admin/registrars.en.yml b/config/locales/admin/registrars.en.yml
index ec8d39b63..249a3b70a 100644
--- a/config/locales/admin/registrars.en.yml
+++ b/config/locales/admin/registrars.en.yml
@@ -22,9 +22,6 @@ en:
       edit:
         header: Edit registrar
 
-      billing:
-        header: Billing
-
       create:
         created: Registrar has been successfully created
         not_created: Unable to create registrar
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4845d7309..65c3d658d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -199,6 +199,7 @@ en:
         alg: 'Algorithm'
         public_key: 'Public key'
       registrar:
+        billing_email: 'Billing e-mail'
         phone: 'Contact phone'
         email: 'Contact e-mail'
         state: 'State / Province'
@@ -777,5 +778,4 @@ en:
         unit: €
 
   attributes:
-    vat_no: VAT number
     vat_rate: VAT rate