dorsale 3.8.1 → 3.9.0

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

@@ -19,8 +19,8 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
 
   def state
     return "done"      if done
-    return "onalert"   if term          && term          <= Time.zone.now.to_date
-    return "onwarning" if reminder_date && reminder_date <= Time.zone.now.to_date
+    return "onalert"   if term          && term          <= Date.current
+    return "onwarning" if reminder_date && reminder_date <= Date.current
     return "ontime"
   end
 
@@ -29,40 +29,40 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
 
   scope :ontime, -> {
     undone
-      .where("#{table_name}.term IS NULL OR #{table_name}.term > ?", Time.zone.now.to_date)
-      .where("#{table_name}.reminder_date IS NULL OR #{table_name}.reminder_date > ?", Time.zone.now.to_date)
+      .where("#{table_name}.term IS NULL OR #{table_name}.term > ?", Date.current)
+      .where("#{table_name}.reminder_date IS NULL OR #{table_name}.reminder_date > ?", Date.current)
   }
 
   scope :onwarning, -> {
     undone
-      .where("#{table_name}.reminder_date <= ?", Time.zone.now.to_date)
-      .where("#{table_name}.term IS NULL OR #{table_name}.term > ?", Time.zone.now.to_date)
+      .where("#{table_name}.reminder_date <= ?", Date.current)
+      .where("#{table_name}.term IS NULL OR #{table_name}.term > ?", Date.current)
   }
 
   scope :onalert, -> {
     undone
-      .where("#{table_name}.term <= ?", Time.zone.now.to_date)
+      .where("#{table_name}.term <= ?", Date.current)
   }
 
-  scope :delayed,  -> { where(done: false).where("#{table_name}.term < ?", Time.zone.now.to_date) }
-  scope :today,    -> { where(done: false).where("#{table_name}.term = ?", Time.zone.now.to_date) }
-  scope :tomorrow, -> { where(done: false).where("#{table_name}.term = ?", Date.tomorrow)         }
+  scope :delayed,  -> { where(done: false).where("#{table_name}.term < ?", Date.current)  }
+  scope :today,    -> { where(done: false).where("#{table_name}.term = ?", Date.current)  }
+  scope :tomorrow, -> { where(done: false).where("#{table_name}.term = ?", Date.tomorrow) }
 
   scope :this_week, -> {
     min = Date.tomorrow
-    max = Time.zone.now.to_date.end_of_week
+    max = Date.current.end_of_week
     where(done: false).where("#{table_name}.term > ?", min).where("#{table_name}.term <= ?", max)
   }
 
   scope :next_week, -> {
-    min = Time.zone.now.to_date.end_of_week
-    max = Time.zone.now.to_date.next_week.end_of_week
+    min = Date.current.end_of_week
+    max = Date.current.next_week.end_of_week
     where(done: false).where("#{table_name}.term > ?", min).where("#{table_name}.term <= ?", max)
   }
 
   scope :next_next_week, -> {
-    min = Time.zone.now.to_date.next_week.end_of_week
-    max = Time.zone.now.to_date.next_week.next_week.end_of_week
+    min = Date.current.next_week.end_of_week
+    max = Date.current.next_week.next_week.end_of_week
     where(done: false).where("#{table_name}.term > ?", min).where("#{table_name}.term <= ?", max)
   }
 
@@ -77,7 +77,7 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
   def assign_default_values
     assign_default :progress, 0
     assign_default :done,     false
-    assign_default :term,     Time.zone.now.to_date.end_of_week
+    assign_default :term,     Date.current.end_of_week
   end
 
   def snoozer
@@ -112,7 +112,7 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
     end
 
     if reminder_type == "duration" && term && reminder_duration && reminder_unit.in?(REMINDER_UNITS)
-      self.reminder_date = term - eval("#{reminder_duration}.#{reminder_unit}")
+      self.reminder_date = term - reminder_duration.public_send(reminder_unit)
     end
 
     true
@@ -123,5 +123,4 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
       errors.add(:reminder_date, :less_than, count: term)
     end
   end
-
 end

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

@@ -22,7 +22,7 @@ class Dorsale::Flyboy::TaskComment < ::Dorsale::ApplicationRecord
   def update_task_progress
     task.update!(
       :progress => progress,
-      :done     => progress.equal?(100)
+      :done     => progress.equal?(100),
     )
   end
 end

data/app/models/dorsale/users/active.rb

@@ -11,7 +11,7 @@ module Dorsale::Users::Active
       end
 
       def active_for_authentication?
-        super && self.is_active?
+        super && is_active?
       end
 
       def inactive_message

data/app/models/dorsale/users/avatar.rb

@@ -12,7 +12,8 @@ module Dorsale::Users::Avatar
       end
 
       def gravatar_url
-        "https://www.gravatar.com/avatar/" + Digest::MD5.hexdigest(email.to_s) + "?default=mm&size=200"
+        gravatar_id = Digest::MD5.hexdigest(email.to_s)
+        "https://www.gravatar.com/avatar/#{gravatar_id}?default=mm&size=200"
       end
     end
   end

data/app/models/dorsale/users/password_generation.rb

@@ -11,7 +11,6 @@ module Dorsale::Users::PasswordGeneration
       def send_welcome_email
         Dorsale::UserMailer.new_account(self, password).deliver_later
       end
-
     end
   end
 end

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

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

data/app/pdfs/dorsale/application_pdf.rb

@@ -0,0 +1,7 @@
+require "prawn"
+require "prawn/table"
+require "prawn/measurement_extensions"
+
+class Dorsale::ApplicationPdf < Prawn::Document
+  include ::Dorsale::PrawnHelpers
+end

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

@@ -1,36 +1,37 @@
 class Dorsale::BillingMachine::InvoiceMultipleVatPdf < ::Dorsale::BillingMachine::InvoiceSingleVatPdf
+  # rubocop:disable Style/SingleLineMethods, Layout/EmptyLineBetweenDefs
   def first_column_width;  64.mm; end
   def second_column_width; 22.mm; end
   def third_column_width;  20.mm; end
   def fourth_column_width; 20.mm; end
   def fifth_column_width;  29.mm; end
+  # rubocop:enable Style/SingleLineMethods, Layout/EmptyLineBetweenDefs
+
   def last_column_width
     bounds.width - first_column_width - second_column_width - third_column_width - fourth_column_width - fifth_column_width
   end
 
   def build_table
-    left   = bounds.left
-    top    = bounds.top
-    width  = bounds.width - left
+    height = products_table_height
 
-    bounding_box [left, top], width: width, height: products_table_height do
+    # Empty table to draw lines
+    bb height: products_table_height do
       repeat :all do
         float do
-            table [["","","","","",""]],
-                :column_widths => [first_column_width, second_column_width, third_column_width, fourth_column_width, fifth_column_width, last_column_width],
-                :cell_style => {height: products_table_height} do
-                  row(0).style :text_color       => BLACK
-                  row(0).style :font_style       => :bold
-                  column(0).style :align => :left
-                  column(1..4).style :align => :right
-                end
-             end
-          end
-      end
-
-    bounding_box [left, top], width: width, height: products_table_height do
-      draw_bounds_debug
-
+          table [["", "", "", "", "", ""]],
+            :column_widths => [first_column_width, second_column_width, third_column_width, fourth_column_width, fifth_column_width, last_column_width],
+            :cell_style => {height: products_table_height} do
+              row(0).style :text_color => BLACK
+              row(0).style :font_style => :bold
+              column(0).style :align => :left
+              column(1..4).style :align => :right
+            end # table
+        end # float
+      end # repeat
+    end # bb
+
+    # Products table
+    bb height: height do
       table_products = [[
         main_document.t(:designation).mb_chars.upcase.to_s,
         main_document.t(:quantity).mb_chars.upcase.to_s,
@@ -40,38 +41,42 @@ class Dorsale::BillingMachine::InvoiceMultipleVatPdf < ::Dorsale::BillingMachine
         main_document.t(:line_total).mb_chars.upcase.to_s,
       ]]
 
-
       main_document.lines.each do |line|
-        table_products.push [line.label,
-            number(line.quantity).gsub(",00","").gsub(".00",""),
-            line.unit,
-            percentage(line.vat_rate),
-            bm_currency(line.unit_price),
-            bm_currency(line.total),]
+        table_products.push [
+          line.label,
+          number(line.quantity).gsub(",00", "").gsub(".00", ""),
+          line.unit,
+          percentage(line.vat_rate),
+          bm_currency(line.unit_price),
+          bm_currency(line.total),
+        ]
       end
 
-    table table_products,
-      :column_widths => [first_column_width, second_column_width, third_column_width, fourth_column_width, fifth_column_width, last_column_width],
-      :header => true,
-      :cell_style    => {border_width: 0} do
+      table table_products,
+        :column_widths => [
+          first_column_width,
+          second_column_width,
+          third_column_width,
+          fourth_column_width,
+          fifth_column_width,
+          last_column_width,
+        ],
+        :header => true,
+        :cell_style  => {border_width: 0} \
+      do
         row(0).font_style = :bold
-        row(0).border_width = 1,
-        cells.style do |c|
-          c.align = c.column == 0 ? :left : :right
-        end
-      end
-    end
-  end
+        row(0).border_width =
+          1,
+          cells.style { |c| c.align = c.column.zero? ? :left : :right }
+      end # table
+    end # bb
+  end # build_table
 
   def build_total
-    left   = bounds.left
     top    = bounds.top - products_table_height - 5.mm
-    width  = bounds.width - left
-    height = middle_height - products_table_height
-
-    bounding_box [left, top], width: width, height: height do
-      draw_bounds_debug
+    height = middle_height - products_table_height - 5.mm
 
+    bb top: top, height: height do
       table_totals = [[]]
 
       if has_discount
@@ -109,10 +114,10 @@ class Dorsale::BillingMachine::InvoiceMultipleVatPdf < ::Dorsale::BillingMachine
       end
 
       table table_totals,
-        :column_widths => [fifth_column_width , last_column_width],
-        :cell_style    => {border_width: [0, 1, 0 ,0]},
+        :column_widths => [fifth_column_width, last_column_width],
+        :cell_style    => {border_width: [0, 1, 0, 0]},
         :position      => :right do
-          row(-1).style :font_style       => :bold
+          row(-1).style :font_style => :bold
           column(0).padding_right = 0.2.cm
           row(-1).borders = [:top, :right]
           row(-1).border_width = 1
@@ -120,10 +125,10 @@ class Dorsale::BillingMachine::InvoiceMultipleVatPdf < ::Dorsale::BillingMachine
             c.align = :right
           end
         end
+
       stroke do
         rectangle [(bounds.right - fifth_column_width - last_column_width), bounds.top], (fifth_column_width + last_column_width), (bounds.top-cursor)
       end
     end
   end
-
 end

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

@@ -1,9 +1,5 @@
-require "prawn/measurement_extensions"
-
-class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
+class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
   include Dorsale::Alexandrie::Prawn::RenderWithAttachments
-  include Dorsale::AllHelpers
-  include ActionView::Helpers::NumberHelper
 
   def attachments
     @main_document.try(:attachments) || []
@@ -11,40 +7,33 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
 
   DEBUG = false
 
+  BLACK      = "000000"
+  WHITE      = "FFFFFF"
   GREY       = "808080"
   LIGHT_GREY = "C0C0C0"
-  WHITE      = "FFFFFF"
-  BLACK      = "000000"
-  BLUE       = "005F9E"
 
   def bm_currency(n)
     currency(n, Dorsale::BillingMachine.default_currency)
   end
 
-  def has_advance
-    main_document.try(:advance) && main_document.advance != 0.0
-  end
-
-  def has_discount
-    main_document.try(:commercial_discount) && main_document.commercial_discount != 0.0
-  end
-
   attr_reader :main_document
 
   def initialize(main_document)
-    super(page_size: 'A4', margin: 1.cm)
-    setup
+    super(page_size: "A4", margin: 1.cm)
     @main_document = main_document
-    @id_card       = main_document.id_card
+    setup
   end
 
+  # rubocop:disable Style/SingleLineMethods, Layout/EmptyLineBetweenDefs
   def header_height;         90.mm; end
   def logo_height;           32.mm; end
   def logo_width;            50.mm; end
+  def contact_infos_height;  30.mm; end
 
-  def footer_height;         40.mm; end
-  def footer_top_height;     15.mm; end
-  def footer_bottom_height;  15.mm; end
+  def footer_height;           40.mm; end
+  def footer_top_height;       15.mm; end
+  def footer_bottom_height;    15.mm; end
+  def footer_pagination_height; 5.mm; end
 
   def middle_height;         14.cm; end
   def products_table_height; 90.mm; end
@@ -53,6 +42,8 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
   def second_column_width; 2.4.cm; end
   def third_column_width;  2.5.cm; end
   def fourth_column_width; 2.9.cm; end
+  # rubocop:enable Style/SingleLineMethods, Layout/EmptyLineBetweenDefs
+
   def last_column_width
     bounds.width - first_column_width - second_column_width - third_column_width - fourth_column_width
   end
@@ -69,11 +60,11 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
 
   def setup
     font_root = ::Dorsale::Engine.root.join("app/assets/fonts")
-    font_families.update(
+    font_families.update( # rubocop:disable Rails/SaveBang
       "BryantPro" => {
         normal: "#{font_root}/BryantPro-Regular.ttf",
         bold:   "#{font_root}/BryantPro-Bold.ttf",
-      }
+      },
     )
 
     font("BryantPro")
@@ -81,11 +72,10 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
   end
 
   def build_header
-    bounding_box [0, bounds.top], width: bounds.width, height: header_height do
-      draw_bounds_debug
+    bb height: header_height do
       build_title
       build_logo
-      build_contact
+      build_contact_infos
       build_subject
       build_customer
     end
@@ -93,75 +83,47 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
 
   def build_title
     top    = bounds.top - 1.5.cm
-    left   = bounds.left
-    width  = bounds.width
     height = 1.cm
-    bounding_box [left, top], width: width, height: height do
-      draw_bounds_debug
-      text "<b>#{main_document.t} n° #{main_document.tracking_id}</b>", inline_format: true, size: 20, align: :center
+
+    title = "<b>#{main_document.t} n° #{main_document.tracking_id}</b>"
+
+    bb top: top, height: height do
+      tb title, size: 20, align: :center
     end
   end
 
   def logo_path
-    main_document.id_card.logo.path
-  rescue NoMethodError
-    nil
   end
 
   def build_logo
-    return if logo_path.nil?
-
     height = logo_height
     width  = logo_width
 
-    bounding_box [bounds.left, bounds.top], width: width, height: height do
-      draw_bounds_debug
-      image logo_path, fit: [width, height]
+    bb width: width, height: height do
+      image logo_path, fit: [width, height] if logo_path
     end
   end
 
-  def contact_address_line
-    [
-      @id_card.address1,
-      @id_card.address2,
-      @id_card.zip,
-      @id_card.city,
-    ].select(&:present?).join(", ")
+  def contact_infos_content
+    placeholder __method__
   end
 
-  def contact_content
-    content = []
-    content << "<b>#{@id_card.entity_name}</b>"                                           if @id_card.entity_name.present?
-    content << "<b>#{contact_address_line}</b>"                                           if contact_address_line.present?
-    content << " "
-    content << "<b>#{main_document.t(:your_contact)} : #{@id_card.contact_full_name}</b>" if @id_card.contact_full_name.present?
-    content << "<b>#{main_document.t(:contact_phone)} : </b> #{@id_card.contact_phone}"   if @id_card.contact_phone.present?
-    content << "<b>#{main_document.t(:contact_fax)} : </b> #{@id_card.contact_fax}"       if @id_card.contact_fax.present?
-    content << "<b>#{main_document.t(:contact_email)} : </b> #{@id_card.contact_email}"   if @id_card.contact_email.present?
-    content.join("\n")
-  end
-
-  def build_contact
+  def build_contact_infos
     top    = bounds.top - 4.cm
-    left   = bounds.left
     width  = bounds.width / 2 - 1.1.cm
-    height = 2.5.cm
+    height = contact_infos_height
 
-    bounding_box [left, top], width: width, height: height do
-      draw_bounds_debug
-      text contact_content, inline_format: true, size: 8
+    bb top: top, width: width, height: height do
+      tb contact_infos_content.to_s, size: 9
     end
   end
 
   def build_subject
     top    = bounds.top - 7.5.cm
-    left   = bounds.left
     width  = bounds.width / 2 - 1.1.cm
     height = 15.mm
 
-    bounding_box [left, top], width: width, height: height do
-      draw_bounds_debug
-
+    bb top: top, width: width, height: height do
       if main_document.label.present?
         text "<b>#{main_document.t(:label)} : </b> #{main_document.label}", inline_format: true
       end
@@ -184,7 +146,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
     content << main_document.customer.address.country
 
     if main_document.customer.try(:european_union_vat_number).present?
-      content << main_document.customer.t(:european_union_vat_number)
+      content << main_document.customer.t(:european_union_vat_number) + " : "
       content << main_document.customer.european_union_vat_number
     end
 
@@ -192,53 +154,44 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
   end
 
   def build_customer
-    top    = bounds.top - 4.cm
-    left   = bounds.width / 2 + 1.1.cm
-    width  = bounds.width / 2 - 1.1.cm
-    height = 4.5.cm
+    top     = bounds.top - 4.cm
+    left    = bounds.width / 2 + 1.1.cm
+    width   = bounds.width / 2 - 1.1.cm
+    height  = 4.5.cm
     padding = 3.mm
 
-    bounding_box [left, top], width: width, height: height do
-      draw_bounds_debug
-      stroke do
-        fill_color LIGHT_GREY
-        fill_rounded_rectangle [cursor-bounds.height,cursor], bounds.width, bounds.height, 0
-        fill_color BLACK
-      end
-
-      bounding_box [bounds.left + padding, bounds.top - padding], height: bounds.height - padding, width: bounds.width - padding do
-        text customer_content
-      end
+    bb top: top, left: left, height: height, width: width, padding: padding, background: LIGHT_GREY do
+      tb customer_content.to_s
     end
   end # def build_customer
 
   def build_middle
-    left   = bounds.left
     top    = bounds.top - header_height
-    width  = bounds.width - left
     height = middle_height
 
-    bounding_box [left, top], width: width, height: height do
+    bb top: top, height: height do
       build_table
       build_total
-      build_payment_conditions
-      build_bank_informations
-      build_expiry
-      build_comments
+      build_document_infos
     end
   end
 
+  def has_advance
+    main_document.try(:advance) && main_document.advance != 0.0
+  end
+
+  def has_discount
+    main_document.try(:commercial_discount) && main_document.commercial_discount != 0.0
+  end
+
   def build_table
-    left   = bounds.left
-    top    = bounds.top
-    width  = bounds.width - left
     height = products_table_height
 
     # Empty table to draw lines
-    bounding_box [left, top], width: width, height: height do
+    bb height: products_table_height do
       repeat :all do
         float do
-          table [["","","","",""]],
+          table [["", "", "", "", ""]],
             :column_widths => [
               first_column_width,
               second_column_width,
@@ -255,12 +208,10 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
           end # table
         end # float
       end # repeat all
-    end # bounding_box
-
-    # products table
-    bounding_box [left, top], width: width, height: height do
-      draw_bounds_debug
+    end # bb
 
+    # Products table
+    bb height: height do
       table_products = [[
         main_document.t(:designation).mb_chars.upcase.to_s,
         main_document.t(:quantity).mb_chars.upcase.to_s,
@@ -272,7 +223,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
       main_document.lines.each do |line|
         table_products.push [
           line.label,
-          number(line.quantity).gsub(",00","").gsub(".00",""),
+          number(line.quantity).gsub(",00", "").gsub(".00", ""),
           line.unit,
           bm_currency(line.unit_price),
           bm_currency(line.total),
@@ -291,21 +242,18 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
         :cell_style => {border_width: 0} \
       do
         row(0).font_style = :bold
-        row(0).border_width = 1,
-        cells.style { |c| c.align = c.column == 0 ? :left : :right }
+        row(0).border_width =
+          1,
+          cells.style { |c| c.align = c.column.zero? ? :left : :right }
       end # table
-    end # bounding_box
+    end # bb
   end # build_table
 
   def build_total
-    left   = bounds.left
     top    = bounds.top - products_table_height - 5.mm
-    width  = bounds.width - left
-    height = middle_height - products_table_height
-
-    bounding_box [left, top], width: width, height: height do
-      draw_bounds_debug
+    height = middle_height - products_table_height - 5.mm
 
+    bb top: top, height: height do
       table_totals = [[]]
 
       if has_discount
@@ -322,7 +270,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
 
       vat_rate = number(main_document.vat_rate)
       table_totals.push [
-        "#{main_document.t(:vat).mb_chars.upcase.to_s} #{percentage vat_rate}",
+        "#{main_document.t(:vat).mb_chars.upcase} #{percentage vat_rate}",
         bm_currency(main_document.vat_amount),
       ]
 
@@ -345,9 +293,9 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
 
       table table_totals,
         :column_widths => [fourth_column_width, last_column_width],
-        :cell_style    => {border_width: [0, 1, 0 ,0]},
+        :cell_style    => {border_width: [0, 1, 0, 0]},
         :position      => :right do
-          row(-1).style :font_style       => :bold
+          row(-1).style :font_style => :bold
           column(0).padding_right = 0.2.cm
           row(-1).borders = [:top, :right]
           row(-1).border_width = 1
@@ -355,140 +303,81 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Prawn::Document
             c.align = :right
           end
         end
+
       stroke do
         rectangle [(bounds.right - fourth_column_width - last_column_width), bounds.top], (fourth_column_width + last_column_width), (bounds.top-cursor)
       end
     end
   end
 
-  def build_comments
-    return if main_document.comments.blank?
-
-    top    = bounds.top - products_table_height - 35.mm
-    height = top - bounds.bottom
-    width  = 10.cm
-
-    text_box main_document.comments,
-      :at       => [bounds.left, top],
-      :height   => height,
-      :width    => width,
-      :overflow => :shrink_to_fit,
-      :size     => 9
-  end
-
-  def build_payment_conditions
-    return if main_document.payment_term.blank?
+  def document_infos_content
+    txt = []
 
-    top    = bounds.top - products_table_height - 5.mm
-    height = 15.mm
-    width  = 7.5.cm
+    if main_document.try(:payment_term).present?
+      txt << "<b>#{main_document.t :payment_term}</b> : #{main_document.payment_term}"
+    end
 
-    txt = "<b>#{main_document.t(:payment_terms)}</b> : #{main_document.payment_term}"
+    if main_document.try(:expires_at).present?
+      txt << "<b>#{main_document.t :expires_at}</b> : #{date main_document.expires_at}"
+    end
 
-    text_box txt,
-      :at            => [bounds.left, top],
-      :height        => height,
-      :width         => width,
-      :overflow      => :shrink_to_fit,
-      :inline_format => true,
-      :size          => 9
-  end
+    txt << main_document.comments
 
-  def build_expiry
+    txt.select(&:present?).join("\n\n")
   end
 
-  def build_bank_informations
-    top = bounds.top - products_table_height - 20.mm
-    height = 1.cm
-    width  = 7.5.cm
+  def build_document_infos
+    top    = bounds.top - products_table_height - 5.mm
+    height = middle_height - products_table_height - 5.mm
+    width  = 10.cm
 
-    bounding_box [bounds.left, top], height: height, width: width do
-      draw_bounds_debug
-      font_size 9 do
-        text "#{main_document.t(:iban)} : #{@id_card.iban}"           if @id_card.iban.present?
-        text "#{main_document.t(:bic_swift)} : #{@id_card.bic_swift}" if @id_card.bic_swift.present?
-      end
-    end
+    btb document_infos_content, top: top, height: height, width: width
   end
 
   def build_footer
-    top = bounds.bottom + footer_height
+    top    = bounds.bottom + footer_height
+    height = footer_height
 
-    bounding_box [0, top], width: bounds.width, height: footer_height do
-      draw_bounds_debug
+    bb top: top, height: height do
       build_footer_top
       build_footer_line
       build_footer_bottom
     end
   end
 
+  # TODO
   def footer_top_content
-    @id_card.custom_info_1.to_s
+    placeholder __method__
   end
 
   def build_footer_top
-    top    = bounds.top
-    height = footer_top_height
-    width  = bounds.width
-
-    text_box footer_top_content,
-      :at       => [bounds.left, top],
-      :height   => height,
-      :width    => width,
-      :overflow => :shrink_to_fit,
-      :size          => 9
+    btb footer_top_content, height: footer_top_height, size: 9
   end
 
   def build_footer_line
-    # Center line between the two footer parts
-    n = footer_top_height + (footer_height - footer_top_height - footer_bottom_height) / 2
-    move_down n
+    top = bounds.top - footer_top_height - (footer_height - footer_top_height - footer_bottom_height - footer_pagination_height) / 2
     stroke do
-      horizontal_rule
-      line_width 1
+      horizontal_line bounds.left, bounds.right, at: top
     end
   end
 
   def footer_bottom_content
-    infos_text = []
-    infos_text << @id_card.entity_name                                                                                if @id_card.entity_name.present?
-    infos_text << "#{main_document.t(:info_phone)} : #{@id_card.contact_phone}"                                       if @id_card.contact_phone.present?
-    infos_text << "#{main_document.t(:info_fax)} : #{@id_card.contact_fax}"                                           if @id_card.contact_fax.present?
-    infos_text << "#{@id_card.contact_email}"                                                                         if @id_card.contact_email.present?
-    infos_text << "#{@id_card.legal_form.to_s}"                                                                       if @id_card.legal_form.present?
-    infos_text << "#{main_document.t(:capital)} : #{bm_currency @id_card.capital}"                                          if @id_card.capital.present?
-    infos_text << "#{main_document.t(:registration)} : #{@id_card.registration_city} #{@id_card.registration_number}" if @id_card.registration_number.present?
-    infos_text << "#{main_document.t(:siret)} : #{@id_card.siret}"                                                    if @id_card.siret.present?
-    infos_text << "#{main_document.t(:intracommunity_vat)} : #{@id_card.intracommunity_vat}"                          if @id_card.intracommunity_vat.present?
-    infos_text = infos_text.join(" - ")
+    placeholder __method__
   end
 
   def build_footer_bottom
     height = footer_bottom_height
-    top    = bounds.bottom + height
-    width  = bounds.width
-
-    text_box footer_bottom_content,
-      :at       => [bounds.left, top],
-      :height   => height,
-      :width    => width,
-      :overflow => :shrink_to_fit,
-      :size     => 9
+    top    = bounds.bottom + height + footer_pagination_height
+
+    btb footer_bottom_content, top: top, height: height, size: 9
   end
 
   def build_page_numbers
-    height = 5.mm
+    height = footer_pagination_height
     top    = bounds.bottom + height
-    width  = bounds.width
 
-    bounding_box [0, top], height: height, width: bounds.width do
-      float do
-        number_pages "page <page>/<total>", align: :right, size: 9
-      end
+    bb top: top, height: height do
+      number_pages "page <page>/<total>", align: :right, size: 9
     end
   end
-
-  def draw_bounds_debug
-    transparent(0.5) { stroke_bounds } if DEBUG
-  end
 end