dorsale 3.8.1 → 3.9.0

data/app/pdfs/dorsale/prawn_helpers.rb

@@ -0,0 +1,107 @@
+require "prawn"
+require "prawn/measurement_extensions"
+
+module Dorsale::PrawnHelpers
+  include Dorsale::AllHelpers
+  include ActionView::Helpers::NumberHelper
+
+  def draw_debug_bounds?
+    false
+  end
+
+  def draw_debug_bounds!
+    transparent(0.5) { stroke_bounds } if draw_debug_bounds?
+  end
+
+  def t(*args)
+    I18n.t(*args)
+  end
+
+  def page_height
+    page.dimensions[3]
+  end
+
+  def page_width
+    page.dimensions[2]
+  end
+
+  def bb(options = {}, &block)
+    outer_box_left   = options.fetch(:left, bounds.left)
+    outer_box_top    = options.fetch(:top, bounds.top)
+    outer_box_width  = options.fetch(:width, bounds.width)
+    outer_box_height = options.fetch(:height, bounds.height)
+    padding          = options.fetch(:padding, 0)
+    radius           = options.fetch(:radius, 0)
+    rectangle        = options.fetch(:rectangle, false)
+    background       = options.fetch(:background, false)
+
+    if rectangle
+      stroke do
+        rounded_rectangle [outer_box_left, outer_box_top], outer_box_width, outer_box_height, radius
+      end
+    end
+
+    if background
+      previous_fill_color = fill_color
+      fill_color background
+      fill_rounded_rectangle [outer_box_left, outer_box_top], outer_box_width, outer_box_height, radius
+      fill_color previous_fill_color
+    end
+
+    bounding_box [outer_box_left, outer_box_top], width: outer_box_width, height: outer_box_height do
+      draw_debug_bounds!
+
+      inner_box_left   = bounds.left   + padding
+      inner_box_top    = bounds.top    - padding
+      inner_box_width  = bounds.width  - (padding * 2)
+      inner_box_height = bounds.height - (padding * 2)
+
+      bounding_box [inner_box_left, inner_box_top], width: inner_box_width, height: inner_box_height do
+        draw_debug_bounds!
+
+        block&.call
+      end
+    end
+  end
+
+  def tb(text, options = {})
+    box_left   = options[:left]   || bounds.left
+    box_top    = options[:top]    || bounds.top
+    box_width  = options[:width]  || bounds.width
+    box_height = options[:height] || bounds.height
+
+    options = {
+      :at            => [box_left, box_top],
+      :width         => box_width,
+      :height        => box_height,
+      :overflow      => :shrink_to_fit,
+      :inline_format => true,
+    }.merge(options)
+
+    text_box(text.to_s, options)
+  end
+
+  def btb(text, options = {})
+    bb(options) do
+      tb(text)
+    end
+  end
+
+  def get_image(obj)
+    return if obj.blank?
+
+    if ApplicationUploader.storage.to_s.end_with?("File") # Local
+      obj.path
+    elsif ApplicationUploader.storage.to_s.end_with?("Fog") # Amazon S3
+      open(obj.url)
+    else
+      raise NotImplementedError
+    end
+  end
+
+  def placeholder(method)
+    return unless Rails.env.development?
+
+    "You can override this text in <b>##{method}</b> method, otherwise it will not be displayed in other environments."
+  end
+end

data/app/policies/dorsale/application_policy.rb

@@ -24,16 +24,14 @@ class Dorsale::ApplicationPolicy
 
   def self.define_subject_accessor!
     # Dorsale::BillingMachine::InvoicePolicy -> :invoice
-    object_type = self.to_s.demodulize.gsub("Policy", "").underscore.to_sym
+    object_type = to_s.demodulize.gsub("Policy", "").underscore.to_sym
 
     # Avoid user/subject conflict
     object_type = :other_user if object_type == :user
 
-    self.send(:define_method, object_type) { subject }
+    send(:define_method, object_type) { subject }
   end
 
-  private
-
   class Scope
     attr_reader :user, :scope
 

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

@@ -35,5 +35,4 @@ module Dorsale::ExpenseGun::ExpensePolicyHelper
     return false unless expense.may_go_to_canceled?
     super
   end
-
 end

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

@@ -30,9 +30,9 @@ module Dorsale::Flyboy::TaskPolicyHelper
   private
 
   def cannot_read_taskable?
-    return false unless task.is_a?(::Dorsale::Flyboy::Task)
-    return false unless task.taskable.present?
+    return false if task == Dorsale::Flyboy::Task
+    return false if task.taskable.blank?
 
-    ! policy(task.taskable).read?
+    !policy(task.taskable).read?
   end
 end

data/app/policies/dorsale/policy_checker.rb

@@ -8,7 +8,6 @@ class Dorsale::PolicyChecker
 
     check_policy! "Dorsale::Alexandrie::AttachmentPolicy"
     check_policy! "Dorsale::Alexandrie::AttachmentTypePolicy"
-    check_policy! "Dorsale::BillingMachine::IdCardPolicy"
     check_policy! "Dorsale::BillingMachine::InvoicePolicy"
     check_policy! "Dorsale::BillingMachine::PaymentTermPolicy"
     check_policy! "Dorsale::BillingMachine::QuotationPolicy"
@@ -37,28 +36,24 @@ class Dorsale::PolicyChecker
   private
 
   def check_policy!(policy)
-    begin
-      policy_klass = policy.constantize
-    rescue NameError
+    if (policy_klass = policy.safe_constantize).nil?
       errors << "#{policy} does not exist"
       return
     end
 
-    begin
-      helper_klass = "#{policy}Helper".constantize
-    rescue NameError
+    if (helper_klass = "#{policy}Helper".safe_constantize).nil?
       errors << "#{policy}Helper does not exist"
       return
     end
 
-    begin
-      scope_klass = "#{policy}::Scope".constantize
-
-      unless scope_klass.public_instance_methods.include?(:resolve)
-        errors << "#{policy}::Scope#resolve is not defined"
-      end
-    rescue NameError
+    if (scope_klass = "#{policy}::Scope".constantize).nil?
       errors << "#{policy}::Scope does not exist"
+      return
+    end
+
+    if scope_klass.public_instance_methods.exclude?(:resolve)
+      errors << "#{policy}::Scope#resolve is not defined"
+      return
     end
 
     unless policy_klass < helper_klass
@@ -67,11 +62,9 @@ class Dorsale::PolicyChecker
     end
 
     helper_klass::POLICY_METHODS.each do |method|
-      unless policy_klass.public_instance_methods(false).include?(method)
+      if policy_klass.public_instance_methods(false).exclude?(method)
         errors << "#{policy_klass}##{method} is not defined"
-        next
       end
     end
-  end
-
+  end # def check_policy
 end

data/app/services/dorsale/billing_machine/invoice/copy.rb

@@ -12,8 +12,8 @@ class Dorsale::BillingMachine::Invoice::Copy < ::Dorsale::Service
       @copy.lines << line.dup
     end
 
-    @copy.date         = Time.zone.now.to_date
-    @copy.due_date     = Time.zone.now.to_date + 30.days
+    @copy.date         = Date.current
+    @copy.due_date     = Date.current + 30.days
     @copy.unique_index = nil
     @copy.paid         = false
 

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

@@ -17,8 +17,13 @@ class Dorsale::BillingMachine::PdfFileGenerator < Dorsale::Service
   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)
+    if document.is_a?(::Dorsale::BillingMachine::Invoice)
+      return ::Dorsale::BillingMachine.invoice_pdf_model
+    end
+
+    if document.is_a?(::Dorsale::BillingMachine::Quotation)
+      return ::Dorsale::BillingMachine.quotation_pdf_model
+    end
   end
 
   def pdf_data

data/app/services/dorsale/billing_machine/quotation/copy.rb

@@ -15,7 +15,7 @@ class Dorsale::BillingMachine::Quotation::Copy < ::Dorsale::Service
     @copy.unique_index = nil
     @copy.created_at   = nil
     @copy.updated_at   = nil
-    @copy.date         = Time.zone.now.to_date
+    @copy.date         = Date.current
     @copy.state        = ::Dorsale::BillingMachine::Quotation::STATES.first
 
     @copy.save!

data/app/services/dorsale/billing_machine/quotation/to_invoice.rb

@@ -9,9 +9,7 @@ class Dorsale::BillingMachine::Quotation::ToInvoice < ::Dorsale::Service
     @invoice = Dorsale::BillingMachine::Invoice.new
 
     quotation.attributes.each do |k, v|
-      next if k.to_s == "id"
-      next if k.to_s.match /index|tracking|state/
-      next if k.to_s.end_with?("_at")
+      next if ignored_key?(k)
 
       if invoice.respond_to?("#{k}=")
         invoice.public_send("#{k}=", v)
@@ -22,9 +20,7 @@ class Dorsale::BillingMachine::Quotation::ToInvoice < ::Dorsale::Service
       invoice_line = invoice.lines.new
 
       quotation_line.attributes.each do |k, v|
-        next if k.to_s == "id"
-        next if k.to_s.match /index|tracking|state/
-        next if k.to_s.end_with?("_at")
+        next if ignored_key?(k)
 
         if invoice_line.respond_to?("#{k}=")
           invoice_line.public_send("#{k}=", v)
@@ -32,8 +28,15 @@ class Dorsale::BillingMachine::Quotation::ToInvoice < ::Dorsale::Service
       end
     end
 
-    invoice.date = Time.zone.now.to_date
+    invoice.date = Date.current
 
     invoice
   end
+
+  private
+
+  def ignored_key?(k)
+    k = k.to_s
+    k == "id" || k.match?(/index|tracking|state/) || k.end_with?("_at")
+  end
 end

data/app/services/dorsale/flyboy/task/snoozer.rb

@@ -36,7 +36,7 @@ class Dorsale::Flyboy::Task::Snoozer < ::Dorsale::Service
   private
 
   def current_date
-    Time.zone.now.to_date
+    Date.current
   end
 
   def snooze_term_value

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

@@ -6,11 +6,10 @@
     .col-md-6
       .well
         = info document, :label
+        = info document, :date
 
     .col-md-6
       .well
-        = info document, :date
-        hr
         - if document.customer.present?
           = document.customer
           br

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

@@ -11,19 +11,12 @@
 
     .row
       .col-md-6
-        .well
-          - if @id_cards.one?
-            = f.hidden_field :id_card_id
-            = info document, :id_card
-          - else
-            = f.association :id_card, collection: @id_cards
-
-        = f.input :label
+        .well.well-sm
+          = f.input :label
+          = f.input :date, html5: true
 
       .col-md-6
-        .well
-          = f.input :date, html5: true
-          hr
+        .well.well-sm
           = f.input :customer_guid, collection: @people.map{ |e| [e.to_s, e.guid] }, input_html: {class: "select2"}
 
     table#lines-table

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

@@ -15,7 +15,7 @@ data = [
     Dorsale::BillingMachine::Invoice.t(:total_including_taxes),
     Dorsale::BillingMachine::Invoice.t(:advance),
     Dorsale::BillingMachine::Invoice.t(:balance),
-  ]
+  ],
 ]
 
 @invoices_without_pagination.each do |invoice|

data/app/views/dorsale/flyboy/tasks/index.xlsx.ruby

@@ -5,7 +5,7 @@ data = [
     model.t(:name),
     model.t(:progress),
     model.t(:term),
-  ]
+  ],
 ]
 
 @tasks_without_pagination.each do |task|

data/config/locales/alexandrie.en.yml

@@ -13,10 +13,6 @@ en:
     create_ok : "Category successfully created."
     update_ok : "Category successfully updated."
 
-  id_cards:
-    create_ok : "Card successfully created."
-    update_ok : "Card successfully updated."
-
   payment_terms:
     create_ok : "Payment Term successfully created."
     update_ok : "Payment Term successfully updated."

data/config/locales/alexandrie.fr.yml

@@ -13,10 +13,6 @@ fr:
     create_ok : "La Catégorie a été créée."
     update_ok : "La Catégorie a été modifiée."
 
-  id_cards:
-    create_ok : "La Carte a été créée."
-    update_ok : "La Carte a été modifiée."
-
   payment_terms:
     create_ok : "La Paiement a été créé."
     update_ok : "La Paiement a été modifié."

data/config/locales/billing_machine.en.yml

@@ -2,41 +2,10 @@ en:
   actions:
     create_invoice: "Create invoice"
     new_payment_term: "New payment terms"
-    new_id_card: "New Id Card"
 
   attributes:
     invoice: "Invoice"
     quotation: "Quotation"
-    id_card: "Id Card"
-    id_card_name: "Id Card name"
-    entity_name: "Entity name"
-    intracommunity_vat: "Intracommunity VAT"
-    legal_form: "Legal form"
-    registration_number: "Registration number"
-    registration_city: "Registration city"
-    contact_full_name: "Contact name"
-    contact_fax: "Contact fax number"
-    contact_email: "Contact email"
-    contact_phone: "Contact phone"
-    contact_address_1: "Contact address (1)"
-    contact_address_2: "Contact address (2)"
-    contact_zip: "Contact zip"
-    contact_city: "Contact city"
-    bank_name: "Bank name"
-    bank_address: "Bank address"
-    siret: "SIRET"
-    capital: "Capital"
-    iban: "IBAN"
-    bic_swift: "BIC/SWIFT"
-    ape_naf: "APE/NAF"
-    custom_info_1: "Custom informations (1)"
-    custom_info_2: "Custom informations (2)"
-    custom_info_3: "Custom informations (3)"
-    your_contact: "Your contact"
-    contact_phone: "Phone"
-    contact_email: "Email"
-    contact_fax: "Fax"
-    tracking_number: "Number"
     customer: "Customer"
     designation: "Designation"
     quantity: "Quantity"
@@ -46,12 +15,6 @@ en:
     line_total: "Total"
     payment_term: "Payment terms"
     payment_terms: "Payment terms"
-    iban: "IBAN"
-    bic_swift: "BIC / SWIFT"
-    info_phone: "Phone"
-    info_fax: "Fax"
-    registration: "Registration"
-    siret: "SIRET"
     vat: "VAT"
     vat_amount: "VAT Amount"
     vat_rate: "VAT Rate"
@@ -81,10 +44,6 @@ en:
         one: "Quotation Line"
         other: "Quotation Lines"
 
-      dorsale/billing_machine/id_card:
-        one: "Id card"
-        other: "Id cards"
-
       dorsale/billing_machine/payment_term:
         one: "Payment term"
         other: "Payment terms"

data/config/locales/billing_machine.fr.yml

@@ -2,41 +2,10 @@ fr:
   actions:
     create_invoice: "Facturer"
     new_payment_term: "Nouvelles conditions de paiement"
-    new_id_card: "Nouvelle carte d'identité"
 
   attributes:
     invoice: "Facture"
     quotation: "Devis"
-    id_card: "Carte d'identité"
-    id_card_name: "Nom de la carte"
-    entity_name: "Nom de l'entité"
-    intracommunity_vat: "TVA intracommunautaire"
-    legal_form: "Forme juridique"
-    registration_number: "Numéro d'immatriculation"
-    registration_city: "Ville d'immatriculation"
-    contact_full_name: "Nom du contact"
-    contact_fax: "Fax du contact"
-    contact_email: "Email du contact"
-    contact_phone: "Téléphone du contact"
-    contact_address_1: "Adresse du contact (1)"
-    contact_address_2: "Adresse du contact (2)"
-    contact_zip: "Code postal du contact"
-    contact_city: "Ville du contact"
-    bank_name: "Nom de la banque"
-    bank_address: "Adresse de la banque"
-    siret: "Siret"
-    capital: "Capital"
-    iban: "IBAN"
-    bic_swift: "BIC/SWIFT"
-    ape_naf: "APE/NAF"
-    custom_info_1: "Information personalisées (1)"
-    custom_info_2: "Information personalisées (2)"
-    custom_info_3: "Information personalisées (3)"
-    your_contact: "Votre contact"
-    contact_phone: "Téléphone"
-    contact_email: "Email"
-    contact_fax: "Fax"
-    tracking_number: "Numéro"
     customer: "Client"
     designation: "Désignation"
     quantity: "Qte"
@@ -46,12 +15,6 @@ fr:
     line_total: "TOTAL HT"
     payment_term: "Conditions de paiement"
     payment_terms: "Conditions de paiement"
-    iban: "IBAN"
-    bic_swift: "BIC / SWIFT"
-    info_phone: "Tel."
-    info_fax: "Fax"
-    registration: "RCS"
-    siret: "SIRET "
     vat: "TVA"
     vat_amount: "Montant TVA"
     vat_rate: "Taux TVA"
@@ -81,10 +44,6 @@ fr:
         one: "Ligne de devis"
         other: "Lignes de devis"
 
-      dorsale/billing_machine/id_card:
-        one: "Carte d'identité"
-        other: "Cartes d'identité"
-
       dorsale/billing_machine/payment_term:
         one: "Condition de paiement"
         other: "Conditions de paiement"