985 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sylvain	b23ebfdcaa	Merge branch 'dev' for release 2.4.6	2016-11-30 17:29:06 +01:00
Sylvain	3fad06c886	Version 2.4.6	2016-11-30 17:28:51 +01:00
Sylvain	4c8b661750	display coupon application result in inline message instead of growl notification	2016-11-30 10:17:05 +01:00
Sylvain	16ed469c72	add deploy instructions for 2.4.5	2016-11-29 17:56:56 +01:00
Sylvain	920270e602	add deploy instructions for 2.4.5	2016-11-29 17:56:41 +01:00
Sylvain	aeb770868a	Merge branch 'dev' for release 2.4.5	2016-11-29 17:07:24 +01:00
Sylvain	25a668bb30	Version 2.4.5	2016-11-29 17:06:56 +01:00
Sylvain	10fc7b69e9	Ability to display optional information message on event reservation page	2016-11-29 16:46:19 +01:00
Sylvain	c10298359f	no newline at end of version-file	2016-11-29 16:01:05 +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	fd93f3cefd	updated changelog	2016-11-29 12:03:38 +01:00
Sylvain	f91959af81	updated changelog	2016-11-29 11:54:56 +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
Sylvain	42a8d40b37	fix partial refund of invoices with cash coupons	2016-11-28 16:34:39 +01:00
Sylvain	684a33716c	tests subscription	2016-11-28 12:33:03 +01:00
Sylvain	dd177c6ec9	test reservation training	2016-11-28 12:31:22 +01:00
Sylvain	32a2699bc4	test reservation machine w/o subscription	2016-11-28 12:30:18 +01:00
Sylvain	34d2d108ba	test reservation machine+subscription	2016-11-28 12:29:10 +01:00
Sylvain	35cfed126d	test reservation trining w/ expired coupon	2016-11-28 12:25:35 +01:00
Sylvain	1b9d397c06	test reservation machine+plan w/ coupon	2016-11-28 12:25:03 +01:00
Sylvain	c879a7e10c	test create reservation training+plan by wallet	2016-11-28 12:24:26 +01:00
Sylvain	78002e66aa	add comments about prices	2016-11-28 12:23:48 +01:00
Sylvain	aa7748f8eb	Merge branch 'cash' into dev	2016-11-28 12:05:18 +01:00
Sylvain	7858d261c3	test event reservation with wallet + coupon	2016-11-28 11:50:16 +01:00
Sylvain	265ed3967c	change events test architecture	2016-11-28 11:49:59 +01:00
Sylvain	6439bc68e5	add event fixtures	2016-11-28 11:00:01 +01:00
Sylvain	585d137cfc	some automated tests about cash coupons	2016-11-28 10:40:02 +01:00
Sylvain	5231beb6e1	updated changelog	2016-11-28 10:11:52 +01:00
Sylvain	f0e11cf718	fix pdf invoice generation with cash coupon	2016-11-28 09:57:09 +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	63b0f0c061	[to test] compute prices/invoices using cash coupons	2016-11-24 17:57:48 +01:00
Sylvain	29f4974e78	Merge branch 'dev' for release 2.4.4	2016-11-24 16:48:38 +01:00
Sylvain	762d85f378	Version 2.4.4	2016-11-24 16:48:05 +01:00
Sylvain	a37dc5ab97	updated changelog	2016-11-24 16:44:47 +01:00
Sylvain	55564df8e8	improve translation to make it sex-agnostic	2016-11-24 16:43:15 +01:00
Sylvain	8b772b8c70	fix translation name in plan form	2016-11-24 16:42:30 +01:00
Sylvain	012a6b63c8	fix migration rollback	2016-11-24 16:42:02 +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
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