194 Commits

Author	SHA1	Message	Date
Sylvain	336a4b789c	proceed with payment on subscription renewal	2021-10-13 17:39:39 +02:00
Du Peng	6b763cc1c9	improve code for stripe subscription payment	2021-09-10 15:19:04 +02:00
Sylvain	870de2b421	reserve machine button in show machine page	2021-06-18 16:40:39 +02:00
Sylvain	fcdc357f89	required training modal	2021-06-18 16:05:36 +02:00
Sylvain	962f9bc26f	WIP: pending training modal	2021-06-17 17:26:35 +02:00
Sylvain	4ca16c2688	associate plan w/ category	2021-06-08 17:26:40 +02:00
Sylvain	68f64cfc5c	update the card for payment schedules	2021-06-04 18:26:20 +02:00
Sylvain	dc0a75e52d	verify each deadlines on payzen for payment schedules	2021-06-03 12:22:37 +02:00
Sylvain	d6a6d34105	display correct gateway name in payment schedule confirmation modal	2021-06-01 11:24:43 +02:00
Sylvain	81bc22c494	front-end adaptation for interacting with new object[] API ... Also: [bug] handle not onnected users on subscription page - fix showing an error message when no gateway is selected	2021-06-01 11:01:38 +02:00
Sylvain	6bcd9f6fef	Merge branch 'dev' into payzen	2021-05-17 15:07:41 +02:00
Sylvain	436db80ccf	Increased the width of the input field for the prices of the events ... This is especially useful for currencies like FCFA that have large numbers and large currency symbol	2021-05-12 15:16:10 +02:00
Sylvain	2a7a7fd614	[bug] the event themes are not kept when editing the event again	2021-05-12 14:54:56 +02:00
Sylvain	23e38238c8	fix payment on site modal in case of payment schedule	2021-04-28 17:25:42 +02:00
Sylvain	d70d0dcf7a	stripe modal -> generic payment modal	2021-04-08 15:21:24 +02:00
Sylvain	a74c5d4c95	WIP: plan description	2021-03-03 17:21:11 +01:00
Sylvain	592bf7302d	fix translation	2021-02-23 11:43:35 +01:00
Sylvain	9609d96fc3	adjust payment schedule table to usage by admins & members	2021-02-10 10:03:04 +01:00
Sylvain	0e7226c85c	handle stripe requires_action	2021-02-08 15:28:47 +01:00
Sylvain	26636254bd	generate the invoices for each schedule item and notify if something goes wrong	2021-01-25 13:05:27 +01:00
Sylvain	dc00df4afc	fix stripe subscription w/ coupon + wallet	2020-12-30 12:19:33 +01:00
Sylvain	c3c881d2a8	process the schedule to the stripe subscription ... - only for subscriptions for now - TODO: reservations (see app/services/reservations/reserv.rb:13)	2020-12-09 16:47:51 +01:00
Sylvain	1d64c517c9	create stripe's paymentIntent ... associate the paymentMethod (the card) with the customer (the user) for futur usages in subscriptions	2020-12-08 12:26:03 +01:00
Sylvain	f5709ef60e	get stripe payment method	2020-11-25 17:13:45 +01:00
Sylvain	6abee0cea0	define payment method before validating schedule	2020-11-18 16:01:05 +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	a321771040	user consent about payment schedule	2020-11-10 09:51:13 +01:00
Sylvain	2af6c8b9cc	style fix	2020-11-09 15:22:22 +01:00
Sylvain	0fe4f13110	component to display the payment schedule	2020-11-05 17:32:37 +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	5f93e6d3be	plan creation: set if it allows monthly payments	2020-10-27 13:06:37 +01:00
Sylvain	57b76d156b	Alert before cancelling a reservation that credits will be lost	2020-09-29 12:03:13 +02:00
Sylvain	8945dbfb39	[bug] unable to create a subscription plan for only one group	2020-09-23 15:28:20 +02:00
Sylvain	a3c6560833	wording	2020-06-24 11:11:14 +02:00
Sylvain	bafef4e5f1	corrected wording	2020-06-24 10:52:59 +02:00
Sylvain	5f7287cec7	Ask for confirmation before booking a slot for a member without the required tag	2020-05-06 15:32:40 +02:00
Sylvain	fc0f153e8a	fixed strings	2020-04-20 10:20:42 +02:00
Sylvain	1115ba064b	fixes some translation	2020-03-11 14:45:58 +01:00
Sylvain	e44499d7ee	fixed some translations	2020-03-11 10:04:32 +01:00
Sylvain	2c1dbd4d82	[ongoing] help modal	2020-03-10 16:38:29 +01:00
Sylvain	bb752f1218	refactor translations to work with crowdin pull requests	2020-03-09 11:47:18 +01:00
Sylvain	6aafd0c7e1	add missing translations	2020-03-03 18:06:19 +01:00
Sylvain	5765e3d2e4	move availability options to new step + wording	2020-03-02 16:52:54 +01:00
Sylvain	a44bf85014	Merge branch 'slot_is_only_subscriptions' into dev	2020-03-02 16:27:26 +01:00
Sylvain	07b21f5094	Merge branch 'book_slot_at_same_time' into dev	2020-03-02 15:52:05 +01:00
Sylvain	7b955f616e	fix i18n syntax + missing transaltion	2020-02-24 15:25:15 +01:00
Du Peng	b559d10b87	improve slot is only subscription	2020-02-12 12:58:17 +01:00
Sylvain	372d7f936b	typos & syntax	2020-02-11 11:46:40 +01:00
Sylvain	392ddc6aa5	wording	2020-02-11 11:01:24 +01:00
Du Peng	74cc69d1bd	Ability to configure reservation slot restrict for plans	2020-02-07 17:37:00 +01:00
Du Peng	7c86adde4b	Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time	2020-02-05 16:53:47 +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
Sylvain	d4f7ff3603	fixes comments syntax for crowdin compat	2019-12-24 11:47:31 +01:00
Sylvain	ff8319b166	harmonize front translations in english with new model	2019-12-18 14:35:29 +01:00
Sylvain	c565d9ff2b	unified front-end i18n interpolations syntax to messageformat	2019-12-16 10:16:11 +01:00
Sylvain	510c802ab1	messages variations depending on slot duration	2019-12-09 10:27:50 +01:00
Sylvain	22251e6516	summary screen ... TODO: eventModal.html.erb:167	2019-11-12 16:28:10 +01:00
Sylvain	aef4cc49f2	fixes accounting codes setting + improved error handling	2019-09-17 13:00:25 +02:00
Sylvain	539eb08b89	ability to disable the online payments through an env var	2019-09-11 17:08:00 +02:00
Sylvain	04f17d44d8	handle sca in js frontend	2019-09-10 12:46:02 +02:00
Sylvain	e9e27663cd	quick coding rules checking with rubocop	2019-09-09 18:04:31 +02:00
Sylvain	967f539ad9	[ongoing] update to stripe-js:v3 to use strong customer authentication	2019-09-04 17:20:18 +02:00
Sylvain	43ff06c35d	fixed and improved translations	2019-04-18 11:35:09 +02:00
Sylvain	b9e7276394	fix missing translation	2019-01-16 12:08:27 +01:00
Sylvain	a2eb10331e	[ongoing] remove invoicing disabled per user	2019-01-10 16:50:54 +01:00
Sylvain	9fe828f51c	improved translations	2019-01-02 17:11:18 +01:00
Sylvain	12c6cd2a70	Merge branch 'siteswapjuggler-master' into dev ... also: align translations and mark missings	2017-11-20 11:43:40 +01:00
Sylvain	1c8d362f11	ability to disable space	2017-10-11 14:58:38 +02:00
Sylvain	05d9e62dd2	ability to disabled training	2017-10-10 17:16:43 +02:00
Sylvain	40bf22279e	add warning on plan disabling	2017-10-05 15:44:06 +02:00
Sylvain	26d79e5b12	disable a plan	2017-10-04 18:56:39 +02:00
Sylvain	2ccc9e9dbd	[bug] missing translation for EN and PT	2017-08-24 12:46:58 +02:00
Sylvain	5abc85ae0a	[feature] weekly plans	2017-03-21 13:06:02 +01:00
Sylvain	71a3c8b41f	pluralize selection helper in cart	2017-02-22 16:53:58 +01:00
Sylvain	c2c400107d	improved tag management in cart	2017-02-22 11:23:32 +01:00
Sylvain	ce087ae778	refacto wording to make cart reservableType agnostic	2017-02-22 10:51:07 +01:00
Sylvain	7a21a907a8	offer slot from cart + [ongoing] refacto cart translations	2017-02-22 09:44:15 +01:00
Sylvain	a463ad6a2a	[ongoing] refacto cart translations	2017-02-21 17:45:53 +01:00
Sylvain	42819b18cb	refactor plan form translations mapping	2017-02-14 16:19:10 +01:00
Sylvain	0adb9e29c6	space edition interface	2017-02-14 13:36:10 +01:00
Sylvain	da95e6e0d8	space creation interface	2017-02-14 11:28:07 +01:00
Sylvain	b44089a33d	interface & api to build avoir for a wallet credit	2016-12-12 14:20:26 +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	0a08c4c32d	check cash coupons does not exceed cart amount for subscriptions	2016-11-24 16:38:22 +01:00
Sylvain	04e10c8bb6	check cash coupons does not exceed cart amount for trainings & machines	2016-11-24 13:58:41 +01:00
Sylvain	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +01:00
Kenneth Lim	18bc37749b	locale: informations --> information ... Not sure if this helps but information does not require an `s`. :) Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>	2016-10-07 17:11:58 +08:00
Sylvain	fc747c55c7	wallet credit confirmation	2016-09-29 13:02:24 +02:00
Sylvain	36524d4cd9	display list of allowed extensions in project's CAD attachments	2016-09-27 14:08:04 +02:00
Sylvain	13f416a101	[sso] save and restore field data mapping	2016-09-15 15:58:21 +02:00
Sylvain	ee333df53f	improved transformation interface	2016-09-14 18:54:53 +02:00
Sylvain	77626aa674	[SSO] interface for transforming boolean and dates datatypes	2016-09-14 18:52:18 +02:00
Sylvain	50543b8d09	[sso] give informations about the expected data in sso mapping	2016-09-14 16:41:45 +02:00
Sylvain	9aef331596	add textual indications about empty fields in coupon form	2016-09-01 14:54:24 +02:00
Sylvain	4f41aa6554	event custom prices: various fixes and removed artifacts	2016-08-30 13:07:47 +02:00
Sylvain	60a8f60be8	display custom prices in events index	2016-08-29 17:33:21 +02:00