198 Commits

Author	SHA1	Message	Date
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	85ee73f0e0	ability to edit coupon expiration	2016-12-13 12:01:54 +01:00
Sylvain	10fc7b69e9	Ability to display optional information message on event reservation page	2016-11-29 16:46:19 +01:00
Sylvain	a9e593a840	fix statistics generation with cash coupon	2016-11-29 14:57:43 +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	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	63b0f0c061	[to test] compute prices/invoices using cash coupons	2016-11-24 17:57:48 +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	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	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +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	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
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	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	fc9aeb00a2	remove edit wallet reference from facture	2016-09-23 12:52:43 +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
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	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
Sylvain	50543b8d09	[sso] give informations about the expected data in sso mapping	2016-09-14 16:41:45 +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	53dd54b175	working custom aggs w/ result tidy in stats query	2016-09-06 16:32:41 +02:00
Sylvain	ea671d03a4	database structure for custom aggregations in statistics	2016-09-05 17:16:23 +02:00
Sylvain	701b913eb1	[ongoing] elastic data structure for storing availabilities info	2016-09-05 15:15:31 +02:00
Sylvain	c3505c1419	fix coupon discount if reservation+subscription when pay by stripe	2016-09-01 11:36:51 +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	4f41aa6554	event custom prices: various fixes and removed artifacts	2016-08-30 13:07:47 +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	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	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	77db2b2326	ability to edit price category	2016-08-24 16:52:37 +02:00
Sylvain	6c3dfab0a9	API for price categories management	2016-08-24 12:30:48 +02:00
Sylvain	cc1d6e4f21	[not tested] send reminder notification every hours for upcoming reservations	2016-08-17 17:39:12 +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	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	396d7b4df7	include coupons discounts in statistics CA	2016-08-16 10:29:08 +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	4be571e6d2	fix coupon usage with stripe	2016-08-10 17:37:17 +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	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	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	7c434db09a	interface to create new coupons	2016-08-04 18:13:19 +02:00
Sylvain	ce31c1412b	coupons usages are counted with invoices	2016-08-04 09:45:00 +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	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	a2066d8c09	[feature]async generation of users exports	2016-07-27 17:00:06 +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	32d239f723	[Bug #28] Event type disappear when editing the event	2016-07-25 16:16:25 +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	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	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	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	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	70d623f65a	filter calendar by machine/formation/event or disponible	2016-07-14 18:36:52 +02:00
Peng DU	49ee5011c1	show availability with reservation state	2016-07-14 12:20:02 +02:00
Peng DU	e9c1584968	availability public api	2016-07-14 12:20:02 +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	e930e04ed6	add age&theme filters to statistics	2016-06-30 12:48:46 +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