Karen
0778616345
(feat) add a custom banner for trainings
2023-02-15 10:28:13 +01:00
Karen
06a93391a2
(quality) remove unnecessary getValue function
2023-02-15 10:28:13 +01:00
Karen
4800d4aee1
(quality) add typing for status filter and settings
2023-02-15 10:28:12 +01:00
Karen
0d508839e5
(feat) machines custom banner frontend and frontend test
2023-02-15 10:28:12 +01:00
Karen
7357ece87f
(bug) show error validation message
2023-02-15 10:28:11 +01:00
Karen
9396c5371e
(feat) create settings for machines banner backend
2023-02-15 10:28:11 +01:00
Karen
f57df4cc6e
(quality) remove unnecessary getValue function
2023-02-15 10:28:10 +01:00
Karen
82a88aadad
(quality) add typing for status filter and settings
2023-02-15 10:28:09 +01:00
Karen
7047c557cd
(bug) wrong typing on status js model
2023-02-15 10:28:09 +01:00
Karen
a1eaa2eae7
(feat) machines custom banner frontend and frontend test
2023-02-15 10:28:09 +01:00
Karen
4dde127203
(bug) show error validation message
2023-02-15 10:28:08 +01:00
Karen
5658e0aeed
(feat) create settings for machines banner backend
2023-02-15 10:28:08 +01:00
Sylvain
ddc2dd4c6e
(feat) training auto cancel authorization and invalidation rule
2023-02-15 10:28:07 +01:00
vincent
7208cd80b0
(quality) Refacto pack-form
2023-02-15 10:28:06 +01:00
Sylvain
c804c84113
(feat) per training settings for auto cancel
2023-02-15 10:28:04 +01:00
Sylvain
e2edbb419a
(feat) auto cancel trainings under the threshold
2023-02-15 10:28:04 +01:00
vincent
0dc564a294
(ui) Fix button color
2023-02-15 10:28:03 +01:00
Sylvain
305b5425bc
(ui) display trainings in list
2023-02-15 10:28:03 +01:00
Sylvain
117bd36caa
(ui) reservable machine cannot be disabled
2023-02-15 10:28:02 +01:00
vincent
2ea6f49e35
(ui) Editorial block rwd
2023-02-15 10:28:02 +01:00
vincent
1c38073b1b
(quality) Editorial-block component + clean up
2023-02-15 10:28:01 +01:00
vincent
9ac9a2a725
(ui) Update product categories layout
2023-02-15 10:28:01 +01:00
vincent
18f0cf3f0f
(ui) Fix edit event form layout
2023-02-15 10:28:00 +01:00
vincent
4f46e62b87
(ui) Add link to agenda
2023-02-15 10:28:00 +01:00
vincent
49a06a9176
(ui) Update machines layout
2023-02-15 10:27:59 +01:00
vincent
5fd2d3fc79
(ui) Add missing margin
2023-02-15 10:27:59 +01:00
vincent
d2f650a150
(ui) Fixe order layout
2023-02-15 10:27:58 +01:00
vincent
c12bf45ff8
(ui) Update store layout
2023-02-15 10:27:58 +01:00
vincent
6e38e72851
(ui) Add editorial text block
2023-02-15 10:27:57 +01:00
vincent
98e10dc774
(ui) Uniform layout for settings and form
2023-02-15 10:27:57 +01:00
vincent
a0508e689e
(feat) Add characters count to form input
2023-02-15 10:27:56 +01:00
vincent
7edec2bd69
(ui) Training form
2023-02-15 10:27:56 +01:00
vincent
17c70e0c81
(ui) Trainings settings + style cleanup
2023-02-15 10:27:55 +01:00
vincent
47229d9fff
(ui) Fix layout
2023-02-15 10:27:55 +01:00
vincent
554ed083d0
(ui) Update layout
2023-02-15 10:27:54 +01:00
Karen
b9d86aecdc
(quality) status property :label is now :name for better coherence
2023-02-15 10:27:54 +01:00
Karen
96ddb40c59
(feat) Add Status Settings in Projects Settings
2023-02-15 10:27:53 +01:00
Karen
d80cc4769a
(feat) filter for status in project gallery
2023-02-15 10:27:49 +01:00
Karen
7209dfbe7b
(ui) create status project component
2023-02-15 10:27:13 +01:00
Sylvain
63e8a1a4a6
(ui) mark canceled slots as this
2023-02-15 10:27:12 +01:00
Sylvain
28b64f3c6d
(feat) buy a new prepaid pack from the dashboard
2023-02-15 10:27:12 +01:00
Sylvain
4c4ebe3b47
(feat) report status of user's prepaid packs in dashboard
2023-02-15 10:27:08 +01:00
vincent
4650d0e1cb
(ui) Add missing cta
2023-02-15 10:26:15 +01:00
vincent
eb7c4de0ce
(ui) Dashboard inte
2023-02-15 10:26:14 +01:00
Sylvain
34914c1c4d
(bug) fix missing stat subtype
2023-02-14 17:03:54 +01:00
Sylvain
dde6782475
(bug) wrong times in admin/event monitoring
2023-02-14 11:37:07 +01:00
Du Peng
74ebad6dc0
(quality) remove unused code
2023-02-06 14:59:11 +01:00
Sylvain
1644bc43db
(bug) invalid date display in negative timezones
2023-02-03 17:25:24 +01:00
Sylvain
193407e0da
(bug) filter statistics by slot date
2023-02-02 11:02:33 +01:00
Sylvain
71579e7465
(wip) slot date in stats
2023-01-31 17:10:07 +01:00
Sylvain
001d024948
(bug) unable to create a non-rolling plan
2023-01-31 13:49:37 +01:00
Sylvain
98d6363525
(bug) unable to create a recurrent event
2023-01-31 11:39:51 +01:00
Sylvain
66311b8761
(bug) invalid month in some date format
2023-01-31 10:44:45 +01:00
Sylvain
65e2f037ab
(bug) invalid plan prices in interface
2023-01-26 09:39:27 +01:00
Sylvain
0ac3caf96a
(bug) admin cannot book an event for himself
2023-01-25 12:37:06 +01:00
Sylvain
c1159b2aed
(bug) update plan prices
2023-01-25 12:08:16 +01:00
Sylvain
921b5eab2f
(bug) invalid event date in negative TZ
2023-01-13 12:15:48 +01:00
vincent
5001098f85
(ui) Move Add machine button
2023-01-09 14:57:38 +01:00
Sylvain
eff829471a
(bug) event in negative timezone
2023-01-09 12:26:43 +01:00
Sylvain
e24fca7f9d
(bug) event is over before the end
2023-01-09 11:37:58 +01:00
Sylvain
d77283dd0a
(bug) failed to create manager cryptic error
2023-01-06 15:14:17 +01:00
Sylvain
5588948bf7
(bug) VAT decimal values
2023-01-06 13:05:51 +01:00
Sylvain
75a4783e43
(bug) canceled reservations in dashboard
2023-01-06 12:51:09 +01:00
Du Peng
045fe18cdd
(bug) unable to filter Show only slots with reservations in public calendar for admin
2023-01-06 11:06:40 +01:00
Sylvain
ac187a986f
(bug) payment schedule by check
2023-01-05 11:45:23 +01:00
Sylvain
cbb7e8cbcf
(bug) unable to return to the statistics tab
2023-01-04 12:14:03 +01:00
Sylvain
8ce1ceb345
(quality) translate validation messages
2023-01-04 11:12:02 +01:00
Sylvain
43f45c383f
(feat) cancel subscription
2023-01-03 17:17:39 +01:00
Sylvain
e8649818de
(feat) help about reservable machine switch
2023-01-03 16:27:15 +01:00
Du Peng
e7615b70a6
(feat) use switch instant of checkbox in show slots unavailables calendar filter
2023-01-03 15:26:32 +01:00
Sylvain
5630872b5f
(bug) update VAT name in front after change
2023-01-03 10:25:41 +01:00
Du Peng
29b92475bb
(feat) Ability to filter uniq slots reserved in admin calendar
2023-01-02 19:20:02 +01:00
Du Peng
a740d984ee
(bug) unable to update title of availability after admin remove a machine/plan in calendar
2023-01-02 16:08:47 +01:00
vincent
14d649c935
Remove alignment from Summernote editor
2023-01-02 09:57:34 +01:00
Sylvain
051f182839
(bug) clear date in suscription extend free days
2022-12-27 17:15:49 +01:00
Sylvain
7fc79d44e5
(feat) machines reservable or not
2022-12-27 16:14:29 +01:00
Sylvain
f0d9537182
(feat) default image for events
2022-12-27 15:11:28 +01:00
Sylvain
b9965e54e7
(bug) unable to set product main image
2022-12-27 14:59:24 +01:00
Sylvain
751cdd62c6
(bug) feature tour in admin/settings is broken
2022-12-27 13:49:44 +01:00
Sylvain
0fafd30486
(i18n) missing translation
2022-12-27 13:38:09 +01:00
Sylvain
898ce07509
(merge) Merge branch 'staging' into dev
2022-12-27 12:20:18 +01:00
Sylvain
f8904dfb9c
(feat) customize VAT name
2022-12-27 12:13:24 +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
Du Peng
774ce35fa8
(feat) add accordion for calendar filter
2022-12-22 15:18:53 +01:00
Sylvain
00d841e2c6
(bug) no method find on undefined planCategories
2022-12-22 14:56:59 +01:00
Sylvain
cde322befe
(bug) unable to add event price
2022-12-22 13:42:41 +01:00
Sylvain
785e80a6f4
(test) PasswordStrength
2022-12-22 12:11:14 +01:00
Sylvain
137b9f3c1b
(feat) improved security when changing password
2022-12-22 11:07:14 +01:00
Sylvain
e7912557eb
(test) UserProfileForm
2022-12-21 14:14:39 +01:00
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