dorsale 3.15.0 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bd710629c9ecaa72a71a0df0645d38fae72cc1a0f5203a0e4c5ddfd8c966f24
-  data.tar.gz: 726555caa581d9251e2d40388414b974f5d1570fa5463be6ee28bd17c9a26b80
+  metadata.gz: 8c07aa163d58442697fc7cbbd50008cff4128218f6c28a567ec693fa028112a8
+  data.tar.gz: 137b46a639e3e82c637e001e6bcdf06e307f357fd07c4bc69fbcce69e7600bf5
 SHA512:
-  metadata.gz: e8d08edee46c29a4f80adbc0f371d70c532f9e06325141837ff94bd19c9d116ae7e7f41fa077ae6ce94305ab45362502f3d459c2a703563c5b72fbead3bc47ae
-  data.tar.gz: d41ad18d76e122b20249254ec2df1e79d016411cf3ca11060396cc859026d15f4a7a893e089e4dac32eb624aba83dcbf4bac7a1a1581f996da14306740352f7d
+  metadata.gz: 3cc2d98f933b68bb02d421f3f8ba132fa70d54c910292db9539b3c7e2bd8027692cf4d8e30ba333a0abfe6825bd34fee362a0f5d699c91a542ff7fcf0dac59ce
+  data.tar.gz: 00cc8a3a2a6ac15cdd523871ed2b8ea3ffeb7832006c6b643fe3e0c801aa17579de20e22d525f36a273bcf93fcb13142f0257bda5dcef56b0b5758e40bdccf04

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 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

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

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.15.0"
+  VERSION = "3.16.0"
 end

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.15.0
+  version: 3.16.0
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -468,7 +468,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
@@ -835,6 +834,7 @@ 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
 - features/access.feature
 - features/billing_machine_invoices.feature
 - features/billing_machine_multiple_vat.feature

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)}});