rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-15 00:24:09 +01:00
Code Issues Releases Activity
7,567 Commits 15 Branches 274 Tags 83 MiB
8f237ff4ec
Commit Graph

1283 Commits

Author SHA1 Message Date
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
4d7e09c98d (feat) multiple accounting journals 2022-12-21 14:14:36 +01:00
Sylvain
90dc38ed10 (feat) move external id to InvoicingProfile 2022-12-21 14:14:34 +01:00
Sylvain
0ca7c8fb11 (quality) remove dead code 2022-12-21 14:14:32 +01:00
Sylvain
4b84963d7f (feat) optional external id 2022-12-21 14:14:29 +01:00
Sylvain
e246480049 (test) ProductForm 2022-12-21 14:14:28 +01:00
Sylvain
d547660170 (bug) unable to set price on new product 2022-12-21 14:14:28 +01:00
Sylvain
ad8e95922f (bug) machine advanced accouting codes, files attachements, image 2022-12-21 14:14:27 +01:00
Sylvain
c1638ab54d (test) tiptap & file uploads 2022-12-21 14:14:26 +01:00
Sylvain
b30701ba6f (test) improved frontend tests 2022-12-21 14:14:25 +01:00
Sylvain
664e42099a (test) improved settings fixtures 2022-12-21 14:14:24 +01:00
Sylvain
7d83d6454f (test) Jest + react-testing-library 
This commit aims to put a testing environment in place
for frontend react components using the de-facto standards
for our stack.

An example test file was writter for the component plan-form.tsx.
Some fixtures for some API endpoints were written (see
__setup__/server.js)
 2022-12-21 14:14:22 +01:00
Sylvain
2889fb8e12 (bug) unable to manage stocks on new product 2022-12-21 14:12:16 +01:00
Sylvain
13eeff5964 (ui) enable advanced accounting button in separate box 2022-12-21 14:12:15 +01:00
Sylvain
bc5e306091 (bug) training default seats should be null 2022-12-21 14:12:14 +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
b3072ec444 (feat) auto fix rouding errors on accounting lines 
Also: (ui) added help tooltips on some input fields
 2022-12-21 14:12:10 +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
85ec08ae67 (quality) adapt code to New JSX transform 2022-12-21 14:11:36 +01:00
Sylvain
37f30e26a9 (feat) enable/disable advanced accounting 2022-12-21 14:05:16 +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
85fcc71d6b (wip) refactor plan form 2022-12-21 14:05:15 +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
Sylvain
4203da097c (ui) refactor machine creation form 2022-12-21 14:05:13 +01:00
Sylvain
4cc6574f58 (ui) refactor machine edition form 2022-12-21 14:05:09 +01:00
Du Peng
f47440c85a (feat) add machine category 2022-12-20 18:45:53 +01:00
Sylvain
795928c07c (feat) Add reservation deadline parameter 2022-12-19 09:58:44 +01:00
Sylvain
66b1db6d0a (bug) phone/adresse required not shown 2022-12-16 15:35:02 +01:00
Sylvain
14b5c40ec8 Merge branch 'feature/reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/reservation-deadlines 2022-12-14 11:30:54 +01:00
Sylvain
575c7c7d62 (feat) updated FabAnalytics reports to include new features 2022-12-01 16:34:14 +01:00
Guilherme Chaguri
dea9663f37 Added reservation deadline parameter 2022-11-29 17:02:01 -03:00
Du Peng
1f5808da4a (quality) use point instant of square brackets in react-form-hook field path 2022-11-22 17:12:39 +01: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
eb15e0e5a2 (feat) default sort invoices by date 2022-11-17 11:20:49 +01:00
Sylvain
c6aef07fb4 (bug) unable to reserve a machine with payment on site 2022-11-17 10:56:03 +01:00
Sylvain
35656229ad (bug) should not change group of subscriber 2022-11-07 15:14:33 +01:00
Sylvain
a8623487fd (bug) admin shop for himself 
Crash if there was no offered product when the admin select himself in the list
 2022-11-07 11:56:35 +01:00
Sylvain
d3d285dfbe (bug) configuring price does not edit the right prices 2022-11-07 11:40:36 +01:00
Sylvain
7c7ec0aa4c (feature) admin can buy product for himself 2022-11-04 12:18:04 +01:00
Sylvain
60580a2bae (bug) no plan for the user's group 2022-11-04 09:58:32 +01:00
Sylvain
83fb4f11ff (bug) switch display is broken 2022-11-03 10:07:14 +01:00
Sylvain
20e50bda13 (bug) fix file/image input components 2022-11-03 09:26:21 +01:00
Sylvain
a97e08b43b (quality) refactored upload components 2022-10-28 14:59:52 +02:00
Sylvain
74f826eef7 (merge) Merge branch 'product-store' into product-store_dev 2022-10-28 14:32:11 +02:00
Sylvain
9f3cbc46a3 (quality) refactor selectOption 2022-10-28 14:30:41 +02:00
Du Peng
65ded9d847 Merge branch 'product-store' into product-store_dev 2022-10-27 18:08:15 +02:00
vincent
feb191ca70 (ui) Fix image bg and list items border 2022-10-27 08:52:21 +02:00
Du Peng
6d448e0af2 (merge) merge dev and product-store 2022-10-26 09:37:31 +02:00
Sylvain
0c785aae06 (feat) default image for machines 2022-10-25 17:08:32 +02:00
Sylvain
fcbee960a7 (bug) reload store on category url change 2022-10-25 14:50:09 +02:00
Sylvain
c9901a89e1 (test) test admin reserves for himself 2022-10-25 14:31:31 +02:00
Sylvain
744b811b62 (feat) remove admins group: allow admins to reserve 2022-10-25 11:57:26 +02:00
Sylvain
f9f60cba17 (wip) allow admin to reserve for himself 2022-10-24 17:39:16 +02:00
Sylvain
d4613cdbcc (quality) refactored EventService to match rubocop rules 2022-10-24 15:56:04 +02:00
Du Peng
0fddd22df8 (bug) admin cannot filter product availble in store 2022-10-24 12:34:20 +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
9eeef449ab (bug) product category filter 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
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
ebbbb47e67 (bug) cannot show order statstic 2022-10-18 12:44:19 +02:00
vincent
d2338dee6a (ui) Fix nav-tabs 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
Du Peng
b9397388c5 (feat) stock limit if stock <= stock threshold 2022-10-14 11:27:59 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
1aa058f3d6 (feat) allow product price = 0 2022-09-19 19:27:11 +02:00
Du Peng
b5ffae1fb6 (bug) form input cannot save a float 2022-09-19 19:08:52 +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
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
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
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
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
b76c7889ac (bug) fix add to cart button can't apply a quantity min 2022-09-13 16:36:44 +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
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
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
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
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
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
vincent
3a0248ed98 stock 2022-09-06 12:08:19 +02:00
Sylvain
8055de38b8 (bug) the events times are not displayed 2022-09-05 12:21:07 +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
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
b669316e43 request user login when checkout a cart 2022-08-28 23:31:43 +02:00
Du Peng
c80198603e set customer of cart dont save before payment 2022-08-27 18:01:25 +02:00
Du Peng
0f7b99c8a9 add a function return the currency symbol 2022-08-26 20:14:15 +02:00
Du Peng
981cffa27d pay cart with coupon code 2022-08-26 20:10:21 +02:00
Du Peng
5030f5e1bc fix bug: user cant pay order by wallet 2022-08-26 13:37:23 +02:00
vincent
e339cc18e7 merge product_store-store 2022-08-26 12:12:35 +02:00
Du Peng
e7d5cbfb2e show an error if payment success but payment_state != paid 2022-08-26 12:04:19 +02:00
Du Peng
ded92dfb89 show error if cart update failed 2022-08-26 11:57:53 +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
vincent
42c38a0dd7 Remove filters logic from the front-end 2022-08-26 09:46:35 +02:00
Du Peng
885db68b51 add coupon component 2022-08-25 20:50:15 +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