vincent
157134f4ef
(feat) Add period filter
2022-09-07 18:36:54 +02:00
Du Peng
75b3295f65
(feat) allow to apply coupon in cart without login
2022-09-07 17:52:23 +02:00
Sylvain
45bac88b26
(quality) refactored categories sorting + fix ts issues
2022-09-07 17:30:21 +02:00
Du Peng
6d2239bc15
(fix) cant pay order with coupon
2022-09-07 17:24:14 +02:00
vincent
0bb4f47b99
(feat) Add actions dropdown
2022-09-07 17:14:06 +02:00
Du Peng
d98082a2c4
(fix) cart's operator_id has rename to operator_profile_id
2022-09-07 16:57:07 +02:00
vincent
3f08d831b9
(merge) branch 'product_store-inte'
2022-09-07 15:54:29 +02:00
vincent
23488284e8
(quality) Create state label component
2022-09-07 15:35:46 +02:00
Du Peng
79182fb8c1
Merge branch 'product_store-store' into product-store
2022-09-07 15:00:27 +02:00
Du Peng
e0e8fc9ec2
(fix) checkout button cant click
2022-09-07 09:59:37 +02:00
Du Peng
79f01d4f78
Merge branch 'product_store-inte' into product_store-store
2022-09-07 09:27:57 +02:00
vincent
874be0bcb6
(wip) user orders dashboard
2022-09-07 09:22:16 +02:00
Du Peng
4387c05200
Merge branch 'product_store' into product_store-store
2022-09-06 20:06:59 +02:00
Du Peng
29a84acf2e
Merge branch 'product_store-payment' into product_store-store
2022-09-06 19:22:22 +02:00
Du Peng
fd97d23208
(feat) set order reference after create order
2022-09-06 19:16:29 +02:00
Du Peng
59d2b8c990
(feat) order reference
2022-09-06 19:12:06 +02:00
Du Peng
e86b143c5e
(quality) refactroing find or create service
2022-09-06 18:17:11 +02:00
Sylvain
b52a59fb42
improved comments
2022-09-06 17:01:20 +02:00
vincent
3a0248ed98
stock
2022-09-06 12:08:19 +02:00
Sylvain
80825a2113
(bug) unable to build stats
...
NoMethodError: undefined method `project_id' for #<Hash>
app/services/statistics/concerns/projects_concern.rb:50:in `project_info_stat'
2022-09-05 16:53:56 +02:00
Sylvain
b7af29c1a8
(bug) unable to build stats
...
NoMethodError: undefined method `date' for #<Hash>
app/services/statistics/builders/projects_builder_service.rb:12:in `block in build'
2022-09-05 16:29:01 +02:00
Sylvain
9a9aaf6889
(bug) unable to build stats
...
NoMethodError: undefined method `project_info' for Statistics::FetcherService:Class
app/services/statistics/fetcher_service.rb:179:in `block in projects_list'
2022-09-05 15:15:35 +02:00
Sylvain
8055de38b8
(bug) the events times are not displayed
2022-09-05 12:21:07 +02:00
Sylvain
5bc1da7cf5
(feat) coupon in reservations export
2022-09-05 11:39:23 +02:00
vincent
f21a68593a
stock (wip)
2022-09-02 18:17:15 +02:00
vincent
a5a45ee1ce
Store settings + update text editor options
2022-09-01 18:02:22 +02:00
vincent
27a3bdc308
Admin orders (tmp)
2022-09-01 16:08:37 +02:00
vincent
539d89cf8e
Fix accordion
2022-08-31 11:15:28 +02:00
Sylvain
f21beeaee7
(api) OpenAPI prices index endpoint
2022-08-30 14:16:49 +02:00
Sylvain
4319ea9bce
(api) OpenAPI plans categories index endpoint
2022-08-30 13:11:08 +02:00
Sylvain
657723bc22
(api) OpenAPI plans endpoints
...
index and show endpoints
2022-08-30 12:58:44 +02:00
Sylvain
4c3aa59bc0
(api) openAPI spaces endpoints
...
index spaces and show a space
2022-08-30 12:18:09 +02:00
vincent
2e696f94fd
(wip) Admin orders list
2022-08-29 19:15:10 +02:00
Sylvain
b9c02742a1
(bug) unable to generate statistics
2022-08-29 17:34:09 +02:00
vincent
78683a31b3
Style cart
2022-08-29 16:32:35 +02:00
vincent
5791e6076d
Merge remote-tracking branch 'origin/product_store-store' into product_store-inte
2022-08-29 10:32:14 +02:00
Du Peng
b669316e43
request user login when checkout a cart
2022-08-28 23:31:43 +02:00
Du Peng
631d5889c0
refactoring create cart service
2022-08-28 23:23:58 +02:00
Du Peng
ea535d86b2
add checkout policy
2022-08-27 18:59:59 +02:00
Du Peng
c80198603e
set customer of cart dont save before payment
2022-08-27 18:01:25 +02:00
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
3a669109b5
order extends to payment document
2022-08-26 15:56:20 +02:00
Du Peng
453954e2b9
save payment gateway object after pay an order
2022-08-26 15:30:51 +02:00
Du Peng
e3dfe4935a
set default value of order_item_id in update_stock
2022-08-26 14:08:20 +02:00
Du Peng
8d52768031
set operator_profile_id after payment
2022-08-26 14:07:18 +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
7c59d44785
add payment method in order after payment
2022-08-26 11:24:42 +02:00
Du Peng
939927fb73
add wallet transaction id to order
2022-08-26 11:19:09 +02:00
Du Peng
8059512f19
add order item id to product stock movement for sold
2022-08-26 11:06:09 +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
8a8ce607b7
check product is valid and in stock before payment
2022-08-25 11:46:14 +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
a31f3555a1
(Bug) password verification during setup
2022-08-23 17:35:12 +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
ec62931a78
fix bug: product amount cannot update
2022-08-23 16:02:16 +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
5e61e9c409
Fix save-btn color
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
e096d95dcc
reset product_category_id to nil if product_category is removed
2022-08-23 16:02:09 +02:00
Du Peng
19e3921dc4
add products relation in product's category
2022-08-23 16:02:08 +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
Du Peng
69e2b3e111
Product model/controller
2022-08-23 16:02:07 +02:00
Du Peng
b53efc9850
change top position of product category to 0
2022-08-23 16:02:07 +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
5826f462d6
allow manager to create/edit/delete product's category
2022-08-23 16:02:04 +02:00
Du Peng
778f98bd9a
product category update position api
2022-08-23 16:02:04 +02:00
vincent
235c0cb7d5
Fix plan-category button's colors
2022-08-23 16:02:03 +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
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
Sylvain
887585d9e2
Merge branch 'dev' of github.com:sleede/fab-manager into dev
2022-08-22 13:32:49 +02:00
vincent
857261ba62
Merge branch 'product_store-store' into product_store-inte
2022-08-22 10:00:09 +02:00
Du Peng
5ec541d854
add checkout controller and refactoring cart controller
2022-08-21 19:08:10 +02:00
Du Peng
73a2e328a5
set operator if admin create cart
2022-08-21 15:34:23 +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
Guilherme Chaguri
9b44492971
(bug) Fix user reference for admin check
...
Fix user variable reference when verifying whether the user is an administrator
2022-08-16 11:02:25 -03: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
dc67d08395
Update color variables' names
2022-08-04 15:19:34 +02:00
vincent
0dee28ebc8
Merge remote-tracking branch 'origin/product_store' into product_store-inte
2022-08-04 14:05:18 +02:00
Du Peng
1b605b3265
fix bug: product amount cannot update
2022-08-04 14:02:19 +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
1cb94e6c3d
Fix save-btn color
2022-08-03 10:23:40 +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
d690db8b6f
reset product_category_id to nil if product_category is removed
2022-08-03 10:18:00 +02:00
Du Peng
00f811645a
add products relation in product's category
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
Du Peng
1e3e7854b2
Product model/controller
2022-08-03 10:16:36 +02:00
Du Peng
4ce68f33a8
change top position of product category to 0
2022-08-03 10:16:12 +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
5242d7b021
allow manager to create/edit/delete product's category
2022-08-03 10:16:11 +02:00
Du Peng
11fc251557
product category update position api
2022-08-03 10:16:11 +02:00
vincent
571e7c7612
Fix plan-category button's colors
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
vincent
c3cdccfb74
Adjust connection modals' style
2022-08-03 09:12:57 +02:00
Du Peng
d399a085ee
Merge branch 'improves-password-complexity-check-2pxghn4' into dev
2022-08-01 19:32:29 +02:00
Du Peng
890e3659b4
Merge branch 'prevents-users-enumeration-attack-2pxggdn' into dev
2022-08-01 19:06:13 +02:00
Du Peng
68dc18a68d
Merge remote-tracking branch 'origin/2pcjn0j-files-format-vulnerability' into dev
2022-08-01 18:18:06 +02:00
Du Peng
549a719413
Merge remote-tracking branch 'origin/2pcjmhw-xss-vulnerability' into dev
2022-08-01 18:17:08 +02:00
Cyril
be53adb551
Display the tag and theme field on the detail view of a project
2022-08-01 17:44:36 +02:00
Nicolas Florentin
1d6a59dd67
improvement: add complexity check of the user password
2022-07-29 17:37:42 +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
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
Nicolas Florentin
9bc2d4f96c
improves file validation, validation is now based on content of the file in addition of the validation of the extension
2022-07-27 17:14:15 +02:00
Sylvain
3f84c2dfa1
(bug) ics description not using new methdod
2022-07-27 13:58:52 +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
445e63b44c
(feature) Improved attached ICS file texts, in reservations emails
2022-07-27 12:04:23 +02:00
Sylvain
7fa9414527
Merge pull request #377 from Guichaguri/fix/ignore-empty-from-sso
...
(bug) Fix SSO data being overridden when it is empty and the user can change it
2022-07-27 10:08:00 +02:00
Sylvain
a4649603c0
Merge pull request #376 from Guichaguri/fix/admin-group-overriden
...
(bug) Fix admin group being replaced in SSO authentication
2022-07-27 10:04:30 +02:00
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
Sylvain
56b254dffc
print an error if the current invoice does not have a main_item
2022-07-26 17:38:33 +02:00
Sylvain
bb7eec924c
Usage of the rails logger instead of printing to standard output
2022-07-26 17:27:33 +02:00
Sylvain
eaaf3b9a73
(bug) fix reservation reminder
2022-07-26 15:41:07 +02:00
Sylvain
07757e6adb
(bug) Erroneous "cancelation failed" message if elasticsearch was disabled
2022-07-26 15:08:59 +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
6937a426c3
(bug) unable to show daily slots on public calendar
2022-07-26 12:12:59 +02:00
Sylvain
8015a457a4
(bug) missing modal translation
2022-07-25 16:48:33 +02:00
Sylvain
7432bb848e
(bug) unable to reserve a machine slot when another machine was already reserved on the same slot
2022-07-25 16:41:48 +02:00
Sylvain
10a918ced7
(bug) unable to reserve an event
2022-07-25 15:40:29 +02:00
vincent
783e43f3a4
Fix user porfil bio's link display
2022-07-25 15:33:33 +02:00
vincent
2dacb66011
Fix form-switch layout
2022-07-25 15:33:33 +02:00
Guilherme Chaguri
026a09194a
Improve filter and sorting to include the users prefix
2022-07-21 13:21:06 -03:00
Guilherme Chaguri
fda93cb7df
Fix SSO properties not updating
2022-07-20 16:28:17 -03:00
Sylvain
2705b9f6bd
(bug) unable to reserve if user's subscription plan is disabled
2022-07-20 17:46:09 +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
2bd84e623a
(bug) missing translations
2022-07-20 15:27:01 +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
c4d959570f
code linting
2022-07-19 17:32:55 +02:00
Sylvain
b243800f5a
(bug) As admin, unable to create a new member ( #374 )
2022-07-19 16:29:28 +02:00
Sylvain
e9a7b609bb
(bug) Unable to change the group of a user
2022-07-19 16:08:24 +02:00
Sylvain
c710af04b7
(bug) slot title must only contains name of the requested resource
2022-07-19 15:56:21 +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
e955ecc6f8
(bug) create slots when occurences is nil
2022-07-18 17:27:40 +02:00