dorsale 2.2.6 → 2.2.8

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

@@ -1,16 +1,17 @@
-.filters
-  = form_tag dorsale.small_data_filters_path, class: "form-inline", role: "form"
-    input type="hidden" name="call_back" value="#{dorsale.billing_machine_invoices_path}"
+= simple_form_for :filters, url: dorsale.small_data_filters_path, wrapper: :inline_form do |f|
+  = f.input(:customer_guid,
+    :collection    => @people.map { |p| [p.name, p.guid] },
+    :include_blank => t("filters.all_customers"),
+  )
 
-    .form-group
-      label.sr-only for="customer_guid" Client
-      = select 'filters', 'customer_guid', @people.map { |p| [p.name, p.guid] }, {include_blank: 'Tous les clients', selected: @filters.get('customer_guid')}, class: "form-control"
+  = f.input(:bm_time_period,
+    :collection    => dorsale_time_periods_for_select,
+    :include_blank => false,
+  )
 
-    .form-group
-      = select 'filters', 'time_period',[['Aujourd\'hui', 'today'],['Cette semaine', 'week'], ['Ce mois-ci', 'month']], {include_blank: 'Depuis toujours', selected: @filters.get('time_period')}, class: "form-control"
+  = f.input(:bm_payment_status,
+    :collection    => billing_machine_payment_status_for_filter_select,
+    :include_blank => false,
+  )
 
-    .form-group
-      = select 'filters', 'payment_status',[['Non payées', 'unpaid'], ['En attente', 'pending'],['En retard', 'late'],['Payées', 'paid']], {include_blank: 'Toutes', selected: @filters.get('payment_status')}, class: "form-control"
-
-    = filter_reset_button
-    = filter_submit_button
+  = filter_buttons

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

@@ -0,0 +1,30 @@
+.billing_machine
+  h1 = t("actions.email")
+  .well
+    = horizontal_form_for :email do |f|
+      = f.input(:subject,
+        :as => :string,
+        :label => t("attributes.subject"),
+        :input_html => {value: @subject},
+      )
+
+      = f.input(:body,
+        :as => :text,
+        :label => t("attributes.body"),
+        :input_html => {value: @body},
+      )
+
+      .actions
+        button.btn.btn-success type="submit"
+          = icon(:send)
+          = " "
+          = t("actions.send")
+
+        a.btn.btn-default href=dorsale.billing_machine_invoice_path(@invoice)
+          = icon(:times)
+          = " "
+          = t("actions.cancel")
+
+  hr
+
+  = render "dorsale/billing_machine/invoices/details", document: @invoice

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

@@ -2,11 +2,17 @@
   .actions
     - if can?(:copy, @invoice)
       = copy_button dorsale.copy_billing_machine_invoice_path(@invoice)
+
     - if can?(:update, @invoice)
       = update_button dorsale.edit_billing_machine_invoice_path(@invoice)
+
     - if can?(:download, @invoice)
       = download_button dorsale.billing_machine_invoice_path(@invoice, format: :pdf)
+
     - if can?(:pay, @invoice)
       = dorsale_button dorsale.pay_billing_machine_invoice_path(@invoice), icon: :check, action: :pay, method: :patch
 
+    - if can?(:email, @invoice)
+      = dorsale_button dorsale.email_billing_machine_invoice_path(@invoice), icon: :send, action: :email
+
   = render "dorsale/billing_machine/invoices/details", document: @invoice

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

@@ -1,13 +1,17 @@
-.filters
-  = form_tag dorsale.small_data_filters_path, class: "form-inline", role: "form"
-    input type="hidden" name="call_back" value="#{dorsale.billing_machine_quotations_path}"
+= simple_form_for :filters, url: dorsale.small_data_filters_path, wrapper: :inline_form do |f|
+  = f.input(:customer_guid,
+    :collection    => @people.map { |p| [p.name, p.guid] },
+    :include_blank => t("filters.all_customers"),
+  )
 
-    .form-group
-      label.sr-only for="customer_guid" Client
-      = select 'filters', 'customer_guid', @people.map { |p| [p.name, p.guid] }, {include_blank: 'Tous les clients', selected: @filters.get('customer_guid')}, class: "form-control"
+  = f.input(:bm_time_period,
+    :collection    => dorsale_time_periods_for_select,
+    :include_blank => false,
+  )
 
-    .form-group
-      = select 'filters', 'time_period',[['Aujourd\'hui', 'today'],['Cette semaine', 'week'], ['Ce mois-ci', 'month']], {include_blank: 'Depuis toujours', selected: @filters.get('time_period')}, class: "form-control"
+  = f.input(:bm_quotation_state,
+    :collection    => billing_machine_quotation_states_for_filter_select,
+    :include_blank => false,
+  )
 
-    = filter_reset_button
-    = filter_submit_button
+  = filter_buttons

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

@@ -24,7 +24,7 @@ table.default.quotations
 
   tbody
     - quotations.each do |quotation|
-      tr.quotation
+      tr class="quotation #{quotation_state_classes(quotation)}"
         td.hidden-sm.hidden-xs.date
           = date(quotation.date)
 

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

@@ -2,10 +2,13 @@
   .actions
     - if can?(:update, @quotation)
       = update_button dorsale.edit_billing_machine_quotation_path(@quotation)
+
     - if can?(:download, @quotation)
       = download_button dorsale.billing_machine_quotation_path(@quotation, format: :pdf)
+
     - if can?(:copy, @quotation)
       = copy_button dorsale.copy_billing_machine_quotation_path(@quotation), method: :post, confirm: true
+
     - if can?(:create, @quotation)
       = dorsale_button dorsale.create_invoice_billing_machine_quotation_path(@quotation), action: :create_invoice, icon: :magic
 

data/app/views/dorsale/customer_vault/corporations/_context.html.slim

@@ -5,16 +5,16 @@
   = context_title corporation.name
   = actions_for corporation, url: dorsale.customer_vault_corporation_path(corporation)
 
-  = context_info corporation.t(:tags),    person_tags(corporation)
-  = context_info corporation.t(:email),   email_link(corporation.email)
-  = context_info corporation.t(:phone),   tel_link(corporation.phone)
-  = context_info corporation.t(:fax),     tel_link(corporation.fax)
-  = context_info corporation.t(:capital), corporation.capital.to_s
-
+  = context_info corporation.t(:tags),                     person_tags(corporation)
+  = context_info corporation.t(:phone),                    tel_link(corporation.phone)
+  = context_info corporation.t(:email),                    email_link(corporation.email)
+  = context_info corporation.t(:www),                      web_link(corporation.www)
+  = context_info corporation.t(:fax),                      tel_link(corporation.fax)
+  = context_info corporation.t(:short_name),               corporation.short_name
+  = context_info corporation.t(:capital),                  corporation.capital.to_s
   = context_info corporation.t(:immatriculation_number_1), corporation.immatriculation_number_1
   = context_info corporation.t(:immatriculation_number_2), corporation.immatriculation_number_2
-  = context_info corporation.t(:legal_form), corporation.legal_form
-
-  = context_info corporation.t(:www), web_link(corporation.www)
+  = context_info corporation.t(:legal_form),               corporation.legal_form
 
-  = context_info corporation.t(:address), corporation.address.one_line if corporation.address.present?
+  - if corporation.address.present?
+    = context_info corporation.t(:address), corporation.address.one_line

data/app/views/dorsale/customer_vault/corporations/_form.html.slim

@@ -1,14 +1,16 @@
 = horizontal_form_for @corporation, as: :corporation do |f|
   = f.input :name
   = f.input :tag_list, collection: @tags, input_html: {multiple: true}
-  = f.input :email
-  = f.input :www
   = f.input :phone
+  = f.input :email, as: :string
+  = f.input :www, as: :string
   = f.input :fax
   = f.input :capital
   = f.input :immatriculation_number_1
   = f.input :immatriculation_number_2
+  = f.input :european_union_vat_number
   = f.input :legal_form
+  = f.input :short_name
 
   / Temporaire - A refactoriser
   = f.simple_fields_for :address do |af|

data/app/views/dorsale/customer_vault/individuals/_context.html.slim

@@ -5,12 +5,15 @@
   = context_title individual.name
   = actions_for individual, url: dorsale.customer_vault_individual_path(individual)
 
-  = context_info individual.t(:tags),    person_tags(individual)
-  = context_info individual.t(:email),   email_link(individual.email)
-  = context_info individual.t(:twitter), twitter_link(individual.twitter)
-  = context_info individual.t(:phone),   tel_link(individual.phone)
-  = context_info individual.t(:mobile),  tel_link(individual.mobile)
-  = context_info individual.t(:fax),     tel_link(individual.fax)
-  = context_info individual.t(:skype),   individual.skype
-  = context_info individual.t(:www),     web_link(individual.www)
-  = context_info individual.t(:address), individual.address.one_line if individual.address.present?
+  = context_info individual.t(:tags),       person_tags(individual)
+  = context_info individual.t(:phone),      tel_link(individual.phone)
+  = context_info individual.t(:mobile),     tel_link(individual.mobile)
+  = context_info individual.t(:email),      email_link(individual.email)
+  = context_info individual.t(:www),        web_link(individual.www)
+  = context_info individual.t(:twitter),    twitter_link(individual.twitter)
+  = context_info individual.t(:fax),        tel_link(individual.fax)
+  = context_info individual.t(:skype),      individual.skype
+  = context_info individual.t(:short_name), individual.short_name
+
+  - if individual.address.present?
+    = context_info individual.t(:address), individual.address.one_line

data/app/views/dorsale/customer_vault/individuals/_form.html.slim

@@ -2,15 +2,16 @@
   = f.input :first_name
   = f.input :last_name
   = f.input :tag_list, collection: @tags, input_html: {multiple: true}
-  = f.input :email
-  = f.input :title
-  = f.input :twitter
-  = f.input :context, as: :text
   = f.input :phone
-  = f.input :fax
   = f.input :mobile
+  = f.input :email, as: :string
+  = f.input :www, as: :string
+  = f.input :fax
+  = f.input :twitter
   = f.input :skype
-  = f.input :www
+  = f.input :title
+  = f.input :context, as: :text
+  = f.input :short_name
 
   / Temporaire - A refactoriser
   = f.simple_fields_for :address do |af|

data/app/views/dorsale/flyboy/_filters.html.slim

@@ -2,11 +2,10 @@
   = form_tag dorsale.small_data_filters_path, class: "form-inline"
 
     .form-group
-      label.sr-only for="status" Status
-      select.form-control name="filters[status]"
+      label.sr-only for="fb_status" Status
+      select.form-control name="filters[fb_status]"
         option value="" = t("messages.folders.status.all")
         option value="open" selected=(@filters.get("status") == "open") = t("messages.folders.status.open")
         option value="closed" selected=(@filters.get("status") == "closed") = t("messages.folders.status.closed")
 
-    = filter_reset_button
-    = filter_submit_button
+    = filter_buttons

data/config/locales/billing_machine.en.yml

@@ -4,23 +4,27 @@ en:
 
   activerecord:
     models:
-      dorsale/billing_machine/invoice: "invoice"
-      dorsale/billing_machine/quotation: "quotation"
-      dorsale/billing_machine/id_card: "id card"
-      dorsale/billing_machine/payment_term: "payment term"
+      dorsale/billing_machine/invoice: "Invoice"
+      dorsale/billing_machine/quotation: "Quotation"
+      dorsale/billing_machine/id_card: "Id card"
+      dorsale/billing_machine/payment_term: "Payment term"
 
     attributes:
       dorsale/billing_machine/invoice/payment_status:
+        all: "All statuses"
         pending: "Pending"
         paid: "Paid"
         on_alert: "On alert"
         late: "Late"
+        unpaid: "Unpaid"
 
       dorsale/billing_machine/quotation/state:
+        all: "All states"
         pending: "Pending"
         accepted: "Accepted"
         refused: "Refused"
         canceled: "Canceled"
+        not_canceled: "Not canceled"
 
       dorsale/billing_machine/id_card:
         id_card_name: "id card name"
@@ -79,6 +83,10 @@ en:
     tva: "TVA "
     expires_at: "Expires at : "
 
+  emails:
+    invoices:
+      send_invoice_to_customer: ""
+
   messages:
     invoices:
       create_ok : "Invoice successfully created."
@@ -87,6 +95,9 @@ en:
       update_error : "Impossible to update this invoice."
       pay_ok    : "This invoice has been marked payed."
       pay_error : "Impossible to mark this invoice as payed."
+      email_ok : "Invoice successfully sent to customer."
+      email_error : "Unable to send invoice to customer, please verify customer email."
+
     quotations:
       create_ok : "Quotation successfully created."
       update_ok : "Quotation successfully created."

data/config/locales/billing_machine.fr.yml

@@ -1,26 +1,30 @@
 fr:
   actions:
-    create_invoice: "Créer facture"
+    create_invoice: "Facturer"
 
   activerecord:
     models:
-      dorsale/billing_machine/invoice: "facture"
-      dorsale/billing_machine/quotation: "devis"
-      dorsale/billing_machine/id_card: "carte d'identité"
-      dorsale/billing_machine/payment_term: "conditions de paiement"
+      dorsale/billing_machine/invoice: "Facture"
+      dorsale/billing_machine/quotation: "Devis"
+      dorsale/billing_machine/id_card: "Carte d'identité"
+      dorsale/billing_machine/payment_term: "Conditions de paiement"
 
     attributes:
       dorsale/billing_machine/invoice/payment_status:
+        all: "Tous les statuts"
         pending: "En attente"
         paid: "Payée"
         on_alert: "En alerte"
         late: "En retard"
+        unpaid: "Non payée"
 
       dorsale/billing_machine/quotation/state:
+        all: "Tous les états"
         pending: "En attente"
         accepted: "Accepté"
         refused: "Refusé"
         canceled: "Annulé"
+        not_canceled: "Non annulé"
 
       dorsale/billing_machine/id_card:
         id_card_name: "nom de la carte"
@@ -84,6 +88,10 @@ fr:
     total_including_taxes: "TOTAL TTC"
     expires_at: "Date d'expiration : "
 
+  emails:
+    invoices:
+      send_invoice_to_customer: "%{to},\n\nVeuillez-trouver ci-joint votre facture.\n\nCordialement,\n%{from}"
+
   messages:
     invoices:
       create_ok : "La facture a été créée."
@@ -92,6 +100,9 @@ fr:
       update_error : "Erreur dans la modification de la facture."
       pay_ok    : "La facture a été marquée comme payée."
       pay_error : "Impossible de marquer la facture comme payée."
+      email_ok : "La facture a été envoyée au client."
+      email_error : "Impossible d'envoyer la facture au client, vérifiez son adresse email."
+
     quotations:
       create_ok : "Le devis a été créé."
       update_ok : "Le devis a été modifié."

data/config/locales/common.en.yml

@@ -70,6 +70,7 @@ en:
     paid       : "Payd"
     continue   : "Continue"
     rename     : "Rename"
+    email      : "Send by email"
 
   attributes: &attributes
     id                    : "Id"
@@ -124,6 +125,8 @@ en:
     number                : "Number"
     message               : "Message"
     skype                 : "Skype"
+    subject               : "Subject"
+    body                  : "Message"
 
     # BillingMachine
     unit                  : "Unit"
@@ -143,5 +146,16 @@ en:
     messages:
       extension_white_list_error : "This file type is not supported"
 
+  filters:
+    all_customers: "All customers"
+
+  time_periods:
+    all_time: "All time"
+    today: "Today"
+    week: "This week"
+    month: "This month"
+    year: "This year"
+
+
   labels:
     <<: *attributes

data/config/locales/common.fr.yml

@@ -78,6 +78,7 @@ fr:
     paid       : "Payée"
     continue   : "Continuer"
     rename     : "Renommer"
+    email      : "Envoyer par email"
 
   attributes: &attributes
     id                    : "Id"
@@ -134,6 +135,9 @@ fr:
     message               : "Message"
     skype                 : "Skype"
     is_active             : "Actif ?"
+    short_name            : "Initiales"
+    subject               : "Objet"
+    body                  : "Message"
 
     # BillingMachine
     unit                  : "Unité"
@@ -154,5 +158,15 @@ fr:
     messages:
       extension_white_list_error : "Ce type de fichier n'est pas prit en charge"
 
+  filters:
+    all_customers: "Tous les clients"
+
+  time_periods:
+    all_time: "Depuis toujours"
+    today: "Aujourd'hui"
+    week: "Cette semaine"
+    month: "Ce mois"
+    year: "Cette année"
+
   labels:
     <<: *attributes

data/config/locales/customer_vault.en.yml

@@ -59,6 +59,7 @@ en:
         capital: "Capital"
         immatriculation_number_1: "Immatriculation number 1"
         immatriculation_number_2: "Immatriculation number 2"
+        european_union_vat_number: "European union VAT number"
         legal_form: "Legal form"
       dorsale/customer_vault/individual:
         <<: *customer_vault_person_attributes

data/config/locales/customer_vault.fr.yml

@@ -59,6 +59,7 @@ fr:
         capital: "Capital"
         immatriculation_number_1: "SIREN"
         immatriculation_number_2: "RCS"
+        european_union_vat_number: "Numéro TVA européenne"
         legal_form: "Forme juridique"
       dorsale/customer_vault/individual:
         <<: *customer_vault_person_attributes

data/config/routes.rb

@@ -37,6 +37,7 @@ Dorsale::Engine.routes.draw do
       member do
         get :copy
         patch :pay
+        match :email, via: [:get, :post]
       end
     end