dorsale 3.9.3 → 3.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2920c20a5fcc0b5057396ace7326452b10413142
-  data.tar.gz: 3b6318a593083ae63a1c4ad7e6b4ff19ca66beef
+  metadata.gz: 6d1981d085335b6deff47728894401a10ce26a57
+  data.tar.gz: 1056f1dcb748bf45f8a68983835e4de0e054872e
 SHA512:
-  metadata.gz: 7930f9d2cd19663154dd4b326d2216870d890a3fdf69251a337d1776b1963b925c8081078d062105b67e3be9b35a43d5ad1a63a44c44e6dd7164d1ac27df9149
-  data.tar.gz: 1c23b59eec27a27fa88934e35586c0617236077ad83ce16097ce0036d495be15ea97c99149d1fc343d4671201e118c47195e7c44db497723e1e0ddfb0864dc79
+  metadata.gz: 96ca04594a0ca7d63dcfb37e834d2c52427376396d6dcf94e30e139799d2fc22d9d3d5a7c87a51bc7ab5d3b66c1f67a424e689cde5e87c165678b341c5c49b0d
+  data.tar.gz: 977c3a58712d7b26ee69f1a81cc72aa32705515d380693f2f3e3d201b440dd165caafa1c35cda0075ee36720f91b60c81bee387b6327ec72b9318b73fa1df486

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Next version
 
+## 3.9.4
+
+- BillingMachine : add invoice/quotation preview
+- BillingMachine : add quotation email + refactor email service
+- Various small fixes
+
 ## 3.9.3
 
 - BillingMachine : Fix payment status filter

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

@@ -13,4 +13,18 @@ class Dorsale::BillingMachine::ApplicationController < ::Dorsale::ApplicationCon
     @payment_terms ||= policy_scope(::Dorsale::BillingMachine::PaymentTerm)
     @people        ||= policy_scope(::Dorsale::CustomerVault::Person)
   end
+
+  def email_permitted_params
+    [
+      :to,
+      :subject,
+      :body,
+    ]
+  end
+
+  def email_params
+    params.fetch(:email, {})
+      .permit(email_permitted_params)
+      .merge(current_user: current_user)
+  end
 end

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

@@ -86,6 +86,16 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
     end
   end
 
+  def preview
+    authorize model, :preview?
+
+    @invoice ||= scope.new(invoice_params_for_preview)
+    @invoice.update_totals
+    Dorsale::BillingMachine::PdfFileGenerator.(@invoice)
+
+    render :show, formats: :pdf
+  end
+
   def pay
     # callback in BillingMachine::ApplicationController
     authorize @invoice, :update?
@@ -102,21 +112,11 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
   def email
     authorize @invoice, :email?
 
-    default_subject = "#{model.t} #{@invoice.tracking_id} : #{@invoice.label}"
-    default_body    = t("emails.invoices.send_invoice_to_customer",
-      :from => current_user.to_s,
-      :to   => @invoice.customer.to_s,
-    )
-
-    @subject = params.dig(:email, :subject) || default_subject
-    @body    = params.dig(:email, :body)    || default_body
+    @email = Dorsale::BillingMachine::Email.new(@invoice, email_params)
 
     return if request.get?
 
-    email = ::Dorsale::BillingMachine::InvoiceMailer
-      .send_invoice_to_customer(@invoice, @subject, @body, current_user)
-
-    if email.deliver_later
+    if @email.save
       flash[:notice] = t("messages.invoices.email_ok")
       redirect_to back_url
     else
@@ -178,4 +178,8 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
   def invoice_params_for_update
     invoice_params
   end
+
+  def invoice_params_for_preview
+    invoice_params
+  end
 end

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

@@ -6,6 +6,7 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
     :destroy,
     :copy,
     :create_invoice,
+    :email,
   ]
 
   def index
@@ -88,6 +89,16 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
     redirect_to url_for(action: :index, id: nil)
   end
 
+  def preview
+    authorize model, :preview?
+
+    @quotation ||= scope.new(quotation_params_for_preview)
+    @quotation.update_totals
+    Dorsale::BillingMachine::PdfFileGenerator.(@quotation)
+
+    render :show, formats: :pdf
+  end
+
   def copy
     authorize @quotation, :copy?
 
@@ -100,14 +111,29 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
   end
 
   def create_invoice
-    authorize @quotation, :read?
-    authorize ::Dorsale::BillingMachine::Invoice, :create?
+    authorize @quotation, :create_invoice?
 
     @invoice = Dorsale::BillingMachine::Quotation::ToInvoice.(@quotation)
 
     render "dorsale/billing_machine/invoices/new"
   end
 
+  def email
+    authorize @quotation, :email?
+
+    @email = Dorsale::BillingMachine::Email.new(@quotation, email_params)
+
+    return if request.get?
+
+    if @email.save
+      flash[:notice] = t("messages.quotations.email_ok")
+      redirect_to back_url
+    else
+      flash.now[:alert] = t("messages.quotations.email_error")
+      render
+    end
+  end
+
   private
 
   def model
@@ -160,4 +186,8 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
   def quotation_params_for_update
     quotation_params
   end
+
+  def quotation_params_for_preview
+    quotation_params
+  end
 end

data/app/{commands/dorsale/flyboy/task_commands.rb → crons/dorsale/flyboy/task_crons.rb}

@@ -1,4 +1,4 @@
-module Dorsale::Flyboy::TaskCommands
+module Dorsale::Flyboy::TaskCrons
   def self.send_daily_term_emails!
     ::Dorsale::Flyboy::Task.all.each do |task|
       next if task.done?

data/app/mailers/dorsale/generic_mailer.rb

@@ -0,0 +1,9 @@
+class Dorsale::GenericMailer < Dorsale::ApplicationMailer
+  def generic_email(data)
+    data.delete(:attachments).each do |filename, content|
+      attachments[filename] = content
+    end
+
+    mail(data)
+  end
+end

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

@@ -0,0 +1,33 @@
+class Dorsale::BillingMachine::Email < Dorsale::Email
+  attr_accessor :document
+
+  def initialize(document, attributes = {})
+    @document = document
+    super(attributes)
+  end
+
+  private
+
+  def model
+    document.class
+  end
+
+  def default_to
+    "#{document.customer} <#{document.customer.email}>" if document.customer
+  end
+
+  def default_subject
+    "#{model.t} #{document.tracking_id} : #{document.label}"
+  end
+
+  def default_body
+    I18n.t("billing_machine.emails.#{document.document_type}.body",
+      :from => current_user.to_s,
+      :to   => document.customer.to_s,
+    )
+  end
+
+  def default_attachments
+    {"#{document.t}_#{document.tracking_id}.pdf" => document.pdf_file.read}
+  end
+end

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

@@ -18,6 +18,10 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     order(unique_index: :desc)
   }
 
+  def document_type
+    :invoice
+  end
+
   before_create :assign_unique_index
   before_create :assign_tracking_id
 
@@ -50,6 +54,9 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
 
   def update_totals
     assign_default_values
+    lines.each(&:update_total)
+    apply_vat_rate_to_lines
+
     lines_sum = lines.map(&:total).sum
 
     self.total_excluding_taxes = lines_sum - commercial_discount
@@ -89,8 +96,6 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
 
   attr_writer :vat_rate
 
-  before_validation :apply_vat_rate_to_lines
-
   def apply_vat_rate_to_lines
     return if ::Dorsale::BillingMachine.vat_mode == :multiple
 

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

@@ -29,6 +29,10 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     order(unique_index: :desc)
   }
 
+  def document_type
+    :quotation
+  end
+
   before_create :assign_unique_index
   before_create :assign_tracking_id
 
@@ -55,6 +59,9 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
 
   def update_totals
     assign_default_values
+    lines.each(&:update_total)
+    apply_vat_rate_to_lines
+
     lines_sum = lines.map(&:total).sum
 
     self.total_excluding_taxes = lines_sum - commercial_discount
@@ -103,8 +110,6 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
 
   attr_writer :vat_rate
 
-  before_validation :apply_vat_rate_to_lines
-
   def apply_vat_rate_to_lines
     return if ::Dorsale::BillingMachine.vat_mode == :multiple
 

data/app/models/dorsale/email.rb

@@ -0,0 +1,80 @@
+class Dorsale::Email
+  include ActiveModel::Model
+  include Agilibox::ModelToS
+  include Agilibox::ModelI18n
+
+  validates :to,      presence: true
+  validates :subject, presence: true
+  validates :body,    presence: true
+
+  attr_accessor(
+    :current_user,
+    :from,
+    :to,
+    :cc,
+    :subject,
+    :body,
+    :attachments,
+  )
+
+  def initialize(*)
+    super
+    assign_default_values
+  end
+
+  def attachment_names
+    attachments.keys.join(", ")
+  end
+
+  def save
+    valid? && deliver_now
+  end
+
+  private
+
+  def data
+    # Real email :from is mailer default
+    # The :from of this class is used as reply_to
+    {
+      :reply_to    => from,
+      :to          => to,
+      :cc          => cc,
+      :subject     => subject,
+      :body        => body,
+      :attachments => attachments,
+    }
+  end
+
+  def deliver_now
+    Dorsale::GenericMailer.generic_email(data).deliver_now
+  end
+
+  def default_from
+    "#{current_user} <#{current_user.email}>" if current_user
+  end
+
+  def assign_default_values
+    self.from        ||= default_from
+    self.to          ||= default_to
+    self.cc          ||= default_cc
+    self.subject     ||= default_subject
+    self.body        ||= default_body
+    self.attachments ||= default_attachments
+  end
+
+  def default_to
+  end
+
+  def default_cc
+  end
+
+  def default_subject
+  end
+
+  def default_body
+  end
+
+  def default_attachments
+    {}
+  end
+end

data/app/policies/dorsale/billing_machine/invoice_policy_helper.rb

@@ -5,13 +5,9 @@ module Dorsale::BillingMachine::InvoicePolicyHelper
     :create?,
     :read?,
     :update?,
+    :preview?,
     :download?,
     :copy?,
     :email?,
   ]
-
-  def email?
-    return false if invoice.customer.try(:email).nil?
-    super
-  end
 end

data/app/policies/dorsale/billing_machine/quotation_policy_helper.rb

@@ -6,6 +6,9 @@ module Dorsale::BillingMachine::QuotationPolicyHelper
     :update?,
     :delete?,
     :download?,
+    :preview?,
     :copy?,
+    :email?,
+    :create_invoice?,
   ]
 end

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

@@ -2,16 +2,20 @@ class Dorsale::BillingMachine::PdfFileGenerator < Dorsale::Service
   attr_reader :document
 
   def initialize(document)
+    @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)
+    @document = document.class.find(document.id) if document.persisted?
   end
 
   def call
-    document.update!(pdf_file: file)
+    document.pdf_file = file
+    document.save! if document.persisted?
+    document
   end
 
   private

data/app/views/dorsale/_actions.html.slim

@@ -5,4 +5,4 @@
   = update_button(edit_url)
 
 - if delete_url && policy(obj).delete? && request.path == edit_url
-  = delete_button(url)
+  = delete_button(delete_url)

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

@@ -0,0 +1,121 @@
+- vat_mode = ::Dorsale::BillingMachine.vat_mode
+
+#billing_machine-show
+  .row
+    .col-md-6
+      .well
+        = info document, :label
+        = info document, :date
+
+    .col-md-6
+      .well
+        - if document.customer.present?
+          = document.customer
+          br
+
+          - if document.customer.address.street.present?
+            = document.customer.address.street
+            br
+
+          - if document.customer.address.street_bis.present?
+            = document.customer.address.street_bis
+            br
+
+          - if document.customer.address.zip.present? || document.customer.address.city.present?
+            = document.customer.address.zip
+            = " "
+            = document.customer.address.city
+
+          - if document.customer.address.country.present?
+            = document.customer.address.country
+
+  table#lines-table
+    thead
+      tr
+        th.line-label      = Dorsale::BillingMachine::InvoiceLine.t(:label)
+        th.line-quantity   = Dorsale::BillingMachine::InvoiceLine.t(:quantity)
+        th.line-unit       = Dorsale::BillingMachine::InvoiceLine.t(:unit)
+        - if vat_mode == :multiple
+          th.line-vat_rate   = Dorsale::BillingMachine::InvoiceLine.t(:vat_rate)
+        th.line-unit_price   = Dorsale::BillingMachine::InvoiceLine.t(:unit_price)
+        th.line-total        = Dorsale::BillingMachine::InvoiceLine.t(:total)
+
+    tbody
+      - document.lines.each do |line|
+        = render "dorsale/billing_machine/commons/line_details", line: line
+
+  .row
+    .col-sm-6
+      .well
+        = info document, :payment_term
+        br
+
+        - if document.document_type == :invoice
+          = info document, :due_date
+
+        - if document.document_type == :quotation
+
+          = info document, :expires_at
+          br
+
+        - if document.comments.present?
+          = info document, :comments, text2html(document.comments), separator: " :<br />".html_safe
+          br
+
+
+    .col-sm-6
+        table#totals-table
+          tbody
+            - if document.commercial_discount.nonzero?
+              tr
+                th.commercial_discount-label
+                  = document.class.t(:commercial_discount)
+
+                td.commercial_discount
+                  = " - #{bm_currency document.commercial_discount}"
+
+
+            tr
+              th.total_excluding_taxes-label
+                = document.class.t(:total_excluding_taxes)
+
+              td.total_excluding_taxes
+                = bm_currency document.total_excluding_taxes
+
+            - if vat_mode == :single
+              tr
+                th.vat_rate-label
+                  = document.class.t(:vat_rate)
+
+                td.vat_rate
+                  = percentage document.vat_rate
+
+            tr
+              th.vat_amount-label
+                = document.class.t(:vat_amount)
+
+              td.vat_amount
+                = bm_currency document.vat_amount
+
+            tr
+              th.total_including_taxes-label
+                = document.class.t(:total_including_taxes)
+
+              td.total_including_taxes
+                = bm_currency document.total_including_taxes
+
+            - if document.respond_to?(:advance)
+              - document.advance.present?
+                tr
+                  th.advance-label
+                    = document.class.t(:advance)
+
+                  td.advance
+                    = bm_currency document.advance
+
+              tr
+                th.balance-label
+                  = document.class.t(:balance)
+
+                td.balance
+                  = bm_currency document.balance