dorsale 3.9.3 → 3.9.4

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

@@ -1,27 +1 @@
-tr.line
-  td.actions
-    a.delete href="#"
-      span.fa.fa-fw.fa-trash
-    = f.hidden_field :_destroy
-
-  td.line-label
-    = f.text_area :label, rows: 1
-
-  td.line-quantity
-    = f.text_field :quantity, class: "number"
-
-  td.line-unit
-    = f.text_field :unit
-
-  - if ::Dorsale::BillingMachine.vat_mode == :multiple
-    td.line-vat_rate
-      = f.text_field :vat_rate, class: "number"
-      span.unit = "%"
-
-  td.line-unit_price
-    = f.text_field :unit_price, class: "number"
-    span.unit = Dorsale::BillingMachine.default_currency
-
-  td.line-total
-    = f.text_field :total, class: "number", disabled: true
-    span.unit = Dorsale::BillingMachine.default_currency
+= render "dorsale/billing_machine/commons/line_fields", f: f

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

@@ -3,10 +3,5 @@
   = " n° "
   = document.tracking_id
 
-- if document.is_a?(Dorsale::BillingMachine::Invoice)
-  .label class="invoice #{document.payment_status}"
-    = document.t("payment_status.#{document.payment_status}")
-
-- if document.is_a?(Dorsale::BillingMachine::Quotation)
-  .label class="quotation #{quotation_state_classes(document)}"
-    = document.t("state.#{document.state}")
+.label class="invoice #{document.payment_status}"
+  = document.t("payment_status.#{document.payment_status}")

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

@@ -1,51 +1 @@
-.billing_machine
-  .panel.panel-default
-    .panel-heading: .panel-title = t("actions.email")
-
-    .panel-body
-      = horizontal_form_for :email do |f|
-        = f.input(:subject,
-          :as => :string,
-          :label => t("attributes.email_subject"),
-          :input_html => {value: @subject},
-        )
-
-        = f.input(:from,
-          :disabled => true,
-          :label => t("attributes.email_from"),
-          :input_html => {value: "#{current_user} <#{current_user.email}>"},
-        )
-
-        = f.input(:to,
-          :disabled => true,
-          :label => t("attributes.email_to"),
-          :input_html => {value: "#{@invoice.customer} <#{@invoice.customer.email}>"},
-        )
-
-        = f.input(:attachment,
-          :disabled => true,
-          :label => t("attributes.email_attachment"),
-          :input_html => {value: "#{@invoice.class.t}_#{@invoice.tracking_id}.pdf"},
-        )
-
-        = f.input(:body,
-          :as => :text,
-          :label => t("attributes.email_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
+= render "dorsale/billing_machine/commons/email", document: @invoice

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

@@ -1 +1,6 @@
-= render "dorsale/billing_machine/invoices/details", document: document
+= render "dorsale/billing_machine/commons/details", document: document
+
+
+- if action_name == "show"
+  .attachments-panel
+    = attachments_for(document)

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

@@ -1 +1 @@
-= render "dorsale/billing_machine/invoices/form", document: @quotation
+= render "dorsale/billing_machine/commons/form", document: @quotation

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

@@ -1 +1 @@
-= render "dorsale/billing_machine/invoices/header_infos"
+= render "dorsale/billing_machine/commons/header_infos"

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

@@ -1 +1 @@
-= render "dorsale/billing_machine/invoices/line_fields", f: f
+= render "dorsale/billing_machine/commons/line_fields", f: f

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

@@ -7,7 +7,10 @@
 - if policy(@quotation).copy?
   = copy_button dorsale.copy_billing_machine_quotation_path(@quotation), method: :post, confirm: true
 
-- if policy(@quotation).create?
+- if policy(@quotation).email?
+  = bs_button dorsale.email_billing_machine_quotation_path(@quotation), action: :email, icon: :send
+
+- if policy(@quotation).create_invoice?
   = bs_button dorsale.create_invoice_billing_machine_quotation_path(@quotation), action: :create_invoice, icon: :magic
 
 - if policy(@quotation).delete?

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

@@ -1 +1,7 @@
-= render "dorsale/billing_machine/invoices/show_title", document: document
+= document.t
+- if document.tracking_id.present?
+  = " n° "
+  = document.tracking_id
+
+.label class="quotation #{quotation_state_classes(document)}"
+  = document.t("state.#{document.state}")

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

@@ -0,0 +1 @@
+= render "dorsale/billing_machine/commons/email", document: @quotation

data/app/views/dorsale/forms/_send_email_buttons.html.slim

@@ -0,0 +1,10 @@
+.actions
+  button.btn.btn-success type="submit"
+    = icon(:send)
+    = " "
+    = t("actions.send")
+
+  a.btn.btn-default href=back_url
+    = icon(:times)
+    = " "
+    = t("actions.cancel")

data/config/locales/billing_machine.en.yml

@@ -72,9 +72,13 @@ en:
         canceled: "Canceled"
         not_canceled: "Not canceled"
 
-  emails:
-    invoices:
-      send_invoice_to_customer: ""
+  billing_machine:
+    emails:
+      invoice:
+        body: ""
+
+      quotation:
+        body: ""
 
   messages:
     invoices:
@@ -85,7 +89,7 @@ en:
       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."
+      email_error : "Unable to send invoice to customer."
 
     quotations:
       create_ok : "Quotation successfully created."
@@ -94,4 +98,5 @@ en:
       update_error : "Impossible to update this quotation."
       copy_ok : "Quotation successfully duplicated."
       create_invoice_ok : "Invoice successfully created from quotation."
-
+      email_ok : "Quotation successfully sent to customer."
+      email_error : "Unable to send quotation to customer."

data/config/locales/billing_machine.fr.yml

@@ -72,9 +72,13 @@ fr:
         canceled: "Annulé"
         not_canceled: "Non annulé"
 
-  emails:
-    invoices:
-      send_invoice_to_customer: "Bonjour,\n\nVeuillez-trouver ci-joint votre facture.\n\nCordialement,\n%{from}"
+  billing_machine:
+    emails:
+      invoice:
+        body: "Bonjour,\n\nVeuillez-trouver ci-joint votre facture.\n\nCordialement,\n%{from}"
+
+      quotation:
+        body: "Bonjour,\n\nVeuillez-trouver ci-joint votre devis.\n\nCordialement,\n%{from}"
 
   messages:
     invoices:
@@ -85,7 +89,7 @@ fr:
       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."
+      email_error : "Impossible d'envoyer la facture au client."
 
     quotations:
       create_ok : "Le devis a été créé."
@@ -94,3 +98,5 @@ fr:
       update_error : "Erreur dans la modification du devis."
       copy_ok : "Le devis a été dupliqué."
       create_invoice_ok : "La facture a été créée depuis le devis"
+      email_ok : "Le devis a été envoyée au client."
+      email_error : "Impossible d'envoyer le devis au client."

data/config/locales/dorsale.en.yml

@@ -40,3 +40,14 @@ en:
       dorsale/comment:
         title: "Title (optional)"
         text: "Comment"
+
+  activemodel:
+    attributes:
+      dorsale/email:
+        from: "From"
+        to: "To"
+        cc: "Copy"
+        subject: "Subject"
+        body: "Message"
+        attachments: "Attachments"
+        attachment_names: "Attachments"

data/config/locales/dorsale.fr.yml

@@ -40,3 +40,14 @@ fr:
       dorsale/comment:
         title: "Titre (facultatif)"
         text: "Commentaire"
+
+  activemodel:
+    attributes:
+      dorsale/email:
+        from: "Expéditeur"
+        to: "Destinataire"
+        cc: "Copie cachée"
+        subject: "Objet"
+        body: "Message"
+        attachments: "Pièces jointes"
+        attachment_names: "Pièces jointes"

data/config/routes.rb

@@ -34,6 +34,9 @@ Dorsale::Engine.routes.draw do
     resources :payment_terms, except: [:destroy, :show]
 
     resources :invoices, except: [:destroy] do
+      collection do
+        post :preview
+      end
       member do
         get :copy
         patch :pay
@@ -42,8 +45,14 @@ Dorsale::Engine.routes.draw do
     end
 
     resources :quotations do
-      post :copy, on: :member
-      get :create_invoice, on: :member
+      collection do
+        post :preview
+      end
+      member do
+        post :copy
+        get :create_invoice
+        match :email, via: [:get, :post]
+      end
     end
   end
 
@@ -53,7 +62,6 @@ Dorsale::Engine.routes.draw do
   get "customer_vault/individuals"  => "customer_vault/people#individuals"
 
   namespace :customer_vault do
-
     resources :activity_types, except: [:destroy, :show]
     resources :origins, except: [:destroy, :show]
 
@@ -97,5 +105,4 @@ Dorsale::Engine.routes.draw do
 
     get "/" => redirect{ ExpenseGun::Engine.routes.url_helpers.expenses_path }
   end
-
 end

data/config/schedule.rb

@@ -1,5 +1,5 @@
 if ENV["RAILS_ENV"] == "production"
   every :day, at: "7 am" do
-    runner "Dorsale::Flyboy::TaskCommands.send_daily_term_emails"
+    runner "Dorsale::Flyboy::TaskCrons.send_daily_term_emails!"
   end
 end

data/features/billing_machine_invoices.feature

@@ -48,6 +48,13 @@ Feature: Invoice Management
     When the user goes to the invoice details
     Then he can see all the informations
 
+  Scenario: Invoice preview
+    When the user goes to the invoices page
+    And he creates a new invoice
+    And he click on the preview invoice button
+    Then he see the invoice preview
+    And no invoice is created
+
   Scenario: New invoice for existing customer
     And an existing customer
     And an existing payment term

data/features/billing_machine_quotations.feature

@@ -35,12 +35,26 @@ Feature: Quotation Management
     When the user goes to the quotation details
     Then he can see all the quotation informations
 
+  Scenario: Quotation preview
+    When the user goes to the quotations page
+    And he creates a new quotation
+    And he click on the preview quotation button
+    Then he see the quotation preview
+    And no quotation is created
+
   Scenario: Quotation copy
     Given an existing quotation
     When the user goes to the quotation details
     And he copy the quotation
     Then he is on the created quotation edit page
 
+  Scenario: Send quotation by email
+    Given an existing customer
+    And an existing quotation
+    When the user goes to the quotation details
+    And he send quotation to customer by email
+    Then an quotation is sent to customer
+
   Scenario: Quotation to invoice
     Given an existing quotation
     When the user goes to the quotation details

data/features/step_definitions/billing_machine_invoices_steps.rb

@@ -358,3 +358,20 @@ When(/^he filters invoices between two date$/) do
   fill_in :filters_bm_date_end,   with: I18n.l(Date.current)
   find(".filter-submit").click
 end
+
+When(/^he click on the preview invoice button$/) do
+  @invoices_count = Dorsale::BillingMachine::Invoice.count
+  controller = Dorsale::BillingMachine::InvoicesController
+  expect_any_instance_of(controller).to receive(:preview).and_call_original
+  expect_any_instance_of(controller).to_not receive(:create)
+  expect_any_instance_of(controller).to_not receive(:update)
+  find("#preview-button").click
+end
+
+Then(/^he see the invoice preview$/) do
+  expect(windows.count).to eq 2
+end
+
+Then(/^no invoice is created$/) do
+  expect(Dorsale::BillingMachine::Invoice.count).to eq @invoices_count
+end

data/features/step_definitions/billing_machine_quotations_steps.rb

@@ -208,3 +208,43 @@ Then(/^only the "(.*?)" quotations appear$/) do |state|
   expect(page).to have_selector("tr.quotation", count: 1)
   expect(find("tr.quotation")).to have_content(state_i18n)
 end
+
+When(/^he send quotation to customer by email$/) do
+  ActionMailer::Base.deliveries.clear
+
+  Dorsale::BillingMachine::PdfFileGenerator.(@quotation)
+  @quotation.customer = create(:customer_vault_corporation, email: "aaa@example.org")
+  @quotation.save!
+
+  find("[href$=email]").click
+  fill_in :email_subject, with: "abc"
+  fill_in :email_body, with: "def"
+  find("[type=submit]").click
+end
+
+Then(/^an quotation is sent to customer$/) do
+  expect(ActionMailer::Base.deliveries.count).to eq 1
+  email = ActionMailer::Base.deliveries.first
+
+  expect(email.to).to include "aaa@example.org"
+  expect(email.subject).to eq "abc"
+  expect(email.parts.first.body).to eq "def"
+  expect(email.attachments.count).to eq 1
+end
+
+When(/^he click on the preview quotation button$/) do
+  @invoices_count = Dorsale::BillingMachine::Quotation.count
+  controller = Dorsale::BillingMachine::QuotationsController
+  expect_any_instance_of(controller).to receive(:preview).and_call_original
+  expect_any_instance_of(controller).to_not receive(:create)
+  expect_any_instance_of(controller).to_not receive(:update)
+  find("#preview-button").click
+end
+
+Then(/^he see the quotation preview$/) do
+  expect(windows.count).to eq 2
+end
+
+Then(/^no quotation is created$/) do
+  expect(Dorsale::BillingMachine::Quotation.count).to eq @invoices_count
+end

data/features/step_definitions/flyboy_tasks_steps.rb

@@ -55,7 +55,7 @@ end
 
 When(/^the flyboy daily crons run$/) do
   ActionMailer::Base.deliveries.clear
-  Dorsale::Flyboy::TaskCommands.send_daily_term_emails!
+  Dorsale::Flyboy::TaskCrons.send_daily_term_emails!
 end
 
 When(/^I create a task$/) do

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.9.3"
+  VERSION = "3.9.4"
 end

data/spec/controllers/dorsale/billing_machine/invoices_controller_spec.rb

@@ -6,6 +6,22 @@ describe Dorsale::BillingMachine::InvoicesController, type: :controller do
   let(:user) { create(:user) }
   before(:each) { sign_in(user) }
 
+  describe "#preview" do
+    render_views
+
+    it "should render show" do
+      post :preview
+      expect(response).to render_template(:show)
+    end
+
+    it "should not save" do
+      post :preview
+      @invoice = assigns(:invoice)
+      expect(@invoice).to be_valid
+      expect(@invoice).to_not be_persisted
+    end
+  end # describe "#preview" do
+
   describe "XLSX export" do
     render_views