dorsale 3.14.9 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02356f6d8c0cf4484b3c5bbf8ae14b4afb5807b79a836c3ac3def7fe4f0d795
-  data.tar.gz: 10e1416b942207884fc2a84665285e6a5ebb9d73fe5d65a69057f89d05ac75fa
+  metadata.gz: edb8363b4a987b737cfba9c432a65fd5c64fbb72690c51f6ea5da99c195430a6
+  data.tar.gz: 9b88ffbea03b8971f2a853c5dfcbe6387670ec7b69d8601d68ab295ba425364c
 SHA512:
-  metadata.gz: ad1c5adb07688951372ec42e57c85f9487c06257827dcf0e712ab3a87794c9c9ac5e6fe6ba09115fe3813e55ceba36b56dc871729e5aead840b3815af4a8b3a8
-  data.tar.gz: 90da6df14ad83c78ea0abe031686ea1f9cbbdb3750005c669c19f89875b7ea77a9fce70c4bfbdc9dd7f28e28f95b954ef85395c8422b86148c9bbeefffeeed1d
+  metadata.gz: c84800985f5243887825313437907d6a40d2ab5398e7c78de903d404a9c3d5e1d01e6bed9c7cee4fe57f15af26d0aa0c1950ede73946dd3d3f8c14a7ce20a6e1
+  data.tar.gz: 373d7d5e133bcb61443e8defed065177fb6e82fc56bc7424abbb110f3632d51a07a24df569f96d2b336206339a2774d26c206d5b1ff6e6862f6d5b63baa061fb

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## Next version
 
+## 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
+
+## 3.14.10
+- Change BillingMachine PDF filenames
+- Fix CustomerVault layout
+
 ## 3.14.9
 - Create corporation from individual form
 - Quotations: add draft state

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/customer_vault/events_controller.rb

@@ -1,8 +1,6 @@
 class Dorsale::CustomerVault::EventsController < ::Dorsale::CustomerVault::ApplicationController
   before_action :set_objects
 
-  layout -> { action_name == "index" ? nil : false }
-
   def index
     authorize model, :list?
 

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/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

@@ -22,6 +22,8 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     :invoice
   end
 
+  after_initialize :assign_default_dates
+  before_save :update_totals
   before_create :assign_unique_index
   before_create :assign_tracking_id
 
@@ -43,15 +45,11 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     assign_default :paid,                  false
   end
 
-  after_initialize :assign_default_dates
-
   def assign_default_dates
     assign_default :date,     Date.current
     assign_default :due_date, Date.current + 30.days
   end
 
-  before_save :update_totals
-
   def update_totals
     assign_default_values
     lines.each(&:update_total)

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

@@ -33,6 +33,7 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     :quotation
   end
 
+  before_save :update_totals
   before_create :assign_unique_index
   before_create :assign_tracking_id
 
@@ -55,8 +56,6 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     assign_default :total_excluding_taxes,  0
   end
 
-  before_save :update_totals
-
   def update_totals
     assign_default_values
     lines.each(&:update_total)

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

@@ -9,8 +9,6 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
     Dorsale::CustomerVault::PersonPolicy
   end
 
-  after_initialize :verify_class
-
   def verify_class
     if self.class == ::Dorsale::CustomerVault::Person
       # self.abstract_class does not work with STI
@@ -30,6 +28,13 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   belongs_to :activity_type, class_name: "Dorsale::CustomerVault::ActivityType"
   belongs_to :origin, class_name: "Dorsale::CustomerVault::Origin"
 
+  validate :validate_taken_emails
+
+  after_initialize :verify_class
+  after_initialize  :build_address, if: proc { new_record? && address.nil? }
+
+  before_validation :build_address, if: proc { address.nil? }
+
   after_destroy :destroy_links
 
   default_scope -> {
@@ -50,9 +55,6 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
 
   scope :having_email, -> (email) { where("email = :e OR :e = ANY (secondary_emails)", e: email) }
 
-  after_initialize  :build_address, if: proc { new_record? && address.nil? }
-  before_validation :build_address, if: proc { address.nil? }
-
   def taken_emails
     taken_emails = {}
     ([email] + secondary_emails).select(&:present?).each do |e|
@@ -62,8 +64,6 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
     taken_emails
   end
 
-  validate :validate_taken_emails
-
   def validate_taken_emails
     return if taken_emails.empty?
 

data/app/pdfs/dorsale/billing_machine/invoice_single_vat_pdf.rb

@@ -177,11 +177,11 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
   end
 
   def has_advance
-    main_document.try(:advance) && main_document.advance != 0.0
+    main_document.try(:advance) && main_document.advance.to_d != 0.0.to_d
   end
 
   def has_discount
-    main_document.try(:commercial_discount) && main_document.commercial_discount != 0.0
+    main_document.try(:commercial_discount) && main_document.commercial_discount.to_d != 0.0.to_d
   end
 
   def build_table

data/app/policies/dorsale/application_policy.rb

@@ -19,6 +19,7 @@ class Dorsale::ApplicationPolicy
   end
 
   def self.inherited(klass)
+    super(klass)
     klass.define_subject_accessor!
   end
 

data/app/services/dorsale/billing_machine/invoice/copy.rb

@@ -2,6 +2,7 @@ class Dorsale::BillingMachine::Invoice::Copy < ::Dorsale::Service
   attr_accessor :invoice, :copy
 
   def initialize(invoice)
+    super()
     @invoice = invoice
   end
 

data/app/services/dorsale/billing_machine/pdf_file_generator.rb

@@ -2,14 +2,8 @@ class Dorsale::BillingMachine::PdfFileGenerator < Dorsale::Service
   attr_reader :document
 
   def initialize(document)
+    super()
     @document = document
-
-    # I have no idea why I need to do that,
-    # if I don't do that, CarrierWare do not stores the file.
-    # The reload() method don't work either.
-    # The problem appears only on server, not in console.
-    # I think CarrierWave do not work anymore after first save.
-    @document = document.class.find(document.id) if document.persisted?
   end
 
   def call

data/app/services/dorsale/billing_machine/quotation/copy.rb

@@ -2,6 +2,7 @@ class Dorsale::BillingMachine::Quotation::Copy < ::Dorsale::Service
   attr_accessor :quotation, :copy
 
   def initialize(quotation)
+    super()
     @quotation = quotation
   end
 

data/app/services/dorsale/billing_machine/quotation/to_invoice.rb

@@ -2,6 +2,7 @@ class Dorsale::BillingMachine::Quotation::ToInvoice < ::Dorsale::Service
   attr_accessor :quotation, :invoice
 
   def initialize(quotation)
+    super()
     @quotation = quotation
   end
 

data/app/services/dorsale/expense_gun/expense/copy.rb

@@ -2,6 +2,7 @@ class Dorsale::ExpenseGun::Expense::Copy < ::Dorsale::Service
   attr_accessor :expense, :copy
 
   def initialize(expense)
+    super()
     @expense = expense
   end
 

data/app/services/dorsale/flyboy/task/copy.rb

@@ -2,6 +2,7 @@ class Dorsale::Flyboy::Task::Copy < ::Dorsale::Service
   attr_accessor :task, :copy
 
   def initialize(task)
+    super()
     @task = task
   end
 

data/app/services/dorsale/flyboy/task/snoozer.rb

@@ -2,6 +2,7 @@ class Dorsale::Flyboy::Task::Snoozer < ::Dorsale::Service
   attr_reader :task
 
   def initialize(task)
+    super()
     @task = task
   end
 

data/app/services/dorsale/tag_list_for_model.rb

@@ -2,6 +2,7 @@ class Dorsale::TagListForModel < ::Dorsale::Service
   attr_reader :model
 
   def initialize(model)
+    super()
     @model = model
   end
 

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

@@ -21,6 +21,7 @@
     table#lines-table
       thead
         tr
+          th.position
           th.actions
           th.line-label      = Dorsale::BillingMachine::InvoiceLine.t(:label)
           th.line-quantity   = Dorsale::BillingMachine::InvoiceLine.t(:quantity)
@@ -32,7 +33,7 @@
 
       tbody
         = f.simple_fields_for :lines do |lf|
-          = render "dorsale/billing_machine/invoices/line_fields", f: lf
+          = render "dorsale/billing_machine/#{document.document_type}s/line_fields", f: lf
 
     .row
       .col-sm-6

data/app/views/dorsale/billing_machine/commons/_line_fields.html.slim

@@ -1,4 +1,8 @@
 tr.line
+  td.position
+    = icon(:arrows_alt, class: "handle")
+    = f.hidden_field :position
+
   td.actions
     a.delete href="#"
       span.fa.fa-fw.fa-trash

data/app/views/dorsale/billing_machine/invoices/show.pdf.ruby

@@ -1,7 +1,7 @@
 filename = [
   @invoice.t.capitalize,
   @invoice.tracking_id,
-  @invoice.customer.try(:short_name),
+  @invoice.customer.to_s.tr(" ", "_"),
 ].join("_").concat(".pdf")
 
 response.headers["Content-Disposition"] = %(inline; filename="#{filename}")

data/app/views/dorsale/billing_machine/quotations/show.pdf.ruby

@@ -1,7 +1,7 @@
 filename = [
   @quotation.t.capitalize,
   @quotation.tracking_id,
-  @quotation.customer.try(:short_name),
+  @quotation.customer.to_s.tr(" ", "_"),
 ].join("_").concat(".pdf")
 
 response.headers["Content-Disposition"] = %(inline; filename="#{filename}")

data/app/views/dorsale/flyboy/task_mailer/new_task.html.slim

@@ -1 +1 @@
-p == lf2br t("task_mailer.new_task.body", @locals)
+p == lf2br t("task_mailer.new_task.body", **@locals)

data/app/views/dorsale/flyboy/task_mailer/term_email.html.slim

@@ -1 +1 @@
-p == lf2br t("task_mailer.term_email.body", @locals)
+p == lf2br t("task_mailer.term_email.body", **@locals)

data/config/locales/billing_machine.fr.yml

@@ -25,6 +25,7 @@ fr:
     expires_at: "Date d'expiration"
     balance: "Reste à payer"
     pdf_file: "Fichier PDF"
+    position: "Position"
 
   activerecord:
     models:

data/db/migrate/20210202100529_billing_machine_add_positions.rb

@@ -0,0 +1,6 @@
+class BillingMachineAddPositions < ActiveRecord::Migration[6.0]
+  def change
+    add_column :dorsale_billing_machine_invoice_lines, :position, :integer, null: false, default: 0
+    add_column :dorsale_billing_machine_quotation_lines, :position, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20210311131928_billing_machine_add_missing_unique_indexes.rb

@@ -0,0 +1,6 @@
+class BillingMachineAddMissingUniqueIndexes < ActiveRecord::Migration[6.0]
+  def change
+    add_index :dorsale_billing_machine_invoices, :unique_index, unique: true
+    add_index :dorsale_billing_machine_quotations, :unique_index, unique: true
+  end
+end

data/features/step_definitions/billing_machine_payment_terms_steps.rb

@@ -28,7 +28,7 @@ When(/^the user edits the payment_term$/) do
   find(".link_update").click
 end
 
-Then(/^the current payment_term's label should be pre\-filled$/) do
+Then(/^the current payment_term's label should be pre-filled$/) do
   expect(page).to have_field("billing_machine_payment_term_label", with: @payment_term.label)
 end
 

data/features/step_definitions/billing_machine_quotations_steps.rb

@@ -58,7 +58,7 @@ When(/^the quotation line shows the right date$/) do
   expect(page).to have_selector ".date", text: I18n.l(@quotation.date)
 end
 
-When(/^the quotation line shows the right traking\-id$/) do
+When(/^the quotation line shows the right traking-id$/) do
   expect(page).to have_selector ".tracking_id", text: @quotation.tracking_id
 end
 

data/features/step_definitions/customer_vault_activity_types_steps.rb

@@ -28,7 +28,7 @@ When(/^I edit the activity type$/) do
   find(".link_update").click
 end
 
-Then(/^the current activity type's name should be pre\-filled$/) do
+Then(/^the current activity type's name should be pre-filled$/) do
   expect(page).to have_field("activity_type_name", with: @activity_type.name)
 end
 

data/features/step_definitions/customer_vault_origins_steps.rb

@@ -28,7 +28,7 @@ When(/^I edit the origin$/) do
   find(".link_update").click
 end
 
-Then(/^the current origin's name should be pre\-filled$/) do
+Then(/^the current origin's name should be pre-filled$/) do
   expect(page).to have_field("origin_name", with: @origin.name)
 end
 

data/features/step_definitions/customer_vault_people_steps.rb

@@ -7,7 +7,7 @@ Then(/^the file is downloaded$/) do
 end
 
 Given(/^a very long comment on this person$/) do
-  text = Faker::Lorem.paragraph(30)
+  text = Faker::Lorem.paragraph(sentence_count: 30)
   @comment = create(:customer_vault_event_comment, person: @person, text: text)
 end
 

data/features/step_definitions/customer_vault_search_steps.rb

@@ -1,48 +1,48 @@
-Lorsqu(/^he go to the people list$/) do
+When(/^he go to the people list$/) do
   visit dorsale.customer_vault_people_path
 end
 
-Etantdonné(/^existing individuals$/) do
+Given(/^existing individuals$/) do
   @individual1 = create(:customer_vault_individual, first_name: "Jean", last_name: "DUPONT")
   @individual2 = create(:customer_vault_individual, first_name: "Laurent", last_name: "DURAND")
 end
 
-Etantdonné(/^existing corporations$/) do
+Given(/^existing corporations$/) do
   @corporation1 = create(:customer_vault_corporation, name: "aaa", email: "contact@aaa.com")
   @corporation2 = create(:customer_vault_corporation, name: "zzz", email: "contact@zzz.com")
 end
 
-Lorsqu(/^he search an individual by first name$/) do
+When(/^he search an individual by first name$/) do
   fill_in "q", with: "Jean"
   find(".search-submit").click
 end
 
-Alors(/^this individual appear in search results$/) do
+Then(/^this individual appear in search results$/) do
   expect(page).to have_content "Jean"
   expect(page).to have_content "DUPONT"
 end
 
-Alors(/^other individuals do not appear in search results$/) do
+Then(/^other individuals do not appear in search results$/) do
   expect(page).to have_no_content "Laurent"
   expect(page).to have_no_content "DURAND"
 end
 
-Lorsqu(/^he search an individual by last name$/) do
+When(/^he search an individual by last name$/) do
   fill_in "q", with: "DUPONT"
   find(".search-submit").click
 end
 
-Lorsqu(/^he search a corporation by name$/) do
+When(/^he search a corporation by name$/) do
   fill_in "q", with: "aaa"
   find(".search-submit").click
 end
 
-Alors(/^this corporation appear in search results$/) do
+Then(/^this corporation appear in search results$/) do
   expect(page).to have_content "aaa"
   expect(page).to have_content "contact@aaa.com"
 end
 
-Alors(/^other corporations do not appear in search results$/) do
+Then(/^other corporations do not appear in search results$/) do
   expect(page).to have_no_content "zzz"
   expect(page).to have_no_content "contact@zzz.com"
 end

data/features/step_definitions/expense_gun_categories_steps.rb

@@ -28,7 +28,7 @@ When(/^I edit the expense category$/) do
   find(".link_update").click
 end
 
-Then(/^the current expense category's label should be pre\-filled$/) do
+Then(/^the current expense category's label should be pre-filled$/) do
   expect(page).to have_field("category_name", with: @category.name)
 end
 

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.14.9"
+  VERSION = "3.17.0"
 end

data/spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb

@@ -18,7 +18,7 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
       expect(assigns(:task_comment).persisted?).to be true
     end
 
-    it "should redirect to referrer if referrer is task" do
+    it "should redirect to referrer if referrer is task show" do
       url = flyboy_task_path(task) + "?sort=xxx"
       request.env["HTTP_REFERER"] = url
       post :create, params: valid_params
@@ -26,7 +26,7 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
     end
 
     it "should redirect to task if referrer is not task" do
-      url = "/anywhere"
+      url = flyboy_task_path(task) + "/some-action"
       request.env["HTTP_REFERER"] = url
       post :create, params: valid_params
       expect(response).to redirect_to flyboy_task_path(task)

data/spec/factories/customer_vault_individuals.rb

@@ -1,17 +1,17 @@
 FactoryBot.define do
   factory :customer_vault_individual, class: ::Dorsale::CustomerVault::Individual do
-    origin     { create(:customer_vault_origin)                      }
-    first_name { Faker::Name.first_name                              }
-    last_name  { Faker::Name.last_name                               }
-    short_name { "SN"                                                }
-    email      { Faker::Internet.email("#{first_name} #{last_name}") }
-    title      { "Individual-Title"                                  }
-    twitter    { "#{first_name}#{last_name}"                         }
-    www        { Faker::Internet.url                                 }
-    context    { "Individual-Context"                                }
-    phone      { "01 23 xx xx xx"                                    }
-    fax        { "09 xx xx xx xx"                                    }
-    mobile     { "06 xx xx xx xx"                                    }
-    address    { build(:dorsale_address)                             }
+    origin     { create(:customer_vault_origin)    }
+    first_name { Faker::Name.first_name            }
+    last_name  { Faker::Name.last_name             }
+    short_name { "SN"                              }
+    email      { Faker::Internet.email(name: name) }
+    title      { "Individual-Title"                }
+    twitter    { "#{first_name}#{last_name}"       }
+    www        { Faker::Internet.url               }
+    context    { "Individual-Context"              }
+    phone      { "01 23 xx xx xx"                  }
+    fax        { "09 xx xx xx xx"                  }
+    mobile     { "06 xx xx xx xx"                  }
+    address    { build(:dorsale_address)           }
   end
 end

data/spec/factories/expense_gun_categories.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :expense_gun_category, class: ::Dorsale::ExpenseGun::Category do
-    name           { Faker::Lorem.word       }
-    code           { Faker::Number.number(4) }
-    vat_deductible { [true, false].sample    }
+    name           { Faker::Lorem.word               }
+    code           { Faker::Number.number(digits: 4) }
+    vat_deductible { [true, false].sample            }
   end
 end

data/spec/factories/expense_gun_expense_lines.rb

@@ -1,11 +1,11 @@
 FactoryBot.define do
   factory :expense_gun_expense_line, class: ::Dorsale::ExpenseGun::ExpenseLine do
-    expense         { build(:expense_gun_expense)   }
-    name            { Faker::Lorem.sentence(3)      }
-    category        { build(:expense_gun_category) }
-    date            { Faker::Date.backward(30)      }
-    total_all_taxes { rand(100..1000)               }
-    vat             { rand(1..(total_all_taxes/5))  }
-    company_part    { [25, 50, 75, 100].sample      }
+    expense         { build(:expense_gun_expense)          }
+    name            { Faker::Lorem.sentence(word_count: 3) }
+    category        { build(:expense_gun_category)         }
+    date            { Faker::Date.backward(days: 30)       }
+    total_all_taxes { rand(100..1000)                      }
+    vat             { rand(1..(total_all_taxes/5))         }
+    company_part    { [25, 50, 75, 100].sample             }
   end
 end

data/spec/factories/expense_gun_expenses.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :expense_gun_expense, class: ::Dorsale::ExpenseGun::Expense do
-    name { Faker::Lorem.sentence(3) }
-    date { Date.current             }
-    user { create(:user)            }
+    name { Faker::Lorem.sentence(word_count: 3) }
+    date { Date.current }
+    user { create(:user) }
 
     after(:create) { |expense|
       rand(2..5).times {

data/spec/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf_spec.rb

@@ -23,7 +23,7 @@ describe ::Dorsale::BillingMachine::InvoiceMultipleVatPdf, pdfs: true do
 
   let(:content) {
     generate!
-    Yomu.new(invoice.pdf_file.path).text
+    PDF::Reader.new(invoice.pdf_file.path).pages.map(&:text).join("\n")
   }
 
   it "should not display global vat rate" do

data/spec/pdfs/dorsale/billing_machine/invoice_single_vat_pdf_spec.rb

@@ -23,7 +23,7 @@ describe ::Dorsale::BillingMachine::InvoiceSingleVatPdf, pdfs: true do
 
   let(:content) {
     generate!
-    Yomu.new(invoice.pdf_file.path).text
+    PDF::Reader.new(invoice.pdf_file.path).pages.map(&:text).join("\n")
   }
 
   it "should display global vat rate" do

data/spec/pdfs/dorsale/billing_machine/quotation_multiple_vat_pdf_spec.rb

@@ -23,7 +23,7 @@ describe ::Dorsale::BillingMachine::QuotationMultipleVatPdf, pdfs: true do
 
   let(:content) {
     generate!
-    Yomu.new(quotation.pdf_file.path).text
+    PDF::Reader.new(quotation.pdf_file.path).pages.map(&:text).join("\n")
   }
 
   it "should not display global vat rate" do

data/spec/pdfs/dorsale/billing_machine/quotation_single_vat_pdf_spec.rb

@@ -23,7 +23,7 @@ describe ::Dorsale::BillingMachine::QuotationSingleVatPdf, pdfs: true do
 
   let(:content) {
     generate!
-    Yomu.new(quotation.pdf_file.path).text
+    PDF::Reader.new(quotation.pdf_file.path).pages.map(&:text).join("\n")
   }
 
   it "should display global vat rate" do

data/spec/rails_helper.rb

@@ -4,7 +4,6 @@ require 'spec_helper'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require "agilibox/rspec"
-require "yomu"
 # Add additional requires below this line. Rails is not loaded until this point!
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.14.9
+  version: 3.17.0
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,20 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '99'
-- !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '99'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '99'
 - !ruby/object:Gem::Dependency
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
@@ -468,7 +454,6 @@ files:
 - app/assets/javascripts/dorsale/engines/billing_machine.coffee.erb
 - app/assets/javascripts/dorsale/engines/customer_vault.coffee
 - app/assets/javascripts/dorsale/engines/flyboy.coffee
-- app/assets/javascripts/url.min.js
 - app/assets/stylesheets/dorsale/all.sass
 - app/assets/stylesheets/dorsale/common.sass
 - app/assets/stylesheets/dorsale/common/comments.sass
@@ -550,14 +535,11 @@ files:
 - app/models/dorsale/customer_vault.rb
 - app/models/dorsale/customer_vault/activity_type.rb
 - app/models/dorsale/customer_vault/corporation.rb
-- app/models/dorsale/customer_vault/corporation_data.rb
 - app/models/dorsale/customer_vault/event.rb
 - app/models/dorsale/customer_vault/individual.rb
-- app/models/dorsale/customer_vault/individual_data.rb
 - app/models/dorsale/customer_vault/link.rb
 - app/models/dorsale/customer_vault/origin.rb
 - app/models/dorsale/customer_vault/person.rb
-- app/models/dorsale/customer_vault/person_data.rb
 - app/models/dorsale/email.rb
 - app/models/dorsale/expense_gun.rb
 - app/models/dorsale/expense_gun/category.rb
@@ -835,6 +817,8 @@ files:
 - db/migrate/20171023133219_customer_vault_events_add_contact_type.rb
 - db/migrate/20171024075514_customer_vault_contact_type_default_value.rb
 - db/migrate/20171115171425_dorsale_customer_vault_people_add_secondary_emails.rb
+- db/migrate/20210202100529_billing_machine_add_positions.rb
+- db/migrate/20210311131928_billing_machine_add_missing_unique_indexes.rb
 - features/access.feature
 - features/billing_machine_invoices.feature
 - features/billing_machine_multiple_vat.feature
@@ -989,7 +973,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Modular ERP made with Ruby on Rails

data/app/assets/javascripts/url.min.js

@@ -1 +0,0 @@
-/*! js-url - v2.3.0 - 2016-03-10 */window.url=function(){function a(){}function b(a){return decodeURIComponent(a.replace(/\+/g," "))}function c(a,b){var c=a.charAt(0),d=b.split(c);return c===a?d:(a=parseInt(a.substring(1),10),d[0>a?d.length+a:a-1])}function d(a,c){for(var d=a.charAt(0),e=c.split("&"),f=[],g={},h=[],i=a.substring(1),j=0,k=e.length;k>j;j++)if(f=e[j].match(/(.*?)=(.*)/),f||(f=[e[j],e[j],""]),""!==f[1].replace(/\s/g,"")){if(f[2]=b(f[2]||""),i===f[1])return f[2];h=f[1].match(/(.*)\[([0-9]+)\]/),h?(g[h[1]]=g[h[1]]||[],g[h[1]][h[2]]=f[2]):g[f[1]]=f[2]}return d===a?g:g[i]}return function(b,e){var f,g={};if("tld?"===b)return a();if(e=e||window.location.toString(),!b)return e;if(b=b.toString(),f=e.match(/^mailto:([^\/].+)/))g.protocol="mailto",g.email=f[1];else{if((f=e.match(/(.*?)\/#\!(.*)/))&&(e=f[1]+f[2]),(f=e.match(/(.*?)#(.*)/))&&(g.hash=f[2],e=f[1]),g.hash&&b.match(/^#/))return d(b,g.hash);if((f=e.match(/(.*?)\?(.*)/))&&(g.query=f[2],e=f[1]),g.query&&b.match(/^\?/))return d(b,g.query);if((f=e.match(/(.*?)\:?\/\/(.*)/))&&(g.protocol=f[1].toLowerCase(),e=f[2]),(f=e.match(/(.*?)(\/.*)/))&&(g.path=f[2],e=f[1]),g.path=(g.path||"").replace(/^([^\/])/,"/$1").replace(/\/$/,""),b.match(/^[\-0-9]+$/)&&(b=b.replace(/^([^\/])/,"/$1")),b.match(/^\//))return c(b,g.path.substring(1));if(f=c("/-1",g.path.substring(1)),f&&(f=f.match(/(.*?)\.(.*)/))&&(g.file=f[0],g.filename=f[1],g.fileext=f[2]),(f=e.match(/(.*)\:([0-9]+)$/))&&(g.port=f[2],e=f[1]),(f=e.match(/(.*?)@(.*)/))&&(g.auth=f[1],e=f[2]),g.auth&&(f=g.auth.match(/(.*)\:(.*)/),g.user=f?f[1]:g.auth,g.pass=f?f[2]:void 0),g.hostname=e.toLowerCase(),"."===b.charAt(0))return c(b,g.hostname);a()&&(f=g.hostname.match(a()),f&&(g.tld=f[3],g.domain=f[2]?f[2]+"."+f[3]:void 0,g.sub=f[1]||void 0)),g.port=g.port||("https"===g.protocol?"443":"80"),g.protocol=g.protocol||("443"===g.port?"https":"http")}return b in g?g[b]:"{}"===b?g:void 0}}(),"undefined"!=typeof jQuery&&jQuery.extend({url:function(a,b){return window.url(a,b)}});

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

@@ -1,10 +0,0 @@
-class Dorsale::CustomerVault::CorporationData < Dorsale::CustomerVault::PersonData
-  attribute :legal_form,                String
-  attribute :immatriculation_number,    String
-  attribute :naf,                       String
-  attribute :european_union_vat_number, String
-  attribute :societe_com,               String
-  attribute :capital,                   Integer
-  attribute :revenue,                   Integer
-  attribute :number_of_employees,       Integer
-end

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

@@ -1,3 +0,0 @@
-class Dorsale::CustomerVault::IndividualData < Dorsale::CustomerVault::PersonData
-  attribute :title, String
-end

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

@@ -1,17 +0,0 @@
-require "virtus"
-
-class Dorsale::CustomerVault::PersonData
-  include Virtus.model
-
-  def self.dump(obj)
-    JSON.dump(obj.attributes)
-  end
-
-  def self.load(json_string)
-    new JSON.parse(json_string.presence || "{}")
-  end
-
-  def self.methods_to_delegate
-    instance_methods - Dorsale::CustomerVault::PersonData.instance_methods
-  end
-end