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

6828 Commits

Author SHA1 Message Date
Du Peng
7aef6c69cf Version 5.4.25 2022-10-19 18:20:00 +02:00
Du Peng
24a47acec7 Merge branch 'dev' for release 5.4.25 2022-10-19 18:20:00 +02:00
Du Peng
cfc2a71c98 (test) add test for prepaid pack 2022-10-19 18:16:54 +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
c48956be10 (bug) unable apply a coupon if this coupon has used by an user removed 2022-10-19 11:38:17 +02:00
Du Peng
3fc232ad55 (bug) cannot run seed for create statistic index 2022-10-18 17:29:32 +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
ebbbb47e67 (bug) cannot show order statstic 2022-10-18 12:44:19 +02:00
Du Peng
7155a00870 Merge branch 'product-store_integration' into product-store 2022-10-18 10:31:37 +02:00
Du Peng
3f7b8317e7 (bug) update order status error 2022-10-18 09:56:43 +02:00
vincent
dfea0203a5 Merge branch 'product-store_integration' of git.sleede.com:projets/fab-manager into product-store_integration 2022-10-18 09:10:00 +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
vincent
d2338dee6a (ui) Fix nav-tabs 2022-10-18 08:42:48 +02:00
Du Peng
7215b021e5 Merge branch 'dev' for release 5.4.24 2022-10-14 17:26:45 +02:00
Du Peng
b1d0a5aad2 Version 5.4.24 2022-10-14 17:26:44 +02:00
Du Peng
62a62ec1eb (bug) fix cannot debit prepaid pack after reservation of machine 2022-10-14 17:00:38 +02:00
Du Peng
48de0f8b9e (bug) fix product and order error message 2022-10-14 12:57:55 +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
vincent
ee81ed3434 (i18n) Text update 2022-10-14 09:10:44 +02:00
vincent
d07502f70f (ui) Fix nav-tabs 2022-10-13 18:50:53 +02:00
Du Peng
5a8aa747e5 Merge branch 'product-store_integration' into product-store 2022-10-13 18:39:29 +02:00
Du Peng
e462079754 (bug) product limit stock error 2022-10-13 18:38:42 +02:00
Du Peng
9834faf120 (bug) cant load order withdrawal instructions if no login 2022-10-13 17:57:26 +02:00
Du Peng
ef3b876bd0 (feat) disable create card if store hidden 2022-10-13 17:56:34 +02:00
Du Peng
5d0e170b92 (bug) load content when tabs are clicked in admin store 2022-10-13 17:44:44 +02:00
vincent
90005c2643 (ui) small fixes 2022-10-13 17:28:24 +02:00
vincent
dca2b7f5b3 (i18n) update locales files from Crowdin 2022-10-13 17:16:42 +02:00
vincent
6dcfd4d99e (i18n) fix placeholder 2022-10-13 16:57:03 +02:00
vincent
c883a27c95 (i18n) fix text 2022-10-13 16:41:23 +02:00
vincent
6383b2ed80 (ui) fix colors 2022-10-13 16:38:32 +02:00
Du Peng
8537a580e9 (feat) dont scroll down to product list after fetch 2022-10-13 14:51:46 +02:00
Du Peng
9ddc21619b (bug) fix product cannot update low stock alert 2022-10-13 14:42:32 +02:00
Du Peng
5de91acf88 (bug) fix save empty product image and is_main cannot set to new image after remove old main image 2022-10-13 12:38:54 +02:00
Du Peng
7e3cbf7172 (bug) cannot load order withdrawal instructions 2022-10-13 11:23:35 +02:00
Du Peng
11a0f62452 (bug) cannot access store 2022-10-12 19:40:49 +02:00
Du Peng
351f7f670d Merge branch 'dev' for release 5.4.23 2022-10-12 19:08:32 +02:00
Du Peng
844624954b Version 5.4.23 2022-10-12 19:08:32 +02:00
Du Peng
de92ccbbee Merge branch 'docker_build_error' into dev 2022-10-12 19:05:37 +02:00
Du Peng
269eace05c (bug) add xz in dockerfile 2022-10-12 18:50:59 +02:00
vincent
bd10f0235b (ui) fix store settings layout 2022-10-12 18:20:36 +02:00
Sylvain
9b580fbfac (i18n) updated translations 2022-10-12 17:21:17 +02:00
Sylvain
5be2c79569 (bug) prevent links on nothing in wysiwyg editor 2022-10-12 17:02:02 +02:00
Sylvain
11c8b25357 (feat) hide the store to members/visitors 2022-10-12 16:48:39 +02:00
Sylvain
e851188354 (feat) default privacy policy to include store cookie 2022-10-12 15:06:21 +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