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

760 Commits

Author SHA1 Message Date
Sylvain
473aedbdcb (feat) add reservations in cart/order 2023-02-15 10:29:53 +01:00
Sylvain
bbaac2c122 (wip) use cartitem from order api 2023-02-15 10:29:51 +01:00
Sylvain
48a44ff4f3 (feat) create cart items from the api 2023-02-15 10:29:50 +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
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
Karen
b9d86aecdc (quality) status property :label is now :name for better coherence 2023-02-15 10:27:54 +01:00
Karen
d80cc4769a (feat) filter for status in project gallery 2023-02-15 10:27:49 +01:00
Karen
4aba30c5e3 (feat) project statuses api 2023-02-15 10:27:13 +01:00
Sylvain
4c4ebe3b47 (feat) report status of user's prepaid packs in dashboard 2023-02-15 10:27:08 +01:00
Du Peng
37989aec63 (feat) OpenAPI endpoint to fetch subscription data 2023-02-06 16:46:54 +01:00
Sylvain
1644bc43db (bug) invalid date display in negative timezones 2023-02-03 17:25:24 +01:00
Sylvain
71579e7465 (wip) slot date in stats 2023-01-31 17:10:07 +01:00
Sylvain
b14329497b (test) abuses, age_range, categories 2023-01-06 17:18:44 +01:00
Sylvain
7fc79d44e5 (feat) machines reservable or not 2022-12-27 16:14:29 +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
ed4295b847 (bug) broken notifications if slot cancelled 2022-12-22 15:12:56 +01:00
Sylvain
02a8202f2f (feat) private note 2022-12-21 14:14:39 +01:00
Sylvain
86756f911b (bug) api/accounting: amounts expressed in centimes 2022-12-21 14:14:38 +01:00
Sylvain
b552e5e626 (feat) rename client accounts to financial 2022-12-21 14:14:37 +01:00
Sylvain
40dd3f11b8 (api) accounting: invoice.payment_details.payment_mean 2022-12-21 14:14:36 +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
3a05398c8c (api) accounting: report build status 2022-12-21 14:14:33 +01:00
Sylvain
4763014ec8 (api) users: first_name, last_name 2022-12-21 14:14:31 +01:00
Sylvain
fdddb545d9 (feat) OpenAPI/users: gender, organization, address 2022-12-21 14:14:31 +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
ad8e95922f (bug) machine advanced accouting codes, files attachements, image 2022-12-21 14:14:27 +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
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
Sylvain
3d796549f2 (ui) refactor event form 2022-12-21 14:05:14 +01:00
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
Du Peng
f47440c85a (feat) add machine category 2022-12-20 18:45:53 +01: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
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
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
b2540a1cd4 (bug) broken display of machines pages 2022-11-21 15:22:23 +01:00
Sylvain
20e50bda13 (bug) fix file/image input components 2022-11-03 09:26:21 +01:00
Sylvain
11c8b25357 (feat) hide the store to members/visitors 2022-10-12 16:48:39 +02:00
Du Peng
ef9a5c22bb (feat) clone a product 2022-10-11 18:53:12 +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
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
134d8147b6 (feat) add product url in order item 2022-10-04 18:50:29 +02:00
Sylvain
43fbf2ac8d (feat) withdrawal instructions in order ready email 2022-10-04 16:59:51 +02:00
Sylvain
4cfb1a1253 (bug) create a category result in error 2022-10-04 10:28:37 +02:00
Sylvain
e51592061a (feat) count products in categories 2022-10-03 15:56:46 +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
18dc24e366 (feat) use thumbnail version of product images 2022-09-27 12:21:35 +02:00
Sylvain
d6fbd90c7c (feat) ability to disable the store 2022-09-27 11:14:27 +02:00
Sylvain
a41e5a93e5 (feat) products filtering for admin view 2022-09-20 15:30:44 +02:00
Du Peng
cbed318c3f (feat) refund an order by admin 2022-09-16 18:31:20 +02:00
Du Peng
8c75b5fdd4 (bug) product stock status and quantity min to cart 2022-09-16 16:50:05 +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
Du Peng
b87355bc5a (feat) orders filter by admin 2022-09-14 19:54:24 +02:00
Sylvain
c4baf89c54 (merge) Merge branch 'product-store_stocks' into product-store 2022-09-14 15:15:47 +02:00
Du Peng
f130ba46c1 (feat) show product sku in cart and order detail 2022-09-13 18:55:08 +02:00
Du Peng
522b559ced (feat) add payment status to order 2022-09-13 18:43:37 +02:00
Du Peng
b76c7889ac (bug) fix add to cart button can't apply a quantity min 2022-09-13 16:36:44 +02:00
Du Peng
42f7320e63 (feat) show payment info in order 2022-09-13 14:05:31 +02:00
Du Peng
dbe4570c30 (feat) client can show orders in dashbaord 2022-09-12 19:44:13 +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
85720c31fa (feat) order items order by created date 2022-09-08 12:13:34 +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
Sylvain
5bc1da7cf5 (feat) coupon in reservations export 2022-09-05 11:39:23 +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
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
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
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
ab800a519f store cart 2022-08-19 20:03:09 +02:00
Du Peng
16288ae2bd fablab store page 2022-08-16 19:47:27 +02:00
Du Peng
1cef45e3d7 add product stock mouvements 2022-08-08 18:04:14 +02:00
Du Peng
f345fc2443 add is_main to product image 2022-08-03 20:16:21 +02:00
Du Peng
fc4fd78843 product files and images upload 2022-08-03 10:25:36 +02:00
Du Peng
5e1436eda4 create/edit product form 2022-08-03 10:18:00 +02:00
Du Peng
1e3e7854b2 Product model/controller 2022-08-03 10:16:36 +02:00
Du Peng
432b60ca9a store product category create/list/update/delete 2022-08-03 10:16:08 +02:00
Du Peng
549a719413 Merge remote-tracking branch 'origin/2pcjmhw-xss-vulnerability' into dev 2022-08-01 18:17:08 +02:00
Nicolas Florentin
a8d0df11d3 projects/index/json.jbuilder : sanitize project description 2022-07-27 17:16:48 +02:00
Nicolas Florentin
e4fb068c12 fix xss vulnerability in projects 2022-07-27 17:16:38 +02:00
Sylvain
be5b6af3f1
Merge pull request #375 from Guichaguri/feat/add-admin-member-usernames
Add username column to the member list
2022-07-27 09:32:45 +02:00
Sylvain
f67c286497 (bug) prevent same slot booking feature ignores canceled reservations 2022-07-26 13:35:14 +02:00
Sylvain
6937a426c3 (bug) unable to show daily slots on public calendar 2022-07-26 12:12:59 +02:00
Sylvain
7134b8ffac (bug) fix notification with slots 2022-07-20 16:20:09 +02:00
Sylvain
29b9399ca3 (bug) unable to reserve event 2022-07-20 15:54:04 +02:00
Sylvain
165b3e17b9 (bug) unable to move or cancel reservations 2022-07-20 14:59:42 +02:00
Sylvain
0d072291c7 (bug) 2 people can book the same machine slot
Also: fix reservation change behavior
2022-07-20 11:22:00 +02:00
Sylvain
06ee1acea5 (bug) fix slot reservation is considered full 2022-07-19 15:40:28 +02:00
Sylvain
d26e2ae313 (bug) fix various issues due to slots behavior refactoring 2022-07-19 11:32:12 +02:00
Nicolas Florentin
b3795e21ec bug fix canceled_at was called on slot in members/show.json.jbuilder 2022-07-19 08:21:18 +02:00
Sylvain
6a8c441e85 public calendar endpoint refactoring & testing 2022-07-18 17:19:33 +02:00
Sylvain
37b24a8d2f refactor slots model 2022-07-18 17:18:01 +02:00
Sylvain
5012912edd (wip) refactoring Availabilities::AvailabilitiesService and Availabilities::StatusService 2022-07-18 17:18:01 +02:00
Sylvain
b2fd2e1b48 build all slots at reservation creation time 2022-07-18 17:18:00 +02:00
Sylvain
8be2425275 (wip) refactoring slots to be unique per availability time-slot 2022-07-18 17:18:00 +02:00
Guilherme Chaguri
d63b8d0dfa Add username column to the member list 2022-07-14 16:11:44 -03:00
Sylvain
a41a22a050 (bug) wrong number of credits + improved text 2022-06-29 15:35:17 +02:00
Sylvain
1b8282fda4 display reservations credits in the dashboard 2022-06-29 15:35:17 +02:00
Sylvain
bcbd3bfb58 (bug) invalid users are reported in search 2022-06-29 15:35:17 +02:00
Sylvain
6ce762f778 (bug) unable to reserve a space 2022-06-29 15:34:47 +02:00
Sylvain
9b601bc438 (feat) show reservations panel 2022-06-29 15:34:04 +02:00
Sylvain
ea1883e406 factorize front-end API params helper 2022-06-29 15:34:04 +02:00
Sylvain
48e1cf782f (bug) unable to edit an event 2022-06-15 09:42:39 +02:00
vincent
103bf80e81 Standardize card layout 2022-06-14 16:44:26 +02:00
Sylvain
1b5bb662ac (bug) unable to edit OIDC provider 2022-06-06 11:40:53 +02:00
Du Peng
01191f467c add ProofOfIdentityFile max size in frontend 2022-05-11 18:14:52 +02:00
Du Peng
798941c349 edit organization custom field in member's dashboard profile 2022-05-11 16:57:44 +02:00
Du Peng
3e34b3c7a7 add user validation required setting, user proof of identity upload and organization custom field 2022-05-11 16:57:44 +02:00
Sylvain
ac1d518ddc (ui) option to disable the machines module 2022-05-11 11:54:00 +02:00
Sylvain
302c55755e (ui) admin edit user: use new user-profile-form component 2022-05-10 10:23:43 +02:00
Sylvain
040858ac1f (ui) refactored profile-completion screen to use more accurate messages 2022-05-09 14:58:26 +02:00
Sylvain
aae1a5c20e (api) rename user related models to use the _attributes naming convention 2022-05-04 14:12:48 +02:00
Sylvain
6ec6a8c4c9 (api) save which data is really mapped from the sso 2022-05-04 14:05:36 +02:00
vincent
4c6942eba4 merge 2022-05-04 13:02:40 +02:00
Sylvain
07578b5826 (ui)(api) configure data mapping for openid 2022-05-04 12:28:48 +02:00
Sylvain
c85281b29f (api) automatically configure the openID response_type 2022-05-04 12:28:48 +02:00
Sylvain
6c46e5ec81 (api) automatically configure some openID parameters: redirect_uri, display, response_mode 2022-05-04 12:28:48 +02:00
Sylvain
c9e1749bb7 (adminsys) do not require to recompile the assets when switching the authentication provider 2022-05-04 12:28:44 +02:00
Sylvain
f9e5e7f2a8 (ui) display authorization callback url directly in interface 2022-05-04 12:28:29 +02:00
Sylvain
2c2f8fdcc5 (api) openid provider configuration api 2022-05-04 12:16:38 +02:00
Sylvain
056a982d68 (bug) return auth provider mappings from the API 2022-05-04 12:16:38 +02:00
Sylvain
b4e53d2039 (db) table to save OpenID connect configuration
Also refactored OAuth2Mapping to allow usage with any types of providers
2022-05-04 12:16:38 +02:00
vincent
3f4714861b Add description to plan category 2022-05-04 11:16:51 +02:00
Du Peng
1e5e18481d Fix a bug: unable to send notification mail if no set a logo 2022-04-15 12:20:17 +02:00