zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 11:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-800

Browse source 
# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-04-17 15:09:47 +03:00
commit 22e1d09dfa
11 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/domain.rb
View file

@ -638,6 +638,7 @@ class Domain < ActiveRecord::Base
def as_json(_options)
hash = super
hash['auth_info'] = hash.delete('transfer_code') # API v1 requirement
hash['valid_from'] = hash['registered_at'] # API v1 requirement
hash
end

1
app/models/epp/domain.rb
View file

@ -44,7 +44,6 @@ class Epp::Domain < Domain
domain.attributes = domain.attrs_from(frame, current_user)
domain.attach_default_contacts
domain.registered_at = Time.zone.now
domain.valid_from = Time.zone.now
period = domain.period.to_i
plural_period_unit_name = (domain.period_unit == 'm' ? 'months' : 'years').to_sym