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
Sylvain
9d831ef44a
rubocop code style
2018-12-27 14:55:55 +01:00
Sylvain
96e980e7b2
removed dead code + improved test suite
2018-12-27 14:53:11 +01:00
Sylvain
10e3d4c3e4
fix update setting from client
2018-12-27 14:15:58 +01:00
Sylvain
688b57e537
fixed data migration for settings -> history_values
2018-12-18 10:21:35 +01:00
Sylvain
ed65976c41
[ongoing] save settings history
2018-12-17 16:02:02 +01:00
Sylvain
d01a93e0f0
[ongoing] members tests
2018-12-12 17:24:31 +01:00
Sylvain
811b7193f7
improved & fixed test suite
2018-12-12 13:49:14 +01:00
Sylvain
f2eaf4e4e1
improved tests and bug fixes
2018-12-11 17:27:25 +01:00
Sylvain
ad69b647f7
fix reservation + subscription
2018-12-11 15:07:32 +01:00
Sylvain
7822ab4572
[ongoing] fix reservation processes
2018-12-10 17:20:23 +01:00
Sylvain
8e60545753
extend subscription and offer free days will keep track of previous subscription
2018-12-10 13:24:00 +01:00
Sylvain
bef3118649
[ongoing] refactor user.subscriptions to save history
...
TODO: - refactor subscription.save_with_payment (stripe)
- offer free days
- extend the subscription
- renew a subscription
- buy subscription + reservation
2018-12-06 18:26:01 +01:00
Sylvain
6794b12555
force gawk during elastic upgrade & rubocop
2018-12-03 15:10:04 +01:00
Sylvain
5828513a3a
handle error while polling notifications fails
2018-11-27 16:51:30 +01:00
Sylvain
f6cd552c66
migrate to angular 1.6
2018-11-27 16:26:21 +01:00
Sylvain
ab334d504b
migrate to angular 1.5
2018-11-27 15:16:23 +01:00
Sylvain
ad3105cbc9
migrate to angular 1.4
2018-11-27 13:57:41 +01:00
Sylvain
ffbe3e0b4a
updated procedure to setup development env, using docker
2018-11-26 15:14:43 +01:00
Sylvain
56a56565ae
[bug] create transverse plan: do not create one for the admins group
2018-11-26 11:33:48 +01:00
Sylvain
0c63405b4d
migrate from bower to yarn
2018-11-22 17:09:33 +01:00
Sylvain
2801ab0039
fix controllers imports issues due es6 convertion
2018-11-21 15:29:35 +01:00
Sylvain
0aa75488fa
store and retrieve app version in package.json
2018-11-21 11:42:04 +01:00
Sylvain
6e56ac4286
javascript fixes
2018-11-21 11:32:50 +01:00
Sylvain
f528b2021d
added semicolons
2018-11-21 11:08:53 +01:00
Sylvain
8cd533b5a6
eslint problems autofixes
2018-11-21 10:59:07 +01:00
Sylvain
d250dfa1d3
convert coffeescript comments to valid jsdoc
2018-11-21 09:42:31 +01:00
Sylvain
8a03b0b4f2
fix events page + fix disableAnimation directive
2018-11-20 16:25:15 +01:00
Sylvain
c1b1b701ae
fixes and improvements after coffeescript migration
2018-11-20 14:44:41 +01:00
Sylvain
bf1a3ce913
fix ERB JS services
2018-11-20 13:46:28 +01:00
Sylvain
0814f8c2fa
fix ERB JS directives
2018-11-20 13:44:53 +01:00
Sylvain
cfedb643b5
fix angular router file
2018-11-20 12:57:10 +01:00
Sylvain
74b6afd166
fix ERB JS controllers
2018-11-20 12:26:06 +01:00
Sylvain
aac0e8125c
[ongoing] fix erb js controllers
2018-11-19 16:52:48 +01:00
Sylvain
185ea30db3
Merge branch 'erb' into es6
2018-11-19 16:20:46 +01:00
Sylvain
6352087f70
fix comments in erb files
2018-11-19 16:17:49 +01:00
Sylvain
12f74d5d08
fixed javascript for events controllers
2018-11-07 16:37:28 +01:00
Sylvain
39b18933b6
fixed javascript for application controller
2018-11-07 16:36:10 +01:00
Sylvain
e7031c90d5
restablished erb files
2018-10-25 17:08:13 +02:00
decaffeinate
5da4bf6317
decaffeinate: Run post-processing cleanups on about.coffee and 95 other files
2018-10-25 16:51:20 +02:00
decaffeinate
2c4dd31869
decaffeinate: Convert about.coffee and 95 other files to JS
2018-10-25 16:50:16 +02:00
decaffeinate
c4a2635cd9
decaffeinate: Rename about.coffee and 95 other files from .coffee to .js
2018-10-25 16:49:04 +02:00
Sylvain
944fa5f9b9
fixed erb syntax for decaffeinate
2018-10-25 13:10:39 +02:00
Sylvain
41847d75a2
removed erb suffixes
2018-10-25 13:06:09 +02:00
Sylvain
8d4b354199
[bug] change group button overflow
2018-10-15 16:51:44 +02:00
Sylvain
2126a199e0
Ability to set a neutral gender for the fablab's title ( #108 )
2018-09-18 16:40:50 +02:00
Sylvain
1e3066f6f4
Ability to parametrize machines order on the booking page
2018-09-18 15:30:54 +02:00
Sylvain
a26e8edf19
fix rendering issues in settings
2018-09-18 14:38:43 +02:00
Sylvain
1b33f3c865
display the machine reservation user name to other members
2018-07-24 12:24:51 +02:00
Sylvain
afc6ef40d2
fixed User.to_json
2018-07-24 11:19:30 +02:00
Sylvain
9af1e5c658
fixed User.to_json
2018-07-24 11:13:05 +02:00
Sylvain
a7cc1711aa
Merge branch 'elastic5' into dev
2018-07-12 12:50:52 +02:00
Sylvain
407c18075c
[bug] event catgories not correct in statistics
2018-07-12 12:48:50 +02:00
Sylvain
05bd65dfb2
migrate es api: top 10 aggregations
2018-07-12 11:26:13 +02:00
Sylvain
7afe62522f
refactor User.as_json to use jbuilder template
2018-07-04 14:05:44 +02:00
Sylvain
17b7e96b67
[ongoing] fix top 10 aggregation
2018-06-12 12:59:23 +02:00
Sylvain
38551e8ac2
[ongoing] migrate es api: graphs (see FIXME)
2018-06-08 17:22:03 +02:00
Sylvain
f66ca9165e
migrate es api: statistics
2018-06-08 12:27:11 +02:00
Sylvain
697ea87e37
[bug] unable to filter statistics from age 0
2018-06-08 12:06:22 +02:00
Sylvain
d69007c6c9
[ongoing] migrate es api
2018-06-05 12:30:08 +02:00
Sylvain
1aad974782
Ensure elasticSearch indices are started with green status on new installations
2018-04-04 14:05:48 +02:00
Sylvain
c174f22c00
fix social sharing of trainings
2018-01-09 16:53:27 +01:00
Sylvain
679ccfec99
ability to share trainings on social medias
2018-01-09 15:09:48 +01:00
Sylvain
290b2ad513
[bug] facebook sharing of event has HTML tags in description
2018-01-09 15:02:45 +01:00
Sylvain
bdf799f79e
[bug] a reminder notification were sent for canceled reservations
2018-01-09 14:44:19 +01:00
Sylvain
72634162c6
[bug] unable to create training credit
2017-12-21 11:49:51 +01:00
Nicolas Florentin
a29ba926c0
fix events/index order, frontend js code was conflicting with server-side behaviour
2017-12-18 16:15:38 +01:00
Nicolas Florentin
2f4dd4642a
adds polyfill for Object.assign, fix for IE11
2017-12-18 14:54:46 +01:00
Sylvain
77e218aa7e
fix test suite
...
- update VCR cassettes
- fix test fixtures to allow pass test suite at the end of the week
2017-12-14 16:40:01 +01:00
Sylvain
a5b718d981
fix tests with invoices
2017-12-14 15:52:34 +01:00
Sylvain
e091b81187
fix events pagination
2017-12-13 15:20:51 +01:00
Sylvain
0b3192c3ab
[bug] subscription refund generate PDF with wrong dates
2017-12-13 13:16:32 +01:00
Sylvain
12c6cd2a70
Merge branch 'siteswapjuggler-master' into dev
...
also: align translations and mark missings
2017-11-20 11:43:40 +01:00
Sylvain
639610dc7a
[bug] unable to display profiles of users whom any reservation is associated with a deleted object
2017-11-13 11:15:33 +01:00
Sylvain
497ad71591
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2017-11-02 15:34:09 +01:00
Sylvain
73a62bd9a0
[feature] allow setting decimal prices
2017-11-02 15:33:56 +01:00
Sylvain
90fe4e313b
hide reserve button on machine details page is machine is disabled
2017-10-16 14:04:55 +02:00
Sylvain
f4fd919dde
display disabled status for machines & trainings in openAPI
2017-10-11 16:03:04 +02:00
Sylvain
cc94a19ba6
hide disabled spaces in admin pricing area
2017-10-11 15:50:18 +02:00
Sylvain
02a155e7af
prevent create availability for disabled space
2017-10-11 15:23:42 +02:00
Sylvain
1631e4ae5c
hide disabled spaces & machines in public calendar
2017-10-11 15:18:44 +02:00
Sylvain
f8f45bcb69
filter and hide disabled spaces in list
2017-10-11 15:15:30 +02:00
Sylvain
1c8d362f11
ability to disable space
2017-10-11 14:58:38 +02:00
Sylvain
02baf9097e
hide disabled machine in admin pricing zone + prevent creating negative credits
2017-10-11 14:48:03 +02:00
Sylvain
ad288628cc
hide disabled trainings in pricing admin zone
2017-10-11 13:09:52 +02:00
Sylvain
0ab01091cd
prevent create availabilities for disabled machines
2017-10-11 13:02:54 +02:00
Sylvain
45465e8b59
prevent associate disabled machines w/ training
2017-10-11 13:00:46 +02:00
Sylvain
c9c7fe00c5
filter disabled machines in list + improve responsiveness
2017-10-11 12:54:13 +02:00
Sylvain
c67360771a
ability to disable machine
2017-10-11 12:10:05 +02:00
Sylvain
5ce6d4486e
fix profile complete mail template for non imported users
2017-10-11 11:56:43 +02:00
Sylvain
41eef71ead
fix c/p issue + prevent link disabled training to user
2017-10-11 11:40:21 +02:00
Sylvain
4d7a317315
prevent create new availability with disabled training
2017-10-10 18:17:22 +02:00
Sylvain
0e38574ef8
hide disabled trainings in public calendar
2017-10-10 18:13:30 +02:00
Sylvain
4752fce762
disable required training modal for machines associated with disabled trainings
2017-10-10 18:12:07 +02:00
Sylvain
4090fe2119
filter trainings list by status
2017-10-10 17:38:01 +02:00
Sylvain
05d9e62dd2
ability to disabled training
2017-10-10 17:16:43 +02:00
Sylvain
14592c1e18
prevent user from switching to disabled group
2017-10-10 16:30:28 +02:00
Sylvain
33b146d243
hide disabled groups
2017-10-10 15:44:17 +02:00
Sylvain
189665e53b
[ongoing] prevent disable group with users + [ongoing] hide disabled groups
2017-10-05 17:54:44 +02:00
Sylvain
fb092afc8c
filter enabled/disabled groups
2017-10-05 17:12:22 +02:00
Sylvain
c5f0501df2
enable/disable group
2017-10-05 16:48:18 +02:00
Sylvain
40bf22279e
add warning on plan disabling
2017-10-05 15:44:06 +02:00
Sylvain
a9cce55855
plan disabling: hide everywhere + filter in admin filter
2017-10-05 15:32:20 +02:00
Sylvain
26d79e5b12
disable a plan
2017-10-04 18:56:39 +02:00
Sylvain
25eb24e516
Confirmation and error handling while deleting an event
2017-10-02 13:14:15 +02:00
Sylvain
bbae623cac
[bug] image deformed on small device
2017-09-26 16:32:55 +02:00
Sylvain
601ac177b6
[bug] rendering for social networks shares
2017-09-26 15:48:47 +02:00
Sylvain
dbff2d1745
events list: change buttons to anchors to allow opening in background tab
2017-09-26 09:44:55 +02:00
Sylvain
ce0887e2ec
add missing jsdoc
2017-09-25 15:58:45 +02:00
Sylvain
f874748f74
[bug] fix events monitoring pagination
2017-09-25 15:48:21 +02:00
siteswapjuggler
70cf6ebfa8
cancel and sold out badge in event list
...
Public event list prompte cancelled and sold out badge for more clarity
to the public users.
Correction for « sold_out » test in home, show and public list. 0
subscriber with 0 free_place should be a free entry case and it appears
to be sold out.
Another error occurs (negative free place) if an admin change the
number of free places or decide to go free entry with an event.
Home and public list better display with access and price separate.
2017-09-24 21:51:58 +02:00
siteswapjuggler
cda13540f9
limit parameter removed
...
as requested
2017-09-24 18:39:32 +02:00
siteswapjuggler
5fe1a53237
double slashes correction in open API event JSON
...
correction of the double slash as requested
2017-09-24 18:37:08 +02:00
siteswapjuggler
22982a2356
Merge remote-tracking branch 'LaCasemate/master'
2017-09-24 18:17:58 +02:00
siteswapjuggler
3e2e5f5972
cancelled event management on front page
...
Cancelled event (nb_total_places = -1) are not prompted anymore on the
homepage >> no need to push them to the final user.
They are still display in the event module for continuity
2017-09-24 18:17:40 +02:00
siteswapjuggler
37bdfcb96f
pull request modification
...
Modification as requested for the pull request.
2017-09-24 15:12:46 +02:00
Sylvain
8d92f8492a
removed full-calendar hack, improved remove slot precess
2017-09-18 12:42:45 +02:00
Sylvain
54d686f1ac
[bug] home events overflow
2017-09-11 14:10:52 +02:00
siteswapjuggler
52071c7b83
Merge remote-tracking branch 'LaCasemate/master'
2017-09-10 12:01:59 +02:00
Sylvain
f5e2a44dcf
[bug] in public calendar, availabilities are not shown to visitors
2017-09-07 11:44:50 +02:00
Sylvain
404101ccd4
english and portuguese translations
2017-09-07 10:47:18 +02:00
Sylvain
273ec5317d
disallow locking availabilities if it has any non-cancelled reservations
2017-09-06 18:07:56 +02:00
Sylvain
57228f4eec
hide slots in members calendars if locked
2017-09-06 17:10:10 +02:00
Sylvain
9caa3ff56f
hide slots in members calendars if locked
2017-09-06 17:09:40 +02:00
Sylvain
d092a1c5ea
admin can lock and unlock availbilities
2017-09-06 15:01:41 +02:00
Sylvain
82511aa781
[feature] prevent creation of irregular yearly plans
2017-09-05 17:01:09 +02:00
Sylvain
53c1a72060
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2017-09-05 10:43:24 +02:00
Sylvain
31cdc5c695
[bug] reccursive events have difference with requested time when crossing DST ( #77 )
2017-09-04 16:50:07 +02:00
siteswapjuggler
e13817176f
event monitor improvement
...
Many imrovement for the event monitoring admin module.
2017-09-04 00:09:08 +02:00
siteswapjuggler
73c9e301fb
open api events improvement
...
new data available: start_at, end_at, event_image
new controllers: id, upcoming, limit
2017-09-03 13:55:38 +02:00
Sylvain
112b174e5f
[bug] invalid time for reccurent events after Daylight Saving Time change
2017-08-31 17:32:04 +02:00
Nicolas Florentin
d602055e67
In login modal, displays an alert if Caps lock key is pressed
2017-08-31 17:11:46 +02:00
Sylvain
3d4260a3f7
[bug] unable to delete standard group
2017-08-30 14:57:06 +02:00
Sylvain
9c6143bd5e
tooltip about images insertion in medium editor
2017-08-29 17:50:57 +02:00
Sylvain
dcf55d8351
[bug] invalid notification text when sending amount coupon
2017-08-29 16:10:16 +02:00
Sylvain
cf6afb817d
[feature] configuration of max visibility for reservations
2017-08-24 18:34:18 +02:00
Sylvain
eb4f97000d
[bug] admin cannot see all space availabilities
2017-08-24 16:53:27 +02:00
Sylvain
295dc3749b
[bug] filename too long on events&prices API + updated axlsx
2017-08-16 12:05:04 +02:00
Sylvain
00d157dc3b
[bug] filename too long error on GET api/groups
2017-07-26 10:15:47 +02:00
Sylvain
3e44d62aac
[bug] filename too long error on GET api/trainings
2017-07-18 10:55:41 +02:00
Sylvain
17544225b5
[bug] invoices generation failed for subscription days offered
2017-07-12 11:38:51 +02:00
Sylvain
42d2c2ee31
[bug] hide spaces in public calendar when disabled
2017-06-13 19:31:48 +02:00
Sylvain
7ff46db808
[bug] confirmation message after admin creation
2017-06-13 19:26:32 +02:00
Peng DU
2ff47f3204
add task Id: 3713, reference: 1706002/VL, stripe id: in_1ASRQy2sOmf47Nz9Xpxtw46A, invoice total: 30.0, stripe invoice total: 80.0, date: 2017-06-08 16:16:26 +0200
...
Id: 3716, reference: 1706005/VL, stripe id: in_1ASRye2sOmf47Nz9utkjPDve, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:51:15 +0200
Id: 3717, reference: 1706006/VL, stripe id: in_1ASS1X2sOmf47Nz93Xn2UxVh, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:54:14 +0200
Id: 3718, reference: 1706007/VL, stripe id: in_1ASSBI2sOmf47Nz9Ol0gEEfC, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 17:04:19 +0200 allow find the invoices incoherent
2017-06-09 11:08:08 +02:00
Peng DU
c6fedf3f20
Merge branch 'fix_issus_77' into dev
2017-06-08 19:40:30 +02:00
Peng DU
eca141f902
fix bug #77 : reservation amount total isnt equal stripe invoice amount that be paid by client
2017-06-08 19:38:19 +02:00
Sylvain
8531168ba2
improve RSS with project author and image + event dates image and category
2017-05-17 12:18:20 +02:00
Sylvain
7960964aed
set organization name in invoice object, if any ( #64 )
2017-05-16 10:44:52 +02:00
Sylvain
54154b1713
[feature] ability for admins to create users or organizations
2017-05-16 10:23:25 +02:00
Sylvain
b403f86187
[bug] price init for new groups & delete group
2017-05-15 15:25:27 +02:00
Sylvain
89e30980e0
[bug] unable to set locale other than fr or en
2017-04-27 18:35:00 +02:00
cyril
d1a1b63db5
Project view: added responsive support on external images
2017-04-13 14:26:29 +02:00
cyril
3fcf61de24
hide spaces in admin's credit management if spaces are disabled
2017-03-28 20:13:18 +02:00
Peng DU
1d53e3b5b7
fix json template of training reservation
2017-03-28 19:53:48 +02:00
Peng DU
2cc8096236
fix bug: cant get list of training reservation
2017-03-28 19:45:36 +02:00
Sylvain
ff8e804750
Merge branch 'week' into dev
2017-03-21 15:51:52 +01:00
Sylvain
f4187d0b4b
[bug] news plans statistics are not shown
2017-03-21 15:47:25 +01:00
Sylvain
5abc85ae0a
[feature] weekly plans
2017-03-21 13:06:02 +01:00
Sylvain
21560dd5d9
show space details on image-click
2017-03-21 12:06:58 +01:00
Sylvain
2c1b65eab9
Merge branch 'hotfix' into dev
2017-03-15 13:07:28 +01:00
Sylvain
8d5966396d
[bug] editing a plan remove the rolling attribute
2017-03-15 12:50:19 +01:00
Sylvain
38ce1b23b7
fix duplicates SLOT_DURATION declarations
2017-03-13 10:21:41 +01:00
Sylvain
796f0a87ae
ability to remove an unused custom price for an event ( #61 )
2017-03-02 18:36:54 +01:00
Sylvain
0f6358011f
improved space explications style
2017-03-02 17:04:47 +01:00
Sylvain
20ccc809aa
prevent polling notifications when the page is in background
2017-03-02 16:50:02 +01:00
Sylvain
853a3160d3
add notice about availabilities export
2017-03-02 13:39:49 +01:00
Sylvain
d8b8c39cb3
add day of week to availabilities export
2017-03-02 13:31:12 +01:00
Sylvain
c21f7ed5dc
export events availabilities
2017-03-02 13:05:29 +01:00
Sylvain
056060a88d
export spaces availabilities
2017-03-02 12:57:07 +01:00
Sylvain
d9b30fa2b0
export trainings availabilities
2017-03-02 12:44:59 +01:00
Sylvain
504fe49964
export machines availabilities
2017-03-02 12:34:28 +01:00
Sylvain
4d09ed37a3
export machines availabilities
2017-03-02 12:34:16 +01:00
Sylvain
f5ac9b1913
[bug] month navigation in client calendar ( #59 )
2017-03-01 17:23:46 +01:00
Sylvain
b9dcf5a512
[bug] delete event with custom price ( #61 )
2017-03-01 17:09:37 +01:00
Sylvain
2e094a501f
init spaces prices on plan creation
2017-03-01 16:45:05 +01:00
Sylvain
6df0a4090e
hide spaces in admin's price management and in plan edition if spaces are disabled
2017-03-01 15:58:40 +01:00
Sylvain
7ba50a72b7
reorganize spaces menu entries
2017-03-01 15:51:13 +01:00
Sylvain
13689fd707
set spaces disabled by default
2017-03-01 15:50:49 +01:00
Sylvain
f208caf5b0
fix change space reservation when many users on the slot does not change the good user
2017-03-01 14:47:59 +01:00
Sylvain
3c6bcccd0d
reset reservation modification on user change
2017-03-01 14:38:29 +01:00
Sylvain
30c6954464
prevent modify reservation to a complete slot
2017-03-01 14:35:07 +01:00
Sylvain
c9d6df13f9
disable space projects
2017-03-01 14:30:53 +01:00
Sylvain
185084f244
prevent admin from creating space availabilities that are not multiples of 1h
2017-03-01 14:27:01 +01:00
Sylvain
cdefcebf4c
fix typo
2017-03-01 12:59:59 +01:00
Sylvain
cf9181770b
export space statistics
2017-03-01 12:56:11 +01:00
Sylvain
05bf899393
delete old space stats when regenerating
2017-03-01 11:58:11 +01:00
Sylvain
b48451f9f8
improved space reservation optional explication message
2017-03-01 11:47:20 +01:00
Sylvain
d450301934
[to test] space reservations
2017-02-28 18:13:38 +01:00
Sylvain
4a9fb5855f
filter spaces in client calendar
2017-02-28 17:17:43 +01:00
Sylvain
e1178df45b
show space details on click in client calendar
2017-02-28 16:59:28 +01:00
Sylvain
c936b283f7
display spaces status in client calendar
2017-02-28 16:51:56 +01:00
Sylvain
0e94f8c3d4
Redo "change DB model to allow many_to_many relationship between Slot and Reservation"
...
This reverts commit 4cbfbdc4e0
.
2017-02-28 13:23:31 +01:00
Sylvain
4cbfbdc4e0
Revert "change DB model to allow many_to_many relationship between Slot and Reservation"
...
This reverts commit 03d922e214
.
2017-02-28 12:36:50 +01:00
Sylvain
a0e7e7951f
[ongoing] display spaces in public calendar
2017-02-28 11:59:48 +01:00
Sylvain
4703350de5
fix pay with stripe and coupon
2017-02-28 10:18:02 +01:00
Sylvain
b48557fd96
invoice generation for space reservation
2017-02-27 17:42:36 +01:00
Sylvain
43f78ff0e0
fix credits usage in space reservation
2017-02-27 17:38:15 +01:00
Sylvain
31f3c00b3a
fix pay many space slots by stripe
2017-02-27 16:51:11 +01:00
Sylvain
b5a0b43689
fix manage reservations
2017-02-27 16:43:39 +01:00
Sylvain
6a132948af
fixed slots display in space reservation calendar
2017-02-27 16:35:41 +01:00
Sylvain
847a0ba140
display correct slot status in space reservation calendar
2017-02-27 16:15:27 +01:00
Sylvain
af5f3c777d
fix space slot status in API
2017-02-27 13:48:35 +01:00
Sylvain
03d922e214
change DB model to allow many_to_many relationship between Slot and Reservation
2017-02-27 13:15:31 +01:00
Sylvain
fd2d18bf94
fix message on delete availability error
2017-02-27 10:14:19 +01:00
Sylvain
8e86c4b212
[ongoing] spaces reservation calendar
2017-02-23 17:45:55 +01:00
Sylvain
1efd506a5d
fix display in all trainings calendar
2017-02-23 13:50:45 +01:00
Sylvain
59384698f7
clean controllers imports
2017-02-23 13:46:16 +01:00
Sylvain
b25e69d131
fix do not subscribe
2017-02-23 12:50:12 +01:00
Sylvain
201eefc7bd
fix reservation through all trainings calendar
2017-02-23 12:39:50 +01:00
Sylvain
b098281155
fix reservation through all trainings calendar
2017-02-23 12:23:00 +01:00
Sylvain
ad83d38305
prevent book full event
2017-02-23 11:24:44 +01:00
Sylvain
8ea611882b
fix training reservation
2017-02-23 11:13:25 +01:00
Sylvain
03758d336c
fix move & cancel training reservation + fix display after cancel for machines & training
2017-02-22 17:45:22 +01:00
Sylvain
40ec38465c
fix display: after event move, starting a new move does not reset the previous move summary
2017-02-22 17:31:02 +01:00
Sylvain
c12366c9f1
[bug] unable to see reserved trainings for admin in booking calendar
2017-02-22 17:29:35 +01:00
Sylvain
71a3c8b41f
pluralize selection helper in cart
2017-02-22 16:53:58 +01:00
Sylvain
1959856235
use the cart directive in training reservation
2017-02-22 16:45:13 +01:00
Sylvain
dbc5d8836d
ability to add only one item in the cart
2017-02-22 14:41:49 +01:00
Sylvain
3e49c35414
improved comments
2017-02-22 13:50:13 +01:00
Sylvain
c2c400107d
improved tag management in cart
2017-02-22 11:23:32 +01:00
Sylvain
4bb9728502
clean machines controller
2017-02-22 11:01:52 +01:00
Sylvain
ce087ae778
refacto wording to make cart reservableType agnostic
2017-02-22 10:51:07 +01:00
Sylvain
c4824f99ba
fix summary after event moved
2017-02-22 10:28:14 +01:00
Sylvain
7a21a907a8
offer slot from cart + [ongoing] refacto cart translations
2017-02-22 09:44:15 +01:00
Sylvain
86371a42df
fix display alter when exchanging events if tag missmatch
2017-02-21 17:44:27 +01:00
Sylvain
9b2ba8528f
fix machines controller JSDoc
2017-02-21 17:43:39 +01:00
Sylvain
76478bc075
display reservable name in summary after payment
2017-02-21 17:26:54 +01:00
Sylvain
4fa171da9d
display summary after payment + ongoing clean template from references to machine
2017-02-21 17:23:53 +01:00
Sylvain
11619dc6c5
remove reference to machine in cart directive code
2017-02-21 16:41:53 +01:00
Sylvain
5a41424579
fixed & improved js routing
2017-02-21 15:41:45 +01:00
Sylvain
3837604dd6
fix remove slot from cart
2017-02-21 15:26:11 +01:00
Sylvain
fe6f85eb7c
fix after payment update calendar
2017-02-21 14:48:59 +01:00
Sylvain
3db55019c9
split calendar & cart logic for machines
2017-02-21 13:42:12 +01:00
Sylvain
afd1cb4ce7
[bug] unable to delete admin
2017-02-21 10:36:00 +01:00
Sylvain
85572a03db
[ongoing] move payment to cart component
2017-02-20 17:17:27 +01:00
Sylvain
9b7f74e02d
handle coupons & plans & user change in cart directive
2017-02-20 15:07:14 +01:00
Sylvain
049606b450
[ongoing] reservation cart refactoring
2017-02-16 17:57:14 +01:00
Sylvain
8343c1503d
disabled ability to create space availabilities if no spaces
2017-02-16 12:06:44 +01:00
Sylvain
f850c66f01
prevent add space availability if disabled
2017-02-15 16:58:17 +01:00
Sylvain
23b9851218
allow enable/disable spaces -> disabled by default
2017-02-15 15:41:25 +01:00
Sylvain
69130a1309
fix translation mapping in settings
2017-02-15 13:38:16 +01:00
Sylvain
d463d4dd5a
display spaces in admin calendar
2017-02-15 13:18:03 +01:00
Sylvain
1855935322
interface to create space availabilities
2017-02-15 11:32:29 +01:00
Sylvain
30454c4262
manage space info message + refactor settings translations mapping
2017-02-15 09:48:27 +01:00
Sylvain
36a0eafef3
interface to set credits for spaces
2017-02-14 17:29:52 +01:00
Sylvain
ec4a06a0e4
interface to configure space price per plan + refactored plans interface code
2017-02-14 17:06:42 +01:00
Sylvain
42819b18cb
refactor plan form translations mapping
2017-02-14 16:19:10 +01:00
Sylvain
1554cfe65d
refactor plan translations mapping
2017-02-14 16:09:07 +01:00
Sylvain
93bceb5517
define spaces prices for non-subscribers
2017-02-14 15:25:28 +01:00
Sylvain
334201e551
refactor admin pricing translations mapping
2017-02-14 14:58:16 +01:00
Sylvain
0adb9e29c6
space edition interface
2017-02-14 13:36:10 +01:00
Sylvain
d8acd4c86f
fix ui issues on space creation/deletion
2017-02-14 12:51:30 +01:00
Sylvain
73a5689140
inteface to display spaces
2017-02-14 12:41:51 +01:00
Sylvain
da95e6e0d8
space creation interface
2017-02-14 11:28:07 +01:00
Sylvain
9d367f95db
[ongoing] new space interface
2017-02-13 17:18:06 +01:00
Sylvain
40952600e7
basic interface structure for space management
2017-02-13 17:00:27 +01:00
Sylvain
c254cad8e5
spaces policy
2017-02-13 16:12:14 +01:00
Sylvain
05d4b7b3c5
spaces api
2017-02-13 16:10:12 +01:00
Sylvain
46fbcc06f3
add attachment & characteristics to spaces
2017-02-13 15:53:12 +01:00
Sylvain
560bb46383
space db model
2017-02-13 14:38:28 +01:00
Sylvain
4f3c5e963c
[bug] change plan price lost stats
2017-01-09 10:54:30 +01:00
Sylvain
ab53b621d1
[bug] navigation to about page duplicates admin's links in left menu
2017-01-05 18:03:54 +01:00
Sylvain
fedfc866a9
[bug] ReservationReminderWorker crash with undefined method find_by
2017-01-05 15:15:31 +01:00
Sylvain
c479502dd0
[bug] too many unread notifications cause system memory overflow
2017-01-05 15:06:54 +01:00
Sylvain
b5246ae1cf
[bug] AvailabilityIndexerWorker crash availabilities deleted just after their creation
2017-01-04 15:20:54 +01:00
Sylvain
ce7b737163
possible workaround for orphan InvoiceWorkers created with nil parameter
...
Moreover, a log was added on job creation, to help debugging if this does not fix the issue
2017-01-04 14:48:32 +01:00
Sylvain
e656b7d784
[bug] regenerate statistics does not remove all previous values
2017-01-04 14:46:43 +01:00
Sylvain
8119f54e4c
Statistics about hours available for machine reservations and tickets available for training reservations, now handle custom filtering on date and type
2017-01-03 17:07:23 +01:00
Sylvain
9edf723373
[bug] wrong statistics about hours available for reservation
2017-01-03 13:35:36 +01:00
Sylvain
5b7e8474d4
asterisk on group select in member form
2017-01-03 12:07:16 +01:00
Sylvain
d5c5e36965
[bug] compute age of users born on 29/02, lead to app crash on non-leap years
2017-01-03 11:24:14 +01:00
Sylvain
94abdb9eec
revert last commit
2017-01-02 17:01:52 +01:00
Sylvain
a39be14718
fix number of remaining notifications
2017-01-02 15:56:52 +01:00
Sylvain
1f0da1194b
[bug] fix VAT amount in invoice config
2017-01-02 11:08:40 +01:00
Sylvain
9bfaaaccd9
improved numerous notifications display
2016-12-19 17:08:11 +01:00
Sylvain
102eecdc8a
ability to send again auth migration code
2016-12-15 14:16:24 +01:00
Sylvain
5e1b85832c
[ongoing] resend sso fusion token
2016-12-14 17:14:53 +01:00
Sylvain
a7fdc4d741
fix potentital issue with sso + enterprise profile
2016-12-14 15:55:12 +01:00
Sylvain
d8b6848b1b
sso wording
2016-12-14 15:14:33 +01:00
Sylvain
531a89945b
member form: add asterisks on mendatory fields
2016-12-14 13:05:42 +01:00
Sylvain
76c1412177
Merge branch 'wallet_avoir' into dev
2016-12-13 15:33:56 +01:00
Sylvain
3cdbecf74a
add invoice item to refund invoices for wallet credit
2016-12-13 15:05:40 +01:00
Sylvain
ecbe8a58a2
coupon edition: display internationalized errors
2016-12-13 12:46:00 +01:00
Sylvain
85ee73f0e0
ability to edit coupon expiration
2016-12-13 12:01:54 +01:00
Sylvain
4817da75d6
[bug] unable to create or edit percentage coupons
2016-12-13 10:08:19 +01:00
Sylvain
9190e61f5f
basic avoir invoice for wallet credit
2016-12-12 15:32:01 +01:00
Sylvain
b44089a33d
interface & api to build avoir for a wallet credit
2016-12-12 14:20:26 +01:00
Sylvain
c2f638934e
added info notice about operation's time of admin delete
2016-12-12 11:18:24 +01:00
Sylvain
4c8b661750
display coupon application result in inline message instead of growl notification
2016-11-30 10:17:05 +01:00
Sylvain
10fc7b69e9
Ability to display optional information message on event reservation page
2016-11-29 16:46:19 +01:00
Sylvain
b75cbc17d7
fix training reservation calendar witch shows all trainings slots
2016-11-29 15:48:39 +01:00
Sylvain
852437ebf8
remove coupon from memory after payment
2016-11-29 15:35:54 +01:00
Sylvain
82fa5416ce
fix creation of prices with float values
2016-11-29 15:23:36 +01:00
Sylvain
a9e593a840
fix statistics generation with cash coupon
2016-11-29 14:57:43 +01:00
Sylvain
6c933857f4
fix statistics generation with cash coupon
2016-11-29 14:57:21 +01:00
Sylvain
1ebab285f3
fix statistic generation with cash coupons
2016-11-29 12:07:22 +01:00
Sylvain
3894523eae
fix error message about rounding inconsistencies when generating invoices
2016-11-29 11:52:11 +01:00
Peng DU
f487133825
fix bug: user cant debit his wallet when admin pay a plan for this user with invoice disabled
2016-11-29 11:39:41 +01:00
Sylvain
5a4eaefc02
fix cash coupon usage when paying by stripe
2016-11-29 11:12:58 +01:00
Sylvain
0c05b45d08
improved error message on machine reservation w/ stripe payment
2016-11-29 09:15:30 +01:00
Sylvain
70a369a2b9
display error message on server error when paying by card
2016-11-28 16:47:40 +01:00
Sylvain
42a8d40b37
fix partial refund of invoices with cash coupons
2016-11-28 16:34:39 +01:00
Sylvain
aa7748f8eb
Merge branch 'cash' into dev
2016-11-28 12:05:18 +01:00
Sylvain
585d137cfc
some automated tests about cash coupons
2016-11-28 10:40:02 +01:00
Sylvain
f0e11cf718
fix pdf invoice generation with cash coupon
2016-11-28 09:57:09 +01:00
Sylvain
3ce41f0c5c
[to test] send cash coupon to user by mail
2016-11-24 18:17:49 +01:00
Sylvain
ce6877b484
success message when applying cash coupon
2016-11-24 18:05:16 +01:00
Sylvain
63b0f0c061
[to test] compute prices/invoices using cash coupons
2016-11-24 17:57:48 +01:00
Sylvain
0a08c4c32d
check cash coupons does not exceed cart amount for subscriptions
2016-11-24 16:38:22 +01:00
Sylvain
ff11694e05
check cash coupons does not exceed cart amount for events
2016-11-24 15:01:35 +01:00
Peng DU
63a3bcf19a
Fix a bug: invoice of reservation show payment by debit card when user pay with wallet
2016-11-24 14:09:34 +01:00
Sylvain
04e10c8bb6
check cash coupons does not exceed cart amount for trainings & machines
2016-11-24 13:58:41 +01:00
Sylvain
3dc5f1a0e4
real fix for coupon change slot's original price (reverts cfd92cdc40
)
2016-11-24 11:33:45 +01:00
Sylvain
8419efc7f5
handle unconfigured twitter's keys
2016-11-24 09:38:42 +01:00
Sylvain
0cb0ff3a06
[ongoing] using cash coupon in reservation logic
2016-11-23 17:17:34 +01:00
Sylvain
c13f640e81
remove rails find_by_* helpers
2016-11-23 16:30:19 +01:00
Sylvain
cc06bcab85
fix cash coupon creation on stripe + store amount in centimes
2016-11-23 15:44:59 +01:00
Sylvain
30ab25b5a0
normalize ProjectsController code structure
2016-11-23 15:01:33 +01:00
Sylvain
cf11f6afcf
factorize currency symbol into
2016-11-23 14:27:11 +01:00
Sylvain
ad2911529c
db model, api and interface for cash coupons
2016-11-23 12:43:42 +01:00
Sylvain
52ad1b2c13
fix trainings, users, events graphs
2016-11-21 11:45:48 +01:00
Sylvain
6c9fdaaf83
[bug] fix machine hours stats graph
2016-11-21 11:35:56 +01:00
Sylvain
38653d22d1
fix events description on the home page
2016-11-16 16:55:56 +01:00
Sylvain
d46e6cf9c9
[members excel export] invoicing disabled
2016-11-16 15:08:24 +01:00
Sylvain
73e4439036
front-end modifications to cancel a booked event
2016-11-09 17:07:48 +01:00
Sylvain
da71ba783c
[bug] exports for events reservation always have seats=1 ( fixes #54 )
2016-11-09 15:01:58 +01:00
Sylvain
c04ed51f85
[bug] translation conflict
2016-11-09 14:35:02 +01:00
Sylvain
2dcd980be3
[bug] recurrent events doesn't have the configured theme and age range
2016-11-09 13:12:30 +01:00
Peng DU
99cca406d5
fix bug: event date period dant show correct in invoice
2016-11-03 12:17:19 +01:00
Peng DU
9dca65786a
fix project step images height bug
2016-11-03 11:26:01 +01:00
Peng DU
f1b749d5f2
Image max size is configutable, size by default is 2 megabytes
2016-11-02 15:36:22 +01:00
Peng DU
ba5e5752a4
allow add more picture for project step
2016-11-02 14:58:06 +01:00
Peng DU
84c03a690b
add padding for summernote editor modal
2016-11-02 11:12:23 +01:00
Sylvain
f9220d44a0
fix i_accept_to_receive_information_from_the_fablab in sign-up modal
2016-10-26 16:35:10 +02:00
Sylvain
42f7b3c75c
add HTML in event description
2016-10-26 16:33:21 +02:00
Sylvain
91f70e2c47
[bug] statistics graphs not working
2016-10-24 09:31:29 +02:00
Sylvain
c500518c28
[bug] sharing project or event w/o image on social network render error 500
2016-10-11 16:07:34 +02:00
Sylvain
7d54341d98
Merge remote-tracking branch 'github/master' into dev
2016-10-11 15:37:35 +02:00
Kenneth Lim
18bc37749b
locale: informations --> information
...
Not sure if this helps but information does not require an `s`. :)
Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>
2016-10-07 17:11:58 +08:00
Sylvain
611652ccb5
[bug] many fixes on admin calendar
...
- [bug] after creating an element (training/machine), browse through the calendar and come back: the element appears duplicated
- [bug] deleting an element have an erronous confirmation message
- [bug] deleting an element cause the message "cannot read property 'length' of undefined" to be displayed in the console
2016-10-05 11:06:58 +02:00
Sylvain
fc747c55c7
wallet credit confirmation
2016-09-29 13:02:24 +02:00
Sylvain
1ef2c11355
add links to RSS feeds into application header
2016-09-29 11:54:08 +02:00
Sylvain
34ad1c9056
move RSS code into separate folders
2016-09-29 10:53:20 +02:00
Sylvain
376cb6dbe9
Merge branch 'rss_feeds' of git://github.com/Vincent14/fab-manager into Vincent14-rss_feeds
2016-09-29 10:09:15 +02:00
Sylvain
c2d2786515
fix default_host for dev and test environments
2016-09-29 10:02:31 +02:00
cyril
a0fef8d046
bug fix: not to force https in env production for root_url helper
2016-09-28 13:58:22 +02:00
Sylvain
785e9a42f8
test fix asset:precompile
2016-09-28 10:52:25 +02:00
Sylvain
60d60fdd65
use slugs in projects URL opened from notifications
2016-09-27 16:58:57 +02:00
Sylvain
e48bb88f1f
use slug in traning show url
2016-09-27 16:00:22 +02:00
Sylvain
b715078e83
[admin] button to delete training from view + confirmation on machine/training deletion from view
2016-09-27 15:32:49 +02:00
Sylvain
9a71dc5ea2
trainings monitoring: open current year/month by default on training selection
2016-09-27 14:56:57 +02:00
Sylvain
d45ca7213f
updated changelog
2016-09-27 14:10:00 +02:00
Sylvain
36524d4cd9
display list of allowed extensions in project's CAD attachments
2016-09-27 14:08:04 +02:00
Sylvain
bf9ea40648
[feature #40 ] project images will show in full-size on a click
2016-09-27 11:50:05 +02:00
Sylvain
6e94850522
prevent project step reordering to trigger unsaved-changes dialog
2016-09-27 11:31:20 +02:00
Sylvain
1195451863
[bug] embedded video not working in tranings/machines descriptions
2016-09-27 10:45:07 +02:00
Sylvain
24a0f5533c
fix unable to view dashboard nav buttons on small devices + fix responsive issues on admin views
2016-09-27 09:55:24 +02:00
Sylvain
30c52dfe95
share on twitter with title
2016-09-26 16:44:45 +02:00
Sylvain
a1fd69f309
auth provider safe destroy
2016-09-26 12:41:59 +02:00
cyril
b2b66e7910
display the edit button for admin
2016-09-23 14:43:34 +02:00
cyril
c14a4d03c5
ui: machines and trainings list : remove the description
2016-09-23 14:42:53 +02:00
cyril
70a95ffcd7
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2016-09-23 14:40:47 +02:00
cyril
eed8f6519e
display caret icon for small screen in profil nav
2016-09-23 14:40:41 +02:00
Peng DU
fc9aeb00a2
remove edit wallet reference from facture
2016-09-23 12:52:43 +02:00
Peng DU
0f7238bbba
fix wallet amount display error
2016-09-23 11:46:58 +02:00
Peng DU
972a5e0a89
fix bug: admin cant pay a plan with code promo by wallet
2016-09-22 18:04:13 +02:00
Sylvain
205c45060a
update version on user login according to their role
2016-09-22 17:01:40 +02:00
Sylvain
6401b321ef
[feature] display fab-manager's version, when logged as admin
2016-09-22 16:46:14 +02:00
Peng DU
270b279ffb
user can use a code promo for pay le plan by wallet and carte visa
2016-09-21 16:19:04 +02:00
Peng DU
1008a6dd1b
fix bug: cant show correct payment modal when pay by wallet and code promo
2016-09-21 13:09:10 +02:00
Peng DU
cfd92cdc40
fix bug: code promotion change slot's price original
2016-09-20 18:39:28 +02:00
Peng DU
afb026bdc9
clear invoice_item of wallet/group if payment has a error
2016-09-20 17:42:30 +02:00
Peng DU
802e239d5b
calcul total price of reservation with coupon when use wallet
2016-09-20 16:54:23 +02:00
Peng DU
e5341b0b89
fix bug: cant subscribe a plan
2016-09-20 14:37:35 +02:00
Peng DU
5d6aa163b5
change groups cache key name
2016-09-20 11:39:49 +02:00
Vincent
6920793ce1
add RSS feed to events index
2016-09-15 22:22:35 +02:00
Vincent
a5c6ba5f7d
add RSS feed to projects index
2016-09-15 21:50:08 +02:00
Sylvain
64bae54bce
[Bug] move event reservation is not limited by admin settings (prior-delay & disable)
2016-09-15 18:43:27 +02:00
Sylvain
32a79bec1b
[bug] clicking on the text in stripe's payment modal, does not validate the checkbox
2016-09-15 18:22:52 +02:00
Sylvain
638747ff0e
[SSO] improved boolean mapping interface
2016-09-15 18:15:23 +02:00
Sylvain
3c277428bf
[SSO] field data mapping transformation on data reception
2016-09-15 17:10:41 +02:00
Sylvain
13f416a101
[sso] save and restore field data mapping
2016-09-15 15:58:21 +02:00
Sylvain
ee333df53f
improved transformation interface
2016-09-14 18:54:53 +02:00
Sylvain
77626aa674
[SSO] interface for transforming boolean and dates datatypes
2016-09-14 18:52:18 +02:00
Sylvain
a0fb6fb683
[sso] show mapping datatype in provider edition
2016-09-14 17:32:11 +02:00
Sylvain
dc4c4b678f
[sso] fix create mapping w/ datatype display
2016-09-14 17:13:07 +02:00
Sylvain
50543b8d09
[sso] give informations about the expected data in sso mapping
2016-09-14 16:41:45 +02:00
Sylvain
019cfcadea
[sso] fix endpoint regexp
2016-09-13 12:09:55 +02:00
Sylvain
ec0f597067
[sso] display strategy name in providers list
2016-09-13 12:06:25 +02:00
Sylvain
627073f2be
[SSO] updated user's documentation
2016-09-12 17:29:44 +02:00
Sylvain
336158c5ad
[SSO] fix re-mapping of avatar, address and organization
2016-09-12 12:10:46 +02:00
Sylvain
d233297469
check coupon code server side + integration test for wrong copon
2016-09-08 15:19:12 +02:00
Sylvain
d99d090814
remove duplicate in mime types
2016-09-07 16:30:14 +02:00
Sylvain
19e89cce3d
[feature] validate project attachement by mime type
2016-09-07 15:44:19 +02:00
Sylvain
6bbb45c953
add more extensions to the allowed projects attachements
2016-09-07 12:17:21 +02:00
Sylvain
c2533c0590
add custom aggs for machine & trainings stats: available bookings
2016-09-06 17:17:15 +02:00
Sylvain
9d599a14e5
display custom aggregations in front statistics
2016-09-06 16:53:04 +02:00
Sylvain
53dd54b175
working custom aggs w/ result tidy in stats query
2016-09-06 16:32:41 +02:00
Sylvain
1fec50accf
ability to run custom aggregation with query and append result to query
2016-09-06 14:21:52 +02:00
Sylvain
ea671d03a4
database structure for custom aggregations in statistics
2016-09-05 17:16:23 +02:00
Sylvain
d0837706b6
fixed rake tasks
2016-09-05 15:30:46 +02:00
Sylvain
701b913eb1
[ongoing] elastic data structure for storing availabilities info
2016-09-05 15:15:31 +02:00
Sylvain
3dea7a63a9
prevent sending multiple reminders for reservations with multiple slots
2016-09-01 16:26:08 +02:00
Sylvain
71a111d8ba
improved reservations settings validation (delays)
2016-09-01 16:15:41 +02:00
Sylvain
9aef331596
add textual indications about empty fields in coupon form
2016-09-01 14:54:24 +02:00
Sylvain
670e9371d8
improved machine reservation tag display
2016-09-01 14:34:08 +02:00
Sylvain
434234c235
[Bug] machine slots with tags are not displayed correctly on reservation calendar
2016-09-01 14:31:21 +02:00
Sylvain
401e88cd88
fix event hover color for age range and theme
2016-09-01 11:44:18 +02:00
Sylvain
c3505c1419
fix coupon discount if reservation+subscription when pay by stripe
2016-09-01 11:36:51 +02:00
Sylvain
cb42b46790
[Bug] machine name is not shown in plan edition
2016-08-31 17:01:01 +02:00
Sylvain
87104a6b97
remove unused recuced_amount from event + allow to rollback migrations + openAPI will display custom prices for events
2016-08-31 11:58:37 +02:00
Sylvain
4c9879768b
fix statistic generation for events with custom prices
2016-08-30 17:03:05 +02:00
Sylvain
ea73b9a88b
fix create event without custom price + fix test fixtures
2016-08-30 14:48:22 +02:00
Sylvain
4f41aa6554
event custom prices: various fixes and removed artifacts
2016-08-30 13:07:47 +02:00
Sylvain
63a9f8bf95
update nummber of free places after event reservation payment
2016-08-30 12:45:35 +02:00
Sylvain
b9411366c2
update nb of free places after moving an event reservation with custom prices
2016-08-30 12:34:36 +02:00
Sylvain
7de896feb9
display 'pay' button when booking only custom prices tickets
2016-08-30 12:11:51 +02:00
Sylvain
feda4861f2
ability to move reservation with custom fares reservations
2016-08-30 11:27:25 +02:00
Sylvain
f175b4b28e
display custom prices places names in reservation summary after booking an event
2016-08-30 10:17:52 +02:00
Sylvain
d8e467d261
fix coupon usage with on-site payment
2016-08-30 09:47:03 +02:00
Sylvain
cd038a8550
custom price on all occurrences with recursive event creation
2016-08-30 09:37:05 +02:00
Sylvain
8aef50660a
show custom price reservations in admin/events/show reservations
2016-08-29 17:51:11 +02:00
Sylvain
60a8f60be8
display custom prices in events index
2016-08-29 17:33:21 +02:00
Sylvain
7bc19f540d
show custom price event bookings in dashboard
2016-08-29 17:21:20 +02:00
Sylvain
3d1c852576
show custom prices bookings in admin/editMember
2016-08-29 16:54:10 +02:00
Sylvain
d47a5aea5f
statistics generation for event with custom prices
2016-08-29 16:44:07 +02:00
Sylvain
d86cccf98c
custom prices in invoice generation
2016-08-29 16:37:51 +02:00
Sylvain
af883ea1ec
show custom price tickets booked in event show
2016-08-29 16:28:26 +02:00
Sylvain
06d65c785a
reserve event with custom prices
2016-08-29 15:43:47 +02:00
Sylvain
12eadb8ceb
interface for booking event custom prices
2016-08-29 11:09:36 +02:00
Sylvain
c6a83e98cb
[ongoing] db architecture for custom prices reservation
2016-08-25 18:41:33 +02:00
Sylvain
4fd31c3e9b
display custom prices in event show
2016-08-25 15:36:52 +02:00
Sylvain
05b010b83f
fix ability to edit custom prices
2016-08-25 14:13:30 +02:00
Sylvain
5d91756ace
ability to edit event with custom prices
2016-08-25 13:56:07 +02:00
Sylvain
7dc359e4ee
associate custom price categories to an event
2016-08-25 13:16:47 +02:00
Sylvain
bca77559ed
ability to delete a price category
2016-08-24 17:09:00 +02:00
Sylvain
77db2b2326
ability to edit price category
2016-08-24 16:52:37 +02:00
Sylvain
500a466371
full ability to create price categories
2016-08-24 16:21:43 +02:00
Sylvain
6c3dfab0a9
API for price categories management
2016-08-24 12:30:48 +02:00
Sylvain
9748ea596f
interface structure refactoring for fares' categories
2016-08-23 17:49:43 +02:00
Sylvain
ead7eda76b
interface structure refactoring for fares' categories
2016-08-23 17:49:28 +02:00
Sylvain
ea7410a738
reservation reminder: tested and fixed
2016-08-23 10:10:58 +02:00
Sylvain
cc1d6e4f21
[not tested] send reminder notification every hours for upcoming reservations
2016-08-17 17:39:12 +02:00
Sylvain
b166d6abc6
renamed FlowWorkers to more consistant name (Processors)
2016-08-17 15:43:13 +02:00
Sylvain
26aed7a1b5
ability for the admin to set custom settings for the reservation reminders + fix settings customization confirmation message
2016-08-17 12:49:52 +02:00
Sylvain
63e767bd18
refactored settings page
2016-08-17 10:10:23 +02:00
Sylvain
1799ab9bf5
fix error message
2016-08-17 09:54:31 +02:00
Sylvain
8aa5d5e4f5
allow dashes in coupon codes
2016-08-17 09:53:58 +02:00
Sylvain
428b2db0ea
send a coupon to a user
2016-08-16 18:12:13 +02:00
Sylvain
3253290860
[ongoing] send a coupon to a user
2016-08-16 11:33:10 +02:00
Sylvain
396d7b4df7
include coupons discounts in statistics CA
2016-08-16 10:29:08 +02:00
Sylvain
8ae3cf25b8
fix display success after admin subscribe plan
2016-08-11 18:30:59 +02:00
Sylvain
ba559d87fb
use coupon in plan subscription
2016-08-11 18:17:28 +02:00
Sylvain
1e0d809db9
handle coupon in refunds
2016-08-11 13:44:42 +02:00
Sylvain
d955f5d3e1
use coupon in event reservation
2016-08-11 12:34:55 +02:00
Sylvain
a63c1830cd
better fix for events categories
2016-08-11 11:33:55 +02:00
Sylvain
0c3a2a7832
fix events categories
2016-08-11 11:07:49 +02:00
Sylvain
5af64d1cd0
fix: go to training planning when trying to book not trained machine
2016-08-10 18:07:57 +02:00
Sylvain
8a68445d2e
fix stripe coupon creation
2016-08-10 17:48:34 +02:00
Sylvain
4be571e6d2
fix coupon usage with stripe
2016-08-10 17:37:17 +02:00
Sylvain
e122b99ebb
coupon usage in trainings
2016-08-10 16:53:40 +02:00
Sylvain
6e1dfda8f5
show coupon details in invoice
2016-08-10 16:33:26 +02:00
Sylvain
6a87467f7c
rebase coupon usage on code instead of id (more secure)
2016-08-10 15:34:47 +02:00
Sylvain
def5384a38
validation of validity_per_user on coupon usage
2016-08-10 11:08:01 +02:00
Sylvain
b4e28b94f3
apply coupon in payment modal + fix update user w/o organization
2016-08-09 17:20:38 +02:00
Sylvain
a679bc1638
compute price including coupon discount
2016-08-09 16:36:14 +02:00
Sylvain
d1c1a614a9
i18n coupon directive
2016-08-09 10:22:01 +02:00
Sylvain
5ce0097aa3
[ongoing] coupon validation and usage directive
2016-08-08 17:09:05 +02:00
Sylvain
c23b6fa3e0
fix coupons test
2016-08-08 15:43:02 +02:00
Sylvain
e2ea64cf9c
coupon edition + refactored coupon status
2016-08-08 15:21:33 +02:00
Sylvain
a6ded12ee9
create/delete coupons on stripe + adjust schema to match stripe requirements
2016-08-08 14:42:17 +02:00
Sylvain
35b324e108
coupon safe destroy
2016-08-08 12:25:27 +02:00
Sylvain
23320104c5
ability to edit coupons
2016-08-08 12:08:09 +02:00
Sylvain
01b77b3179
fixed delete coupon + fixed coupon status
2016-08-08 10:11:36 +02:00
Sylvain
7c434db09a
interface to create new coupons
2016-08-04 18:13:19 +02:00
Sylvain
ee03f1a79c
admin interface to list coupons
2016-08-04 14:26:07 +02:00
Sylvain
0eaa81b0ba
extracted some heavy admin views into sub-templates files & fixed uncomplete users display behavior in admin list
2016-08-04 12:08:33 +02:00
Sylvain
ce31c1412b
coupons usages are counted with invoices
2016-08-04 09:45:00 +02:00
Sylvain
84a7e81813
API for coupons
2016-08-03 17:56:36 +02:00
Sylvain
3a932e75c0
coupon data model & tests
2016-08-03 17:25:00 +02:00
Sylvain
c9a7c599c0
notify admin about organization registration & organization server validation
2016-08-02 18:06:07 +02:00
Sylvain
e3774230d3
use organization name & address in invoices if any
2016-08-02 15:55:49 +02:00
Sylvain
af94b62ff1
add organization infos to members xlsx export
2016-08-02 15:28:24 +02:00
Sylvain
33358c2fb5
ability to edit organization in profile & ablity to link its params from an sso
2016-08-02 15:11:26 +02:00
Sylvain
2afd6ade8a
allow user to set his organization on registration
2016-08-02 12:27:45 +02:00
Sylvain
ccc1eaf3a0
database structure for organizations
2016-08-01 17:36:38 +02:00
Sylvain
bd54ad8158
ability to share events on social networks twitter & fb
2016-08-01 16:19:50 +02:00
Sylvain
26d5e5e42c
allow social share of projects on twitter & facebook
2016-08-01 15:45:56 +02:00
Sylvain
dbc199cbba
project preview in facebook open graph
2016-07-28 17:44:58 +02:00
Sylvain
5f96c9916d
[feature] newsletter : ask conscent + export in xlsx
2016-07-28 12:20:51 +02:00
Sylvain
5cacb1d34a
notify admin when users exports are running
2016-07-28 10:28:43 +02:00
Sylvain
a2066d8c09
[feature]async generation of users exports
2016-07-27 17:00:06 +02:00
Sylvain
b3f56cefd4
alert user about ongoing running export
2016-07-27 15:42:29 +02:00
Sylvain
7843cd1f8e
fix typo
2016-07-27 12:34:42 +02:00
Sylvain
4d2f46ca95
[feature] Async statistics export to XLSX
...
- fix tests due to removal of event_categories
- rake task for generating statistics
2016-07-27 11:28:54 +02:00
Sylvain
74154cf1f3
Merge branch 'xls' into dev
...
Conflicts:
CHANGELOG.md
app/helpers/application_helper.rb
config/locales/en.yml
config/locales/fr.yml
2016-07-25 16:56:22 +02:00
Sylvain
32d239f723
[Bug #28 ] Event type disappear when editing the event
2016-07-25 16:16:25 +02:00
Sylvain
54740d13f8
Fix i18n for stripe payment dialog
2016-07-25 12:14:38 +02:00
Sylvain
3b9d1b398b
Fix i18n for payment dialog
2016-07-25 12:10:10 +02:00
Peng DU
c220678ea5
change some texts in reservation on site
2016-07-21 16:32:58 +02:00
Peng DU
7650ec5a5a
fix bug: dont get plan object in compute amount of wallet in reservation
2016-07-21 16:32:57 +02:00
Peng DU
909c204af5
show invoice download link in wallet transaction debit operator
2016-07-21 16:32:57 +02:00
Peng DU
9ba8e46450
refactroing wallet service, credit/debit in transaction of db, if have an error we rollback all
2016-07-21 16:32:57 +02:00
Peng DU
56f2ea4172
always use debit text
2016-07-21 16:32:57 +02:00
Peng DU
5d84dcb666
update locale
2016-07-21 16:32:57 +02:00
Peng DU
9befe091b8
refactoring generate invoice settlement info
2016-07-21 16:32:57 +02:00
Peng DU
50ba15b5bf
fix bug: dont update wallet amount if invoice disable, cant update wallet amount when user only subscribe subscription
2016-07-21 16:32:56 +02:00
Peng DU
7be60c2d00
fix locale key no found error
2016-07-21 16:32:56 +02:00
Peng DU
f2010e752d
show pay by wallet in invoice
2016-07-21 16:32:56 +02:00
Peng DU
773c1adf4a
edit invoice reference
2016-07-21 16:32:56 +02:00
Peng DU
2c49285740
avoir by wallet
2016-07-21 16:32:56 +02:00
Peng DU
4f42253d3d
wallet transaction list operation locale
2016-07-21 16:32:55 +02:00
Peng DU
38fafb7a70
wallet credit amount can be a float
2016-07-21 16:32:55 +02:00
Peng DU
2dbc026db1
pay subscription by wallet
2016-07-21 16:32:55 +02:00
Peng DU
31d5c6d3b3
pay totalement/partialement reservation by wallet
2016-07-21 16:32:54 +02:00
Peng DU
fc7eaaab94
add notification and alert when user wallet credit
2016-07-21 16:32:54 +02:00
Peng DU
d0956bb0aa
show wallet transactions of user
2016-07-21 16:32:54 +02:00
Peng DU
1dab903054
refactoring wallet amount to concern
2016-07-21 16:32:54 +02:00
Peng DU
9116e8c04a
wallet transaction type must be credit/debit
2016-07-21 16:32:54 +02:00
Peng DU
b22bae1d8f
wallet amount convert auto to float
2016-07-21 16:32:54 +02:00
Peng DU
cac9e16c17
cant debit/credit a negative
2016-07-21 16:32:53 +02:00
Peng DU
363fd73bc4
add model WalletTransaction
2016-07-21 16:32:53 +02:00
Peng DU
db8a6e8a32
application can show user wallet
2016-07-21 16:32:53 +02:00
Peng DU
79ef7f4188
refactoring show training controller and add a new action avaibilities
2016-07-19 12:16:41 +02:00
Peng DU
0b053b11ed
change calendar default view to agendDay if screen width <= 480px
2016-07-18 18:10:39 +02:00
Peng DU
dd7f67116d
change machines list icon
2016-07-18 17:57:50 +02:00
Peng DU
38bf35d06f
hide popup of training description
2016-07-18 17:51:49 +02:00
Peng DU
120df2e716
add an aside for filter caldendar in mobile
2016-07-18 16:31:14 +02:00
Peng DU
9638b775fc
fix bug: cant set correct default date for fullcalendar
2016-07-18 10:37:54 +02:00
Peng DU
70d623f65a
filter calendar by machine/formation/event or disponible
2016-07-14 18:36:52 +02:00
Peng DU
0b1a19cd76
calendar training slot redirect to fetch of training
2016-07-14 12:20:04 +02:00
Peng DU
f26e211acb
update locale
2016-07-14 12:20:03 +02:00
Peng DU
dbc9a388a8
fix bug: cant click machines event in < today and > first day of week
2016-07-14 12:20:03 +02:00
Peng DU
066458ca70
availability type filter
2016-07-14 12:20:03 +02:00
Peng DU
c1cdea18f3
optimise sql query
2016-07-14 12:20:03 +02:00
Peng DU
b3ca940880
show tag in availability
2016-07-14 12:20:03 +02:00
Peng DU
1fc4439df8
click slot to show machine fetch
2016-07-14 12:20:03 +02:00
Peng DU
2b08cc8594
fix bug cant navigate to yestoday in agendaDay view
2016-07-14 12:20:02 +02:00
Peng DU
49ee5011c1
show availability with reservation state
2016-07-14 12:20:02 +02:00
Peng DU
a67320121c
rename a variable
2016-07-14 12:20:02 +02:00
Peng DU
68e1b959ff
disable slotEventOverlap for agendaDay view
2016-07-14 12:20:02 +02:00
Peng DU
e9c1584968
availability public api
2016-07-14 12:20:02 +02:00
Peng DU
fb26a2e358
add public calendar menu, view, controller, routes and refactoring calldendar config
2016-07-14 12:20:02 +02:00
Peng DU
44b0fd8aa8
get availability border color in helper
2016-07-14 12:20:01 +02:00
Peng DU
0af0cc7878
update angular-ui-calendar and ajax load availabilites
2016-07-14 12:20:01 +02:00
Peng DU
1529e4b14e
allow active/disactive a training to show in training lists
2016-07-14 12:18:24 +02:00
Peng DU
503e8fc95f
fix bug: check text is exist in breakFilter
2016-07-14 11:26:03 +02:00
Sylvain
6839e8db38
Merge branch 'events' into dev
...
Conflicts:
CHANGELOG.md
config/locales/app.shared.en.yml
config/locales/app.shared.fr.yml
2016-07-13 18:32:30 +02:00
Sylvain
90142ae3bb
Merge branch 'training' into dev
2016-07-13 18:15:14 +02:00
Sylvain
e765267bb5
fix export for missing users
2016-07-13 18:09:32 +02:00
Sylvain
68f9324725
Merge branch 'steps' into dev
...
Conflicts:
app/assets/javascripts/controllers/projects.coffee.erb
db/schema.rb
2016-07-13 16:10:18 +02:00
Sylvain
3d7b0bbdfc
Merge remote-tracking branch 'origin/machines' into dev
2016-07-13 16:03:12 +02:00
Sylvain
2c8001f38f
Merge branch 'projects' into dev
...
Conflicts:
app/views/api/members/show.json.jbuilder
2016-07-13 15:57:45 +02:00
Sylvain
c863975e9c
statistics tables: sort by date
2016-07-13 11:12:16 +02:00
Sylvain
ad19bfbd79
fix custom filter CA=0
2016-07-13 10:19:43 +02:00
Sylvain
cbeb78fd7e
fix members full export
2016-07-13 09:20:52 +02:00
Sylvain
3413c3040b
[ongoing] members export full infos
2016-07-12 17:46:19 +02:00
Sylvain
b489b5d270
change export links to xlsx
2016-07-12 13:41:19 +02:00
Sylvain
bfe04c8be6
export reservations: eager load reservables
2016-07-12 13:38:35 +02:00
Sylvain
1b17290395
optimize export subscriptions & reservations queries
2016-07-12 13:16:29 +02:00
Sylvain
827b3334e1
migrate export subscriptions to axlsx
2016-07-12 13:10:06 +02:00
Sylvain
85912603a2
migrate export reservations to axlsx
2016-07-12 13:00:56 +02:00
Sylvain
d72e39f716
migrate export members to axlsx
2016-07-12 12:48:26 +02:00
Sylvain
d84238b331
statistics: global export to excel
2016-07-12 12:03:38 +02:00
Sylvain
569cc1b737
use theme primary in export header
2016-07-07 17:15:54 +02:00
Sylvain
8e968f7813
fix type key transmission
2016-07-07 16:57:23 +02:00
Sylvain
0f7f2c256a
[export] handle data type in custom fields
2016-07-07 16:34:28 +02:00
Sylvain
022db4e486
export all stats indices to excel
2016-07-07 16:26:25 +02:00
Sylvain
8e8bd3f9eb
full subscriptions export
2016-07-07 15:31:22 +02:00
Sylvain
eec004d1ba
cancel button does not trigger the generation
2016-07-06 19:04:04 +02:00
Sylvain
b0f7c634ea
subscriptions export with all rows
2016-07-06 19:00:22 +02:00
Sylvain
e8b1c99d2a
Alleluia git add . Downloading xls from front is working
2016-07-06 15:53:09 +02:00
Peng DU
40038f571c
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2016-07-06 11:22:05 +02:00
Peng DU
e57d5c96e6
cancel cache machine index json
2016-07-06 11:22:01 +02:00
Sylvain
d307f91983
use an hidden form to post export data
2016-07-05 17:23:14 +02:00
Sylvain
4dcab27af2
API generate valid xlsx files
2016-07-05 16:13:11 +02:00
Sylvain
b26bbd18ef
API accessing service & conforming server-side access points
2016-07-05 12:21:55 +02:00
Sylvain
38c00391fc
basic UI and API for exporting stats to excel
2016-07-04 17:15:37 +02:00
Sylvain
683bc835df
[bug] statistics: sum of stats does not work
2016-07-04 12:53:56 +02:00
Sylvain
8ba797bbf2
add filters in event index view
2016-07-04 11:11:00 +02:00
Sylvain
5af4c0b9d5
fix articles image height
2016-07-04 10:53:09 +02:00
Sylvain
3f6890825b
fix events index: box sizes
2016-07-04 10:39:24 +02:00
Sylvain
981999c29f
simplify event view in index if event on a single day
2016-06-30 16:56:13 +02:00
Sylvain
abb91458b1
display filters infos in event show
2016-06-30 16:45:47 +02:00
Sylvain
fda619e422
add info message on categories management + fix existing categories slugs
2016-06-30 16:12:24 +02:00
Sylvain
894f836286
fix the 'load more events' button
2016-06-30 15:26:34 +02:00
Sylvain
0557cb991f
rake task for correct event statistics mapping in elastic
2016-06-30 14:14:46 +02:00
Sylvain
e930e04ed6
add age&theme filters to statistics
2016-06-30 12:48:46 +02:00
Sylvain
5a0bb86394
fix events pagniation
2016-06-30 12:41:47 +02:00
Sylvain
e36df94f0f
server-side protection against deleting used filters
2016-06-30 11:39:56 +02:00
Sylvain
c8b42f1b7f
add slugs to event filters + add categories into statistics + prevent remove linked elements in front
2016-06-30 11:24:57 +02:00
Sylvain
812d7a3c05
server-side protection against last category deletion
2016-06-30 09:57:40 +02:00
Sylvain
bb6295c487
prevent from removing the last category
2016-06-30 09:51:06 +02:00
Sylvain
5374d8d0a6
event form: do not display filters with no values
2016-06-30 09:43:24 +02:00
Sylvain
859960ce3e
confirmation on event filter deletion
2016-06-30 09:34:26 +02:00
Sylvain
eb7ee6300e
remove associations with events on filter deletion
2016-06-29 17:26:41 +02:00
Sylvain
e13870555b
ability to link filters to events
2016-06-29 17:05:42 +02:00
Sylvain
09bcd7df2c
do not display events filter if no values exists for this filter
2016-06-29 16:13:42 +02:00
Sylvain
bdda4cd7b0
[feature] ability to filter events by category, theme and age
2016-06-29 16:09:27 +02:00
Sylvain
79b97eb113
[feature] manage event's age range
2016-06-29 11:21:21 +02:00
Sylvain
51cce7bbc3
[feature] manage event themes
2016-06-29 10:38:04 +02:00
Sylvain
9adc219edb
[feature] manage events categories
2016-06-28 17:06:33 +02:00
Sylvain
cbbd697d38
age_range & theme for event model
2016-06-28 15:56:37 +02:00
Sylvain
7d02fa9d9a
rename Courses/Workshops to Events
2016-06-28 11:42:20 +02:00
Sylvain
d5b06d08ad
[feature] confirmation on project deletion
2016-06-28 10:02:36 +02:00
Sylvain
6df3c90da2
fix api doc link
2016-06-27 18:08:19 +02:00
Sylvain
841c2dfd3a
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2016-06-27 17:23:16 +02:00
Sylvain
f6f539d2fc
link to openAPI documentation in front interface
2016-06-27 17:23:05 +02:00
cyril
fb73fc23de
fix ui:list openapi
2016-06-27 17:08:18 +02:00
Sylvain
875e513f1c
Merge remote-tracking branch 'origin/open-api' into dev
2016-06-27 16:31:50 +02:00
Sylvain
8e07460deb
[feature] redirect to slugged-url on publish project
2016-06-27 15:34:08 +02:00
Peng DU
a4fcede638
fix bug: cant get member training availability
2016-06-27 13:38:50 +02:00
Peng DU
4eea18a479
fix merge
2016-06-27 12:49:20 +02:00
Peng DU
6db26e7a19
fix conflt
2016-06-27 12:47:03 +02:00
Peng DU
df8dbfae8c
fix conflt of changelog
2016-06-27 12:42:57 +02:00
Peng DU
b477353286
cancel cache for plant and training_prcings
2016-06-27 12:37:44 +02:00
Peng DU
68e45c0460
cache last event and optimise last subscript api
2016-06-27 10:55:51 +02:00
Peng DU
0bb4665b4a
avoid N+1 for users list
2016-06-24 18:43:22 +02:00
Peng DU
d64e8a291b
remove order for avoid N+1
2016-06-24 18:36:36 +02:00
Peng DU
702e35650f
event cache
2016-06-24 18:26:11 +02:00