dorsale 2.2.9 → 2.2.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/dorsale/billing_machine/invoices_controller.rb +15 -0
- data/app/controllers/dorsale/customer_vault/people_controller.rb +1 -1
- data/app/helpers/dorsale/text_helper.rb +9 -7
- data/app/models/dorsale/billing_machine/small_data/filter_for_invoices.rb +3 -3
- data/app/models/dorsale/billing_machine/small_data/filter_for_quotations.rb +3 -3
- data/app/views/dorsale/billing_machine/invoices/_header_infos.html.slim +8 -0
- data/app/views/dorsale/billing_machine/invoices/index.html.slim +4 -6
- data/app/views/dorsale/billing_machine/quotations/_header_infos.html.slim +1 -0
- data/app/views/dorsale/billing_machine/quotations/index.html.slim +5 -8
- data/app/views/dorsale/customer_vault/people/_new_people_contexts.html.slim +3 -0
- data/app/views/dorsale/customer_vault/people/activity.slim +1 -1
- data/app/views/dorsale/customer_vault/people/list.html.slim +1 -1
- data/config/locales/customer_vault.en.yml +1 -0
- data/config/locales/customer_vault.fr.yml +1 -0
- data/lib/dorsale/version.rb +1 -1
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/log/development.log +2492 -0
- data/spec/dummy/log/test.log +3209 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2Lm4aMNrWbKoHHtvJRIX7WMbsuBCh7jnYg9aGVQ05aY.cache +2 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/H_CG3bjSEmXPpBo-8ykpHSr72kWqN1yQiKBbxb1LvA8.cache +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kovtDe4ut4jwTeR8gb6DUDUTbNmVN2uX3RdttWaJtXI.cache +3 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uHhgBOq-9GXUHky_5x06UlhPIVBaQaZaUAopILI8vtM.cache +1 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2Lm4aMNrWbKoHHtvJRIX7WMbsuBCh7jnYg9aGVQ05aY.cache +2 -0
- data/spec/helpers/dorsale/text_helper_spec.rb +4 -0
- metadata +12 -4
- data/app/views/dorsale/billing_machine/invoices/_data_context.html.slim +0 -10
- data/app/views/dorsale/billing_machine/quotations/_data_context.html.slim +0 -6
Binary file
|
@@ -0,0 +1,3 @@
|
|
1
|
+
{:uriI"�file:///Users/benoit/www/agilidee/dorsale/app/assets/images/dorsale/avatar.png?type=image/png&id=ebccf8cae1e5c3430b018c49fd45f20599519ef1822af6bf74b1fc9f497eb717:ET:load_pathI"9/Users/benoit/www/agilidee/dorsale/app/assets/images;T:
|
2
|
+
@hash{ I"environment-version;TTI"environment-paths;TTI"2processors:type=image/png&file_type=image/png;TTI"Zfile-digest:///Users/benoit/www/agilidee/dorsale/app/assets/images/dorsale/avatar.png;TT:dependencies_digest"%ۋ��!t���.wv�"�
|
3
|
+
mtimel+�FU
|
@@ -0,0 +1 @@
|
|
1
|
+
I"�/Users/benoit/www/agilidee/dorsale/app/assets/images/dorsale/avatar.png?type=image/png&id=ebccf8cae1e5c3430b018c49fd45f20599519ef1822af6bf74b1fc9f497eb717:ET
|
@@ -95,6 +95,10 @@ describe Dorsale::TextHelper, type: :helper do
|
|
95
95
|
it "should accept helper" do
|
96
96
|
expect(info quotation_line, :quantity, helper: :euros).to include "1 000,17 €"
|
97
97
|
end
|
98
|
+
|
99
|
+
it "should work with class" do
|
100
|
+
expect(info Dorsale::CustomerVault::Person, :count, 123).to eq %(<div class="info"><strong class="info-label">Nombre de contacts</strong> : <span class="info-value person-count">123</span></div>)
|
101
|
+
end
|
98
102
|
end
|
99
103
|
|
100
104
|
end
|
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: 2.2.
|
4
|
+
version: 2.2.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- agilidée
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-12-
|
11
|
+
date: 2015-12-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -521,10 +521,10 @@ files:
|
|
521
521
|
- app/views/dorsale/alexandrie/attachments/_form_and_list.html.slim
|
522
522
|
- app/views/dorsale/alexandrie/attachments/_list.html.slim
|
523
523
|
- app/views/dorsale/alexandrie/attachments/edit.html.slim
|
524
|
-
- app/views/dorsale/billing_machine/invoices/_data_context.html.slim
|
525
524
|
- app/views/dorsale/billing_machine/invoices/_details.html.slim
|
526
525
|
- app/views/dorsale/billing_machine/invoices/_filters.html.slim
|
527
526
|
- app/views/dorsale/billing_machine/invoices/_form.html.slim
|
527
|
+
- app/views/dorsale/billing_machine/invoices/_header_infos.html.slim
|
528
528
|
- app/views/dorsale/billing_machine/invoices/_line_details.html.slim
|
529
529
|
- app/views/dorsale/billing_machine/invoices/_line_fields.html.slim
|
530
530
|
- app/views/dorsale/billing_machine/invoices/_list.html.slim
|
@@ -533,9 +533,9 @@ files:
|
|
533
533
|
- app/views/dorsale/billing_machine/invoices/index.html.slim
|
534
534
|
- app/views/dorsale/billing_machine/invoices/new.html.slim
|
535
535
|
- app/views/dorsale/billing_machine/invoices/show.html.slim
|
536
|
-
- app/views/dorsale/billing_machine/quotations/_data_context.html.slim
|
537
536
|
- app/views/dorsale/billing_machine/quotations/_filters.html.slim
|
538
537
|
- app/views/dorsale/billing_machine/quotations/_form.html.slim
|
538
|
+
- app/views/dorsale/billing_machine/quotations/_header_infos.html.slim
|
539
539
|
- app/views/dorsale/billing_machine/quotations/_line_details.html.slim
|
540
540
|
- app/views/dorsale/billing_machine/quotations/_line_fields.html.slim
|
541
541
|
- app/views/dorsale/billing_machine/quotations/_list.html.slim
|
@@ -830,6 +830,7 @@ files:
|
|
830
830
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/26szcKkz6Z5rIeB8eDV8AoUnI5qIs5MZAM_S_o45bSc.cache
|
831
831
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2F-eYUg8MCGq0NCSi9CQzLK3A5OO1ao-fwFzXRGf6b4.cache
|
832
832
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2K364PpuPTugOz0yXBQ2M6npE6AUetz5s2905IzElfA.cache
|
833
|
+
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2Lm4aMNrWbKoHHtvJRIX7WMbsuBCh7jnYg9aGVQ05aY.cache
|
833
834
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2M3u5PgIaQmtoiBp7CJd8cEv34G9XnMU8kmyTqmlJDA.cache
|
834
835
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2M_GuXEQaA9hXwyjm7StsgKgtyFNg0yMDpT5MJ3p9Xw.cache
|
835
836
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2NWx4QnmQ3So0UfEeImPYHjtS0GI-u0sPirEmiQA9d0.cache
|
@@ -2041,6 +2042,7 @@ files:
|
|
2041
2042
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kgfkQZwP5_AnqwZP9pdGWLzbicYX0GZzDBFChgzOpYM.cache
|
2042
2043
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kkEFlRNAj6yCGpxwrqMR8FC8cyspfsX9dEX2bYkSqmw.cache
|
2043
2044
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kngrdbPbhn7CilTBZ6rn-axHDXyFdIoLguWs9SclDKI.cache
|
2045
|
+
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kovtDe4ut4jwTeR8gb6DUDUTbNmVN2uX3RdttWaJtXI.cache
|
2044
2046
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kpK5uEe-EI7Ut538kZn2xY0pB4O7I57QgHb8UHd0VFg.cache
|
2045
2047
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/krA_ci1WYvvdnL-GYpttfO01dS8I-TrcMtPkmiyrxRo.cache
|
2046
2048
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/ktRWcnuOc7TKSFAzRyjqjJK9juNgBH8Db4rpLxhwo9g.cache
|
@@ -2310,6 +2312,7 @@ files:
|
|
2310
2312
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uA7xIC0xf886rqUH0gYatCv1OaVMjocndGnLxukYTfo.cache
|
2311
2313
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uFGGfTN3FAhPfUYzgN_CzOKc1vczueB5VZ0ZMmMchUM.cache
|
2312
2314
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uHFKJhYsTe_VAr-xVPuwB3Jv5vz24S5bFNHA3pc6l04.cache
|
2315
|
+
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uHhgBOq-9GXUHky_5x06UlhPIVBaQaZaUAopILI8vtM.cache
|
2313
2316
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uKqz6NHnBgBjuoT05VLWFJWQakNRI-nvT0PStQ9TuNQ.cache
|
2314
2317
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uR25UQ1ptyC3EbeKPSzkCEqyo1CX_wf_j-xTSUGiZjQ.cache
|
2315
2318
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uVsHpDF39p6SPrBAoJ8_en-2vL7hQR-Qg6lMYaZEIgs.cache
|
@@ -2488,6 +2491,7 @@ files:
|
|
2488
2491
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/27ianhVLZaFhaCV7XACBAtIEqRbX6-j2zlBaPoJVewY.cache
|
2489
2492
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2K364PpuPTugOz0yXBQ2M6npE6AUetz5s2905IzElfA.cache
|
2490
2493
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2LG-JMY_00XcgT89_D2KEG9VW8pkfTz3SziUOKgnUyE.cache
|
2494
|
+
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2Lm4aMNrWbKoHHtvJRIX7WMbsuBCh7jnYg9aGVQ05aY.cache
|
2491
2495
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2NWx4QnmQ3So0UfEeImPYHjtS0GI-u0sPirEmiQA9d0.cache
|
2492
2496
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2S8SBGQ9_cxQeuoQBGrD5uUNNOCP8nX9dysvoYe7fks.cache
|
2493
2497
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2SacIzw87NtgaKH7MgJhfNXWd8IYbkPjEvHvVniZbOk.cache
|
@@ -3597,6 +3601,7 @@ test_files:
|
|
3597
3601
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2fl2KI_o_z_TPVZzNgMm3RogXc7vZqrstWafNR--Pok.cache
|
3598
3602
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2geVixuX5w2uZurAnj10f6EXCj1g7Se1NE_ASgZ6dZE.cache
|
3599
3603
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2K364PpuPTugOz0yXBQ2M6npE6AUetz5s2905IzElfA.cache
|
3604
|
+
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2Lm4aMNrWbKoHHtvJRIX7WMbsuBCh7jnYg9aGVQ05aY.cache
|
3600
3605
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2M3u5PgIaQmtoiBp7CJd8cEv34G9XnMU8kmyTqmlJDA.cache
|
3601
3606
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2M_GuXEQaA9hXwyjm7StsgKgtyFNg0yMDpT5MJ3p9Xw.cache
|
3602
3607
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2NWx4QnmQ3So0UfEeImPYHjtS0GI-u0sPirEmiQA9d0.cache
|
@@ -4379,6 +4384,7 @@ test_files:
|
|
4379
4384
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/KMdvkrsNcj7QvjLm2CamkZff1IKjlKDwnJXfSr754ys.cache
|
4380
4385
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kngrdbPbhn7CilTBZ6rn-axHDXyFdIoLguWs9SclDKI.cache
|
4381
4386
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/KnXfcH0QuwYcuBG56SC85u6B29AdU_kzLy_fwugEw8g.cache
|
4387
|
+
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kovtDe4ut4jwTeR8gb6DUDUTbNmVN2uX3RdttWaJtXI.cache
|
4382
4388
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/KPf_03z5k3uzdVPy94Hx-n3ukvdyiZgsy1z-KG-gcRY.cache
|
4383
4389
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/kpK5uEe-EI7Ut538kZn2xY0pB4O7I57QgHb8UHd0VFg.cache
|
4384
4390
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/KQ7cSPt-VYvsoVRxpcOOJZKSTFBWifRP5dfCbVYwyvI.cache
|
@@ -4916,6 +4922,7 @@ test_files:
|
|
4916
4922
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/ufeWch_sB11JXNM_vbPu2Zx-3tqO4P7DlJbViOb2rOc.cache
|
4917
4923
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uFGGfTN3FAhPfUYzgN_CzOKc1vczueB5VZ0ZMmMchUM.cache
|
4918
4924
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uHFKJhYsTe_VAr-xVPuwB3Jv5vz24S5bFNHA3pc6l04.cache
|
4925
|
+
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/uHhgBOq-9GXUHky_5x06UlhPIVBaQaZaUAopILI8vtM.cache
|
4919
4926
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/UimZL373RaS9ED5GJRBzahxlntioq4JAAhL5wySHLT4.cache
|
4920
4927
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/UIQLQMVu6eXYPVAaBlWfhWKXmUV10hBNwkuziSCCSsA.cache
|
4921
4928
|
- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/UirFds9WsIGMwRTKq_Cbxk0NorxWX9ehYEiYMiwfpHc.cache
|
@@ -5253,6 +5260,7 @@ test_files:
|
|
5253
5260
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2fl2KI_o_z_TPVZzNgMm3RogXc7vZqrstWafNR--Pok.cache
|
5254
5261
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2K364PpuPTugOz0yXBQ2M6npE6AUetz5s2905IzElfA.cache
|
5255
5262
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2LG-JMY_00XcgT89_D2KEG9VW8pkfTz3SziUOKgnUyE.cache
|
5263
|
+
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2Lm4aMNrWbKoHHtvJRIX7WMbsuBCh7jnYg9aGVQ05aY.cache
|
5256
5264
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2NWx4QnmQ3So0UfEeImPYHjtS0GI-u0sPirEmiQA9d0.cache
|
5257
5265
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2S8SBGQ9_cxQeuoQBGrD5uUNNOCP8nX9dysvoYe7fks.cache
|
5258
5266
|
- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2SacIzw87NtgaKH7MgJhfNXWd8IYbkPjEvHvVniZbOk.cache
|
@@ -1,10 +0,0 @@
|
|
1
|
-
.invoice-context: .context
|
2
|
-
= context_title ::Dorsale::BillingMachine::Invoice.t(:data)
|
3
|
-
|
4
|
-
- total_excluding_taxes = @invoices_without_pagination.map(&:total_excluding_taxes).delete_if {|e| e.blank?}.inject(:+) || 0
|
5
|
-
- vat_amount = @invoices_without_pagination.map(&:vat_amount).delete_if {|e| e.blank?}.inject(:+) || 0
|
6
|
-
- total_including_taxes = @invoices_without_pagination.map(&:total_including_taxes).delete_if {|e| e.blank?}.inject(:+) || 0
|
7
|
-
|
8
|
-
= context_info ::Dorsale::BillingMachine::Invoice.t(:total_excluding_taxes), euros(total_excluding_taxes)
|
9
|
-
= context_info ::Dorsale::BillingMachine::Invoice.t(:vat_amount), euros(vat_amount)
|
10
|
-
= context_info ::Dorsale::BillingMachine::Invoice.t(:total_including_taxes), euros(total_including_taxes)
|
@@ -1,6 +0,0 @@
|
|
1
|
-
.quotation-context: .context
|
2
|
-
= context_title ::Dorsale::BillingMachine::Quotation.t(:data)
|
3
|
-
|
4
|
-
= context_info ::Dorsale::BillingMachine::Quotation.t(:total_excluding_taxes), euros(@total_excluding_taxes)
|
5
|
-
= context_info ::Dorsale::BillingMachine::Quotation.t(:vat_amount), euros(@vat_amount)
|
6
|
-
= context_info ::Dorsale::BillingMachine::Quotation.t(:total_including_taxes), euros(@total_including_taxes)
|