Sylvain
852437ebf8
remove coupon from memory after payment
2016-11-29 15:35:54 +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
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
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
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
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
6c9fdaaf83
[bug] fix machine hours stats graph
2016-11-21 11:35:56 +01:00
Peng DU
ba5e5752a4
allow add more picture for project step
2016-11-02 14:58:06 +01:00
Sylvain
91f70e2c47
[bug] statistics graphs not working
2016-10-24 09:31:29 +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
c2d2786515
fix default_host for dev and test environments
2016-09-29 10:02:31 +02:00
Sylvain
785e9a42f8
test fix asset:precompile
2016-09-28 10:52:25 +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
36524d4cd9
display list of allowed extensions in project's CAD attachments
2016-09-27 14:08:04 +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
30c52dfe95
share on twitter with title
2016-09-26 16:44:45 +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
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
e5341b0b89
fix bug: cant subscribe a plan
2016-09-20 14:37:35 +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
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
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
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
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
cb42b46790
[Bug] machine name is not shown in plan edition
2016-08-31 17:01:01 +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
