Du Peng
0f7b99c8a9
add a function return the currency symbol
2022-08-26 20:14:15 +02:00
Du Peng
981cffa27d
pay cart with coupon code
2022-08-26 20:10:21 +02:00
Du Peng
5030f5e1bc
fix bug: user cant pay order by wallet
2022-08-26 13:37:23 +02:00
vincent
e339cc18e7
merge product_store-store
2022-08-26 12:12:35 +02:00
Du Peng
e7d5cbfb2e
show an error if payment success but payment_state != paid
2022-08-26 12:04:19 +02:00
Du Peng
ded92dfb89
show error if cart update failed
2022-08-26 11:57:53 +02:00
Du Peng
49aa54193d
rename operator id to operator_profile_id in order
2022-08-26 11:55:35 +02:00
Du Peng
97ee15cf78
rename order amount to total
2022-08-26 10:46:30 +02:00
vincent
42c38a0dd7
Remove filters logic from the front-end
2022-08-26 09:46:35 +02:00
Du Peng
885db68b51
add coupon component
2022-08-25 20:50:15 +02:00
vincent
4e76396dee
Store ad on machines list
2022-08-25 18:46:55 +02:00
vincent
d602087710
Clients' store categories
2022-08-25 17:08:43 +02:00
Du Peng
d9687a007b
fix various bugs for cart
2022-08-25 16:23:00 +02:00
Du Peng
193c21a583
payment of cart by stripe/payzen/local
2022-08-25 08:52:17 +02:00
vincent
e0dc008d4c
Client side product list + product view
2022-08-24 18:34:34 +02:00
Sylvain
9caf401412
(bug) disabling/removing groups
...
When disabling a group, another unrelated group maybe disabled/enabled;
When deleting a group, another unrelated group may be deleted,
instead of the requested one
2022-08-24 12:21:52 +02:00
vincent
29993b0ec9
Cleanup files
2022-08-23 18:55:49 +02:00
Sylvain
428867bb6d
(Bug) Invalid password length verification
2022-08-23 16:43:10 +02:00
Du Peng
f62244fcdb
add product stock mouvements
2022-08-23 16:02:17 +02:00
Du Peng
851294e8d9
add size medium to product image
2022-08-23 16:02:16 +02:00
Du Peng
350275d31b
add is_main to product image
2022-08-23 16:02:15 +02:00
Du Peng
0773e5bc82
product files and images upload
2022-08-23 16:02:14 +02:00
vincent
ea1171ba0f
Remove test text
2022-08-23 16:02:14 +02:00
vincent
ecb7f6d640
(wip) drag and drop
2022-08-23 16:02:13 +02:00
vincent
debe8a6a52
(wip) Style products list and form
2022-08-23 16:02:13 +02:00
vincent
be6ba8deff
Fix button color + standardise class names
2022-08-23 16:02:12 +02:00
vincent
4e65396e7e
(wip) Style product's components
2022-08-23 16:02:11 +02:00
Sylvain
ab6d91fd12
(quality) rename check-list to checklist and added an uncheck all button
2022-08-23 16:02:11 +02:00
vincent
1d5141d073
Temporary broken drag and drop
2022-08-23 16:02:10 +02:00
vincent
81cc8db0f5
Remove react-beautiful-dnd
2022-08-23 16:02:10 +02:00
Du Peng
4f90cb5d80
update edit product comment
2022-08-23 16:02:09 +02:00
Du Peng
272cbf165c
create/edit product form
2022-08-23 16:02:08 +02:00
Du Peng
6b805f15f1
products page in front
2022-08-23 16:02:08 +02:00
vincent
59748356fc
Add subfolder in store
2022-08-23 16:02:06 +02:00
vincent
bf1700e43a
Convert product category form to RHF
2022-08-23 16:02:05 +02:00
vincent
39c8ec3c3e
(wip) Convert product-category to RFH
2022-08-23 16:02:05 +02:00
Du Peng
778f98bd9a
product category update position api
2022-08-23 16:02:04 +02:00
Du Peng
4396bb0ca0
store product category create/list/update/delete
2022-08-23 16:01:59 +02:00
Sylvain
faae719fef
Removed unused imports
2022-08-23 15:15:49 +02:00
Sylvain
055b588ffc
Use union type instead of enum for SettingName
2022-08-23 13:12:13 +02:00
Nicolas Florentin
27dcc5f593
password length check in password-input.tsx file
2022-08-22 16:00:55 +02:00
vincent
5f8a15bcbb
Fix [form-rich-text] focus
2022-08-22 15:25:00 +02:00
vincent
857261ba62
Merge branch 'product_store-store' into product_store-inte
2022-08-22 10:00:09 +02:00
Du Peng
396248ed2b
manage cart session when user login or logout
2022-08-20 20:49:51 +02:00
Du Peng
cfd21adb60
cart button
2022-08-20 18:47:15 +02:00
Du Peng
ab800a519f
store cart
2022-08-19 20:03:09 +02:00
Du Peng
16288ae2bd
fablab store page
2022-08-16 19:47:27 +02:00
vincent
605b3ec92c
(wip) drag and drop categories
2022-08-15 14:52:09 +02:00
vincent
5677ef3b6d
Add accordion item component
2022-08-15 14:51:13 +02:00
vincent
7ca3955c1d
Filter and sort products
2022-08-13 19:23:56 +02:00
vincent
ba0a604e40
Merge remote-tracking branch 'origin/product_store' into product_store-inte
2022-08-09 11:45:28 +02:00
vincent
0ee6521d3c
Filter by machines
2022-08-09 11:36:52 +02:00
Du Peng
1cef45e3d7
add product stock mouvements
2022-08-08 18:04:14 +02:00
vincent
86a40bc096
(wip) Products list filters
2022-08-05 18:38:54 +02:00
vincent
d118d045c6
Style list items
2022-08-04 16:24:52 +02:00
vincent
927aa40182
Update image upload
2022-08-04 10:44:31 +02:00
vincent
ac46314532
Merge remote-tracking branch 'origin/product_store' into product_store-inte
2022-08-04 09:51:41 +02:00
Du Peng
640a428198
add size medium to product image
2022-08-04 09:41:53 +02:00
vincent
82fab4dd4f
Merge remote-tracking branch 'origin/product_store' into product_store-inte
2022-08-04 09:15:27 +02:00
Du Peng
f345fc2443
add is_main to product image
2022-08-03 20:16:21 +02:00
vincent
be90d0720b
Product form style
2022-08-03 18:30:29 +02:00
Du Peng
fc4fd78843
product files and images upload
2022-08-03 10:25:36 +02:00
vincent
c5f2b2587e
Remove test text
2022-08-03 10:24:27 +02:00
vincent
c8559c603c
(wip) drag and drop
2022-08-03 10:24:26 +02:00
vincent
400f832313
(wip) Style products list and form
2022-08-03 10:23:41 +02:00
vincent
8c62853395
Fix button color + standardise class names
2022-08-03 10:23:41 +02:00
vincent
d3d4fdf84d
(wip) Style product's components
2022-08-03 10:23:40 +02:00
Sylvain
bd96622d37
(quality) rename check-list to checklist and added an uncheck all button
2022-08-03 10:23:40 +02:00
vincent
57ef555943
Temporary broken drag and drop
2022-08-03 10:23:38 +02:00
vincent
5b65fb7a54
Remove react-beautiful-dnd
2022-08-03 10:21:01 +02:00
Du Peng
a53c68d6b4
update edit product comment
2022-08-03 10:18:00 +02:00
Du Peng
5e1436eda4
create/edit product form
2022-08-03 10:18:00 +02:00
Du Peng
e23e83000d
products page in front
2022-08-03 10:17:58 +02:00
vincent
bd2cbd55d2
Add subfolder in store
2022-08-03 10:16:11 +02:00
vincent
588ab696ae
Convert product category form to RHF
2022-08-03 10:16:11 +02:00
vincent
c18c17ee62
(wip) Convert product-category to RFH
2022-08-03 10:16:11 +02:00
Du Peng
11fc251557
product category update position api
2022-08-03 10:16:11 +02:00
Du Peng
432b60ca9a
store product category create/list/update/delete
2022-08-03 10:16:08 +02:00
Nicolas Florentin
98c7da492d
prevents users enumeration attacks by not giving any info about the validity of the email
2022-07-29 16:02:58 +02:00
Du Peng
677b796d32
fix bug: user validation required alert is displayed and disappears instantly
2022-07-27 13:16:51 +02:00
Sylvain
98b1919de2
Make the username column optionnal ( #375 )
2022-07-27 09:59:23 +02:00
Sylvain
df0b5628b3
(bug) canceled trainings are still shown on the public profile page
2022-07-26 17:55:45 +02:00
Sylvain
f67c286497
(bug) prevent same slot booking feature ignores canceled reservations
2022-07-26 13:35:14 +02:00
Sylvain
b53644d3a5
(bug) profile completion form is not shown is T&C were not filled
2022-07-26 12:44:30 +02:00
Sylvain
8015a457a4
(bug) missing modal translation
2022-07-25 16:48:33 +02:00
Sylvain
10a918ced7
(bug) unable to reserve an event
2022-07-25 15:40:29 +02:00
vincent
2dacb66011
Fix form-switch layout
2022-07-25 15:33:33 +02:00
Sylvain
29b9399ca3
(bug) unable to reserve event
2022-07-20 15:54:04 +02:00
Sylvain
165b3e17b9
(bug) unable to move or cancel reservations
2022-07-20 14:59:42 +02:00
Sylvain
e0944746a9
(bug) unable to cancel a machine reservation + unable to update member profile
2022-07-20 11:52:38 +02:00
Sylvain
0d072291c7
(bug) 2 people can book the same machine slot
...
Also: fix reservation change behavior
2022-07-20 11:22:00 +02:00
Sylvain
d05a6373be
(bug) for admins and managers, the current password is not requested before changing their own password
2022-07-20 10:45:42 +02:00
Sylvain
7c918ff497
(bug) missing translation
2022-07-20 09:56:55 +02:00
Sylvain
06ee1acea5
(bug) fix slot reservation is considered full
2022-07-19 15:40:28 +02:00
Sylvain
d26e2ae313
(bug) fix various issues due to slots behavior refactoring
2022-07-19 11:32:12 +02:00
Sylvain
6a8c441e85
public calendar endpoint refactoring & testing
2022-07-18 17:19:33 +02:00
Sylvain
b68e47a0ea
refactor shopping_cart/reservation
...
Previsouly, the reservation was expecting parameters like:
slots_attributes: [{start_at: date, end_at: date, availability_id: number}]
Now, the reservation is expecting simpler parameters like:
slots_reservations_attributes:[{slot_id: number}]
2022-07-18 17:18:01 +02:00
Sylvain
37b24a8d2f
refactor slots model
2022-07-18 17:18:01 +02:00
Sylvain
5012912edd
(wip) refactoring Availabilities::AvailabilitiesService and Availabilities::StatusService
2022-07-18 17:18:01 +02:00
Sylvain
9c72da8e6f
(bug) social networks icons not shown in firefox
2022-07-06 14:19:36 +02:00
Sylvain
cc1cf38d69
(bug) OIDC scopes are not shown in the configuration form select
2022-07-06 12:59:45 +02:00
Sylvain
9250ed720f
(bug) Gender, Address and Birthday are not mapped properly from SSO ( #365 )
2022-07-05 17:43:16 +02:00
Sylvain
bfc6d76109
(bug) unable to access the new OIDC provider form
2022-07-05 16:18:17 +02:00
Sylvain
b0775ad11c
(typo) passed -> past
2022-06-29 15:45:17 +02:00
Sylvain
a41a22a050
(bug) wrong number of credits + improved text
2022-06-29 15:35:17 +02:00
Sylvain
1b8282fda4
display reservations credits in the dashboard
2022-06-29 15:35:17 +02:00
Sylvain
bcbd3bfb58
(bug) invalid users are reported in search
2022-06-29 15:35:17 +02:00
Sylvain
2ad842a93b
(feat) do not show passed slots in futur reservations if it has mixed slots
2022-06-29 15:34:04 +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
a10f5e6bf7
(bug) user can change his group in the profile completion page, even if mapped from the SSO
2022-06-27 12:58:40 +02:00
Sylvain
c1246092ed
(bug) unable to remove an SSO data mapping field once saved
2022-06-22 16:42:14 +02:00
Sylvain
3d2bdaea10
fix missing translation
2022-06-22 15:45:53 +02:00
Sylvain
b25cfe65c1
fix translations
2022-06-22 15:37:41 +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
21ee80ab19
rename proof-of-identity to supporting-documents
2022-06-21 14:39:26 +02:00
Sylvain
18aba05f25
linted profile-custom-fields
2022-06-21 14:10:51 +02:00
Sylvain
00fb384ba5
fixed imports
2022-06-21 12:18:54 +02:00
Sylvain
f28b66068f
tidied up the flowing components
2022-06-21 12:18:25 +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
Sylvain
2033329342
linted all front code, excepted profile-completion/
...
and prrofile-custom-fields/
2022-06-20 15:35:38 +02:00
Sylvain
37bc2b3d43
(bug) the birthday was not shown in user edition form
2022-06-20 10:49:44 +02:00
Sylvain
32259e8876
(bug) birthday, phone, address not marked as required
2022-06-20 10:18:50 +02:00
Du Peng
d45c03d36e
Override angular currency filter, use Intl.NumberFormat to format amount
2022-06-15 19:44:55 +02:00
Sylvain
28f873c871
(code) rule to enforce component named like filename
2022-06-15 13:40:57 +02:00
Sylvain
925e109175
all components must have their matching root class
2022-06-15 13:40:54 +02:00
Sylvain
8770adead4
fix typo
2022-06-15 13:39:27 +02:00
Sylvain
0f15127f22
updated eslint rules dependency
2022-06-15 13:39:27 +02:00
Sylvain
ca9eec8579
(lint) add rule to check component class naming
2022-06-15 13:39:27 +02:00
vincent
ed34279cef
unable non-required [text-setting]
2022-06-15 13:35:46 +02:00
Sylvain
503ae22c0b
(feat) admins can scroll to the featured event
2022-06-15 12:26:44 +02:00
Sylvain
31fe9dea05
(feat) feature the next event in the event page
2022-06-15 10:55:08 +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
ac16eca60f
fix conflict
2022-06-07 16:57:02 +02:00
Du Peng
c24aad00c4
check shopping cart items is valid before pay online
2022-06-07 16:55:29 +02:00
Sylvain
667272fab6
(bug) list of OIDC scopes are loading indefinitely
2022-06-06 11:44:16 +02:00
Du Peng
f9bd27ea13
Fix a bug: unable to show tours in machines and spaces page
2022-06-03 12:18:15 +02:00
Du Peng
ef5d603065
Fix a bug: admins are shown in select member for reservation by admin
2022-06-03 12:05:55 +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
2172c102c9
(bug) use arrays for OIDC scopes in front and DB.
...
Send the scope as a string separated with spaces to the OIDC provider.
2022-06-01 09:27:49 +02:00
Sylvain
78f7cdcb8c
(bug) unable to remove the last training or the last tag to a member
2022-05-31 17:06:39 +02:00
Sylvain
e914567cf1
(bug) fix multi select behavior
2022-05-31 17:06:06 +02:00
Sylvain
931e19b331
(bug) hide create account links when public registrations disabled
2022-05-30 14:19:32 +02:00
Sylvain
31b4089bd2
(bug) OIDC scopes
2022-05-30 12:56:22 +02:00
Du Peng
384dd43029
Fix a bug: undefined error in new member page
2022-05-27 12:02:02 +02:00
Sylvain
532a896cad
(bug) fix #348 : open reset password modal when back from notification center
2022-05-23 14:20:08 +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
c404424fb4
fix bug: new category button transalte
2022-05-17 19:31:58 +02:00
Du Peng
cecf8126e0
Fix bug: Unable to create plans for all group
2022-05-17 17:38:00 +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
8d55f617fe
adjuste create groups button width
2022-05-12 15:10:55 +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
c46a2ba085
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2022-05-12 11:43:18 +02:00
Du Peng
b46ebe9dab
fix bug: admin can't show his group
2022-05-12 11:11:50 +02:00
vincent
abf101178b
Adjust texts on admin settings about
2022-05-12 10:47:28 +02:00
Sylvain
bdf42f7b5d
Merge remote-tracking branch 'origin/user_validation_required' into dev
2022-05-11 18:39:50 +02:00
Du Peng
01191f467c
add ProofOfIdentityFile max size in frontend
2022-05-11 18:14:52 +02:00
Sylvain
3fd20cd57d
(bug) unable to validate account
2022-05-11 18:06:49 +02:00
Du Peng
78076b7fba
user and admin can edit organization field
2022-05-11 16:57:44 +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
6d1852252b
(style) Use of CSS variables for main and secondary colors in react components styles
2022-05-11 16:14:52 +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
249285ea51
Merge branch 'ics' into v5.4
2022-05-11 10:45:33 +02:00
Sylvain
7da62bb513
(back) generate ICS file for a reservation
2022-05-10 16:48:58 +02:00
vincent
3a8671edbd
Add disabled style on text editor
2022-05-10 15:22:01 +02:00
Sylvain
0e8230af48
(ui) use user-profile-form in admin/members/new
2022-05-10 11:18:33 +02:00
Sylvain
89853d3533
(ui) allow admins to change user password without asking for the current
2022-05-10 10:50:41 +02:00
Sylvain
302c55755e
(ui) admin edit user: use new user-profile-form component
2022-05-10 10:23:43 +02:00
Sylvain
6e4031523c
(bug) allow to set custom scope in openID connect configuration when using discovery
2022-05-09 16:28:18 +02:00
Sylvain
83fef46ceb
(bug) unable to edit in rich-text editor component
2022-05-09 15:15:27 +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
55e76e1523
(ui) disabled fields mapped from the sso
2022-05-09 10:12:27 +02:00
Sylvain
b9b8150e28
(wip)(ui) disabled fields mapped from the sso
2022-05-04 17:15:04 +02:00
Sylvain
9b22286327
Merge remote-tracking branch 'origin/socials-refacto' into profile-form
2022-05-04 15:53:22 +02:00
Sylvain
aa767cfbd2
(bug) do send user edition form when confirming password
2022-05-04 15:29:01 +02:00
vincent
86e792b764
Fix attribute name
2022-05-04 15:22:52 +02:00
Sylvain
1f2d3867aa
(ui) allow form inputs to be disabled, possibly with a callback
2022-05-04 14:59:55 +02:00
vincent
521229b87b
Add form validation
2022-05-04 14:57:31 +02:00
Sylvain
2f0a8064c2
(ui) remove workaround
2022-05-04 14:36:16 +02:00
Sylvain
fc2169980f
(bug) fix minor eslint issues + rebasing issue
2022-05-04 14:32:56 +02:00
Sylvain
51960782ee
(code) simplified regexs
2022-05-04 14:12:49 +02:00
Sylvain
048ed4b644
(ui) user profile form: confirmation message + save button
2022-05-04 14:12:49 +02:00
Sylvain
eab523c961
(bug) display date in user form
2022-05-04 14:12:48 +02:00
Sylvain
858e86dbcb
(ui) avatar input
2022-05-04 14:12:48 +02:00
Sylvain
1c22bc3cc5
(bug) focus the text edition area when the user clicks on the editor
2022-05-04 14:12:48 +02:00
Sylvain
5cb811e3c3
(wip)(ui) avatar input
2022-05-04 14:12:48 +02:00
Sylvain
11491aeb6c
(ui) save profile editions to the API
2022-05-04 14:12:48 +02:00