mirror of
https://github.com/internetee/registry.git
synced 2025-06-05 20:27:30 +02:00
fixed codeclimate errors
This commit is contained in:
parent
e7e3278267
commit
e0c47cdb35
9 changed files with 13 additions and 18 deletions
|
@ -63,9 +63,7 @@ class Registrar
|
||||||
|
|
||||||
possible_users = ApiUser.where(identity_code: idc) || User.new
|
possible_users = ApiUser.where(identity_code: idc) || User.new
|
||||||
possible_users.each do |selected_user|
|
possible_users.each do |selected_user|
|
||||||
if selected_user.registrar.white_ips.registrar_area.include_ip?(request.ip)
|
return selected_user if selected_user.registrar.white_ips.registrar_area.include_ip?(request.ip)
|
||||||
return selected_user
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ class Registrar
|
||||||
|
|
||||||
def load_xml
|
def load_xml
|
||||||
cl_trid = "#{depp_current_user.tag}-#{Time.zone.now.to_i}"
|
cl_trid = "#{depp_current_user.tag}-#{Time.zone.now.to_i}"
|
||||||
xml_dir_path = Rails.root.join('app', 'views', 'registrar', 'xml_consoles', 'epp_requests').to_s
|
xml_dir_path = Rails.root.join('app/views/registrar/xml_consoles/epp_requests').to_s
|
||||||
xml = File.read("#{xml_dir_path}/#{params[:obj]}/#{params[:epp_action]}.xml")
|
xml = File.read("#{xml_dir_path}/#{params[:obj]}/#{params[:epp_action]}.xml")
|
||||||
xml = prepare_payload(xml, cl_trid)
|
xml = prepare_payload(xml, cl_trid)
|
||||||
|
|
||||||
|
|
|
@ -2,9 +2,7 @@ module ObjectVersionsHelper
|
||||||
def attach_existing_fields(version, new_object)
|
def attach_existing_fields(version, new_object)
|
||||||
version.object_changes.to_h.each do |key, value|
|
version.object_changes.to_h.each do |key, value|
|
||||||
method_name = "#{key}=".to_sym
|
method_name = "#{key}=".to_sym
|
||||||
if new_object.respond_to?(method_name)
|
new_object.public_send(method_name, event_value(version, value)) if new_object.respond_to?(method_name)
|
||||||
new_object.public_send(method_name, event_value(version, value))
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ module Domains
|
||||||
end
|
end
|
||||||
|
|
||||||
def logger
|
def logger
|
||||||
@logger ||= Logger.new(Rails.root.join('log', 'domain_expire_period.log'))
|
@logger ||= Logger.new(Rails.root.join('log/domain_expire_period.log'))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -31,6 +31,6 @@ class MigrateBeforeForceDeleteStatusesJob < ApplicationJob
|
||||||
end
|
end
|
||||||
|
|
||||||
def logger
|
def logger
|
||||||
@logger ||= Logger.new(Rails.root.join('log', 'migrate_before_force_delete_statuses.log'))
|
@logger ||= Logger.new(Rails.root.join('log/migrate_before_force_delete_statuses.log'))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -31,6 +31,6 @@ class MigrateStatusesToDomainHistoryJob < ApplicationJob
|
||||||
end
|
end
|
||||||
|
|
||||||
def logger
|
def logger
|
||||||
@logger ||= Logger.new(Rails.root.join('log', 'migrate_statuses_to_domain_history.log'))
|
@logger ||= Logger.new(Rails.root.join('log/migrate_statuses_to_domain_history.log'))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
class ApplicationMailer < ActionMailer::Base
|
class ApplicationMailer < ActionMailer::Base
|
||||||
append_view_path Rails.root.join('app', 'views', 'mailers')
|
append_view_path Rails.root.join('app/views/mailers')
|
||||||
layout 'mailer'
|
layout 'mailer'
|
||||||
|
|
||||||
def registrant_confirm_url(domain:, method:)
|
def registrant_confirm_url(domain:, method:)
|
||||||
|
|
|
@ -325,12 +325,9 @@ class Epp::Domain < Domain
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
if (statuses &
|
if (statuses & [DomainStatus::CLIENT_DELETE_PROHIBITED, DomainStatus::SERVER_DELETE_PROHIBITED]).any?
|
||||||
[DomainStatus::CLIENT_DELETE_PROHIBITED, DomainStatus::SERVER_DELETE_PROHIBITED]).any?
|
errors.add(:base, :domain_status_prohibits_operation)
|
||||||
begin
|
return false
|
||||||
errors.add(:base, :domain_status_prohibits_operation)
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
true
|
true
|
||||||
|
|
|
@ -13,6 +13,7 @@ class Invoice < ApplicationRecord
|
||||||
|
|
||||||
accepts_nested_attributes_for :items
|
accepts_nested_attributes_for :items
|
||||||
# rubocop:disable Layout/LineLength
|
# rubocop:disable Layout/LineLength
|
||||||
|
# rubocop:disable Style/MultilineBlockLayout
|
||||||
scope :all_columns, -> { select("invoices.*") }
|
scope :all_columns, -> { select("invoices.*") }
|
||||||
scope :sort_due_date_column, -> { all_columns.select("CASE WHEN invoices.cancelled_at is not null THEN
|
scope :sort_due_date_column, -> { all_columns.select("CASE WHEN invoices.cancelled_at is not null THEN
|
||||||
(invoices.cancelled_at + interval '100 year') ELSE
|
(invoices.cancelled_at + interval '100 year') ELSE
|
||||||
|
@ -28,6 +29,7 @@ class Invoice < ApplicationRecord
|
||||||
|
|
||||||
scope :overdue, -> { unpaid.non_cancelled.where('due_date < ?', Time.zone.today) }
|
scope :overdue, -> { unpaid.non_cancelled.where('due_date < ?', Time.zone.today) }
|
||||||
# rubocop:enable Layout/LineLength
|
# rubocop:enable Layout/LineLength
|
||||||
|
# rubocop:enable Style/MultilineBlockLayout
|
||||||
validates :due_date, :currency, :seller_name,
|
validates :due_date, :currency, :seller_name,
|
||||||
:seller_iban, :buyer_name, :items, presence: true
|
:seller_iban, :buyer_name, :items, presence: true
|
||||||
|
|
||||||
|
@ -38,7 +40,7 @@ class Invoice < ApplicationRecord
|
||||||
attribute :vat_rate, ::Type::VatRate.new
|
attribute :vat_rate, ::Type::VatRate.new
|
||||||
|
|
||||||
def set_invoice_number
|
def set_invoice_number
|
||||||
last_no = Invoice.order(number: :desc).limit(1).pluck(:number).first
|
last_no = Invoice.order(number: :desc).limit(1).pick(:number)
|
||||||
|
|
||||||
if last_no && last_no >= Setting.invoice_number_min.to_i
|
if last_no && last_no >= Setting.invoice_number_min.to_i
|
||||||
self.number = last_no + 1
|
self.number = last_no + 1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue