Sylvain
b645e5efe5
fixed: remove restrincting plan message
2020-03-02 16:59:04 +01:00
Sylvain
5765e3d2e4
move availability options to new step + wording
2020-03-02 16:52:54 +01:00
Sylvain
a44bf85014
Merge branch 'slot_is_only_subscriptions' into dev
2020-03-02 16:27:26 +01:00
Sylvain
4ad8a836f9
removed unneeded returns
2020-03-02 16:20:50 +01:00
Sylvain
07b21f5094
Merge branch 'book_slot_at_same_time' into dev
2020-03-02 15:52:05 +01:00
Sylvain
11ccaa73b6
Merge remote-tracking branch 'origin/disable_wallet_option' into dev
2020-03-02 15:47:14 +01:00
Sylvain
147a78de96
Merge branch 'tour' into dev
2020-03-02 15:39:45 +01:00
Sylvain
6748a1aca1
[bug] with Firefox browser, the texts in date inputs are shifted to the bottom
2020-03-02 11:46:56 +01:00
Sylvain
f1928c0d4c
refactor the home tour to start after the render
2020-03-02 11:40:00 +01:00
Sylvain
5186d6b22c
behavior of FEATURE_TOUR_DISPLAY
2020-03-02 11:17:28 +01:00
Sylvain
9ce9079ef9
auto-start home tour after login + reorganizer tour to comply with new menu
2020-03-02 10:32:51 +01:00
Sylvain
1a7d7258d8
[bug] in some cases, bogus admin notification on profile completed
2020-03-02 10:20:10 +01:00
Sylvain
29eb248029
[bug] unable to select a group in profile completion screen
2020-03-02 09:59:35 +01:00
Sylvain
63bdd85657
[bug] datepicker does not work in profile completion screen
2020-03-02 09:49:16 +01:00
Sylvain
02aafcb78b
fix missing translations
2020-03-02 09:43:42 +01:00
Sylvain
676da06ef1
left menu spacers style
2020-03-02 09:13:00 +01:00
Sylvain
4e72cd16a1
harmonized Fab-manager typo
2020-03-02 08:59:43 +01:00
Sylvain
38b196feb8
rearrange main menu
2020-02-26 18:05:09 +01:00
Sylvain
fc5b935495
helpers between reservables screens
2020-02-26 17:30:27 +01:00
Sylvain
a62e31090e
tours wording
2020-02-26 16:49:29 +01:00
Sylvain
6835d71197
fix missing translation
2020-02-26 16:07:01 +01:00
Sylvain
c111fca980
alert about slots division on availability creation
2020-02-26 15:58:41 +01:00
Sylvain
0ea7e774d3
wording in training & calendar tours + label on ical button
2020-02-26 15:48:42 +01:00
Sylvain
7143801641
start help tour by clicking on help in user menu
...
also: tour descriptions of home page items
2020-02-26 15:13:58 +01:00
Sylvain
d71a1b7cbd
improve settings/privacy tab
2020-02-26 12:20:33 +01:00
Sylvain
6b63483fcc
fix an issue with the health endpoint
2020-02-26 12:00:51 +01:00
Sylvain
e1d346591f
rewrited some steps of the home tour
2020-02-26 11:44:49 +01:00
Sylvain
d833f6d812
harmonize Fab-manager trademark syntax
2020-02-26 10:19:43 +01:00
Sylvain
222590ae5e
tour step modal: increase width + align buttons
2020-02-26 09:37:21 +01:00
Sylvain
4db219b204
[ongoing] FEATURE_TOUR_DISPLAY
2020-02-25 18:02:41 +01:00
Sylvain
cf8fb0659b
open-api tour
2020-02-25 11:47:30 +01:00
Sylvain
9f9656caa4
settings tour
2020-02-25 11:40:01 +01:00
Sylvain
a56f6c4e18
statistics tour
2020-02-25 11:06:03 +01:00
Sylvain
31dce73f14
project elements tour
2020-02-25 10:47:16 +01:00
Sylvain
9589efa312
fix scroll issues on tours
2020-02-25 10:11:18 +01:00
Sylvain
64e41910ec
trainings tour: change tab on tracking step
...
invoices tour: do not show listing steps if invoicing is disabled
+ typo
2020-02-25 09:48:55 +01:00
Sylvain
e6f2e60997
spaces tour
2020-02-24 16:57:41 +01:00
Sylvain
76c1b69b7a
machines tour
2020-02-24 16:51:03 +01:00
Sylvain
c13ba85230
events tour
2020-02-24 16:21:12 +01:00
Sylvain
42e2c8bafa
do not display spaces tab help if space module is disabled
2020-02-24 15:04:17 +01:00
Sylvain
f8f1dde14a
pricing tour
2020-02-24 15:02:45 +01:00
Sylvain
a1a96b9c03
fix handle invoices tour with F1
2020-02-24 11:56:13 +01:00
Sylvain
807a9596a8
invoices tour
2020-02-24 11:55:13 +01:00
Sylvain
9f68375ae9
admin calendar tour
2020-02-24 10:33:27 +01:00
Sylvain
32d5af9b87
fix tours collision on F1
2020-02-24 10:05:03 +01:00
Sylvain
496e926abd
fix members tour if no member
2020-02-19 14:39:45 +01:00
Sylvain
bc63465a84
members tour
2020-02-19 14:30:56 +01:00
Sylvain
906decb620
[ongoing] members tour
2020-02-19 13:00:38 +01:00
Sylvain
3d788579f1
set active tab depending on tour step
2020-02-19 12:21:24 +01:00
Sylvain
fd62062533
Updated angular-ui-bootstrap from v1.1 to v1.2
2020-02-19 12:07:42 +01:00
Sylvain
0948ef4381
Updated angular-ui-bootstrap from v0.14 to v1.1
2020-02-19 11:34:38 +01:00
Sylvain
05a29a54b3
trainings tour
2020-02-19 10:22:32 +01:00
Sylvain
0d9f79976d
[ongoing] trainings tour
2020-02-18 17:53:53 +01:00
Sylvain
16ed2fa73a
isolate welcome tour
2020-02-18 17:39:47 +01:00
Sylvain
5b46edd748
welcome tour + save completed tours in database
2020-02-18 17:36:45 +01:00
Sylvain
d869948cd0
fix translations mapping
2020-02-18 15:52:37 +01:00
Sylvain
40f41aeef5
fix translations mapping
2020-02-18 15:52:28 +01:00
Sylvain
4c919824ba
fix unmapped translations in signup modal
2020-02-18 10:17:07 +01:00
Sylvain
11a2dde776
fix notifications over tour
2020-02-17 18:57:05 +01:00
Du Peng
908275d171
add disable wallet option
2020-02-12 18:15:44 +01:00
Sylvain
fd471be40a
angular-ui-tour: fixed positionning problem + some more steps in the tour + centering the welcome message
2020-02-12 17:18:11 +01:00
Du Peng
7242eb32f8
allow admin reserve a slot at the same time
2020-02-12 14:54:06 +01:00
Du Peng
b559d10b87
improve slot is only subscription
2020-02-12 12:58:17 +01:00
Sylvain
71290420bb
ui-tour 3 steps
2020-02-11 15:49:43 +01:00
Sylvain
528877bc76
poc features-tour
2020-02-11 15:49:43 +01:00
Sylvain
b7dda83060
Merge branch 'edit_event_recurrent' into dev
2020-02-11 15:43:29 +01:00
Sylvain
db26533d94
alert on date change
2020-02-11 15:42:43 +01:00
Du Peng
870a092a81
Merge branch 'slot_is_only_subscriptions' of git.sleede.com:projets/fab-manager into slot_is_only_subscriptions
2020-02-11 13:22:28 +01:00
Du Peng
096a658bac
add a validator to check reservation's slot is or not restrict for subscriptions
2020-02-11 13:22:20 +01:00
Du Peng
760109de05
fix bug: cant reserve formation slot
2020-02-11 13:21:25 +01:00
Sylvain
372d7f936b
typos & syntax
2020-02-11 11:46:40 +01:00
Sylvain
54bcc392f3
typo and syntax
2020-02-11 10:48:29 +01:00
Du Peng
d9676b604c
remove debug info
2020-02-10 11:53:20 +01:00
Du Peng
427725f927
fix bug: select plans error
2020-02-10 11:52:57 +01:00
Sylvain
ea9607521b
translation issue on event reservation
2020-02-10 11:09:54 +01:00
Sylvain
aecbaa7f04
translation issue on event reservation
2020-02-10 11:09:22 +01:00
Du Peng
74cc69d1bd
Ability to configure reservation slot restrict for plans
2020-02-07 17:37:00 +01:00
Du Peng
7c86adde4b
Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time
2020-02-05 16:53:47 +01:00
Du Peng
c3965b28cf
remove rebocop disable
2020-02-03 10:53:54 +01:00
Du Peng
05073d5a28
fix bug for update event recurrent
2020-01-30 12:03:50 +01:00
Sylvain
fd0f49f132
rubocop: ruby syntax
2020-01-29 17:50:06 +01:00
Sylvain
5b97ef03a9
rubocop: ruby syntax
2020-01-29 17:49:05 +01:00
Sylvain
b1a98d3574
improved texts
2020-01-29 17:44:17 +01:00
Du Peng
35d9bec8a5
update event recurrent
2020-01-29 17:20:19 +01:00
Du Peng
de02bb1c72
update all attributes of event
2020-01-28 18:34:32 +01:00
Sylvain
81a42e5935
customize home page : full texts
2020-01-28 10:12:29 +01:00
Sylvain
8d8c9a8af5
fix double insertion of widgets button in home page editor
2020-01-28 09:24:55 +01:00
Sylvain
49b3a54afb
allow display widgets multiple times on home page
2020-01-28 09:21:39 +01:00
Du Peng
b1419271e6
edit event recurrent in progress
2020-01-27 18:21:46 +01:00
Sylvain
656a603d6c
customize home page css
2020-01-27 17:10:29 +01:00
Sylvain
37c90b1d54
ruby syntax
2020-01-22 14:34:45 +01:00
Sylvain
34a3286870
fix homepage layout
2020-01-22 14:16:35 +01:00
Sylvain
898a18ed46
display customized home page html
2020-01-22 13:25:22 +01:00
Sylvain
75c49c06f2
move homepage components to standalone directives
...
- events
2020-01-22 12:52:51 +01:00
Sylvain
89e146d419
[ongoing] move homepage components to standalone directives
...
- twitter
- members
2020-01-22 12:43:08 +01:00
Sylvain
fd1778b465
renamed twitter template file
2020-01-22 12:24:45 +01:00
Sylvain
1968ba601d
[ongoing] move homepage components to standalone directives
2020-01-22 12:23:51 +01:00
Sylvain
b85c7ac00b
admin set its customized html template for the home page & can reset it to factory value
2020-01-22 11:53:40 +01:00
Sylvain
b1e6154cc9
POC for custom home page
2020-01-21 18:03:15 +01:00
Sylvain
15ab3c1305
Ability to customize the title of the link to the about page
2020-01-21 16:16:12 +01:00
Sylvain
45e4b5c4bc
Create machine availabilities: select all/none in a click
2020-01-21 12:09:24 +01:00
Sylvain
97660924cb
fix typo and wording
2020-01-21 11:16:49 +01:00
Sylvain
146ba97766
Merge remote-tracking branch 'origin/reserve_slots_passed' into dev
2020-01-21 11:01:48 +01:00
Sylvain
57e5da61de
remove unused helper
2020-01-21 11:01:23 +01:00
Du Peng
3c26c6d4bd
disable add plan with reserve slot in the past
2020-01-20 16:17:10 +01:00
Du Peng
0143c3d495
allow admin reserve machine/space in the past time
2020-01-20 16:17:10 +01:00
Sylvain
c214ae3beb
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2020-01-15 12:49:07 +01:00
Sylvain
7929d3b198
detailled view of collected data in fabanalytics
2020-01-15 12:48:55 +01:00
Du Peng
fe387cbe3c
Merge branch 'twitter' into dev
2020-01-15 12:40:01 +01:00
Du Peng
db29673a4c
remove twitter api for get latest tweet
2020-01-15 12:34:51 +01:00
Du Peng
900d84f3c6
get latest twitter by twitter search without twitter api
2020-01-15 12:04:07 +01:00
Sylvain
059096c2dd
privacy option for fab-analytics
2020-01-15 10:46:04 +01:00
Sylvain
a67b2ff29c
do not show version modal if system if up-to-date
2020-01-14 18:03:57 +01:00
Sylvain
774060d9ab
FORCE_VERSION_CHECK for dev env + do not save hub public key if duplicate
2020-01-14 17:59:30 +01:00
Sylvain
19502c8231
fix display version on home page
2020-01-14 17:39:13 +01:00
Sylvain
1f3d9cf88d
display upgrade infos directly on the interface
2020-01-14 17:12:36 +01:00
Sylvain
a564ec62b5
updated version check worker
2020-01-14 16:16:31 +01:00
Sylvain
bb48a13f83
health endpoint & automated version check
2020-01-14 14:33:00 +01:00
Sylvain
64764e5498
check version on hub & [ongoing] health endpoint
2020-01-13 17:05:53 +01:00
Sylvain
54be21729b
batch delete periodic events
2020-01-07 17:18:49 +01:00
Sylvain
1c4f144b8d
Merge branch 'members-filters' into dev
2020-01-07 10:44:55 +01:00
Sylvain
f778ee9016
fix syntax + add missing translations
2020-01-07 10:44:29 +01:00
Sylvain
3c3e806a29
Merge branch 'user-confirmation' into dev
2020-01-07 10:34:25 +01:00
Sylvain
b6ee4e92a4
change falsy value + updated changelog
2020-01-07 10:34:12 +01:00
Sylvain
6d0cc201c4
remove: send abuse with ENTER
2020-01-06 17:08:50 +01:00
Nicolas Florentin
9cc090e4bc
typo
2019-12-30 13:48:40 +01:00
Nicolas Florentin
60e063a15b
fix currentUser value after successfull sign up when confirmation is needed, plus improves translations
2019-12-30 13:45:25 +01:00
Nicolas Florentin
6550428f72
fix AUthService factory, isAuthenticated was called from scope and not from the factory itself
2019-12-30 13:44:24 +01:00
Nicolas Florentin
0b899fe183
Merge branch 'dev' into user-confirmation
2019-12-30 09:36:43 +01:00
Sylvain
3412d9e35c
fix checking enable_in_context_translation
2019-12-23 13:49:46 +01:00
Sylvain
f05547e46e
change ach pluralization location
2019-12-23 11:29:02 +01:00
Sylvain
40e8b60a0a
add ach pluralization fonction for messageFormat
2019-12-23 10:28:12 +01:00
Nicolas Florentin
62c979cfc0
members filters, translations for other languages are still needed
2019-12-20 15:47:42 +01:00
Nicolas Florentin
518511ab3b
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2019-12-19 12:06:54 +01:00
Nicolas Florentin
7ea3e5ce32
fix translation key path app.public.projects_list.the_fablab_projects
2019-12-19 12:06:45 +01:00
Sylvain
bcd0e6833d
integrate crowdin in-context translation code
2019-12-18 16:50:16 +01:00
Nicolas Florentin
0a3a6d034a
env variable USER_CONFIRMATION_NEEDED_TO_SIGN_IN can force user to confirm his account to sign in
2019-12-18 16:02:47 +01:00
Sylvain
14c3abb449
refactoring i18n keys: trainings + modals + various missings
2019-12-18 13:04:38 +01:00
Sylvain
1124159f2e
refactoring i18n keys: projects
2019-12-18 11:08:14 +01:00
Sylvain
a8e8ffa1d4
refactoring i18n keys: export stats
2019-12-17 18:09:36 +01:00
Sylvain
a7b423b151
refactoring i18n keys - admin
2019-12-17 18:06:56 +01:00
Sylvain
88c48e4e69
[ongoing] refactoring i18n keys - admin
2019-12-17 12:40:36 +01:00
Sylvain
d21f616283
[ongoing] refactoring i18n keys
2019-12-16 16:54:40 +01:00
Sylvain
c565d9ff2b
unified front-end i18n interpolations syntax to messageformat
2019-12-16 10:16:11 +01:00
Sylvain
0c11f61010
Prevent event reservation in the past
2019-12-10 12:16:26 +01:00
Sylvain
6aa3c0caeb
Notify all admins on the creation of a refund invoice
2019-12-09 11:55:31 +01:00
Sylvain
510c802ab1
messages variations depending on slot duration
2019-12-09 10:27:50 +01:00
Sylvain
f50e45d2de
rake task to sync users with stripe
2019-12-03 16:32:59 +01:00
Sylvain
60755a2c2a
Merge remote-tracking branch 'origin/fix-time-now' into dev
2019-12-03 15:51:22 +01:00
Sylvain
11e74c6859
Merge branch 'ics' into dev
2019-12-03 15:30:28 +01:00
Sylvain
64fe68b2b0
icalendar source sync: create/update/delete ical events
2019-12-03 12:16:07 +01:00
Sylvain
538b5cef78
add/remove ical imports in public agenda
...
also: a little of refacftoring in CalendarController
2019-12-03 11:27:20 +01:00
Sylvain
32e7fc3900
confirm delete icalendar imports + fix display + add translations
2019-12-03 10:48:53 +01:00
Sylvain
d93ce15a47
external calendars legend
2019-12-03 10:23:19 +01:00
Sylvain
122ff54cd8
fix colors in ics imports
2019-12-03 10:17:29 +01:00
Sylvain
5215d0643d
Merge branch 'ics' of git.sleede.com:projets/fab-manager into ics
2019-12-03 09:56:37 +01:00
Sylvain
22be9f6a08
display external calendars list in public calendar + pull availabilities
2019-12-02 16:49:20 +01:00
Sylvain
cca6b14f58
import events asyncronously from icalendar
2019-12-02 15:53:24 +01:00
Nicolas Florentin
db41e846dd
uses DateTime#current instead of Time.now in tests
2019-12-02 15:29:05 +01:00
Nicolas Florentin
b17bcfde86
comment model slot.rb
2019-12-02 12:39:20 +01:00
Nicolas Florentin
6ff6c71060
rm dead code Slot#can_be_modified?
2019-12-02 12:32:52 +01:00
Sylvain
55d2c88134
delete & sync ical sources
2019-12-02 12:19:30 +01:00
Nicolas Florentin
77cf8c8218
replaces almost all Time.now by DateTime.current
2019-12-02 11:57:25 +01:00
Sylvain
36eba99808
[bug] report errors on admin creation
2019-12-02 10:39:42 +01:00
Sylvain
f72ae98109
do not show title if calendar is configured to hide them
2019-11-27 17:50:38 +01:00
Sylvain
85d17d62f3
fix events endpoint
2019-11-27 17:44:01 +01:00
Sylvain
97d93cd622
added a name to imported calendar
2019-11-27 17:39:19 +01:00
Sylvain
baf8cfb487
iCalendar server api & db model
2019-11-27 17:05:19 +01:00
Sylvain
9e2134c9cf
ics sources configuration interface
2019-11-27 16:17:42 +01:00
Sylvain
bb777227d6
display events of external ics in calendar
2019-11-27 13:59:56 +01:00
Sylvain
a9b1eabb2c
[poc] show google agenda events in the public calendar
2019-11-27 13:51:23 +01:00
Sylvain
90b3564138
admin calendar: surround select item by shadow-box
2019-11-27 12:31:32 +01:00
Sylvain
91008b3df1
improved calendar legend
2019-11-27 11:52:37 +01:00
Sylvain
eb3c78a61d
[poc] show google agenda events in the public calendar
2019-11-26 13:44:43 +01:00
Sylvain
48b811d2b5
Added freeCAD files as default allowed extensions
...
also: refactored some ruby code
2019-11-25 16:12:23 +01:00
Sylvain
68b17cbe9a
Ability to show the scheduled events in the admin calendar
2019-11-25 14:49:39 +01:00
Sylvain
563de29b9d
Calendar management: improved legend style
2019-11-25 11:59:34 +01:00
Sylvain
1182822d8b
show correct seats nb in canceled reservation
2019-11-25 10:45:54 +01:00
Sylvain
bbd613f2a5
compute right nb of free seats for event reservation
...
also: copy nb_total_places to n+1 instances when creating recurrent
availabilities
2019-11-25 10:30:12 +01:00
Sylvain
ce366beaa2
display that an event reservation was canceled
...
also: fixed transtions files
2019-11-21 11:15:05 +01:00
Sylvain
cabe2e5604
update free places after cancel event reservation
2019-11-20 17:06:42 +01:00
Sylvain
b725a5a071
Merge branch 'cancel' into dev
2019-11-20 10:27:56 +01:00
Sylvain
37d6c84cc6
[bug] unable to remove training picture
...
also: removed some invalid href=# in the templates
2019-11-19 15:18:00 +01:00
Sylvain
ad928bd4e6
ability to set phone number optional or required
...
also: show stars on required fields in new admin form
2019-11-19 11:44:32 +01:00
Sylvain
9ec736e6b5
delete recursive slots
2019-11-18 17:29:51 +01:00
Sylvain
26738563bd
create reccursive events
2019-11-18 11:50:20 +01:00
Sylvain
a60a39ff9e
[ongoing] create multiple availabilities according to UI
2019-11-13 12:13:22 +01:00
Sylvain
0d740c95a9
recapitulative screen
2019-11-13 10:59:10 +01:00
Sylvain
22251e6516
summary screen
...
TODO: eventModal.html.erb:167
2019-11-12 16:28:10 +01:00
Sylvain
2cccbd3486
recurrence UI
2019-11-12 14:25:28 +01:00
Sylvain
96a2f6e426
create availablities with slots duration ne 60
2019-10-30 15:09:44 +01:00
Sylvain
cdc30e0da2
configure the slots duration with an environment variable
2019-10-29 16:52:52 +01:00
Nicolas Florentin
12b9155b43
try to fix edge cases of VatHistoryService, related to issue #156
2019-10-29 15:20:25 +01:00
Sylvain
1ed3eba129
[feature] export last connection date to members.xlsx
2019-10-29 11:09:17 +01:00
Sylvain
f94d8feba6
[feature] admin can delete an user
2019-10-29 09:59:21 +01:00
Sylvain
35fb991cdb
Improved user experience in defining slots in the calendar management
2019-10-23 17:48:31 +02:00
Sylvain
d7aed3fa1f
Improved notification email to the member when a rolling subscription is taken
2019-10-23 11:43:42 +02:00
Sylvain
58821555fe
Ability to set the default view in project gallery: openLab or local
2019-10-22 14:42:45 +02:00
Sylvain
d48e5602ce
[bug] admins can't edit members projects
2019-10-22 14:42:35 +02:00
Sylvain
fdcec06345
CVE-2019-16892 + #49
...
- updated rubyzip to fix a security issue
- updated axlsx and file writing method as a possible fix for #49
2019-10-21 16:11:49 +02:00
Sylvain
528e6f5e55
admin invoices interface: default selected tab depending on FABLAB_WITHOUT_INVOICES value
2019-10-21 15:24:27 +02:00
Sylvain
e8930924e4
[bug] do not display each days in invoices for multiple days event reservation
2019-10-16 16:11:37 +02:00
Sylvain
9e1e23f268
[bug] unauthorized user can see the edit project form
2019-10-16 15:21:50 +02:00
Sylvain
ab5ee0f2d8
[bug] invoices list is not shown by default in 'manage invoices' section
2019-10-14 10:59:56 +02:00
Sylvain
bc36b78719
[bug] public calendar won't show anything if the current date range include a reserved space availability ( #151 )
2019-10-14 10:38:13 +02:00
Sylvain
2897eec723
various bugfixes
...
- in profile_complete form, the user's group is not selected by default
- missing asterisks on some required fields in profile_complete form
- renamed default DatabaseProvider from Fablab to FabManager
2019-10-09 14:41:32 +02:00
Sylvain
7dbfbc4868
fix typo
2019-10-07 17:12:49 +02:00
Sylvain
38847844fb
display label on all rows in accounting export
2019-10-07 14:02:47 +02:00
Sylvain
19a125bd67
[bug] accounting export: on subscription + reservation invoice, the subscription item is exported twice
2019-10-07 12:08:08 +02:00
Sylvain
86f4c132b0
Merge branch 'cve-2015-9284' into dev
2019-10-02 16:08:40 +02:00
Sylvain
5fcf9968cb
Updated Omniauth & Omniauth-oauth2 + fixed oauth2 callback url
2019-10-02 16:06:27 +02:00
Sylvain
927479733b
migrated links to /users/auth from GET to POST
...
see https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284 for more info
2019-10-02 14:37:47 +02:00
Sylvain
2cc7fb0e44
accounting export: display lable on all lignes
2019-10-02 10:25:06 +02:00
Sylvain
35b069a4db
added gem omniauth-rails_csrf_protection + [ongoing] moving from GET /users/auth/... to POST
2019-10-01 17:14:16 +02:00
Sylvain
877506b26a
[bug] unable to dissociate the last machine from a formation
2019-10-01 15:27:59 +02:00
Sylvain
29d6a1daa4
Merge branch 'uvsq' into dev
2019-10-01 14:32:58 +02:00
Sylvain
a7a929ddbc
integration unit test for imports + fixed import result colors in UI + fixed test fixtures
2019-10-01 14:32:30 +02:00
Sylvain
193e81e711
Merge branch 'uvsq' into dev
2019-09-30 15:34:21 +02:00
Sylvain
0d3cc0fe40
[feature] Ability to disable invoices generation and interfaces
2019-09-30 15:29:20 +02:00
Sylvain
8bd1d72fdf
improved results page
2019-09-30 12:49:50 +02:00
Sylvain
ba3161589c
update users through CSV import
2019-09-30 12:19:33 +02:00
Sylvain
ff5de97c92
import new users from CSV and view results in app
...
TODO:
- update users though CSV
2019-09-26 17:05:57 +02:00
Sylvain
4deaf1f75a
[ongoing] import members from csv
2019-09-25 16:37:42 +02:00
Sylvain
a532efd198
upload csv file to the server through the API and save it on the disk
2019-09-24 17:42:50 +02:00
Sylvain
ede53ad761
[feature] Ability to set project's CAO attachement maximum upload size
2019-09-24 16:40:38 +02:00
Sylvain
ad1b7baa05
import members interface
2019-09-24 15:21:18 +02:00
Sylvain
8eda1e673f
Merge remote-tracking branch 'origin/hotfixes' into dev
2019-09-24 14:43:14 +02:00
Sylvain
e7bb41f38d
[ongoing] import users from csv file: admin inteface
2019-09-24 12:21:19 +02:00
Sylvain
f75633e64e
[bug] create a plan does not set its name
2019-09-24 11:41:07 +02:00
Sylvain
588010ac0b
[feature] Optional reCaptcha checkbox in sign-up form
2019-09-23 17:46:46 +02:00
Nicolas Florentin
c49db3b512
fix api/reservations#index find statistic_profile_id from the user_id because user_id is not a column of reservations table anymore
2019-09-20 15:23:53 +02:00
Nicolas Florentin
22d4d3a78a
method date_range, test on all_day was never truthy
2019-09-20 15:03:49 +02:00
Nicolas Florentin
401df4cb77
delay_for does not exist anymore in sidekiq 5
2019-09-20 15:01:27 +02:00
Sylvain
de1cc2013a
[bug] after disabling a group, its associated plans are hidden from the interface
...
+ validate server-side that there's no more user in the group to disable
2019-09-19 15:34:21 +02:00
Sylvain
668eb43959
[bug] in case of unexpected server error during stripe payment process, the confirm button is not unlocked
2019-09-19 15:00:27 +02:00
Sylvain
a7dc3b2431
factorized invoice reference & order number code
2019-09-19 14:59:22 +02:00
Sylvain
2d6f5c3e81
wallet client line in accounting export + factorized accountingExportService
2019-09-19 13:57:33 +02:00
Sylvain
7d26932f6c
configure accounting codes & labels for wallet clients and other means clients
2019-09-19 11:51:14 +02:00
Sylvain
c76563f22f
wallet label in accounting export
2019-09-19 11:25:12 +02:00
Sylvain
f81a2e4343
wallet credit in accounting export
2019-09-19 11:10:26 +02:00
Sylvain
c905d3fbc5
use correct VAT infos in accounting export
2019-09-18 17:25:53 +02:00
Sylvain
cd2c8488c2
Compute the VAT per item in each invoices, instead of globally
2019-09-18 17:14:59 +02:00
Sylvain
02c7cb801f
factorized footprint computation
2019-09-18 15:09:14 +02:00
Sylvain
276a99c068
improved VAT history service + display dates when VAT was enabled in invoice configuration panel + do not render vat row in accouting export if vat was disabled
2019-09-18 13:28:53 +02:00
Sylvain
46c3497c85
ventilate coupon codes on items
2019-09-17 17:39:05 +02:00
Sylvain
30e7ce8377
[bug] invoices with total = 0, are marked as paid on site even if paid by card
2019-09-17 15:16:11 +02:00
Sylvain
1fa36d4029
renamed avoir_mode to payment_method
2019-09-17 14:48:06 +02:00
Sylvain
aef4cc49f2
fixes accounting codes setting + improved error handling
2019-09-17 13:00:25 +02:00
Sylvain
3348539fdf
export labels: user name + reference + summary, only on client line. Also: handling new export parameters (decimal separator, label length, export zeros)
2019-09-17 12:35:34 +02:00
Sylvain
f06bdaaf21
provide additional settings to export api
2019-09-16 16:31:16 +02:00
Sylvain
02d28e0b8c
improved accounting codes settings page (1 click saves all) + improved export file name
2019-09-16 14:39:47 +02:00
Sylvain
224b0d6dee
Merge branch 'sca' into dev
2019-09-12 12:53:56 +02:00
Sylvain
9d2e17d5d6
[bug] once a reservation was made, the reminder of the paid price is always 0 if a coupon was used
2019-09-12 12:25:13 +02:00
Sylvain
52afb6ef07
[bug] extend a current subscription for a member, does not reset his credits
2019-09-12 11:37:03 +02:00
Sylvain
53e02622b9
[bug] disabled groups still appears as available in sign-up modal
2019-09-12 11:14:04 +02:00
Nicolas Florentin
3c486e4b93
[Bug] unable to create the first user because role member was missing
2019-09-11 17:11:43 +02:00
Sylvain
539eb08b89
ability to disable the online payments through an env var
2019-09-11 17:08:00 +02:00
Sylvain
d977838d52
fix tests according to changes for stripe SCA
2019-09-11 16:20:47 +02:00
Sylvain
78e6392f60
do not display invoice update logs in test mode + updated reservations fixtures w/o stp_invoice_id column + helper script to run tests
2019-09-11 14:29:35 +02:00
Sylvain
9fc3c7f61c
[bug] Wallet credit inputs does not allow to put zeros at the end of the decimal part of the amount
2019-09-11 13:05:10 +02:00
Sylvain
3320ee103b
Log changes in Invoices or InvoiceItems records for better handling of accounting certification issues
2019-09-11 12:22:14 +02:00
Sylvain
f60d19fa27
allow reservations & subscriptions at price of zero
2019-09-11 11:51:04 +02:00
Sylvain
75f483a7a6
compute subscription price server-side for payments
2019-09-11 10:31:22 +02:00
Sylvain
ac0489a496
[bug] wallet usage is noted on subscription invoices even if wallet was not used + use payment confirm API for subscriptions only (sca)
2019-09-10 17:57:46 +02:00
Sylvain
4d0ac9b3ca
using stp_payment_intent_id instead of stp_invoice_id on new invoices
2019-09-10 16:45:45 +02:00
Sylvain
5a75db394c
[bug] Users with role 'member' cannot download their invoices
2019-09-10 14:46:07 +02:00
Sylvain
04f17d44d8
handle sca in js frontend
2019-09-10 12:46:02 +02:00
Sylvain
a96050a2e9
refactor payment process for sca
2019-09-10 11:46:14 +02:00
Sylvain
e9e27663cd
quick coding rules checking with rubocop
2019-09-09 18:04:31 +02:00
Nicolas Florentin
e94cf46fa4
ongoing work on sca stripe
2019-09-09 17:37:54 +02:00
Nicolas Florentin
f1958a300b
[Bug] unable to create the first user because role member was missing
2019-09-09 14:34:00 +02:00
Sylvain
510533e080
handle 2nd confirmation on server + display confirmation modal on the client
2019-09-05 17:17:51 +02:00
Sylvain
12447698f8
collect card details on the client & create a paymentIntent on the server
2019-09-05 16:17:02 +02:00
Sylvain
a0961314a4
[ongoing] upgrade stripe gem & api version to allow SCA
2019-09-05 11:03:22 +02:00
Sylvain
967f539ad9
[ongoing] update to stripe-js:v3 to use strong customer authentication
2019-09-04 17:20:18 +02:00
Sylvain
bebb3354fb
[bug] ( #140 ) VAT rate is erronous in invoices
2019-08-14 10:56:30 +02:00
Sylvain
92d79bc9c7
[bug] ( #140 ) VAT rate is erronous in invoices
2019-08-14 10:54:23 +02:00
Sylvain
13d3197069
prevent existance of unwanted separators + truncate labels
2019-08-01 14:58:10 +02:00
Sylvain
15f858ba9c
Merge branch 'acd' into dev
2019-08-01 13:07:05 +02:00
Sylvain
35c31b96ea
fix vat history usage in invoice test + fix sidekiq delay extension
2019-08-01 11:50:03 +02:00
Sylvain
61c1d09ac8
[bug] use vat history while regenerating invoices
2019-08-01 11:29:45 +02:00
Sylvain
38ab06840e
consider vat history in accounting export + [bug] use vat history while regenerating invoices
2019-08-01 11:26:40 +02:00
Sylvain
acacd9a19e
fixed accounting codes interface + fixed csv generation
2019-08-01 10:24:34 +02:00
Sylvain
26c98394ac
fixed export service
2019-08-01 09:49:09 +02:00
Sylvain
e32825675c
[ongoing] fixing accounting export service
2019-07-31 16:52:11 +02:00
Sylvain
12d8c65fa2
async generation of export and download cached csv using hidden iframe
2019-07-31 15:47:02 +02:00
Sylvain
fa6a54a422
export notifications
2019-07-31 12:37:31 +02:00
Sylvain
a7f68b59dd
connect the export modal to the api
2019-07-31 12:00:52 +02:00
Sylvain
22d84e86f5
export modal
2019-07-31 11:10:10 +02:00
Sylvain
a9ea4057f3
interface to customize accounting codes and labels
2019-07-30 16:06:35 +02:00
Sylvain
f772bc3509
api endpoint and worker to export accounting data
2019-07-30 11:43:51 +02:00
Sylvain
82ad69d386
handle avoirs
2019-07-30 10:27:47 +02:00
Sylvain
ab295f064d
service to export invoices into a given period to CSV lines for an accounting sofware
2019-07-29 17:51:53 +02:00
Sylvain
3d3be70e29
[bug] newly generated refund is displayed as broken
2019-07-29 12:25:46 +02:00
Sylvain
5e8697de18
fix invoices list API
2019-07-29 12:19:54 +02:00
Sylvain
a778b1063a
enhance ruby syntax
2019-07-29 12:17:57 +02:00
Sylvain
0714878bca
[bug] unable to generate a refund
2019-07-29 12:07:22 +02:00
Sylvain
1be7bda603
[security] updated sidekiq to fix 3 security vulnerabilities
2019-07-29 11:34:59 +02:00
Sylvain
26c8d402e1
removed dependency to jquery-ui
2019-07-17 15:30:19 +02:00
Sylvain
12fcfee71e
[bug] unable to export reservations or subscriptions to excel
2019-07-10 12:25:08 +02:00
Sylvain
38d3ddd48a
[bug] export members list to excel is broken
2019-07-10 11:27:45 +02:00
Sylvain
b77fde2506
[bug] OpenlabWorker is crashing with message undefined method profile for StatisticProfile
2019-07-10 10:58:51 +02:00
Sylvain
1253af5377
Prevent invalid invoice logo from crashing the InvoiceWorker
2019-07-10 10:54:35 +02:00
Sylvain
ca61e4e08e
[bug] SubscriptionExpireWorker cannot run due to wrong expiration column in SQL query
2019-07-10 10:52:29 +02:00
Sylvain
ddbb492ace
[bug] abuses reports are not notified to admins
2019-06-26 12:55:38 +02:00
Sylvain
85f4182b2f
[bug] projects RSS feed fails to render
2019-06-24 11:03:40 +02:00
Sylvain
50373b6609
[bug] cookie consent modal is not shown
2019-06-17 14:57:11 +02:00
Sylvain
2d92df3ebb
do not delete the user if superadmin + fix text alert
2019-06-17 11:12:05 +02:00
Sylvain
b0b2e8d3a9
use an async worker to notify users about policy update
2019-06-17 10:01:59 +02:00
Sylvain
5cd977b4dd
ruby syntax + may fix #132 ?
2019-06-13 16:53:36 +02:00
Sylvain
f3c433883d
[bug] canceled reservation are not removed from statistics ( fix #133 )
2019-06-13 16:29:12 +02:00
Sylvain
84c90cdef3
ignore cookies modal if GA is disabled
2019-06-13 14:00:43 +02:00
Sylvain
f69703f0a0
allow user to change his choice about cookies
2019-06-13 12:52:56 +02:00
Sylvain
249e59bb2a
get user consent about cookies
2019-06-13 11:28:55 +02:00
Sylvain
7fc03af6bc
[ongoing] cookies consent modal
2019-06-12 16:53:37 +02:00
Sylvain
6e5cc2a4c4
typo and syntax
2019-06-12 16:31:45 +02:00
Sylvain
d0cd5a90d2
handle deleted users in notifications
2019-06-12 15:49:35 +02:00
Sylvain
ddce997e12
display data collection purpose on each input field + fix notifications on deleted user
2019-06-12 15:34:03 +02:00
Sylvain
0e18defe53
handle deleted user in statistics
2019-06-12 12:40:43 +02:00
Sylvain
a53c6e80e7
move invoice->operator to invoicing_profile + minor fixes to handle user deletion
2019-06-12 12:22:38 +02:00
Sylvain
86ded2b8d2
[ongoing] fixes for invoices pdf files
2019-06-11 16:56:11 +02:00
Sylvain
37b9e3da60
link statistic profile to invoices
2019-06-11 10:02:48 +02:00
Sylvain
818d1357a9
save user cration date in statistic_profile
2019-06-06 16:54:09 +02:00
Sylvain
cfd33c3a52
migrate projects to statistic_profile
2019-06-06 16:34:53 +02:00
Sylvain
35da65b686
change statistic_service to use statistic_profile + use raw sql in migrations
2019-06-06 13:58:49 +02:00
Sylvain
fe2a6f7120
migrate trainings to statistic_profile and adjust code
2019-06-06 12:00:21 +02:00
Sylvain
0a5e373730
models linking
2019-06-05 16:21:39 +02:00
Sylvain
f0c5b0eb09
init StatisticProfileTraining
2019-06-05 16:17:56 +02:00
Sylvain
6f87873b2c
fix init member group when created from signup modal
2019-06-05 16:09:11 +02:00
Sylvain
5c57bcc7c6
defer member search in admin panel to optimize requesting
2019-06-05 15:35:27 +02:00
Sylvain
660a8abe8b
fix statistic_profile
2019-06-05 12:24:01 +02:00
Sylvain
17fbd6b465
multiple fixes related to statistic_profile & invoicing_profile + fix users list while sorting by subscription
2019-06-05 12:11:51 +02:00
Sylvain
bd796bc588
fix SubscriptionsController - all tests passing
2019-06-05 07:58:49 +02:00
Sylvain
9fd6ea08b9
fix SubscriptionGroupValidator
2019-06-05 07:52:02 +02:00
Sylvain
4c033614ae
[ongoing] migrate subscriptions & reservations to statistic_profile
2019-06-04 16:50:23 +02:00
Sylvain
52992ac9d5
move gender & birthday to statistic_profile
2019-06-04 13:33:00 +02:00
Sylvain
42e73e4315
[ongoing] statistic profile
2019-06-03 17:25:04 +02:00
Sylvain
9ef2f142bd
link HistoryValue to InvoicingProfile + improved invoices tests
2019-06-03 16:51:43 +02:00
Sylvain
7ed97ef35a
link wallet & its transactions to invoicingprofile
2019-06-03 16:00:09 +02:00
Sylvain
6011f27268
finish moving organization & address to invoiving profile: fix create & edit user
2019-06-03 12:06:01 +02:00
Sylvain
a211ad39ff
moving organization & address to invoicingProfile + refactored doc about postgre
2019-05-29 14:28:14 +02:00
Sylvain
142e07f3c9
update code to use invoicingprofile
2019-05-29 12:01:24 +02:00
Sylvain
ffbca98276
[ongoing] fix api to use the invoicing_profile
2019-05-28 16:49:36 +02:00
Sylvain
83d3fd83b3
[bug] close period reminder is sent too early
2019-05-27 16:09:27 +02:00
Sylvain
3945b760b5
[ongoing] attach invoices to invoicingProfile instead of user
2019-05-27 13:03:44 +02:00
Sylvain
5231e464fe
fix invoicingProfile schema + migration script
2019-05-27 13:00:05 +02:00
Sylvain
70bc3d5732
put invoicing data into separate table
2019-05-27 13:00:05 +02:00
Sylvain
0c51f25f7f
Merge branch 'hotfix' into dev
2019-05-27 12:50:19 +02:00
Sylvain
5d32756928
[bug] updating a setting does not chain new values
2019-05-27 11:21:29 +02:00
Sylvain
6f2483a51f
[bug] when generating an Avoir at a previous date, the resulting checksum may be invalid
2019-05-27 11:11:21 +02:00
Sylvain
b423d9fce7
add link to interface in abuse report mail
2019-05-21 12:38:07 +02:00
Sylvain
9c2598d405
ability to delete processed reports
2019-05-21 12:24:45 +02:00
Sylvain
dfb0ea12f0
style component
2019-05-21 11:57:44 +02:00
Sylvain
7bbea22e76
display reports in interface
2019-05-21 11:49:50 +02:00
Sylvain
630809b91f
moved abuses panel to admin zone + fix loading template
2019-05-21 11:16:12 +02:00
Sylvain
dd4b6e2cb1
[ongoing] abuses management interface
2019-05-09 18:27:19 +02:00
Sylvain
10a87eb4cb
refactored project list translations
2019-05-09 16:09:20 +02:00
Sylvain
3394413747
fixed syntax
2019-05-07 15:56:23 +02:00
Sylvain
26b901ebb5
[bug#131] Availabilities export report an erroneous number of reservations for machine availabilities
2019-05-07 12:24:51 +02:00
Sylvain
4dfe02bebf
improved ruby syntax to match coding rules in some services
2019-04-25 15:09:37 +02:00
Sylvain
21c7484396
notify admin about notifications sent
2019-04-25 12:04:16 +02:00
Sylvain
8369e2e78e
fix: restore current policy on dropdown selection
2019-04-25 11:58:42 +02:00
Sylvain
162a56250a
notify users after privacy policy update + hide undefined content
2019-04-25 11:40:26 +02:00
Sylvain
531e298b14
[bug] updating a setting does not chain new values
2019-04-23 13:04:50 +02:00
Sylvain
c0c9b2a980
privacy policy: fixed admin view after update + display last update date
2019-04-23 12:58:01 +02:00
Sylvain
d0f0a293f3
save as draft or publish
2019-04-18 16:55:50 +02:00
Sylvain
caf6054e66
convert es6 to es5 in erb file
2019-04-18 16:01:58 +02:00
Sylvain
d9ce766f42
using ruby interpretation for SettingsController
2019-04-18 15:58:45 +02:00
Sylvain
7a2fc7c42e
[ongoing] save as draft or publish
2019-04-18 15:57:56 +02:00
Sylvain
8fae8b104d
admin interface to customize privacy policy page
2019-04-18 12:30:00 +02:00
Sylvain
5bdaebb2f2
privacy policy public page
2019-04-18 12:00:57 +02:00
Sylvain
43ff06c35d
fixed and improved translations
2019-04-18 11:35:09 +02:00
Sylvain
403e3a5562
enhance code quality for statistic service
2019-04-16 11:57:36 +02:00
Sylvain
936495e596
[bug] when paying reservation with wallet, the invoice footprint is not correctly updated
2019-04-08 17:04:53 +02:00
Sylvain
3b3e1af822
improved coupon filtering to allow pagination while filtering
2019-04-08 11:00:00 +02:00
Sylvain
44479b5597
allow filtering coupons list
2019-04-04 18:00:19 +02:00
Sylvain
9f8d24ec4f
paginate list of coupons
2019-04-04 17:28:29 +02:00
Sylvain
c223bd99ea
add loader while archive is not ready
2019-04-04 12:55:21 +02:00
Sylvain
c786ba6edb
notify user about archiving
2019-04-04 11:37:23 +02:00
Sylvain
94796bca29
fixed ruby syntax with linter
2019-04-04 09:33:41 +02:00
Sylvain
21a5f5591a
[ongoing] generate achives async
2019-04-03 17:57:21 +02:00
Sylvain
0f622d1aec
fixed ruby style
2019-04-03 17:39:45 +02:00
Sylvain
4be597ba9d
fixed ruby style
2019-04-03 17:33:43 +02:00
Sylvain
8a6ff0c093
prevent closing a period not in the past
2019-04-03 17:27:25 +02:00
Sylvain
9e39a0517c
[bug] vat rat in archives may be wrong
2019-04-03 16:56:47 +02:00
Sylvain
8e895e6b6a
force user to use datepicker in close period modal
2019-04-03 14:47:39 +02:00
Sylvain
79c3cfaa27
prevent the user to close the modal modal while closing a period
2019-04-03 14:31:39 +02:00
Sylvain
722d5d36e7
check server-side that periods match length requirements + explain requirements to user before closing
2019-04-03 13:04:19 +02:00
Sylvain
93ff761e64
[bug] Error :syntax when using quote in event category name
2019-04-02 16:19:23 +02:00
Sylvain
7cdacb3164
print date in archive
2019-04-01 13:36:45 +02:00
Sylvain
7a317b7e45
[bug] unable to add a file attachment to an event
2019-03-28 11:30:25 +01:00
Sylvain
a50bb63b64
prevent double validation while closing period
2019-03-27 17:37:36 +01:00
Sylvain
fc04886e89
prevent generate refund before first accounting period
2019-03-27 16:46:08 +01:00
Sylvain
be6b82fda1
improved VAT history + updated changelog + added instruction on watermark localisation
2019-03-27 15:50:38 +01:00
Sylvain
ea2a73cdc1
add asterisks on required fields
2019-03-26 17:20:10 +01:00
Sylvain
75310d599f
Merge branch 'host' into dev
2019-03-26 14:33:30 +01:00
Sylvain
fcc78d3930
apply coding rules to openAPI doc
2019-03-26 14:27:39 +01:00
Sylvain
b31bb272cc
unbranding LaCasemate
2019-03-26 14:04:45 +01:00
Sylvain
01ac73a1a1
removed capistrano & unicorn + cleaned lacasemate brading
2019-03-26 10:40:58 +01:00
Sylvain
2ac0336adb
Merge branch 'dev' into host
2019-03-25 16:17:23 +01:00
Sylvain
5cdaa014ef
[security] updated devise + updated rails
2019-03-25 14:57:48 +01:00
Sylvain
fd55c8d315
use SHA-3 (256 bits) to compute checksums + simplify accounting period integrity check UI
2019-03-21 17:15:41 +01:00
Sylvain
8530a6f655
superadmin + fixed free space notification
2019-03-20 16:49:38 +01:00
Sylvain
bf526458b4
add label to accounting period button
2019-03-20 11:56:03 +01:00
Sylvain
940ea3051b
chain historyValues with sha256 footprints
2019-03-20 11:01:53 +01:00
Sylvain
03c0c0d4fb
close periods at 1 year minus 1 day + fix alert reminder transalation
2019-03-18 14:45:21 +01:00
Sylvain
7b0824a4a3
notify admins when no accounting period closed for 1 year
2019-03-18 14:33:30 +01:00
Sylvain
c356f35f29
add operator_id to invoices
2019-03-18 11:11:09 +01:00
Sylvain
b439c643cb
zip archives, include checksum, chained zips
2019-03-13 17:48:35 +01:00
Sylvain
9fcb4277cd
Merge branch 'dev' into host
2019-03-13 16:49:11 +01:00
Sylvain
402be18bdf
model documentation
2019-03-13 16:49:03 +01:00
Sylvain
857b1cebba
fix accounting period checksum + improved period validation
2019-03-12 15:26:17 +01:00
Sylvain
4f418cc3fb
compute total without taxes + fix close period date pickers + improved archived % number format
2019-03-12 13:36:10 +01:00
Sylvain
b9e427a9fc
include VAT in archives
2019-03-12 12:15:14 +01:00
Sylvain
4e7a62bc2b
[ongoing] close period for max 1 year + force contiguous periods + fix totals
2019-03-12 09:14:20 +01:00
Sylvain
2a32bc4752
date the archives
2019-03-11 16:25:51 +01:00
Sylvain
b940ae0327
display complete info set on accounting archives
2019-03-11 16:11:49 +01:00
Sylvain
e35c50e42b
multilingual watermark on invoices
2019-03-11 14:47:52 +01:00
Sylvain
811d7288e7
fix chain_record methods
2019-03-11 13:49:16 +01:00
Sylvain
ae7a939cba
Merge branch 'dev' into host
2019-03-11 12:48:14 +01:00
Sylvain
20e91ede4e
Limit members search to 50 results to speed up queries
2019-03-11 12:47:46 +01:00
Sylvain
e78831e3cf
enlight watermark
2019-03-11 12:41:58 +01:00
Sylvain
e543f1fe3e
add watermark to invoices in dev/staging/test environment
2019-02-27 17:44:52 +01:00
Sylvain
672029876a
Merge branch 'dev' into host
2019-02-27 15:30:23 +01:00
Sylvain
a30513d59e
refactored invoice generation
2019-02-26 16:27:26 +01:00
Sylvain
a2ce0c3753
refactored invoice pdf generation script
2019-02-26 16:11:37 +01:00
Sylvain
9854a4b965
prevent memory saturation with periodic checks
2019-02-26 15:18:19 +01:00
Sylvain
1c8e82df14
added free disk space notification to oss release to prevent collision
2019-02-26 11:13:57 +01:00
Sylvain
8f210bb713
Merge branch 'dev' into host
2019-02-26 10:45:34 +01:00
Sylvain
1b97c39645
refactored notificationcenter to accept meta_data
2019-02-26 10:45:12 +01:00
Sylvain
279a958e46
download accounting period archive through interface
2019-02-25 17:22:54 +01:00
Sylvain
f11f629bcf
compute, secure and archive period total and cumulative total of each accounting period
2019-02-25 14:51:19 +01:00
Sylvain
1321e196f2
Merge branch 'dev' into host
2019-02-25 14:41:00 +01:00
Sylvain
e9b52a4c42
added sass variables for bootstrap upgrade
2019-02-25 14:40:39 +01:00
Sylvain
cf23fae73c
Merge branch 'dev' into host
2019-02-14 16:35:38 +01:00
Sylvain
7b573dd37f
restored deprecated notification
2019-02-14 13:05:09 +01:00
Sylvain
9f765009a8
[bug] unable to create oauth2 sso
...
[bug] application failed when sso activated
[bug] missing translations in oauth2 forms
2019-02-14 12:25:37 +01:00
Sylvain
06f2c3626c
refactored rake tasks
2019-02-13 12:59:28 +01:00
Sylvain
ffe5516d10
prevent closing an accounting period if any checksum error in period
2019-02-12 17:38:44 +01:00
Sylvain
9f4d026f30
fix last archive infos in closed accounting period
2019-02-12 16:19:11 +01:00
Sylvain
2ba3890325
display records integrity status
2019-02-12 16:00:36 +01:00
Sylvain
f9364b3872
chains invoice and invoiceItem records. save them in archives
2019-02-12 14:45:21 +01:00
Sylvain
cc124a0dee
[ongoing] chain invoice records
2019-02-11 13:57:07 +01:00
Sylvain
6e274afe3b
accounting archive: insert code checksum and previous archive checksum
2019-01-31 12:19:50 +01:00
Sylvain
55ae979213
Merge branch 'dev' into host
2019-01-30 10:04:12 +01:00
Sylvain
a528fc3766
infos about deprecated notification
2019-01-30 10:03:53 +01:00
Sylvain
6e89df045d
[bug] some reservation slots are not shown on the user calendars ( #127 )
2019-01-29 11:29:14 +01:00
Sylvain
da672ea8b6
Merge branch 'dev' into host
2019-01-21 16:34:06 +01:00
Sylvain
da4c9cf26f
[bug] invalid translation of title in new partner modal + refactored plans controller
2019-01-21 16:27:59 +01:00
Sylvain
75eaf4d4d0
improved member autocompletion with multiple words + refactored members controller
2019-01-21 15:17:56 +01:00
Sylvain
62410da9e1
add test for member autocomplete
2019-01-21 11:49:35 +01:00
Sylvain
80aab9f17c
fixed: create event with custom price
2019-01-21 11:26:42 +01:00
Sylvain
c4b3c1eab5
[bug] unable to search in user autocomplete
2019-01-21 09:42:51 +01:00
Sylvain
65892684a8
fixed availabilities controller
2019-01-17 16:55:25 +01:00
Sylvain
5a09453ac2
refactored availabilities controller
2019-01-17 16:26:03 +01:00
Sylvain
da25e16c50
refactored events controller
2019-01-17 09:53:28 +01:00
Sylvain
d2c4773ac9
[bug] unable to delete an admin who has changed a setting
2019-01-16 17:09:27 +01:00
Sylvain
0cd841da33
rubocop api controllers
...
TODO:
- events controller
- availabilies controller
- members controller
- plans controller
2019-01-16 16:28:25 +01:00
Sylvain
c6cf86fa5c
rubocop api controllers
2019-01-16 13:07:19 +01:00
Sylvain
526b9aab0c
[bug] unable to create/edit plan of 12 months/53 weeks
2019-01-16 12:10:07 +01:00
Sylvain
27f3296719
rubocop coupon
2019-01-16 11:07:09 +01:00
Sylvain
eb69822ce0
Merge branch 'dev' into host
2019-01-14 15:00:55 +01:00
Sylvain
77797db2f1
display VAT rates history
2019-01-14 15:00:33 +01:00
Sylvain
7ca72f53f2
refactored ApplicationController + rubymine stub for devise
2019-01-14 14:45:23 +01:00
Sylvain
068f4c829b
fixed user's role method call
2019-01-14 14:32:00 +01:00
Sylvain
a1ba272538
Merge branch 'dev' into host
2019-01-14 13:00:24 +01:00
Sylvain
f6e236aeb5
refactored roles methods to match ruby conventions
2019-01-14 12:57:31 +01:00
Sylvain
0927336956
fixed reservation after removing disable_invoicing + updated vcr cassettes
2019-01-14 12:45:17 +01:00
Sylvain
a2eb10331e
[ongoing] remove invoicing disabled per user
2019-01-10 16:50:54 +01:00
Sylvain
1db5e76bc9
tests on accounting periods + force reload periods when opening periods/avoir modal
2019-01-10 15:12:22 +01:00
Sylvain
4b5bd74188
add invoice_items in accounting archive
2019-01-10 13:05:57 +01:00
Sylvain
b42d1614fd
export to flat json files closed periods
2019-01-10 10:52:29 +01:00
Sylvain
2f17d90054
remove button 'generate refund' for invoices within closed periods
2019-01-09 17:07:15 +01:00
Sylvain
35638d611b
validates invoice&avoir creation to prevent any creation in closed period
2019-01-09 16:54:09 +01:00
Sylvain
5e8172af35
Merge branch 'dev' into us78
2019-01-09 16:28:36 +01:00
Sylvain
5ab0333176
rubocop invoice & avoir
2019-01-09 16:28:23 +01:00
Sylvain
dafeb668e0
Merge branch 'dev' into us78
2019-01-09 12:07:47 +01:00
Sylvain
56829190d6
refactored invoices controller
2019-01-09 12:07:31 +01:00
Sylvain
9fac706da8
validates accounting periods on creation + prevent refunding on closed periods (client only)
2019-01-08 17:32:45 +01:00
Sylvain
84aa0c75ff
fix date on period closing + improved confirmation msg
2019-01-08 11:58:37 +01:00
Sylvain
ccff40b226
handle dates default values and limits in close period modal
2019-01-08 11:19:07 +01:00
Sylvain
12c25389fa
Merge branch 'dev' into us78
2019-01-08 09:56:22 +01:00
Sylvain
d4cddc92fb
code comments
2019-01-08 09:56:07 +01:00
Sylvain
859544565b
[bug] first day of week is ignored in statistics custom filter
2019-01-08 09:38:35 +01:00
Sylvain
d8c8e4f72f
set default dates in close modal pickers
2019-01-07 17:21:32 +01:00
Sylvain
5b13c59496
list existing closings in close period modal
2019-01-07 16:45:31 +01:00
Sylvain
d89f9e9301
close an accounting period from interface to db through api
2019-01-07 15:33:09 +01:00
Sylvain
b1b5edbfb4
Merge branch 'dev' into us78
2019-01-07 12:48:47 +01:00
Sylvain
4ab0b52294
rubocop controllers
2019-01-07 12:48:22 +01:00
Sylvain
4af3e19cd0
accounting periods API
2019-01-07 12:47:53 +01:00
Sylvain
0a684c8e13
rails DB model for accounting periods
2019-01-07 12:29:52 +01:00
Sylvain
0a59dc6b5d
display previous closings in modal
2019-01-07 10:50:10 +01:00
Sylvain
c35029d205
i18n for close period modal
2019-01-03 17:51:24 +01:00
Sylvain
3fda7562d4
Merge branch 'dev' into us78
2019-01-03 17:40:04 +01:00
Sylvain
6637832d00
refactored frontend invoices translations
2019-01-03 17:39:50 +01:00
Sylvain
bd6584f529
code improvement
2019-01-03 16:50:50 +01:00
Sylvain
105bcf6236
[ongoing] interface to close an accounting period
2019-01-03 16:48:52 +01:00
Sylvain
ea0ec47268
[bug] error handling does not work in some cases
2019-01-03 12:22:34 +01:00
Sylvain
93dd1491cd
[bug] unable to create or edit a plan
2019-01-02 16:49:09 +01:00
Sylvain
39ab5a7ba9
[bug] unable to fetch projects from OpenProjects ( #126 )
2019-01-02 13:53:27 +01:00