dorsale 3.14.5 → 3.14.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ed8f65abd6ae12d960fe88cc17c321b7838660d09d206bc79f7b234e984ac3
-  data.tar.gz: 0247c7a10d86060d9f869e0659254506de509de49e0d591e086f4a750f7db739
+  metadata.gz: bed10bfd8955fa8dec1e5c01787b450201bfb08941099fbe6d2e413f8b679dd1
+  data.tar.gz: 7bdab067a557c8d7ceb4d660462be2452bb429cf6bdbd540c84b6b3dc5972446
 SHA512:
-  metadata.gz: 734d3ea40626c063c7afe6c713f7e43d4934b27554a513898eb072cf9222ac48b3159f546de818c6c436367dbc86fef4f63c2b954892db24c5b5910aab0c1a51
-  data.tar.gz: e73667d0999d746a7d5dfb16ab07abb77c2dae0a410c98d0b0b621d16b6d646fcd45c3e8a1a3ccc31f4cf88068b8d3b5cd754204d3ef8921e35ec76f5b552491
+  metadata.gz: 83a3b664703cae40e41a194157e4369474d461b29042e48e13b4d259dd02f3db99e2835c885b73d83e1bc254e1d1a3c51ef7b4a025db86d45ab3653bb7da4fb0
+  data.tar.gz: '03826fb01f8843a16685a23d319611d393f988376b59418d37cbfa60fcc7e0f3baf44f518ed9a581d682615cce7061e5c35e805087eacf7dac3803edb19506ca'

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ## Next version
 
+## 3.14.10
+- Change BillingMachine PDF filenames
+- Fix CustomerVault layout
+
+## 3.14.9
+- Create corporation from individual form
+- Quotations: add draft state
+- Fix carrierwave white lists
+
+## 3.14.8
+- Rails 6
+
+## 3.14.7
+- Freeze ttfunk to <1.6 to fix PDF errors
+
+## 3.14.6
+- Small changes on BM policy check
+
 ## 3.14.5
 - Restore test files in gemspec
 

data/app/assets/javascripts/dorsale/common/tags.coffee

@@ -1,4 +1,4 @@
-$(document).on "turbolinks:load", ->
+$(document).on "turbolinks:load modal:load", ->
   $("form:not([action*=filters]) select[multiple][name*=tag]").not(".select2-hidden-accessible").map ->
     placeholder = $(this).attr("placeholder")
 

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

@@ -75,9 +75,11 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
 
   def update
     # callback in BillingMachine::ApplicationController
+    @invoice.attributes = invoice_params_for_update
+
     authorize @invoice, :update?
 
-    if @invoice.update(invoice_params_for_update)
+    if @invoice.save
       Dorsale::BillingMachine::PdfFileGenerator.(@invoice)
       flash[:notice] = t("messages.invoices.update_ok")
       redirect_to default_back_url

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

@@ -65,9 +65,11 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
 
   def update
     # callback in BillingMachine::ApplicationController
+    @quotation.attributes = quotation_params_for_update
+
     authorize @quotation, :update?
 
-    if @quotation.update(quotation_params_for_update)
+    if @quotation.save
       Dorsale::BillingMachine::PdfFileGenerator.(@quotation)
       flash[:notice] = t("messages.quotations.update_ok")
       redirect_to default_back_url

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

@@ -45,13 +45,19 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
 
     @person ||= scope.new(person_params_for_create)
 
-    if @person.save
-      generate_event!("create")
-      flash[:notice] = t("messages.#{person_type.to_s.pluralize}.create_ok")
-      redirect_to back_url
-    else
+    unless @person.save
       render :new
+      return
     end
+
+    if request.xhr? && @person.corporation?
+      render :create_corporation_js
+      return
+    end
+
+    generate_event!("create")
+    flash[:notice] = t("messages.#{person_type.to_s.pluralize}.create_ok")
+    redirect_to back_url
   end
 
   def show

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/quotation.rb

@@ -1,7 +1,7 @@
 class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_billing_machine_quotations"
 
-  STATES = %w(pending accepted refused canceled)
+  STATES = %w(draft pending accepted refused canceled)
 
   belongs_to :customer, polymorphic: true
   belongs_to :payment_term
@@ -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/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,6 +2,7 @@ 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,

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/uploaders/dorsale/image_uploader.rb

@@ -1,5 +1,5 @@
 class Dorsale::ImageUploader < ::Dorsale::ApplicationUploader
-  def extension_white_list
+  def extension_whitelist
     %w(jpg jpeg gif png)
   end
 end

data/app/uploaders/dorsale/pdf_uploader.rb

@@ -1,5 +1,5 @@
 class Dorsale::PdfUploader < ::Dorsale::ApplicationUploader
-  def extension_white_list
+  def extension_whitelist
     %w(pdf)
   end
 end

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/customer_vault/people/_form.html.slim

@@ -30,8 +30,16 @@
 
       - if @person.individual?
         = f.input :title
-        = f.association :corporation, collection: policy_scope(Dorsale::CustomerVault::Corporation), input_html: {class: 'select2'}
+        .row.form-group
+          = f.label :corporation, class: "control-label col-sm-3"
+          .col-sm-9
+            div style="display:flex"
+              = f.collection_select :corporation_id, policy_scope(Dorsale::CustomerVault::Corporation), :id, :to_s, {include_blank: true}, {class: "select2", style: "width:100%"}
+              a.btn.btn-success.btn-xs href=new_customer_vault_corporation_path data-modal="nested" style="margin-left:1em;padding-top:5px"
+               = icon(:plus)
+
       = f.input :context, as: :text, input_html: {rows: 4}
+
   .panel.panel-default
     .panel-heading: .panel-title = t("customer_vault.contact_informations")
     .panel-body

data/app/views/dorsale/customer_vault/people/create_corporation_js.html.slim

@@ -0,0 +1,7 @@
+javascript:
+  option = document.createElement("option")
+  option.value = #{@person.id.to_json.html_safe}
+  option.innerHTML = #{@person.to_s.to_json.html_safe}
+  option.selected = true
+  $("select[id$=corporation_id]").append(option)
+  modal.close()

data/config/locales/billing_machine.en.yml

@@ -66,6 +66,7 @@ en:
 
       dorsale/billing_machine/quotation/state:
         all: "All states"
+        draft: Draft
         pending: "Pending"
         accepted: "Accepted"
         refused: "Refused"

data/config/locales/billing_machine.fr.yml

@@ -66,6 +66,7 @@ fr:
 
       dorsale/billing_machine/quotation/state:
         all: "Tous les états"
+        draft: Brouillon
         pending: "En attente"
         accepted: "Accepté"
         refused: "Refusé"

data/features/customer_vault_individuals.feature

@@ -14,7 +14,7 @@ Feature: Manage individuals
     And I validate the new individual
     Then the individual is created
 
-  Scenario: New individual without individual
+  Scenario: New individual errors
     When I create an new individual
     And I fill the address
     And I validate the new individual
@@ -33,3 +33,11 @@ Feature: Manage individuals
     And I remove tags to this individual
     And I submit this individual
     Then tags are removed
+
+  Scenario: Create corporation from individual
+    When I create an new individual
+    And I create corporation from individual
+    And I add his first_name, last_name and email
+    And I validate the new individual
+    Then the individual is created
+    And the new corporation is associated to individual

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_individuals_steps.rb

@@ -65,3 +65,14 @@ end
 When(/^I go on this individual$/) do
   visit dorsale.customer_vault_individual_path(@individual)
 end
+
+When("I create corporation from individual") do
+  find("a[href*=corporation][href$=new]").click
+  fill_in :person_corporation_name, with: "agilidée"
+  find("#modal [type=submit]").click
+end
+
+Then("the new corporation is associated to individual") do
+  expect(@individual.corporation).to be_present
+  expect(@individual.corporation.name).to eq "agilidée"
+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_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/engine.rb

@@ -48,7 +48,7 @@ module Dorsale
       end
     end
 
-    initializer "check_pundit_policies" do
+    config.after_initialize do
       Dorsale::PolicyChecker.check! if Rails.env.test? || Rails.env.development?
     end
 

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.14.5"
+  VERSION = "3.14.10"
 end

data/spec/models/dorsale/billing_machine/quotation_spec.rb

@@ -36,7 +36,7 @@ describe Dorsale::BillingMachine::Quotation do
     end
 
     it "default state should be pending" do
-      expect(described_class.new.state).to eq "pending"
+      expect(described_class.new.state).to eq "draft"
     end
   end
 

data/spec/services/dorsale/billing_machine/quotation/copy_spec.rb

@@ -50,6 +50,6 @@ RSpec.describe Dorsale::BillingMachine::Quotation::Copy do
 
   it "should reset state to pending" do
     expect(quotation.reload.state).to eq "canceled"
-    expect(copy.reload.state).to      eq "pending"
+    expect(copy.reload.state).to      eq "draft"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.14.5
+  version: 3.14.10
 platform: ruby
 authors:
 - agilidée
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -288,6 +288,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '99'
+- !ruby/object:Gem::Dependency
+  name: ttfunk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: combine_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -700,6 +714,7 @@ files:
 - app/views/dorsale/customer_vault/people/_list_item.html.slim
 - app/views/dorsale/customer_vault/people/_show_layout.html.slim
 - app/views/dorsale/customer_vault/people/_show_tabs.html.slim
+- app/views/dorsale/customer_vault/people/create_corporation_js.html.slim
 - app/views/dorsale/customer_vault/people/edit.html.slim
 - app/views/dorsale/customer_vault/people/index.html.slim
 - app/views/dorsale/customer_vault/people/index.xlsx.ruby
@@ -959,7 +974,7 @@ homepage: https://github.com/agilidee/dorsale
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -975,7 +990,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Modular ERP made with Ruby on Rails
 test_files: