321 Commits

Author	SHA1	Message	Date
Sylvain	5941446a72	fixes for card payment	2020-12-02 14:28:41 +01:00
Sylvain	34a9084501	pass payment method to the ruby service	2020-11-23 11:48:44 +01:00
Sylvain	a56112a47f	using stripe api	2020-11-17 16:23:55 +01:00
Sylvain	678af0de1f	using stripe api + improved ui + ui to configure schedules reference ... TODO: as an admin, I can select if payment_method = (stripe || local)	2020-11-16 16:37:40 +01:00
Sylvain	b5504d2342	create stripe subscription with all data	2020-11-12 16:44:55 +01:00
Sylvain	ed5b90cbdc	add stp_product_id to all items that can be scheduled	2020-11-12 12:14:51 +01:00
Sylvain	78847bdb4b	WIP: create subscription on stripe	2020-11-10 17:02:21 +01:00
Sylvain	7833b0924b	add other cart items to the first schedule	2020-11-05 14:55:06 +01:00
Sylvain	b0afa02f1d	use cart directive on the plan subscription page ... + fix payment schedule compute + fix price for monthly-payments plans in plan-card + TODO: valid_reservation_modal.html + TODO: Stripe processing	2020-11-04 16:22:31 +01:00
Sylvain	7d37174b51	[bug] when a cash coupon was used, an invalid amount is shown in the statistics	2020-11-04 15:53:40 +01:00
Sylvain	21bd1312bc	compute payment schedule + basic display	2020-11-03 16:50:11 +01:00
Sylvain	19fb816d36	Enhanced rake task to create fixtures for test cases	2020-07-22 09:45:20 +02:00
Sylvain	7bf06ff23e	debug footprints	2020-07-21 19:25:21 +02:00
Sylvain	a83a42c70c	[bug] Health API is broken if ElasticSearch is not present	2020-07-01 15:13:44 +02:00
Sylvain	e288f66997	use search index to speed up projects searches	2020-06-23 17:06:59 +02:00
Sylvain	23338eb36d	refactored project search using service	2020-06-23 15:45:38 +02:00
Sylvain	40dd39304e	enable/disable statistics module fomr the UI	2020-06-17 12:20:51 +02:00
Sylvain	24155bc009	ability to lock settings from the env vars	2020-06-15 13:20:48 +02:00
Sylvain	4b8504f531	fix tests	2020-06-10 11:52:54 +02:00
Sylvain	88208627c9	read stripe_public_key from the db	2020-06-10 11:02:30 +02:00
Sylvain	9ff0a06029	many sidekiq fixes	2020-06-09 18:51:57 +02:00
Sylvain	a70668f52a	sync members on stripe after keys update	2020-06-09 14:27:18 +02:00
Sylvain	06b5da9df8	configure online payment from the UI	2020-06-08 17:42:59 +02:00
Sylvain	f78eb10c75	use openlab_app_secret from db w/ openlab_ruby gem	2020-06-08 15:17:56 +02:00
Sylvain	88f2fb3749	secure the settings API (read) + read the openlab settings from the db	2020-06-08 15:08:07 +02:00
Sylvain	0d211e2e31	configure google recaptcha from UI	2020-05-27 16:35:30 +02:00
Sylvain	628a0f3bc3	configure facebook_app_id from the UI	2020-05-27 12:29:51 +02:00
Sylvain	2d628d8826	disable the invoicing module from the UI config panel	2020-05-26 18:07:07 +02:00
Sylvain	537743a740	configure the plans module from the admin UI	2020-05-26 15:39:28 +02:00
Sylvain	6cc6bba7ce	refactored app to gather spaces module status from the settings	2020-05-26 13:59:40 +02:00
Sylvain	01017f3012	fix setting.get for boolean	2020-05-25 16:47:06 +02:00
Sylvain	98c63e8327	[bug] managers do not see the name of the user who reserved a slot	2020-05-25 16:35:21 +02:00
Sylvain	ba4c39ca99	use slot duration from the db setting	2020-05-25 12:55:01 +02:00
Sylvain	f80eb230ca	refactored code to use Setting.get	2020-05-25 12:54:19 +02:00
Sylvain	bf57587301	[bug] recurrent availabilities do not keep the custom duration	2020-05-25 11:03:31 +02:00
Sylvain	18e2b032ae	fix import users from csv	2020-05-19 11:45:51 +02:00
Sylvain	ca7a50bacc	[bug] admin's members list shows the same members multiple times	2020-05-13 10:59:16 +02:00
Sylvain	7e1edef8a0	[bug] when an admin logs on the subscription page, his view is broken ... Also: Prevent admins from leaving their dedicated group	2020-05-13 08:37:49 +02:00
Sylvain	06502cde33	[bug] accounting periods totals are wrong for periods closed after 2019-08-01	2020-05-11 10:10:52 +02:00
Sylvain	47a0fca481	show all availabilities to managers	2020-05-06 12:56:12 +02:00
Sylvain	be23cf27c3	use Price.compute to generate invoice items	2020-05-06 12:43:47 +02:00
Sylvain	6aa7ba89e8	manager's notifications	2020-04-29 15:34:30 +02:00
Sylvain	5312c13d3f	[manager] manage agenda + book machines for himself&others	2020-04-27 12:12:29 +02:00
Sylvain	e1a8646e5f	inteface to add/remove/edit managers	2020-04-22 10:09:16 +02:00
Sylvain	2ca5c8c50f	managers interface	2020-04-21 17:24:22 +02:00
Sylvain	ff75a96ecc	Ability to define, per availability, a custom duration for the reservation slots	2020-04-15 18:08:02 +02:00
Sylvain	a4cd6e4dc7	[bug] unable to access health endpoint	2020-04-07 15:19:41 +02:00
Sylvain	f24d94b979	set correct invoicing_profile_id for refund invoice during wallet credit	2020-04-01 17:58:32 +02:00
Sylvain	3917d6042c	[bug] no statistics for subscriptions (#196) ... + [bug] issing translation for subscriptions statistics > duration	2020-04-01 17:25:55 +02:00
Sylvain	705bedc25c	[bug] crediting a wallet w/ refund invoice prevent statistics generation (#196)	2020-04-01 12:51:18 +02:00
Sylvain	570f61c5df	[bug] report error on invalid encoding in members import	2020-03-31 16:53:30 +02:00
Du Peng	b3313d3e75	update rails to 5.1.7	2020-03-25 12:35:07 +01:00
Sylvain	6b63483fcc	fix an issue with the health endpoint	2020-02-26 12:00:51 +01:00
Sylvain	b7dda83060	Merge branch 'edit_event_recurrent' into dev	2020-02-11 15:43:29 +01:00
Du Peng	c3965b28cf	remove rebocop disable	2020-02-03 10:53:54 +01:00
Du Peng	05073d5a28	fix bug for update event recurrent	2020-01-30 12:03:50 +01:00
Sylvain	fd0f49f132	rubocop: ruby syntax	2020-01-29 17:50:06 +01:00
Sylvain	5b97ef03a9	rubocop: ruby syntax	2020-01-29 17:49:05 +01:00
Du Peng	35d9bec8a5	update event recurrent	2020-01-29 17:20:19 +01:00
Du Peng	de02bb1c72	update all attributes of event	2020-01-28 18:34:32 +01:00
Du Peng	b1419271e6	edit event recurrent in progress	2020-01-27 18:21:46 +01:00
Sylvain	656a603d6c	customize home page css	2020-01-27 17:10:29 +01:00
Sylvain	97660924cb	fix typo and wording	2020-01-21 11:16:49 +01:00
Du Peng	3c26c6d4bd	disable add plan with reserve slot in the past	2020-01-20 16:17:10 +01:00
Du Peng	0143c3d495	allow admin reserve machine/space in the past time	2020-01-20 16:17:10 +01:00
Sylvain	7929d3b198	detailled view of collected data in fabanalytics	2020-01-15 12:48:55 +01:00
Sylvain	059096c2dd	privacy option for fab-analytics	2020-01-15 10:46:04 +01:00
Sylvain	bb48a13f83	health endpoint & automated version check	2020-01-14 14:33:00 +01:00
Sylvain	64764e5498	check version on hub & [ongoing] health endpoint	2020-01-13 17:05:53 +01:00
Sylvain	54be21729b	batch delete periodic events	2020-01-07 17:18:49 +01:00
Sylvain	f778ee9016	fix syntax + add missing translations	2020-01-07 10:44:29 +01:00
Nicolas Florentin	62c979cfc0	members filters, translations for other languages are still needed	2019-12-20 15:47:42 +01:00
Sylvain	60755a2c2a	Merge remote-tracking branch 'origin/fix-time-now' into dev	2019-12-03 15:51:22 +01:00
Sylvain	64fe68b2b0	icalendar source sync: create/update/delete ical events	2019-12-03 12:16:07 +01:00
Sylvain	cca6b14f58	import events asyncronously from icalendar	2019-12-02 15:53:24 +01:00
Nicolas Florentin	77cf8c8218	replaces almost all Time.now by DateTime.current	2019-12-02 11:57:25 +01:00
Sylvain	36eba99808	[bug] report errors on admin creation	2019-12-02 10:39:42 +01:00
Sylvain	bbd613f2a5	compute right nb of free seats for event reservation ... also: copy nb_total_places to n+1 instances when creating recurrent availabilities	2019-11-25 10:30:12 +01:00
Sylvain	9ec736e6b5	delete recursive slots	2019-11-18 17:29:51 +01:00
Sylvain	26738563bd	create reccursive events	2019-11-18 11:50:20 +01:00
Sylvain	a60a39ff9e	[ongoing] create multiple availabilities according to UI	2019-11-13 12:13:22 +01:00
Nicolas Florentin	12b9155b43	try to fix edge cases of VatHistoryService, related to issue #156	2019-10-29 15:20:25 +01:00
Sylvain	fdcec06345	CVE-2019-16892 + #49 ... - updated rubyzip to fix a security issue - updated axlsx and file writing method as a possible fix for #49	2019-10-21 16:11:49 +02:00
Sylvain	bc36b78719	[bug] public calendar won't show anything if the current date range include a reserved space availability (#151)	2019-10-14 10:38:13 +02:00
Sylvain	7dbfbc4868	fix typo	2019-10-07 17:12:49 +02:00
Sylvain	38847844fb	display label on all rows in accounting export	2019-10-07 14:02:47 +02:00
Sylvain	19a125bd67	[bug] accounting export: on subscription + reservation invoice, the subscription item is exported twice	2019-10-07 12:08:08 +02:00
Sylvain	2cc7fb0e44	accounting export: display lable on all lignes	2019-10-02 10:25:06 +02:00
Sylvain	29d6a1daa4	Merge branch 'uvsq' into dev	2019-10-01 14:32:58 +02:00
Sylvain	a7a929ddbc	integration unit test for imports + fixed import result colors in UI + fixed test fixtures	2019-10-01 14:32:30 +02:00
Sylvain	193e81e711	Merge branch 'uvsq' into dev	2019-09-30 15:34:21 +02:00
Sylvain	ba3161589c	update users through CSV import	2019-09-30 12:19:33 +02:00
Sylvain	ff5de97c92	import new users from CSV and view results in app ... TODO: - update users though CSV	2019-09-26 17:05:57 +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	22d4d3a78a	method date_range, test on all_day was never truthy	2019-09-20 15:03:49 +02:00
Sylvain	a7dc3b2431	factorized invoice reference & order number code	2019-09-19 14:59:22 +02:00
Sylvain	2d6f5c3e81	wallet client line in accounting export + factorized accountingExportService	2019-09-19 13:57:33 +02:00
Sylvain	c76563f22f	wallet label in accounting export	2019-09-19 11:25:12 +02:00
Sylvain	f81a2e4343	wallet credit in accounting export	2019-09-19 11:10:26 +02:00
Sylvain	c905d3fbc5	use correct VAT infos in accounting export	2019-09-18 17:25:53 +02:00
Sylvain	cd2c8488c2	Compute the VAT per item in each invoices, instead of globally	2019-09-18 17:14:59 +02:00
Sylvain	02c7cb801f	factorized footprint computation	2019-09-18 15:09:14 +02:00
Sylvain	276a99c068	improved VAT history service + display dates when VAT was enabled in invoice configuration panel + do not render vat row in accouting export if vat was disabled	2019-09-18 13:28:53 +02:00
Sylvain	46c3497c85	ventilate coupon codes on items	2019-09-17 17:39:05 +02:00
Sylvain	1fa36d4029	renamed avoir_mode to payment_method	2019-09-17 14:48:06 +02:00
Sylvain	3348539fdf	export labels: user name + reference + summary, only on client line. Also: handling new export parameters (decimal separator, label length, export zeros)	2019-09-17 12:35:34 +02:00
Sylvain	f06bdaaf21	provide additional settings to export api	2019-09-16 16:31:16 +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	52afb6ef07	[bug] extend a current subscription for a member, does not reset his credits	2019-09-12 11:37:03 +02:00
Nicolas Florentin	3c486e4b93	[Bug] unable to create the first user because role member was missing	2019-09-11 17:11:43 +02:00
Sylvain	f60d19fa27	allow reservations & subscriptions at price of zero	2019-09-11 11:51:04 +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	a96050a2e9	refactor payment process for sca	2019-09-10 11:46:14 +02:00
Nicolas Florentin	f1958a300b	[Bug] unable to create the first user because role member was missing	2019-09-09 14:34:00 +02:00
Sylvain	bebb3354fb	[bug] (#140) VAT rate is erronous in invoices	2019-08-14 10:56:30 +02:00
Sylvain	92d79bc9c7	[bug] (#140) VAT rate is erronous in invoices	2019-08-14 10:54:23 +02:00
Sylvain	13d3197069	prevent existance of unwanted separators + truncate labels	2019-08-01 14:58:10 +02:00
Sylvain	61c1d09ac8	[bug] use vat history while regenerating invoices	2019-08-01 11:29:45 +02:00
Sylvain	38ab06840e	consider vat history in accounting export + [bug] use vat history while regenerating invoices	2019-08-01 11:26:40 +02:00
Sylvain	acacd9a19e	fixed accounting codes interface + fixed csv generation	2019-08-01 10:24:34 +02:00
Sylvain	26c98394ac	fixed export service	2019-08-01 09:49:09 +02:00
Sylvain	e32825675c	[ongoing] fixing accounting export service	2019-07-31 16:52:11 +02:00
Sylvain	a9ea4057f3	interface to customize accounting codes and labels	2019-07-30 16:06:35 +02:00
Sylvain	82ad69d386	handle avoirs	2019-07-30 10:27:47 +02:00
Sylvain	ab295f064d	service to export invoices into a given period to CSV lines for an accounting sofware	2019-07-29 17:51:53 +02:00
Sylvain	5e8697de18	fix invoices list API	2019-07-29 12:19:54 +02:00
Sylvain	0714878bca	[bug] unable to generate a refund	2019-07-29 12:07:22 +02:00
Sylvain	12fcfee71e	[bug] unable to export reservations or subscriptions to excel	2019-07-10 12:25:08 +02:00
Sylvain	38d3ddd48a	[bug] export members list to excel is broken	2019-07-10 11:27:45 +02:00
Sylvain	5cd977b4dd	ruby syntax + may fix #132?	2019-06-13 16:53:36 +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	37b9e3da60	link statistic profile to invoices	2019-06-11 10:02:48 +02:00
Sylvain	818d1357a9	save user cration date in statistic_profile	2019-06-06 16:54:09 +02:00
Sylvain	cfd33c3a52	migrate projects to statistic_profile	2019-06-06 16:34:53 +02:00
Sylvain	35da65b686	change statistic_service to use statistic_profile + use raw sql in migrations	2019-06-06 13:58:49 +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	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	7ed97ef35a	link wallet & its transactions to invoicingprofile	2019-06-03 16:00:09 +02:00
Sylvain	142e07f3c9	update code to use invoicingprofile	2019-05-29 12:01:24 +02:00
Sylvain	ffbca98276	[ongoing] fix api to use the invoicing_profile	2019-05-28 16:49:36 +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