dorsale 3.9.8 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92313d3e11ca03d76f1153193497dd581e8cf4ad
-  data.tar.gz: 4e9f7171df37fff5047abecf671cd2408affb103
+  metadata.gz: 99dec4abf499000f2dd5056f0ad64e158982020b
+  data.tar.gz: 8880c252a553956e6d24ac1723c20a9d46108a36
 SHA512:
-  metadata.gz: e836be0347fe2fafd0bfedc565599c89ab786f58dc665ac923489cb900aaad73e5b34c9b06e4a8fff1681181ac3a81591315c9734ee424455ebb536da0380ed2
-  data.tar.gz: 3a377cbad257367addc9a05df944d4e22608001ba8ec15624efedabb023519879e0f7160ea73032d9f30be59cf3e512cc48528deee29726a37de6c7457524835
+  metadata.gz: 98a8ede0dc3303cf86f0f275a153df7d4cc0fd4409dfd0faee7baf3101cb5c03c0a6bd6d0bc72e64fbec1bc3f12bd012c5c3b989935f3964e59818c0d682fb04
+  data.tar.gz: 29e5a4f979b8fa53a478f65a6092ac5fd5c74bb6a92618d74f4a97e6d8fabe1264e468de69cae688555ea4195287809b9852947b08772e9633ebc71f0e3b238a

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Next version
 
+## 3.10.0
+
+- Billing Machine : fix amounts round
+- Billing Machine : change ::DEFAULT_VAT_RATE to ::default_vat_rate
+- Billing Machine : refactor/improve JS
+
 ## 3.9.8
 
 - Tasks : add increment progress buttons

data/app/assets/javascripts/dorsale/engines/billing_machine.coffee

@@ -1,95 +1,104 @@
-accounting.settings =
-  number:
-    precision : 2
-    thousand: " " # nbsp
-    decimal : ","
+@BillingMachine = {}
 
-window.str2num = (str) ->
+BillingMachine.settings =
+  precision : 2
+  thousand  : " " # nbsp
+  decimal   : ","
+
+BillingMachine.str2num = (str) ->
   parseFloat(
     String(str)
       .replace(",", ".")
       .replace(/[^-0-9\.]+/g, "")
   ) || 0.0
 
-window.num2str = (num) ->
+BillingMachine.num2str = (num) ->
   num = parseFloat(num)
-  accounting.formatNumber(num)
+  settings = BillingMachine.settings
+  accounting.formatNumber(num, settings.precision, settings.thousand, settings.decimal)
+
+BillingMachine.round2 = (num) ->
+  return +(Math.round(num + "e+2")  + "e-2")
+
+BillingMachine.updateTotals = ->
+  total_excluding_taxes = 0.0
+
+  # Update line totals
+  $("#billing_machine-form .line").map ->
+    return if parseInt($(this).find("input[name*=destroy]").val()) == 1
+    quantity   = BillingMachine.str2num $(this).find(".line-quantity input").val()
+    unit_price = BillingMachine.str2num $(this).find(".line-unit_price input").val()
+    line_total = BillingMachine.round2(unit_price * quantity)
+    $(this).find(".line-total input").val BillingMachine.num2str line_total
+
+    total_excluding_taxes += line_total
+
+  # Substract discount to total excluding taxes
+  commercial_discount   = BillingMachine.str2num $(".commercial_discount input").val()
+  raw_total_excluding_taxes = total_excluding_taxes
+  total_excluding_taxes = raw_total_excluding_taxes - commercial_discount
+  $(".total_excluding_taxes input").val BillingMachine.num2str total_excluding_taxes
+
+  discount_rate = commercial_discount / raw_total_excluding_taxes
+
+  # VAT amount based on each line total with discount rate
+  vat_amount = 0.0
+  $("#billing_machine-form .line").map ->
+    return if parseInt($(this).find("input[name*=destroy]").val()) == 1
+
+    # Per line VAT rate
+    if $(this).find(".line-vat_rate input").length > 0
+      vat_rate = BillingMachine.str2num $(this).find(".line-vat_rate input").val()
+    # Global VAT rate
+    else
+      vat_rate = BillingMachine.str2num $("#totals-table .vat_rate input").val()
+
+    line_total = BillingMachine.str2num $(this).find(".line-total input").val()
+    discounted_line_total = line_total - (line_total * discount_rate)
+    line_vat_amount = BillingMachine.round2(discounted_line_total * vat_rate / 100)
+    vat_amount += line_vat_amount
+  $(".vat_amount input").val BillingMachine.num2str vat_amount
+
+  total_including_taxes = total_excluding_taxes + vat_amount
+  $(".total_including_taxes input").val BillingMachine.num2str total_including_taxes
+
+  # Advances is for invoices only, not for quotations
+  if $(".advance input").length > 0 && $(".balance input").length > 0
+    advance = BillingMachine.str2num $(".advance input").val()
+    balance = total_including_taxes - advance
+    $(".balance input").val BillingMachine.num2str balance
+
+BillingMachine.formatInputs = ->
+  $("#billing_machine-form input.number").map ->
+    formatted_number = BillingMachine.num2str BillingMachine.str2num $(this).val()
+    $(this).val formatted_number
+
+# Empty number inputs on focus if value is 0
+$(document).on "focus", "#billing_machine-form input.number", ->
+  $(this).val("") if BillingMachine.str2num($(this).val()) == 0
+
+# Auto ajust line label textarea height
+$(document).on "keyup", "#billing_machine-form textarea", ->
+   this.rows = this.value.split("\n").length
+$("#billing_machine-form textarea").keyup()
+
+# Button to delete line
+$(document).on "click", "#billing_machine-form a.delete", ->
+  e.preventDefault()
+  $(this).parents("td").find("input").val(1)
+  $(this).parents("tr").hide()
+  BillingMachine.updateTotals()
 
 $(document).on "turbolinks:load cocoon:after-insert", ->
-  $("#billing_machine-form input.number").keyup ->
-    total_excluding_taxes = 0.0
-
-    # Update line totals
-    $("#billing_machine-form .line").map ->
-      return if parseInt($(this).find("input[name*=destroy]").val()) == 1
-      quantity   = str2num $(this).find(".line-quantity input").val()
-      unit_price = str2num $(this).find(".line-unit_price input").val()
-      line_total = unit_price * quantity
-      $(this).find(".line-total input").val num2str line_total
-
-      total_excluding_taxes += line_total
-
-    # Substract discount to total excluding taxes
-    commercial_discount   = str2num $(".commercial_discount input").val()
-    raw_total_excluding_taxes = total_excluding_taxes
-    total_excluding_taxes = raw_total_excluding_taxes - commercial_discount
-    $(".total_excluding_taxes input").val num2str total_excluding_taxes
-
-    discount_rate = commercial_discount / raw_total_excluding_taxes
-
-    # VAT amount based on each line total with discount rate
-    vat_amount = 0.0
-    $("#billing_machine-form .line").map ->
-      return if parseInt($(this).find("input[name*=destroy]").val()) == 1
-
-      # Per line VAT rate
-      if $(this).find(".line-vat_rate input").length > 0
-        vat_rate = str2num $(this).find(".line-vat_rate input").val()
-      # Global VAT rate
-      else
-        vat_rate = str2num $("#totals-table .vat_rate input").val()
-
-      line_total = str2num $(this).find(".line-total input").val()
-      discounted_line_total = line_total - (line_total * discount_rate)
-      line_vat_amount = discounted_line_total * vat_rate / 100
-      vat_amount += line_vat_amount
-    $(".vat_amount input").val num2str vat_amount
-
-    total_including_taxes = total_excluding_taxes + vat_amount
-    $(".total_including_taxes input").val num2str total_including_taxes
-
-    # Advances is for invoices only, not for quotations
-    if $(".advance input").length > 0 && $(".balance input").length > 0
-      advance = str2num $(".advance input").val()
-      balance = total_including_taxes - advance
-      $(".balance input").val num2str balance
-
-  # Update amount on page load
-  $("#billing_machine-form input").keyup()
-
-  # Format all input correctly
-  $("#billing_machine-form input.number").blur ->
-    $("#billing_machine-form input.number").map ->
-      formatted_number = num2str str2num $(this).val()
-      $(this).val formatted_number
-  $("#billing_machine-form input.number").blur()
-
-  # Empty number inputs on focus if value is 0
-  $("#billing_machine-form input.number").focus ->
-    $(this).val("") if str2num($(this).val()) == 0
-
-  # Auto ajust line label textarea height
-  $("#billing_machine-form textarea").keyup ->
-     this.rows = this.value.split("\n").length
-  $("#billing_machine-form textarea").keyup()
+  BillingMachine.formatInputs()
+  BillingMachine.updateTotals()
 
   # Fix Cocoon bug
   $("#billing_machine-form .line textarea").map ->
     this.value = this.value.trim()
 
-  # Button to delete line
-  $("#billing_machine-form a.delete").click ->
-    $(this).parents("td").find("input").val(1)
-    $(this).parents("tr").hide()
-    $("#billing_machine-form input").keyup() # Update totals
-    return false
+$(document).on "keyup", "#billing_machine-form input.number", ->
+  BillingMachine.updateTotals()
+
+$(document).on "blur", "#billing_machine-form input.number", ->
+  BillingMachine.formatInputs()

data/app/models/dorsale/billing_machine.rb

@@ -1,6 +1,4 @@
 module Dorsale::BillingMachine
-  DEFAULT_VAT_RATE = 20.00
-
   class << self
     def vat_modes
       [:single, :multiple]
@@ -28,5 +26,11 @@ module Dorsale::BillingMachine
     def default_currency
       @default_currency ||= "€"
     end
+
+    attr_writer :default_vat_rate
+
+    def default_vat_rate
+      @default_vat_rate ||= 20.0
+    end
   end
 end

data/app/models/dorsale/billing_machine/invoice.rb

@@ -71,7 +71,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
 
     lines.each do |line|
       line_total = line.total - (line.total * discount_rate)
-      self.vat_amount += (line_total * line.vat_rate / 100.0)
+      self.vat_amount += (line_total * line.vat_rate / 100.0).round(2)
     end
 
     self.total_including_taxes = total_excluding_taxes + vat_amount
@@ -91,7 +91,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
       raise "Invoice has multiple vat rates"
     end
 
-    vat_rates.first || ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+    vat_rates.first || ::Dorsale::BillingMachine.default_vat_rate
   end
 
   attr_writer :vat_rate

data/app/models/dorsale/billing_machine/invoice_line.rb

@@ -14,12 +14,12 @@ class Dorsale::BillingMachine::InvoiceLine < ::Dorsale::ApplicationRecord
   def assign_default_values
     assign_default :quantity,   0
     assign_default :unit_price, 0
-    assign_default :vat_rate,   ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+    assign_default :vat_rate,   ::Dorsale::BillingMachine.default_vat_rate
   end
 
   def update_total
     assign_default_values
-    self.total = quantity * unit_price
+    self.total = (quantity * unit_price).round(2)
   end
 
   after_save :update_invoice_total

data/app/models/dorsale/billing_machine/quotation.rb

@@ -76,7 +76,7 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
 
     lines.each do |line|
       line_total = line.total - (line.total * discount_rate)
-      self.vat_amount += (line_total * line.vat_rate / 100.0)
+      self.vat_amount += (line_total * line.vat_rate / 100.0).round(2)
     end
 
     self.total_including_taxes = total_excluding_taxes + vat_amount
@@ -105,7 +105,7 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
       raise "Quotation has multiple vat rates"
     end
 
-    vat_rates.first || ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+    vat_rates.first || ::Dorsale::BillingMachine.default_vat_rate
   end
 
   attr_writer :vat_rate

data/app/models/dorsale/billing_machine/quotation_line.rb

@@ -14,12 +14,12 @@ class Dorsale::BillingMachine::QuotationLine < ::Dorsale::ApplicationRecord
   def assign_default_values
     assign_default :quantity,   0
     assign_default :unit_price, 0
-    assign_default :vat_rate,   ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+    assign_default :vat_rate,   ::Dorsale::BillingMachine.default_vat_rate
   end
 
   def update_total
     assign_default_values
-    self.total = quantity * unit_price
+    self.total = (quantity * unit_price).round(2)
   end
 
   after_save :update_quotation_total

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.9.8"
+  VERSION = "3.10.0"
 end

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

@@ -25,7 +25,7 @@ describe Dorsale::BillingMachine::InvoiceLine, type: :model do
     end
 
     it "vat_rate should be 0" do
-      expect(described_class.new.vat_rate).to eq Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      expect(described_class.new.vat_rate).to eq Dorsale::BillingMachine.default_vat_rate
     end
   end
 
@@ -41,12 +41,12 @@ describe Dorsale::BillingMachine::InvoiceLine, type: :model do
   end
 
   it "should update the total upon save" do
-    invoice = create(:billing_machine_invoice_line, quantity: 10, unit_price: 10, total: 0)
-    expect(invoice.total).to eq(100)
+    line = create(:billing_machine_invoice_line, quantity: 12.34, unit_price: 12.34, total: 0)
+    expect(line.total).to eq(152.28)
   end
 
   it "should update the total gracefully with invalid data" do
-    invoice = create(:billing_machine_invoice_line, quantity: nil, unit_price: nil, total: 0)
-    expect(invoice.total).to eq(0)
+    line = create(:billing_machine_invoice_line, quantity: nil, unit_price: nil, total: 0)
+    expect(line.total).to eq(0)
   end
 end

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

@@ -120,7 +120,7 @@ describe Dorsale::BillingMachine::Invoice, type: :model do
 
   describe "vat rate" do
     it "default vat rate should be 20" do
-      expect(described_class.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      expect(described_class.new.vat_rate).to eq ::Dorsale::BillingMachine.default_vat_rate
     end
 
     it "it should be specified vat rate" do
@@ -202,6 +202,31 @@ describe Dorsale::BillingMachine::Invoice, type: :model do
       expect(invoice.balance).to eq(108)
     end
 
+    it "should round numbers" do
+      invoice = create(:billing_machine_invoice,
+        :commercial_discount => 0,
+      )
+
+      create(:billing_machine_invoice_line,
+        :quantity   => 12.34,
+        :unit_price => 12.34,
+        :vat_rate   => 20,
+        :invoice    => invoice,
+      ) # total 152.28
+
+      create(:billing_machine_invoice_line,
+        :quantity   => 12.34,
+        :unit_price => 12.34,
+        :vat_rate   => 20,
+        :invoice    => invoice,
+      ) # total 152.28
+
+      expect(invoice.total_excluding_taxes).to eq(304.56)
+      expect(invoice.vat_amount).to eq(60.92)
+      expect(invoice.total_including_taxes).to eq(365.48)
+      expect(invoice.balance).to eq(365.48)
+    end
+
     it "should work fine even with empty lines" do
       invoice = create(:billing_machine_invoice)
 

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

@@ -25,7 +25,7 @@ describe Dorsale::BillingMachine::QuotationLine do
     end
 
     it "vat_rate should be 0" do
-      expect(described_class.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      expect(described_class.new.vat_rate).to eq ::Dorsale::BillingMachine.default_vat_rate
     end
   end
 
@@ -40,12 +40,12 @@ describe Dorsale::BillingMachine::QuotationLine do
   end
 
   it "should update the total upon save" do
-    quotation = create(:billing_machine_quotation_line, quantity: 10, unit_price: 10, total: 0)
-    expect(quotation.total).to eq(100)
+    line = create(:billing_machine_quotation_line, quantity: 12.34, unit_price: 12.34, total: 0)
+    expect(line.total).to eq(152.28)
   end
 
   it "should update the total gracefully with invalid data" do
-    quotation = create(:billing_machine_quotation_line, quantity: nil, unit_price: nil, total: 0)
-    expect(quotation.total).to eq(0)
+    line = create(:billing_machine_quotation_line, quantity: nil, unit_price: nil, total: 0)
+    expect(line.total).to eq(0)
   end
 end

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

@@ -74,7 +74,7 @@ describe Dorsale::BillingMachine::Quotation do
 
   describe "vat rate" do
     it "default vat rate should be 20" do
-      expect(described_class.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      expect(described_class.new.vat_rate).to eq ::Dorsale::BillingMachine.default_vat_rate
     end
 
     it "it should be specified vat rate" do
@@ -152,6 +152,31 @@ describe Dorsale::BillingMachine::Quotation do
       Dorsale::BillingMachine.vat_mode = :single
     end
 
+    it "should round numbers" do
+      quotation = create(:billing_machine_quotation,
+        :commercial_discount => 0,
+      )
+
+      create(:billing_machine_quotation_line,
+        :quantity   => 12.34,
+        :unit_price => 12.34,
+        :vat_rate   => 20,
+        :quotation  => quotation,
+      ) # total 152.28
+
+      create(:billing_machine_quotation_line,
+        :quantity   => 12.34,
+        :unit_price => 12.34,
+        :vat_rate   => 20,
+        :quotation  => quotation,
+      ) # total 152.28
+
+      expect(quotation.total_excluding_taxes).to eq(304.56)
+      expect(quotation.vat_amount).to eq(60.92)
+      expect(quotation.total_including_taxes).to eq(365.48)
+      expect(quotation.balance).to eq(365.48)
+    end
+
     it "should work fine even with empty lines" do
       quotation = create(:billing_machine_quotation, commercial_discount: nil)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.9.8
+  version: 3.10.0
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails