Sylvain
8df60a8712
(ui) refactor space form
2022-12-21 14:05:14 +01:00
Sylvain
3d88266fe6
(ui) refactor training form
2022-12-21 14:05:13 +01:00
Sylvain
4203da097c
(ui) refactor machine creation form
2022-12-21 14:05:13 +01:00
Sylvain
4cc6574f58
(ui) refactor machine edition form
2022-12-21 14:05:09 +01:00
Du Peng
bcd76ee6d5
(bug) always show machine availability in calender if machine module is inactive
2022-12-20 18:46:25 +01:00
Du Peng
f47440c85a
(feat) add machine category
2022-12-20 18:45:53 +01:00
Sylvain
795928c07c
(feat) Add reservation deadline parameter
2022-12-19 09:58:44 +01:00
Sylvain
66b1db6d0a
(bug) phone/adresse required not shown
2022-12-16 15:35:02 +01:00
Guilherme Chaguri
9b2e1909d9
Allow last minute reservations by admins
2022-12-16 10:48:56 -03:00
Sylvain
380373a16d
Merge branch 'fix/availabitilies_export_reservations' of https://github.com/Guichaguri/fab-manager into Guichaguri-fix/availabitilies_export_reservations
2022-12-14 12:30:11 +01:00
Sylvain
14b5c40ec8
Merge branch 'feature/reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/reservation-deadlines
2022-12-14 11:30:54 +01:00
Du Peng
3224daf791
(bug) unable to credit wallet amount
2022-12-12 16:25:29 +01:00
Du Peng
766c08a302
(bug) fix unable to update/delete a space
2022-12-12 14:19:57 +01:00
Sylvain
575c7c7d62
(feat) updated FabAnalytics reports to include new features
2022-12-01 16:34:14 +01:00
Sylvain
7b30086a34
(bug) unable to set amount to 4.85
2022-12-01 15:43:16 +01:00
Sylvain
963d2e93bd
(bug) unable to export statistics
2022-12-01 13:03:19 +01:00
Guilherme Chaguri
be4ea06fdf
(Bug) Fix reservations count from spaces in availabilities export
2022-11-29 18:18:47 -03:00
Guilherme Chaguri
dea9663f37
Added reservation deadline parameter
2022-11-29 17:02:01 -03:00
Sylvain
8eaeb2df39
(bug) soft-destroyed still reported in OpenAPI
...
Also: improved testing
2022-11-23 11:59:06 +01:00
Du Peng
1f5808da4a
(quality) use point instant of square brackets in react-form-hook field path
2022-11-22 17:12:39 +01:00
Du Peng
fe0af02ba8
(bug) unable set a main image of product and remove an image of product
2022-11-22 16:31:34 +01:00
Sylvain
509dd0eb5f
(feat) soft destroy machines/spaces
2022-11-22 14:17:25 +01:00
Sylvain
16087d3aa3
(bug) objects not sync on Stripe
2022-11-21 16:56:28 +01:00
Sylvain
b2540a1cd4
(bug) broken display of machines pages
2022-11-21 15:22:23 +01:00
Sylvain
451cd0e915
(test) add admin offer product to himself
...
Also: split AdminPayOrderTest in two files
2022-11-17 17:14:31 +01:00
Sylvain
5860466be3
(bug) unable to download existing stats export
2022-11-17 16:35:26 +01:00
Sylvain
c284190253
(quality) lint HistoryValue
2022-11-17 11:47:47 +01:00
Sylvain
eb15e0e5a2
(feat) default sort invoices by date
2022-11-17 11:20:49 +01:00
Sylvain
c6aef07fb4
(bug) unable to reserve a machine with payment on site
2022-11-17 10:56:03 +01:00
Sylvain
d9b3f22366
(bug) unable to export statistics
2022-11-16 16:55:56 +01:00
Sylvain
25606a2642
(bug) unable to merge an SSO account with an existing account
2022-11-15 15:12:08 +01:00
Sylvain
a776b9cc6a
(bug) free disk space not verified in some cases
2022-11-14 09:32:32 +01:00
Du Peng
ef6bc6c046
Merge branch 'product-store' into product-store_dev
2022-11-07 18:58:22 +01:00
Du Peng
ac2de3d22e
(bug) admin cannot pay order by card
2022-11-07 18:51:49 +01:00
Du Peng
42be9ae3e7
(bug) fix cant set payment_method if admin pay a reservation himself in invoice
2022-11-07 16:04:53 +01:00
Sylvain
35656229ad
(bug) should not change group of subscriber
2022-11-07 15:14:33 +01:00
Sylvain
a8623487fd
(bug) admin shop for himself
...
Crash if there was no offered product when the admin select himself in the list
2022-11-07 11:56:35 +01:00
Sylvain
d3d285dfbe
(bug) configuring price does not edit the right prices
2022-11-07 11:40:36 +01:00
Sylvain
7c7ec0aa4c
(feature) admin can buy product for himself
2022-11-04 12:18:04 +01:00
Sylvain
60580a2bae
(bug) no plan for the user's group
2022-11-04 09:58:32 +01:00
Sylvain
c9c9ed9a02
(feature) auto validate admins
2022-11-04 09:46:17 +01:00
Sylvain
1f97393a12
(bug) invalid VAT rate
2022-11-04 08:12:13 +01:00
Sylvain
83fb4f11ff
(bug) switch display is broken
2022-11-03 10:07:14 +01:00
Sylvain
20e50bda13
(bug) fix file/image input components
2022-11-03 09:26:21 +01:00
Sylvain
a97e08b43b
(quality) refactored upload components
2022-10-28 14:59:52 +02:00
Sylvain
74f826eef7
(merge) Merge branch 'product-store' into product-store_dev
2022-10-28 14:32:11 +02:00
Sylvain
9f3cbc46a3
(quality) refactor selectOption
2022-10-28 14:30:41 +02:00
Sylvain
46e042fd38
(bug) test on invoice items was not idempotent
2022-10-28 10:25:10 +02:00
Du Peng
65ded9d847
Merge branch 'product-store' into product-store_dev
2022-10-27 18:08:15 +02:00
Sylvain
71d5abdedb
(bug) invalid coupon amount in PDF invoices
2022-10-27 16:45:38 +02:00
Sylvain
a3190115ab
(bug) invoice rounding error using coupons
2022-10-27 16:04:21 +02:00
vincent
feb191ca70
(ui) Fix image bg and list items border
2022-10-27 08:52:21 +02:00
Sylvain
fc2b52c2ca
(bug) invalid accounting export for store orders
2022-10-26 14:32:19 +02:00
Du Peng
6d448e0af2
(merge) merge dev and product-store
2022-10-26 09:37:31 +02:00
Sylvain
0c785aae06
(feat) default image for machines
2022-10-25 17:08:32 +02:00
Sylvain
fcbee960a7
(bug) reload store on category url change
2022-10-25 14:50:09 +02:00
Sylvain
c9901a89e1
(test) test admin reserves for himself
2022-10-25 14:31:31 +02:00
Sylvain
744b811b62
(feat) remove admins group: allow admins to reserve
2022-10-25 11:57:26 +02:00
Sylvain
45129e3e37
(quality) linted code about payment schedules
2022-10-25 10:52:33 +02:00
Sylvain
f9f60cba17
(wip) allow admin to reserve for himself
2022-10-24 17:39:16 +02:00
Sylvain
d4613cdbcc
(quality) refactored EventService to match rubocop rules
2022-10-24 15:56:04 +02:00
Du Peng
0fddd22df8
(bug) admin cannot filter product availble in store
2022-10-24 12:34:20 +02:00
Sylvain
873752172d
(bug) no statistics on trainings and spaces reservations
2022-10-24 12:12:49 +02:00
vincent
b3d9c6b3bf
(i18n) update
2022-10-24 12:10:42 +02:00
Sylvain
fdac8168ef
(quality) refactored SingleSignOnConcern to match rubocop rules
2022-10-24 11:43:30 +02:00
Sylvain
e5fc418ecf
Merge branch 'fix/sso-admin-group-id' of https://github.com/Guichaguri/fab-manager into Guichaguri-fix/sso-admin-group-id
2022-10-24 10:53:06 +02:00
Sylvain
50138ece51
(feat) search by username ( #401 )
2022-10-24 10:17:07 +02:00
Du Peng
ef3a8641d5
(feat) update created at date after paid an order
2022-10-21 19:10:57 +02:00
Du Peng
1f7f9be37d
(feat) if a child category is selected, with every sibling of it, we dont automatically select its parent
2022-10-21 18:57:11 +02:00
Du Peng
b1135f6df0
(feat) save latest product filter when click back button
2022-10-20 19:14:16 +02:00
Du Peng
2f676d1a89
(feat) add loading for save product btn
2022-10-20 19:14:16 +02:00
Du Peng
531b8d4947
(quality) clean code
2022-10-20 19:14:16 +02:00
Du Peng
c43ce2b142
(feat) hidden product count in category config page
2022-10-20 19:14:16 +02:00
Du Peng
5804b6230d
(bug) show product count is only active in category
2022-10-20 19:14:16 +02:00
Du Peng
9eeef449ab
(bug) product category filter
2022-10-20 19:14:16 +02:00
Du Peng
b2ddc48d51
(bug) product search accent letter
2022-10-20 19:14:16 +02:00
Du Peng
de960cf00c
(bug) filter product is available in admin products list
2022-10-20 19:14:16 +02:00
Du Peng
0abb3641df
(bug) product category order in store
2022-10-20 19:14:16 +02:00
Du Peng
0c19c9856f
(bug) filter product is available
2022-10-20 19:14:16 +02:00
vincent
9f32784aec
(ui) add identation for the select sub categories options
2022-10-20 14:25:11 +02:00
vincent
1db8bd8537
(ui) fix product card's status colors
2022-10-20 11:39:44 +02:00
Du Peng
1024b6fdc4
(bug) add fix prepaid pack hours dont count down script
2022-10-19 16:18:17 +02:00
Du Peng
c48956be10
(bug) unable apply a coupon if this coupon has used by an user removed
2022-10-19 11:38:17 +02:00
Du Peng
6bdbe1fe50
(bug) cannot load statistic
2022-10-18 12:46:20 +02:00
Du Peng
1dee7d6f93
(bug) cannot generate order statistic if no set a category
2022-10-18 12:45:54 +02:00
Du Peng
ebbbb47e67
(bug) cannot show order statstic
2022-10-18 12:44:19 +02:00
Du Peng
7155a00870
Merge branch 'product-store_integration' into product-store
2022-10-18 10:31:37 +02:00
Du Peng
3f7b8317e7
(bug) update order status error
2022-10-18 09:56:43 +02:00
vincent
d2338dee6a
(ui) Fix nav-tabs
2022-10-18 08:42:48 +02:00
Du Peng
62a62ec1eb
(bug) fix cannot debit prepaid pack after reservation of machine
2022-10-14 17:00:38 +02:00
Du Peng
48de0f8b9e
(bug) fix product and order error message
2022-10-14 12:57:55 +02:00
Du Peng
b9397388c5
(feat) stock limit if stock <= stock threshold
2022-10-14 11:27:59 +02:00
Du Peng
1b7c4862c5
(quality) refactoring cart add/remove/set_quantity item total compute
2022-10-14 10:52:24 +02:00
Du Peng
6dea7ba6b3
(feat) save operator id in order activity after paid
2022-10-14 10:12:28 +02:00
Du Peng
5a8aa747e5
Merge branch 'product-store_integration' into product-store
2022-10-13 18:39:29 +02:00
Du Peng
e462079754
(bug) product limit stock error
2022-10-13 18:38:42 +02:00
Du Peng
9834faf120
(bug) cant load order withdrawal instructions if no login
2022-10-13 17:57:26 +02:00
Du Peng
ef3b876bd0
(feat) disable create card if store hidden
2022-10-13 17:56:34 +02:00
Du Peng
5d0e170b92
(bug) load content when tabs are clicked in admin store
2022-10-13 17:44:44 +02:00
vincent
90005c2643
(ui) small fixes
2022-10-13 17:28:24 +02:00
vincent
6dcfd4d99e
(i18n) fix placeholder
2022-10-13 16:57:03 +02:00
vincent
c883a27c95
(i18n) fix text
2022-10-13 16:41:23 +02:00
vincent
6383b2ed80
(ui) fix colors
2022-10-13 16:38:32 +02:00
Du Peng
8537a580e9
(feat) dont scroll down to product list after fetch
2022-10-13 14:51:46 +02:00
Du Peng
9ddc21619b
(bug) fix product cannot update low stock alert
2022-10-13 14:42:32 +02:00
Du Peng
5de91acf88
(bug) fix save empty product image and is_main cannot set to new image after remove old main image
2022-10-13 12:38:54 +02:00
Du Peng
7e3cbf7172
(bug) cannot load order withdrawal instructions
2022-10-13 11:23:35 +02:00
Du Peng
11a0f62452
(bug) cannot access store
2022-10-12 19:40:49 +02:00
vincent
bd10f0235b
(ui) fix store settings layout
2022-10-12 18:20:36 +02:00
Sylvain
5be2c79569
(bug) prevent links on nothing in wysiwyg editor
2022-10-12 17:02:02 +02:00
Sylvain
11c8b25357
(feat) hide the store to members/visitors
2022-10-12 16:48:39 +02:00
Sylvain
f80aec1ef2
(merge) Merge branch 'product-store_stats' into product-store
2022-10-12 14:20:38 +02:00
Sylvain
eb0639f7b2
(quality) refactored API::StatisticsController
2022-10-12 14:19:59 +02:00
Sylvain
0016f248d8
(feat) report store orders in the stats
2022-10-12 11:42:15 +02:00
Sylvain
33238e2ea5
(bug) home page tour tries to start after the page was unloaded
2022-10-12 11:07:47 +02:00
Du Peng
ef9a5c22bb
(feat) clone a product
2022-10-11 18:53:12 +02:00
Sylvain
d9e8d0e40d
(wip) report store statistics in UI
2022-10-11 17:23:45 +02:00
Du Peng
7700737cf3
(bug) fix cannot remove product if it has the relation with machines
2022-10-11 16:40:45 +02:00
Sylvain
70f7ef8951
(feat) build stats in elasticsearch
2022-10-11 15:14:53 +02:00
Sylvain
6df9724527
(quality) disable Rails/RedundantPresenceValidationOnBelongsTo
...
This setting was disabled in config/application.rb:
`config.active_record.belongs_to_required_by_default = false`,
so we must configure the linter accordingly.
Also: linting some little bit of code
2022-10-11 11:44:08 +02:00
Sylvain
3e6763f14a
(bug) wallet transation not returned if success
2022-10-11 11:41:44 +02:00
Sylvain
da11a592e8
(quality) lint wallet transaction
2022-10-11 10:59:48 +02:00
Sylvain
b4f3f7f737
(wip) building stats to ES
2022-10-10 17:42:25 +02:00
Sylvain
ef502070be
Merge branch 'dev' into product-store
2022-10-10 16:23:08 +02:00
Sylvain
fe419f295a
(bug) erroneous statistics
...
The date of the statistics data was using the date of the regenerate
command parameter. This was ok for the nightly builds but definitly not
for bulk regeneration
2022-10-10 14:46:10 +02:00
Sylvain
6a0b896815
(bug) ArgumentError (comparison of Integer with nil failed)
...
this crash occured when creating/updating a product without activating
the low stock alert
2022-10-10 10:00:06 +02:00
Sylvain
a63975dd18
(merge) Merge branch 'dev' into product-store
2022-10-05 17:16:04 +02:00
Sylvain
d750885f3b
(feat) filter and paginate stock movements
2022-10-05 16:58:40 +02:00
Sylvain
3cb70c5cf0
(quality) remove unused props
2022-10-05 16:09:18 +02:00
Sylvain
794f6130d2
(security) access to admin/store is restricted to admins & managers
...
also, access to admin/store/settings is not allowed to managers
2022-10-05 16:06:51 +02:00
Sylvain
8dd4463a14
(feat) alert on low stock threshold
2022-10-05 15:51:33 +02:00
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