dorsale 3.2.0 → 3.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (70) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +13 -0
  3. data/app/assets/javascripts/dorsale/common/forms.coffee +3 -14
  4. data/app/assets/stylesheets/dorsale/common/contexts.sass +0 -23
  5. data/app/assets/stylesheets/dorsale/common/styles.sass +5 -0
  6. data/app/assets/stylesheets/dorsale/engines/billing_machine.sass +3 -0
  7. data/app/assets/stylesheets/dorsale/print.sass +1 -0
  8. data/app/helpers/dorsale/button_helper.rb +18 -0
  9. data/app/helpers/dorsale/context_helper.rb +2 -6
  10. data/app/views/dorsale/_page.html.slim +40 -0
  11. data/app/views/dorsale/billing_machine/id_cards/_index_actions.html.slim +2 -0
  12. data/app/views/dorsale/billing_machine/id_cards/index.html.slim +2 -3
  13. data/app/views/dorsale/billing_machine/invoices/_details.html.slim +0 -14
  14. data/app/views/dorsale/billing_machine/invoices/_index_actions.html.slim +6 -0
  15. data/app/views/dorsale/billing_machine/invoices/_show_title.html.slim +12 -0
  16. data/app/views/dorsale/billing_machine/invoices/index.html.slim +2 -6
  17. data/app/views/dorsale/billing_machine/invoices/index.pdf.ruby +5 -0
  18. data/app/views/dorsale/billing_machine/invoices/show.html.slim +7 -3
  19. data/app/views/dorsale/billing_machine/payment_terms/_index_actions.html.slim +2 -0
  20. data/app/views/dorsale/billing_machine/payment_terms/index.html.slim +2 -3
  21. data/app/views/dorsale/billing_machine/quotations/_details.html.slim +1 -0
  22. data/app/views/dorsale/billing_machine/quotations/_index_actions.html.slim +2 -0
  23. data/app/views/dorsale/billing_machine/quotations/_show_title.html.slim +1 -0
  24. data/app/views/dorsale/billing_machine/quotations/index.html.slim +2 -3
  25. data/app/views/dorsale/billing_machine/quotations/show.html.slim +7 -4
  26. data/app/views/dorsale/customer_vault/links/edit.html.slim +1 -1
  27. data/app/views/dorsale/customer_vault/links/index.html.slim +6 -7
  28. data/app/views/dorsale/customer_vault/links/new.html.slim +1 -1
  29. data/app/views/dorsale/customer_vault/people/{_actions.html.slim → _index_actions.html.slim} +1 -1
  30. data/app/views/dorsale/customer_vault/people/_show_layout.html.slim +3 -4
  31. data/app/views/dorsale/customer_vault/people/_show_tabs.html.slim +26 -0
  32. data/app/views/dorsale/customer_vault/people/activity.slim +3 -3
  33. data/app/views/dorsale/customer_vault/people/edit.html.slim +2 -2
  34. data/app/views/dorsale/customer_vault/people/index.html.slim +2 -2
  35. data/app/views/dorsale/customer_vault/people/invoices.html.slim +2 -3
  36. data/app/views/dorsale/customer_vault/people/new.html.slim +2 -2
  37. data/app/views/dorsale/customer_vault/people/show.html.slim +1 -1
  38. data/app/views/dorsale/customer_vault/people/tasks.html.slim +4 -3
  39. data/app/views/dorsale/expense_gun/categories/_index_actions.html.slim +2 -0
  40. data/app/views/dorsale/expense_gun/categories/index.html.slim +2 -3
  41. data/app/views/dorsale/expense_gun/expenses/_index_actions.html.slim +2 -0
  42. data/app/views/dorsale/expense_gun/expenses/_show_actions.html.slim +19 -0
  43. data/app/views/dorsale/expense_gun/expenses/index.html.slim +2 -3
  44. data/app/views/dorsale/expense_gun/expenses/show.html.slim +36 -49
  45. data/app/views/dorsale/flyboy/folders/_context.html.slim +1 -1
  46. data/app/views/dorsale/flyboy/folders/{_actions.html.slim → _context_actions.html.slim} +0 -0
  47. data/app/views/dorsale/flyboy/folders/_index_actions.html.slim +2 -0
  48. data/app/views/dorsale/flyboy/folders/edit.html.slim +3 -3
  49. data/app/views/dorsale/flyboy/folders/index.html.slim +2 -3
  50. data/app/views/dorsale/flyboy/folders/show.html.slim +8 -3
  51. data/app/views/dorsale/flyboy/tasks/_index_actions.html.slim +2 -0
  52. data/app/views/dorsale/flyboy/tasks/_tasks_for_taskable.html.slim +4 -3
  53. data/app/views/dorsale/flyboy/tasks/edit.html.slim +3 -3
  54. data/app/views/dorsale/flyboy/tasks/index.html.slim +2 -3
  55. data/app/views/dorsale/flyboy/tasks/new.html.slim +3 -3
  56. data/app/views/dorsale/flyboy/tasks/show.html.slim +3 -3
  57. data/app/views/dorsale/users/_index_actions.html.slim +2 -0
  58. data/app/views/dorsale/users/index.html.slim +2 -3
  59. data/config/locales/common.en.yml +5 -0
  60. data/config/locales/common.fr.yml +5 -9
  61. data/config/locales/customer_vault.fr.yml +1 -1
  62. data/config/locales/expense_gun.fr.yml +0 -4
  63. data/lib/dorsale/version.rb +1 -1
  64. data/spec/controllers/dorsale/billing_machine/invoices_controller_spec.rb +10 -0
  65. data/spec/models/dorsale/i18n_spec.rb +3 -5
  66. metadata +20 -8
  67. data/app/views/dorsale/_contextual.html.slim +0 -11
  68. data/app/views/dorsale/_index.html.slim +0 -24
  69. data/app/views/dorsale/customer_vault/people/_tabs.html.slim +0 -24
  70. data/app/views/dorsale/flyboy/tasks/_actions.html.slim +0 -9
@@ -43,7 +43,7 @@ fr:
43
43
  other: "Personnes"
44
44
  dorsale/customer_vault/corporation:
45
45
  one: "Entreprise"
46
- other: "Entreprise"
46
+ other: "Entreprises"
47
47
  dorsale/customer_vault/individual:
48
48
  one: "Individu"
49
49
  other: "Individus"
@@ -11,10 +11,6 @@ fr:
11
11
 
12
12
  actions:
13
13
  create : "Nouvelle note de frais"
14
- submit : "Soumettre"
15
- accept : "Accepter"
16
- refuse : "Refuser"
17
- cancel : "Annuler"
18
14
 
19
15
  expense_line:
20
16
  actions:
@@ -1,3 +1,3 @@
1
1
  module Dorsale
2
- VERSION = "3.2.0"
2
+ VERSION = "3.3.0"
3
3
  end
@@ -16,6 +16,16 @@ describe Dorsale::BillingMachine::InvoicesController, type: :controller do
16
16
  end
17
17
  end # describe "XLSX export"
18
18
 
19
+ describe "PDF export" do
20
+ render_views
21
+
22
+ it "should be ok" do
23
+ 3.times { create(:billing_machine_invoice) }
24
+ get :index, params: {format: :pdf}
25
+ expect(response).to be_ok
26
+ end
27
+ end # describe "PDF export"
28
+
19
29
  describe "filters" do
20
30
  before do
21
31
  Timecop.freeze "2016-11-08 12:00:00"
@@ -1,11 +1,9 @@
1
1
  require "rails_helper"
2
2
 
3
- RSpec.describe "i18n" do
4
- before :all do
5
- Rails.application.eager_load!
6
- end
3
+ # TODO : test FR + EN
7
4
 
8
- # TODO : test FR + EN
5
+ RSpec.describe "i18n" do
6
+ Rails.application.eager_load!
9
7
 
10
8
  ::Dorsale::ApplicationRecord.descendants.each do |model|
11
9
  next unless model.to_s.start_with?("Dorsale")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dorsale
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.0
4
+ version: 3.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - agilidée
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-11-22 00:00:00.000000000 Z
11
+ date: 2017-01-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -668,9 +668,8 @@ files:
668
668
  - app/uploaders/dorsale/avatar_uploader.rb
669
669
  - app/uploaders/dorsale/image_uploader.rb
670
670
  - app/views/dorsale/_actions.html.slim
671
- - app/views/dorsale/_contextual.html.slim
672
671
  - app/views/dorsale/_flash.html.slim
673
- - app/views/dorsale/_index.html.slim
672
+ - app/views/dorsale/_page.html.slim
674
673
  - app/views/dorsale/alexandrie/attachments/_attachment.html.slim
675
674
  - app/views/dorsale/alexandrie/attachments/_edit.html.slim
676
675
  - app/views/dorsale/alexandrie/attachments/_header.html.slim
@@ -680,6 +679,7 @@ files:
680
679
  - app/views/dorsale/alexandrie/attachments/_progress_bar.html.slim
681
680
  - app/views/dorsale/alexandrie/attachments/index.html.slim
682
681
  - app/views/dorsale/billing_machine/id_cards/_form.html.slim
682
+ - app/views/dorsale/billing_machine/id_cards/_index_actions.html.slim
683
683
  - app/views/dorsale/billing_machine/id_cards/_list.html.slim
684
684
  - app/views/dorsale/billing_machine/id_cards/edit.html.slim
685
685
  - app/views/dorsale/billing_machine/id_cards/index.html.slim
@@ -688,29 +688,36 @@ files:
688
688
  - app/views/dorsale/billing_machine/invoices/_filters.html.slim
689
689
  - app/views/dorsale/billing_machine/invoices/_form.html.slim
690
690
  - app/views/dorsale/billing_machine/invoices/_header_infos.html.slim
691
+ - app/views/dorsale/billing_machine/invoices/_index_actions.html.slim
691
692
  - app/views/dorsale/billing_machine/invoices/_line_details.html.slim
692
693
  - app/views/dorsale/billing_machine/invoices/_line_fields.html.slim
693
694
  - app/views/dorsale/billing_machine/invoices/_list.html.slim
694
695
  - app/views/dorsale/billing_machine/invoices/_show_actions.html.slim
696
+ - app/views/dorsale/billing_machine/invoices/_show_title.html.slim
695
697
  - app/views/dorsale/billing_machine/invoices/edit.html.slim
696
698
  - app/views/dorsale/billing_machine/invoices/email.html.slim
697
699
  - app/views/dorsale/billing_machine/invoices/index.html.slim
700
+ - app/views/dorsale/billing_machine/invoices/index.pdf.ruby
698
701
  - app/views/dorsale/billing_machine/invoices/index.xlsx.ruby
699
702
  - app/views/dorsale/billing_machine/invoices/new.html.slim
700
703
  - app/views/dorsale/billing_machine/invoices/show.html.slim
701
704
  - app/views/dorsale/billing_machine/invoices/show.pdf.ruby
702
705
  - app/views/dorsale/billing_machine/payment_terms/_form.html.slim
706
+ - app/views/dorsale/billing_machine/payment_terms/_index_actions.html.slim
703
707
  - app/views/dorsale/billing_machine/payment_terms/_list.html.slim
704
708
  - app/views/dorsale/billing_machine/payment_terms/edit.html.slim
705
709
  - app/views/dorsale/billing_machine/payment_terms/index.html.slim
706
710
  - app/views/dorsale/billing_machine/payment_terms/new.html.slim
711
+ - app/views/dorsale/billing_machine/quotations/_details.html.slim
707
712
  - app/views/dorsale/billing_machine/quotations/_filters.html.slim
708
713
  - app/views/dorsale/billing_machine/quotations/_form.html.slim
709
714
  - app/views/dorsale/billing_machine/quotations/_header_infos.html.slim
715
+ - app/views/dorsale/billing_machine/quotations/_index_actions.html.slim
710
716
  - app/views/dorsale/billing_machine/quotations/_line_details.html.slim
711
717
  - app/views/dorsale/billing_machine/quotations/_line_fields.html.slim
712
718
  - app/views/dorsale/billing_machine/quotations/_list.html.slim
713
719
  - app/views/dorsale/billing_machine/quotations/_show_actions.html.slim
720
+ - app/views/dorsale/billing_machine/quotations/_show_title.html.slim
714
721
  - app/views/dorsale/billing_machine/quotations/edit.html.slim
715
722
  - app/views/dorsale/billing_machine/quotations/index.html.slim
716
723
  - app/views/dorsale/billing_machine/quotations/new.html.slim
@@ -726,16 +733,16 @@ files:
726
733
  - app/views/dorsale/customer_vault/links/edit.html.slim
727
734
  - app/views/dorsale/customer_vault/links/index.html.slim
728
735
  - app/views/dorsale/customer_vault/links/new.html.slim
729
- - app/views/dorsale/customer_vault/people/_actions.html.slim
730
736
  - app/views/dorsale/customer_vault/people/_context.html.slim
731
737
  - app/views/dorsale/customer_vault/people/_data_context.html.slim
732
738
  - app/views/dorsale/customer_vault/people/_filters.html.slim
733
739
  - app/views/dorsale/customer_vault/people/_form.html.slim
740
+ - app/views/dorsale/customer_vault/people/_index_actions.html.slim
734
741
  - app/views/dorsale/customer_vault/people/_index_tabs.html.slim
735
742
  - app/views/dorsale/customer_vault/people/_list.html.slim
736
743
  - app/views/dorsale/customer_vault/people/_list_item.html.slim
737
744
  - app/views/dorsale/customer_vault/people/_show_layout.html.slim
738
- - app/views/dorsale/customer_vault/people/_tabs.html.slim
745
+ - app/views/dorsale/customer_vault/people/_show_tabs.html.slim
739
746
  - app/views/dorsale/customer_vault/people/activity.slim
740
747
  - app/views/dorsale/customer_vault/people/edit.html.slim
741
748
  - app/views/dorsale/customer_vault/people/index.html.slim
@@ -745,6 +752,7 @@ files:
745
752
  - app/views/dorsale/customer_vault/people/show.html.slim
746
753
  - app/views/dorsale/customer_vault/people/tasks.html.slim
747
754
  - app/views/dorsale/expense_gun/categories/_form.html.slim
755
+ - app/views/dorsale/expense_gun/categories/_index_actions.html.slim
748
756
  - app/views/dorsale/expense_gun/categories/_list.html.slim
749
757
  - app/views/dorsale/expense_gun/categories/edit.html.slim
750
758
  - app/views/dorsale/expense_gun/categories/index.html.slim
@@ -752,15 +760,18 @@ files:
752
760
  - app/views/dorsale/expense_gun/expenses/_expense_line_fields.html.slim
753
761
  - app/views/dorsale/expense_gun/expenses/_filters.html.slim
754
762
  - app/views/dorsale/expense_gun/expenses/_form.html.slim
763
+ - app/views/dorsale/expense_gun/expenses/_index_actions.html.slim
755
764
  - app/views/dorsale/expense_gun/expenses/_list.html.slim
765
+ - app/views/dorsale/expense_gun/expenses/_show_actions.html.slim
756
766
  - app/views/dorsale/expense_gun/expenses/edit.html.slim
757
767
  - app/views/dorsale/expense_gun/expenses/index.html.slim
758
768
  - app/views/dorsale/expense_gun/expenses/new.html.slim
759
769
  - app/views/dorsale/expense_gun/expenses/show.html.slim
760
770
  - app/views/dorsale/flyboy/_filters.html.slim
761
- - app/views/dorsale/flyboy/folders/_actions.html.slim
762
771
  - app/views/dorsale/flyboy/folders/_context.html.slim
772
+ - app/views/dorsale/flyboy/folders/_context_actions.html.slim
763
773
  - app/views/dorsale/flyboy/folders/_form.html.slim
774
+ - app/views/dorsale/flyboy/folders/_index_actions.html.slim
764
775
  - app/views/dorsale/flyboy/folders/_list.html.slim
765
776
  - app/views/dorsale/flyboy/folders/edit.html.slim
766
777
  - app/views/dorsale/flyboy/folders/index.html.slim
@@ -769,9 +780,9 @@ files:
769
780
  - app/views/dorsale/flyboy/task_comments/_list.html.slim
770
781
  - app/views/dorsale/flyboy/task_mailer/new_task.html.slim
771
782
  - app/views/dorsale/flyboy/task_mailer/term_email.html.slim
772
- - app/views/dorsale/flyboy/tasks/_actions.html.slim
773
783
  - app/views/dorsale/flyboy/tasks/_context.html.slim
774
784
  - app/views/dorsale/flyboy/tasks/_form.html.slim
785
+ - app/views/dorsale/flyboy/tasks/_index_actions.html.slim
775
786
  - app/views/dorsale/flyboy/tasks/_list.html.slim
776
787
  - app/views/dorsale/flyboy/tasks/_summary.html.slim
777
788
  - app/views/dorsale/flyboy/tasks/_summary_list.html.slim
@@ -787,6 +798,7 @@ files:
787
798
  - app/views/dorsale/search/_form.html.slim
788
799
  - app/views/dorsale/user_mailer/new_account.html.slim
789
800
  - app/views/dorsale/users/_form.html.slim
801
+ - app/views/dorsale/users/_index_actions.html.slim
790
802
  - app/views/dorsale/users/_list.html.slim
791
803
  - app/views/dorsale/users/edit.html.slim
792
804
  - app/views/dorsale/users/index.html.slim
@@ -1,11 +0,0 @@
1
- - if content_for?(:context) && content_for?(:main)
2
- .row
3
- aside#context.col-sm-4.col-xs-12
4
- = yield :context
5
- #context-main.col-sm-8.col-xs-12
6
- = yield :main
7
-
8
- - elsif content_for?(:main)
9
- .row
10
- #context-main.col-sm-8.col-sm-offset-2.col-xs-12
11
- = yield :main
@@ -1,24 +0,0 @@
1
- #page_header = yield(:page_header)
2
-
3
- - if content_for(:search)
4
- .row
5
- .col-md-8
6
- .col-md-4
7
- = yield(:search)
8
-
9
- = yield(:filters)
10
-
11
- - if content_for?(:title) || content_for?(:actions) || content_for?(:table)
12
- .panel.panel-default
13
- - if content_for?(:title) || content_for?(:actions)
14
- .panel-heading: .panel-title
15
- = yield(:title)
16
- .pull-right = yield(:actions)
17
-
18
- = yield(:table)
19
-
20
- = yield(:page_body)
21
-
22
- = yield(:pagination)
23
-
24
- #page_footer = yield(:page_footer)
@@ -1,24 +0,0 @@
1
- .nav.nav-tabs#person-tabs
2
- li class=("active" if request.path == dorsale.customer_vault_person_path(@person))
3
- a href=dorsale.customer_vault_person_path(@person)
4
- = t("customer_vault.activity")
5
- = " "
6
- span.badge = @person.comments.count
7
-
8
- li class=("active" if request.path.start_with? dorsale.customer_vault_person_links_path(@person))
9
- a href=dorsale.customer_vault_person_links_path(@person)
10
- = Dorsale::CustomerVault::Link.ts
11
- = " "
12
- span.badge = @person.links.length
13
-
14
- li class=("active" if request.path == dorsale.tasks_customer_vault_person_path(@person))
15
- a href=dorsale.tasks_customer_vault_person_path(@person)
16
- = Dorsale::Flyboy::Task.ts
17
- = " "
18
- span.badge = @person.tasks.count
19
-
20
- li class=("active" if request.path == dorsale.invoices_customer_vault_person_path(@person))
21
- a href=dorsale.invoices_customer_vault_person_path(@person)
22
- = Dorsale::BillingMachine::Invoice.ts
23
- = " "
24
- span.badge = @person.invoices.count
@@ -1,9 +0,0 @@
1
- .actions
2
- - if policy(task).update?
3
- = update_button dorsale.edit_flyboy_task_path(task)
4
-
5
- - if policy(task).snooze?
6
- = snooze_button dorsale.snooze_flyboy_task_path(task)
7
-
8
- - if policy(task).complete?
9
- = complete_button dorsale.complete_flyboy_task_path(task)