dorsale 3.10.3 → 3.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -103
- data/README.md +0 -4
- data/app/models/dorsale/alexandrie/attachment.rb +2 -2
- data/app/models/dorsale/application_record.rb +0 -4
- data/app/models/dorsale/billing_machine/invoice.rb +1 -1
- data/app/models/dorsale/billing_machine/quotation.rb +2 -2
- data/app/models/dorsale/comment.rb +1 -1
- data/app/models/dorsale/customer_vault/event.rb +2 -2
- data/app/models/dorsale/customer_vault/link.rb +2 -2
- data/app/models/dorsale/customer_vault/person.rb +6 -6
- data/app/models/dorsale/expense_gun/expense.rb +3 -3
- data/app/models/dorsale/expense_gun/expense_line.rb +2 -2
- data/app/models/dorsale/flyboy/task.rb +3 -3
- data/app/models/dorsale/flyboy/task_comment.rb +1 -1
- data/app/views/dorsale/alexandrie/attachments/index.html.slim +1 -1
- data/app/views/dorsale/customer_vault/people/_index_tabs.html.slim +6 -3
- data/app/views/dorsale/flyboy/task_comments/_task_comment.html.slim +1 -1
- data/app/views/dorsale/flyboy/tasks/_context.html.slim +1 -1
- data/app/views/dorsale/flyboy/tasks/_list.html.slim +1 -1
- data/db/migrate/20171023080507_migrate_people_comments_to_events.rb +1 -1
- data/lib/dorsale/engine.rb +0 -5
- data/lib/dorsale/version.rb +1 -1
- data/spec/models/dorsale/customer_vault/individual_spec.rb +1 -1
- metadata +3 -75
- data/app/views/dorsale/_flash.html.slim +0 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3c5b7404b272ca5ba112982222ab479da275f739afb4b81857ddad3ec5dcf132
|
4
|
+
data.tar.gz: d8f4cb12f3b9f02813c2b112d98479d86c1e9a6de21547a60c0237acd58f3f6f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cd150b1f65bec68063d60e6b792d46bf009083c7b5b03b7d269468c9c439dae7532da9fe6289a7e8a3c769fa64996bf02ba7cdb951483a2f97edf75eee91923a
|
7
|
+
data.tar.gz: 1666b09c7a94602c592cabe30bb22385cbb776762bec90952501e9233d71a4a48cb3363e30c9cd7a57e282e65dcafd5fcd529e60f7f2049986257ced1b9e8361
|
data/CHANGELOG.md
CHANGED
@@ -2,93 +2,77 @@
|
|
2
2
|
|
3
3
|
## Next version
|
4
4
|
|
5
|
-
## 3.
|
5
|
+
## 3.11.0
|
6
|
+
- Various updates
|
7
|
+
- Remove bh gem dependency
|
6
8
|
|
9
|
+
## 3.10.3
|
7
10
|
- Fix BillinMachine JS error
|
8
11
|
|
9
12
|
## 3.10.2
|
10
|
-
|
11
13
|
- Update Ruby and Gems
|
12
14
|
|
13
15
|
## 3.10.1
|
14
|
-
|
15
16
|
- Email fixes and improvements
|
16
17
|
|
17
18
|
## 3.10.0
|
18
|
-
|
19
19
|
- Billing Machine : fix amounts round
|
20
20
|
- Billing Machine : change ::DEFAULT_VAT_RATE to ::default_vat_rate
|
21
21
|
- Billing Machine : refactor/improve JS
|
22
22
|
|
23
23
|
## 3.9.8
|
24
|
-
|
25
24
|
- Tasks : add increment progress buttons
|
26
25
|
- Tasks : small improvements
|
27
26
|
|
28
27
|
## 3.9.7
|
29
|
-
|
30
28
|
- Attachments : refactor + sorting
|
31
29
|
|
32
30
|
## 3.9.6
|
33
|
-
|
34
31
|
- Tasks : add :on_warning_or_alert scope/filter
|
35
32
|
- Tasks : fix redirect after create comment
|
36
33
|
|
37
34
|
## 3.9.5
|
38
|
-
|
39
35
|
- Fix BillingMachine preview JS
|
40
36
|
|
41
37
|
## 3.9.4
|
42
|
-
|
43
38
|
- BillingMachine : add invoice/quotation preview
|
44
39
|
- BillingMachine : add quotation email + refactor email service
|
45
40
|
- Various small fixes
|
46
41
|
|
47
42
|
## 3.9.3
|
48
|
-
|
49
43
|
- BillingMachine : Fix payment status filter
|
50
44
|
|
51
45
|
## 3.9.2
|
52
|
-
|
53
46
|
- CustomerVault : Add secondary emails + uniqueness validation
|
54
47
|
|
55
48
|
## 3.9.1
|
56
|
-
|
57
49
|
- Add tags to tasks
|
58
50
|
|
59
51
|
## 3.9.0
|
60
|
-
|
61
52
|
- Remove BM id cards
|
62
53
|
- Syntax improvements and refactors
|
63
54
|
|
64
55
|
## 3.8.1
|
65
|
-
|
66
56
|
- Change CV contact type default value
|
67
57
|
|
68
58
|
## 3.8.0
|
69
|
-
|
70
59
|
- Move CV comments to events
|
71
60
|
- Add CV event contact type
|
72
61
|
- Various fixes
|
73
62
|
|
74
63
|
## 3.7.8
|
75
|
-
|
76
64
|
- Person build address improvement
|
77
65
|
|
78
66
|
## 3.7.7
|
79
|
-
|
80
67
|
- Change redirect after create task comment
|
81
68
|
|
82
69
|
## 3.7.6
|
83
|
-
|
84
70
|
- Add table names on SQL queries
|
85
71
|
|
86
72
|
## 3.7.5
|
87
|
-
|
88
73
|
- Task improvements
|
89
74
|
|
90
75
|
## 3.7.4
|
91
|
-
|
92
76
|
- Change nilify_blanks config
|
93
77
|
- CustomerVault Events : persist text
|
94
78
|
- CustomerVault : delete event when deleting comment
|
@@ -110,40 +94,33 @@
|
|
110
94
|
- Add activity type and origin in people export
|
111
95
|
|
112
96
|
## 3.7.0
|
113
|
-
|
114
97
|
- Remove some useless "polymorphic" belongs_to
|
115
98
|
- Add `comment?` action to task policy
|
116
99
|
- CustomerVault : origins and activity types
|
117
100
|
|
118
101
|
## 3.6.1
|
119
|
-
|
120
102
|
- CSS fix
|
121
103
|
|
122
104
|
## 3.6.0
|
123
|
-
|
124
105
|
- Task term and reminder improvements
|
125
106
|
- Add CustomerVault events
|
126
107
|
|
127
108
|
## 3.5.2
|
128
|
-
|
129
109
|
- Comments improvements
|
130
110
|
- Add infos to people context
|
131
111
|
|
132
112
|
## 3.5.1
|
133
|
-
|
134
113
|
- Add title and date to comments
|
135
114
|
- Truncate comments
|
136
115
|
- CustomerVault : individual belongs to corporation
|
137
116
|
- CustomerVault : add/remove fields
|
138
117
|
|
139
118
|
## 3.5.0
|
140
|
-
|
141
119
|
- Move helpers/i18n/... to agilibox gem
|
142
120
|
- rename `dorsale_button` helper to `bs_button`
|
143
121
|
- rename `dorsale_time_periods_for_select` helper to `agilibox_time_periods_for_select`
|
144
122
|
|
145
123
|
## 3.4.0
|
146
|
-
|
147
124
|
- Delete Flyboy folders
|
148
125
|
- Add `link_to_object` helper
|
149
126
|
- Change/fix expense states (new -> draft, submited -> submitted)
|
@@ -152,7 +129,6 @@
|
|
152
129
|
- Replace abandoned gem handles_sortable_columns
|
153
130
|
|
154
131
|
## 3.3.0
|
155
|
-
|
156
132
|
- Add download of all invoices in pdf
|
157
133
|
- Rename `render_dorsale_index` to `render_dorsale_page`
|
158
134
|
- Replace `render_contextual` by `render_dorsale_page`
|
@@ -161,7 +137,6 @@
|
|
161
137
|
- Print CSS add flash
|
162
138
|
|
163
139
|
## 3.2.0
|
164
|
-
|
165
140
|
- Add print CSS
|
166
141
|
- UUID friendly
|
167
142
|
- Add missing indexes
|
@@ -176,41 +151,33 @@
|
|
176
151
|
- XLSX Serializer improvements
|
177
152
|
|
178
153
|
## 3.1.7
|
179
|
-
|
180
154
|
- Filters changes : get/set are now private
|
181
155
|
- Add Bullet gem
|
182
156
|
- Add ApplicationRecord
|
183
157
|
|
184
158
|
## 3.1.6
|
185
|
-
|
186
159
|
- Migrate tests to PhantomJS 2
|
187
160
|
- Add more time period filters
|
188
161
|
- Fix avatar concern error
|
189
162
|
|
190
163
|
## 3.1.5
|
191
|
-
|
192
164
|
- Move filters to app/filters
|
193
165
|
- Tags refactor
|
194
166
|
- Rename `person_tags` helper to `tags`
|
195
167
|
|
196
168
|
## 3.1.4
|
197
|
-
|
198
169
|
- Add attachment types
|
199
170
|
|
200
171
|
## 3.1.3
|
201
|
-
|
202
172
|
- Fix delete people
|
203
173
|
|
204
174
|
## 3.1.2
|
205
|
-
|
206
175
|
- Fix gemspec test files
|
207
176
|
|
208
177
|
## 3.1.1
|
209
|
-
|
210
178
|
- Minor fixes
|
211
179
|
|
212
180
|
## 3.1.0
|
213
|
-
|
214
181
|
- Migrate from CanCan to Pundit
|
215
182
|
- ExpenseGun improvements
|
216
183
|
- UX
|
@@ -231,7 +198,6 @@
|
|
231
198
|
- Fix missing i18n
|
232
199
|
|
233
200
|
## 3.0.3
|
234
|
-
|
235
201
|
- Refactor controllers
|
236
202
|
- Refactor back url
|
237
203
|
- Update config cucumber
|
@@ -239,7 +205,6 @@
|
|
239
205
|
- Change some redirects after create/update
|
240
206
|
|
241
207
|
## 3.0.2
|
242
|
-
|
243
208
|
- Add new controllers :
|
244
209
|
- Expense Categories
|
245
210
|
- Payment Terms
|
@@ -247,116 +212,90 @@
|
|
247
212
|
- Fix Expenses VAT min amount
|
248
213
|
|
249
214
|
## 3.0.1
|
250
|
-
|
251
215
|
- Fix ExpenseGun min amounts
|
252
216
|
|
253
217
|
## 3.0.0
|
254
|
-
|
255
218
|
- Migrate to Rails 5
|
256
219
|
- Drop Rails 4 support
|
257
220
|
- Delete 2.8.x versions
|
258
221
|
|
259
222
|
## 2.7.3
|
260
|
-
|
261
223
|
- Fix Fix ActiveRecordCommaTypeCast to accept NBSP
|
262
224
|
|
263
225
|
## 2.7.2
|
264
|
-
|
265
226
|
- Small refactor on ExpenseGun
|
266
227
|
|
267
228
|
## 2.7.1
|
268
|
-
|
269
229
|
- Modals improvements
|
270
230
|
|
271
231
|
## 2.7.0
|
272
|
-
|
273
232
|
- Add ajax to attachments + progress bar
|
274
233
|
- Small CSS fixes
|
275
234
|
|
276
235
|
## 2.6.8
|
277
|
-
|
278
236
|
- Small changes to bootstrap_nav_left.sass
|
279
237
|
|
280
238
|
## 2.6.7
|
281
|
-
|
282
239
|
- Update Ruby development version to 2.2.5
|
283
240
|
- Update Rails developement version
|
284
241
|
- Remove Gemfile.lock from Git
|
285
242
|
- Add zip-zip gem for compabibility
|
286
243
|
|
287
244
|
## 2.6.6
|
288
|
-
|
289
245
|
- Fix negative amount on BillingMachine
|
290
246
|
|
291
247
|
## 2.6.5
|
292
|
-
|
293
248
|
- Add XLSX serializer
|
294
249
|
- Datepicker : add today button + autoclose
|
295
250
|
|
296
251
|
## 2.6.4
|
297
|
-
|
298
252
|
- Add datepicker setup after cocoon insert
|
299
253
|
|
300
254
|
## 2.6.3
|
301
|
-
|
302
255
|
- Add generic filters
|
303
256
|
|
304
257
|
## 2.6.2
|
305
|
-
|
306
258
|
- Invoices small changes and refactor
|
307
259
|
|
308
260
|
## 2.6.1
|
309
|
-
|
310
261
|
- Add modals css/js
|
311
262
|
|
312
263
|
## 2.6.0
|
313
|
-
|
314
264
|
- Add currencies support in BillingMachine (default is €)
|
315
265
|
|
316
266
|
## 2.5.0
|
317
|
-
|
318
267
|
- Changes/refactor on invoice/quotation PDFs - it can break extended PDFs
|
319
268
|
|
320
269
|
## 2.4.3
|
321
|
-
|
322
270
|
- Fix i18n
|
323
271
|
|
324
272
|
## 2.4.2
|
325
|
-
|
326
273
|
- Minor fix in invoice PDF
|
327
274
|
|
328
275
|
## 2.4.1
|
329
|
-
|
330
276
|
- ExpenseGun small fixes
|
331
277
|
|
332
278
|
## 2.4.0
|
333
|
-
|
334
279
|
- Change filters - break compatibility but easy to fix
|
335
280
|
- Add documents on expenses
|
336
281
|
|
337
282
|
## 2.3.5
|
338
|
-
|
339
283
|
- Add "In two weeks" on tasks summary
|
340
284
|
- Add Model::ts to i18n plural model name
|
341
285
|
|
342
286
|
## 2.3.4
|
343
|
-
|
344
287
|
- Use `polymorphic_path` instead of `url_for`
|
345
288
|
|
346
289
|
## 2.3.3
|
347
|
-
|
348
290
|
- Helpers small changes
|
349
291
|
|
350
292
|
## 2.3.2
|
351
|
-
|
352
293
|
- Small changes on users list
|
353
294
|
|
354
295
|
## 2.3.1
|
355
|
-
|
356
296
|
- Fix path on expense status
|
357
297
|
|
358
298
|
## 2.3.0
|
359
|
-
|
360
299
|
- Add ExpenseGun
|
361
300
|
|
362
301
|
## 2.2.16
|
@@ -392,50 +331,40 @@
|
|
392
331
|
- Improve `info` helper
|
393
332
|
|
394
333
|
## 2.2.9
|
395
|
-
|
396
334
|
- Invoices small changes and fixes
|
397
335
|
|
398
336
|
## 2.2.8
|
399
|
-
|
400
337
|
- Rebuild gem
|
401
338
|
|
402
339
|
## 2.2.7
|
403
|
-
|
404
340
|
- Send invoices by email
|
405
341
|
- Add colors to quotations
|
406
342
|
- Add filter by status to quotations
|
407
343
|
- Small fixes
|
408
344
|
|
409
345
|
## 2.2.6
|
410
|
-
|
411
346
|
- Quotation to invoice : edit before save
|
412
347
|
|
413
348
|
## 2.2.5
|
414
|
-
|
415
349
|
- Fix invoices colors
|
416
350
|
- Fix invoices totals
|
417
351
|
- Fix partials names
|
418
352
|
|
419
353
|
## 2.2.4
|
420
|
-
|
421
354
|
- Attachments : Do not validate presence of sender to allow all attachments without sender to be updated
|
422
355
|
|
423
356
|
## 2.2.3
|
424
|
-
|
425
357
|
- Add attachments renaming
|
426
358
|
- Fix invoices errors
|
427
359
|
|
428
360
|
## 2.2.2
|
429
|
-
|
430
361
|
- Add default value to filters
|
431
362
|
- Add ability do task comment view
|
432
363
|
|
433
364
|
## 2.2.1
|
434
|
-
|
435
365
|
- Small fixes on invoices and quotations
|
436
366
|
|
437
367
|
## 2.2.0
|
438
|
-
|
439
368
|
- Add per line vat rate mode
|
440
369
|
- Change billing machine column names
|
441
370
|
- New invoices and quotations views
|
@@ -466,60 +395,47 @@
|
|
466
395
|
- Fix destroy dependencies
|
467
396
|
|
468
397
|
## 2.1.9
|
469
|
-
|
470
398
|
- Add new template for invoices and quotations
|
471
399
|
|
472
400
|
## 2.1.8
|
473
|
-
|
474
401
|
- Quotation copy
|
475
402
|
- Convert quotation to invoice
|
476
403
|
- Add quotation states
|
477
404
|
- Add "download" attributes to `download_button` helper
|
478
405
|
|
479
406
|
## 2.1.7
|
480
|
-
|
481
407
|
- Fix i18n
|
482
408
|
- Add skype to CustomerVault
|
483
409
|
|
484
410
|
## 2.1.6
|
485
|
-
|
486
411
|
- Add commercial discount to invoices and quotations
|
487
412
|
|
488
413
|
## 2.1.5
|
489
|
-
|
490
414
|
- Fix Flyboy error on failing create task
|
491
415
|
|
492
416
|
## 2.1.4
|
493
|
-
|
494
417
|
- EN i18n fix
|
495
418
|
|
496
419
|
## 2.1.3
|
497
|
-
|
498
420
|
- Add tasks summary
|
499
421
|
- Add EN translations
|
500
422
|
|
501
423
|
## 2.1.2
|
502
|
-
|
503
424
|
- Move People.list to UserScope
|
504
425
|
|
505
426
|
## 2.1.1
|
506
|
-
|
507
427
|
- Split Flyboy AbilityHelper
|
508
428
|
|
509
429
|
## 2.1.0
|
510
|
-
|
511
430
|
- Begin migration to UserScope.
|
512
431
|
|
513
432
|
## 2.0.2
|
514
|
-
|
515
433
|
- Embedded user concept into dorsale: the hosting app now shall provide a current_user with specific methods. Check requirements in README.
|
516
434
|
|
517
435
|
## 2.0.1
|
518
|
-
|
519
436
|
- Added periods management as decimal separator
|
520
437
|
|
521
438
|
## 2.0.0
|
522
|
-
|
523
439
|
- Import CustomerVault
|
524
440
|
- Import BillingMachine
|
525
441
|
- Import Flyboy
|
@@ -530,37 +446,30 @@
|
|
530
446
|
- Filters cookie expiry
|
531
447
|
|
532
448
|
## 1.2.6
|
533
|
-
|
534
449
|
- Add `engine_polymorphic_path()` helper
|
535
450
|
- Add number helpers
|
536
451
|
- Add i18n attributes
|
537
452
|
|
538
453
|
## 1.2.5
|
539
|
-
|
540
454
|
- Fix JS back_url
|
541
455
|
|
542
456
|
## 1.2.4
|
543
|
-
|
544
457
|
- JS to add "back_url" to forms
|
545
458
|
|
546
459
|
## 1.2.3
|
547
|
-
|
548
460
|
- Add helpers : email_link, web_link, tel_link, twitter_link
|
549
461
|
- Add i18n actions sort and sort_by
|
550
462
|
- Fix i18n address key
|
551
463
|
|
552
464
|
## 1.2.2
|
553
|
-
|
554
465
|
- Add bootstrap-datepicker
|
555
466
|
|
556
467
|
## 1.2.1
|
557
|
-
|
558
468
|
- Ready for ruby 2.2.2
|
559
469
|
- Pagination style + helper + i18n
|
560
470
|
- Move filters button in separate helper
|
561
471
|
|
562
472
|
## 1.2.0
|
563
|
-
|
564
473
|
- Filters
|
565
474
|
- Merge instead of replace
|
566
475
|
- Import spec
|
@@ -581,7 +490,6 @@
|
|
581
490
|
- Split view
|
582
491
|
|
583
492
|
## 1.1.4
|
584
|
-
|
585
493
|
- Add filters buttons helper
|
586
494
|
- Add link_helper
|
587
495
|
- Add all_helpers
|
@@ -589,19 +497,15 @@
|
|
589
497
|
- Add common i18n actions, labels, ...
|
590
498
|
|
591
499
|
## 1.1.3
|
592
|
-
|
593
500
|
- Add button_helper
|
594
501
|
|
595
502
|
## 1.1.2
|
596
|
-
|
597
503
|
- Fix sprockets/font-awesome error
|
598
504
|
|
599
505
|
## 1.1.1
|
600
|
-
|
601
506
|
- Fix icon helper (font-awesome icon helper should override bh icon helper)
|
602
507
|
|
603
508
|
## 1.1.0
|
604
|
-
|
605
509
|
- Import agilidee_commons :
|
606
510
|
- Contexts
|
607
511
|
- Form helpers
|
@@ -613,13 +517,10 @@
|
|
613
517
|
- Add commons CSS (tables, forms)
|
614
518
|
|
615
519
|
## 1.0.4
|
616
|
-
|
617
520
|
- Change redirect after comment
|
618
521
|
|
619
522
|
## 1.0.3
|
620
|
-
|
621
523
|
- Add Comments
|
622
524
|
|
623
525
|
## 1.0.2
|
624
|
-
|
625
526
|
- Add Dorsale::Search
|
data/README.md
CHANGED
@@ -2,9 +2,9 @@ class Dorsale::Alexandrie::Attachment < ::Dorsale::ApplicationRecord
|
|
2
2
|
self.table_name = "dorsale_alexandrie_attachments"
|
3
3
|
|
4
4
|
belongs_to :attachable, polymorphic: true
|
5
|
-
belongs_to :sender, class_name: User
|
5
|
+
belongs_to :sender, class_name: "User"
|
6
6
|
|
7
|
-
belongs_to :attachment_type,
|
7
|
+
belongs_to :attachment_type, optional: true
|
8
8
|
|
9
9
|
validates :attachable, presence: true
|
10
10
|
validates :file, presence: true
|
@@ -1,7 +1,6 @@
|
|
1
1
|
class Dorsale::ApplicationRecord < ActiveRecord::Base
|
2
2
|
self.abstract_class = true
|
3
3
|
|
4
|
-
include Agilibox::ActiveRecordUUIDConcern
|
5
4
|
include Agilibox::DefaultValuesConcern
|
6
5
|
include Agilibox::ModelToS
|
7
6
|
include Agilibox::ModelI18n
|
@@ -13,6 +12,3 @@ class Dorsale::ApplicationRecord < ActiveRecord::Base
|
|
13
12
|
reorder(:created_at, :id).last
|
14
13
|
end
|
15
14
|
end
|
16
|
-
|
17
|
-
ActsAsTaggableOn::Tagging.send(:include, Agilibox::ActiveRecordUUIDConcern)
|
18
|
-
ActsAsTaggableOn::Tag.send(:include, Agilibox::ActiveRecordUUIDConcern)
|
@@ -4,7 +4,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
|
|
4
4
|
belongs_to :customer, polymorphic: true
|
5
5
|
belongs_to :payment_term
|
6
6
|
|
7
|
-
has_many :lines, inverse_of: :invoice, dependent: :destroy, class_name:
|
7
|
+
has_many :lines, inverse_of: :invoice, dependent: :destroy, class_name: "Dorsale::BillingMachine::InvoiceLine"
|
8
8
|
|
9
9
|
accepts_nested_attributes_for :lines, allow_destroy: true
|
10
10
|
|
@@ -9,12 +9,12 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
|
|
9
9
|
has_many :lines,
|
10
10
|
:inverse_of => :quotation,
|
11
11
|
:dependent => :destroy,
|
12
|
-
:class_name =>
|
12
|
+
:class_name => "Dorsale::BillingMachine::QuotationLine"
|
13
13
|
|
14
14
|
has_many :attachments,
|
15
15
|
:as => :attachable,
|
16
16
|
:dependent => :destroy,
|
17
|
-
:class_name =>
|
17
|
+
:class_name => "Dorsale::Alexandrie::Attachment"
|
18
18
|
|
19
19
|
accepts_nested_attributes_for :lines, allow_destroy: true
|
20
20
|
|
@@ -4,8 +4,8 @@ class Dorsale::CustomerVault::Event < ::Dorsale::ApplicationRecord
|
|
4
4
|
ACTIONS = %w(create update comment)
|
5
5
|
CONTACT_TYPES = %w(contact r1 r2)
|
6
6
|
|
7
|
-
belongs_to :author, class_name: User
|
8
|
-
belongs_to :person, class_name: Dorsale::CustomerVault::Person
|
7
|
+
belongs_to :author, class_name: "User"
|
8
|
+
belongs_to :person, class_name: "Dorsale::CustomerVault::Person"
|
9
9
|
|
10
10
|
validates :person, presence: true
|
11
11
|
validates :date, presence: true
|
@@ -1,8 +1,8 @@
|
|
1
1
|
class Dorsale::CustomerVault::Link < ::Dorsale::ApplicationRecord
|
2
2
|
self.table_name = "dorsale_customer_vault_links"
|
3
3
|
|
4
|
-
belongs_to :alice, class_name:
|
5
|
-
belongs_to :bob, class_name:
|
4
|
+
belongs_to :alice, class_name: "Dorsale::CustomerVault::Person"
|
5
|
+
belongs_to :bob, class_name: "Dorsale::CustomerVault::Person"
|
6
6
|
|
7
7
|
validates :alice, presence: true
|
8
8
|
validates :bob, presence: true
|
@@ -20,15 +20,15 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
|
|
20
20
|
|
21
21
|
acts_as_taggable
|
22
22
|
|
23
|
-
has_many :comments, class_name:
|
24
|
-
has_one :address, class_name:
|
25
|
-
has_many :tasks, class_name:
|
23
|
+
has_many :comments, class_name: "Dorsale::Comment", as: :commentable, dependent: :destroy
|
24
|
+
has_one :address, class_name: "Dorsale::Address", as: :addressable, inverse_of: :addressable, dependent: :destroy
|
25
|
+
has_many :tasks, class_name: "Dorsale::Flyboy::Task", as: :taskable, dependent: :destroy
|
26
26
|
has_many :events, dependent: :destroy
|
27
|
-
has_many :invoices, class_name:
|
27
|
+
has_many :invoices, class_name: "Dorsale::BillingMachine::Invoice", as: :customer, dependent: :nullify
|
28
28
|
accepts_nested_attributes_for :address, allow_destroy: true
|
29
29
|
|
30
|
-
belongs_to :activity_type, class_name:
|
31
|
-
belongs_to :origin, class_name:
|
30
|
+
belongs_to :activity_type, class_name: "Dorsale::CustomerVault::ActivityType"
|
31
|
+
belongs_to :origin, class_name: "Dorsale::CustomerVault::Origin"
|
32
32
|
|
33
33
|
after_destroy :destroy_links
|
34
34
|
|
@@ -2,14 +2,14 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
|
|
2
2
|
self.table_name = "dorsale_expense_gun_expenses"
|
3
3
|
include AASM
|
4
4
|
|
5
|
-
has_many :expense_lines, inverse_of: :expense, dependent: :destroy, class_name:
|
5
|
+
has_many :expense_lines, inverse_of: :expense, dependent: :destroy, class_name: "Dorsale::ExpenseGun::ExpenseLine"
|
6
6
|
|
7
7
|
has_many :attachments,
|
8
8
|
:as => :attachable,
|
9
9
|
:dependent => :destroy,
|
10
|
-
:class_name =>
|
10
|
+
:class_name => "Dorsale::Alexandrie::Attachment"
|
11
11
|
|
12
|
-
belongs_to :user
|
12
|
+
belongs_to :user
|
13
13
|
validates :user, presence: true
|
14
14
|
|
15
15
|
validates :name, presence: true
|
@@ -1,8 +1,8 @@
|
|
1
1
|
class Dorsale::ExpenseGun::ExpenseLine < ::Dorsale::ApplicationRecord
|
2
2
|
self.table_name = "dorsale_expense_gun_expense_lines"
|
3
3
|
|
4
|
-
belongs_to :expense, class_name:
|
5
|
-
belongs_to :category, class_name:
|
4
|
+
belongs_to :expense, class_name: "Dorsale::ExpenseGun::Expense"
|
5
|
+
belongs_to :category, class_name: "Dorsale::ExpenseGun::Category"
|
6
6
|
|
7
7
|
validates :expense, presence: true
|
8
8
|
validates :name, presence: true
|
@@ -9,9 +9,9 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
|
|
9
9
|
|
10
10
|
paginates_per 50
|
11
11
|
|
12
|
-
belongs_to :taskable, polymorphic: true,
|
13
|
-
belongs_to :owner, class_name: User
|
14
|
-
has_many :comments, class_name:
|
12
|
+
belongs_to :taskable, polymorphic: true, optional: true
|
13
|
+
belongs_to :owner, class_name: "User"
|
14
|
+
has_many :comments, class_name: "Dorsale::Flyboy::TaskComment", inverse_of: :task, dependent: :destroy
|
15
15
|
|
16
16
|
polymorphic_id_for :taskable
|
17
17
|
polymorphic_id_for :owner
|
@@ -2,7 +2,7 @@ class Dorsale::Flyboy::TaskComment < ::Dorsale::ApplicationRecord
|
|
2
2
|
self.table_name = "dorsale_flyboy_task_comments"
|
3
3
|
|
4
4
|
belongs_to :task
|
5
|
-
belongs_to :author, class_name: User
|
5
|
+
belongs_to :author, class_name: "User"
|
6
6
|
|
7
7
|
validates :author, presence: true
|
8
8
|
validates :task, presence: true
|
@@ -1,6 +1,9 @@
|
|
1
1
|
.index-tabs-container
|
2
|
-
|
3
|
-
=
|
4
|
-
|
2
|
+
ul.nav.nav-tabs.index-tabs
|
3
|
+
li class=("active" if request.path == dorsale.customer_vault_events_path)
|
4
|
+
= link_to Dorsale::CustomerVault::Event.ts, dorsale.customer_vault_events_path
|
5
|
+
|
6
|
+
li class=("active" if request.path == dorsale.customer_vault_people_path)
|
7
|
+
= link_to Dorsale::CustomerVault::Person.ts, dorsale.customer_vault_people_path
|
5
8
|
|
6
9
|
= search_form action: dorsale.customer_vault_people_path
|
@@ -6,7 +6,7 @@
|
|
6
6
|
|
7
7
|
.context-body class=task.state
|
8
8
|
= info task, :tags, tags(task)
|
9
|
-
= info task, :progress,
|
9
|
+
= info task, :progress, helper: :bs_progress_bar
|
10
10
|
= info task, :owner
|
11
11
|
= info task, :created_at
|
12
12
|
= info task, :reminder_date
|
@@ -2,7 +2,7 @@ class MigratePeopleCommentsToEvents < ActiveRecord::Migration[5.0]
|
|
2
2
|
class Event < ::Dorsale::ApplicationRecord
|
3
3
|
self.table_name = :dorsale_customer_vault_events
|
4
4
|
|
5
|
-
belongs_to :comment, class_name: Dorsale::Comment
|
5
|
+
belongs_to :comment, class_name: "Dorsale::Comment"
|
6
6
|
end
|
7
7
|
|
8
8
|
def change
|
data/lib/dorsale/engine.rb
CHANGED
@@ -1,8 +1,4 @@
|
|
1
1
|
require "slim-rails"
|
2
|
-
require "sass-rails"
|
3
|
-
require "bootstrap-sass"
|
4
|
-
require "bh"
|
5
|
-
require "font-awesome-sass"
|
6
2
|
require "simple_form"
|
7
3
|
require "coffee-rails"
|
8
4
|
require "jquery-rails"
|
@@ -11,7 +7,6 @@ require "turbolinks"
|
|
11
7
|
require "bootstrap-kaminari-views"
|
12
8
|
require "bootstrap-datepicker-rails"
|
13
9
|
require "cocoon"
|
14
|
-
require "select2-rails"
|
15
10
|
|
16
11
|
require "rails-i18n"
|
17
12
|
require "pundit"
|
data/lib/dorsale/version.rb
CHANGED
@@ -17,7 +17,7 @@ RSpec.describe ::Dorsale::CustomerVault::Individual, :type => :model do
|
|
17
17
|
it { is_expected.to validate_presence_of :first_name }
|
18
18
|
it { is_expected.to validate_presence_of :last_name }
|
19
19
|
|
20
|
-
it { is_expected.to
|
20
|
+
it { is_expected.to respond_to :activity_type }
|
21
21
|
it { is_expected.to belong_to :origin }
|
22
22
|
|
23
23
|
it { is_expected.to respond_to :context }
|
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.
|
4
|
+
version: 3.11.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:
|
11
|
+
date: 2019-04-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -66,48 +66,6 @@ dependencies:
|
|
66
66
|
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: sass-rails
|
71
|
-
requirement: !ruby/object:Gem::Requirement
|
72
|
-
requirements:
|
73
|
-
- - ">="
|
74
|
-
- !ruby/object:Gem::Version
|
75
|
-
version: '0'
|
76
|
-
type: :runtime
|
77
|
-
prerelease: false
|
78
|
-
version_requirements: !ruby/object:Gem::Requirement
|
79
|
-
requirements:
|
80
|
-
- - ">="
|
81
|
-
- !ruby/object:Gem::Version
|
82
|
-
version: '0'
|
83
|
-
- !ruby/object:Gem::Dependency
|
84
|
-
name: bootstrap-sass
|
85
|
-
requirement: !ruby/object:Gem::Requirement
|
86
|
-
requirements:
|
87
|
-
- - ">="
|
88
|
-
- !ruby/object:Gem::Version
|
89
|
-
version: '0'
|
90
|
-
type: :runtime
|
91
|
-
prerelease: false
|
92
|
-
version_requirements: !ruby/object:Gem::Requirement
|
93
|
-
requirements:
|
94
|
-
- - ">="
|
95
|
-
- !ruby/object:Gem::Version
|
96
|
-
version: '0'
|
97
|
-
- !ruby/object:Gem::Dependency
|
98
|
-
name: font-awesome-sass
|
99
|
-
requirement: !ruby/object:Gem::Requirement
|
100
|
-
requirements:
|
101
|
-
- - ">="
|
102
|
-
- !ruby/object:Gem::Version
|
103
|
-
version: '0'
|
104
|
-
type: :runtime
|
105
|
-
prerelease: false
|
106
|
-
version_requirements: !ruby/object:Gem::Requirement
|
107
|
-
requirements:
|
108
|
-
- - ">="
|
109
|
-
- !ruby/object:Gem::Version
|
110
|
-
version: '0'
|
111
69
|
- !ruby/object:Gem::Dependency
|
112
70
|
name: simple_form
|
113
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -192,20 +150,6 @@ dependencies:
|
|
192
150
|
- - ">="
|
193
151
|
- !ruby/object:Gem::Version
|
194
152
|
version: '0'
|
195
|
-
- !ruby/object:Gem::Dependency
|
196
|
-
name: bh
|
197
|
-
requirement: !ruby/object:Gem::Requirement
|
198
|
-
requirements:
|
199
|
-
- - ">="
|
200
|
-
- !ruby/object:Gem::Version
|
201
|
-
version: '0'
|
202
|
-
type: :runtime
|
203
|
-
prerelease: false
|
204
|
-
version_requirements: !ruby/object:Gem::Requirement
|
205
|
-
requirements:
|
206
|
-
- - ">="
|
207
|
-
- !ruby/object:Gem::Version
|
208
|
-
version: '0'
|
209
153
|
- !ruby/object:Gem::Dependency
|
210
154
|
name: rails-i18n
|
211
155
|
requirement: !ruby/object:Gem::Requirement
|
@@ -360,20 +304,6 @@ dependencies:
|
|
360
304
|
- - ">="
|
361
305
|
- !ruby/object:Gem::Version
|
362
306
|
version: '0'
|
363
|
-
- !ruby/object:Gem::Dependency
|
364
|
-
name: select2-rails
|
365
|
-
requirement: !ruby/object:Gem::Requirement
|
366
|
-
requirements:
|
367
|
-
- - ">="
|
368
|
-
- !ruby/object:Gem::Version
|
369
|
-
version: '0'
|
370
|
-
type: :runtime
|
371
|
-
prerelease: false
|
372
|
-
version_requirements: !ruby/object:Gem::Requirement
|
373
|
-
requirements:
|
374
|
-
- - ">="
|
375
|
-
- !ruby/object:Gem::Version
|
376
|
-
version: '0'
|
377
307
|
- !ruby/object:Gem::Dependency
|
378
308
|
name: acts-as-taggable-on
|
379
309
|
requirement: !ruby/object:Gem::Requirement
|
@@ -652,7 +582,6 @@ files:
|
|
652
582
|
- app/uploaders/dorsale/image_uploader.rb
|
653
583
|
- app/uploaders/dorsale/pdf_uploader.rb
|
654
584
|
- app/views/dorsale/_actions.html.slim
|
655
|
-
- app/views/dorsale/_flash.html.slim
|
656
585
|
- app/views/dorsale/_page.html.slim
|
657
586
|
- app/views/dorsale/alexandrie/attachments/_attachment.html.slim
|
658
587
|
- app/views/dorsale/alexandrie/attachments/_edit.html.slim
|
@@ -1023,8 +952,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1023
952
|
- !ruby/object:Gem::Version
|
1024
953
|
version: '0'
|
1025
954
|
requirements: []
|
1026
|
-
|
1027
|
-
rubygems_version: 2.7.6
|
955
|
+
rubygems_version: 3.0.3
|
1028
956
|
signing_key:
|
1029
957
|
specification_version: 4
|
1030
958
|
summary: Modular ERP made with Ruby on Rails
|