Du Peng
|
4387c05200
|
Merge branch 'product_store' into product_store-store
|
2022-09-06 20:06:59 +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 |
|
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 |
|
Du Peng
|
f62244fcdb
|
add product stock mouvements
|
2022-08-23 16:02:17 +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 |
|
Du Peng
|
272cbf165c
|
create/edit product form
|
2022-08-23 16:02:08 +02:00 |
|
Du Peng
|
69e2b3e111
|
Product model/controller
|
2022-08-23 16:02:07 +02:00 |
|
Du Peng
|
4396bb0ca0
|
store product category create/list/update/delete
|
2022-08-23 16:01:59 +02:00 |
|
Sylvain
|
f7261043b5
|
Fix a bug: trainings monitoring is not available
|
2022-08-23 15:54:37 +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 |
|
Du Peng
|
1cef45e3d7
|
add product stock mouvements
|
2022-08-08 18:04:14 +02:00 |
|
Du Peng
|
f345fc2443
|
add is_main to product image
|
2022-08-03 20:16:21 +02:00 |
|
Du Peng
|
fc4fd78843
|
product files and images upload
|
2022-08-03 10:25:36 +02:00 |
|
Du Peng
|
5e1436eda4
|
create/edit product form
|
2022-08-03 10:18:00 +02:00 |
|
Du Peng
|
1e3e7854b2
|
Product model/controller
|
2022-08-03 10:16:36 +02:00 |
|
Du Peng
|
432b60ca9a
|
store product category create/list/update/delete
|
2022-08-03 10:16:08 +02:00 |
|
Du Peng
|
549a719413
|
Merge remote-tracking branch 'origin/2pcjmhw-xss-vulnerability' into dev
|
2022-08-01 18:17:08 +02:00 |
|
Nicolas Florentin
|
a8d0df11d3
|
projects/index/json.jbuilder : sanitize project description
|
2022-07-27 17:16:48 +02:00 |
|
Nicolas Florentin
|
e4fb068c12
|
fix xss vulnerability in projects
|
2022-07-27 17:16:38 +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
|
f67c286497
|
(bug) prevent same slot booking feature ignores canceled reservations
|
2022-07-26 13:35:14 +02:00 |
|
Sylvain
|
6937a426c3
|
(bug) unable to show daily slots on public calendar
|
2022-07-26 12:12:59 +02:00 |
|
Sylvain
|
7134b8ffac
|
(bug) fix notification with slots
|
2022-07-20 16:20:09 +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
|
0d072291c7
|
(bug) 2 people can book the same machine slot
Also: fix reservation change behavior
|
2022-07-20 11:22:00 +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 |
|
Nicolas Florentin
|
b3795e21ec
|
bug fix canceled_at was called on slot in members/show.json.jbuilder
|
2022-07-19 08:21:18 +02:00 |
|
Sylvain
|
6a8c441e85
|
public calendar endpoint refactoring & testing
|
2022-07-18 17:19:33 +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
|
b2fd2e1b48
|
build all slots at reservation creation time
|
2022-07-18 17:18:00 +02:00 |
|
Guilherme Chaguri
|
d63b8d0dfa
|
Add username column to the member list
|
2022-07-14 16:11:44 -03: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
|
6ce762f778
|
(bug) unable to reserve a space
|
2022-06-29 15:34:47 +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
|
48e1cf782f
|
(bug) unable to edit an event
|
2022-06-15 09:42:39 +02:00 |
|
vincent
|
103bf80e81
|
Standardize card layout
|
2022-06-14 16:44:26 +02:00 |
|
Sylvain
|
1b5bb662ac
|
(bug) unable to edit OIDC provider
|
2022-06-06 11:40:53 +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
|
302c55755e
|
(ui) admin edit user: use new user-profile-form component
|
2022-05-10 10:23:43 +02:00 |
|