44 Commits

Author	SHA1	Message	Date
Sylvain	26d79e5b12	disable a plan	2017-10-04 18:56:39 +02:00
Sylvain	273ec5317d	disallow locking availabilities if it has any non-cancelled reservations	2017-09-06 18:07:56 +02: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	03758d336c	fix move & cancel training reservation + fix display after cancel for machines & training	2017-02-22 17:45:22 +01:00
Sylvain	1959856235	use the cart directive in training reservation	2017-02-22 16:45:13 +01:00
Sylvain	3e49c35414	improved comments	2017-02-22 13:50:13 +01:00
Sylvain	4bb9728502	clean machines controller	2017-02-22 11:01:52 +01:00
Sylvain	c4824f99ba	fix summary after event moved	2017-02-22 10:28:14 +01:00
Sylvain	9b2ba8528f	fix machines controller JSDoc	2017-02-21 17:43:39 +01:00
Sylvain	4fa171da9d	display summary after payment + ongoing clean template from references to machine	2017-02-21 17:23: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	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	73a5689140	inteface to display spaces	2017-02-14 12:41:51 +01:00
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	04e10c8bb6	check cash coupons does not exceed cart amount for trainings & machines	2016-11-24 13:58:41 +01:00
Sylvain	cf11f6afcf	factorize currency symbol into	2016-11-23 14:27:11 +01: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	b715078e83	[admin] button to delete training from view + confirmation on machine/training deletion from view	2016-09-27 15:32:49 +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	5af64d1cd0	fix: go to training planning when trying to book not trained machine	2016-08-10 18:07:57 +02:00
Sylvain	e122b99ebb	coupon usage in trainings	2016-08-10 16:53:40 +02:00
Sylvain	6a87467f7c	rebase coupon usage on code instead of id (more secure)	2016-08-10 15:34:47 +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	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	5d84dcb666	update locale	2016-07-21 16:32:57 +02:00
Peng DU	31d5c6d3b3	pay totalement/partialement reservation by wallet	2016-07-21 16:32:54 +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
Sylvain	f924144fda	[feature] member select with lazy loading	2016-06-14 09:57:39 +02:00
cyril	d1450f65f6	release 2.0 rc	2016-03-23 18:39:41 +01:00
cyril	68eab24fa1	init depot fabmanager	2015-05-05 03:10:25 +02:00