rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity
7,195 Commits 15 Branches 273 Tags 82 MiB
4c4ebe3b47
Commit Graph

3081 Commits

Author SHA1 Message Date
vincent
b3d9c6b3bf (i18n) update 2022-10-24 12:10:42 +02:00
Sylvain
2ba760cc00 (bug) portuguese time formatting (#405) 2022-10-24 10:20:49 +02:00
Sylvain
a3f3251b6b (bug) mail for shop invoice has wrong object 2022-10-24 10:13:46 +02:00
vincent
ab796991a6 (i18n) text update 2022-10-20 10:14:51 +02:00
vincent
c4930c70f4 (i18n) Fix translation 2022-10-18 09:09:13 +02:00
vincent
b4a59508c7 (i18n) Text update 2022-10-18 08:42:48 +02:00
Du Peng
48de0f8b9e (bug) fix product and order error message 2022-10-14 12:57:55 +02:00
vincent
dca2b7f5b3 (i18n) update locales files from Crowdin 2022-10-13 17:16:42 +02:00
vincent
c883a27c95 (i18n) fix text 2022-10-13 16:41:23 +02:00
Sylvain
9b580fbfac (i18n) updated translations 2022-10-12 17:21:17 +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
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
3a9344103c (i18n) updated translations 2022-10-05 17:27:08 +02:00
Sylvain
a63975dd18 (merge) Merge branch 'dev' into product-store 2022-10-05 17:16:04 +02:00
Sylvain
a7e21069ed (i18n) removed useless translation 2022-10-05 17:09:52 +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
6f14bdadf3 (i18n) updated translations 2022-10-05 12:16:08 +02:00
Sylvain
81c1c80587 (bug) invalid translation syntax 2022-10-05 12:13:10 +02:00
Sylvain
0464aae23e (quality) compute withdrawal instructions server side 2022-10-05 12:06:35 +02:00
Sylvain
43fbf2ac8d (feat) withdrawal instructions in order ready email 2022-10-04 16:59:51 +02:00
Sylvain
72d55a6a0b (feat) display withdrawal instructions on the show-order page 2022-10-04 15:30:20 +02:00
vincent
4f58ea64d1 (i18n) improve product category delete message 2022-10-04 10:56:12 +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
a260f88555 (feat) store withdrawal instructions 2022-10-03 15:24:01 +02:00
Sylvain
51aa967001 (feat) dismiss a user to a lower privileged role 2022-10-03 14:22:15 +02:00
vincent
05e729fa26 (inte) cart item error message + responsive 2022-09-28 17:48:55 +02:00
Guilherme Chaguri
68683cf155 (Bug) Fix pt time formatting 2022-09-28 10:48:55 -03:00
Sylvain
a30eac10de (feat) humanize gateway error messages 2022-09-28 12:54:29 +02:00
Du Peng
274d661a58 (feat) always check cart items when user in cart page 2022-09-28 12:14:58 +02:00
Sylvain
3d6fe3c7a2 (bug) missing translations in PayZen configuration screens 2022-09-28 10:41:29 +02:00
Sylvain
b8db1dc9a9 (bug) visitor is not prompted to login on checkout 2022-09-28 10:32:34 +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
116dac646c (quality) remove eslint-disable 2022-09-27 12:53:29 +02:00
Sylvain
d6fbd90c7c (feat) ability to disable the store 2022-09-27 11:14:27 +02:00
Sylvain
040f74a2fe (merge) Merge branch 'product-store_integration' into product-store 2022-09-26 17:29:12 +02:00
vincent
6aaabe5b05 (i18n) Add missing translations 2022-09-22 11:23:26 +02:00
vincent
3ffa7c1cea (i18n) Update translations 2022-09-22 10:30:05 +02:00
vincent
5b014b8d64 (i18n) Update translations 2022-09-22 09:40:29 +02:00
vincent
ab52a1425c (i18n) restore translation 2022-09-21 16:23:09 +02:00
vincent
4fe2679808 (quality) refacto item quantity input 2022-09-21 12:27:20 +02:00
Sylvain
57e3dda2cd (feat) products filtering in public store 2022-09-21 11:51:41 +02:00
vincent
e4c0c10ef3 (merge) branch 'origin/product-store_filtering' 2022-09-20 17:36:23 +02:00
Sylvain
a41e5a93e5 (feat) products filtering for admin view 2022-09-20 15:30:44 +02:00
vincent
0345476b5f (merge) branch 'origin/product-store' 2022-09-20 15:25:21 +02:00
vincent
75d327f410 (quality) Improve responsive 2022-09-20 15:21:44 +02:00
Sylvain
586dd5f9b5 (quality) extract filter in separate components 2022-09-20 09:24:35 +02:00
vincent
945428e71c (quality) Refacto tooltip 2022-09-20 09:24:05 +02:00
vincent
b7e128a63c (feat) Add filters 2022-09-20 09:24:04 +02:00
Du Peng
cbed318c3f (feat) refund an order by admin 2022-09-16 18:31:20 +02:00
vincent
2e1784b291 (quality) Refacto tooltip 2022-09-16 17:58:19 +02:00
Du Peng
96a0f10747 (feat) add delivered state to order 2022-09-16 17:54:41 +02:00
Du Peng
8769244a33 (feat) update change order action locale 2022-09-16 17:30:28 +02:00
vincent
ffafb223f1 (merge) branch 'origin/product-store' 2022-09-16 14:13:29 +02:00
vincent
9a10c992c2 (feat) Add filters 2022-09-16 11:54:58 +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
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
Sylvain
6b224d7db1 (feat) alert unsaved changes 
if the user tries to quit the product form, he will
be alerted about unsaved changes, if any
 2022-09-14 14:51:54 +02:00
Du Peng
522b559ced (feat) add payment status to order 2022-09-13 18:43:37 +02:00
Du Peng
7cb691f6f9 (feat) update order's invoice object 2022-09-13 16:10:17 +02:00
Sylvain
feabded2a0 (feat) update the stock total 2022-09-13 15:01:55 +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
Sylvain
f705f71c4f (feat) display/remove ongoing stocks operations 2022-09-12 15:55:41 +02:00
Du Peng
185589407f (feat) order invoice 2022-09-09 16:35:49 +02:00
Du Peng
50276f5b41 (feat) VAT for store's product and Accounting code/label 2022-09-09 09:31:00 +02:00
Sylvain
c968f7b1aa (feat) stock management: create/show 2022-09-08 17:51:48 +02:00
Du Peng
cd1bfe976c Merge branch 'product-store-payment' into product-store 2022-09-08 16:49:24 +02:00
Du Peng
8d414a3172 (feat) admin can set offer for product in cart 2022-09-08 15:10:56 +02:00
vincent
d5d8a972cf (quality) Refacto orders views 2022-09-08 12:04:37 +02:00
vincent
157134f4ef (feat) Add period filter 2022-09-07 18:36:54 +02:00
vincent
3f08d831b9 (merge) branch 'product_store-inte' 2022-09-07 15:54:29 +02:00
vincent
23488284e8 (quality) Create state label component 2022-09-07 15:35:46 +02:00
Du Peng
79182fb8c1 Merge branch 'product_store-store' into product-store 2022-09-07 15:00:27 +02:00
Sylvain
507420f96c (i18n) updated translations 2022-09-07 14:02:04 +02:00
Sylvain
9fbd908b56 (dev) Script to download translations from Crowdin 2022-09-07 12:57:02 +02:00
Du Peng
79f01d4f78 Merge branch 'product_store-inte' into product_store-store 2022-09-07 09:27:57 +02:00
vincent
874be0bcb6 (wip) user orders dashboard 2022-09-07 09:22:16 +02:00
Du Peng
4387c05200 Merge branch 'product_store' into product_store-store 2022-09-06 20:06:59 +02:00
Sylvain
9c5f6088d3 Merge branch 'dev' of github.com:sleede/fab-manager into dev 2022-09-06 14:10:36 +02:00
Sylvain
96cc7ec436 (bug) openAPI documentation syntax not interpreted 2022-09-06 13:10:05 +02:00
vincent
3a0248ed98 stock 2022-09-06 12:08:19 +02:00
Sylvain
24e1771408 New translations app.shared.en.yml (Zulu) 2022-09-06 12:02:25 +02:00
Sylvain
3a6bd81e85 New translations mails.en.yml (Zulu) 2022-09-06 12:02:21 +02:00
Sylvain
c5a5a1f445 New translations app.admin.en.yml (Zulu) 2022-09-06 12:02:20 +02:00
Sylvain
976f93584a New translations app.public.en.yml (Zulu) 2022-09-06 12:02:12 +02:00
Sylvain
31c060e8cf New translations app.logged.en.yml (Zulu) 2022-09-06 12:02:09 +02:00
Sylvain
fcc4603f7f New translations en.yml (Portuguese) 2022-09-05 14:25:24 +02:00
Sylvain
44af693deb New translations en.yml (French) 2022-09-05 14:25:10 +02:00
Sylvain
11ed07de63 New translations mails.en.yml (Zulu) 2022-09-05 14:18:31 +02:00
Sylvain
18225e4b6a New translations en.yml (Zulu) 2022-09-05 14:18:21 +02:00
Sylvain
19a983e314 New translations en.yml (Portuguese) 2022-09-05 14:18:20 +02:00
Sylvain
1647f1c16f New translations en.yml (Norwegian) 2022-09-05 14:18:19 +02:00
Sylvain
dfcc585e28 New translations en.yml (German) 2022-09-05 14:18:18 +02:00
Sylvain
4eaefe26a2 New translations en.yml (Spanish) 2022-09-05 14:18:17 +02:00
Sylvain
10c31e132a New translations en.yml (French) 2022-09-05 14:17:59 +02:00
Sylvain
5bc1da7cf5 (feat) coupon in reservations export 2022-09-05 11:39:23 +02:00
vincent
f21a68593a stock (wip) 2022-09-02 18:17:15 +02:00
vincent
a5a45ee1ce Store settings + update text editor options 2022-09-01 18:02:22 +02:00
vincent
27a3bdc308 Admin orders (tmp) 2022-09-01 16:08:37 +02:00
vincent
539d89cf8e Fix accordion 2022-08-31 11:15:28 +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
vincent
2e696f94fd (wip) Admin orders list 2022-08-29 19:15:10 +02:00
vincent
78683a31b3 Style cart 2022-08-29 16:32:35 +02:00
vincent
5791e6076d Merge remote-tracking branch 'origin/product_store-store' into product_store-inte 2022-08-29 10:32:14 +02:00
Du Peng
c80198603e set customer of cart dont save before payment 2022-08-27 18:01:25 +02:00
vincent
e339cc18e7 merge product_store-store 2022-08-26 12:12:35 +02:00
vincent
4e76396dee Store ad on machines list 2022-08-25 18:46:55 +02:00
vincent
d602087710 Clients' store categories 2022-08-25 17:08:43 +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
vincent
e0dc008d4c Client side product list + product view 2022-08-24 18:34:34 +02:00
vincent
29993b0ec9 Cleanup files 2022-08-23 18:55:49 +02:00
Du Peng
350275d31b add is_main to product image 2022-08-23 16:02:15 +02:00
Du Peng
9561e61f5a update locale fr 2022-08-23 16:02:15 +02:00
Du Peng
0773e5bc82 product files and images upload 2022-08-23 16:02:14 +02:00
Sylvain
ab6d91fd12 (quality) rename check-list to checklist and added an uncheck all button 2022-08-23 16:02:11 +02:00
vincent
81cc8db0f5 Remove react-beautiful-dnd 2022-08-23 16:02:10 +02:00
Du Peng
272cbf165c create/edit product form 2022-08-23 16:02:08 +02:00
Du Peng
6b805f15f1 products page in front 2022-08-23 16:02:08 +02:00
Du Peng
69e2b3e111 Product model/controller 2022-08-23 16:02:07 +02:00
vincent
bf1700e43a Convert product category form to RHF 2022-08-23 16:02:05 +02:00
vincent
39c8ec3c3e (wip) Convert product-category to RFH 2022-08-23 16:02:05 +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
vincent
857261ba62 Merge branch 'product_store-store' into product_store-inte 2022-08-22 10:00:09 +02:00
Du Peng
cfd21adb60 cart button 2022-08-20 18:47:15 +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
vincent
7ca3955c1d Filter and sort products 2022-08-13 19:23:56 +02:00
vincent
86a40bc096 (wip) Products list filters 2022-08-05 18:38:54 +02:00
vincent
d118d045c6 Style list items 2022-08-04 16:24:52 +02:00
vincent
82fab4dd4f Merge remote-tracking branch 'origin/product_store' into product_store-inte 2022-08-04 09:15:27 +02:00
Du Peng
f345fc2443 add is_main to product image 2022-08-03 20:16:21 +02:00
vincent
be90d0720b Product form style 2022-08-03 18:30:29 +02:00
Du Peng
8f38ff79d7 update locale fr 2022-08-03 10:30:30 +02:00
Du Peng
fc4fd78843 product files and images upload 2022-08-03 10:25:36 +02:00
Sylvain
bd96622d37 (quality) rename check-list to checklist and added an uncheck all button 2022-08-03 10:23:40 +02:00
vincent
5b65fb7a54 Remove react-beautiful-dnd 2022-08-03 10:21:01 +02:00