dorsale 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7376b6c7d46d198bbede8be8663db10631de53
-  data.tar.gz: 6b83f90d10b65ccc90b864f6f4fd0aaeb795d732
+  metadata.gz: 28eb1c98bdece057979af2bc922aaca17f24f3e9
+  data.tar.gz: a7033e420547043adc5e9a096f541d6196c06498
 SHA512:
-  metadata.gz: 57aef075a9310b76cca63a2f7da3b3e9e6edfb5d2e7b25689c78800e2d14f3bb452fb0c177f52c88287df18aeb70a452deb0ebc44399b1551025723fc235b33a
-  data.tar.gz: 24765f16d7bba8aef49ffe422c7f506e01b265beda6eebf86a292886819b95447ce1e5fc30c49edb5ca54bf23d9a4cd605f71aa21524a593cdc40a84fe85059e
+  metadata.gz: 9e27c04cec5d074974d8a54848037b144bff4fb706d11da476bf206bb3e56d95559f408aed6f058b60a1ed82e4062406d97bb1a20da36b69b28776ce5827618c
+  data.tar.gz: 09c33cdf4e97216007092392cab0d875d214fa49a5ef5b2d2b77c8459eef796a6650138fc3cdf848222f34db2a7de5961b84cee49a1966f6c3d2f82a8cb1b7c0

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

@@ -0,0 +1,4 @@
+body[class*=devise] #main,
+body[data-controller*=devise] #main,
+  max-width: 40em
+  margin: auto

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

@@ -37,6 +37,7 @@ module Dorsale
 
       def header_height;         90.mm; end
       def logo_height;           32.mm; end
+      def logo_width;            50.mm; end
 
       def footer_height;         40.mm; end
       def footer_top_height;     15.mm; end
@@ -107,12 +108,12 @@ module Dorsale
       def build_logo
         return if logo_path.nil?
 
-        width  = 3.2.cm
         height = logo_height
+        width  = logo_width
 
         bounding_box [bounds.left, bounds.top], width: width, height: height do
           draw_bounds_debug
-          image logo_path, width: (bounds.width - 1.cm)
+          image logo_path, fit: [width, height]
         end
       end
 
@@ -125,27 +126,27 @@ module Dorsale
         ].select(&:present?).join(", ")
       end
 
+      def contact_content
+        content = []
+        content << "<b>#{@id_card.entity_name}</b>"                                           if @id_card.entity_name.present?
+        content << "<b>#{contact_address_line}</b>"                                           if contact_address_line.present?
+        content << " "
+        content << "<b>#{main_document.t(:your_contact)} : #{@id_card.contact_full_name}</b>" if @id_card.contact_full_name.present?
+        content << "<b>#{main_document.t(:contact_phone)} : </b> #{@id_card.contact_phone}"   if @id_card.contact_phone.present?
+        content << "<b>#{main_document.t(:contact_fax)} : </b> #{@id_card.contact_fax}"       if @id_card.contact_fax.present?
+        content << "<b>#{main_document.t(:contact_email)} : </b> #{@id_card.contact_email}"   if @id_card.contact_email.present?
+        content.join("\n")
+      end
+
       def build_contact
         top    = bounds.top - 4.cm
         left   = bounds.left
         width  = bounds.width / 2 - 1.1.cm
         height = 2.5.cm
 
-        contact_text = []
-        contact_text << "<b>#{@id_card.entity_name}</b>"                                           if @id_card.entity_name.present?
-        contact_text << "<b>#{contact_address_line}</b>"                                           if contact_address_line.present?
-        contact_text << " "
-        contact_text << "<b>#{main_document.t(:your_contact)} : #{@id_card.contact_full_name}</b>" if @id_card.contact_full_name.present?
-        contact_text << "<b>#{main_document.t(:contact_phone)} : </b> #{@id_card.contact_phone}"   if @id_card.contact_phone.present?
-        contact_text << "<b>#{main_document.t(:contact_fax)} : </b> #{@id_card.contact_fax}"       if @id_card.contact_fax.present?
-        contact_text << "<b>#{main_document.t(:contact_email)} : </b> #{@id_card.contact_email}"   if @id_card.contact_email.present?
-        contact_text = contact_text.join("\n")
-
         bounding_box [left, top], width: width, height: height do
           draw_bounds_debug
-          font_size 8 do
-            text contact_text, inline_format: true
-          end
+          text contact_content, inline_format: true, size: 8
         end
       end
 
@@ -364,27 +365,30 @@ module Dorsale
         height = top - bounds.bottom
         width  = 10.cm
 
-        font_size 9 do
-          text_box main_document.comments,
-            :at       => [bounds.left, top],
-            :height   => height,
-            :width    => width,
-            :overflow => :shrink_to_fit
-        end
+        text_box main_document.comments,
+          :at       => [bounds.left, top],
+          :height   => height,
+          :width    => width,
+          :overflow => :shrink_to_fit,
+          :size     => 9
       end
 
       def build_payment_conditions
-        top = bounds.top - products_table_height - 5.mm
-        height = 1.cm
+        return if main_document.payment_term.blank?
+
+        top    = bounds.top - products_table_height - 5.mm
+        height = 15.mm
         width  = 7.5.cm
 
-        bounding_box [bounds.left, top], height: height, width: width do
-          draw_bounds_debug
-          font_size 9 do
-            text main_document.t(:payment_terms), style: :bold if main_document.payment_term.present?
-            text main_document.payment_term.try(:label)
-          end
-        end
+        txt = "<b>#{main_document.t(:payment_terms)}</b> : #{main_document.payment_term}"
+
+        text_box txt,
+          :at            => [bounds.left, top],
+          :height        => height,
+          :width         => width,
+          :overflow      => :shrink_to_fit,
+          :inline_format => true,
+          :size          => 9
       end
 
       def build_expiry
@@ -424,13 +428,12 @@ module Dorsale
         height = footer_top_height
         width  = bounds.width
 
-        font_size 9 do
-          text_box footer_top_content,
-            :at       => [bounds.left, top],
-            :height   => height,
-            :width    => width,
-            :overflow => :shrink_to_fit
-        end
+        text_box footer_top_content,
+          :at       => [bounds.left, top],
+          :height   => height,
+          :width    => width,
+          :overflow => :shrink_to_fit,
+          :size          => 9
       end
 
       def build_footer_line
@@ -462,13 +465,12 @@ module Dorsale
         top    = bounds.bottom + height
         width  = bounds.width
 
-        font_size 9 do
-          text_box footer_bottom_content,
-            :at       => [bounds.left, top],
-            :height   => height,
-            :width    => width,
-            :overflow => :shrink_to_fit
-        end
+        text_box footer_bottom_content,
+          :at       => [bounds.left, top],
+          :height   => height,
+          :width    => width,
+          :overflow => :shrink_to_fit,
+          :size     => 9
       end
 
       def build_page_numbers
@@ -477,10 +479,8 @@ module Dorsale
         width  = bounds.width
 
         bounding_box [0, top], height: height, width: bounds.width do
-          font_size 9 do
-            float do
-              number_pages "page <page>/<total>", align: :right
-            end
+          float do
+            number_pages "page <page>/<total>", align: :right, size: 9
           end
         end
       end

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

@@ -25,15 +25,13 @@ module Dorsale
       def build_expiry
         return if main_document.expires_at.nil?
 
-        top = bounds.top - 11.5.cm
+        top    = bounds.top - 11.5.cm
         height = 0.5.cm
         width  = 7.5.cm
 
         bounding_box [bounds.left, top], height: height, width: width do
           draw_bounds_debug
-          font_size 9 do
-            text "<b>#{main_document.t(:expires_at)}</b> #{I18n.l(main_document.expires_at)}", inline_format: true
-          end
+          text "<b>#{main_document.t(:expires_at)}</b> #{I18n.l(main_document.expires_at)}", inline_format: true, size: 9
         end
       end
     end

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.6.1"
+  VERSION = "2.6.2"
 end

data/spec/controllers/dorsale/alexandrie/attachments_controller_spec.rb

@@ -18,13 +18,9 @@ describe Dorsale::Alexandrie::AttachmentsController, type: :controller do
     }
   }
 
-  let(:user) {
-    create(:user)
-  }
+  let(:user) { create(:user) }
 
-  before :each do
-    sign_in user
-  end
+  before(:each) { sign_in(user) }
 
   describe "create" do
     it "should create attachment" do

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

@@ -3,6 +3,10 @@ require "rails_helper"
 describe Dorsale::BillingMachine::QuotationsController, type: :controller do
   routes { Dorsale::Engine.routes }
 
+  let(:user) { create(:user) }
+
+  before(:each) { sign_in(user) }
+
   describe "#index" do
     it "stats should not include canceled quotations" do
       q1 = create(:billing_machine_quotation_line, quantity: 1, unit_price: 10)

data/spec/controllers/dorsale/comments_controller_spec.rb

@@ -3,10 +3,9 @@ require "rails_helper"
 describe Dorsale::CommentsController, type: :controller do
   routes { Dorsale::Engine.routes }
 
-  let(:user) {create(:user)}
-  before :each do
-    sign_in user
-  end
+  let(:user) { create(:user) }
+
+  before(:each) { sign_in(user) }
 
   let(:valid_attributes){
     commentable = DummyModel.create!(name: "A")

data/spec/controllers/dorsale/customer_vault/corporations_controller_spec.rb

@@ -1,9 +1,12 @@
 require "rails_helper"
 
 RSpec.describe ::Dorsale::CustomerVault::CorporationsController, type: :controller do
-
   routes { ::Dorsale::Engine.routes }
 
+  let(:user) { create(:user) }
+
+  before(:each) { sign_in(user) }
+
   let(:valid_attributes) {
     FactoryGirl.attributes_for(:customer_vault_corporation)
   }

data/spec/controllers/dorsale/customer_vault/individuals_controller_spec.rb

@@ -2,9 +2,12 @@ require "rails_helper"
 
 
 RSpec.describe ::Dorsale::CustomerVault::IndividualsController, type: :controller do
-
   routes { ::Dorsale::Engine.routes }
 
+  let(:user) { create(:user) }
+
+  before(:each) { sign_in(user) }
+
   let(:valid_attributes) {
     FactoryGirl.attributes_for(:customer_vault_individual)
   }

data/spec/controllers/dorsale/customer_vault/people_controller_spec.rb

@@ -2,7 +2,11 @@ require "rails_helper"
 
 RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
   routes { Dorsale::Engine.routes }
+
   let(:user) { create(:user) }
+
+  before(:each) { sign_in(user) }
+
   describe "#index" do
     it "should redirect to activity" do
       get :index

data/spec/controllers/dorsale/flyboy/folders_controller_spec.rb

@@ -1,8 +1,12 @@
 require "rails_helper"
 
 describe Dorsale::Flyboy::FoldersController, type: :controller do
-  render_views
   routes { Dorsale::Engine.routes }
+  render_views
+
+  let(:user) { create(:user) }
+
+  before(:each) { sign_in(user) }
 
   let(:folder){
     create(:flyboy_folder)

data/spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb

@@ -3,14 +3,13 @@ require "rails_helper"
 describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
   routes { Dorsale::Engine.routes }
 
+  let(:user) { create(:user) }
+
+  before(:each) { sign_in(user) }
+
   let(:task)         { create(:flyboy_task) }
   let(:task_comment) { create(:flyboy_task_comment, task: task) }
 
-  let(:user) {create(:user)}
-  before :each do
-    sign_in user
-  end
-  
   describe "#create" do
     it "should create the task_comment" do
       post :create, task_id: task.id, task_comment: task_comment.attributes

data/spec/controllers/dorsale/flyboy/tasks_controller_spec.rb

@@ -2,10 +2,10 @@ require "rails_helper"
 
 describe Dorsale::Flyboy::TasksController, type: :controller do
   routes { Dorsale::Engine.routes }
-  before(:each) do
-    @user = create(:user)
-    sign_in @user
-  end
+
+  let(:user) { create(:user) }
+
+  before(:each) { sign_in(user) }
 
   let!(:task) {
     create(:flyboy_task, done: false)
@@ -48,12 +48,6 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
   end
 
   describe "GET index" do
-    it "assigns all tasks as @tasks" do
-      Dorsale::UserScope.any_instance.stub(:tasks).and_return(Dorsale::Flyboy::Task.where(id: task.id))
-      get :index, {}
-      expect(assigns(:tasks).sort).to eq [task]
-    end
-
     context "when applying filter" do
       before do
         Dorsale::Flyboy::Task.destroy_all

data/spec/controllers/dorsale/small_data/filters_controller_spec.rb

@@ -1,55 +1,58 @@
 require "rails_helper"
 
-module Dorsale
-  describe SmallData::FiltersController, type: :controller do
-    routes { Dorsale::Engine.routes }
+describe Dorsale::SmallData::FiltersController, type: :controller do
+  routes { Dorsale::Engine.routes }
 
-    let(:filters) { {key: "value"} }
+  let(:user) { create(:user) }
 
-    before(:each) do
-      request.env["HTTP_REFERER"] = "where_i_came_from"
+  before(:each) { sign_in(user) }
+
+  let(:filters) { {key: "value"} }
+
+  before(:each) do
+    request.env["HTTP_REFERER"] = "where_i_came_from"
+  end
+
+  describe "create" do
+    let(:action) {post :create, filters: filters}
+
+    it "should redirect to refferer" do
+      action
+      expect(response).to redirect_to "where_i_came_from"
     end
 
-    describe "create" do
-      let(:action) {post :create, filters: filters}
-
-      it "should redirect to refferer" do
-        action
-        expect(response).to redirect_to "where_i_came_from"
-      end
-
-      it "should redirect to call back url if defined" do
-        post :create, filters: {key: "value"}, back_url: "xxx"
-        expect(response).to redirect_to "xxx"
-      end
-
-      it "should store the filter in cookie" do
-        action
-        expect(response.cookies["filters"]).to eq(filters.to_json)
-      end
-
-      it "should merge filters with previous filters" do
-        action
-        post :create, filters: {other_key: "value2"}
-        expect(response.cookies["filters"]).to eq({key: "value", other_key: "value2"}.to_json)
-      end
+    it "should redirect to call back url if defined" do
+      post :create, filters: {key: "value"}, back_url: "xxx"
+      expect(response).to redirect_to "xxx"
     end
 
-    describe "back_url" do
-      it "should reset page" do
-        post :create, filters: {}, back_url: "/dorsale/flyboy/tasks"
-        expect(response).to redirect_to "/dorsale/flyboy/tasks"
+    it "should store the filter in cookie" do
+      action
+      expect(response.cookies["filters"]).to eq(filters.to_json)
+    end
 
-        post :create, filters: {}, back_url: "/dorsale/flyboy/tasks?&sort=term&page=3"
-        expect(response).to redirect_to "/dorsale/flyboy/tasks?&sort=term"
+    it "should merge filters with previous filters" do
+      action
+      post :create, filters: {other_key: "value2"}
+      expect(response.cookies["filters"]).to eq({key: "value", other_key: "value2"}.to_json)
+    end
+  end
 
-        post :create, filters: {}, back_url: "/dorsale/flyboy/tasks?&sort=term&page=3&a=b"
-        expect(response).to redirect_to "/dorsale/flyboy/tasks?&sort=term&a=b"
+  describe "back_url" do
+    it "should reset page" do
+      post :create, filters: {}, back_url: "/dorsale/flyboy/tasks"
+      expect(response).to redirect_to "/dorsale/flyboy/tasks"
 
-        post :create, filters: {}, back_url: "/dorsale/flyboy/tasks?page=3&a=b"
-        expect(response).to redirect_to "/dorsale/flyboy/tasks?a=b"
-      end
-    end
+      post :create, filters: {}, back_url: "/dorsale/flyboy/tasks?&sort=term&page=3"
+      expect(response).to redirect_to "/dorsale/flyboy/tasks?&sort=term"
+
+      post :create, filters: {}, back_url: "/dorsale/flyboy/tasks?&sort=term&page=3&a=b"
+      expect(response).to redirect_to "/dorsale/flyboy/tasks?&sort=term&a=b"
 
+      post :create, filters: {}, back_url: "/dorsale/flyboy/tasks?page=3&a=b"
+      expect(response).to redirect_to "/dorsale/flyboy/tasks?a=b"
+    end
   end
+
 end
+