dorsale 3.14.8 → 3.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7fa35a5738f83f5a6ffe07e3357dd0d95e06a1e01e882d79e97a0b103cb6358
-  data.tar.gz: fae747e4c22a18ae7efc3e683c014a1513d6cf5c798022f45959b053b0338b00
+  metadata.gz: c02356f6d8c0cf4484b3c5bbf8ae14b4afb5807b79a836c3ac3def7fe4f0d795
+  data.tar.gz: 10e1416b942207884fc2a84665285e6a5ebb9d73fe5d65a69057f89d05ac75fa
 SHA512:
-  metadata.gz: cac3603f69fbda59905d4c191af33ede03c001c537ad0e3c387c95429033838e9ec8a10028b350448e7c5be7f69cd19079b847c962e36c01f45b8c3d3545dfd5
-  data.tar.gz: 95675692f74edd6c555c209857939c84b3628616c2b3cd144a3876c3a264de65c7df972a6daa957ef3d49e6f4efe46f76e23c289c09bd59cd9f57e455792c3a0
+  metadata.gz: ad1c5adb07688951372ec42e57c85f9487c06257827dcf0e712ab3a87794c9c9ac5e6fe6ba09115fe3813e55ceba36b56dc871729e5aead840b3815af4a8b3a8
+  data.tar.gz: 90da6df14ad83c78ea0abe031686ea1f9cbbdb3750005c669c19f89875b7ea77a9fce70c4bfbdc9dd7f28e28f95b954ef85395c8422b86148c9bbeefffeeed1d

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next version
 
+## 3.14.9
+- Create corporation from individual form
+- Quotations: add draft state
+- Fix carrierwave white lists
+
 ## 3.14.8
 - Rails 6
 

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

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/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/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/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.14.8"
+  VERSION = "3.14.9"
 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.8
+  version: 3.14.9
 platform: ruby
 authors:
 - agilidée
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -714,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
@@ -973,7 +974,7 @@ homepage: https://github.com/agilidee/dorsale
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -989,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: