Merge remote-tracking branch 'origin/master' into 1739-ns-bulk-change-test-and-whois-update

app/views/admin/base/_menu.haml

@@ -33,6 +33,7 @@
           %li= link_to t('.blocked_domains'), admin_blocked_domains_path
           %li= link_to t('.reserved_domains'), admin_reserved_domains_path
           %li= link_to t('.disputed_domains'), admin_disputes_path
+          %li= link_to t('.bounced_email_addresses'), admin_bounced_mail_addresses_path
           %li= link_to t('.epp_log'), admin_epp_logs_path(created_after: 'today')
           %li= link_to t('.repp_log'), admin_repp_logs_path(created_after: 'today')
           %li= link_to t('.que'), '/admin/que'

app/views/admin/bounced_mail_addresses/index.html.erb

@@ -0,0 +1,36 @@
+<h1>Bounced Mail Addresses</h1>
+
+<div class="row">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="table-responsive">
+                <table class="table table-hover table-bordered table-condensed">
+                    <thead>
+                        <tr>
+                            <th>Email</th>
+                            <th>Action</th>
+                            <th>Status</th>
+                            <th>Diagnostic</th>
+                            <th>Tracked</th>
+                            <th colspan="2">Actions</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        <% @bounced_mail_addresses.each do |mail_addr| %>
+                        <tr>
+                            <td><%= mail_addr.email %></td>
+                            <td><%= mail_addr.action %></td>
+                            <td><%= mail_addr.status %></td>
+                            <td><%= mail_addr.diagnostic %></td>
+                            <td><%= mail_addr.created_at %></td>
+                            <td><%= link_to 'Detailed', admin_bounced_mail_address_path(mail_addr) %></td>
+                            <td><%= link_to 'Destroy', admin_bounced_mail_address_path(mail_addr), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+                        </tr>
+                        <% end %>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>

app/views/admin/bounced_mail_addresses/show.html.erb

@@ -0,0 +1,27 @@
+<p>
+  <strong>Email:</strong>
+  <%= @bounced_mail_address.email %>
+</p>
+
+<p>
+  <strong>Bounced message ID:</strong>
+  <%= @bounced_mail_address.message_id %>
+</p>
+
+<p>
+  <strong>Overall bounce type:</strong>
+  <%= @bounced_mail_address.bounce_type %> (<%= @bounced_mail_address.bounce_subtype %> )
+</p>
+
+<p>
+  <strong>Bounced recipient status:</strong>
+  <%= @bounced_mail_address.action %> (<%= @bounced_mail_address.status %>)
+</p>
+
+<p>
+  <strong>Bounced recipient diagnostic:</strong>
+  <pre><%= @bounced_mail_address.diagnostic %></pre>
+</p>
+
+<%= link_to 'Back', admin_bounced_mail_addresses_path %>
+<%= link_to 'Destroy', admin_bounced_mail_address_path(@bounced_mail_address), method: :delete, data: { confirm: 'Are you sure?' } %></td>

app/views/epp/contacts/info.xml.builder

@@ -14,11 +14,15 @@ xml.epp_head do
         end
 
         xml.tag!('contact:postalInfo', type: 'int') do
-          xml.tag!('contact:name', @contact.name)
+          if can? :view_full_info, @contact, @password
+            xml.tag!('contact:name', @contact.name)
+          else
+            xml.tag!('contact:name', 'No access')
+          end
           if can? :view_full_info, @contact, @password
             xml.tag!('contact:org', @contact.org_name) if @contact.org_name.present?
 
-            if address_processing?
+            if Contact.address_processing?
               xml.tag!('contact:addr') do
                 xml.tag!('contact:street', @contact.street)
                 xml.tag!('contact:city', @contact.city)
@@ -31,7 +35,7 @@ xml.epp_head do
           else
             xml.tag!('contact:org', 'No access')
 
-            if address_processing?
+            if Contact.address_processing?
               xml.tag!('contact:addr') do
                 xml.tag!('contact:street', 'No access')
                 xml.tag!('contact:city', 'No access')

app/views/mailers/domain_expire_mailer/expired_soft.html.erb

@@ -2,7 +2,7 @@
 
 <p>Lugupeetud .ee domeeni registreerija/halduskontakt</p>
 
-<p>Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Domeeniga on seotud puudulike kontakti objekte, milles tulenevalt on Eesti Interneti SA blokeerinud domeeni pikendamise ja registripidaja vahetuse, kuniks kontaktandmed korrastatakse. Andmete korrastamiseks ja registreeringu pikendamiseks pöörduge palun oma registripidaja poole.</p>
+<p>Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Domeeniga on seotud puudulikke kontakti objekte, millest tulenevalt on Eesti Interneti SA blokeerinud domeeni pikendamise ja registripidaja vahetuse, kuniks kontaktandmed korrastatakse. Andmete korrastamiseks ja registreeringu pikendamiseks pöörduge palun oma registripidaja poole.</p>
 
 <p><%= @domain.name %> pikendamata jätmisel domeen kustub ja läheb <%= @domain.delete_date %> oksjonile .ee oksjonikeskkonda. Domeenioksjonite kohta loe lähemalt <a href="https://www.internet.ee/domeenioksjonid">siit</a>.</p>
 

app/views/mailers/domain_expire_mailer/expired_soft.text.erb

@@ -2,7 +2,7 @@ Domeen <%= @domain.name %> on aegunud ning suunatud kustutusmenetlusse kuna olem
 
 Lugupeetud .ee domeeni registreerija/halduskontakt
 
-Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Domeeniga on seotud puudulike kontakti objekte, milles tulenevalt on Eesti Interneti SA blokeerinud domeeni pikendamise ja registripidaja vahetuse, kuniks kontaktandmed korrastatakse. Andmete korrastamiseks ja registreeringu pikendamiseks pöörduge palun oma registripidaja poole.
+Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Domeeniga on seotud puudulikke kontakti objekte, millest tulenevalt on Eesti Interneti SA blokeerinud domeeni pikendamise ja registripidaja vahetuse, kuniks kontaktandmed korrastatakse. Andmete korrastamiseks ja registreeringu pikendamiseks pöörduge palun oma registripidaja poole.
 
 <%= @domain.name %> pikendamata jätmisel domeen kustub ja läheb <%= @domain.delete_date %> oksjonile .ee oksjonikeskkonda. Domeenioksjonite kohta loe lähemalt siit https://www.internet.ee/domeenioksjonid.
 

app/views/registrar/bulk_change/_api_errors.html.erb

@@ -0,0 +1,13 @@
+<% if @api_errors %>
+    <div class="alert alert-danger">
+        <ul>
+            <% if @api_errors.is_a?(String) %>
+            <li><%= @api_errors %></li>
+            <% else %>
+            <% @api_errors.each do |error| %>
+                <li><%= error[:title] %></li>
+            <% end %>
+            <% end %>
+        </ul>
+    </div>
+<% end %>

app/views/registrar/bulk_change/_bulk_renew_form.html.erb

@@ -0,0 +1,57 @@
+<%= form_with url: registrar_bulk_renew_path, multipart: true, class: 'form-horizontal' do |f|%>
+    <%= render 'api_errors' %>
+
+    <div class="form-group">
+        <div class="col-md-2 control-label">
+            <%= f.label :current_balance, t('.current_balance') %>
+        </div>
+        <div class="col-md-4" id='registrar_balance'>
+            <%= number_to_currency current_registrar_user.registrar.balance %>
+        </div>
+    </div>
+
+
+    <div class="form-group">
+        <div class="col-md-2 control-label">
+            <%= f.label :expire_date, t('.expire_date') %>
+        </div>
+        <div class="col-md-4">
+            <%= f.text_field :expire_date, value: @expire_date,
+                               class: 'form-control js-datepicker'%>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-2 control-label">
+            <%= f.label :period, t('.period'), class: 'required' %>
+        </div>
+        <div class="col-md-4">
+            <%= select_tag 'period',
+                           options_for_select(Depp::Domain::PERIODS, @period), { class: 'form-control' } %>
+        </div>
+    </div>
+
+    <% if @domains.present? %>
+        <div class="form-group">
+            <div class="col-md-2 control-label">
+                <%= f.label :domain_ids, t('.domain_ids') %>
+            </div>
+            <div class="col-md-4">
+                <%= f.collection_check_boxes :domain_ids, @domains, :name, :name,
+                                             checked: @domains.map(&:name) do |b|%>
+                    <div class="row">
+                            <%= b.check_box %>
+                            <%= b.label %>
+                    </div>
+                <% end %>
+            </div>
+        </div>
+    <% end %>
+
+    <div class="form-group pull-left">
+        <%= f.submit "#{t '.filter_btn'}", name: 'filter', class: 'btn btn-warning' %>
+        <% if @domains.present? %>
+            <%= f.submit "#{t '.renew_btn'}", name: 'renew', class: 'btn btn-primary' %>
+        <% end %>
+    </div>
+<% end %>

app/views/registrar/bulk_change/_tech_contact_form.html.erb

@@ -1,7 +1,7 @@
 <%= form_tag registrar_tech_contacts_path, method: :patch, class: 'form-horizontal' do %>
     <% if @error %>
         <div class="alert alert-danger">
-            <%= @error[:message] %>
+            <%= @error %>
         </div>
     <% end %>
 

app/views/registrar/bulk_change/new.html.erb

@@ -19,6 +19,10 @@
             <li class="<%= 'active' if active_tab == :bulk_transfer %>">
                 <a href="#bulk_transfer" data-toggle="tab"><%= t '.bulk_transfer' %></a>
             </li>
+
+            <li class="<%= 'active' if active_tab == :bulk_renew %>">
+                <a href="#bulk_renew" data-toggle="tab"><%= t '.bulk_renew' %></a>
+            </li>
         </ul>
 
         <div class="tab-content">
@@ -34,4 +38,8 @@
             <div class="tab-pane<%= ' active' if active_tab == :bulk_transfer %>" id="bulk_transfer">
                 <%= render 'bulk_transfer_form' %>
             </div>
+
+            <div class="tab-pane<%= ' active' if active_tab == :bulk_renew %>" id="bulk_renew">
+                <%= render 'bulk_renew_form' %>
+            </div>
         </div>

app/views/registrar/contacts/_form.haml

@@ -5,7 +5,7 @@
   .col-md-8
     = render 'registrar/contacts/form/general', f: f
 
-- if address_processing?
+- if Contact.address_processing?
   .row
     .col-md-8
       = render 'registrar/contacts/form/address', f: f

app/views/registrar/domain_transfers/form/_api_errors.html.erb

@@ -1,9 +1,13 @@
 <% if @api_errors %>
     <div class="alert alert-danger">
         <ul>
+            <% if @api_errors.is_a?(String) %>
+            <li><%= @api_errors %></li>
+            <% else %>
             <% @api_errors.each do |error| %>
                 <li><%= error[:title] %></li>
             <% end %>
+            <% end %>
         </ul>
     </div>
 <% end %>

app/views/registrar/domains/partials/_contacts.haml

@@ -13,5 +13,5 @@
         - registrant = Contact.find_by_code(x.text)
           %tr
             %td= x['type']
-            %td= registrant.name
+            %td= registrant.registrar == current_registrar_user.registrar ? registrant.name : 'N/A'
             %td= x.text

app/views/registrar/domains/partials/_general.html.erb

@@ -23,7 +23,7 @@
 
             <% registrant = Contact.find_by_code(@data.css('registrant').text) %>
             <dt><%= t('.registrant') %></dt>
-            <dd><%= "#{registrant.name} (#{@data.css('registrant').text})" %></dd>
+            <dd><%= registrant.registrar == current_registrar_user.registrar ? "#{registrant.name} (#{@data.css('registrant').text})" : @data.css('registrant').text %></dd>
 
             <dt><%= t('.registered') %></dt>
             <dd><%= @data.css('crDate').text %></dd>