965 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	9721872b2a	updated changelog	2016-11-24 09:50:56 +01:00
Sylvain	8419efc7f5	handle unconfigured twitter's keys	2016-11-24 09:38:42 +01:00
Sylvain	fc1f19a92f	completed readme about TWITTER_NAME	2016-11-24 09:12:39 +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	cc06bcab85	fix cash coupon creation on stripe + store amount in centimes	2016-11-23 15:44:59 +01:00
Sylvain	2a029255c9	updated changelog	2016-11-23 15:10:07 +01:00
Sylvain	30ab25b5a0	normalize ProjectsController code structure	2016-11-23 15:01:33 +01:00
Sylvain	21d887945e	improve translation to make it sex-agnostic	2016-11-23 14:31:58 +01:00
Sylvain	cf11f6afcf	factorize currency symbol into	2016-11-23 14:27:11 +01:00
Sylvain	51faeedfa8	fix translation name in plan form	2016-11-23 12:57:33 +01:00
Sylvain	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +01:00
Sylvain	b7737be6f3	fix migration rollback	2016-11-23 11:44:48 +01:00
Sylvain	42f1213af7	update documentation schemas	2016-11-23 11:32:22 +01:00
Sylvain	327a6eab11	fix typo	2016-11-21 15:00:34 +01:00
Sylvain	e365034374	Merge branch 'dev' for release 2.4.3	2016-11-21 14:26:02 +01:00
Sylvain	1747157c6b	Version 2.4.3	2016-11-21 14:16:55 +01:00
Sylvain	e38afc0d4b	updated changelog	2016-11-21 12:00:03 +01:00