1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Commit Graph

719 Commits

Author SHA1 Message Date
Sylvain
43f45c383f (feat) cancel subscription 2023-01-03 17:17:39 +01:00
Sylvain
16c24e565c (feat) custom message on invoice PDF not found 2023-01-03 11:07:41 +01:00
Du Peng
29b92475bb (feat) Ability to filter uniq slots reserved in admin calendar 2023-01-02 19:20:02 +01:00
Sylvain
051f182839 (bug) clear date in suscription extend free days 2022-12-27 17:15:49 +01:00
Sylvain
7fc79d44e5 (feat) machines reservable or not 2022-12-27 16:14:29 +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
137b9f3c1b (feat) improved security when changing password 2022-12-22 11:07:14 +01:00
Sylvain
02a8202f2f (feat) private note 2022-12-21 14:14:39 +01:00
Sylvain
b552e5e626 (feat) rename client accounts to financial 2022-12-21 14:14:37 +01:00
Sylvain
31ba4d3486 (api) accounting: payment details 2022-12-21 14:14:35 +01:00
Sylvain
e3eb8eb516 (api) accounting: report external id for user 2022-12-21 14:14:35 +01:00
Sylvain
90dc38ed10 (feat) move external id to InvoicingProfile 2022-12-21 14:14:34 +01:00
Sylvain
9b5cf8842e (api) accounting: filter by type 2022-12-21 14:14:34 +01:00
Sylvain
9ac2655256 (feat) OpenAPI/users: filter by created_after 2022-12-21 14:14:30 +01:00
Sylvain
7659597e32 (doc) Updated OpenAPI documentation 2022-12-21 14:14:29 +01:00
Sylvain
4b84963d7f (feat) optional external id 2022-12-21 14:14:29 +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
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
514a797b64 (wip) accounting endpoint for the OpenAPI 2022-12-21 14:11:39 +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
be8ae01ba4 (ui) refactor plan form
Also: add advanced accounting to plans
2022-12-21 14:05:16 +01:00
Sylvain
4a9cbbb227 (feat) advanced accounting for products 2022-12-21 14:05:15 +01:00
Sylvain
7868f31a58 (feat) advanced accounting parameters
for: machines, spaces, trainings, events
2022-12-21 14:05:15 +01:00
Du Peng
f47440c85a (feat) add machine category 2022-12-20 18:45:53 +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
7b30086a34 (bug) unable to set amount to 4.85 2022-12-01 15:43:16 +01:00
Sylvain
8eaeb2df39 (bug) soft-destroyed still reported in OpenAPI
Also: improved testing
2022-11-23 11:59:06 +01:00
Sylvain
509dd0eb5f (feat) soft destroy machines/spaces 2022-11-22 14:17:25 +01:00
Sylvain
d9b3f22366 (bug) unable to export statistics 2022-11-16 16:55:56 +01:00
Sylvain
7c7ec0aa4c (feature) admin can buy product for himself 2022-11-04 12:18:04 +01: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
Du Peng
48de0f8b9e (bug) fix product and order error message 2022-10-14 12:57:55 +02:00
Du Peng
9834faf120 (bug) cant load order withdrawal instructions if no login 2022-10-13 17:57:26 +02:00
Du Peng
7e3cbf7172 (bug) cannot load order withdrawal instructions 2022-10-13 11:23:35 +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
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
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
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
0464aae23e (quality) compute withdrawal instructions server side 2022-10-05 12:06:35 +02:00
vincent
60c8102c39 (bug) fix product categories position after dnd 2022-10-04 18:03:18 +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
51aa967001 (feat) dismiss a user to a lower privileged role 2022-10-03 14:22:15 +02:00
Sylvain
a30eac10de (feat) humanize gateway error messages 2022-09-28 12:54:29 +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
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
a41e5a93e5 (feat) products filtering for admin view 2022-09-20 15:30:44 +02:00
vincent
9742558cfa (feat) Save product categories' positions 2022-09-20 09:24:05 +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
010718d53e (merge) store manage the orders by admin 2022-09-16 11:45:58 +02:00
Du Peng
f015e23a85 (wip) change order state by admin 2022-09-15 20:19:19 +02:00
Sylvain
c4baf89c54 (merge) Merge branch 'product-store_stocks' into product-store 2022-09-14 15:15:47 +02:00
Du Peng
b542cbab11 (bug) can't save product's price < 1 2022-09-13 16:56:36 +02:00
Sylvain
feabded2a0 (feat) update the stock total 2022-09-13 15:01:55 +02:00
Du Peng
dbe4570c30 (feat) client can show orders in dashbaord 2022-09-12 19:44:13 +02:00
Du Peng
dff0cb26be (bug) product pagination in store 2022-09-09 17:14:22 +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
Sylvain
c968f7b1aa (feat) stock management: create/show 2022-09-08 17:51:48 +02:00
Du Peng
8d414a3172 (feat) admin can set offer for product in cart 2022-09-08 15:10:56 +02:00
Du Peng
75b3295f65 (feat) allow to apply coupon in cart without login 2022-09-07 17:52:23 +02:00
Du Peng
79182fb8c1 Merge branch 'product_store-store' into product-store 2022-09-07 15:00:27 +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
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
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
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
981cffa27d pay cart with coupon code 2022-08-26 20:10:21 +02:00
Du Peng
49aa54193d rename operator id to operator_profile_id in order 2022-08-26 11:55:35 +02:00
Du Peng
97ee15cf78 rename order amount to total 2022-08-26 10:46:30 +02:00
Du Peng
d9687a007b fix various bugs for cart 2022-08-25 16:23:00 +02:00
Du Peng
193c21a583 payment of cart by stripe/payzen/local 2022-08-25 08:52:17 +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
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
Du Peng
272cbf165c create/edit product form 2022-08-23 16:02:08 +02:00
Du Peng
69e2b3e111 Product model/controller 2022-08-23 16:02:07 +02:00
Du Peng
778f98bd9a product category update position api 2022-08-23 16:02:04 +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
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