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,208 Commits 15 Branches 273 Tags 82 MiB
98e10dc774
Commit Graph

3106 Commits

Author SHA1 Message Date
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
vincent
b3d9c6b3bf (i18n) update 2022-10-24 12:10:42 +02:00
Sylvain
fdac8168ef (quality) refactored SingleSignOnConcern to match rubocop rules 2022-10-24 11:43:30 +02:00
Sylvain
e5fc418ecf Merge branch 'fix/sso-admin-group-id' of https://github.com/Guichaguri/fab-manager into Guichaguri-fix/sso-admin-group-id 2022-10-24 10:53:06 +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
1f7f9be37d (feat) if a child category is selected, with every sibling of it, we dont automatically select its parent 2022-10-21 18:57:11 +02:00
Du Peng
b1135f6df0 (feat) save latest product filter when click back button 2022-10-20 19:14:16 +02:00
Du Peng
2f676d1a89 (feat) add loading for save product btn 2022-10-20 19:14:16 +02:00
Du Peng
531b8d4947 (quality) clean code 2022-10-20 19:14:16 +02:00
Du Peng
c43ce2b142 (feat) hidden product count in category config page 2022-10-20 19:14:16 +02:00
Du Peng
5804b6230d (bug) show product count is only active in category 2022-10-20 19:14:16 +02:00
Du Peng
9eeef449ab (bug) product category filter 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
0abb3641df (bug) product category order in store 2022-10-20 19:14:16 +02:00
Du Peng
0c19c9856f (bug) filter product is available 2022-10-20 19:14:16 +02:00
vincent
9f32784aec (ui) add identation for the select sub categories options 2022-10-20 14:25:11 +02:00
vincent
1db8bd8537 (ui) fix product card's status colors 2022-10-20 11:39:44 +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
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
d2338dee6a (ui) Fix nav-tabs 2022-10-18 08:42:48 +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
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
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
vincent
bd10f0235b (ui) fix store settings layout 2022-10-12 18:20:36 +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
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
Sylvain
33238e2ea5 (bug) home page tour tries to start after the page was unloaded 2022-10-12 11:07:47 +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
Du Peng
7700737cf3 (bug) fix cannot remove product if it has the relation with machines 2022-10-11 16:40:45 +02:00
Sylvain
70f7ef8951 (feat) build stats in elasticsearch 2022-10-11 15:14:53 +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
3e6763f14a (bug) wallet transation not returned if success 2022-10-11 11:41:44 +02:00
Sylvain
da11a592e8 (quality) lint wallet transaction 2022-10-11 10:59:48 +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
3cb70c5cf0 (quality) remove unused props 2022-10-05 16:09:18 +02:00
Sylvain
794f6130d2 (security) access to admin/store is restricted to admins & managers 
also, access to admin/store/settings is not allowed to managers
 2022-10-05 16:06:51 +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
Sylvain
185b4f1459 (merge) Merge remote-tracking branch 'origin/product-store_integration' into product-store 2022-10-05 10:21: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
vincent
60c8102c39 (bug) fix product categories position after dnd 2022-10-04 18:03:18 +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
Du Peng
9066148572 (bug) use Math.round instant of Math.trunc for fix float multify (ex: 37.8*100) 2022-10-04 17:26:39 +02:00
Sylvain
43fbf2ac8d (feat) withdrawal instructions in order ready email 2022-10-04 16:59:51 +02:00
Du Peng
a9dc7b4dd7 Merge branch 'product-store' of git.sleede.com:projets/fab-manager into product-store 2022-10-04 16:52:04 +02:00
Du Peng
162c56eb46 (bug) app always check coupon code in admin panier if change item quantity 2022-10-04 16:51:38 +02:00
Sylvain
72d55a6a0b (feat) display withdrawal instructions on the show-order page 2022-10-04 15:30:20 +02:00
vincent
a6173147ca (ui) fix layout 2022-10-04 15:21:01 +02:00
Sylvain
e90fa0ca40 (quality) move orders-dashboard to the dashboard folder 2022-10-04 15:03:29 +02:00
Sylvain
b283e89235 (merge) Merge remote-tracking branch 'origin/product-store_integration' into product-store 2022-10-04 14:48:01 +02:00
Sylvain
3c2ef4b55d (bug) orders sorting in dashboard 2022-10-04 14:42:28 +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
vincent
4f58ea64d1 (i18n) improve product category delete message 2022-10-04 10:56:12 +02:00
vincent
50e4b2ba0c (merge) branch 'origin/product-store' 2022-10-04 10:53:36 +02:00
Sylvain
4f231c0647 (bug) do not buzz the list in member-select 2022-10-04 10:52:53 +02:00
Sylvain
a10e75844a (feat) visual indicator if no user selected 2022-10-04 10:51:32 +02:00
Sylvain
f3a2136e7d (bug) category slug with special characters 2022-10-04 10:32:16 +02:00
Sylvain
4cfb1a1253 (bug) create a category result in error 2022-10-04 10:28:37 +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
31044a56ac (quality) simplified regex 2022-10-03 17:26:43 +02:00
Sylvain
7798df1f87 (bug) stock form fields not marked as required 2022-10-03 16:39:58 +02:00
Sylvain
ac861e3bcb (bug) negative stock is marked as available 2022-10-03 16:37:46 +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
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
dfe786ee45 (quality) Remove auto scroll and filter header 2022-09-29 11:37:58 +02:00
vincent
1425e39183 (ui) Fix order-item layout 2022-09-29 11:36:56 +02:00
vincent
05e729fa26 (inte) cart item error message + responsive 2022-09-28 17:48:55 +02:00
Sylvain
a30eac10de (feat) humanize gateway error messages 2022-09-28 12:54:29 +02:00
Du Peng
91b7fb9e6a (quality) refactoring change quantity in cart 2022-09-28 12:21:46 +02:00
Du Peng
274d661a58 (feat) always check cart items when user in cart page 2022-09-28 12:14:58 +02:00
Du Peng
c7559e3857 (bug) product stock status 2022-09-28 11:32:07 +02:00
Sylvain
f784a4d8a0 (bug) wrong translation key hide payment mean 2022-09-28 10:47:57 +02:00
Sylvain
a8b9ebb665 (quality) add eager loading for orders 2022-09-28 10:34:02 +02:00
Sylvain
eb50c37419 (bug) do not display no price as free 2022-09-28 10:33:30 +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
4d72151ab5 (bug) unable to display the payment schedules management interface 2022-09-27 16:01:22 +02:00
Sylvain
929c70b5be (bug) plan's categories descriptions are not shown 
Also fixes a bug about empty groups displayed in the subscription page
 2022-09-27 16:01:22 +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
f61e784ace (feat) prevent show product in store if price not set 2022-09-27 15:58:59 +02:00
Sylvain
82d2f99b77 (bug) add a link sends the parent form 2022-09-27 15:02:41 +02:00
Sylvain
116dac646c (quality) remove eslint-disable 2022-09-27 12:53:29 +02:00
Sylvain
474a6b9bb7 (feat) display free instead of 0,0€ 2022-09-27 12:42:29 +02:00
Sylvain
768acf3c28 (bug) do not display product sku if no set 2022-09-27 12:33:13 +02:00
Sylvain
18dc24e366 (feat) use thumbnail version of product images 2022-09-27 12:21:35 +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
d6fbd90c7c (feat) ability to disable the store 2022-09-27 11:14:27 +02:00
Sylvain
afc391f73e (ui) move the admin/store menu under the events tab 2022-09-27 09:58:34 +02:00
Sylvain
e217f61524 (bug) undefined method privileged? for nil:Class 2022-09-27 09:43:21 +02:00
Guilherme Chaguri
75796074da (Bug) Fix admin users groups being overriden by SSO group_id 2022-09-26 14:23:29 -03:00
Guilherme Chaguri
1bd97e3251 Allow searching by username 2022-09-26 13:41:50 -03:00
Sylvain
040f74a2fe (merge) Merge branch 'product-store_integration' into product-store 2022-09-26 17:29:12 +02:00
Sylvain
75a4038a60 (feat) save/restore filters in admin/store/products 2022-09-26 17:18:52 +02:00
Sylvain
af81f10a4e (bug) div cannot appear as a descendant of p 2022-09-26 16:44:14 +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
46d1127efc (bug) div cannot appear as a descendant of p 2022-09-26 15:31:57 +02:00
Sylvain
498ed0d115 (bug) cannot render the machine filters 
if a default machines list was not provided to the machines-filters component, the component rendering is broken
 2022-09-26 15:25:15 +02:00
Sylvain
1b930d2005 (feat) restore the filters from the URL 2022-09-26 15:23:07 +02:00
Sylvain
6b7daade5f (feat) save filters to the URL 2022-09-26 12:41:20 +02:00
vincent
6aaabe5b05 (i18n) Add missing translations 2022-09-22 11:23:26 +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
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
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
9742558cfa (feat) Save product categories' positions 2022-09-20 09:24:05 +02:00
vincent
b5c924a8e0 (bug) Fix filter name 2022-09-20 09:24:05 +02:00
vincent
d0e68fbf21 (quality) Refacto/style active orders list's filters 2022-09-20 09:24:04 +02:00
vincent
b7e128a63c (feat) Add filters 2022-09-20 09:24:04 +02:00
Sylvain
5d2bd250a8 (quality) improved comments 2022-09-20 09:24:03 +02:00
Du Peng
ded9b4a1e8 (bug) product slug isn't unique 2022-09-19 19:31:43 +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
b5ffae1fb6 (bug) form input cannot save a float 2022-09-19 19:08:52 +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
034b6b478e (feat) order avoir reference 2022-09-16 19:12:53 +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
b635113843 (bug) all orders is shown in my orders of admin 2022-09-16 17:58:02 +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
vincent
154d2c5565 (feat) Save product categories' positions 2022-09-16 17:01:56 +02:00
Du Peng
8c75b5fdd4 (bug) product stock status and quantity min to cart 2022-09-16 16:50:05 +02:00
vincent
22cb169778 (bug) Fix filter name 2022-09-16 16:06:58 +02:00
vincent
b1cea8f2dd (quality) Refacto/style active orders list's filters 2022-09-16 15:58:18 +02:00
vincent
ffafb223f1 (merge) branch 'origin/product-store' 2022-09-16 14:13:29 +02:00
Du Peng
6fc0b935d9 (bug) change product stock movement type 2022-09-16 12:08:07 +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
947c69c4ed (feat) improve orders filter 2022-09-15 12:38:34 +02:00
Du Peng
b87355bc5a (feat) orders filter by admin 2022-09-14 19:54:24 +02:00
Sylvain
850076f79a (bug) undefined method due to merge conflict 
undefined method `amount_multiplied_by_hundred' for ProductService:Class
 2022-09-14 15:19:32 +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
9b3a1c0634 (feat) add cart status color 2022-09-14 09:37:14 +02:00
Du Peng
007f7d55ba (bug) add product to cart button quantity min error 2022-09-14 09:26:29 +02:00
Du Peng
32b19ed4f7 (feat) manage orders in admin dashbaord 2022-09-13 19:47:19 +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
Sylvain
c381c985d2 (wip) unsaved form alert 2022-09-13 17:18:35 +02:00
Du Peng
b542cbab11 (bug) can't save product's price < 1 2022-09-13 16:56:36 +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
7673c1f814 (feat) sort order lists by created at date 2022-09-13 16:11:27 +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
0ee45f8404 (bug) fix comput the wallet amount that dont apply coupon 2022-09-13 12:36:18 +02:00
Peng
d491384326 (bug) fix comput the wallet amount that dont apply coupon 2022-09-13 10:27:46 +00: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
Sylvain
36704be01d (bug) do not verify group change when no initial group 2022-09-12 12:19:31 +02:00
Sylvain
3bf08973fb (bug) can't complete profile if phone has hyphens or spaces 2022-09-12 11:51:28 +02:00
Sylvain
e3b62df7d4 (bug) admin can't move/cancel event reservation 2022-09-12 09:57:54 +02:00
Du Peng
dff0cb26be (bug) product pagination in store 2022-09-09 17:14:22 +02:00
Du Peng
9bfeaf3ef3 Merge branch 'product-store-invoice' into product-store 2022-09-09 16:37:33 +02:00
Du Peng
185589407f (feat) order invoice 2022-09-09 16:35:49 +02:00
vincent
a1c6757cc3 (quality) Increase products per page count 2022-09-09 14:00:53 +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
Du Peng
2840c93823 (bug) fix invoice reference 2022-09-09 10:43:44 +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
334f365c2c (feat) change store cart back url 2022-09-08 16:46:26 +02:00
Du Peng
5d243d3be6 (feat) change store cart url 2022-09-08 16:41:10 +02:00
Du Peng
aeae5f7aa0 (feat) add product to cart in product page 2022-09-08 16:27:34 +02:00
Du Peng
8d414a3172 (feat) admin can set offer for product in cart 2022-09-08 15:10:56 +02:00
vincent
9e4d6028c5 (merge) branch 'product-store_integration' 2022-09-08 14:06:38 +02:00
Du Peng
85720c31fa (feat) order items order by created date 2022-09-08 12:13:34 +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
Du Peng
75b3295f65 (feat) allow to apply coupon in cart without login 2022-09-07 17:52:23 +02:00
Sylvain
45bac88b26 (quality) refactored categories sorting + fix ts issues 2022-09-07 17:30:21 +02:00
Du Peng
6d2239bc15 (fix) cant pay order with coupon 2022-09-07 17:24:14 +02:00
vincent
0bb4f47b99 (feat) Add actions dropdown 2022-09-07 17:14:06 +02:00
Du Peng
d98082a2c4 (fix) cart's operator_id has rename to operator_profile_id 2022-09-07 16:57:07 +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
Du Peng
e0e8fc9ec2 (fix) checkout button cant click 2022-09-07 09:59:37 +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
Du Peng
29a84acf2e Merge branch 'product_store-payment' into product_store-store 2022-09-06 19:22:22 +02:00
Du Peng
fd97d23208 (feat) set order reference after create order 2022-09-06 19:16:29 +02:00
Du Peng
59d2b8c990 (feat) order reference 2022-09-06 19:12:06 +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
vincent
3a0248ed98 stock 2022-09-06 12:08:19 +02:00
Sylvain
80825a2113 (bug) unable to build stats 
NoMethodError: undefined method `project_id' for #<Hash>
app/services/statistics/concerns/projects_concern.rb:50:in `project_info_stat'
 2022-09-05 16:53:56 +02:00
Sylvain
b7af29c1a8 (bug) unable to build stats 
NoMethodError: undefined method `date' for #<Hash>
app/services/statistics/builders/projects_builder_service.rb:12:in `block in build'
 2022-09-05 16:29:01 +02:00
Sylvain
9a9aaf6889 (bug) unable to build stats 
NoMethodError: undefined method `project_info' for Statistics::FetcherService:Class
app/services/statistics/fetcher_service.rb:179:in `block in projects_list'
 2022-09-05 15:15:35 +02:00
Sylvain
8055de38b8 (bug) the events times are not displayed 2022-09-05 12:21:07 +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