dorsale 3.8.1 → 3.9.0

data/app/helpers/dorsale/context_helper.rb

@@ -1,5 +1,5 @@
 module Dorsale::ContextHelper
-  def actions_for(obj, opts={})
+  def actions_for(obj, opts = {})
     url        = opts[:url]
     edit_url   = opts[:edit_url]
     delete_url = opts[:delete_url]

data/app/helpers/dorsale/flyboy/application_helper.rb

@@ -52,10 +52,10 @@ module Dorsale::Flyboy::ApplicationHelper
   end
 
   def task_term_values_for_select
-    today     = Time.zone.now.to_date
-    tomorrow  = (Time.zone.now + 1.day).to_date
-    this_week = Time.zone.now.to_date.end_of_week
-    next_week = (Time.zone.now + 1.week).to_date.end_of_week
+    today     = Date.current
+    tomorrow  = Date.tomorrow
+    this_week = Date.current.end_of_week
+    next_week = (Date.current + 1.week).end_of_week
 
     # Because today or tomorrow can be equal to this week
     if @task.term == today
@@ -78,5 +78,4 @@ module Dorsale::Flyboy::ApplicationHelper
       [Dorsale::Flyboy::Task.t("term_value.custom"),    :custom,        {selected: is_custom}],
     ]
   end
-
 end

data/app/mailers/dorsale/billing_machine/invoice_mailer.rb

@@ -10,5 +10,4 @@ class Dorsale::BillingMachine::InvoiceMailer < ::Dorsale::ApplicationMailer
       :body     => body,
     )
   end
-
 end

data/app/mailers/dorsale/flyboy/task_mailer.rb

@@ -29,5 +29,4 @@ class Dorsale::Flyboy::TaskMailer < ::Dorsale::ApplicationMailer
       :subject => t("task_mailer.term_email.subject", @locals),
     )
   end
-
 end

data/app/mailers/dorsale/user_mailer.rb

@@ -7,5 +7,4 @@ class Dorsale::UserMailer < ::Dorsale::ApplicationMailer
       :subject => t("emails.user.new_account.title"),
     )
   end
-
 end

data/app/models/dorsale/address.rb

@@ -4,7 +4,7 @@ class Dorsale::Address < ::Dorsale::ApplicationRecord
   validates :addressable, presence: true
 
   def one_line
-    zip_city = [zip, city].select(&:present?).join(' ')
-    [street, street_bis, zip_city, country].select(&:present?).join(', ')
+    zip_city = [zip, city].select(&:present?).join(" ")
+    [street, street_bis, zip_city, country].select(&:present?).join(", ")
   end
 end

data/app/models/dorsale/alexandrie/attachment_type.rb

@@ -8,5 +8,4 @@ class Dorsale::Alexandrie::AttachmentType < ::Dorsale::ApplicationRecord
   default_scope -> {
     order(:name)
   }
-
 end

data/app/models/dorsale/billing_machine.rb

@@ -23,11 +23,10 @@ module Dorsale::BillingMachine
       "::Dorsale::BillingMachine::Quotation#{vat_mode.to_s.capitalize}VatPdf".constantize
     end
 
-    attr_accessor :default_currency
+    attr_writer :default_currency
 
     def default_currency
       @default_currency ||= "€"
     end
-
   end
 end

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

@@ -3,7 +3,6 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
 
   belongs_to :customer, polymorphic: true
   belongs_to :payment_term
-  belongs_to :id_card
 
   has_many :lines, inverse_of: :invoice, dependent: :destroy, class_name: ::Dorsale::BillingMachine::InvoiceLine
 
@@ -13,8 +12,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
 
   mount_uploader :pdf_file, ::Dorsale::PdfUploader
 
-  validates :id_card, presence: true
-  validates :date,    presence: true
+  validates :date, presence: true
 
   default_scope -> {
     order(unique_index: :desc)
@@ -39,14 +37,13 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     assign_default :commercial_discount,   0.0
     assign_default :total_excluding_taxes, 0.0
     assign_default :paid,                  false
-
   end
 
   after_initialize :assign_default_dates
 
   def assign_default_dates
-    assign_default :date,     Time.zone.now.to_date
-    assign_default :due_date, Time.zone.now.to_date + 30.days
+    assign_default :date,     Date.current
+    assign_default :due_date, Date.current + 30.days
   end
 
   before_save :update_totals
@@ -90,9 +87,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     vat_rates.first || ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
   end
 
-  def vat_rate=(value)
-    @vat_rate = value
-  end
+  attr_writer :vat_rate
 
   before_validation :apply_vat_rate_to_lines
 
@@ -106,38 +101,32 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
 
   def payment_status
     if paid?
-      return :paid
-    elsif due_date == nil
-      return :on_alert
-    elsif Time.zone.now.to_date >= due_date + 15
-      return :on_alert
-    elsif Time.zone.now.to_date > due_date
-      return :late
+      :paid
+    elsif due_date.nil?
+      :on_alert
+    elsif Date.current >= due_date + 15
+      :on_alert
+    elsif Date.current > due_date
+      :late
     else
-      return :pending
+      :pending
     end
   end
 
   def t(*args)
     return super if args.any?
 
-    if balance && balance < 0
+    if balance&.negative?
       super(:credit_note)
     else
       self.class.t
     end
   end
 
-  def total_excluding_taxes=(*); super; end
-  private :total_excluding_taxes=
-
-  def vat_amount=(*); super; end
-  private :vat_amount=
-
-  def total_including_taxes=(*); super; end
-  private :total_including_taxes=
-
-  def balance=(*); super; end
-  private :balance=
-
+  # rubocop:disable Style/SingleLineMethods
+  private def total_excluding_taxes=(*); super; end
+  private def vat_amount=(*);            super; end
+  private def total_including_taxes=(*); super; end
+  private def balance=(*);               super; end
+  # rubocop:enable Style/SingleLineMethods
 end

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

@@ -19,12 +19,12 @@ class Dorsale::BillingMachine::InvoiceLine < ::Dorsale::ApplicationRecord
 
   def update_total
     assign_default_values
-    self.total = self.quantity * self.unit_price
+    self.total = quantity * unit_price
   end
 
   after_save :update_invoice_total
 
   def update_invoice_total
-    self.invoice.reload.save!
+    invoice.reload.save!
   end
 end

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

@@ -4,8 +4,8 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
   STATES = %w(pending accepted refused canceled)
 
   belongs_to :customer, polymorphic: true
-  belongs_to :id_card
   belongs_to :payment_term
+
   has_many :lines,
     :inverse_of => :quotation,
     :dependent  => :destroy,
@@ -22,9 +22,8 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
 
   mount_uploader :pdf_file, ::Dorsale::PdfUploader
 
-  validates :id_card, presence: true
-  validates :date,    presence: true
-  validates :state,   presence: true, inclusion: {in: proc { STATES } }
+  validates :date,  presence: true
+  validates :state, presence: true, inclusion: {in: proc { STATES }}
 
   default_scope -> {
     order(unique_index: :desc)
@@ -45,7 +44,7 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
 
   def assign_default_values
     assign_default :state,                  STATES.first
-    assign_default :date,                   Time.zone.now.to_date
+    assign_default :date,                   Date.current
     assign_default :expires_at,             date + 1.month
     assign_default :commercial_discount,    0
     assign_default :vat_amount,             0
@@ -76,17 +75,14 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     self.total_including_taxes = total_excluding_taxes + vat_amount
   end
 
-  def total_excluding_taxes=(*); super; end
-  private :total_excluding_taxes=
-
-  def vat_amount=(*); super; end
-  private :vat_amount=
-
-  def total_including_taxes=(*); super; end
-  private :total_including_taxes=
+  # rubocop:disable Style/SingleLineMethods
+  private def total_excluding_taxes=(*); super; end
+  private def vat_amount=(*);            super; end
+  private def total_including_taxes=(*); super; end
+  # rubocop:enable Style/SingleLineMethods
 
   def balance
-    self.total_including_taxes
+    total_including_taxes
   end
 
   def vat_rate
@@ -105,9 +101,7 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     vat_rates.first || ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
   end
 
-  def vat_rate=(value)
-    @vat_rate = value
-  end
+  attr_writer :vat_rate
 
   before_validation :apply_vat_rate_to_lines
 

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

@@ -19,13 +19,12 @@ class Dorsale::BillingMachine::QuotationLine < ::Dorsale::ApplicationRecord
 
   def update_total
     assign_default_values
-    self.total = self.quantity * self.unit_price
+    self.total = quantity * unit_price
   end
 
   after_save :update_quotation_total
 
   def update_quotation_total
-    self.quotation.reload.save!
+    quotation.reload.save!
   end
-
 end

data/app/models/dorsale/comment.rb

@@ -16,6 +16,6 @@ class Dorsale::Comment < ::Dorsale::ApplicationRecord
   private
 
   def assign_default_values
-    assign_default :date, Time.zone.now.to_date
+    assign_default :date, Date.current
   end
 end

data/app/models/dorsale/customer_vault/corporation.rb

@@ -3,7 +3,7 @@ class Dorsale::CustomerVault::Corporation < Dorsale::CustomerVault::Person
   def_delegators :data, *Dorsale::CustomerVault::CorporationData.methods_to_delegate
 
   validates :corporation_name, presence: true
-  has_many :individuals
+  has_many :individuals, dependent: :nullify
 
   def self_and_related_events
     ::Dorsale::CustomerVault::Event.where(person: [self] + individuals)
@@ -17,13 +17,14 @@ class Dorsale::CustomerVault::Corporation < Dorsale::CustomerVault::Person
     self.corporation_name = corporation_name
   end
 
-  private def first_name;  raise NoMethodError; end
-  private def first_name=; raise NoMethodError; end
-  private def last_name;   raise NoMethodError; end
-  private def last_name=;  raise NoMethodError; end
-  private def corporation;   raise NoMethodError; end
-  private def corporation=;  raise NoMethodError; end
-  private def corporation_id;   raise NoMethodError; end
-  private def corporation_id=;  raise NoMethodError; end
-
+  # rubocop:disable Style/SingleLineMethods
+  private def first_name;      raise NoMethodError; end
+  private def first_name=;     raise NoMethodError; end
+  private def last_name;       raise NoMethodError; end
+  private def last_name=;      raise NoMethodError; end
+  private def corporation;     raise NoMethodError; end
+  private def corporation=;    raise NoMethodError; end
+  private def corporation_id;  raise NoMethodError; end
+  private def corporation_id=; raise NoMethodError; end
+  # rubocop:enable Style/SingleLineMethods
 end

data/app/models/dorsale/customer_vault/event.rb

@@ -10,8 +10,8 @@ class Dorsale::CustomerVault::Event < ::Dorsale::ApplicationRecord
   validates :person,       presence: true
   validates :date,         presence: true
   validates :text,         presence: true
-  validates :action,       presence: true, inclusion: {in: proc {ACTIONS} }
-  validates :contact_type, presence: true, inclusion: {in: proc {CONTACT_TYPES} }
+  validates :action,       presence: true, inclusion: {in: proc { ACTIONS }}
+  validates :contact_type, presence: true, inclusion: {in: proc { CONTACT_TYPES }}
 
   default_scope -> {
     all

data/app/models/dorsale/customer_vault/individual.rb

@@ -11,16 +11,18 @@ class Dorsale::CustomerVault::Individual < Dorsale::CustomerVault::Person
   end
 
   def name
-    [self.last_name, self.first_name].join(", ")
+    [last_name, first_name].join(", ")
   end
 
   def activity_type
     corporation.try(:activity_type)
   end
 
+  # rubocop:disable Style/SingleLineMethods
   private def corporation_name;  raise NoMethodError; end
   private def corporation_name=; raise NoMethodError; end
-  private def activity_type=; raise NoMethodError; end
+  private def activity_type=;    raise NoMethodError; end
   private def activity_type_id;  raise NoMethodError; end
   private def activity_type_id=; raise NoMethodError; end
+  # rubocop:enable Style/SingleLineMethods
 end

data/app/models/dorsale/customer_vault/person.rb

@@ -24,7 +24,7 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   has_one :address, class_name: ::Dorsale::Address, as: :addressable, inverse_of: :addressable, dependent: :destroy
   has_many :tasks, class_name: ::Dorsale::Flyboy::Task, as: :taskable, dependent: :destroy
   has_many :events, dependent: :destroy
-  has_many :invoices, class_name: ::Dorsale::BillingMachine::Invoice, as: :customer
+  has_many :invoices, class_name: ::Dorsale::BillingMachine::Invoice, as: :customer, dependent: :nullify
   accepts_nested_attributes_for :address, allow_destroy: true
 
   belongs_to :activity_type, class_name: ::Dorsale::CustomerVault::ActivityType
@@ -33,7 +33,17 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   after_destroy :destroy_links
 
   default_scope -> {
-    order("LOWER(COALESCE(corporation_name, '') || COALESCE(last_name, '') || COALESCE(first_name, '')) ASC")
+    order_by_name
+  }
+
+  scope :order_by_name, -> {
+    order %(
+      LOWER(
+        COALESCE(corporation_name, '') ||
+        COALESCE(last_name, '') ||
+        COALESCE(first_name, '')
+      ) ASC
+    )
   }
 
   after_initialize  :build_address, if: proc { new_record? && address.nil? }
@@ -59,12 +69,12 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
     a = ::Dorsale::CustomerVault::Link
       .where(alice_id: id)
       .preload(:alice => :taggings, :bob => :taggings)
-      .each { |l| l.person = l.alice ; l.other_person = l.bob }
+      .each { |l| l.person = l.alice; l.other_person = l.bob }
 
     b = ::Dorsale::CustomerVault::Link
       .where(bob_id: id)
       .preload(:alice => :taggings, :bob => :taggings)
-      .each { |l| l.person = l.bob ; l.other_person = l.alice }
+      .each { |l| l.person = l.bob; l.other_person = l.alice }
 
     return a + b
   end

data/app/models/dorsale/customer_vault/person_data.rb

@@ -8,11 +8,10 @@ class Dorsale::CustomerVault::PersonData
   end
 
   def self.load(json_string)
-    new JSON.load(json_string)
+    new JSON.parse(json_string.presence || "{}")
   end
 
   def self.methods_to_delegate
     instance_methods - Dorsale::CustomerVault::PersonData.instance_methods
   end
 end
-

data/app/models/dorsale/expense_gun/expense.rb

@@ -24,7 +24,7 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   }
 
   def assign_default_values
-    assign_default :date, Time.zone.now.to_date
+    assign_default :date, Date.current
   end
 
   # Sum of line amounts
@@ -42,9 +42,7 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
     expense_lines.map(&:total_vat_deductible).sum
   end
 
-  def current_state
-    aasm.current_state
-  end
+  delegate :current_state, to: :aasm
 
   aasm(column: :state, whiny_transitions: false) do
     state :draft, initial: true
@@ -73,5 +71,4 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   def may_edit?
     current_state == :draft
   end
-
 end

data/app/models/dorsale/expense_gun/expense_line.rb

@@ -10,7 +10,8 @@ class Dorsale::ExpenseGun::ExpenseLine < ::Dorsale::ApplicationRecord
   validates :category,        presence: true
   validates :total_all_taxes, presence: true, numericality: {greater_than_or_equal_to: 0}
   validates :vat,             presence: true, numericality: {greater_than_or_equal_to: 0}
-  validates :company_part,    presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100.0}
+  validates :company_part,    presence: true
+  validates :company_part, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
 
   def assign_default_values
     assign_default :company_part, 100
@@ -23,5 +24,4 @@ class Dorsale::ExpenseGun::ExpenseLine < ::Dorsale::ApplicationRecord
   def total_vat_deductible
     category.vat_deductible == true ? (vat * company_part / 100) : 0.0
   end
-
 end