From aedfeac45986089d3913a71bcc42b4fef3c5c40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Thu, 11 Feb 2021 11:23:13 +0200 Subject: [PATCH] Attempt to fix renew issues --- app/interactions/domains/bulk_renew/single_domain_renew.rb | 1 + app/models/billing/price.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/interactions/domains/bulk_renew/single_domain_renew.rb b/app/interactions/domains/bulk_renew/single_domain_renew.rb index bcfc5b451..5951ef9ec 100644 --- a/app/interactions/domains/bulk_renew/single_domain_renew.rb +++ b/app/interactions/domains/bulk_renew/single_domain_renew.rb @@ -56,6 +56,7 @@ module Domains private def add_error + domain.add_epp_error(2104, nil, nil, I18n.t(:domain_renew_error_for_domain)) errors.add(:domain, I18n.t('domain_renew_error_for_domain', domain: domain.name)) end end diff --git a/app/models/billing/price.rb b/app/models/billing/price.rb index dac458b00..642cac17c 100644 --- a/app/models/billing/price.rb +++ b/app/models/billing/price.rb @@ -60,7 +60,10 @@ module Billing def self.price_for(zone, operation_category, duration) lists = valid.where(zone: zone, operation_category: operation_category, duration: duration) return lists.first if lists.count == 1 + lists.order(valid_from: :desc).first + rescue ActiveRecord::StatementInvalid + nil end def name