dorsale 2.1.8 → 2.1.9

data/config/locales/billing_machine.en.yml

@@ -47,15 +47,45 @@ en:
         custom_info_2: "custom informations (2)"
         custom_info_3: "custom informations (3)"
         logo: "logo"
+  pdf:
+    your_contact: "Your contact : "
+    contact_phone: "Phone : "
+    contact_email: "Email : "
+    contact_fax: "Fax : "
+    subject: "Subject : "
+    tracking_number: "Number : "
+    date: "Date : "
+    customer: "Customer :"
+    designation: "DESIGNATION"
+    quantity: "QUANTITY"
+    unity: "UNITY"
+    tax: "TAX %"
+    unit_price: "UNIT PRICE"
+    line_total: "TOTAL"
+    payment_terms: "Payment terms:"
+    iban: "IBAN :"
+    bic_swift: "BIC / SWIFT :"
+    info_phone: "Phone :"
+    info_fax: "Fax :"
+    capital: "capital :"
+    registration: "registration :"
+    siret: "SIRET "
+    tva: "TVA "
+    expires_at: "Expires at : "
 
   messages:
     invoices:
       create_ok : "Invoice successfully created."
       update_ok : "Invoice successfully updated."
+      create_error : "Impossible to create this invoice."
+      update_error : "Impossible to update this invoice."
       pay_ok    : "This invoice has been marked payed."
       pay_error : "Impossible to mark this invoice as payed."
     quotations:
       create_ok : "Quotation successfully created."
       update_ok : "Quotation successfully created."
+      create_error : "Impossible to create this quotation."
+      update_error : "Impossible to update this quotation."
       copy_ok : "Quotation successfully duplicated."
       create_invoice_ok : "Invoice successfully created from quotation."
+

data/config/locales/billing_machine.fr.yml

@@ -47,15 +47,48 @@ fr:
         custom_info_2: "information personalisées (2)"
         custom_info_3: "information personalisées (3)"
         logo: "logo"
+  pdfs:
+    your_contact: "Votre contact : "
+    contact_phone: "Téléphone : "
+    contact_email: "Email : "
+    contact_fax: "Fax : "
+    subject: "Objet : "
+    tracking_number: "Numéro : "
+    date: "Date : "
+    customer: "Client :"
+    designation: "DÉSIGNATION"
+    quantity: "QTITÉ"
+    unity: "UNITÉ"
+    tax: "TVA %"
+    unit_price: "P.U €HT"
+    line_total: "TOTAL €HT"
+    payment_terms: "Conditions de paiement :"
+    iban: "IBAN :"
+    bic_swift: "BIC / SWIFT :"
+    info_phone: "Tel. :"
+    info_fax: "Fax :"
+    capital: "au capital de"
+    registration: "RCS "
+    siret: "SIRET "
+    vat: "TVA "
+    commercial_discount: "REMISE"
+    total_duty: "TOTAL HT"
+    advance: "ACOMPTE"
+    total_all_taxes: "TOTAL TTC"
+    expires_at: "Date d'expiration : "
 
   messages:
     invoices:
       create_ok : "La facture a été créée."
       update_ok : "La facture a été modifiée."
+      create_error : "Erreur dans la création de la facture."
+      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."
     quotations:
       create_ok : "Le devis a été créé."
       update_ok : "Le devis a été modifié."
+      create_error : "Erreur dans la création du devis."
+      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"

data/lib/dorsale/engine.rb

@@ -43,6 +43,7 @@ require "dorsale/alexandrie/prawn"
 require "acts-as-taggable-on"
 require "active_record_comma_type_cast"
 
+
 module Dorsale
   class Engine < ::Rails::Engine
     isolate_namespace Dorsale

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.1.8"
+  VERSION = "2.1.9"
 end

data/spec/pdfs/dorsale/billing_machine/invoice_pdf_spec.rb

@@ -2,12 +2,6 @@ require "rails_helper"
 
 describe ::Dorsale::BillingMachine::InvoicePdf, pdfs: true do
 
-  def self.it_should_write(string)
-    it "should write '#{string}'" do
-      text.strings.should include string
-    end
-  end
-
   let(:customer) {
     create(:customer_vault_corporation)
   }
@@ -29,12 +23,14 @@ describe ::Dorsale::BillingMachine::InvoicePdf, pdfs: true do
     contact_email: 'email@example.org',
     iban: 'FR76 0000 0000 0000 0000 0000 000',
     bic_swift: 'PSSTTHEGAME',
-    custom_info_1: "Mention légale" + "\n" + "Tout retard de règlement donnera lieu de plein droit et sans qu’aucune mise en demeure ne soit nécessaire au paiement de " +
+    custom_info_1: "Tout retard de règlement donnera lieu de plein droit et sans qu’aucune mise en demeure ne soit nécessaire au paiement de " +
         'pénalités de retard sur la base du taux BCE majoré de dix (10) points et au paiement d’une indemnité forfaitaire pour frais de ' +
         'recouvrement d’un montant de 999999€'
     ) }
 
-  let(:invoice) { create(:billing_machine_invoice,
+  let(:invoice) {
+
+    i = create(:billing_machine_invoice,
       date: '16/04/2014',
       id_card: id_card,
       customer: customer,
@@ -44,218 +40,202 @@ describe ::Dorsale::BillingMachine::InvoicePdf, pdfs: true do
       total_all_taxes: 2167.79,
       advance: 1.79,
       vat_rate: 19.6,
-      balance: 2166.0) }
+      balance: 2166.0)
 
-  let(:invoice_line) { create(:billing_machine_invoice_line,
-    invoice_id: invoice.id,
+    create(:billing_machine_invoice_line,
+    invoice: i,
     quantity: 3.14,
     unit: 'heures',
     unit_price: 2.54,
-    total: 7.98) }
+    total: 7.98)
 
-  let(:invoice_line_2) { create(:billing_machine_invoice_line,
-    invoice_id: invoice.id,
+    create(:billing_machine_invoice_line,
+    invoice: i,
     label: 'Truc',
     quantity: 42.42,
     unit: 'nuts',
     unit_price: 42.54,
-    total: 1804.55) }
+    total: 1804.55)
+
+    i.reload
+  }
 
   let(:pdf) {
     invoice.pdf
   }
 
+  let(:content) {
+    tempfile = Tempfile.new("pdf")
+    tempfile.binmode
+    tempfile.write(pdf.render)
+    tempfile.flush
+    Yomu.new(tempfile.path).text
+   }
+
   describe "#initialize" do
     it 'inherits from Prawn::Document' do
-      pdf.should be_kind_of(Prawn::Document)
+      expect(pdf).to be_kind_of(Prawn::Document)
     end
 
     it 'should assign @main_document' do
-      pdf.main_document.should eq(invoice)
+       expect(pdf.main_document).to eq invoice
     end
   end
 
-  describe "#build" do
-    let(:text) { PDF::Inspector::Text.analyze(pdf.render) }
-
-    context 'when the id card is empty' do
-      let(:id_card) {
-        ::Dorsale::BillingMachine::IdCard.create(id_card_name: 'default')
-      }
-      it 'should not crash' do
-        pdf.build
-      end
-    end
-
-    before do
-      invoice.lines << invoice_line
-      invoice.lines << invoice_line_2
+  describe 'when the id card is empty' do
+    let(:id_card) {
+      ::Dorsale::BillingMachine::IdCard.create(id_card_name: 'default')
+    }
+    it 'should not crash' do
       pdf.build
     end
-    context 'in Mentions légales - Coin supérieur droit' do
-      it_should_write 'HEYHO'
-      it_should_write 'SIRET 000 000 000 00000 APE 0000A'
-      it_should_write 'SARL au capital de 1.000.000.000 euros'
-      it_should_write 'RCS MARSEILLE 000 000 000'
-      it_should_write 'N° TVA FR 00 000 000 000 000 00'
-      it_should_write '42 Avenue de Ruby'
-      it_should_write '13004 Marseille'
-    end
-
-    context 'in Entete de facturation' do
+  end
 
-    it_should_write 'Facture'
+  describe 'Id card informations' do
+    it 'is expected to print the right information' do
+      expect(content).to include 'HEYHO'
+      expect(content).to include 'SIRET 000 000 000 00000 '
+      expect(content).to include 'SARL au capital de 1.000.000.000 €'
+      expect(content).to include 'RCS MARSEILLE 000 000 000'
+      expect(content).to include 'TVA FR 00 000 000 000 000 00'
+      expect(content).to include '42 Avenue de Ruby'
+      expect(content).to include '13004 Marseille'
+    end
+  end
 
+  describe 'Header' do
     it "should write invoice tracking id" do
-      text.strings.should include ' N°' + invoice.tracking_id
+      expect(content).to include 'Facture'
+      expect(content).to include 'Numéro :'
+      expect(content).to include invoice.tracking_id
     end
-    it "should write 'Marseille le ' and invoice date" do
-      text.strings.should include 'Marseille le ' + '16 avril 2014'
-    end
-
-      context 'in Informations contact' do
-        it_should_write 'Contact :'
-        it_should_write ' Jane Doe'
-        it_should_write 'Tél :'
-        it_should_write ' +33.6.00.00.00.00'
-        it_should_write 'Fax:'
-        it_should_write ' +33.9.00.00.00.00'
-        it_should_write 'Email:'
-        it_should_write ' email@example.org'
-      end
-
-      context 'in Informations client' do
-        it_should_write 'A l’attention de :'
-
-        it "should write customer name" do
-          text.strings.should include invoice.customer.name
-        end
 
-        it "should write customer address" do
-          text.strings.should include invoice.customer.address.street
-          text.strings.should include invoice.customer.address.street_bis
-        end
-
-        it "should write customer zip and city" do
-          text.strings.should include invoice.customer.address.zip.to_s +
-           ' ' + invoice.customer.address.city.to_s
-        end
-
-        it "should write customer country" do
-          text.strings.should include invoice.customer.address.country
-        end
-      end # context in Informations client
-    end # context in Entete de facturation
-
-    it "shoud write 'Objet :' and invoice label" do
-      text.strings.should include 'Objet :'
-      text.strings.should include ' ' + invoice.label
+    it "is expected to print invoice date" do
+      expect(content).to include 'Date : ' + '16/04/2014'
     end
 
-    context "in Tableau" do
-      it_should_write 'Prestation'
-      it_should_write 'Prix'
-      it_should_write 'unitaire'
-      it_should_write 'Quantité'
-      it_should_write 'Total HT'
-
-
-      context "in Lignes de facturation" do
-        it 'should write invoice line label of each invoice line' do
-          invoice.lines.each do |line|
-            text.strings.should include line.label
-          end
-        end
-
-        it 'should write invoice line quantity of each line' do
-          text.strings.should include '3,14'
-          text.strings.should include '42,42'
-        end
-
-        it 'should write invoice line unit_price of each line' do
-          text.strings.should include '2,54 €'
-          text.strings.should include '42,54 €'
-        end
-
-        it 'should write invoice line total of each line' do
-          text.strings.should include '7,98 €'
-          text.strings.should include '1.804,55 €'
-        end
-      end # context in Lignes de facturation
-
-      context 'in Synthèse' do
+    it 'is expected to print contact informations' do
+      expect(content).to include 'Jane Doe'
+      expect(content).to include 'Téléphone :'
+      expect(content).to include ' +33.6.00.00.00.00'
+      expect(content).to include 'Fax :'
+      expect(content).to include ' +33.9.00.00.00.00'
+      expect(content).to include 'Email :'
+      expect(content).to include ' email@example.org'
+    end
+  end
 
-        it_should_write 'Remise commerciale'
-        it_should_write '100,23 €'
+  describe 'customer information' do
+    it "should write customer name" do
+      expect(content).to include 'Client :'
+      expect(content).to include invoice.customer.name
+    end
 
-        it_should_write 'Total HT'
-        it_should_write '1.712,29 €'
+    it "is expected to print customer address" do
+      expect(content).to include invoice.customer.address.street
+      expect(content).to include invoice.customer.address.street_bis
+    end
 
-        it_should_write 'TVA 19,6 %'
-        it_should_write '335,61 €'
+    it "is expected to print customer zip and city" do
+      expect(content).to include invoice.customer.address.zip.to_s +
+       ' ' + invoice.customer.address.city.to_s
+    end
 
-        it_should_write 'Total TTC'
-        it_should_write '2.047,90 €'
+   it "is expected to print 'Objet :' and invoice label" do
+     expect(content).to include 'Objet : '
+     expect(content).to include invoice.label
+    end
+  end
 
-        it_should_write 'Acompte reçu sur commande'
-        it_should_write '1,79 €'
+  describe "product table" do
+    it "is expected to print the header" do
+      expect(content).to include 'DÉSIGNATION'
+      expect(content).to include 'QTITÉ'
+      expect(content).to include 'UNITÉ'
+      expect(content).to include 'P.U €HT'
+      expect(content).to include 'TOTAL €HT'
+    end
+    it 'is expected to print invoice line label of each invoice line' do
+      invoice.lines.each do |line|
+        expect(content).to include line.label
+      end
+    end
 
-        it_should_write 'Solde à payer'
-        it 'should write balance calculated using total_all_taxes - advance' do
-          text.strings.should include '2.046,11 €'
-        end
+    it 'is expected to print invoice line quantity of each line' do
+      expect(content).to include '3,14'
+      expect(content).to include '42,42'
+    end
 
+    it 'is expected to print invoice line unit_price of each line' do
+      expect(content).to include '2,54 €'
+      expect(content).to include '42,54 €'
+    end
 
-        context 'without advance' do
+    it 'is expected to print invoice line total of each line' do
+      expect(content).to include '7,98 €'
+      expect(content).to include '1 804,55 €'
+    end
+  end
 
-          before(:each) do
-            invoice_incomplete=create(:billing_machine_invoice, total_duty: 1000, vat_amount: 196,
-              total_all_taxes: 1196, advance: 0, balance: 1146 , customer: customer,
-              date: '2014-04-16', vat_rate: 19.6, id_card: id_card)
-            pdf_incomplete = invoice_incomplete.pdf
-            pdf_incomplete.build
-            @text_incomplete = PDF::Inspector::Text.analyze(pdf_incomplete.render)
-          end
+  describe 'Total table' do
+    it 'is expected to print all the invoice synthesis' do
+      expect(content).to include 'REMISE'
+      expect(content).to include '- 100,23 €'
+      expect(content).to include 'TOTAL HT'
+      expect(content).to include '1 712,29 €'
+      expect(content).to include 'TVA 19,60 %'
+      expect(content).to include '335,61 €'
+      expect(content).to include 'ACOMPTE'
+      expect(content).to include '1,79 €'
+      expect(content).to include 'TOTAL TTC'
+      expect(content).to include '2 046,11 €'
+    end
+  end
 
-          it 'should not write Acompte reçu sur commande' do
-            @text_incomplete.strings.should_not include 'Acompte reçu sur commande'
-          end
 
-          it 'should not write Remise commerciale' do
-            @text_incomplete.strings.should_not include 'Remise commerciale'
-          end
+  describe 'Footer' do
+    it 'is expected to print invoice payment term' do
+      expect(content).to include 'Conditions de paiement :'
+      expect(content).to include invoice.payment_term.label
+    end
 
-          it 'should not write Solde à payer' do
-            @text_incomplete.strings.should_not include 'Solde à payer'
-          end
+    it 'is expected to print current and total page number' do
+      expect(content).to include 'page 1/1'
+    end
 
-        end
-      end
-    end # context in Tableau
-    it_should_write 'Conditions de paiement :'
+    it 'is expected to print invoice legals and banks' do
+      expect(content).to include 'IBAN : FR76 0000 0000 0000 0000 0000 000'
+      expect(content).to include 'BIC / SWIFT : PSSTTHEGAME'
+      expect(content).to include 'Tout retard de règlement donnera lieu de plein droit et sans qu’aucune mise en demeure ne soit nécessaire au paiement de'
+      expect(content).to include 'pénalités de retard sur la base du taux BCE majoré de dix (10) points et au paiement d’une indemnité forfaitaire pour frais de'
+      expect(content).to include 'recouvrement d’un montant de 999999€'
+    end
+  end
 
-    it 'should write invoice payment term' do
-      text.strings.should include invoice.payment_term.label
+  describe 'incomplete invoice' do
+    before(:each) do
+      invoice_incomplete=create(:billing_machine_invoice, total_duty: 1000, vat_amount: 196,
+        total_all_taxes: 1196, advance: 0, balance: 1146 , customer: customer,
+        date: '2014-04-16', vat_rate: 19.6, id_card: id_card)
+      pdf_incomplete = invoice_incomplete.pdf
+      pdf_incomplete.build
+      tempfile = Tempfile.new("pdf")
+      tempfile.binmode
+      tempfile.write(pdf_incomplete.render)
+      tempfile.flush
+      @incomplete_content = Yomu.new(tempfile.path).text
     end
 
-    it_should_write 'Coordonnées bancaires :'
-    it_should_write 'IBAN : FR76 0000 0000 0000 0000 0000 000'
-    it_should_write 'BIC / SWIFT : PSSTTHEGAME'
+    it 'is expected not to print ACOMPTE' do
+      expect(@incomplete_content).to_not include 'ACOMPTE'
+    end
 
-    context 'in Mentions légales - Bas de page' do
-      it_should_write 'Mention légale'
-      it_should_write 'Tout retard de règlement donnera lieu de plein droit et sans qu’aucune mise en demeure ne soit nécessaire au paiement de'
-      it_should_write 'pénalités de retard sur la base du taux BCE majoré de dix (10) points et au paiement d’une indemnité forfaitaire pour frais de'
-      it_should_write 'recouvrement d’un montant de 999999€'
+    it 'is expected not to print REMISE' do
+      expect(@incomplete_content).to_not include 'REMISE'
     end
-  end # describe #build
 
-  describe "missing data" do
-    it "missing payment_term should be OK" do
-      invoice = create(:billing_machine_invoice, payment_term: nil)
-      pdf     = invoice.pdf
-      pdf.build
-      PDF::Inspector::Text.analyze(pdf.render)
+    it 'is expected to print TOTAL TTC' do
+      expect(@incomplete_content).to include 'TOTAL TTC'
     end
   end
-end
+end