1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-13 23:48:55 +01:00
Commit Graph

3012 Commits

Author SHA1 Message Date
Sylvain
4cc6574f58 (ui) refactor machine edition form 2022-12-21 14:05:09 +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