Merge branch 'master' of github.com:domify/registry

app/mailers/contact_mailer.rb

@@ -1,4 +1,5 @@
 class ContactMailer < ApplicationMailer
+  # rubocop: disable Metrics/CyclomaticComplexity
   def email_updated(contact)
     unless Rails.env.production?
       return unless TEST_EMAILS.include?(contact.email) || TEST_EMAILS.include?(contact.email_was)
@@ -18,4 +19,5 @@ class ContactMailer < ApplicationMailer
       mail(to: email, subject: "#{I18n.t(:contact_email_update_subject)} [#{@contact.code}]")
     end
   end
+  # rubocop: enable Metrics/CyclomaticComplexity
 end

app/models/depp/contact.rb

@@ -230,7 +230,7 @@ module Depp
 
     def extension_xml
       xml = { _anonymus: [] }
-      ident = ident_xml[:_anonymus].try(:first) if !persisted?
+      ident = ident_xml[:_anonymus].try(:first) unless persisted?
       legal = legal_document_xml[:_anonymus].try(:first)
       xml[:_anonymus] << ident if ident.present?
       xml[:_anonymus] << legal if legal.present?

app/models/domain.rb

@@ -1,3 +1,4 @@
+# rubocop: disable Metrics/ClassLength
 class Domain < ActiveRecord::Base
   include Versions # version/domain_version.rb
   has_paper_trail class_name: "DomainVersion", meta: { children: :children_log }
@@ -426,7 +427,7 @@ class Domain < ActiveRecord::Base
     domain_statuses.where(value: DomainStatus::CLIENT_DELETE_PROHIBITED).destroy_all
     domain_statuses.where(value: DomainStatus::SERVER_DELETE_PROHIBITED).destroy_all
     domain_statuses.reload
-    self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless self.force_delete_at
+    self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at
     save(validate: false)
   end
 
@@ -479,3 +480,4 @@ class Domain < ActiveRecord::Base
     whois_record.blank? ? create_whois_record : whois_record.save
   end
 end
+# rubocop: enable Metrics/ClassLength

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150610144547) do
+ActiveRecord::Schema.define(version: 20150609103333) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -19,7 +19,7 @@ ActiveRecord::Schema.define(version: 20150610144547) do
   create_table "account_activities", force: :cascade do |t|
     t.integer  "account_id"
     t.integer  "invoice_id"
-    t.decimal  "sum",                 precision: 8, scale: 2
+    t.decimal  "sum",                 precision: 10, scale: 2
     t.string   "currency"
     t.integer  "bank_transaction_id"
     t.datetime "created_at"
@@ -36,7 +36,7 @@ ActiveRecord::Schema.define(version: 20150610144547) do
   create_table "accounts", force: :cascade do |t|
     t.integer  "registrar_id"
     t.string   "account_type"
-    t.decimal  "balance",      precision: 8, scale: 2, default: 0.0, null: false
+    t.decimal  "balance",      precision: 10, scale: 2, default: 0.0, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "currency"
@@ -98,7 +98,7 @@ ActiveRecord::Schema.define(version: 20150610144547) do
     t.string   "buyer_name"
     t.string   "document_no"
     t.string   "description"
-    t.decimal  "sum",               precision: 8, scale: 2
+    t.decimal  "sum",               precision: 10, scale: 2
     t.string   "reference_no"
     t.datetime "paid_at"
     t.datetime "created_at"
@@ -114,7 +114,7 @@ ActiveRecord::Schema.define(version: 20150610144547) do
     t.string   "vk_rec_id"
     t.string   "vk_stamp"
     t.string   "vk_t_no"
-    t.decimal  "vk_amount",     precision: 8, scale: 2
+    t.decimal  "vk_amount",     precision: 10, scale: 2
     t.string   "vk_curr"
     t.string   "vk_rec_acc"
     t.string   "vk_rec_name"
@@ -306,7 +306,6 @@ ActiveRecord::Schema.define(version: 20150610144547) do
     t.datetime "registrant_verification_asked_at"
     t.string   "registrant_verification_token"
     t.json     "pending_json"
-    t.datetime "force_delete_at"
   end
 
   add_index "domains", ["delete_at"], name: "index_domains_on_delete_at", using: :btree
@@ -332,7 +331,7 @@ ActiveRecord::Schema.define(version: 20150610144547) do
     t.string   "description",                          null: false
     t.string   "unit"
     t.integer  "amount"
-    t.decimal  "price",       precision: 8, scale: 2
+    t.decimal  "price",       precision: 10, scale: 2
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "creator_str"
@@ -350,7 +349,7 @@ ActiveRecord::Schema.define(version: 20150610144547) do
     t.string   "currency",                                     null: false
     t.string   "description"
     t.string   "reference_no"
-    t.decimal  "vat_prc",             precision: 8, scale: 2, null: false
+    t.decimal  "vat_prc",             precision: 10, scale: 2, null: false
     t.datetime "paid_at"
     t.integer  "seller_id"
     t.string   "seller_name",                                  null: false
@@ -383,7 +382,7 @@ ActiveRecord::Schema.define(version: 20150610144547) do
     t.string   "updator_str"
     t.integer  "number"
     t.datetime "cancelled_at"
-    t.decimal  "sum_cache",           precision: 8, scale: 2
+    t.decimal  "sum_cache",           precision: 10, scale: 2
   end
 
   add_index "invoices", ["buyer_id"], name: "index_invoices_on_buyer_id", using: :btree
@@ -984,7 +983,7 @@ ActiveRecord::Schema.define(version: 20150610144547) do
     t.text     "crt"
     t.string   "type"
     t.string   "registrant_ident"
-    t.string   "encrypted_password",  default: "", null: false
+    t.string   "encrypted_password",  default: ""
     t.datetime "remember_created_at"
     t.integer  "failed_attempts",     default: 0,  null: false
     t.datetime "locked_at"