dorsale 3.1.7 → 3.2.0

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

@@ -28,16 +28,8 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     order(unique_index: :desc)
   }
 
-  def initialize(*)
-    super
-    self.state                 = STATES.first          if state.nil?
-    self.date                  = Time.zone.now.to_date if date.nil?
-    assign_default_values
-  end
-
   before_create :assign_unique_index
   before_create :assign_tracking_id
-  before_validation :assign_default_values
 
   def assign_unique_index
     if unique_index.nil?
@@ -50,10 +42,12 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
   end
 
   def assign_default_values
-    self.expires_at            = date + 1.month if expires_at.nil?
-    self.commercial_discount   = 0              if commercial_discount.nil?
-    self.vat_amount            = 0              if vat_amount.nil?
-    self.total_excluding_taxes = 0              if total_excluding_taxes
+    assign_default :state,                  STATES.first
+    assign_default :date,                   Time.zone.now.to_date
+    assign_default :expires_at,             date + 1.month
+    assign_default :commercial_discount,    0
+    assign_default :vat_amount,             0
+    assign_default :total_excluding_taxes,  0
   end
 
   before_save :update_totals

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

@@ -9,17 +9,12 @@ class Dorsale::BillingMachine::QuotationLine < ::Dorsale::ApplicationRecord
     order(:created_at => :asc)
   }
 
-  def initialize(*)
-    super
-    assign_default_values
-  end
-
   before_validation :update_total
 
   def assign_default_values
-      self.quantity   ||= 0
-      self.unit_price ||= 0
-      self.vat_rate ||= ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+    assign_default :quantity,   0
+    assign_default :unit_price, 0
+    assign_default :vat_rate,   ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
   end
 
   def update_total

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

@@ -11,20 +11,21 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
     Dorsale::CustomerVault::PersonPolicy
   end
 
-  def initialize(*)
+  after_initialize :verify_class
+
+  def verify_class
     if self.class == ::Dorsale::CustomerVault::Person
       # self.abstract_class does not work with STI
       raise "Cannot directly instantiate Person class"
-    else
-      super
     end
   end
 
   acts_as_taggable
 
-  has_many :comments, -> { order(id: :desc) }, class_name: ::Dorsale::Comment, as: :commentable, dependent: :destroy
+  has_many :comments, -> { order(created_at: :desc, id: :desc) }, class_name: ::Dorsale::Comment, as: :commentable, dependent: :destroy
   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 :invoices, class_name: ::Dorsale::BillingMachine::Invoice, as: :customer
   accepts_nested_attributes_for :address, allow_destroy: true
 
   after_destroy :destroy_links

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

@@ -20,12 +20,11 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
     :reject_if => proc { |attr| attr["name"].blank? }
 
   default_scope -> {
-    order(id: :desc)
+    order(created_at: :desc, id: :desc)
   }
 
-  def initialize(*args)
-    super
-    self.date = Time.zone.now.to_date if self.date.nil?
+  def assign_default_values
+    assign_default :date, Time.zone.now.to_date
   end
 
   # Sum of line amounts

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

@@ -4,11 +4,6 @@ class Dorsale::ExpenseGun::ExpenseLine < ::Dorsale::ApplicationRecord
   belongs_to :expense,  class_name: ::Dorsale::ExpenseGun::Expense
   belongs_to :category, class_name: ::Dorsale::ExpenseGun::Category
 
-  def initialize(*)
-    super
-    self.company_part = 100 if company_part.nil?
-  end
-
   validates :expense,         presence: true
   validates :name,            presence: true
   validates :date,            presence: true
@@ -17,6 +12,10 @@ class Dorsale::ExpenseGun::ExpenseLine < ::Dorsale::ApplicationRecord
   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}
 
+  def assign_default_values
+    assign_default :company_part, 100
+  end
+
   def employee_payback
     (total_all_taxes * company_part / 100)
   end

data/app/models/dorsale/flyboy/folder.rb

@@ -30,9 +30,8 @@ class Dorsale::Flyboy::Folder < ::Dorsale::ApplicationRecord
     in: proc { ::Dorsale::Flyboy::Folder.aasm.states.map(&:to_s) }
   }
 
-  def initialize(*args)
-    super
-    self.progress = 0 if progress.nil?
+  def assign_default_values
+    assign_default :progress, 0
   end
 
   def no_undone_tasks?

data/app/models/dorsale/flyboy/task.rb

@@ -51,12 +51,11 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
     end
   end
 
-  def initialize(*args)
-    super
-    self.done = false                                    if done.nil?
-    self.reminder = Time.zone.now.to_date + snooze_default_reminder if reminder.nil?
-    self.term     = Time.zone.now.to_date + snooze_default_term     if term.nil?
-    self.progress = 0                                    if progress.nil?
+  def assign_default_values
+    assign_default :progress, 0
+    assign_default :done,     false
+    assign_default :reminder, Time.zone.now.to_date + snooze_default_reminder
+    assign_default :term,     Time.zone.now.to_date + snooze_default_term
   end
 
   after_save    :update_taskable_progress!

data/app/models/dorsale/flyboy/task_comment.rb

@@ -12,14 +12,9 @@ class Dorsale::Flyboy::TaskComment < ::Dorsale::ApplicationRecord
 
   default_scope -> { order("created_at DESC") }
 
-  def initialize(*args)
-    super
-
-    self.date = Time.zone.now if date.nil?
-
-    if progress.nil?
-      self.progress = task ? task.progress : 0
-    end
+  def assign_default_values
+    assign_default :date,     Time.zone.now
+    assign_default :progress, (task ? task.progress : 0)
   end
 
   after_create :update_task_progress

data/app/models/dorsale/users/active.rb

@@ -17,4 +17,4 @@ module Dorsale::Users::Active
       end
     end
   end
-end
+end

data/app/policies/dorsale/billing_machine/invoice_policy_helper.rb

@@ -9,4 +9,9 @@ module Dorsale::BillingMachine::InvoicePolicyHelper
     :copy?,
     :email?,
   ]
+
+  def email?
+    return false if invoice.customer.try(:email).nil?
+    super
+  end
 end

data/app/policies/dorsale/comment_policy_helper.rb

@@ -4,4 +4,25 @@ module Dorsale::CommentPolicyHelper
     :update?,
     :delete?,
   ]
+
+  def create?
+    return false unless can_read_commentable?
+    super
+  end
+
+  def update?
+    return false unless can_read_commentable?
+    super
+  end
+
+  def delete?
+    return false unless can_read_commentable?
+    super
+  end
+
+  private
+
+  def can_read_commentable?
+    policy(comment.commentable).read?
+  end
 end

data/app/serializers/dorsale/serializers/xlsx.rb

@@ -13,8 +13,19 @@ class Dorsale::Serializers::XLSX < Dorsale::Serializers::Base
     @xlsx ||= Axlsx::Package.new do |p|
       p.workbook.add_worksheet do |sheet|
         data.each do |line|
-          types = [:string] * line.length
-          sheet.add_row(line, types: types)
+          values = line.map do |value|
+            if value.is_a?(Integer)
+              value
+            elsif value.is_a?(Numeric)
+              value.to_f # Fix BigDecimal
+            elsif value == true || value == false
+              I18n.t(value.to_s)
+            else
+              value.to_s
+            end
+          end
+
+          sheet.add_row(values)
         end
       end
 

data/app/views/dorsale/billing_machine/invoices/_details.html.slim

@@ -26,7 +26,7 @@
         = info document, :date
         hr
         - if document.customer.present?
-          = document.customer.name
+          = document.customer
           br
 
           - if document.customer.address.street.present?

data/app/views/dorsale/billing_machine/invoices/_filters.html.slim

@@ -1,6 +1,6 @@
 = filters_form do |f|
   = f.input(:customer_guid,
-    :collection    => @people.map { |p| [p.name, p.guid] },
+    :collection    => @people.map { |p| [p.to_s, p.guid] },
     :include_blank => t("filters.all_customers"),
   )
 

data/app/views/dorsale/billing_machine/invoices/_form.html.slim

@@ -24,7 +24,7 @@
         .well
           = f.input :date, html5: true
           hr
-          = f.input :customer_guid, collection: @people.map{ |e| [e.name, e.guid] }
+          = f.input :customer_guid, collection: @people.map{ |e| [e.to_s, e.guid] }
 
     table#lines-table
       thead

data/app/views/dorsale/billing_machine/invoices/_header_infos.html.slim

@@ -1,4 +1,9 @@
-.well: .row
-  .col-md-4 = info @statistics, :total_excluding_taxes, helper: :bm_currency
-  .col-md-4 = info @statistics, :vat_amount,            helper: :bm_currency
-  .col-md-4 = info @statistics, :total_including_taxes, helper: :bm_currency
+.well.text-center
+  .row
+    .col-md-4 = info @statistics, :total_excluding_taxes, helper: :bm_currency
+    .col-md-4 = info @statistics, :vat_amount,            helper: :bm_currency
+    .col-md-4 = info @statistics, :total_including_taxes, helper: :bm_currency
+
+  - if params[:controller].end_with?("invoices")
+    hr
+    = billing_machine_invoices_chart

data/app/views/dorsale/billing_machine/invoices/_list.html.slim

@@ -16,7 +16,7 @@ table.default.invoices
       th.hidden-xs
         = ::Dorsale::BillingMachine::Invoice.t(:total_including_taxes)
 
-      th
+      th.actions
         = t("actions.actions")
 
   tbody
@@ -29,7 +29,8 @@ table.default.invoices
           = invoice.tracking_id
 
         td.customer_name
-          = invoice.customer.try(:name)
+          - if invoice.customer
+            = link_to invoice.customer, invoice.customer
 
         td.total_excluding_taxes
           = bm_currency invoice.total_excluding_taxes

data/app/views/dorsale/billing_machine/invoices/email.html.slim

@@ -10,6 +10,12 @@
           :input_html => {value: @subject},
         )
 
+        = f.input(:from,
+          :disabled => true,
+          :label => t("attributes.email_from"),
+          :input_html => {value: "#{current_user} <#{current_user.email}>"},
+        )
+
         = f.input(:to,
           :disabled => true,
           :label => t("attributes.email_to"),

data/app/views/dorsale/billing_machine/invoices/index.html.slim

@@ -15,7 +15,7 @@
       = create_button dorsale.new_billing_machine_invoice_path
 
     - if policy(::Dorsale::BillingMachine::Invoice).export?
-      = download_button dorsale.billing_machine_invoices_path(format: :csv), action: :export_csv
+      = download_button dorsale.billing_machine_invoices_path(format: :xlsx), download: "#{model.ts}.xlsx"
 
   - content_for :table
     = render "dorsale/billing_machine/invoices/list", invoices: @invoices

data/app/views/dorsale/billing_machine/invoices/index.xlsx.ruby

@@ -0,0 +1,41 @@
+data = [
+  [
+    Dorsale::BillingMachine::Invoice.t(:date),
+    Dorsale::BillingMachine::Invoice.t(:tracking_id),
+    Dorsale::BillingMachine::Invoice.t(:label),
+    Dorsale::CustomerVault::Person.t(:name),
+    Dorsale::CustomerVault::Person.t(:street),
+    Dorsale::CustomerVault::Person.t(:street_bis),
+    Dorsale::CustomerVault::Person.t(:zip),
+    Dorsale::CustomerVault::Person.t(:city),
+    Dorsale::CustomerVault::Person.t(:country),
+    Dorsale::BillingMachine::Invoice.t(:commercial_discount),
+    Dorsale::BillingMachine::Invoice.t(:total_excluding_taxes),
+    Dorsale::BillingMachine::Invoice.t(:vat_amount),
+    Dorsale::BillingMachine::Invoice.t(:total_including_taxes),
+    Dorsale::BillingMachine::Invoice.t(:advance),
+    Dorsale::BillingMachine::Invoice.t(:balance),
+  ]
+]
+
+@invoices_without_pagination.each do |invoice|
+  data << [
+    invoice.date,
+    invoice.tracking_id,
+    invoice.label,
+    invoice.customer.try(:name),
+    invoice.customer.try(:address).try(:street),
+    invoice.customer.try(:address).try(:street_bis),
+    invoice.customer.try(:address).try(:zip),
+    invoice.customer.try(:address).try(:city),
+    invoice.customer.try(:address).try(:country),
+    invoice.commercial_discount,
+    invoice.total_excluding_taxes,
+    invoice.vat_amount,
+    invoice.total_including_taxes,
+    invoice.advance,
+    invoice.balance,
+  ]
+end
+
+Dorsale::Serializers::XLSX.new(data).render_inline

data/app/views/dorsale/billing_machine/quotations/_filters.html.slim

@@ -1,6 +1,6 @@
 = filters_form do |f|
   = f.input(:customer_guid,
-    :collection    => @people.map { |p| [p.name, p.guid] },
+    :collection    => @people.map { |p| [p.to_s, p.guid] },
     :include_blank => t("filters.all_customers"),
   )
 

data/app/views/dorsale/billing_machine/quotations/_list.html.slim

@@ -19,7 +19,7 @@ table.default.quotations
       th.hidden-xs
         = ::Dorsale::BillingMachine::Quotation.t(:state)
 
-      th
+      th.actions
         = t("actions.actions")
 
   tbody
@@ -32,7 +32,8 @@ table.default.quotations
           = quotation.tracking_id
 
         td.customer_name
-          = quotation.customer.try(:name)
+          - if quotation.customer
+            = link_to quotation.customer, quotation.customer
 
         td.total_excluding_taxes
           = bm_currency quotation.total_excluding_taxes
@@ -40,7 +41,7 @@ table.default.quotations
         td.hidden-xs.total_including_taxes
           = bm_currency quotation.total_including_taxes
 
-        td
+        td.hidden-xs
           = quotation.t("state.#{quotation.state}")
 
         td.actions

data/app/views/dorsale/comments/_comment.html.slim

@@ -14,13 +14,13 @@
   p.infos
     span.commentable-container
       span.commentable
-        = link_to comment.commentable.name, engine_polymorphic_path(comment.commentable)
+        = link_to comment.commentable, engine_polymorphic_path(comment.commentable)
 
       span.separator
         = " - "
 
     span.date
-      = l(comment.created_at)
+      = date(comment.created_at)
 
     = " "
     = ::Dorsale::Comment.t(:written_by)

data/app/views/dorsale/comments/_comments.html.slim

@@ -0,0 +1,5 @@
+#dorsale-comments
+  - if policy(new_comment).create?
+    = render "dorsale/comments/form", comment: new_comment
+
+  = render "dorsale/comments/list", comments: comments

data/app/views/dorsale/comments/_form.html.slim

@@ -1,11 +1,10 @@
-= simple_form_for [dorsale, @comment], remote: true do |f|
-  - if defined?(commentable)
-    input type="hidden" name="commentable_id"   value=commentable.id
-    input type="hidden" name="commentable_type" value=commentable.class
+= simple_form_for [dorsale, comment], remote: true do |f|
+  = f.hidden_field :commentable_id
+  = f.hidden_field :commentable_type
 
   .comment
-    - if @comment.author.try(:avatar_url).present?
-      = image_tag @comment.author.avatar_url, class: "avatar"
+    - if comment.author.try(:avatar_url).present?
+      = image_tag comment.author.avatar_url, class: "avatar"
     - else
       = image_tag "dorsale/avatar.png", class: "avatar"