dorsale 2.2.6 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e6674cbd5f8fe69c85577957e422d688d62ae6
-  data.tar.gz: 50e6fc35845488d569d0cf84f231081f190f9b50
+  metadata.gz: bd183e73d0c111d2017e1384a051528174c04f4f
+  data.tar.gz: c72f152b774c5bda83d7c69c58640124825e7f03
 SHA512:
-  metadata.gz: ed476f85080b92db34deeac474511e871fad031bfc9ca4dcfb2bf11e2bdaa383629d34b0b75174be6c24af4a7129b21004b0cc90872906dea58f4ee83f02df12
-  data.tar.gz: 92254eb7ee9c90f3c850d3323d029c541b8465d9e1198c2c77da0a85e43d9e5490e0a9a1129a54d10a8437410245fccccaa7040df9c43fbdea229f677886a150
+  metadata.gz: e5276d76feb27a952b9c6926c82df74c98d8e0e37ac85334148291bcbea1f442ff1d84e42701201e43373eb6e0f7a542f06793736fa501d3fe8cdae5891dcc5d
+  data.tar.gz: 02d684b6348badd79e6dd1e6f46c891ef0cb661e5fd13139c531496398f3d94162c4adf2b2ca092136ecbc9a54e4c6599356d4df0505400fd1a32dbf18b78b23

data/app/assets/stylesheets/dorsale/billing_machine/all.sass

@@ -1,31 +1,51 @@
 .billing_machine
-  .actions
+  > .actions
     text-align: right
 
     .btn
       margin: 0 0 0.5em 0.5em
 
-  tr.paid td
-    background: $state-success-bg
+  tr.invoice.paid td,
+  tr.quotation.accepted td,
+    background: darken($state-success-bg, 5)
 
-  tr.late td
-    background: $state-warning-bg
+  tr.quotation.pending td,
+    background: white
 
-  tr.on_alert td
-    background: $state-danger-bg
+  tr.invoice.late td,
+  tr.quotation.pending.late td,
+    background: darken($state-warning-bg, 5)
 
-  .label.pending
+  tr.invoice.on_alert td,
+  tr.quotation.refused td,
+    background: darken($state-danger-bg, 5)
+
+  tr.quotation.canceled td,
+    background: #DDDDDD
+
+
+
+  .label.invoice.pending,
+  .label.quotation.pending
     @extend .label-info
 
-  .label.paid
+  .label.invoice.paid,
+  .label.quotation.accepted,
     @extend .label-success
 
-  .label.late
+  .label.invoice.late,
+  .label.quotation.late,
     @extend .label-warning
 
-  .label.on_alert
+  .label.invoice.on_alert,
+  .label.quotation.refused,
     @extend .label-danger
 
+
+  .label.quotation.canceled,
+    @extend .label-default
+
+
   .label
     font-size: 50%
     vertical-align: top

data/app/assets/stylesheets/dorsale/filters.sass

@@ -4,3 +4,13 @@
 
   select, button, input
     margin: 0 5px 0 0
+
+  .form-group
+    display: inline-block
+    width: auto
+    padding: 0
+    margin: 0
+
+  .form-control
+    display: inline-block
+    width: auto

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

@@ -7,6 +7,7 @@ module Dorsale
         :update,
         :copy,
         :pay,
+        :email,
       ]
 
       def index
@@ -139,6 +140,42 @@ module Dorsale
         redirect_to dorsale.billing_machine_invoices_path
       end
 
+      def email
+        authorize! :email, @invoice
+
+        @subject =
+        begin
+          params[:email][:subject]
+        rescue
+          "#{Invoice.t} #{@invoice.tracking_id} : #{@invoice.label}"
+        end
+
+        @body =
+        begin
+          params[:email][:body]
+        rescue
+          t("emails.invoices.send_invoice_to_customer",
+            :from => current_user.to_s,
+            :to   => @invoice.customer.to_s,
+          )
+        end
+
+        if request.get?
+          return
+        end
+
+        email = ::Dorsale::BillingMachine::InvoiceMailer
+          .send_invoice_to_customer(@invoice, @subject, @body, current_user)
+
+        if email.deliver_now
+          flash[:notice] = t("messages.invoices.email_ok")
+          redirect_to action: :show
+        else
+          flash.now[:alert] = t("messages.invoices.email_error")
+          render
+        end
+      end
+
       private
 
       def set_objects

data/app/controllers/dorsale/customer_vault/corporations_controller.rb

@@ -79,6 +79,7 @@ module Dorsale
           :capital,
           :immatriculation_number_1,
           :immatriculation_number_2,
+          :european_union_vat_number,
           :legal_form,
           :tag_list => [],
           :address_attributes => [

data/app/controllers/dorsale/small_data/filters_controller.rb

@@ -20,13 +20,25 @@ module Dorsale
           :path     => "/",
         }
 
+        redirect_to back_url
+      end
+
+      def back_url
         urls = [
           params[:back_url],
           request.referer,
           (main_app.root_path rescue nil)
         ]
 
-        redirect_to urls.select(&:present?).first
+        url = urls.select(&:present?).first
+
+        # Delete page page
+        base, query_string = url.split("?")
+        query_string = query_string.to_s.split("&").delete_if { |p| p.include?("page=") }.join("&")
+        query_string = "?#{query_string}" if query_string.present?
+        url = base + query_string
+
+        url
       end
 
     end

data/app/helpers/dorsale/billing_machine/application_helper.rb

@@ -9,6 +9,32 @@ module Dorsale
           ]
         end
       end
+
+      def billing_machine_quotation_states_for_filter_select
+          [
+            [::Dorsale::BillingMachine::Quotation.t("state.all"), ""],
+            [::Dorsale::BillingMachine::Quotation.t("state.not_canceled"), "not_canceled"],
+          ] + billing_machine_quotation_states_for_select
+      end
+
+      def billing_machine_payment_status_for_filter_select
+        {
+          ::Dorsale::BillingMachine::Invoice.t("payment_status.all")     => "",
+          ::Dorsale::BillingMachine::Invoice.t("payment_status.unpaid")  => "unpaid",
+          ::Dorsale::BillingMachine::Invoice.t("payment_status.pending") => "pending",
+          ::Dorsale::BillingMachine::Invoice.t("payment_status.late")    => "late",
+          ::Dorsale::BillingMachine::Invoice.t("payment_status.paid")    => "paid",
+        }
+      end
+
+      def quotation_state_classes(quotation)
+        if quotation.state == "pending" && quotation.date < 1.month.ago
+          return "pending late"
+        else
+          return quotation.state
+        end
+      end
+
     end
   end
 end

data/app/helpers/dorsale/filters_helper.rb

@@ -3,6 +3,7 @@ module Dorsale
     def filter_submit_button(options = {})
       options[:class] ||= "btn submit filter-submit"
       options[:type]  ||= "submit"
+      options[:value] ||= "submit"
 
       text = options.delete(:text) || t("actions.filter")
       icon = options.delete(:icon) || "filter"
@@ -15,6 +16,7 @@ module Dorsale
     def filter_reset_button(options = {})
       options[:class] ||= "btn reset filter-reset"
       options[:type]  ||= "submit"
+      options[:value] ||= "reset"
 
       text = options.delete(:text) || t("actions.reset")
       icon = options.delete(:icon) || "rotate-left"
@@ -23,5 +25,19 @@ module Dorsale
         icon(icon) + " " + text
       end
     end
+
+    def filter_buttons
+      filter_reset_button + filter_submit_button
+    end
+
+    def dorsale_time_periods_for_select
+      {
+        t("time_periods.all_time") => "",
+        t("time_periods.today")    => "today",
+        t("time_periods.week")     => "week" ,
+        t("time_periods.month")    => "month",
+      }
+    end
+
   end
 end

data/app/helpers/dorsale/form_helper.rb

@@ -14,7 +14,7 @@ module Dorsale
         submit_action = :save
       end
 
-      content_tag("div", class: "actions cdiv") do
+      content_tag("div", class: "actions") do
         submit = content_tag(:button, type: :submit, class: "btn btn-sm btn-success") do
           icon(:save) + " " + t("actions.#{submit_action}")
         end

data/app/helpers/dorsale/text_helper.rb

@@ -70,6 +70,8 @@ module Dorsale
 
       value = text
       value = object.public_send(attribute)     if value.nil?
+      value = t("yes")                          if value === true
+      value = t("no")                           if value === false
       value = object.t("#{attribute}.#{value}") if nested
       value = send(helper, value)               if helper
       value = number(value)                     if value.is_a?(Numeric)

data/app/mailers/dorsale/application_mailer.rb

@@ -5,4 +5,4 @@ module Dorsale
 
     helper Dorsale::AllHelpers
   end
-end
+end

data/app/mailers/dorsale/billing_machine/invoice_mailer.rb

@@ -0,0 +1,18 @@
+module Dorsale
+  module BillingMachine
+    class InvoiceMailer < ::Dorsale::ApplicationMailer
+      def send_invoice_to_customer(invoice, subject, body, sender = nil)
+        return false if invoice.try(:customer).try(:email).blank?
+
+        attachments["#{Invoice.t}_#{invoice.tracking_id}.pdf"] = invoice.pdf.render
+
+        mail(
+          :to       => invoice.customer.email,
+          :reply_to => sender.try(:email),
+          :subject  => subject,
+          :body     => body,
+        )
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module Dorsale
   module BillingMachine
     module AbilityHelper
       def define_dorsale_billing_machine_abilities
-        can [:list, :create, :read, :update, :pay, :copy, :download], ::Dorsale::BillingMachine::Invoice
+        can [:list, :create, :read, :update, :pay, :copy, :download, :email], ::Dorsale::BillingMachine::Invoice
         can [:list, :create, :read, :update, :delete, :copy, :download], ::Dorsale::BillingMachine::Quotation
       end
     end

data/app/models/dorsale/billing_machine/small_data/filter_for_invoices.rb

@@ -3,9 +3,9 @@ module Dorsale
     module SmallData
       class FilterForInvoices < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          'customer_guid'  => FilterStrategyByCustomer.new('invoices'),
-          'time_period'    => FilterStrategyByTimePeriod.new('invoices'),
-          'payment_status' => FilterStrategyByPaymentStatus.new('invoices'),
+          "customer_guid"     => FilterStrategyByCustomer.new("invoices"),
+          "bm_time_period"    => FilterStrategyByTimePeriod.new("invoices"),
+          "bm_payment_status" => FilterStrategyByPaymentStatus.new("invoices"),
         }
 
         def strategy key
@@ -13,8 +13,21 @@ module Dorsale
         end
 
         def target
-          'invoices'
+          "invoices"
         end
+
+        def customer_guid
+          get("customer_guid")
+        end
+
+        def bm_time_period
+          get("time_period")
+        end
+
+        def bm_payment_status
+          get("payment_status")
+        end
+
       end
     end
   end

data/app/models/dorsale/billing_machine/small_data/filter_for_quotations.rb

@@ -3,8 +3,9 @@ module Dorsale
     module SmallData
       class FilterForQuotations < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          'customer_guid' => FilterStrategyByCustomer.new('quotations'),
-          'time_period'   => FilterStrategyByTimePeriod.new('quotations'),
+          "customer_guid"      => FilterStrategyByCustomer.new("quotations"),
+          "bm_time_period"     => FilterStrategyByTimePeriod.new("quotations"),
+          "bm_quotation_state" => FilterStrategyByState.new("quotations"),
         }
 
         def strategy key
@@ -12,8 +13,21 @@ module Dorsale
         end
 
         def target
-          'quotations'
+          "quotations"
         end
+
+        def customer_guid
+          get("customer_guid")
+        end
+
+        def bm_time_period
+          get("time_period")
+        end
+
+        def bm_quotation_state
+          get("quotation_state")
+        end
+
       end
     end
   end

data/app/models/dorsale/billing_machine/small_data/filter_strategy_by_state.rb

@@ -0,0 +1,15 @@
+module Dorsale
+  module BillingMachine
+    module SmallData
+      class FilterStrategyByState < ::Dorsale::SmallData::FilterStrategy
+        def do_apply(query)
+          if @value.to_s.match(/not_(.+)/)
+            query.where("state != ?", $~[1])
+          else
+            query.where(state: @value)
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/dorsale/flyboy/small_data/filter_for_folders.rb

@@ -3,7 +3,7 @@ module Dorsale
     module SmallData
       class FilterForFolders < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          'status' => FilterStrategyByStatus.new("folders")
+          "fb_status" => FilterStrategyByStatus.new("folders")
         }
 
         def strategy key

data/app/models/dorsale/flyboy/small_data/filter_for_tasks.rb

@@ -3,8 +3,8 @@ module Dorsale
     module SmallData
       class FilterForTasks < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          'status' => FilterStrategyByDone.new("tasks"),
-          'owner' => FilterStrategyByOwner.new("tasks")
+          "fb_status" => FilterStrategyByDone.new("tasks"),
+          "owner"     => FilterStrategyByOwner.new("tasks")
         }
 
         def strategy key

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

@@ -177,15 +177,21 @@ module Dorsale
           if @main_document.tracking_id.present?
             table_customer << [I18n.t("pdfs.tracking_number") , @main_document.tracking_id.to_s]
           end
+
           if @main_document.date.present?
             table_customer << [I18n.t("pdfs.date") , date(@main_document.date)]
           end
+
           if @main_document.customer.present?
             name = "#{@main_document.customer.name}\n" if @main_document.customer.name.present?
             street = "#{@main_document.customer.address.street}\n" if @main_document.customer.address.street?
             street_bis = "#{@main_document.customer.address.street_bis}\n" if @main_document.customer.address.street_bis.present?
             zip_country = "#{@main_document.customer.address.zip} #{@main_document.customer.address.city}" if @main_document.customer.address.city.present?
-            table_customer << [I18n.t("pdfs.customer") , "#{name} #{street} #{street_bis} #{zip_country}" ] if @main_document.customer.name.present?
+
+            european_union_vat_number = @main_document.customer.try(:european_union_vat_number)
+            european_union_vat_number = "#{@main_document.customer.t :european_union_vat_number} :\n#{european_union_vat_number}\n" if european_union_vat_number
+
+            table_customer << [I18n.t("pdfs.customer") , "#{name} #{street} #{street_bis} #{zip_country} #{european_union_vat_number}" ] if @main_document.customer.name.present?
           end
 
           table table_customer,

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

@@ -3,15 +3,19 @@
 
 #billing_machine-show
   h1
-    = document.class.t.capitalize
+    = document.class.t
     - if document.tracking_id.present?
       = " n° "
       = document.tracking_id
 
     - if document_type == :invoice
-      .label class=document.payment_status
+      .label class="invoice #{document.payment_status}"
         = document.t("payment_status.#{document.payment_status}")
 
+    - if document_type == :quotation
+      .label class="quotation #{quotation_state_classes(document)}"
+        = document.t("state.#{document.state}")
+
   .row
     .col-md-6
       .well
@@ -59,11 +63,8 @@
 
         - if document_type == :invoice
           = info document, :due_date
-          = info document, :paid
 
         - if document_type == :quotation
-          = info document, :state
-          br
 
           = info document, :expires_at
           br