dorsale 3.14.11 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6866c7560ef92fbd39d25e808a3839c2cd2cebc74f96032e822ec91da2d15d22
-  data.tar.gz: 178783cfc18bcd2e657679d8aba7d03c03f5a1576d89c36811767fdf10d4d2a0
+  metadata.gz: 86af52038f7c9cfc24b17dbcf5229608296a7152f2e4565d3fd415d2dd88ce87
+  data.tar.gz: cd7c59ee287a99e1cac77068550f7a0d64451e164cb2e10855fd1dd2d9b5fb12
 SHA512:
-  metadata.gz: 7c13fd4a88831a65793b92a20fe25008e53313d80c05e94cf10b96b12b5b15e315e679b00177f96f700028b9b7bcecbf361cb0e25d7196d2e6d6ab78e91cdaab
-  data.tar.gz: ab777662670e599361601e3e4a052785f9208835b2170232e6da9fd72c74e7d6dbb99a2b65828d5432ff4df843370cc3ba908aee85d8f8f1c81ca0c1a4da9355
+  metadata.gz: 20bc75f4aa3210835d0b8ce2c6e7bb0b43ab7b2a496555df02fc1b6ef9983af553ad586170a5d67c729630905706d6ecea52340811781707520f71a47211e73a
+  data.tar.gz: 33809971e1f21d88f6a6d6d110a062cb94b18391dee6c667afa28adc9c7d9690d99806b783f02c8a0f427771e7d9f473b7a693cbba069f339005f5631426fa6d

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## Next version
 
+# 3.19.0
+- Change expenses state machine
+- Change expenses list view
+
+# 3.18.0
+- Change uploaders `extension_whitelist` to `extension_allowlist`
+- Rails 6.1 compatibility
+
+## 3.17.0
+- Refactor CV models using stores
+- Fix redirect after task comment create
+- Add missing unique indexes on invoices and quotations
+
+## 3.16.0
+- Allow to reorder BM lines (require Sorting.js + reimport migrations)
+- Remove unused url.js
+
+## 3.15.0
+- Fix Ruby 2.7 warnings
+- Faker 2
+
 ## 3.14.11
 - Fix BM missing PDFs
 

data/app/assets/javascripts/dorsale/dependencies.coffee

@@ -4,11 +4,11 @@
 //= require bootstrap
 //= require cocoon
 //= require accounting
-//= require url.min
 //= require select2
 //= require select2_locale_fr
 //= require bootstrap-datepicker/core
 //= require bootstrap-datepicker/locales/bootstrap-datepicker.fr
 //= require Chart.bundle
 //= require chartkick
+//= require Sortable
 //= require agilibox/all

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

@@ -77,6 +77,10 @@ BillingMachine.formatInputs = ->
     formatted_number = BillingMachine.num2str BillingMachine.str2num $(this).val()
     $(this).val formatted_number
 
+BillingMachine.updatePositions = ->
+  i = 0
+  $("#billing_machine-form input[name*=position]").map -> this.value = (i = i + 1)
+
 # 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
@@ -96,6 +100,7 @@ $(document).on "click", "#billing_machine-form a.delete", (e) ->
 $(document).on "turbolinks:load cocoon:after-insert", ->
   BillingMachine.formatInputs()
   BillingMachine.updateTotals()
+  BillingMachine.updatePositions()
 
   # Fix Cocoon bug
   $("#billing_machine-form .line textarea").map ->
@@ -106,3 +111,12 @@ $(document).on "keyup", "#billing_machine-form input.number", ->
 
 $(document).on "blur", "#billing_machine-form input.number", ->
   BillingMachine.formatInputs()
+
+$(document).on "turbolinks:load", ->
+  $("#billing_machine-form tbody").map ->
+    container = this
+
+    new Sortable container,
+      handle: ".handle"
+      animation: 150
+      onSort: -> BillingMachine.updatePositions()

data/app/assets/stylesheets/dorsale/engines/billing_machine.sass

@@ -103,11 +103,14 @@
 
     th.actions,
     td.actions,
+    th.position,
+    td.position,
       padding: 0
       width: 2.5em
       text-align: center
 
-    th.actions
+    th.actions,
+    th.position,
       border: none
 
     // disabled fields

data/app/controllers/dorsale/billing_machine/invoices_controller.rb

@@ -157,15 +157,20 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
       :advance,
       :due_date,
       :comments,
-      :lines_attributes => [
-        :_destroy,
-        :id,
-        :label,
-        :quantity,
-        :unit,
-        :unit_price,
-        :vat_rate,
-      ],
+      :lines_attributes => line_permitted_params,
+    ]
+  end
+
+  def line_permitted_params
+    [
+      :_destroy,
+      :id,
+      :label,
+      :quantity,
+      :unit,
+      :unit_price,
+      :vat_rate,
+      :position,
     ]
   end
 

data/app/controllers/dorsale/billing_machine/quotations_controller.rb

@@ -165,15 +165,20 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
       :comments,
       :vat_rate,
       :commercial_discount,
-      :lines_attributes => [
-        :_destroy,
-        :id,
-        :label,
-        :quantity,
-        :unit,
-        :unit_price,
-        :vat_rate,
-      ],
+      :lines_attributes => line_permitted_params,
+    ]
+  end
+
+  def line_permitted_params
+    [
+      :_destroy,
+      :id,
+      :label,
+      :quantity,
+      :unit,
+      :unit_price,
+      :vat_rate,
+      :position,
     ]
   end
 

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

@@ -1,15 +1,5 @@
 class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::ApplicationController
-  before_action :set_expense, only: [
-    :show,
-    :edit,
-    :update,
-    :copy,
-    :submit,
-    :accept,
-    :refuse,
-    :cancel,
-  ]
-
+  before_action :set_expense
   before_action :set_filters_variables, only: [:index]
 
   def index
@@ -18,7 +8,10 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     @expenses ||= scope.all.preload(:user, :expense_lines)
     @filters ||= Dorsale::ExpenseGun::SmallData::FilterForExpenses.new(filters_jar)
     @expenses = @filters.apply(@expenses)
+    @expenses = Dorsale::ExpenseGun::ExpensesSorter.call(@expenses, params[:sort] ||= "-created_at")
     @expenses = @expenses.page(params[:page]).per(25)
+
+    @total_payback = @expenses.limit(nil).to_a.sum(&:total_employee_payback)
   end
 
   def new
@@ -34,7 +27,7 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     @expense ||= scope.new(expense_params_for_create)
 
     if @expense.save
-      flash[:success] = t("expense_gun.expense.messages.created")
+      set_succress_flash
       redirect_to dorsale.expense_gun_expense_path(@expense)
     else
       render :new
@@ -55,7 +48,7 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     authorize @expense, :update?
 
     if @expense.update(expense_params_for_update)
-      flash[:success] = t("expense_gun.expense.messages.updated")
+      set_succress_flash
       redirect_to dorsale.expense_gun_expense_path(@expense)
     else
       render :edit
@@ -71,50 +64,47 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     render :new
   end
 
-  def submit
-    authorize @expense, :submit?
+  def go_to_pending
+    authorize @expense, :go_to_pending?
 
-    @expense.go_to_submitted!
-    flash[:success] = t("expense_gun.expense.messages.submitted")
+    @expense.update!(state: "pending")
+    set_succress_flash
     redirect_to dorsale.expense_gun_expenses_path
   end
 
-  def accept
-    authorize @expense, :accept?
-
-    @expense.go_to_accepted!
-    flash[:success] = t("expense_gun.expense.messages.accepted")
-    redirect_to dorsale.expense_gun_expense_path(@expense)
-  end
+  def go_to_paid
+    authorize @expense, :go_to_paid?
 
-  def refuse
-    authorize @expense, :refuse?
-
-    @expense.go_to_refused!
-    flash[:success] = t("expense_gun.expense.messages.refused")
+    @expense.update!(state: "paid")
+    set_succress_flash
     redirect_to dorsale.expense_gun_expenses_path
   end
 
-  def cancel
-    authorize @expense, :cancel?
+  def go_to_canceled
+    authorize @expense, :go_to_canceled?
 
-    @expense.go_to_canceled!
-    flash[:success] = t("expense_gun.expense.messages.canceled")
+    @expense.update!(state: "canceled")
+    set_succress_flash
     redirect_to dorsale.expense_gun_expenses_path
   end
 
   private
 
+  def set_succress_flash
+    flash.notice = t("expense_gun.expense.messages.#{action_name}_ok")
+  end
+
   def model
     ::Dorsale::ExpenseGun::Expense
   end
 
   def set_expense
-    @expense = scope.find(params[:id])
+    @expense = scope.find(params[:id]) if params.key?(:id)
   end
 
   def permitted_params
     [
+      :state,
       :name,
       :date,
       :expense_lines_attributes => [

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

@@ -19,9 +19,9 @@ class Dorsale::Flyboy::TaskCommentsController < ::Dorsale::Flyboy::ApplicationCo
 
   def back_url
     task_path = flyboy_task_path(@task)
-    back_url  = super
+    back_url  = super.to_s
 
-    if back_url.to_s.start_with?(task_path)
+    if back_url == task_path || back_url.start_with?(task_path + "?")
       back_url
     else
       task_path

data/app/filters/dorsale/expense_gun/small_data/filter_for_expenses.rb

@@ -1,6 +1,9 @@
 class Dorsale::ExpenseGun::SmallData::FilterForExpenses < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "expense_state"   => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("state"),
-    "expense_user_id" => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("user_id"),
+    "expense_state"       => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("state"),
+    "expense_user_id"     => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("user_id"),
+    "expense_time_period" => ::Agilibox::SmallData::FilterStrategyByDatePeriod.new(:date),
+    "expense_date_begin"  => ::Agilibox::SmallData::FilterStrategyByDateBegin.new(:date),
+    "expense_date_end"    => ::Agilibox::SmallData::FilterStrategyByDateEnd.new(:date),
   }
 end

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

@@ -1,6 +1,6 @@
 module Dorsale::ExpenseGun::ApplicationHelper
   def expense_states_for_filters_select
-    Dorsale::ExpenseGun::Expense.aasm.states.map do |state|
+    Dorsale::ExpenseGun::Expense::STATES.map do |state|
       [
         Dorsale::ExpenseGun::Expense.t("state.#{state}"),
         state,

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

@@ -11,7 +11,7 @@ class Dorsale::Flyboy::TaskMailer < ::Dorsale::ApplicationMailer
 
     mail(
       :to      => task.owner.email,
-      :subject => t("task_mailer.new_task.subject", @locals),
+      :subject => t("task_mailer.new_task.subject", **@locals),
     )
   end
 
@@ -26,7 +26,7 @@ class Dorsale::Flyboy::TaskMailer < ::Dorsale::ApplicationMailer
 
     mail(
       :to      => task.owner.email,
-      :subject => t("task_mailer.term_email.subject", @locals),
+      :subject => t("task_mailer.term_email.subject", **@locals),
     )
   end
 end

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

@@ -55,7 +55,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     lines.each(&:update_total)
     apply_vat_rate_to_lines
 
-    lines_sum = lines.map(&:total).sum.round(2)
+    lines_sum = lines.sum(&:total).round(2)
 
     self.total_excluding_taxes = lines_sum - commercial_discount
 
@@ -109,9 +109,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
   def payment_status
     if paid?
       :paid
-    elsif due_date.nil?
-      :on_alert
-    elsif Date.current >= due_date + 15
+    elsif due_date.nil? || Date.current >= due_date + 15
       :on_alert
     elsif Date.current > due_date
       :late

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

@@ -6,7 +6,7 @@ class Dorsale::BillingMachine::InvoiceLine < ::Dorsale::ApplicationRecord
   validates :invoice, presence: true
 
   default_scope -> {
-    order(created_at: :asc)
+    order(position: :asc, created_at: :asc, id: :asc)
   }
 
   before_validation :update_total

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

@@ -61,7 +61,7 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     lines.each(&:update_total)
     apply_vat_rate_to_lines
 
-    lines_sum = lines.map(&:total).sum
+    lines_sum = lines.sum(&:total)
 
     self.total_excluding_taxes = lines_sum - commercial_discount
 

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

@@ -6,7 +6,7 @@ class Dorsale::BillingMachine::QuotationLine < ::Dorsale::ApplicationRecord
   validates :quotation, presence: true
 
   default_scope -> {
-    order(:created_at => :asc)
+    order(position: :asc, created_at: :asc, id: :asc)
   }
 
   before_validation :update_total

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

@@ -1,6 +1,15 @@
 class Dorsale::CustomerVault::Corporation < Dorsale::CustomerVault::Person
-  serialize      :data,  Dorsale::CustomerVault::CorporationData
-  def_delegators :data, *Dorsale::CustomerVault::CorporationData.methods_to_delegate
+  data_attributes = %i(
+    legal_form
+    immatriculation_number
+    naf
+    european_union_vat_number
+    societe_com
+    capital
+    revenue
+    number_of_employees
+  )
+  store :data, accessors: data_attributes, coder: JSON
 
   validates :corporation_name, presence: true
   has_many :individuals, dependent: :nullify

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

@@ -1,6 +1,8 @@
 class Dorsale::CustomerVault::Individual < Dorsale::CustomerVault::Person
-  serialize      :data,  Dorsale::CustomerVault::IndividualData
-  def_delegators :data, *Dorsale::CustomerVault::IndividualData.methods_to_delegate
+  data_attributes = %i(
+    title
+  )
+  store :data, accessors: data_attributes, coder: JSON
 
   validates :first_name, presence: true
   validates :last_name,  presence: true

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

@@ -10,7 +10,7 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   end
 
   def verify_class
-    if self.class == ::Dorsale::CustomerVault::Person
+    if instance_of?(Dorsale::CustomerVault::Person)
       # self.abstract_class does not work with STI
       raise "Cannot directly instantiate Person class"
     end

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

@@ -1,6 +1,7 @@
 class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_expense_gun_expenses"
-  include AASM
+
+  STATES = %w(draft pending paid canceled)
 
   has_many :expense_lines, inverse_of: :expense, dependent: :destroy, class_name: "Dorsale::ExpenseGun::ExpenseLine"
 
@@ -12,6 +13,7 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   belongs_to :user
   validates :user, presence: true
 
+  validates :state, presence: true, inclusion: {in: STATES}
   validates :name, presence: true
   validates :date, presence: true
 
@@ -24,51 +26,22 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   }
 
   def assign_default_values
+    assign_default :state, STATES.first
     assign_default :date, Date.current
   end
 
   # Sum of line amounts
   def total_all_taxes
-    expense_lines.map(&:total_all_taxes).sum
+    expense_lines.sum(&:total_all_taxes)
   end
 
   # Sum of line emplee payback
   def total_employee_payback
-    expense_lines.map(&:employee_payback).sum
+    expense_lines.sum(&:employee_payback)
   end
 
   # Sum of deductible deductible vat
   def total_vat_deductible
-    expense_lines.map(&:total_vat_deductible).sum
-  end
-
-  delegate :current_state, to: :aasm
-
-  aasm(column: :state, whiny_transitions: false) do
-    state :draft, initial: true
-    state :submitted
-    state :accepted
-    state :refused
-    state :canceled
-
-    event :go_to_submitted do
-      transitions from: :draft, to: :submitted
-    end
-
-    event :go_to_accepted do
-      transitions from: :submitted, to: :accepted
-    end
-
-    event :go_to_refused do
-      transitions from: :submitted, to: :refused
-    end
-
-    event :go_to_canceled do
-      transitions from: [:draft, :submitted, :accepted], to: :canceled
-    end
-  end
-
-  def may_edit?
-    current_state == :draft
+    expense_lines.sum(&:total_vat_deductible)
   end
 end