1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Commit Graph

7028 Commits

Author SHA1 Message Date
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
Sylvain
d9eee1aa3f (bug) user cannot see past availabilities 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
47d6f2e165 (i18n) Add missing translation 2022-10-27 09:55:15 +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
Du Peng
a9f0969f92 Merge branch 'product-store_test' into product-store 2022-10-25 19:11:44 +02:00
Du Peng
f771a829ab (test) add test on store 2022-10-25 19:10:14 +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
abea5006b2 (bug) fix test failing between 10:00 and 11:00 2022-10-25 10:53:56 +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
6eddadac69 (doc) updated deployment instructions 2022-10-24 12:14:10 +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
9623852b21 (doc) updated changelog 2022-10-24 10:52:26 +02:00
Sylvain
ffd4b6b3ba (security) updated nokogiri to 1.13.9 2022-10-24 10:50:54 +02:00
Sylvain
af0bd6b8ba
Merge pull request #407 from sleede/dependabot/bundler/nokogiri-1.13.9
Bump nokogiri from 1.13.8 to 1.13.9
2022-10-24 10:24:22 +02:00
Sylvain
2ba760cc00 (bug) portuguese time formatting (#405) 2022-10-24 10:20:49 +02:00
Sylvain
50138ece51 (feat) search by username (#401) 2022-10-24 10:17:07 +02:00
Sylvain
a3f3251b6b (bug) mail for shop invoice has wrong object 2022-10-24 10:13:46 +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
vincent
ab796991a6 (i18n) text update 2022-10-20 10:14:51 +02:00
dependabot[bot]
a124a44633
Bump nokogiri from 1.13.8 to 1.13.9
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.8...v1.13.9)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-19 16:20:52 +00:00