646 Commits

Author	SHA1	Message	Date
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