Sylvain
35dd29c193
(bug) show explicit error message when unable to delete a product
2022-10-05 13:50:57 +02:00
Sylvain
2b80516177
(bug) unable to generate statistics
...
This bug is due to the refactoring of the statistics builder service,
in 2022 august. The default_options were not defined so the nightly
worker has no luck to run. The statistics may not have been built since
then, so a rebuild is required
2022-10-05 13:11:17 +02:00
Sylvain
0464aae23e
(quality) compute withdrawal instructions server side
2022-10-05 12:06:35 +02:00
Sylvain
185b4f1459
(merge) Merge remote-tracking branch 'origin/product-store_integration' into product-store
2022-10-05 10:21:35 +02:00
Du Peng
08ddb481a6
Merge branch 'product-store' of git.sleede.com:projets/fab-manager into product-store
2022-10-04 18:50:37 +02:00
Du Peng
134d8147b6
(feat) add product url in order item
2022-10-04 18:50:29 +02:00
vincent
60c8102c39
(bug) fix product categories position after dnd
2022-10-04 18:03:18 +02:00
Du Peng
1104316e62
(feat) update cart created_at after add a new item when cart is empty
2022-10-04 17:42:32 +02:00
Du Peng
9066148572
(bug) use Math.round instant of Math.trunc for fix float multify (ex: 37.8*100)
2022-10-04 17:26:39 +02:00
Sylvain
43fbf2ac8d
(feat) withdrawal instructions in order ready email
2022-10-04 16:59:51 +02:00
Du Peng
a9dc7b4dd7
Merge branch 'product-store' of git.sleede.com:projets/fab-manager into product-store
2022-10-04 16:52:04 +02:00
Du Peng
162c56eb46
(bug) app always check coupon code in admin panier if change item quantity
2022-10-04 16:51:38 +02:00
Sylvain
72d55a6a0b
(feat) display withdrawal instructions on the show-order page
2022-10-04 15:30:20 +02:00
vincent
a6173147ca
(ui) fix layout
2022-10-04 15:21:01 +02:00
Sylvain
e90fa0ca40
(quality) move orders-dashboard to the dashboard folder
2022-10-04 15:03:29 +02:00
Sylvain
b283e89235
(merge) Merge remote-tracking branch 'origin/product-store_integration' into product-store
2022-10-04 14:48:01 +02:00
Sylvain
3c2ef4b55d
(bug) orders sorting in dashboard
2022-10-04 14:42:28 +02:00
Du Peng
ccd15d45b2
(bug) fix cart total error if add a item that have be offered by admin
2022-10-04 12:34:19 +02:00
vincent
4f58ea64d1
(i18n) improve product category delete message
2022-10-04 10:56:12 +02:00
vincent
50e4b2ba0c
(merge) branch 'origin/product-store'
2022-10-04 10:53:36 +02:00
Sylvain
4f231c0647
(bug) do not buzz the list in member-select
2022-10-04 10:52:53 +02:00
Sylvain
a10e75844a
(feat) visual indicator if no user selected
2022-10-04 10:51:32 +02:00
Sylvain
f3a2136e7d
(bug) category slug with special characters
2022-10-04 10:32:16 +02:00
Sylvain
4cfb1a1253
(bug) create a category result in error
2022-10-04 10:28:37 +02:00
Sylvain
3a8082db97
(merge) Merge remote-tracking branch 'origin/product-store_cart' into product-store
2022-10-04 09:41:47 +02:00
Sylvain
31044a56ac
(quality) simplified regex
2022-10-03 17:26:43 +02:00
Sylvain
7798df1f87
(bug) stock form fields not marked as required
2022-10-03 16:39:58 +02:00
Sylvain
ac861e3bcb
(bug) negative stock is marked as available
2022-10-03 16:37:46 +02:00
Sylvain
ae0d87c893
(bug) ability to filter by negative stock
2022-10-03 16:35:54 +02:00
Sylvain
db86769d42
(bug) products filter: is_available
...
previously, we misunderstand the behavior or this filter and
we used the filter is_active instead
2022-10-03 16:32:32 +02:00
Sylvain
e51592061a
(feat) count products in categories
2022-10-03 15:56:46 +02:00
Sylvain
a260f88555
(feat) store withdrawal instructions
2022-10-03 15:24:01 +02:00
Sylvain
51aa967001
(feat) dismiss a user to a lower privileged role
2022-10-03 14:22:15 +02:00
vincent
dfe786ee45
(quality) Remove auto scroll and filter header
2022-09-29 11:37:58 +02:00
vincent
1425e39183
(ui) Fix order-item layout
2022-09-29 11:36:56 +02:00
vincent
05e729fa26
(inte) cart item error message + responsive
2022-09-28 17:48:55 +02:00
Sylvain
a30eac10de
(feat) humanize gateway error messages
2022-09-28 12:54:29 +02:00
Du Peng
91b7fb9e6a
(quality) refactoring change quantity in cart
2022-09-28 12:21:46 +02:00
Du Peng
274d661a58
(feat) always check cart items when user in cart page
2022-09-28 12:14:58 +02:00
Du Peng
c7559e3857
(bug) product stock status
2022-09-28 11:32:07 +02:00
Sylvain
f784a4d8a0
(bug) wrong translation key hide payment mean
2022-09-28 10:47:57 +02:00
Sylvain
a8b9ebb665
(quality) add eager loading for orders
2022-09-28 10:34:02 +02:00
Sylvain
eb50c37419
(bug) do not display no price as free
2022-09-28 10:33:30 +02:00
Sylvain
b8db1dc9a9
(bug) visitor is not prompted to login on checkout
2022-09-28 10:32:34 +02:00
Du Peng
ac671ea26d
(feat) check cart item amount/available/quantity_min/stock before checkout
2022-09-27 19:44:39 +02:00
Sylvain
4d72151ab5
(bug) unable to display the payment schedules management interface
2022-09-27 16:01:22 +02:00
Sylvain
929c70b5be
(bug) plan's categories descriptions are not shown
...
Also fixes a bug about empty groups displayed in the subscription page
2022-09-27 16:01:22 +02:00
Sylvain
9856450aac
(bug) broken daily view of the public agenda
...
When the daily view contains trainings or events, the agenda cannot
be filled with the slots because of an 500 error
2022-09-27 16:01:21 +02:00
Sylvain
f61e784ace
(feat) prevent show product in store if price not set
2022-09-27 15:58:59 +02:00
Sylvain
82d2f99b77
(bug) add a link sends the parent form
2022-09-27 15:02:41 +02:00
Sylvain
116dac646c
(quality) remove eslint-disable
2022-09-27 12:53:29 +02:00
Sylvain
474a6b9bb7
(feat) display free instead of 0,0€
2022-09-27 12:42:29 +02:00
Sylvain
768acf3c28
(bug) do not display product sku if no set
2022-09-27 12:33:13 +02:00
Sylvain
18dc24e366
(feat) use thumbnail version of product images
2022-09-27 12:21:35 +02:00
Sylvain
e687e8ad02
(bug) order by price with unset prices
...
In product ordering, consider NULL prices (no price has been defined) as 0, to
order those products as lowest prices items
2022-09-27 11:50:35 +02:00
Sylvain
d6fbd90c7c
(feat) ability to disable the store
2022-09-27 11:14:27 +02:00
Sylvain
afc391f73e
(ui) move the admin/store menu under the events tab
2022-09-27 09:58:34 +02:00
Sylvain
e217f61524
(bug) undefined method privileged? for nil:Class
2022-09-27 09:43:21 +02:00
Guilherme Chaguri
75796074da
(Bug) Fix admin users groups being overriden by SSO group_id
2022-09-26 14:23:29 -03:00
Guilherme Chaguri
1bd97e3251
Allow searching by username
2022-09-26 13:41:50 -03:00
Sylvain
040f74a2fe
(merge) Merge branch 'product-store_integration' into product-store
2022-09-26 17:29:12 +02:00
Sylvain
75a4038a60
(feat) save/restore filters in admin/store/products
2022-09-26 17:18:52 +02:00
Sylvain
af81f10a4e
(bug) div cannot appear as a descendant of p
2022-09-26 16:44:14 +02:00
Sylvain
bc09450418
(bug) product store filtering
...
- Do not reset the category when reseting the filters
- Prevent filtering by internal stock when user is not privileged
2022-09-26 15:45:52 +02:00
Sylvain
46d1127efc
(bug) div cannot appear as a descendant of p
2022-09-26 15:31:57 +02:00
Sylvain
498ed0d115
(bug) cannot render the machine filters
...
if a default machines list was not provided to the machines-filters component, the component rendering is broken
2022-09-26 15:25:15 +02:00
Sylvain
1b930d2005
(feat) restore the filters from the URL
2022-09-26 15:23:07 +02:00
Sylvain
6b7daade5f
(feat) save filters to the URL
2022-09-26 12:41:20 +02:00
vincent
6aaabe5b05
(i18n) Add missing translations
2022-09-22 11:23:26 +02:00
vincent
4fe2679808
(quality) refacto item quantity input
2022-09-21 12:27:20 +02:00
Sylvain
57e3dda2cd
(feat) products filtering in public store
2022-09-21 11:51:41 +02:00
vincent
e4c0c10ef3
(merge) branch 'origin/product-store_filtering'
2022-09-20 17:36:23 +02:00
Sylvain
c23b57131b
(bug) fix admin/orders & public/store due to refactoring
2022-09-20 17:12:45 +02:00
Sylvain
117c9bb1dd
(feat) products list ordering
2022-09-20 15:47:15 +02:00
Sylvain
a41e5a93e5
(feat) products filtering for admin view
2022-09-20 15:30:44 +02:00
vincent
0345476b5f
(merge) branch 'origin/product-store'
2022-09-20 15:25:21 +02:00
vincent
75d327f410
(quality) Improve responsive
2022-09-20 15:21:44 +02:00
Sylvain
586dd5f9b5
(quality) extract filter in separate components
2022-09-20 09:24:35 +02:00
vincent
945428e71c
(quality) Refacto tooltip
2022-09-20 09:24:05 +02:00
vincent
9742558cfa
(feat) Save product categories' positions
2022-09-20 09:24:05 +02:00
vincent
b5c924a8e0
(bug) Fix filter name
2022-09-20 09:24:05 +02:00
vincent
d0e68fbf21
(quality) Refacto/style active orders list's filters
2022-09-20 09:24:04 +02:00
vincent
b7e128a63c
(feat) Add filters
2022-09-20 09:24:04 +02:00
Sylvain
5d2bd250a8
(quality) improved comments
2022-09-20 09:24:03 +02:00
Du Peng
ded9b4a1e8
(bug) product slug isn't unique
2022-09-19 19:31:43 +02:00
Du Peng
1aa058f3d6
(feat) allow product price = 0
2022-09-19 19:27:11 +02:00
Du Peng
906931f40f
(bug) save double product image when creation of product
2022-09-19 19:09:54 +02:00
Du Peng
b5ffae1fb6
(bug) form input cannot save a float
2022-09-19 19:08:52 +02:00
Du Peng
c424e80f8b
(feat) check order's item amount and quantity min before checkout
2022-09-19 16:51:50 +02:00
Du Peng
e2b6267924
(feat) cannot delete a product if it is used in order
2022-09-19 15:20:42 +02:00
Du Peng
034b6b478e
(feat) order avoir reference
2022-09-16 19:12:53 +02:00
Du Peng
cbed318c3f
(feat) refund an order by admin
2022-09-16 18:31:20 +02:00
vincent
2e1784b291
(quality) Refacto tooltip
2022-09-16 17:58:19 +02:00
Du Peng
b635113843
(bug) all orders is shown in my orders of admin
2022-09-16 17:58:02 +02:00
Du Peng
96a0f10747
(feat) add delivered state to order
2022-09-16 17:54:41 +02:00
Du Peng
a67d6264b3
(feat) cancel order can't create product stock movement
2022-09-16 17:19:26 +02:00
Du Peng
be96e42f26
(bug) client can add product to cart with a out of stock quantity
2022-09-16 17:10:13 +02:00
vincent
154d2c5565
(feat) Save product categories' positions
2022-09-16 17:01:56 +02:00
Du Peng
8c75b5fdd4
(bug) product stock status and quantity min to cart
2022-09-16 16:50:05 +02:00
vincent
22cb169778
(bug) Fix filter name
2022-09-16 16:06:58 +02:00
vincent
b1cea8f2dd
(quality) Refacto/style active orders list's filters
2022-09-16 15:58:18 +02:00
vincent
ffafb223f1
(merge) branch 'origin/product-store'
2022-09-16 14:13:29 +02:00
Du Peng
6fc0b935d9
(bug) change product stock movement type
2022-09-16 12:08:07 +02:00
vincent
9a10c992c2
(feat) Add filters
2022-09-16 11:54:58 +02:00
Du Peng
010718d53e
(merge) store manage the orders by admin
2022-09-16 11:45:58 +02:00
Du Peng
53004767bf
(feat) add order action ready/in_progress/canceled
2022-09-16 11:38:11 +02:00
Du Peng
f015e23a85
(wip) change order state by admin
2022-09-15 20:19:19 +02:00
Du Peng
947c69c4ed
(feat) improve orders filter
2022-09-15 12:38:34 +02:00
Du Peng
b87355bc5a
(feat) orders filter by admin
2022-09-14 19:54:24 +02:00
Sylvain
850076f79a
(bug) undefined method due to merge conflict
...
undefined method `amount_multiplied_by_hundred' for ProductService:Class
2022-09-14 15:19:32 +02:00
Sylvain
c4baf89c54
(merge) Merge branch 'product-store_stocks' into product-store
2022-09-14 15:15:47 +02:00
Sylvain
6b224d7db1
(feat) alert unsaved changes
...
if the user tries to quit the product form, he will
be alerted about unsaved changes, if any
2022-09-14 14:51:54 +02:00
Du Peng
9b3a1c0634
(feat) add cart status color
2022-09-14 09:37:14 +02:00
Du Peng
007f7d55ba
(bug) add product to cart button quantity min error
2022-09-14 09:26:29 +02:00
Du Peng
32b19ed4f7
(feat) manage orders in admin dashbaord
2022-09-13 19:47:19 +02:00
Du Peng
f130ba46c1
(feat) show product sku in cart and order detail
2022-09-13 18:55:08 +02:00
Du Peng
522b559ced
(feat) add payment status to order
2022-09-13 18:43:37 +02:00
Sylvain
c381c985d2
(wip) unsaved form alert
2022-09-13 17:18:35 +02:00
Du Peng
b542cbab11
(bug) can't save product's price < 1
2022-09-13 16:56:36 +02:00
Du Peng
b76c7889ac
(bug) fix add to cart button can't apply a quantity min
2022-09-13 16:36:44 +02:00
Du Peng
7673c1f814
(feat) sort order lists by created at date
2022-09-13 16:11:27 +02:00
Sylvain
feabded2a0
(feat) update the stock total
2022-09-13 15:01:55 +02:00
Du Peng
42f7320e63
(feat) show payment info in order
2022-09-13 14:05:31 +02:00
Du Peng
0ee45f8404
(bug) fix comput the wallet amount that dont apply coupon
2022-09-13 12:36:18 +02:00
Peng
d491384326
(bug) fix comput the wallet amount that dont apply coupon
2022-09-13 10:27:46 +00:00
Du Peng
dbe4570c30
(feat) client can show orders in dashbaord
2022-09-12 19:44:13 +02:00
Sylvain
f705f71c4f
(feat) display/remove ongoing stocks operations
2022-09-12 15:55:41 +02:00
Sylvain
36704be01d
(bug) do not verify group change when no initial group
2022-09-12 12:19:31 +02:00
Sylvain
3bf08973fb
(bug) can't complete profile if phone has hyphens or spaces
2022-09-12 11:51:28 +02:00
Sylvain
e3b62df7d4
(bug) admin can't move/cancel event reservation
2022-09-12 09:57:54 +02:00
Du Peng
dff0cb26be
(bug) product pagination in store
2022-09-09 17:14:22 +02:00
Du Peng
9bfeaf3ef3
Merge branch 'product-store-invoice' into product-store
2022-09-09 16:37:33 +02:00
Du Peng
185589407f
(feat) order invoice
2022-09-09 16:35:49 +02:00
vincent
a1c6757cc3
(quality) Increase products per page count
2022-09-09 14:00:53 +02:00
vincent
dd26a1d9af
(merge) 'origin/product-store'
2022-09-09 13:54:42 +02:00
vincent
6678412cd6
(feat) pagination
2022-09-09 13:48:20 +02:00
Du Peng
2840c93823
(bug) fix invoice reference
2022-09-09 10:43:44 +02:00
Du Peng
50276f5b41
(feat) VAT for store's product and Accounting code/label
2022-09-09 09:31:00 +02:00
Sylvain
c968f7b1aa
(feat) stock management: create/show
2022-09-08 17:51:48 +02:00
Du Peng
cd1bfe976c
Merge branch 'product-store-payment' into product-store
2022-09-08 16:49:24 +02:00
Du Peng
334f365c2c
(feat) change store cart back url
2022-09-08 16:46:26 +02:00
Du Peng
5d243d3be6
(feat) change store cart url
2022-09-08 16:41:10 +02:00
Du Peng
aeae5f7aa0
(feat) add product to cart in product page
2022-09-08 16:27:34 +02:00
Du Peng
8d414a3172
(feat) admin can set offer for product in cart
2022-09-08 15:10:56 +02:00
vincent
9e4d6028c5
(merge) branch 'product-store_integration'
2022-09-08 14:06:38 +02:00
Du Peng
85720c31fa
(feat) order items order by created date
2022-09-08 12:13:34 +02:00
vincent
d5d8a972cf
(quality) Refacto orders views
2022-09-08 12:04:37 +02:00
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
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
783e86d9cc
(bug) fix slots creation
2022-07-18 17:18:00 +02:00
Sylvain
b2fd2e1b48
build all slots at reservation creation time
2022-07-18 17:18:00 +02:00
Sylvain
8be2425275
(wip) refactoring slots to be unique per availability time-slot
2022-07-18 17:18:00 +02:00
Guilherme Chaguri
27d71dcffd
(bug) Fix SSO data being overridden when it is empty and the user can change it
2022-07-14 17:55:36 -03:00
Guilherme Chaguri
6423255116
(bug) Fix admin group being replaced in SSO authentication
2022-07-14 17:03:22 -03: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
bec2e8a514
(bug) Gender, Address and Birthday are not mapped properly from SSO ( #365 )
2022-07-06 15:56:57 +02:00
Sylvain
4fe7226959
(bug) unable to import a new account from an SSO provider
2022-07-06 15:37:47 +02:00
Sylvain
9c72da8e6f
(bug) social networks icons not shown in firefox
2022-07-06 14:19:36 +02:00
Sylvain
3d566782f2
(bug) OIDC scopes are not saved
2022-07-06 13:16:09 +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
eb1c54d8f3
updated diagrams
2022-07-04 10:48:42 +02:00
vincent
f81cbc72fa
Increase About page title's size
2022-07-01 09:30:45 +02:00
Du Peng
a0d158974b
fix bug: validator of reservation can't find if slot has reserved by reservable type
2022-06-29 19:58:53 +02:00
Sylvain
6719469e76
(doc) add more description about the members import feature #364
2022-06-29 16:41:58 +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
6ce762f778
(bug) unable to reserve a space
2022-06-29 15:34:47 +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
Du Peng
35cc5ed149
fix variable name error
2022-06-27 15:54:25 +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
0510a5f3a3
(bug) when an empty data was retured by the SSO, unable to edit it
2022-06-27 12:51:38 +02:00
Sylvain
46b2ba1f54
(bug) when email was mapped from SSO but provided as empty string -> unable to merge account
2022-06-27 12:06:25 +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
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