Merge remote-tracking branch 'origin/master' into fix-registrant-contact-view

app/views/admin/invoices/show.haml

@@ -21,3 +21,5 @@
   .col-md-6= render 'registrar/invoices/partials/buyer'
 .row
   .col-md-12= render 'registrar/invoices/partials/items'
+.row
+  .col-md-12= render 'registrar/invoices/partials/payment_orders'

app/views/layouts/admin/base.haml

@@ -32,5 +32,5 @@
 
       .footer.text-right
         Version
-        = CURRENT_COMMIT_HASH
+        = current_commit_link
     = javascript_include_tag 'admin-manifest', async: true

app/views/layouts/registrant/application.html.erb

@@ -76,7 +76,7 @@
                     </div>
                     <div class="col-md-6 text-right">
                         Version
-                        <%= CURRENT_COMMIT_HASH %>
+                        <%= current_commit_link %>
                     </div>
                 </div>
             </div>

app/views/layouts/registrar/base.html.erb

@@ -54,7 +54,7 @@
                     </div>
                     <div class="col-md-6 text-right">
                         Version
-                        <%= CURRENT_COMMIT_HASH %>
+                        <%= current_commit_link %>
                     </div>
                 </div>
             </div>

app/views/layouts/registrar/sessions.html.erb

@@ -44,7 +44,7 @@
                 </div>
                 <div class="col-md-6 text-right">
                     Version
-                    <%= CURRENT_COMMIT_HASH %>
+                    <%= current_commit_link %>
                 </div>
             </div>
         </div>

app/views/registrar/domains/info.html.erb

@@ -6,6 +6,10 @@
                     class: 'btn btn-default') %>
         <%= link_to(t(:delete), delete_registrar_domains_path(domain_name: params[:domain_name]),
                     class: 'btn btn-default') %>
+        <% if @client_holded %>
+            <%= link_to(t(:remove_client_hold), remove_hold_registrar_domains_path(domain_name: params[:domain_name]),
+                    class: 'btn btn-default') %>
+        <% end %>
     <% else %>
         <%= link_to t('.transfer_btn'), new_registrar_domain_transfer_path(domain_name: params[:domain_name]),
                     class: 'btn btn-default' %>

app/views/registrar/invoices/partials/_payment_orders.haml

@@ -0,0 +1,19 @@
+%h4= "Payment Orders"
+%hr
+.table-responsive
+  %table.table.table-hover.table-condensed
+    %thead
+      %tr
+        %th{class: 'col-xs-1'}= "#"
+        %th{class: 'col-xs-1'}= "Channel"
+        %th{class: 'col-xs-2'}= "Status"
+        %th{class: 'col-xs-3'}= "Initiated"
+        %th{class: 'col-xs-4'}= "Notes"
+    %tbody
+      - @invoice.payment_orders.each do |payment_order|
+        %tr
+          %td= payment_order.id
+          %td= payment_order.channel
+          %td= payment_order.status
+          %td= payment_order.created_at
+          %td= payment_order.notes

app/views/registrar/invoices/show.haml

@@ -17,4 +17,4 @@
 
 - if @invoice.payable?
   .row.semifooter
-    .col-md-6-offset-6.text-right= render 'registrar/invoices/partials/banklinks', locals: { payment_channels: PaymentOrders::PAYMENT_METHODS }
+    .col-md-6-offset-6.text-right= render 'registrar/invoices/partials/banklinks', locals: { payment_channels: PaymentOrder::CUSTOMER_PAYMENT_METHODS }

app/views/registrar/payments/pay.html.haml

@@ -2,8 +2,8 @@
   = t('registrar.invoices.redirected_to_intermediary')
 
 .payment-form
-  = form_tag @payment.form_url, method: :post do
-    - @payment.form_fields.each do |k, v|
+  = form_tag @payment_order.form_url, method: :post do
+    - @payment_order.form_fields.each do |k, v|
       = hidden_field_tag k, v
     = submit_tag t('registrar.invoices.go_to_intermediary')
 

app/views/registrar/xml_consoles/epp_requests/domain/client_hold.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
+  <command>
+    <update>
+      <domain:update
+        xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+        <domain:name>example.ee</domain:name>
+        <domain:rem>
+          <domain:status s="clientHold"/>
+        </domain:rem>
+      </domain:update>
+    </update>
+    <clTRID>timo-1579351654</clTRID>
+  </command>
+</epp>

app/views/registrar/xml_consoles/show.haml

@@ -29,6 +29,9 @@
     ,
     %a.js-load-xml{href: 'javascript:void(0)', data: {obj: 'domain', epp_action: 'delete'}}
       Delete
+    ,
+    %a.js-load-xml{href: 'javascript:void(0)', data: {obj: 'domain', epp_action: 'client_hold'}}
+      Remove Client Hold
 
     %h4 Poll
     %a.js-load-xml{href: 'javascript:void(0)', data: {obj: 'poll', epp_action: 'poll'}}