81 Commits

Author	SHA1	Message	Date
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	c13f640e81	remove rails find_by_* helpers	2016-11-23 16:30:19 +01:00
Sylvain	73e4439036	front-end modifications to cancel a booked event	2016-11-09 17:07:48 +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	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	d233297469	check coupon code server side + integration test for wrong copon	2016-09-08 15:19:12 +02:00
Sylvain	c3505c1419	fix coupon discount if reservation+subscription when pay by stripe	2016-09-01 11:36:51 +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	06d65c785a	reserve event with custom prices	2016-08-29 15:43:47 +02:00
Sylvain	c6a83e98cb	[ongoing] db architecture for custom prices reservation	2016-08-25 18:41:33 +02:00
Sylvain	396d7b4df7	include coupons discounts in statistics CA	2016-08-16 10:29:08 +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
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	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	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
Nicolas Florentin	ed478f95c7	UsersCredits::Manager accept an event Reservation but do not do nothing, acting as a blackbox	2016-04-20 11:24:28 +02:00
Sylvain	d880a8f0f4	fix unable to reserve Event	2016-04-13 18:21:01 +02:00
Nicolas Florentin	1344e09f96	adds comments to model reservation	2016-04-08 16:59:09 +02:00
Nicolas Florentin	d104403af0	little fix Reservation#generate_invoice_items take into account that plan can be purchased at the same time when reserving machine	2016-04-08 11:17:52 +02:00
Nicolas Florentin	c78e010888	refacto method generate_invoice_items using UsersCredits::Manager service	2016-04-08 11:12:03 +02:00
Nicolas Florentin	7748d601f8	uses users_credits/manager service in models reservation and subscription, and adds integration tests	2016-04-07 16:02:09 +02:00
cyril	d1450f65f6	release 2.0 rc	2016-03-23 18:39:41 +01:00