296 Commits

Author	SHA1	Message	Date
Sylvain	193e81e711	Merge branch 'uvsq' into dev	2019-09-30 15:34:21 +02:00
Sylvain	4deaf1f75a	[ongoing] import members from csv	2019-09-25 16:37:42 +02:00
Sylvain	a532efd198	upload csv file to the server through the API and save it on the disk	2019-09-24 17:42:50 +02:00
Sylvain	8eda1e673f	Merge remote-tracking branch 'origin/hotfixes' into dev	2019-09-24 14:43:14 +02:00
Sylvain	588010ac0b	[feature] Optional reCaptcha checkbox in sign-up form	2019-09-23 17:46:46 +02:00
Nicolas Florentin	c49db3b512	fix api/reservations#index find statistic_profile_id from the user_id because user_id is not a column of reservations table anymore	2019-09-20 15:23:53 +02:00
Sylvain	1fa36d4029	renamed avoir_mode to payment_method	2019-09-17 14:48:06 +02:00
Sylvain	02d28e0b8c	improved accounting codes settings page (1 click saves all) + improved export file name	2019-09-16 14:39:47 +02:00
Sylvain	224b0d6dee	Merge branch 'sca' into dev	2019-09-12 12:53:56 +02:00
Sylvain	539eb08b89	ability to disable the online payments through an env var	2019-09-11 17:08:00 +02:00
Sylvain	d977838d52	fix tests according to changes for stripe SCA	2019-09-11 16:20:47 +02:00
Sylvain	f60d19fa27	allow reservations & subscriptions at price of zero	2019-09-11 11:51:04 +02:00
Sylvain	75f483a7a6	compute subscription price server-side for payments	2019-09-11 10:31:22 +02:00
Sylvain	ac0489a496	[bug] wallet usage is noted on subscription invoices even if wallet was not used + use payment confirm API for subscriptions only (sca)	2019-09-10 17:57:46 +02:00
Sylvain	4d0ac9b3ca	using stp_payment_intent_id instead of stp_invoice_id on new invoices	2019-09-10 16:45:45 +02:00
Sylvain	04f17d44d8	handle sca in js frontend	2019-09-10 12:46:02 +02:00
Sylvain	a96050a2e9	refactor payment process for sca	2019-09-10 11:46:14 +02:00
Sylvain	e9e27663cd	quick coding rules checking with rubocop	2019-09-09 18:04:31 +02:00
Nicolas Florentin	e94cf46fa4	ongoing work on sca stripe	2019-09-09 17:37:54 +02:00
Sylvain	510533e080	handle 2nd confirmation on server + display confirmation modal on the client	2019-09-05 17:17:51 +02:00
Sylvain	12447698f8	collect card details on the client & create a paymentIntent on the server	2019-09-05 16:17:02 +02:00
Sylvain	a0961314a4	[ongoing] upgrade stripe gem & api version to allow SCA	2019-09-05 11:03:22 +02:00
Sylvain	e32825675c	[ongoing] fixing accounting export service	2019-07-31 16:52:11 +02:00
Sylvain	12d8c65fa2	async generation of export and download cached csv using hidden iframe	2019-07-31 15:47:02 +02:00
Sylvain	fa6a54a422	export notifications	2019-07-31 12:37:31 +02:00
Sylvain	a7f68b59dd	connect the export modal to the api	2019-07-31 12:00:52 +02:00
Sylvain	f772bc3509	api endpoint and worker to export accounting data	2019-07-30 11:43:51 +02:00
Sylvain	f3c433883d	[bug] canceled reservation are not removed from statistics (fix #133)	2019-06-13 16:29:12 +02:00
Sylvain	a53c6e80e7	move invoice->operator to invoicing_profile + minor fixes to handle user deletion	2019-06-12 12:22:38 +02:00
Sylvain	86ded2b8d2	[ongoing] fixes for invoices pdf files	2019-06-11 16:56:11 +02:00
Sylvain	cfd33c3a52	migrate projects to statistic_profile	2019-06-06 16:34:53 +02:00
Sylvain	fe2a6f7120	migrate trainings to statistic_profile and adjust code	2019-06-06 12:00:21 +02:00
Sylvain	17fbd6b465	multiple fixes related to statistic_profile & invoicing_profile + fix users list while sorting by subscription	2019-06-05 12:11:51 +02:00
Sylvain	bd796bc588	fix SubscriptionsController - all tests passing	2019-06-05 07:58:49 +02:00
Sylvain	4c033614ae	[ongoing] migrate subscriptions & reservations to statistic_profile	2019-06-04 16:50:23 +02:00
Sylvain	52992ac9d5	move gender & birthday to statistic_profile	2019-06-04 13:33:00 +02:00
Sylvain	9ef2f142bd	link HistoryValue to InvoicingProfile + improved invoices tests	2019-06-03 16:51:43 +02:00
Sylvain	7ed97ef35a	link wallet & its transactions to invoicingprofile	2019-06-03 16:00:09 +02:00
Sylvain	6011f27268	finish moving organization & address to invoiving profile: fix create & edit user	2019-06-03 12:06:01 +02:00
Sylvain	a211ad39ff	moving organization & address to invoicingProfile + refactored doc about postgre	2019-05-29 14:28:14 +02:00
Sylvain	ffbca98276	[ongoing] fix api to use the invoicing_profile	2019-05-28 16:49:36 +02:00
Sylvain	dd4b6e2cb1	[ongoing] abuses management interface	2019-05-09 18:27:19 +02:00
Sylvain	26b901ebb5	[bug#131] Availabilities export report an erroneous number of reservations for machine availabilities	2019-05-07 12:24:51 +02:00
Sylvain	3b3e1af822	improved coupon filtering to allow pagination while filtering	2019-04-08 11:00:00 +02:00
Sylvain	44479b5597	allow filtering coupons list	2019-04-04 18:00:19 +02:00
Sylvain	9f8d24ec4f	paginate list of coupons	2019-04-04 17:28:29 +02:00
Sylvain	7a317b7e45	[bug] unable to add a file attachment to an event	2019-03-28 11:30:25 +01:00
Sylvain	2ac0336adb	Merge branch 'dev' into host	2019-03-25 16:17:23 +01:00
Sylvain	5cdaa014ef	[security] updated devise + updated rails	2019-03-25 14:57:48 +01:00
Sylvain	c356f35f29	add operator_id to invoices	2019-03-18 11:11:09 +01:00