Du Peng
5f8f6a8e6b
update translates
2022-05-12 15:06:06 +02:00
vincent
abf101178b
Adjust texts on admin settings about
2022-05-12 10:47:28 +02:00
Du Peng
798941c349
edit organization custom field in member's dashboard profile
2022-05-11 16:57:44 +02:00
Du Peng
3e34b3c7a7
add user validation required setting, user proof of identity upload and organization custom field
2022-05-11 16:57:44 +02:00
Sylvain
1d2b814d6f
(ui) react component to change user's group
2022-05-11 14:37:39 +02:00
Sylvain
302c55755e
(ui) admin edit user: use new user-profile-form component
2022-05-10 10:23:43 +02:00
Sylvain
69d595e9f6
(ui) use user-profile-form in profile completion screen
2022-05-09 12:11:37 +02:00
Sylvain
9b22286327
Merge remote-tracking branch 'origin/socials-refacto' into profile-form
2022-05-04 15:53:22 +02:00
vincent
521229b87b
Add form validation
2022-05-04 14:57:31 +02:00
Sylvain
048ed4b644
(ui) user profile form: confirmation message + save button
2022-05-04 14:12:49 +02:00
Sylvain
cad8484231
(ui) profile data: website, job, cad softwares, interests
2022-05-04 14:12:48 +02:00
Sylvain
d62cb0ac54
(ui) add profile data to user-profile-form
2022-05-04 14:12:48 +02:00
Sylvain
6955a4bba1
(ui) stylized form-switch
2022-05-04 14:12:48 +02:00
Sylvain
c1bf5bee14
(wip)(ui) refactor user edition form
2022-05-04 14:07:12 +02:00
Sylvain
63b03568e4
(i18n) reorganize translations per components
2022-05-04 12:27:48 +02:00
Sylvain
073b0c8eae
(ui) add tooltip to FormInput
...
+ add tooltip for auth_provider/mappings/API field input
2022-05-04 12:27:48 +02:00
Sylvain
04ae91a7d1
(ui) improve the appeareance for the auth provider definition form
2022-05-04 12:27:46 +02:00
Sylvain
470a8284ff
(ui) sso data mapping - by type
2022-05-04 12:27:12 +02:00
Sylvain
e51e2d63cb
(wip)(ui) type mapping ui
2022-05-04 12:26:42 +02:00
vincent
1868be1642
Add labels
2022-05-04 11:20:19 +02:00
vincent
3f4714861b
Add description to plan category
2022-05-04 11:16:51 +02:00
vincent
7461f6d1d5
(wip) show and edit social networks
2022-05-04 10:21:05 +02:00
Sylvain
654f0880a0
(ui) user profile form: confirmation message + save button
2022-05-03 16:45:06 +02:00
Sylvain
7a6fe34b90
(ui) profile data: website, job, cad softwares, interests
2022-05-02 15:29:32 +02:00
Sylvain
58f823518f
(ui) add profile data to user-profile-form
2022-04-27 16:24:26 +02:00
Sylvain
6be3a4c324
(ui) stylized form-switch
2022-04-27 15:36:36 +02:00
Sylvain
aa432d08b3
(wip)(ui) refactor user edition form
2022-04-26 18:05:18 +02:00
Sylvain
ecc7565346
(i18n) reorganize translations per components
2022-04-12 13:54:47 +02:00
Sylvain
e91fa00afc
(ui) add tooltip to FormInput
...
+ add tooltip for auth_provider/mappings/API field input
2022-04-12 12:12:04 +02:00
Sylvain
4da6a5fa72
(ui) improve the appeareance for the auth provider definition form
2022-04-11 16:12:13 +02:00
Sylvain
d542292dbf
(ui) sso data mapping - by type
2022-04-11 13:19:07 +02:00
Sylvain
6ac3ad4373
(wip)(ui) type mapping ui
2022-04-06 17:14:23 +02:00
Du Peng
08b072e33c
Fix a bug: unable to show machine availability slot for admin
2022-04-05 14:21:19 +02:00
vincent
f25fdd4091
merge
2022-04-01 17:48:32 +02:00
vincent
c16150d7cc
Add labels
2022-03-28 17:58:35 +02:00
Sylvain
0c51aff748
(feat) OAuth2 scopes are now configurable from the interface
...
Previously, scopes were supported through OAUTH2_SCOPE since v5.3.1.
BREAKING CHANGE: update your oauth2 provider configuration if you need scopes support
2022-03-22 16:40:09 +01:00
vincent
9d7c890f63
Remove gender variable use on locales
2022-03-10 10:01:21 +01:00
vincent
719c1abd63
Add description to plan category
2022-02-03 15:32:02 +01:00
Sylvain
c031f099a5
Merge branch 'oauth2' into dev
2022-01-17 12:46:07 +01:00
Sylvain
634da414f8
(feat) When a payment schedule is in error or canceled, ability to re-enable it with another payment method
2022-01-17 12:38:53 +01:00
Sylvain
d8f27f0b1a
reactored payment-schedules-table to extract buttons to payment-schedule-item-actions
2022-01-17 10:51:27 +01:00
Sylvain
f647ebd9e0
When a payment schedule was canceled by the payment gateway, inform the user in the interface
...
TODO: send an in-system notification and an email notification
+ refactor payzen/service and stripe/service to extract notification sending
+ send notifications on state=error
+ in the interface: open a modal dialog to allow the admin to choose an action (cancel/continue by check/continue by transfer)
+ refactor the payment-schedule-tables.ts to extact the item-line logic (the component is getting too big)
2022-01-05 17:16:25 +01:00
Sylvain
9922812111
Ability to select "bank transfer" as the payment mean for a payment schedule
2022-01-05 15:58:33 +01:00
Sylvain
c91e825496
[bug] minamed sso perperty
2021-12-20 14:10:44 +01:00
Sylvain
3a787ea2a0
support for JSONPath syntax in oAuth2 mapping
2021-12-20 13:40:55 +01:00
Sylvain
4a59f6faed
[bug] invalid text shown when a member confirms a free cart
2021-10-22 15:43:33 +02:00
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
