Rename invoices.var_prc to vat_rate

#623

app/models/directo.rb

@@ -34,7 +34,7 @@ class Directo < ActiveRecord::Base
               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.sum_cache/(1+invoice.vat_rate), precision: 2, separator: "."),
                   "ProductName"    => invoice.order
               )
             }

app/models/invoice.rb

@@ -28,7 +28,7 @@ class Invoice < ActiveRecord::Base
   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
+            :seller_iban, :buyer_name, :invoice_items, :vat_rate, presence: true
 
   before_create :set_invoice_number, :check_vat
 
@@ -52,7 +52,7 @@ class Invoice < ActiveRecord::Base
 
   def check_vat
     if buyer.country_code != 'EE' && buyer.vat_no.present?
-      self.vat_prc = 0
+      self.vat_rate = 0
     end
   end
 
@@ -157,7 +157,7 @@ class Invoice < ActiveRecord::Base
   end
 
   def vat
-    (sum_without_vat * vat_prc).round(2)
+    (sum_without_vat * vat_rate).round(2)
   end
 
   def sum

app/models/registrar.rb

@@ -81,7 +81,7 @@ class Registrar < ActiveRecord::Base
       payment_term: 'prepayment',
       description: description,
       currency: 'EUR',
-      vat_prc: Setting.registry_vat_prc,
+      vat_rate: Setting.registry_vat_prc,
       seller_name: Setting.registry_juridical_name,
       seller_reg_no: Setting.registry_reg_no,
       seller_iban: Setting.registry_iban,

app/views/registrar/invoices/partials/_items.haml

@@ -24,7 +24,7 @@
         %td= currency(@invoice.sum_without_vat)
       %tr
         %th.no-border{colspan: 3}
-        %th= t('vat', vat_prc: (@invoice.vat_prc * 100).round)
+        %th= t('vat', rate: (@invoice.vat_rate * 100).round)
         %td= currency(@invoice.vat)
       %tr
         %th.no-border{colspan: 3}

app/views/registrar/invoices/pdf.haml

@@ -242,7 +242,7 @@
                   %td= "#{currency(@invoice.sum_without_vat)} #{@invoice.currency}"
                 %tr
                   %th.no-border{colspan: 3}
-                  %th= t('vat', vat_prc: (@invoice.vat_prc * 100).round)
+                  %th= t('vat', rate: (@invoice.vat_rate * 100).round)
                   %td= "#{currency(@invoice.vat)} #{@invoice.currency}"
                 %tr
                   %th.no-border{colspan: 3}

config/locales/en.yml

@@ -553,7 +553,7 @@ en:
   invoice_number: Invoice no.
   seller: 'Seller'
   prepayment: 'Prepayment'
-  vat: 'VAT (%{vat_prc}%)'
+  vat: 'VAT (%{rate}%)'
   unpaid: 'Unpaid'
   your_current_account_balance_is: 'Your current account balance is %{balance} %{currency}'
   billing: 'Billing'

db/migrate/20180228064342_rename_invoices_var_prc_to_vat_rate.rb

@@ -0,0 +1,5 @@
+class RenameInvoicesVarPrcToVatRate < ActiveRecord::Migration
+  def change
+    rename_column :invoices, :vat_prc, :vat_rate
+  end
+end

db/structure.sql

@@ -1127,7 +1127,7 @@ CREATE TABLE invoices (
     currency character varying NOT NULL,
     description character varying,
     reference_no character varying,
-    vat_prc numeric(10,2) NOT NULL,
+    vat_rate numeric(10,2) NOT NULL,
     paid_at timestamp without time zone,
     seller_id integer,
     seller_name character varying NOT NULL,
@@ -5115,3 +5115,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180218004148');
 
 INSERT INTO schema_migrations (version) VALUES ('20180228055259');
 
+INSERT INTO schema_migrations (version) VALUES ('20180228064342');
+

doc/models_complete.svg

@@ -1687,7 +1687,7 @@
 <text text-anchor="start" x="121.5" y="-1481.3" font-family="Times,serif" font-size="14.00">currency :string</text>
 <text text-anchor="start" x="121.5" y="-1466.3" font-family="Times,serif" font-size="14.00">description :string</text>
 <text text-anchor="start" x="121.5" y="-1451.3" font-family="Times,serif" font-size="14.00">reference_no :string</text>
-<text text-anchor="start" x="121.5" y="-1436.3" font-family="Times,serif" font-size="14.00">vat_prc :decimal</text>
+<text text-anchor="start" x="121.5" y="-1436.3" font-family="Times,serif" font-size="14.00">vat_rate :decimal</text>
 <text text-anchor="start" x="121.5" y="-1421.3" font-family="Times,serif" font-size="14.00">paid_at :datetime</text>
 <text text-anchor="start" x="121.5" y="-1406.3" font-family="Times,serif" font-size="14.00">seller_id :integer</text>
 <text text-anchor="start" x="121.5" y="-1391.3" font-family="Times,serif" font-size="14.00">seller_name :string</text>

spec/factories/invoice.rb

@@ -8,7 +8,7 @@ FactoryBot.define do
     seller_name { 'EIS' }
     seller_city { 'Tallinn' }
     seller_street { 'Paldiski mnt. 123' }
-    vat_prc 0.2
+    vat_rate 0.2
     buyer { FactoryBot.create(:registrar) }
 
     after :build do |invoice|

spec/models/invoice_spec.rb

@@ -54,7 +54,7 @@ describe Invoice do
 
     it 'should calculate sums correctly' do
       @invoice = create(:invoice)
-      @invoice.vat_prc.should == BigDecimal.new('0.2')
+      @invoice.vat_rate.should == BigDecimal.new('0.2')
       @invoice.sum_without_vat.should == BigDecimal.new('300.0')
       @invoice.vat.should == BigDecimal.new('60.0')
       @invoice.sum.should == BigDecimal.new('360.0')

test/fixtures/invoices.yml

@@ -6,7 +6,7 @@ DEFAULTS: &DEFAULTS
   seller_name: John Doe
   seller_iban: 1234
   buyer_name: Jane Doe
-  vat_prc: 0.2
+  vat_rate: 0.2
 
 valid:
   <<: *DEFAULTS

test/models/invoice_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class InvoiceTest < ActiveSupport::TestCase
+  def test_invalid_without_vat_rate
+    invoice = Invoice.new(vat_rate: nil)
+    invoice.validate
+    assert invoice.errors.added?(:vat_rate, :blank)
+  end
+end