Merge remote-tracking branch 'origin/master' into 509-directo-to-gem

app/controllers/registrar/domains_controller.rb

@@ -59,6 +59,7 @@ class Registrar
     def info
       authorize! :info, Depp::Domain
       @data = @domain.info(params[:domain_name]) if params[:domain_name]
+      @client_holded = client_holded(@data)
       if response_ok?
         render 'info'
       else
@@ -153,12 +154,26 @@ class Registrar
       render json: scope.pluck(:name, :code).map { |c| { display_key: "#{c.second} #{c.first}", value: c.second } }
     end
 
+    def remove_hold
+      authorize! :remove_hold, Depp::Domain
+      return unless params[:domain_name]
+
+      @data = @domain.remove_hold(params)
+
+      flash[:alert] = @data.css('msg').text unless response_ok?
+      redirect_to info_registrar_domains_url(domain_name: params[:domain_name])
+    end
+
     private
 
     def init_domain
       @domain = Depp::Domain.new(current_user: depp_current_user)
     end
 
+    def client_holded(data)
+      data.css('status')&.map { |element| element.attribute('s').value }
+         &.any? { |status| status == DomainStatus::CLIENT_HOLD }
+    end
 
     def contacts
       current_registrar_user.registrar.contacts

app/jobs/send_e_invoice_job.rb

@@ -0,0 +1,43 @@
+class SendEInvoiceJob < Que::Job
+  def run(invoice_id)
+    invoice = run_condition(Invoice.find_by(id: invoice_id))
+
+    invoice.to_e_invoice.deliver
+    ActiveRecord::Base.transaction do
+      invoice.update(e_invoice_sent_at: Time.zone.now)
+      log_success(invoice)
+      destroy
+    end
+  rescue StandardError => e
+    log_error(invoice: invoice, error: e)
+    raise e
+  end
+
+  private
+
+  def run_condition(invoice)
+    destroy unless invoice
+    destroy if invoice.do_not_send_e_invoice?
+    invoice
+  end
+
+  def log_success(invoice)
+    id = invoice.try(:id) || invoice
+    message = "E-Invoice for an invoice with ID # #{id} was sent successfully"
+    logger.info message
+  end
+
+  def log_error(invoice:, error:)
+    id = invoice.try(:id) || invoice
+    message = <<~TEXT.squish
+      There was an error sending e-invoice for invoice with ID # #{id}.
+      The error message was the following: #{error}
+      This job will retry.
+    TEXT
+    logger.error message
+  end
+
+  def logger
+    Rails.logger
+  end
+end

app/models/ability.rb

@@ -50,6 +50,7 @@ class Ability
     can(:check,    Epp::Domain)
     can(:create,   Epp::Domain)
     can(:renew,    Epp::Domain) { |d| d.registrar_id == @user.registrar_id }
+    can(:remove_hold, Epp::Domain) { |d| d.registrar_id == @user.registrar_id }
     can(:update,   Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || d.transfer_code == pw }
     can(:transfer, Epp::Domain)
     can(:delete,   Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || d.transfer_code == pw }

app/models/concerns/remove_hold.rb

@@ -0,0 +1,9 @@
+module RemoveHold
+  extend ActiveSupport::Concern
+
+  def remove_hold(params)
+    xml = epp_xml.update(name: { value: params[:domain_name] },
+                         rem: [status: { attrs: { s: 'clientHold' }, value: '' }])
+    current_user.request(xml)
+  end
+end

app/models/depp/domain.rb

@@ -1,6 +1,7 @@
 module Depp
   class Domain
     include ActiveModel::Conversion
+    include RemoveHold
     extend ActiveModel::Naming
 
     attr_accessor :name, :current_user, :epp_xml

app/models/domain.rb

@@ -485,9 +485,9 @@ class Domain < ApplicationRecord
             self.delete_date = nil
           when DomainStatus::SERVER_MANUAL_INZONE # removal causes server hold to set
             self.outzone_at = Time.zone.now if force_delete_scheduled?
-          when DomainStatus::DomainStatus::EXPIRED # removal causes server hold to set
+          when DomainStatus::EXPIRED # removal causes server hold to set
             self.outzone_at = self.expire_time + 15.day
-          when DomainStatus::DomainStatus::SERVER_HOLD # removal causes server hold to set
+          when DomainStatus::SERVER_HOLD # removal causes server hold to set
             self.outzone_at = nil
         end
       end

app/models/invoice.rb

@@ -118,6 +118,14 @@ class Invoice < ApplicationRecord
     inv
   end
 
+  def do_not_send_e_invoice?
+    e_invoice_sent? || cancelled? || paid?
+  end
+
+  def e_invoice_sent?
+    e_invoice_sent_at.present?
+  end
+
   private
 
   def apply_default_buyer_vat_no

app/models/registrar.rb

@@ -100,9 +100,7 @@ class Registrar < ApplicationRecord
         }
       ]
     )
-
-    e_invoice = invoice.to_e_invoice
-    e_invoice.deliver
+    SendEInvoiceJob.enqueue(invoice.id)
 
     invoice
   end

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/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'}}