Sylvain
eb4f97000d
[bug] admin cannot see all space availabilities
2017-08-24 16:53:27 +02:00
Peng DU
2cc8096236
fix bug: cant get list of training reservation
2017-03-28 19:45:36 +02: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
504fe49964
export machines availabilities
2017-03-02 12:34:28 +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
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
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
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
8e86c4b212
[ongoing] spaces reservation calendar
2017-02-23 17:45:55 +01:00
Sylvain
c12366c9f1
[bug] unable to see reserved trainings for admin in booking calendar
2017-02-22 17:29:35 +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
23b9851218
allow enable/disable spaces -> disabled by default
2017-02-15 15:41:25 +01:00
Sylvain
d463d4dd5a
display spaces in admin calendar
2017-02-15 13:18:03 +01:00
Sylvain
d8acd4c86f
fix ui issues on space creation/deletion
2017-02-14 12:51:30 +01:00
Sylvain
da95e6e0d8
space creation interface
2017-02-14 11:28:07 +01:00
Sylvain
05d4b7b3c5
spaces api
2017-02-13 16:10:12 +01:00
Sylvain
c479502dd0
[bug] too many unread notifications cause system memory overflow
2017-01-05 15:06:54 +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
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
76c1412177
Merge branch 'wallet_avoir' into dev
2016-12-13 15:33:56 +01:00
Sylvain
85ee73f0e0
ability to edit coupon expiration
2016-12-13 12:01:54 +01:00
Sylvain
b44089a33d
interface & api to build avoir for a wallet credit
2016-12-12 14:20:26 +01:00
Sylvain
4c8b661750
display coupon application result in inline message instead of growl notification
2016-11-30 10:17:05 +01:00
Sylvain
b75cbc17d7
fix training reservation calendar witch shows all trainings slots
2016-11-29 15:48:39 +01:00
Sylvain
82fa5416ce
fix creation of prices with float values
2016-11-29 15:23:36 +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
ff11694e05
check cash coupons does not exceed cart amount for events
2016-11-24 15:01:35 +01:00
Sylvain
04e10c8bb6
check cash coupons does not exceed cart amount for trainings & machines
2016-11-24 13:58:41 +01:00
Sylvain
8419efc7f5
handle unconfigured twitter's keys
2016-11-24 09:38:42 +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
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
da71ba783c
[bug] exports for events reservation always have seats=1 ( fixes #54 )
2016-11-09 15:01:58 +01:00
Peng DU
ba5e5752a4
allow add more picture for project step
2016-11-02 14:58:06 +01:00
Sylvain
e48bb88f1f
use slug in traning show url
2016-09-27 16:00:22 +02:00
Sylvain
36524d4cd9
display list of allowed extensions in project's CAD attachments
2016-09-27 14:08:04 +02:00
Sylvain
a1fd69f309
auth provider safe destroy
2016-09-26 12:41:59 +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
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
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
d233297469
check coupon code server side + integration test for wrong copon
2016-09-08 15:19:12 +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
ea73b9a88b
fix create event without custom price + fix test fixtures
2016-08-30 14:48:22 +02:00
Sylvain
06d65c785a
reserve event with custom prices
2016-08-29 15:43:47 +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
7dc359e4ee
associate custom price categories to an event
2016-08-25 13:16:47 +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
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
428b2db0ea
send a coupon to a user
2016-08-16 18:12:13 +02:00
Sylvain
ba559d87fb
use coupon in plan subscription
2016-08-11 18:17:28 +02:00
Sylvain
0c3a2a7832
fix events categories
2016-08-11 11:07:49 +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
a679bc1638
compute price including coupon discount
2016-08-09 16:36:14 +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
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
84a7e81813
API for coupons
2016-08-03 17:56:36 +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
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
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
Peng DU
909c204af5
show invoice download link in wallet transaction debit operator
2016-07-21 16:32:57 +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
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
70d623f65a
filter calendar by machine/formation/event or disponible
2016-07-14 18:36:52 +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
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
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
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
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
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
3413c3040b
[ongoing] members export full infos
2016-07-12 17:46: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
8e968f7813
fix type key transmission
2016-07-07 16:57:23 +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
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
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
e36df94f0f
server-side protection against deleting used filters
2016-06-30 11:39:56 +02:00
Sylvain
812d7a3c05
server-side protection against last category deletion
2016-06-30 09:57:40 +02:00
Sylvain
e13870555b
ability to link filters to events
2016-06-29 17:05: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
875e513f1c
Merge remote-tracking branch 'origin/open-api' into dev
2016-06-27 16:31:50 +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
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
Sylvain
9e728c691f
[feature] prevent unmerged accounts (soo imported) from being displayed in lists/searches
2016-06-23 11:42:10 +02:00
Sylvain
c90f4684b9
[bug] scroll statistics tables not working when elastic is not localhost
2016-06-23 11:11:54 +02:00
Peng DU
4dff74827b
optimise machine/training availabilities query
2016-06-22 12:54:12 +02:00
Peng DU
e82372fb7b
optimise machine availabilities query
2016-06-21 19:07:47 +02:00
Peng DU
85a40db603
price cache
2016-06-21 16:04:44 +02:00
Peng DU
4d0d3d6af0
optimise load plans json
2016-06-21 14:49:39 +02:00
Sylvain
24f963645b
optimize usernames mapping in statistics
2016-06-21 14:39:44 +02:00
Sylvain
4639a15e2f
[feature] paginate statistics
2016-06-21 13:16:42 +02:00
Sylvain
f7d8d18bc8
[feature] paginate public list of members
2016-06-16 16:09:22 +02:00
Sylvain
ddbb043a41
do not retrieve full users list on plans page
2016-06-16 14:26:10 +02:00
Sylvain
0339fd8e09
allow multi words search in users autocomplete
2016-06-16 12:55:20 +02:00
Sylvain
a325211552
optimization collaborators of a project
2016-06-16 09:30:38 +02:00
Sylvain
08244d53dc
improve trainings load times
...
- do not eager load trainings availabilities in INDEX action if not requsted
- in trainings monitoring (font), do not load all availabilities for all traninings by default, by select a training first to load its availabilities
2016-06-15 12:01:09 +02:00
Sylvain
e503d6edd8
optimize trainings API
2016-06-14 15:42:28 +02:00
Sylvain
f924144fda
[feature] member select with lazy loading
2016-06-14 09:57:39 +02:00
Sylvain
2b1d1fc4dd
[feature] basic ability manage steps order
2016-06-02 12:49:00 +02:00
Sylvain
3593f293ce
[feature] partial load of invoices list
2016-05-31 10:02:27 +02:00
Sylvain
820d8bba53
users list: display only active members
2016-05-30 16:39:20 +02:00
Sylvain
c8e9c6dae5
[feature] partial load of users list
2016-05-30 15:39:19 +02:00
Sylvain
0be0935474
[feature] add user's job to profile
2016-05-26 12:34:30 +02:00
Sylvain
d009cf3fc1
[feature] add flickr, lastfm & pinterest
2016-05-26 12:05:28 +02:00
Sylvain
88de9c3c75
[feature] profile website + edition of is_allow_contact
2016-05-16 14:46:57 +02:00
Sylvain
7ec5e5ba03
[feature] allow user to add links to his socials networks
2016-05-16 11:18:30 +02:00
Nicolas Florentin
2c70903dfd
admin open_api_client managing
2016-05-09 18:15:04 +02:00
Nicolas Florentin
4cfcbb47aa
openlab_projects ctrl, rescue all standard error
2016-04-25 10:07:54 +02:00
Nicolas Florentin
5403386c75
fallback and message if openlab server not available
2016-04-25 10:06:35 +02:00
Nicolas Florentin
1a446bf646
frontend openlab search view, ctrl, services
2016-04-22 18:17:55 +02:00
Sylvain
f9628b4989
prevent subscription creation/modification if card_token is invalid
2016-04-11 18:37:15 +02:00
Nicolas Florentin
7649e953e4
refacto subscription extension with first training using a service
2016-04-07 17:57:48 +02:00
Sylvain
d97c336512
[ #16 ] add email field to reservations export
2016-03-31 11:52:49 +02:00
Sylvain
e81cc1597a
various fix
...
- handle stripe limitation: plan cannot exceed 1 year
- [bug] unable to change password
- [bug] incorrect value of plans durations in admin list
- [css] plan price was exceeding width of the container
2016-03-24 15:39:24 +01:00
cyril
d1450f65f6
release 2.0 rc
2016-03-23 18:39:41 +01:00
Sylvain
5fff77d906
[bug] unable to edit event (possible fix for #17 )
2016-01-19 10:48:56 +01:00
cyril
68eab24fa1
init depot fabmanager
2015-05-05 03:10:25 +02:00