dorsale 2.1.15 → 2.2.0

data/spec/models/dorsale/billing_machine/invoice_line_spec.rb

@@ -2,11 +2,33 @@ require "rails_helper"
 
 describe ::Dorsale::BillingMachine::InvoiceLine, type: :model do
   it { is_expected.to belong_to :invoice }
+  it { is_expected.to validate_presence_of :invoice }
+
+  it { is_expected.to respond_to :quantity }
+  it { is_expected.to respond_to :label }
+  it { is_expected.to respond_to :vat_rate }
+  it { is_expected.to respond_to :total }
+  it { is_expected.to respond_to :unit }
+  it { is_expected.to respond_to :unit_price }
 
   it "should have a valid factory" do
     expect(build(:billing_machine_invoice_line)).to be_valid
   end
 
+  describe "default values" do
+    it "quantity should be 0" do
+      expect(::Dorsale::BillingMachine::InvoiceLine.new.quantity).to eq 0
+    end
+
+    it "unit_price should be 0" do
+      expect(::Dorsale::BillingMachine::InvoiceLine.new.unit_price).to eq 0
+    end
+
+    it "vat_rate should be 0" do
+      expect(::Dorsale::BillingMachine::InvoiceLine.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+    end
+  end
+
   it "should be sorted by created_at" do
     line1 = create(:billing_machine_invoice_line, :created_at => DateTime.now + 1.seconds)
     line2 = create(:billing_machine_invoice_line, :created_at => DateTime.now + 2.seconds)

data/spec/models/dorsale/billing_machine/invoice_spec.rb

@@ -1,15 +1,29 @@
 require "rails_helper"
 
 describe ::Dorsale::BillingMachine::Invoice, type: :model do
+  # Reset to default mode before each test
+  before :each do
+    ::Dorsale::BillingMachine.vat_mode = :single
+  end
+
   it { is_expected.to belong_to :customer }
   it { is_expected.to belong_to :payment_term }
-  it { is_expected.to have_many :lines }
+  it { is_expected.to have_many(:lines).dependent(:destroy) }
 
   it { is_expected.to validate_presence_of :id_card }
   it { is_expected.to validate_presence_of :date }
 
+  it { is_expected.to respond_to :date }
+  it { is_expected.to respond_to :label }
+  it { is_expected.to respond_to :vat_amount }
+  it { is_expected.to respond_to :unique_index }
   it { is_expected.to respond_to :commercial_discount }
 
+  it {is_expected.to respond_to :total_excluding_taxes}
+  it {is_expected.to respond_to :total_including_taxes}
+
+  it { is_expected.to respond_to :advance }
+
   it "should have a valid factory" do
     expect(create(:billing_machine_invoice)).to be_valid
   end
@@ -85,31 +99,99 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
     end
   end
 
+  describe "vat rate" do
+    it "default vat rate should be 20" do
+      expect(::Dorsale::BillingMachine::Invoice.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+    end
+
+    it "it should be specified vat rate" do
+      expect(build(:billing_machine_invoice, vat_rate: 12).vat_rate).to eq 12
+    end
+
+    it "it should be first line vat rate" do
+      invoice = create(:billing_machine_invoice)
+      line1   = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 10)
+      line2   = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 10)
+      expect(invoice.vat_rate).to eq 10
+    end
+
+    it "it should raise if multiple vat_rates" do
+      invoice = create(:billing_machine_invoice)
+      line1   = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 10)
+
+      expect{
+        line2   = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 15)
+      }.to raise_error(RuntimeError)
+    end
+
+    it "it should raise when vat mode is multiple" do
+      ::Dorsale::BillingMachine.vat_mode = :multiple
+      invoice = build(:billing_machine_invoice)
+      expect{ invoice.vat_rate }.to raise_error(RuntimeError)
+    end
+  end
+
   describe "totals" do
-    it "should be calculated upon saving" do
-      invoice = create(:billing_machine_invoice, vat_rate: 20, total_duty: 0, vat_amount: 0, total_all_taxes: 0, commercial_discount: 10, advance: 40, balance: 0)
-      create(:billing_machine_invoice_line, quantity: 10, unit_price: 5, invoice: invoice)
-      create(:billing_machine_invoice_line, quantity: 10, unit_price: 5, invoice: invoice)
-      expect(invoice.total_duty).to eq(90.0)
-      expect(invoice.vat_amount).to eq(18.0)
-      expect(invoice.total_all_taxes).to eq(108)
-      expect(invoice.balance).to eq(68.0)
-    end
-    it "should be calculated upon saving" do
-      invoice = create(:billing_machine_invoice, vat_rate: nil, total_duty: nil, vat_amount: nil, total_all_taxes: nil, commercial_discount: 10.5, advance: nil, balance: nil)
-      create(:billing_machine_invoice_line, quantity: 10, unit_price: 5, invoice: invoice)
-      create(:billing_machine_invoice_line, quantity: 10, unit_price: 5, invoice: invoice)
-
-      expect(invoice.total_duty).to eq(89.5)
-      expect(invoice.vat_amount).to eq(0.0)
-      expect(invoice.total_all_taxes).to eq(89.5)
-      expect(invoice.balance).to eq(89.5)
+    it "should be calculated upon saving with advance" do
+      invoice = create(:billing_machine_invoice,
+        :commercial_discount => 10,
+        :advance             => 40,
+      )
+
+      create(:billing_machine_invoice_line,
+        :quantity   => 10,
+        :unit_price => 5,
+        :vat_rate   => 20,
+        :invoice    => invoice,
+      ) #total 50
+
+      create(:billing_machine_invoice_line,
+        :quantity   => 10,
+        :unit_price => 5,
+        :vat_rate   => 20,
+        :invoice    => invoice,
+      ) # total 50
+
+      expect(invoice.total_excluding_taxes).to eq(90.0)
+      expect(invoice.vat_amount).to eq(18)
+      expect(invoice.total_including_taxes).to eq(108)
+      expect(invoice.balance).to eq(68)
+    end
+
+    it "should be calculated upon saving without advance" do
+      invoice = create(:billing_machine_invoice,
+        :commercial_discount => 10,
+      )
+
+      create(:billing_machine_invoice_line,
+        :quantity   => 10,
+        :unit_price => 5,
+        :vat_rate   => 20,
+        :invoice    => invoice,
+      ) #total 50
+
+      create(:billing_machine_invoice_line,
+        :quantity   => 10,
+        :unit_price => 5,
+        :vat_rate   => 20,
+        :invoice    => invoice,
+      ) # total 50
+
+      expect(invoice.total_excluding_taxes).to eq(90.0)
+      expect(invoice.vat_amount).to eq(18)
+      expect(invoice.total_including_taxes).to eq(108)
+      expect(invoice.balance).to eq(108)
     end
 
     it "should work fine even with empty lines" do
-      invoice = create(:billing_machine_invoice, vat_rate: nil, total_duty: nil, vat_amount: nil, total_all_taxes: nil, advance: nil, balance: nil)
-      create(:billing_machine_invoice_line, quantity: nil, unit_price: nil, invoice: invoice)
-      expect(invoice.total_duty).to eq(0.0)
+      invoice = create(:billing_machine_invoice)
+
+      create(:billing_machine_invoice_line, invoice: invoice, quantity: nil, unit_price: nil)
+
+      expect(invoice.total_excluding_taxes).to eq(0.0)
+      expect(invoice.vat_amount).to eq(0)
+      expect(invoice.total_including_taxes).to eq(0)
+      expect(invoice.balance).to eq(0)
     end
   end
 
@@ -128,31 +210,50 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
       )
     }
 
-    let(:columns_names) {'"Date";"Numéro";"Objet";"Client";"Adresse 1";"Adresse 2";"Code postal";"Ville";"Pays";"Remise commerciale";"Montant HT";"Taux TVA";"Montant TVA";"Montant TTC";"Acompte";"Solde à payer"'+"\n"}
+    let(:columns_names) {'"Date";"Numéro";"Objet";"Client";"Adresse 1";"Adresse 2";"Code postal";"Ville";"Pays";"Remise commerciale";"Montant HT";"Montant TVA";"Montant TTC";"Acompte";"Solde à payer"'+"\n"}
     it 'should return csv', ignore_semaphore: true do
-      invoice0 = create(:billing_machine_invoice, label: "invoiceLabel", date: "2014-07-31", unique_index: 1, commercial_discount:1, total_duty: 9.99, vat_rate: 19.6, vat_amount: 23.2, total_all_taxes: 43.35, advance: 3.5, id_card: id_card, customer: customer)
-      invoice0.lines.create(quantity: 1, unit_price: 9.99)
+      invoice0 = create(:billing_machine_invoice,
+        :label               => "invoiceLabel",
+        :date                => "2014-07-31",
+        :unique_index        => 1,
+        :commercial_discount => 1,
+        :advance             => 3.5,
+        :id_card             => id_card,
+        :customer            => customer,
+      )
+
+      invoice0.lines.create(quantity: 1, unit_price: 9.99, vat_rate: 19.6)
+
       invoice1 = invoice0.dup
-      invoice1.update(label: 'çé"à;ç\";,@\\', date: "2014-08-01", commercial_discount:0, unique_index: 2, advance: 3.0, vat_rate: 20)
-      invoice1.lines.create(quantity: 1, unit_price: 13.0)
+
+      invoice1.update(label: 'çé"à;ç\";,@\\', date: "2014-08-01", commercial_discount:0, unique_index: 2, advance: 3.0)
+
+      invoice1.lines.create(quantity: 1, unit_price: 13.0 , vat_rate: 20)
+
       csv_output = ::Dorsale::BillingMachine::Invoice.to_csv
 
       expect(csv_output).to be ==
         columns_names +
         '"2014-07-31";"2014-01";"invoiceLabel";"cutomerName";"address1";"address2";'\
-        '"13005";"Marseille";"country";"1,00";"8,99";"19,60";"1,76";"10,75";"3,50";"7,25"' + "\n"\
+        '"13005";"Marseille";"country";"1,00";"8,99";"1,76";"10,75";"3,50";"7,25"' + "\n"\
         '"2014-08-01";"2014-02";"çé""à;ç\"";,@\";"cutomerName";"address1";"address2";'\
-        '"13005";"Marseille";"country";"0,00";"13,00";"20,00";"2,60";"15,60";"3,00";"12,60"' + "\n"
+        '"13005";"Marseille";"country";"0,00";"13,00";"2,60";"15,60";"3,00";"12,60"' + "\n"
     end
+
     it 'should return expected csv with nil values' do
-      invoice0 = create(:billing_machine_invoice, id_card: id_card, total_duty: nil,
-        vat_rate: nil, vat_amount: nil, total_all_taxes: 0, advance: nil, label: nil,
-        customer: nil, payment_term: nil, commercial_discount: nil)
+      invoice0 = create(:billing_machine_invoice,
+        :id_card             => id_card,
+        :advance             => nil,
+        :label               => nil,
+        :customer            => nil,
+        :payment_term        => nil,
+        :commercial_discount => nil,
+      )
       csv_output = ::Dorsale::BillingMachine::Invoice.to_csv
 
       expect(csv_output).to be ==
         columns_names +
-        '"2014-02-19";"2014-01";"";"";"";"";"";"";"";"0,00";"0,00";"0,00";"0,00";"0,00";"0,00";"0,00"' + "\n"
+        '"2014-02-19";"2014-01";"";"";"";"";"";"";"";"0,00";"0,00";"0,00";"0,00";"0,00";"0,00"' + "\n"
     end
   end
 end

data/spec/models/dorsale/billing_machine/quotation_line_spec.rb

@@ -1,18 +1,34 @@
 require "rails_helper"
 
 describe ::Dorsale::BillingMachine::QuotationLine do
-
-  it "should have a valid factory" do
-    expect(build(:billing_machine_quotation_line)).to be_valid
-  end
-
   it { is_expected.to belong_to :quotation }
+  it { is_expected.to validate_presence_of :quotation }
+
   it { is_expected.to respond_to :quantity }
   it { is_expected.to respond_to :label }
+  it { is_expected.to respond_to :vat_rate }
   it { is_expected.to respond_to :total }
   it { is_expected.to respond_to :unit }
   it { is_expected.to respond_to :unit_price }
 
+  it "should have a valid factory" do
+    expect(build(:billing_machine_quotation_line)).to be_valid
+  end
+
+  describe "default values" do
+    it "quantity should be 0" do
+      expect(::Dorsale::BillingMachine::QuotationLine.new.quantity).to eq 0
+    end
+
+    it "unit_price should be 0" do
+      expect(::Dorsale::BillingMachine::QuotationLine.new.unit_price).to eq 0
+    end
+
+    it "vat_rate should be 0" do
+      expect(::Dorsale::BillingMachine::QuotationLine.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+    end
+  end
+
   it "should be sorted by created_at" do
     line1 = create(:billing_machine_quotation_line,:created_at => DateTime.now + 1.seconds)
     line2 = create(:billing_machine_quotation_line,:created_at => DateTime.now + 2.seconds)

data/spec/models/dorsale/billing_machine/quotation_spec.rb

@@ -3,23 +3,20 @@ require "rails_helper"
 describe ::Dorsale::BillingMachine::Quotation do
   it { is_expected.to belong_to :customer }
   it { is_expected.to belong_to :payment_term }
-
-  it { is_expected.to have_many :lines }
+  it { is_expected.to have_many(:lines).dependent(:destroy) }
 
   it { is_expected.to validate_presence_of :id_card }
   it { is_expected.to validate_presence_of :date }
   it { is_expected.to validate_presence_of :state }
   it { is_expected.to ensure_inclusion_of(:state).in_array(::Dorsale::BillingMachine::Quotation::STATES) }
-
   it { is_expected.to respond_to :date }
   it { is_expected.to respond_to :label }
-  it { is_expected.to respond_to :total_duty }
   it { is_expected.to respond_to :vat_amount }
-  it { is_expected.to respond_to :vat_rate }
-  it { is_expected.to respond_to :total_all_taxes }
   it { is_expected.to respond_to :comments }
   it { is_expected.to respond_to :unique_index }
   it { is_expected.to respond_to :commercial_discount }
+  it { is_expected.to respond_to :total_excluding_taxes }
+  it { is_expected.to respond_to :total_including_taxes }
 
   it "should have a valid factory" do
     expect(create(:billing_machine_quotation)).to be_valid
@@ -72,29 +69,100 @@ describe ::Dorsale::BillingMachine::Quotation do
     end
   end
 
-  describe "totals" do
-    it "should be calculated upon saving" do
-      quotation = create(:billing_machine_quotation, vat_rate: 20, total_duty: 0, vat_amount: 0, total_all_taxes: 0, commercial_discount: 10)
-      create(:billing_machine_quotation_line, quantity: 10, unit_price: 5, quotation: quotation)
-      create(:billing_machine_quotation_line, quantity: 10, unit_price: 5, quotation: quotation)
-      expect(quotation.total_duty).to eq(90.0)
-      expect(quotation.vat_amount).to eq(18.0)
-      expect(quotation.total_all_taxes).to eq(108.0)
+  describe "vat rate" do
+    it "default vat rate should be 20" do
+      expect(::Dorsale::BillingMachine::Quotation.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
     end
-    it "should be calculated upon saving" do
-      quotation = create(:billing_machine_quotation, vat_rate: nil, total_duty: nil, vat_amount: nil, total_all_taxes: nil, commercial_discount: 10.50)
-      create(:billing_machine_quotation_line, quantity: 10, unit_price: 5, quotation: quotation)
-      create(:billing_machine_quotation_line, quantity: 10, unit_price: 5, quotation: quotation)
 
-      expect(quotation.total_duty).to eq(89.5)
-      expect(quotation.vat_amount).to eq(0.0)
-      expect(quotation.total_all_taxes).to eq(89.5)
+    it "it should be specified vat rate" do
+      expect(build(:billing_machine_quotation, vat_rate: 12).vat_rate).to eq 12
+    end
+
+    it "it should be first line vat rate" do
+      quotation = create(:billing_machine_quotation)
+      line1   = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
+      line2   = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
+      expect(quotation.vat_rate).to eq 10
+    end
+
+    it "it should raise if multiple vat_rates" do
+      quotation = create(:billing_machine_quotation)
+      line1   = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
+
+      expect{
+        line2   = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 15)
+      }.to raise_error(RuntimeError)
+    end
+
+    it "it should raise when vat mode is multiple" do
+      ::Dorsale::BillingMachine.vat_mode = :multiple
+      quotation = build(:billing_machine_quotation)
+      expect{ quotation.vat_rate }.to raise_error(RuntimeError)
+    end
+  end
+
+  describe "totals" do
+    it "should be calculated upon saving" do
+      quotation = create(:billing_machine_quotation, commercial_discount: 10)
+
+      create(:billing_machine_quotation_line,
+        :vat_rate   => 20,
+        :quantity   => 10,
+        :unit_price => 5,
+        :quotation  => quotation,
+      )
+
+      create(:billing_machine_quotation_line,
+        :vat_rate   => 20,
+        :quantity   => 10,
+        :unit_price => 5,
+        :quotation  => quotation
+      )
+
+      expect(quotation.total_excluding_taxes).to eq(90.0)
+      expect(quotation.vat_amount).to eq(18)
+      expect(quotation.total_including_taxes).to eq(108)
+      expect(quotation.balance).to eq(108)
+    end
+
+    it "should be calculated upon saving with different vat rates" do
+      Dorsale::BillingMachine.vat_mode = :multiple
+      quotation = create(:billing_machine_quotation, commercial_discount: 20)
+      create(:billing_machine_quotation_line,
+        :quantity   => 10,
+        :vat_rate   => 10,
+        :unit_price => 5,
+        :quotation  => quotation,
+      )
+
+      create(:billing_machine_quotation_line,
+        :quantity   => 10,
+        :vat_rate   => 20,
+        :unit_price => 5,
+        :quotation  => quotation,
+      )
+
+      expect(quotation.total_excluding_taxes).to eq(80)
+      expect(quotation.vat_amount).to eq(12)
+      expect(quotation.total_including_taxes).to eq(92)
+      expect(quotation.balance).to eq(92)
+      Dorsale::BillingMachine.vat_mode = :single
     end
 
     it "should work fine even with empty lines" do
-      quotation = create(:billing_machine_quotation, vat_rate: nil, total_duty: nil, vat_amount: nil, total_all_taxes: nil, commercial_discount: nil)
-      create(:billing_machine_quotation_line, quantity: nil, unit_price: nil, quotation: quotation)
-      expect(quotation.total_duty).to eq(0.0)
+      quotation = create(:billing_machine_quotation, commercial_discount: nil)
+
+      create(:billing_machine_quotation_line,
+        :quantity   => nil,
+        :unit_price => nil,
+        :vat_rate   => nil,
+        :quotation  => quotation,
+      )
+
+      expect(quotation.total_excluding_taxes).to eq(0.0)
+      expect(quotation.vat_amount).to eq(0.0)
+      expect(quotation.total_including_taxes).to eq(0.0)
+      expect(quotation.balance).to eq(0.0)
     end
   end
 

data/spec/models/dorsale/billing_machine_spec.rb

@@ -0,0 +1,28 @@
+require "rails_helper"
+
+RSpec.describe Dorsale::BillingMachine do
+  let(:bm) {
+    ::Dorsale::BillingMachine
+  }
+
+  it "default vat_mode should be :single" do
+    expect(bm.vat_mode).to eq :single
+    expect(bm.invoice_pdf_model).to eq Dorsale::BillingMachine::InvoiceSingleVatPdf
+    expect(bm.quotation_pdf_model).to eq Dorsale::BillingMachine::QuotationSingleVatPdf
+  end
+
+  it "vat_mode should accept :multiple value" do
+    bm.vat_mode = :multiple
+    expect(bm.vat_mode).to eq :multiple
+    expect(bm.invoice_pdf_model).to eq Dorsale::BillingMachine::InvoiceMultipleVatPdf
+    expect(bm.quotation_pdf_model).to eq Dorsale::BillingMachine::QuotationMultipleVatPdf
+  end
+
+  it "vat_mode should not accept :abc value" do
+    expect {
+      bm.vat_mode = :abc
+    }.to raise_error(RuntimeError)
+  end
+
+
+end