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

688 Commits

Author SHA1 Message Date
Sylvain
ed6a397b89 (test) test places cache 2023-02-15 10:29:56 +01:00
Sylvain
fea26285d6 (feat) improved calendars loading time
+ (feat) ability to choose a machine in the public calendar
2023-02-15 10:29:55 +01:00
Sylvain
d0239a0e25 (wip) move slot status request 2023-02-15 10:29:55 +01:00
Sylvain
986a663c40 (feat) places cache for slots 2023-02-15 10:29:54 +01:00
Sylvain
9f9a2e616f (feat) slots/availabilities status for pending reservations 2023-02-15 10:29:54 +01:00
Sylvain
473aedbdcb (feat) add reservations in cart/order 2023-02-15 10:29:53 +01:00
Sylvain
c24673fefa (quality) log errors to the JS console 2023-02-15 10:29:52 +01:00
Sylvain
bbaac2c122 (wip) use cartitem from order api 2023-02-15 10:29:51 +01:00
Sylvain
bfe0936b40 (feat) save both operator/customer for orders 2023-02-15 10:29:50 +01:00
Sylvain
48a44ff4f3 (feat) create cart items from the api 2023-02-15 10:29:50 +01:00
Sylvain
42d830b4f8 (feat) save cart items in db 2023-02-15 10:29:46 +01:00
Sylvain
6fa12d3996 (test) training default settings 2023-02-15 10:28:17 +01:00
Sylvain
2b42858229 (feat) display special style if a training override general settings 2023-02-15 10:28:16 +01:00
Sylvain
ddc2dd4c6e (feat) training auto cancel authorization and invalidation rule 2023-02-15 10:28:07 +01:00
Sylvain
78cb8b7854 (quality) isolate auto cancel features in separate service 2023-02-15 10:28:07 +01:00
Sylvain
a05ef1f0ba (feat) auto refund after trainings cancelled and notify 2023-02-15 10:28:05 +01:00
Sylvain
71305bbc8f (wip) notify admin on auto cancel 2023-02-15 10:28:04 +01:00
Sylvain
c804c84113 (feat) per training settings for auto cancel 2023-02-15 10:28:04 +01:00
Sylvain
e2edbb419a (feat) auto cancel trainings under the threshold 2023-02-15 10:28:04 +01:00
Karen
d80cc4769a (feat) filter for status in project gallery 2023-02-15 10:27:49 +01:00
Sylvain
4c4ebe3b47 (feat) report status of user's prepaid packs in dashboard 2023-02-15 10:27:08 +01:00
Sylvain
eba0c99ae5 (bug) date shift in event creation/update 2023-02-14 16:47:06 +01:00
Sylvain
04f933f94d (bug) deal with DST using Time instead of DateTime 2023-02-14 13:10:58 +01:00
Du Peng
e5eb24a9dc (bug) change event date with wrong timezone 2023-02-13 11:39:36 +01:00
Sylvain
4d942b4161 (quality) Optimized statistics fetcher service 2023-02-02 15:43:05 +01:00
Sylvain
193407e0da (bug) filter statistics by slot date 2023-02-02 11:02:33 +01:00
Sylvain
71579e7465 (wip) slot date in stats 2023-01-31 17:10:07 +01:00
Sylvain
98d6363525 (bug) unable to create a recurrent event 2023-01-31 11:39:51 +01:00
Sylvain
029eb90d78 (feat) soft-destroy a reserved event 2023-01-20 08:53:37 +01:00
Sylvain
f204f654c2 (feat) map external id from sso 2023-01-19 17:33:48 +01:00
Sylvain
91dd7b174e (bug) unable to export accounting if label not defined 2023-01-19 15:25:20 +01:00
Sylvain
5dae938078 (bug) empty object for some invoice item 2023-01-06 10:15:32 +01:00
Sylvain
7b195ab2ec (bug) unable to generate avoir label 2023-01-05 12:21:53 +01:00
Sylvain
10f054256e (feat) payment schedule due in invoices 2023-01-05 12:09:16 +01:00
Sylvain
7bb97d267d (feat) build accounting data for yesterday by default 2023-01-04 10:27:14 +01:00
Sylvain
3ec88c8f5f (bug) unable to udpate some settings 2023-01-03 10:36:45 +01:00
Sylvain
7cd689b92c (bug) product low stock notification 2022-12-28 11:01:05 +01:00
Sylvain
898ce07509 (merge) Merge branch 'staging' into dev 2022-12-27 12:20:18 +01:00
Sylvain
f8904dfb9c (feat) customize VAT name 2022-12-27 12:13:24 +01:00
Sylvain
574974c239 (merge) Merge branch 'machine_category' into staging 2022-12-27 10:59:36 +01:00
Sylvain
e139067954 (feat) prevent generate invoices at 0 2022-12-23 14:14:42 +01:00
Sylvain
137b9f3c1b (feat) improved security when changing password 2022-12-22 11:07:14 +01:00
Sylvain
b552e5e626 (feat) rename client accounts to financial 2022-12-21 14:14:37 +01:00
Sylvain
4d7e09c98d (feat) multiple accounting journals 2022-12-21 14:14:36 +01:00
Sylvain
90dc38ed10 (feat) move external id to InvoicingProfile 2022-12-21 14:14:34 +01:00
Sylvain
3a05398c8c (api) accounting: report build status 2022-12-21 14:14:33 +01:00
Sylvain
b7838db648 (feat) clean accounting lines async before rebuilding 2022-12-21 14:14:33 +01:00
Sylvain
fdddb545d9 (feat) OpenAPI/users: gender, organization, address 2022-12-21 14:14:31 +01:00
Sylvain
4b84963d7f (feat) optional external id 2022-12-21 14:14:29 +01:00
Sylvain
7cd25a68df (bug) unable to export VAT 2022-12-21 14:14:27 +01:00
Sylvain
2cf18c277c (bug) create recurrent event
Also: (test) test trainings API
Also: (test) test create recurrent event
2022-12-21 14:12:16 +01:00
Sylvain
5d1c70a26e (test) accounting service 2022-12-21 14:12:15 +01:00
Sylvain
a55880a0ad (feat) OpenAPI endpoint for accounting
Also: (bug) filter by array in openAPI = error
2022-12-21 14:12:14 +01:00
Sylvain
749f848034 (feat) rebuild accounting lines on updates 2022-12-21 14:12:13 +01:00
Sylvain
b3072ec444 (feat) auto fix rouding errors on accounting lines
Also: (ui) added help tooltips on some input fields
2022-12-21 14:12:10 +01:00
Sylvain
af3def0e2e (feat) save the accounting data in DB
Previously, the accounting data were built on demand,
extracting the data from the invoices on-the-fly.
This is intended to be used only once in a while, so there was
no performance issue with that.
Now, we want those data to be accessed from the OpenAPI,
so building them on-the-fly would be very much
intensive and resouces heavy. So we build them each nights
using a scheduled worker and save them in the database
2022-12-21 14:11:40 +01:00
Sylvain
25edbcfbb0 (feat) use advanced accounting codes in accounting export 2022-12-21 14:05:17 +01:00
Sylvain
462a764276 (quality) moved accounting services to a decicated module 2022-12-21 14:05:17 +01:00
Sylvain
bec610458c (bug) do not create plans for disabled groups
Also: (bug) unable to create plan without partner
(bug) unable to set plan price to a decimal number
(bug) unable to create a plan without toggling the partner switch
(quality) linted PlansService
2022-12-21 14:05:16 +01:00
Sylvain
7868f31a58 (feat) advanced accounting parameters
for: machines, spaces, trainings, events
2022-12-21 14:05:15 +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
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
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
dea9663f37 Added reservation deadline parameter 2022-11-29 17:02:01 -03: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
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
d9b3f22366 (bug) unable to export statistics 2022-11-16 16:55:56 +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
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
46e042fd38 (bug) test on invoice items was not idempotent 2022-10-28 10:25:10 +02:00
Sylvain
a3190115ab (bug) invoice rounding error using coupons 2022-10-27 16:04: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
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
Sylvain
fdac8168ef (quality) refactored SingleSignOnConcern to match rubocop rules 2022-10-24 11:43:30 +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
5804b6230d (bug) show product count is only active in category 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
0c19c9856f (bug) filter product is available 2022-10-20 19:14:16 +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
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
3f7b8317e7 (bug) update order status error 2022-10-18 09:56:43 +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
9ddc21619b (bug) fix product cannot update low stock alert 2022-10-13 14:42:32 +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
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
Sylvain
70f7ef8951 (feat) build stats in elasticsearch 2022-10-11 15:14:53 +02:00
Sylvain
3e6763f14a (bug) wallet transation not returned if success 2022-10-11 11:41:44 +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
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
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
1104316e62 (feat) update cart created_at after add a new item when cart is empty 2022-10-04 17:42:32 +02:00
Sylvain
43fbf2ac8d (feat) withdrawal instructions in order ready email 2022-10-04 16:59:51 +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
Sylvain
3a8082db97 (merge) Merge remote-tracking branch 'origin/product-store_cart' into product-store 2022-10-04 09:41:47 +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
51aa967001 (feat) dismiss a user to a lower privileged role 2022-10-03 14:22:15 +02:00
Du Peng
274d661a58 (feat) always check cart items when user in cart page 2022-09-28 12:14:58 +02:00
Sylvain
a8b9ebb665 (quality) add eager loading for orders 2022-09-28 10:34:02 +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
f61e784ace (feat) prevent show product in store if price not set 2022-09-27 15:58:59 +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
e217f61524 (bug) undefined method privileged? for nil:Class 2022-09-27 09:43:21 +02:00
Guilherme Chaguri
1bd97e3251 Allow searching by username 2022-09-26 13:41:50 -03:00
Sylvain
75a4038a60 (feat) save/restore filters in admin/store/products 2022-09-26 17:18:52 +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
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
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
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
cbed318c3f (feat) refund an order by admin 2022-09-16 18:31:20 +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
Du Peng
6fc0b935d9 (bug) change product stock movement type 2022-09-16 12:08:07 +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