Merge branch 'master' into remove-unused-cron-task

app/models/bank_link.rb

@@ -29,7 +29,7 @@ class BankLink
       hash["VK_VERSION"]  = "008"
       hash["VK_SND_ID"]   = ENV["payments_#{type}_seller_account"]
       hash["VK_STAMP"]    = invoice.number
-      hash["VK_AMOUNT"]   = number_with_precision(invoice.sum_cache, :precision => 2, :separator => ".")
+      hash["VK_AMOUNT"]   = number_with_precision(invoice.total, :precision => 2, :separator => ".")
       hash["VK_CURR"]     = invoice.currency
       hash["VK_REF"]      = ""
       hash["VK_MSG"]      = invoice.order
@@ -140,7 +140,7 @@ class BankLink
 
     def validate_amount
       source = number_with_precision(BigDecimal.new(params["VK_AMOUNT"].to_s), precision: 2, separator: ".")
-      target = number_with_precision(invoice.sum_cache, precision: 2, separator: ".")
+      target = number_with_precision(invoice.total, precision: 2, separator: ".")
 
       source == target
     end

app/models/bank_transaction.rb

@@ -47,7 +47,7 @@ class BankTransaction < ActiveRecord::Base
     return if invoice.binded?
     return if invoice.cancelled?
 
-    return if invoice.sum != sum
+    return if invoice.total != sum
     create_activity(registrar, invoice)
   end
   # rubocop: enable Metrics/PerceivedComplexity
@@ -76,7 +76,7 @@ class BankTransaction < ActiveRecord::Base
       return
     end
 
-    if invoice.sum != sum
+    if invoice.total != sum
       errors.add(:base, I18n.t('invoice_and_transaction_sums_do_not_match'))
       return
     end
@@ -88,7 +88,7 @@ class BankTransaction < ActiveRecord::Base
     create_account_activity(
       account: registrar.cash_account,
       invoice: invoice,
-      sum: invoice.sum_without_vat,
+      sum: invoice.subtotal,
       currency: currency,
       description: description,
       activity_type: AccountActivity::ADD_CREDIT

app/models/directo.rb

@@ -3,7 +3,7 @@ class Directo < ActiveRecord::Base
   belongs_to :item, polymorphic: true
 
   def self.send_receipts
-    new_trans = Invoice.where(invoice_type: "DEB", in_directo: false).where(cancelled_at: nil)
+    new_trans = Invoice.where(in_directo: false).where(cancelled_at: nil)
     total     = new_trans.count
     counter   = 0
     Rails.logger.info("[DIRECTO] Will try to send #{total} invoices")
@@ -15,7 +15,7 @@ class Directo < ActiveRecord::Base
           group.each do |invoice|
 
             if invoice.account_activity.nil? || invoice.account_activity.bank_transaction.nil? ||
-                invoice.account_activity.bank_transaction.sum.nil? || invoice.account_activity.bank_transaction.sum != invoice.sum_cache
+                invoice.account_activity.bank_transaction.sum.nil? || invoice.account_activity.bank_transaction.sum != invoice.total
               Rails.logger.info("[DIRECTO] Invoice #{invoice.number} has been skipped")
               next
             end
@@ -29,12 +29,14 @@ class Directo < ActiveRecord::Base
                 "InvoiceDate" => invoice.created_at.strftime("%Y-%m-%dT%H:%M:%S"),
                 "PaymentTerm" => Setting.directo_receipt_payment_term,
                 "Currency"    => invoice.currency,
-                "CustomerCode"=> invoice.buyer.accounting_customer_code
+                "CustomerCode"=> invoice.buyer.accounting_customer_code,
+                'TotalVAT' => ActionController::Base.helpers.number_with_precision(invoice.vat_amount, precision: 2, separator: '.')
             ){
               xml.line(
                   "ProductID"      => Setting.directo_receipt_product_name,
                   "Quantity"       => 1,
-                  "UnitPriceWoVAT" => ActionController::Base.helpers.number_with_precision(invoice.sum_cache/(1+invoice.vat_prc), precision: 2, separator: "."),
+                  "UnitPriceWoVAT" => ActionController::Base.helpers.number_with_precision(invoice.subtotal, precision: 2, separator: '.'),
+                  'VATCode' => invoice.buyer_vat_no,
                   "ProductName"    => invoice.order
               )
             }

app/models/epp/domain.rb

@@ -18,7 +18,7 @@ class Epp::Domain < Domain
 
   after_validation :validate_contacts
   def validate_contacts
-    return true if is_renewal || is_transfer
+    return true if is_transfer
 
     ok = true
     active_admins = admin_domain_contacts.select { |x| !x.marked_for_destruction? }

app/models/invoice.rb

@@ -27,12 +27,18 @@ class Invoice < ActiveRecord::Base
   attr_accessor :billing_email
   validates :billing_email, email_format: { message: :invalid }, allow_blank: true
 
-  validates :invoice_type, :due_date, :currency, :seller_name,
-            :seller_iban, :buyer_name, :invoice_items, :vat_prc, presence: true
+  validates :due_date, :currency, :seller_name,
+            :seller_iban, :buyer_name, :invoice_items, presence: true
+  validates :vat_rate, numericality: { greater_than_or_equal_to: 0, less_than: 100 },
+            allow_nil: true
 
-  before_create :set_invoice_number, :check_vat
+  before_create :set_invoice_number
+  before_create :apply_default_vat_rate, unless: :vat_rate?
+  before_create :calculate_total, unless: :total?
+  before_create :apply_default_buyer_vat_no, unless: :buyer_vat_no?
 
-  before_save   :check_vat
+  attribute :vat_rate, ::Type::VATRate.new
+  attr_readonly :vat_rate
 
   def set_invoice_number
     last_no = Invoice.order(number: :desc).where('number IS NOT NULL').limit(1).pluck(:number).first
@@ -50,14 +56,6 @@ class Invoice < ActiveRecord::Base
     false
   end
 
-  def check_vat
-    if buyer.country_code != 'EE' && buyer.vat_no.present?
-      self.vat_prc = 0
-    end
-  end
-
-  before_save -> { self.sum_cache = sum }
-
   class << self
     def cancel_overdue_invoices
       STDOUT << "#{Time.zone.now.utc} - Cancelling overdue invoices\n" unless Rails.env.test?
@@ -106,12 +104,12 @@ class Invoice < ActiveRecord::Base
   def buyer_country
     Country.new(buyer_country_code)
   end
-  
+
 # order is used for directo/banklink description
   def order
     "Order nr. #{number}"
   end
-  
+
   def pdf(html)
     kit = PDFKit.new(html)
     kit.to_pdf
@@ -152,15 +150,31 @@ class Invoice < ActiveRecord::Base
     invoice_items
   end
 
-  def sum_without_vat
-    (items.map(&:item_sum_without_vat).sum).round(2)
+  def subtotal
+    invoice_items.map(&:item_sum_without_vat).reduce(:+)
   end
 
-  def vat
-    (sum_without_vat * vat_prc).round(2)
+  def vat_amount
+    return 0 unless vat_rate
+    subtotal * vat_rate / 100
   end
 
-  def sum
-    (sum_without_vat + vat).round(2)
+  def total
+    calculate_total unless total?
+    read_attribute(:total)
+  end
+
+  private
+
+  def apply_default_vat_rate
+    self.vat_rate = buyer.effective_vat_rate
+  end
+
+  def apply_default_buyer_vat_no
+    self.buyer_vat_no = buyer.vat_no
+  end
+
+  def calculate_total
+    self.total = subtotal + vat_amount
   end
 end

app/models/registrar.rb

@@ -6,7 +6,7 @@ class Registrar < ActiveRecord::Base
   has_many :api_users, dependent: :restrict_with_error
   has_many :messages
   has_many :invoices, foreign_key: 'buyer_id'
-  has_many :accounts
+  has_many :accounts, dependent: :destroy
   has_many :nameservers, through: :domains
   has_many :whois_records
   has_many :white_ips, dependent: :destroy
@@ -17,37 +17,19 @@ class Registrar < ActiveRecord::Base
   validates :name, :reference_no, :code, uniqueness: true
   validates :accounting_customer_code, presence: true
   validates :language, presence: true
-  validate :forbidden_codes
+  validate :forbid_special_code
 
+  validates :vat_rate, presence: true, if: 'foreign_vat_payer? && vat_no.blank?'
+  validates :vat_rate, absence: true, if: :home_vat_payer?
+  validates :vat_rate, absence: true, if: 'foreign_vat_payer? && vat_no?'
+  validates :vat_rate, numericality: { greater_than_or_equal_to: 0, less_than: 100 },
+            allow_nil: true
+
+  validate :forbid_special_code
+
+  attribute :vat_rate, ::Type::VATRate.new
   after_initialize :set_defaults
-
-  def forbidden_codes
-    return true unless ['CID'].include? code
-    errors.add(:code, I18n.t(:forbidden_code))
-    false
-  end
-
   before_validation :generate_iso_11649_reference_no
-  def generate_iso_11649_reference_no
-    return if reference_no.present?
-
-    loop do
-      base = nil
-      loop do
-        base = SecureRandom.random_number.to_s.last(8)
-        break if base.to_i != 0 && base.length == 8
-      end
-
-      control_base = (base + '2715' + '00').to_i
-      reminder = control_base % 97
-      check_digits = 98 - reminder
-
-      check_digits = check_digits < 10 ? "0#{check_digits}" : check_digits.to_s
-
-      self.reference_no = "RF#{check_digits}#{base}"
-      break unless self.class.exists?(reference_no: reference_no)
-    end
-  end
 
   validates :email, :billing_email,
     email_format: { message: :invalid },
@@ -76,12 +58,10 @@ class Registrar < ActiveRecord::Base
   # rubocop:disable Metrics/AbcSize
   def issue_prepayment_invoice(amount, description = nil)
     invoices.create(
-      invoice_type: 'DEB',
       due_date: (Time.zone.now.to_date + Setting.days_to_keep_invoices_active.days).end_of_day,
       payment_term: 'prepayment',
       description: description,
       currency: 'EUR',
-      vat_prc: Setting.registry_vat_prc,
       seller_name: Setting.registry_juridical_name,
       seller_reg_no: Setting.registry_reg_no,
       seller_iban: Setting.registry_iban,
@@ -97,7 +77,7 @@ class Registrar < ActiveRecord::Base
       seller_url: Setting.registry_url,
       seller_email: Setting.registry_email,
       seller_contact_name: Setting.registry_invoice_contact,
-      buyer_id: id,
+      buyer: self,
       buyer_name: name,
       buyer_reg_no: reg_no,
       buyer_country_code: country_code,
@@ -132,11 +112,6 @@ class Registrar < ActiveRecord::Base
     cash_account.account_activities.create!(args)
   end
 
-  def credit!(args)
-    args[:currency] = 'EUR'
-    cash_account.account_activities.create!(args)
-  end
-
   def address
     [street, city, state, zip].reject(&:blank?).compact.join(', ')
   end
@@ -172,9 +147,50 @@ class Registrar < ActiveRecord::Base
     end
   end
 
+  def effective_vat_rate
+    if home_vat_payer?
+      Registry.instance.vat_rate
+    else
+      vat_rate
+    end
+  end
+
   private
 
   def set_defaults
     self.language = Setting.default_language unless language
   end
+
+  def forbid_special_code
+    errors.add(:code, :forbidden) if code == 'CID'
+  end
+
+  def generate_iso_11649_reference_no
+    return if reference_no.present?
+
+    loop do
+      base = nil
+      loop do
+        base = SecureRandom.random_number.to_s.last(8)
+        break if base.to_i != 0 && base.length == 8
+      end
+
+      control_base = (base + '2715' + '00').to_i
+      reminder = control_base % 97
+      check_digits = 98 - reminder
+
+      check_digits = check_digits < 10 ? "0#{check_digits}" : check_digits.to_s
+
+      self.reference_no = "RF#{check_digits}#{base}"
+      break unless self.class.exists?(reference_no: reference_no)
+    end
+  end
+
+  def home_vat_payer?
+    country == Registry.instance.legal_address_country
+  end
+
+  def foreign_vat_payer?
+    !home_vat_payer?
+  end
 end

app/models/registry.rb

@@ -0,0 +1,11 @@
+class Registry
+  include Singleton
+
+  def vat_rate
+    Setting.registry_vat_prc.to_d * 100
+  end
+
+  def legal_address_country
+    Country.new(Setting.registry_country_code)
+  end
+end

app/models/type/vat_rate.rb

@@ -0,0 +1,11 @@
+module Type
+  class VATRate < ActiveRecord::Type::Decimal
+    def type_cast_from_database(value)
+      super * 100 if value
+    end
+
+    def type_cast_for_database(value)
+      super / 100.0 if value
+    end
+  end
+end