1695 Commits

Author	SHA1	Message	Date
Sylvain	1e43dc9518	show indicator while the payment is pending	2020-12-07 12:58:15 +01:00
Sylvain	0d0bf473af	see TODOs (stripe-modal.tsx, machines.js.erb)	2020-12-02 17:28:14 +01:00
Sylvain	5941446a72	fixes for card payment	2020-12-02 14:28:41 +01:00
Sylvain	6c39191efa	allow payment with stripe-modal react component	2020-12-02 10:06:18 +01:00
Sylvain	4ca2299776	WIP: using <stripe-modal> in cart directive	2020-12-01 17:55:23 +01:00
Sylvain	9813c5d27b	style payment modal	2020-11-30 16:52:55 +01:00
Sylvain	f5709ef60e	get stripe payment method	2020-11-25 17:13:45 +01:00
Sylvain	7d0abebc22	WIP: stripe modal	2020-11-24 16:26:18 +01:00
Sylvain	1e5f7ea1fd	WIP: refactor stripe payment modal to react + do not user angular in react component (use Intl instead)	2020-11-24 13:26:15 +01:00
Sylvain	b88c1009db	WIP: create react component to collect card data	2020-11-23 17:36:33 +01:00
Sylvain	34a9084501	pass payment method to the ruby service	2020-11-23 11:48:44 +01:00
Sylvain	6abee0cea0	define payment method before validating schedule	2020-11-18 16:01:05 +01:00
Sylvain	a56112a47f	using stripe api	2020-11-17 16:23:55 +01:00
Sylvain	d3d2434654	fix CHANGELOG + fix modal links colors	2020-11-17 09:15:27 +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	881f8d3efb	[bug] unable to create a coupon on stripe	2020-11-16 14:24:36 +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	9d2dc65958	pay reservation only from cart	2020-11-10 11:57:45 +01:00
Sylvain	a321771040	user consent about payment schedule	2020-11-10 09:51:13 +01:00
Sylvain	2ab7f3bdb9	handle only subscription process in cart	2020-11-10 08:54:52 +01:00
Sylvain	789c6a28fe	handle subscription creation only from the cart	2020-11-09 16:54:20 +01:00
Sylvain	2af6c8b9cc	style fix	2020-11-09 15:22:22 +01:00
Sylvain	0c456b153e	use FabModal component to display ful schedule	2020-11-09 15:17:38 +01:00
Sylvain	0fe4f13110	component to display the payment schedule	2020-11-05 17:32:37 +01:00
Sylvain	0e503e734e	select-schedule component	2020-11-05 15:30:25 +01:00
Sylvain	7833b0924b	add other cart items to the first schedule	2020-11-05 14:55:06 +01:00
Sylvain	2fc9fd4028	show subscription summary in cart payment modal	2020-11-05 09:57:38 +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	506d9dd5fb	typo	2020-11-02 16:50:23 +01:00
Sylvain	f2c81a634a	using the <plan-card> component in embedded plans view	2020-11-02 13:37:58 +01:00
Sylvain	187cb9f06d	replace modules.* by .modules.* for more secure access	2020-11-02 13:36:17 +01:00
Sylvain	d4ce5b7dd0	[bug] warning message overflow in credit wallet modal	2020-11-02 13:22:32 +01:00
Sylvain	7776fe13d6	[bug] unable to access embedded plan views	2020-11-02 13:18:31 +01:00
Sylvain	7084e88d2d	display monthly price for compatible plans	2020-11-02 12:29:08 +01:00
Sylvain	465fe8e913	show link to pdf in component	2020-11-02 11:16:13 +01:00
Sylvain	408531d13a	use i18next instead of angular-translate for react components	2020-11-02 11:07:08 +01:00
Sylvain	14091f547e	parse multiple scss files for theme	2020-10-29 16:11:19 +01:00
Sylvain	6eebd61e3c	[bug] unable to build homepage custom stylesheet	2020-10-29 15:58:24 +01:00
Sylvain	4f877ab05d	react coponent: plan-card + extracted scss from stylesheet.rb into themes/	2020-10-29 15:53:29 +01:00
Sylvain	f5687f1120	WIP: refactoring of plan card	2020-10-28 17:02:22 +01:00
Sylvain	2b014304ce	WIP: plan card	2020-10-28 14:23:27 +01:00
Sylvain	571a273ea2	using typescript for all components	2020-10-28 13:35:31 +01:00
Sylvain	106d8be4c8	Merge branch 'dev' into monthly-payment	2020-10-28 12:11:49 +01:00
Sylvain	1699bbf143	[bug] theme primary color is ignored on links	2020-10-28 12:10:25 +01:00
Sylvain	ddd2b252ab	fix caret color	2020-10-28 10:27:59 +01:00
Sylvain	ccd3e93428	fix about link color	2020-10-28 10:03:04 +01:00
Sylvain	44525f9bad	Merge branch 'dev' into monthly-payment	2020-10-28 09:53:28 +01:00
Sylvain	84fc81e618	Display a message when no plans are available	2020-10-28 09:53:11 +01:00
Sylvain	bf76157703	Initialize new plans with default prices for machines & spaces	2020-10-28 09:24:31 +01:00
Sylvain	85a1cc99cf	Merge branch 'dev' into monthly-payment	2020-10-28 08:54:09 +01:00
Sylvain	79b49778a4	[bug] public cards presenting the plans in the public area, have bogus style	2020-10-28 08:52:42 +01:00
Sylvain	a9cc0b391b	save products and prices to stripe for each plans	2020-10-27 16:46:38 +01:00
Sylvain	6be51feeb2	save stp_price_id for each plan	2020-10-27 16:03:20 +01:00
Sylvain	840be2c6c0	renamed RepaymentSchedule to PaymentSchedule	2020-10-27 16:02:41 +01:00
Sylvain	5f93e6d3be	plan creation: set if it allows monthly payments	2020-10-27 13:06:37 +01:00
Sylvain	52f3bd956f	database structure for payment schedule	2020-10-27 11:32:20 +01:00
Sylvain	a72473f0b6	added typescript + hmr	2020-10-27 09:41:16 +01:00
Sylvain	dc844bb10c	Enlarged privacy policy display and edition zones	2020-10-26 16:52:05 +01:00
Sylvain	c3139307bc	[bug] in the settings area, boolean switches are always shown as false	2020-10-26 16:38:17 +01:00
Sylvain	a2d885f447	[bug] members cannot view available trainings slots	2020-10-23 13:08:52 +02:00
Sylvain	01524da0ab	[bug] unable to display details about a closed period	2020-10-23 12:09:36 +02:00
Sylvain	c87adde6f6	[bug] unable to set libraries locales to their default values (en-us)	2020-10-23 11:53:18 +02:00
Sylvain	c7a8668fd6	architecture changes to allow including React.js components into the application	2020-10-21 15:07:01 +02:00
Sylvain	2227a59275	[bug] unable to rename a group containing users	2020-10-20 15:52:14 +02:00
Sylvain	b5a4e724e8	[bug] email notification after reservation update have wrong previous date (#234)	2020-10-20 15:14:11 +02:00
Sylvain	24e6736f51	fix change space/machine reservation	2020-10-20 14:53:00 +02:00
Sylvain	9187132682	fix placeholder logo in notification mailer	2020-10-20 10:18:27 +02:00
Sylvain	c5ee1ac120	fix translation	2020-10-20 10:01:27 +02:00
Sylvain	f9f21c1496	fix missing fontAwesome icons	2020-10-20 09:53:05 +02:00
Sylvain	61d3fcdb0a	webpack fixes ... - add missing annotation for esFactory - removed unused dependency for diacritics service - removed google_plus from social networks: not relevant anymore - eslinted services syntax	2020-10-19 15:49:17 +02:00
Sylvain	353ca1f291	remove uneffective erb comments	2020-10-19 15:30:07 +02:00
Sylvain	2bbbe8c7d2	change configuration of auto-ngtemplate-loader to use absolute path	2020-10-19 14:40:18 +02:00
Sylvain	875c7a6df8	WIP: correct angualrJS templates path for production build ... see: https://github.com/WearyMonkey/ngtemplate-loader	2020-10-12 09:00:22 +02:00
Sylvain	585f01b671	compile angular-ui-tour from the sources	2020-10-07 16:37:01 +02:00
Sylvain	c30e096e53	fix loading ui-tour with webpack	2020-10-07 10:25:27 +02:00
Sylvain	6d00d03f8e	replace method raw by html_safe ... https://stackoverflow.com/questions/19633877/undefined-method-raw-for-controller-for-rails-4	2020-10-06 12:44:05 +02:00
Sylvain	c1564d5eae	Merge branch 'webpacker' into dev	2020-10-05 17:52:46 +02:00
Sylvain	4f5f54a66a	moved locales files into the main application pack	2020-10-05 17:42:49 +02:00
Sylvain	512411eb04	fix angular-bootstrap-switch	2020-10-05 17:22:59 +02:00
Sylvain	be9dfe4ff5	fix angular-ui-tour templates url	2020-10-05 15:34:41 +02:00
Sylvain	6fa9347c75	fix training reservation calendar	2020-10-05 12:54:37 +02:00
Sylvain	d701260fae	fix spaces reservation calendar	2020-10-05 12:12:22 +02:00
Sylvain	5a0185dd48	fix machine reservation calendar	2020-09-30 16:32:01 +02:00
Sylvain	f6183dbafb	fix public calendar filter	2020-09-30 11:59:50 +02:00
Sylvain	c0a46e5bf1	fix public calendar	2020-09-30 11:45:44 +02:00
Sylvain	495a4686d5	load fullcalendar locale	2020-09-30 11:37:55 +02:00
Sylvain	8ee91ef7d5	fixes fullCalendar for admin agenda	2020-09-30 11:23:42 +02:00
Sylvain	5caceec57b	WIP: debug fullcalendar with webpack ... see https://stackoverflow.com/questions/44220534/uncaught-typeerror-cannot-read-property-hastime-of-undefined	2020-09-29 16:22:34 +02:00
Sylvain	8cc0d30ee9	fix fontawesome left arrows	2020-09-29 14:35:42 +02:00
Sylvain	fe88f3ba0f	fix fontawesome with holder.js	2020-09-29 14:27:49 +02:00
Sylvain	57b76d156b	Alert before cancelling a reservation that credits will be lost	2020-09-29 12:03:13 +02:00
Sylvain	13bc5334cc	ability to configure until when the events are shown on the home page	2020-09-29 09:39:32 +02:00
Sylvain	30b3a794d3	[bug] managers cannot see passed events	2020-09-29 08:40:07 +02:00
Sylvain	62e45dc998	Updated fullCalendar to 2.9.1 ... + fix using moment-timezone with webpack	2020-09-28 17:33:18 +02:00
Sylvain	e68397d0c5	Updated bootstrap-switch to 3.4.0	2020-09-28 16:30:07 +02:00
Sylvain	253fb21940	updated jquery-minicolors to 2.3.5	2020-09-28 14:51:45 +02:00