dorsale 3.3.0 → 3.4.0

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

@@ -20,6 +20,8 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
 
   polymorphic_id_for :customer
 
+  mount_uploader :pdf_file, ::Dorsale::PdfUploader
+
   validates :id_card, presence: true
   validates :date,    presence: true
   validates :state,   presence: true, inclusion: {in: proc { STATES } }
@@ -117,9 +119,7 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     end
   end
 
-  def to_pdf
-    ::Dorsale::BillingMachine.quotation_pdf_model.new(self)
-      .tap(&:build)
-      .render_with_attachments
+  def after_attachments_changes
+    Dorsale::BillingMachine::PdfFileGenerator.(self)
   end
 end

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

@@ -1,5 +1,3 @@
-require "dorsale/search"
-
 class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_customer_vault_people"
 

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

@@ -47,31 +47,31 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   end
 
   aasm(column: :state, whiny_transitions: false) do
-    state :new, initial: true
-    state :submited
+    state :draft, initial: true
+    state :submitted
     state :accepted
     state :refused
     state :canceled
 
-    event :go_to_submited do
-      transitions from: :new, to: :submited
+    event :go_to_submitted do
+      transitions from: :draft, to: :submitted
     end
 
     event :go_to_accepted do
-      transitions from: :submited, to: :accepted
+      transitions from: :submitted, to: :accepted
     end
 
     event :go_to_refused do
-      transitions from: :submited, to: :refused
+      transitions from: :submitted, to: :refused
     end
 
     event :go_to_canceled do
-      transitions from: [:new, :submited, :accepted], to: :canceled
+      transitions from: [:draft, :submitted, :accepted], to: :canceled
     end
   end
 
   def may_edit?
-    current_state == :new
+    current_state == :draft
   end
 
 end

data/app/models/dorsale/flyboy/task.rb

@@ -1,6 +1,3 @@
-require "dorsale/search"
-require "dorsale/polymorphic_id"
-
 class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_flyboy_tasks"
 
@@ -8,15 +5,16 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
 
   paginates_per 50
 
-  belongs_to :taskable, polymorphic: true
+  belongs_to :taskable, polymorphic: true, required: false
   belongs_to :owner, polymorphic: true
   has_many :comments, class_name: ::Dorsale::Flyboy::TaskComment, inverse_of: :task, dependent: :destroy
+
   polymorphic_id_for :taskable
   polymorphic_id_for :owner
 
-  scope :delayed,  -> { where(done: false).where("term < ?", Time.zone.now.to_date)    }
-  scope :today,    -> { where(done: false).where("term = ?", Time.zone.now.to_date)    }
-  scope :tomorrow, -> { where(done: false).where("term = ?", Date.tomorrow) }
+  scope :delayed,  -> { where(done: false).where("term < ?", Time.zone.now.to_date) }
+  scope :today,    -> { where(done: false).where("term = ?", Time.zone.now.to_date) }
+  scope :tomorrow, -> { where(done: false).where("term = ?", Date.tomorrow)         }
 
   scope :this_week, -> {
     min = Date.tomorrow
@@ -37,7 +35,6 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
   }
 
 
-  validates :taskable, presence: true
   validates :name,     presence: true
   validates :term,     presence: true
   validates :reminder, presence: true
@@ -46,7 +43,6 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
 
   def validates_reminder_and_term
     if reminder && term && reminder > term
-      # errors.add(:reminder, "La date de relance doit être antérieure ou égale à la date d'échéance")
       errors.add(:reminder, :less_than, count: term)
     end
   end
@@ -58,13 +54,6 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
     assign_default :term,     Time.zone.now.to_date + snooze_default_term
   end
 
-  after_save    :update_taskable_progress!
-  after_destroy :update_taskable_progress!
-
-  def update_taskable_progress!
-    taskable.try(:update_progress!)
-  end
-
   def snooze
     if term_not_passed_yet
       if self.reminder + snooze_default_reminder > Time.zone.now.to_date

data/app/pdfs/concerns/dorsale/alexandrie/prawn/render_with_attachments.rb

@@ -0,0 +1,13 @@
+module Dorsale::Alexandrie::Prawn::RenderWithAttachments
+  def render_with_attachments
+    final_pdf = ::CombinePDF.parse(self.render)
+
+    attachments.each do |attachment|
+      next unless File.extname(attachment.file.path) == ".pdf"
+
+      final_pdf << ::CombinePDF.load(attachment.file.path)
+    end
+
+    final_pdf.to_pdf
+  end
+end

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

@@ -1,9 +1,14 @@
 require "prawn/measurement_extensions"
 
 class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
-  include Dorsale::Alexandrie::Prawn
+  include Dorsale::Alexandrie::Prawn::RenderWithAttachments
   include Dorsale::AllHelpers
   include ActionView::Helpers::NumberHelper
+
+  def attachments
+    @main_document.try(:attachments) || []
+  end
+
   DEBUG = false
 
   GREY       = "808080"

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

@@ -1,22 +1,4 @@
 module Dorsale::BillingMachine::QuotationPdfCommonMethods
-  def build
-    super
-    build_attachments
-  end
-
-  def build_attachments
-    main_document.attachments.each do |attachment|
-      next unless File.extname(attachment.file.path) == ".pdf"
-
-      file     = attachment.file.path
-      nb_pages = ::CombinePDF.load(file).pages.count
-
-      nb_pages.times do |i|
-        start_new_page template: file, template_page: (i+1)
-      end
-    end
-  end
-
   def build_bank_informations
   end
 

data/app/policies/dorsale/expense_gun/expense_policy_helper.rb

@@ -17,7 +17,7 @@ module Dorsale::ExpenseGun::ExpensePolicyHelper
   end
 
   def submit?
-    return false unless expense.may_go_to_submited?
+    return false unless expense.may_go_to_submitted?
     super
   end
 

data/app/policies/dorsale/flyboy/task_policy_helper.rb

@@ -11,18 +11,15 @@ module Dorsale::Flyboy::TaskPolicyHelper
   ]
 
   def create?
-    return false if folder_is_closed?
     return false if cannot_read_taskable?
     super
   end
 
   def update?
-    return false if folder_is_closed?
     super
   end
 
   def delete?
-    return false if folder_is_closed?
     super
   end
 
@@ -38,13 +35,6 @@ module Dorsale::Flyboy::TaskPolicyHelper
 
   private
 
-  def folder_is_closed?
-    return false unless task.is_a?(::Dorsale::Flyboy::Task)
-    return false unless task.taskable.is_a?(::Dorsale::Flyboy::Folder)
-
-    task.taskable.closed?
-  end
-
   def cannot_read_taskable?
     return false unless task.is_a?(::Dorsale::Flyboy::Task)
     return false unless task.taskable.present?

data/app/policies/dorsale/policy_checker.rb

@@ -17,7 +17,6 @@ class Dorsale::PolicyChecker
     check_policy! "Dorsale::CustomerVault::LinkPolicy"
     check_policy! "Dorsale::ExpenseGun::CategoryPolicy"
     check_policy! "Dorsale::ExpenseGun::ExpensePolicy"
-    check_policy! "Dorsale::Flyboy::FolderPolicy"
     check_policy! "Dorsale::Flyboy::TaskPolicy"
     check_policy! "UserPolicy"
 

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

@@ -0,0 +1,37 @@
+class Dorsale::BillingMachine::PdfFileGenerator < Dorsale::Service
+  attr_reader :document
+
+  def initialize(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)
+  end
+
+  def call
+    document.update!(pdf_file: file)
+  end
+
+  private
+
+  def pdf_klass
+    return ::Dorsale::BillingMachine.invoice_pdf_model   if document.is_a?(::Dorsale::BillingMachine::Invoice)
+    return ::Dorsale::BillingMachine.quotation_pdf_model if document.is_a?(::Dorsale::BillingMachine::Quotation)
+  end
+
+  def pdf_data
+    @pdf_data ||= pdf_klass.new(document).tap(&:build).render_with_attachments
+  end
+
+  def file
+    @file ||= StringIO.new(pdf_data)
+  end
+
+  class StringIO < ::StringIO
+    def original_filename
+      @original_filename ||= "#{SecureRandom.uuid}.pdf"
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ class Dorsale::ExpenseGun::Expense::Copy < ::Dorsale::Service
 
     @copy.user       = nil
     @copy.date       = nil
-    @copy.state      = "new"
+    @copy.state      = "draft"
     @copy.created_at = nil
     @copy.updated_at = nil
 

data/app/uploaders/dorsale/pdf_uploader.rb

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

data/app/views/dorsale/billing_machine/invoices/_details.html.slim

@@ -61,7 +61,7 @@
           br
 
         - if document.comments.present?
-          = info document, :comments, text2html(document.comments), separator: " :<br />"
+          = info document, :comments, text2html(document.comments), separator: " :<br />".html_safe
           br
 
 

data/app/views/dorsale/billing_machine/invoices/_list.html.slim

@@ -29,8 +29,7 @@ table.default.invoices
           = invoice.tracking_id
 
         td.customer_name
-          - if invoice.customer
-            = link_to invoice.customer, invoice.customer
+          = link_to_object(invoice.customer)
 
         td.total_excluding_taxes
           = bm_currency invoice.total_excluding_taxes

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

@@ -1,5 +1,5 @@
 pdf = CombinePDF.new
 @invoices_without_pagination.each do |invoice|
-  pdf << CombinePDF.parse(invoice.to_pdf)
+  pdf << CombinePDF.parse(invoice.pdf_file.read)
 end
-pdf.to_pdf
+pdf.to_pdf

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

@@ -6,4 +6,4 @@ filename = [
 
 response.headers["Content-Disposition"] = %(inline; filename="#{filename}")
 
-@invoice.to_pdf
+@invoice.pdf_file.read

data/app/views/dorsale/billing_machine/quotations/_list.html.slim

@@ -32,8 +32,7 @@ table.default.quotations
           = quotation.tracking_id
 
         td.customer_name
-          - if quotation.customer
-            = link_to quotation.customer, quotation.customer
+          = link_to_object(quotation.customer)
 
         td.total_excluding_taxes
           = bm_currency quotation.total_excluding_taxes

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

@@ -6,4 +6,4 @@ filename = [
 
 response.headers["Content-Disposition"] = %(inline; filename="#{filename}")
 
-@quotation.to_pdf
+@quotation.pdf_file.read

data/app/views/dorsale/comments/_comment.html.slim

@@ -14,7 +14,7 @@
   p.infos
     span.commentable-container
       span.commentable
-        = link_to comment.commentable, engine_polymorphic_path(comment.commentable)
+        = link_to_object(comment.commentable)
 
       span.separator
         = " - "

data/app/views/dorsale/customer_vault/links/new.html.slim

@@ -5,7 +5,7 @@
 
     .panel-body
       = horizontal_form_for @link, as: :link, url: customer_vault_link_form_path do |f|
-        = f.association :bob, label: ::Dorsale::CustomerVault::Person.t
+        = f.association :bob, label: ::Dorsale::CustomerVault::Person.t, collection: @people
 
         = f.input :title
         = form_buttons

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

@@ -5,7 +5,7 @@
       = icon :user  if person.individual?
       = " "
       span.name
-        = link_to person.to_s, dorsale.customer_vault_person_path(person)
+        = link_to_object(person)
 
       - if defined?(link)
         span.separator = " / "

data/app/views/dorsale/flyboy/tasks/_form.html.slim

@@ -12,6 +12,9 @@
 
   .panel-body
     = horizontal_form_for @task, as: :task do |f|
+      - if @task.taskable
+        = f.input :taskable, as: :string, input_html: {value: @task.taskable.to_s, disabled: true}
+
       = f.input :name
       = f.input :description
       = f.input :reminder, html5: true

data/app/views/dorsale/flyboy/tasks/_index_actions.html.slim

@@ -1,2 +1,5 @@
+- if policy(model).create?
+  = create_button dorsale.new_flyboy_task_path
+
 - if policy(model).export?
   = export_button url_for(format: :xlsx), download: "#{model.ts}.xlsx"

data/app/views/dorsale/flyboy/tasks/_list.html.slim

@@ -4,17 +4,17 @@ table#tasks-list
       th.task-status
       th.task-snooze
       th.task-progress.hidden-xs
-        = sortable_column Dorsale::Flyboy::Task.t(:progress), column: "progress"
+        = sortable_column Dorsale::Flyboy::Task.t(:progress), :progress
 
       th.task-name
-        = sortable_column Dorsale::Flyboy::Task.t, column: "name"
+        = sortable_column Dorsale::Flyboy::Task.t, :name
 
       - unless nested
         th.taskable-name.hidden-xs
-          = sortable_column Dorsale::Flyboy::Task.t(:taskable), column: "taskable"
+          = sortable_column Dorsale::Flyboy::Task.t(:taskable), :taskable
 
       th.task-term.hidden-xs
-        = sortable_column Dorsale::Flyboy::Task.t(:term),  column: "term"
+        = sortable_column Dorsale::Flyboy::Task.t(:term), :term
 
   tbody
     - tasks.each do |task|
@@ -51,17 +51,11 @@ table#tasks-list
           = progress_bar percentage: task.progress, label: true
 
         td.task-name
-          - if policy(task).read?
-            = link_to task.to_s, dorsale.flyboy_task_path(task)
-          - else
-            = task.to_s
+          = link_to_object(task)
 
         - unless nested
           td.taskable-name.hidden-xs
-            - if policy(task.taskable).read?
-              = link_to task.taskable.to_s, engine_polymorphic_path(task.taskable)
-            - else
-              = task.taskable.to_s
+            = link_to_object(task.taskable)
 
         td.task-term.hidden-xs
           = date(task.term)

data/app/views/dorsale/flyboy/tasks/_summary_list.html.slim

@@ -11,8 +11,7 @@
       - tasks.each do |task|
         tr
           td.taskable
-            a href=engine_polymorphic_path(task.taskable)
-              = task.taskable
+            = link_to_object(task.taskable)
 
           td.name
             - if task.owner.nil?
@@ -20,7 +19,7 @@
             - else
               = icon(:user)
 
-            = link_to task, dorsale.flyboy_task_path(task)
+            = link_to_object(task)
 
           td.date
             .text-muted = date(task.term)