dorsale 3.1.7 → 3.2.0

data/app/controllers/dorsale/customer_vault/links_controller.rb

@@ -1,6 +1,10 @@
 class Dorsale::CustomerVault::LinksController < ::Dorsale::CustomerVault::ApplicationController
   before_action :set_objects
 
+  def index
+    authorize @person, :read?
+  end
+
   def new
     authorize @person, :update?
 
@@ -54,11 +58,7 @@ class Dorsale::CustomerVault::LinksController < ::Dorsale::CustomerVault::Applic
   end
 
   def back_url
-    customer_vault_person_path(@person) + "#links"
-  end
-
-  def scope
-    policy_scope(model)
+    customer_vault_person_links_path(@person)
   end
 
   def person_scope

data/app/controllers/dorsale/customer_vault/people_controller.rb

@@ -1,12 +1,7 @@
 class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::ApplicationController
   handles_sortable_columns
 
-  before_action :set_objects, only: [
-    :show,
-    :edit,
-    :update,
-    :destroy,
-  ]
+  before_action :set_objects
 
   def index
     authorize model, :list?
@@ -80,6 +75,13 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
     authorize @person, :read?
   end
 
+  def tasks
+    show
+  end
+
+  def invoices
+    show
+  end
 
   def edit
     authorize @person, :update?
@@ -137,12 +139,8 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
     model.to_s.demodulize.downcase.to_sym
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def set_objects
-    @person ||= scope.find(params[:id])
+    @person ||= scope.find(params[:id]) if params.key?(:id)
   end
 
   def common_permitted_params

data/app/controllers/dorsale/expense_gun/categories_controller.rb

@@ -51,10 +51,6 @@ class Dorsale::ExpenseGun::CategoriesController < ::Dorsale::ExpenseGun::Applica
     ::Dorsale::ExpenseGun::Category
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def back_url
     expense_gun_categories_path
   end

data/app/controllers/dorsale/expense_gun/expenses_controller.rb

@@ -109,10 +109,6 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     ::Dorsale::ExpenseGun::Expense
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def set_expense
     @expense = scope.find(params[:id])
   end
@@ -147,7 +143,7 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
   end
 
   def set_filters_variables
-    @users ||= policy_scope(User).all
+    @users ||= scope.preload(:user).map(&:user).uniq.compact
   end
 
 end

data/app/controllers/dorsale/flyboy/folders_controller.rb

@@ -114,10 +114,6 @@ class Dorsale::Flyboy::FoldersController < ::Dorsale::Flyboy::ApplicationControl
     ::Dorsale::Flyboy::Folder
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def set_objects
     @folder = scope.find(params[:id])
   end

data/app/controllers/dorsale/flyboy/tasks_controller.rb

@@ -152,10 +152,6 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
     ::Dorsale::Flyboy::Task
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def default_back_url
     if @task
       url_for(action: :show, id: @task.to_param)

data/app/controllers/dorsale/users_controller.rb

@@ -5,9 +5,6 @@ class Dorsale::UsersController < ::Dorsale::ApplicationController
     :update,
   ]
 
-  def show
-  end
-
   def index
     authorize User, :list?
 
@@ -20,10 +17,6 @@ class Dorsale::UsersController < ::Dorsale::ApplicationController
     authorize @user, :create?
   end
 
-  def edit
-    authorize @user, :update?
-  end
-
   def create
     @user ||= scope.new(user_params_for_create)
 
@@ -38,6 +31,13 @@ class Dorsale::UsersController < ::Dorsale::ApplicationController
     end
   end
 
+  def show
+  end
+
+  def edit
+    authorize @user, :update?
+  end
+
   def update
     authorize @user, :update?
 
@@ -56,10 +56,6 @@ class Dorsale::UsersController < ::Dorsale::ApplicationController
     User
   end
 
-  def scope
-    policy_scope(model)
-  end
-
   def set_objects
     @user = scope.find(params[:id])
   end

data/app/filters/dorsale/billing_machine/small_data/filter_strategy_by_customer.rb

@@ -1,6 +1,6 @@
 class Dorsale::BillingMachine::SmallData::FilterStrategyByCustomer < ::Dorsale::SmallData::FilterStrategy
   def apply(query, value)
-    type, id = value.split("-")
+    type, id = value.split("-", 2)
     query.where(customer_type: type, customer_id: id)
   end
 end

data/app/filters/dorsale/flyboy/small_data/filter_for_tasks.rb

@@ -1,6 +1,6 @@
 class Dorsale::Flyboy::SmallData::FilterForTasks < ::Dorsale::SmallData::Filter
   STRATEGIES = {
     "fb_status" => ::Dorsale::Flyboy::SmallData::FilterStrategyByDone.new,
-    "owner"     => ::Dorsale::SmallData::FilterStrategyByKeyValue.new("owner_id")
+    "fb_owner"  => ::Dorsale::SmallData::FilterStrategyByKeyValue.new(:owner_id)
   }
 end

data/app/helpers/dorsale/all_helpers.rb

@@ -13,6 +13,7 @@ module Dorsale::AllHelpers
   include ::Dorsale::BootstrapHelper
 
   include ::Dorsale::Alexandrie::AttachmentsHelper
+  include ::Dorsale::BillingMachine::ApplicationHelper
   include ::Dorsale::Flyboy::ApplicationHelper
   include ::Dorsale::ExpenseGun::ApplicationHelper
   include ::Dorsale::UsersHelper

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

@@ -33,4 +33,27 @@ module Dorsale::BillingMachine::ApplicationHelper
     end
   end
 
+  def billing_machine_invoices_chart
+    invoices = policy_scope(::Dorsale::BillingMachine::Invoice)
+      .where("date > ?", 1.year.ago.beginning_of_month)
+
+    totals = {}
+
+    (0..12).to_a.reverse.map do |n|
+      date  = n.month.ago
+      label = l(date, format: "%B %Y").titleize
+      totals[label] = 0
+      invoices.each do |i|
+        next if i.date.year  != date.year
+        next if i.date.month != date.month
+        totals[label] += i.total_excluding_taxes
+      end
+    end
+
+    column_chart totals, height: "200px"
+  end
+
+  def bm_currency(n)
+    currency(n, ::Dorsale::BillingMachine.default_currency)
+  end
 end

data/app/helpers/dorsale/comments_helper.rb

@@ -1,5 +1,17 @@
 module Dorsale::CommentsHelper
-  def comments_for(commentable)
-    render partial: "dorsale/comments/loader", locals: {commentable: commentable}
+  def comments_for(commentable, options = {})
+    comments = policy_scope(::Dorsale::Comment)
+      .where(commentable: commentable)
+      .preload(:commentable, :author)
+
+    new_comment = comments.new(author: current_user)
+
+    render(
+      :partial => "dorsale/comments/comments",
+      :locals  => {
+        :comments    => comments,
+        :new_comment => new_comment,
+      },
+    )
   end
 end

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

@@ -49,4 +49,8 @@ module Dorsale::Flyboy::ApplicationHelper
     }
   end
 
+  def flyboy_tasks_owners_for_filters_select
+    policy_scope(User)
+  end
+
 end

data/app/helpers/dorsale/text_helper.rb

@@ -65,12 +65,19 @@ module Dorsale::TextHelper
     str.gsub("\r", "").gsub("\n", "<br />").html_safe
   end
 
-  def info(object, attribute, text_or_options = nil, options = {})
-    if text_or_options.is_a?(Hash)
-      text    = nil
-      options = text_or_options
+  def info(object, attribute, value_or_options = nil, options = {})
+    if value_or_options.nil?
+      value = object.public_send(attribute)
+    elsif value_or_options.is_a?(Hash)
+      value = object.public_send(attribute)
+      options = value_or_options
     else
-      text = text_or_options
+      value = value_or_options
+    end
+
+    if value.blank?
+      value = options[:default]
+      return if value == :hide
     end
 
     label       = options[:label]     || object.t(attribute)
@@ -82,8 +89,6 @@ module Dorsale::TextHelper
     klass       = object.is_a?(Module) ? object : object.class
     object_type = klass.to_s.split("::").last.underscore
 
-    value = text
-    value = object.public_send(attribute)     if value.nil?
     value = t("yes")                          if value === true
     value = t("no")                           if value === false
     value = object.t("#{attribute}.#{value}") if nested

data/app/libs/dorsale/sortable_uuid_generator.rb

@@ -0,0 +1,11 @@
+# Microtime based uuids to be sortable
+class Dorsale::SortableUUIDGenerator
+  REGEX_WITH_DASHES    = /^([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12})$/
+  REGEX_WITHOUT_DASHES = /^([0-9a-f]{8})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{12})$/
+
+  def self.generate
+    prefix = Time.zone.now.strftime("%s%9N").to_i.to_s(16)
+    suffix = SecureRandom.hex(8)
+    (prefix + suffix).gsub(REGEX_WITHOUT_DASHES, '\1-\2-\3-\4-\5')
+  end
+end

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

@@ -1,13 +1,11 @@
 class Dorsale::BillingMachine::InvoiceMailer < ::Dorsale::ApplicationMailer
   def send_invoice_to_customer(invoice, subject, body, sender = nil)
-    return false if invoice.try(:customer).try(:email).blank?
-
     attachments["#{invoice.t}_#{invoice.tracking_id}.pdf"] = invoice.to_pdf
 
     mail(
       :to       => invoice.customer.email,
-      :cc       => sender.try(:email),
-      :reply_to => sender.try(:email),
+      :cc       => sender.email,
+      :reply_to => sender.email,
       :subject  => subject,
       :body     => body,
     )

data/app/models/concerns/dorsale/active_record_uuid_concern.rb

@@ -0,0 +1,15 @@
+module Dorsale::ActiveRecordUUIDConcern
+  extend ActiveSupport::Concern
+
+  private
+
+  def assign_default_uuid
+    if id.nil? && self.class.columns_hash["id"].type == :uuid
+      self.id = ::Dorsale::SortableUUIDGenerator.generate
+    end
+  end
+
+  included do
+    before_save :assign_default_uuid
+  end
+end

data/app/models/concerns/dorsale/default_values_concern.rb

@@ -0,0 +1,13 @@
+module Dorsale::DefaultValuesConcern
+  extend ActiveSupport::Concern
+
+  def assign_default_values; end
+
+  def assign_default(attribute, value)
+    self.send("#{attribute}=", value) if self.send(attribute).nil?
+  end
+
+  included do
+    after_initialize :assign_default_values
+  end
+end

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

@@ -11,15 +11,15 @@ class Dorsale::Alexandrie::Attachment < ::Dorsale::ApplicationRecord
 
   mount_uploader :file, ::Dorsale::Alexandrie::FileUploader
 
-  before_save :set_default_name
+  before_save :assign_default_name
 
   default_scope -> {
     all
-      .order(id: :desc)
+      .order(created_at: :desc, id: :desc)
       .preload(:attachment_type)
   }
 
-  def set_default_name
+  def assign_default_name
     self.name = file_identifier if name.blank?
   end
 

data/app/models/dorsale/application_record.rb

@@ -1,3 +1,14 @@
 class Dorsale::ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
+
+  include Dorsale::ActiveRecordUUIDConcern
+  include Dorsale::DefaultValuesConcern
+  nilify_blanks
+
+  def self.last_created
+    reorder(:created_at, :id).last
+  end
 end
+
+ActsAsTaggableOn::Tagging.send(:include, Dorsale::ActiveRecordUUIDConcern)
+ActsAsTaggableOn::Tag.send(:include, Dorsale::ActiveRecordUUIDConcern)

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

@@ -18,16 +18,8 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     order(unique_index: :desc)
   }
 
-  def initialize(*args)
-    super
-    assign_default_values
-    self.due_date              = 30.days.from_now      if due_date.nil?
-    self.date                  = Time.zone.now.to_date if date.nil?
-  end
-
   before_create :assign_unique_index
   before_create :assign_tracking_id
-  before_validation :assign_default_values
 
   def assign_unique_index
     if unique_index.nil?
@@ -40,11 +32,19 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
   end
 
   def assign_default_values
-    self.advance               = 0.0   if advance.nil?
-    self.vat_amount            = 0.0   if vat_amount.nil?
-    self.commercial_discount   = 0.0   if commercial_discount.nil?
-    self.total_excluding_taxes = 0.0   if total_excluding_taxes.nil?
-    self.paid                  = false if paid.nil?
+    assign_default :advance,               0.0
+    assign_default :vat_amount,            0.0
+    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
   end
 
   before_save :update_totals

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

@@ -9,18 +9,12 @@ class Dorsale::BillingMachine::InvoiceLine < ::Dorsale::ApplicationRecord
     order(created_at: :asc)
   }
 
-  def initialize(*)
-    super
-    assign_default_values
-  end
-
-  before_validation :assign_default_values
   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