Sylvain
98b1919de2
Make the username column optionnal ( #375 )
2022-07-27 09:59:23 +02:00
Sylvain
be5b6af3f1
Merge pull request #375 from Guichaguri/feat/add-admin-member-usernames
...
Add username column to the member list
2022-07-27 09:32:45 +02:00
Sylvain
df0b5628b3
(bug) canceled trainings are still shown on the public profile page
2022-07-26 17:55:45 +02:00
vincent
783e43f3a4
Fix user porfil bio's link display
2022-07-25 15:33:33 +02:00
Sylvain
29b9399ca3
(bug) unable to reserve event
2022-07-20 15:54:04 +02:00
Sylvain
2bd84e623a
(bug) missing translations
2022-07-20 15:27:01 +02:00
Sylvain
d26e2ae313
(bug) fix various issues due to slots behavior refactoring
2022-07-19 11:32:12 +02:00
Sylvain
37b24a8d2f
refactor slots model
2022-07-18 17:18:01 +02:00
Guilherme Chaguri
d63b8d0dfa
Add username column to the member list
2022-07-14 16:11:44 -03:00
vincent
272e105f5a
Fix page title's layout
2022-07-11 11:33:31 +02:00
Sylvain
6719469e76
(doc) add more description about the members import feature #364
2022-06-29 16:41:58 +02:00
Sylvain
9b601bc438
(feat) show reservations panel
2022-06-29 15:34:04 +02:00
Sylvain
ea1883e406
factorize front-end API params helper
2022-06-29 15:34:04 +02:00
Sylvain
dac0acbf03
(feat) removed the admins' button to scroll to the featured event
2022-06-28 11:22:17 +02:00
Sylvain
d03a34b894
(bug) unable to update the user profile after toggling the organization switch twice
2022-06-22 17:14:19 +02:00
Sylvain
a131998aa1
Merge branch 'lint-rules' into dev
2022-06-22 14:19:37 +02:00
Sylvain
89c610514d
fix styling issues + rename proof of identity
2022-06-22 14:18:33 +02:00
Sylvain
7f1cc92c43
linted supporting-documents/*
2022-06-22 13:01:22 +02:00
Sylvain
4d6af2c1c0
(wip) linting supporting-documents (ex proof-of-identify)
...
remaining: type-form, type-modal, types-list
2022-06-21 17:49:04 +02:00
Sylvain
c0d5da55ce
linted all code expected profile-custom-fields/* and proof-of-identity/*
2022-06-21 12:10:00 +02:00
Sylvain
4a8d8796a3
(wip) lint for scoped-translation
2022-06-20 18:06:15 +02:00
vincent
f40f80dd1f
Fix canceled event label's translation
2022-06-15 13:48:42 +02:00
vincent
ed34279cef
unable non-required [text-setting]
2022-06-15 13:35:46 +02:00
Sylvain
3b63ffa532
(bug) fix events list display
2022-06-15 12:29:44 +02:00
Sylvain
503ae22c0b
(feat) admins can scroll to the featured event
2022-06-15 12:26:44 +02:00
Sylvain
96c825769c
(wip) fix events style: no more 3 in rows
2022-06-15 12:00:05 +02:00
Sylvain
31fe9dea05
(feat) feature the next event in the event page
2022-06-15 10:55:08 +02:00
Sylvain
a8ca94ce32
(bug) times are not shown in admin/events monitoring page
2022-06-15 09:59:19 +02:00
Sylvain
48e1cf782f
(bug) unable to edit an event
2022-06-15 09:42:39 +02:00
Sylvain
61080a5188
(feat) feature the first event
2022-06-14 17:50:04 +02:00
vincent
103bf80e81
Standardize card layout
2022-06-14 16:44:26 +02:00
vincent
f30c501948
(wip) React component [EventCard]
2022-06-14 16:44:26 +02:00
vincent
fcfa9513e8
(wip) React component [EventCard]
2022-06-14 16:44:24 +02:00
Du Peng
4d3fe6aa2a
Fix a bug: if multi VAT no value is filled in, the general rate can't apply
2022-06-01 12:41:19 +02:00
vincent
b45b0ed942
Move calendar header's buttons on the left
2022-06-01 09:33:15 +02:00
Sylvain
931e19b331
(bug) hide create account links when public registrations disabled
2022-05-30 14:19:32 +02:00
Du Peng
8d724d7191
Fix a bug: unable to sign up if admin actived organization's additional fields with required
2022-05-27 11:37:31 +02:00
Du Peng
7067757f38
Disable to clicking outside or pressing escape to close sign up modal
2022-05-20 15:58:49 +02:00
Du Peng
e3d2b53767
Fix a bug: when machines module disabled, Associated machines is still shown in trainings list
2022-05-13 12:24:52 +02:00
Du Peng
4d9da0c5f9
hide machines list in edition of training if machines module is disabled
2022-05-12 12:51:52 +02:00
Du Peng
88dc91bcaf
fix bug: machine module/statistic module setting style
2022-05-12 12:14:34 +02:00
Du Peng
c46a2ba085
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2022-05-12 11:43:18 +02:00
Du Peng
3e95960903
fix bug: organization custom field requred
2022-05-12 11:25:40 +02:00
vincent
abf101178b
Adjust texts on admin settings about
2022-05-12 10:47:28 +02:00
Sylvain
3fd20cd57d
(bug) unable to validate account
2022-05-11 18:06:49 +02:00
Du Peng
655f75a394
fix bug: can update machines_module, user_change_group option setting
2022-05-11 16:57:44 +02:00
Du Peng
c719dccd31
add an alert info for modification of fields of organization
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
e45872956c
(ui) Option to prevent users from changing their group
2022-05-11 15:45:49 +02:00
Sylvain
1d2b814d6f
(ui) react component to change user's group
2022-05-11 14:37:39 +02:00
Sylvain
ac1d518ddc
(ui) option to disable the machines module
2022-05-11 11:54:00 +02:00
Sylvain
0e8230af48
(ui) use user-profile-form in admin/members/new
2022-05-10 11:18:33 +02:00
Sylvain
302c55755e
(ui) admin edit user: use new user-profile-form component
2022-05-10 10:23:43 +02:00
Sylvain
040858ac1f
(ui) refactored profile-completion screen to use more accurate messages
2022-05-09 14:58:26 +02:00
Sylvain
69d595e9f6
(ui) use user-profile-form in profile completion screen
2022-05-09 12:11:37 +02:00
Sylvain
c5ef505008
(bug) social icons & avatar not shown
2022-05-04 16:17:05 +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
11491aeb6c
(ui) save profile editions to the API
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
0d09ddd2fa
(wip)(ui) user edition form
2022-05-04 14:05:36 +02:00
Sylvain
70803ee41b
(api) validate auth providers data
...
+ remove legacy code
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
bf148dd14b
(wip) rhf select
2022-05-04 12:17:21 +02:00
Sylvain
b4e53d2039
(db) table to save OpenID connect configuration
...
Also refactored OAuth2Mapping to allow usage with any types of providers
2022-05-04 12:16:38 +02:00
Sylvain
e28c8ab2e9
(front) add is-empty class to the calendar-admin-info side panel if no events are selected
2022-05-04 12:16:38 +02:00
vincent
ca9a564474
Make calendar wider
2022-05-04 12:16:36 +02:00
vincent
cb5dd953ea
Edit and display fab's social networks
2022-05-04 10:25:25 +02:00
vincent
5024037ce6
(wip) fab-socials
2022-05-04 10:25:15 +02:00
vincent
e15082a2ef
Fix social networks list position
2022-05-04 10:21:37 +02:00
vincent
bf380c45d4
Adjust styles and icons
2022-05-04 10:21:37 +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
b801999ee3
(ui) save profile editions to the API
2022-05-02 16:29:04 +02:00
Sylvain
aa432d08b3
(wip)(ui) refactor user edition form
2022-04-26 18:05:18 +02:00
Sylvain
b4ae80457e
(wip)(ui) user edition form
2022-04-25 17:24:28 +02:00
Sylvain
0dd6f4bff5
Merge branch 'openid' into v5.4
2022-04-25 15:43:03 +02:00
Sylvain
c77e6c8a65
(front) add is-empty class to the calendar-admin-info side panel if no events are selected
2022-04-12 17:22:47 +02:00
Du Peng
b277022f6f
Set invoice reference is required
2022-04-12 17:17:39 +02:00
vincent
78be7bb276
Make calendar wider
2022-04-12 15:54:12 +02:00
Sylvain
d2c90f4066
(api) validate auth providers data
...
+ remove legacy code
2022-04-11 17:27:56 +02:00
Sylvain
4da6a5fa72
(ui) improve the appeareance for the auth provider definition form
2022-04-11 16:12:13 +02:00
Du Peng
18c17cc93c
Fix a bug: form maxlength count to exclude spaces and newline
2022-04-07 15:22:54 +02:00
Du Peng
08b072e33c
Fix a bug: unable to show machine availability slot for admin
2022-04-05 14:21:19 +02:00
Sylvain
431d733ffe
(wip) rhf select
2022-04-04 18:19:59 +02:00
Sylvain
8495e2a7a0
(db) table to save OpenID connect configuration
...
Also refactored OAuth2Mapping to allow usage with any types of providers
2022-04-04 16:24:27 +02:00
Sylvain
2fcda8a0ce
(feature) Prepaid-packs purchases are exported to the accounting CSV file
2022-03-23 13:14:34 +01: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
Sylvain
49dd0d2dab
(bug) a sentence was not linked to a translation key
2022-03-08 15:48:06 +01:00
Sylvain
28489e112c
renamed PaymentModal to CardPaymentModal
2022-01-18 16:27:12 +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
036f9df35f
Specilized VAT rate cannot be defined unless the VAT is enabled and saved
2022-01-12 15:30:54 +01:00
Sylvain
cb6a3a00b6
(bug) the switch to enable/disable the VAT does not reflect the current state of the VAT
2022-01-12 15:17:08 +01:00
Sylvain
8a149bb947
(bug) some links redirect to the home page instead of triggering the requested action
2022-01-11 11:03:27 +01:00
vincent
f15907c405
Merge branch 'dev' into wip-demo-update
2022-01-07 08:23:34 +01:00
Sylvain
e1256ec551
Ability to disable public account creation
2022-01-04 15:27:58 +01:00
Sylvain
00b9bce587
export collected VAT by rate
2021-12-29 17:00:54 +01:00
Sylvain
16242d2127
frontend invoice configuration page uses multiVAT
2021-12-29 12:08:50 +01:00
Du Peng
6019767a3b
update multi VAT
2021-12-28 13:45:29 +01:00
vincent
c3cbc26a1e
Merge branch 'spaces_multiprices_front' into spaces_multiprices
2021-12-21 17:14:22 +01:00
Sylvain
ffb0f3e19e
ability to limit extended prices to slots in the same day
2021-12-21 16:32:02 +01:00
vincent
d6a4675209
wip
2021-12-21 14:37:38 +01:00
vincent
f8798e28b5
Convert [spaces] to React
2021-12-20 19:12:01 +01:00
Sylvain
3a787ea2a0
support for JSONPath syntax in oAuth2 mapping
2021-12-20 13:40:55 +01:00
vincent
163e56d2f2
Add minor style adjustments for the demo
2021-12-03 18:25:25 +01:00
Sylvain
840c536c75
Ability to configure data sources for preventing booking on overlapping slots
2021-10-22 14:50:02 +02:00
Sylvain
36086f93df
[WIP] ability to select categories of slots for computing overlapping slots
2021-10-21 18:09:36 +02:00
Sylvain
7ffcd68fb7
[bug] canceled training reservation in admin/edit member
2021-10-21 10:31:21 +02:00
Sylvain
2d61dac9cc
refactored admin takes subscription for a member
2021-10-19 12:24:41 +02:00
Sylvain
4c56dffc04
remove deprecated code and endpoints
2021-10-18 10:15:48 +02:00
Sylvain
fd39eaf2f1
fix renew subscription API
...
TODO:
- remove old endpoints
- bug in UI (start date invalid)
- fix tests
- payzen
2021-10-15 17:31:01 +02:00
Sylvain
336a4b789c
proceed with payment on subscription renewal
2021-10-13 17:39:39 +02:00
Sylvain
6cd91d0291
[WIP] refactor renew subscription modal
2021-10-12 17:29:35 +02:00
Sylvain
17a0baac7e
refactored free subscription extending
2021-10-12 14:07:35 +02:00
Sylvain
70f0e21543
move free extend modal to react
2021-10-11 18:50:53 +02:00
Sylvain
e646eb8cb5
extend subscription UI
2021-10-08 19:14:47 +02:00
Sylvain
a3f680964c
handle stripe errors while local payments
2021-10-07 16:43:51 +02:00
Sylvain
3769afe431
Merge branch 'editor_xss_vulnerability' into dev
2021-10-04 09:31:34 +02:00
Ismaël Sebbane
2c0b981c90
[machines-edit-view] Replaced a href link by button because more semantically correct + it actually redirects to the homepage (unwanted behaviour)
2021-09-22 19:01:10 +02:00
Du Peng
235fd2e58a
Merge branch 'buy_pack_for_plan_option' into dev
2021-09-21 18:01:54 +02:00
Du Peng
2c78ab9cee
fix bug: book overlapping slot setting labal error
2021-09-21 18:01:47 +02:00
Du Peng
1c54e54c17
use plant.base_name instands of plan.name
2021-09-21 18:00:48 +02:00
Du Peng
f2dd1bbcd2
add an option Subscription valid for purchase and use of a prepaid pack
2021-09-20 19:43:05 +02:00
Du Peng
65ba3a686b
disable monthly payment for 1 month of subscription
2021-09-10 15:34:49 +02:00
Du Peng
238d7af1ee
disable monthly payment if interval count == 1
2021-09-08 19:21:44 +02:00
Du Peng
a910e8999b
fix bug: editor xss vulerability, disable code view in new/edit project
2021-08-31 11:30:23 +02:00
Du Peng
51ec220a3e
fix manager cant reserve training for user
2021-08-06 11:12:14 +02:00
Sylvain
19717d1351
use localPaymentModal in cart directive
2021-06-30 16:35:25 +02:00
Sylvain
6c326c7209
compute price according to prepaid hours
...
Also: handle prepaid hours decreasing when used
2021-06-30 10:53:05 +02:00
Sylvain
3a741e79e6
[bug] return to the home page when clicking ⟵ on machines/show
2021-06-29 16:24:37 +02:00
Sylvain
10aaf0042c
integration of packs-summary
2021-06-29 15:59:57 +02:00
Sylvain
f56b8eae75
admin can configure renew threshold
2021-06-29 09:07:11 +02:00
Sylvain
1aad4891c1
buy prepaid-pack a hours from modal
2021-06-28 18:17:11 +02:00
Sylvain
d7ba83f6a0
WIP: migrate machine pricing edition interface to react
2021-06-22 11:13:44 +02:00
Sylvain
d54f30e048
WIP: interface to configure packs
2021-06-21 17:39:48 +02:00
Sylvain
2b0130c6be
Merge branch 'dev' into prepaid
2021-06-21 11:36:31 +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
bff5415a1e
refactor API services to use only static methods
...
Also: separate reserve-button component
2021-06-17 17:09:10 +02:00
Sylvain
67ed329dd7
add button to open reservations
2021-06-17 11:56:00 +02:00
Sylvain
565002a124
WIP: migrate machines list to react
2021-06-16 18:10:29 +02:00
Sylvain
f88e53708d
[bug] invalid link to the user's manual
2021-06-16 14:58:32 +02:00
Sylvain
21a593edf0
[bug] can't see the dates for the next booked training session
2021-06-16 14:48:24 +02:00
Sylvain
7fa89c826a
[bug] can't see the dates for the next booked training session
2021-06-16 14:46:47 +02:00
Sylvain
99792e8610
WIP: migrate machine card to react
2021-06-15 17:34:12 +02:00
Sylvain
11579fede4
ability to disable the public agenda
2021-06-15 11:57:43 +02:00
Sylvain
72be638869
[bug] unable to select no category in plan creation/edition after a category selection
...
Also: Display the category in the plans list instead of the plan type
2021-06-15 09:22:41 +02:00
Sylvain
7ba2d58f50
update VCR to 6.0.0
...
Also: - updated cassettes
- Automated stripe secrets filtering in cassettes
- Improved display when no plan-categories exists
2021-06-11 14:29:30 +02:00
Sylvain
854db568bf
Ability to configure the prefix of the payment-schedules' files
2021-06-10 12:04:00 +02:00
Sylvain
4368851151
[bug] do not allow users to register with an invalid email address
2021-06-09 19:10:31 +02:00
Sylvain
57a370bf56
use PlansList component in embedded form
2021-06-09 16:15:23 +02:00
Sylvain
003dd4ce78
refresh plans list after subscription or controlled member changed
2021-06-09 15:46:02 +02:00
Sylvain
05882b3743
display list of plans grouped by category
2021-06-09 13:03:58 +02:00
Sylvain
b83a9e44d6
fix edition of plan's category
2021-06-09 09:47:56 +02:00
Sylvain
4ca16c2688
associate plan w/ category
2021-06-08 17:26:40 +02:00
Sylvain
e1e446ab3f
API+ interface to CRUD plan categories
2021-06-08 16:43:43 +02:00
Sylvain
3f044513e9
[bug] cannot select the recurrence end date on Safari or Internet Explorer
2021-06-08 10:25:20 +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
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
b938232c19
Merge branch 'dev' into payzen
2021-05-25 14:06:30 +02:00
Sylvain
c3f7f04ec2
[bug] html syntax error result in unable to compile the assets
2021-05-24 17:14:01 +02:00
Sylvain
ecf80b0591
ability to set invoices as erroneous
2021-05-24 16:34:27 +02:00
Sylvain
c7a59c8cb7
WIP: refactoring to singularize the booking process
...
We need to achieve only one process for all booking, not one for subscription, one for reservations, etc.
Moreover we must store one object per invoice_item/payment_schedule_object and stop using Invoice.invoiced or PaymentSchedule.scheduled
2021-05-21 18:25:18 +02:00
Sylvain
da3eb4f8bd
[bug] typo in allow/prevent booking overlapping slots
2021-05-21 17:18:22 +02:00
Sylvain
66f81a975e
WIP: array of items
...
Migration from cart_items:{reservation:{}, subscription:{}, ...}
to cart_items:{items:[{reservation:{}, ...}], ...}
2021-05-19 18:12:52 +02:00
Sylvain
9355256909
refresh payzen keys after initial setting
2021-05-18 15:56:22 +02:00
Sylvain
4826db7cf0
[bug] typo in allow/prevent booking overlapping slots
2021-05-18 10:52:59 +02:00
Sylvain
6bcd9f6fef
Merge branch 'dev' into payzen
2021-05-17 15:07:41 +02:00
Sylvain
c8c2300dd2
[bug] unable to change the slots durations for a new availability
2021-05-14 15:03:30 +02:00
Sylvain
bf9a91b479
[bug] about page on small devices
2021-05-14 14:29:36 +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
d8656d56ec
allow remove all themes for an event
2021-05-12 15:05:16 +02:00
Sylvain
2a63daffb5
display all themes for the events
2021-05-12 15:00:19 +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
aaf36dcc0a
reserve events w/ payzen
...
we cannot use the <cart> directive because the layout is too much different
2021-04-29 16:29:35 +02:00
Sylvain
ee1cdb417e
WIP: move events reservation to use the cart directive
2021-04-28 17:26:07 +02:00
Sylvain
23e38238c8
fix payment on site modal in case of payment schedule
2021-04-28 17:25:42 +02:00
Sylvain
f9b47cf1f4
fix payment on site modal
2021-04-28 16:29:04 +02:00
Sylvain
953224f1f7
remove top margin on first group
2021-04-28 16:17:56 +02:00
Sylvain
1bbb8c3965
move the architecture from stripe-only to gateway-generic
2021-04-15 17:01:52 +02:00
Sylvain
07ea6e8c69
renamed SUPERADMIN_EMAIL to ADMINSYS_EMAIL
...
The previous was too much subject to confusions
2021-04-14 15:04:41 +02:00
Sylvain
5e2c50a85f
PaymentModal : automatically determines the payment modal to used based on the configured payment gateway
2021-04-09 09:03:59 +02:00
Sylvain
fb2abcc382
integrate payzen logo and other fixes
2021-04-08 17:11:48 +02:00
Sylvain
67d0ce24b4
set payzen currency
...
also: refactored the comments in the react components to fit high quality
2021-04-07 16:21:12 +02:00
Sylvain
df7893f65f
open modal to edit the keys of the payment gateway
2021-04-07 11:36:04 +02:00
Sylvain
667f6f6229
show recapitulative of payzen settings
2021-04-06 17:47:47 +02:00
Sylvain
c25e54a6af
save & retreive stripe settings
2021-03-30 15:56:36 +02:00
Sylvain
5aacd6695c
Merge branch 'dev' into payzen
2021-03-30 09:22:47 +02:00
Sylvain
10dd5d2cca
[bug] create a training availability with calendar in month view result in wrong dates
2021-03-29 16:05:53 +02:00
Sylvain
c50e69b351
Enforced validation on required input fields
2021-03-24 18:24:03 +01:00
Sylvain
5b854ea831
Merge branch 'dev' into payzen
2021-03-24 14:34:24 +01:00
Sylvain
7099f1f317
address required
...
- Ability to set the address as a mandatory field
- The address is new requested when creating an account
- The profile completion page is less fuzzy for people landing on it without enabled SSO
2021-03-23 11:49:05 +01:00
Sylvain
f535be5b05
WIP: address_required
2021-03-22 18:02:56 +01:00
Sylvain
39a7e23881
Improved style of public plans page
2021-03-22 13:13:51 +01:00
Sylvain
ef32532cf5
Links created using medium editor opens in new tabs
2021-03-22 11:32:04 +01:00
Sylvain
18465ee8e9
select gateway modal
2021-03-10 16:46:18 +01:00
Sylvain
141f4f31b1
Merge branch 'dev' into payzen
2021-03-10 15:23:56 +01:00