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

3265 Commits

Author SHA1 Message Date
Guilherme Chaguri
855df4b552 Fix merge conflicts with dev 2023-03-15 16:26:45 -03:00
Sylvain
6089e636e4 (feat) limit machine visibility per plan 2023-03-15 14:17:06 +01:00
Sylvain
7ad1f8da3f (quality) delete a plan limitation 2023-03-15 10:19:39 +01:00
Sylvain
25cbf63b48 (feat) notify member on limit reached 2023-03-14 16:45:01 +01:00
Sylvain
6026189e59 (i18n) updated translations 2023-03-14 12:41:08 +01:00
Sylvain
8a32c029d3 (feat) machine limit override category limit 2023-03-14 12:35:58 +01:00
Sylvain
0ac99e3b6b (quality) improved error message 2023-03-14 11:54:41 +01:00
Sylvain
8504864c20 (feat) limit reservation depending on current suscription 2023-03-14 11:15:40 +01:00
Sylvain
2316cc5b1e (feat) destroy a limitation 2023-03-13 14:19:51 +01:00
Sylvain
2b3b123a02 (ui) improved limitation add/edit/destroy 2023-03-13 14:19:50 +01:00
Sylvain
6abea03182 (feat) update limitations 2023-03-13 14:19:50 +01:00
Sylvain
2b8a7008bd (quality) use a single component for unsaved list 2023-03-13 14:19:47 +01:00
Sylvain
0f142680b8 (wip) configure usage limits for plans 2023-03-13 14:19:46 +01:00
Sylvain
65afcbe2a9 (quality) use EditDestroyButtons in product list 2023-03-13 14:19:45 +01:00
Sylvain
ffe6e59681 (test) fix running test
Also: (quality) updated browserbd on caniuse
(ui) improved help text
2023-03-13 14:18:48 +01:00
vincent
c964ec8a6d (ui) Plan limit form and modal 2023-03-13 14:18:47 +01:00
vincent
9294bc4c88 (ui) Plan form layout 2023-03-13 14:18:46 +01:00
Sylvain
587dcda5d5 (i18n) updated translations 2023-03-13 14:18:46 +01:00
Sylvain
8fecec6b3d (i18n) updated translations 2023-03-13 14:04:41 +01:00
Sylvain
c2739f73a7 (bug) unable to select a new machine for an existing category 2023-03-13 12:11:56 +01:00
Sylvain
9b4c47d733 (feat) usage history of prepaid packs 2023-03-09 13:23:42 +01:00
Sylvain
45dc7f016d (i18n) updated translations 2023-03-03 15:47:05 +01:00
Sylvain
ec7a367114 (feat) messages if the user cannot buy prepaid packs 2023-03-03 11:56:13 +01:00
Sylvain
0c3463a2ec (api) required pagination + new data 2023-03-03 10:09:07 +01:00
Guilherme Chaguri
1aa9b2fe39 Added reservation deadlines for each type of reservation 2023-03-01 17:44:01 -03:00
Sylvain
733fd9840c (bug) unable to export store orders 2023-02-20 15:37:51 +01:00
Sylvain
f33bd2ef23 (bug) unable to configure locale to fr-CA 2023-02-20 10:18:19 +01:00
Sylvain
e1ab56340d (i18n) improved translations 2023-02-17 17:03:34 +01:00
Sylvain
874b9b3ed9 (feat) Check SCSS syntax before saving home page style 2023-02-17 16:56:17 +01:00
Sylvain
8b3a7c73a6 (i18n) updated translations 2023-02-16 17:06:29 +01:00
Vincent
2fa59167ec (i18n) Update translations 2023-02-16 16:07:43 +01:00
Sylvain
b2a95e1acb (quality) prevent invalid settings 2023-02-16 12:03:48 +01:00
Sylvain
ed072184bf (feat) notify_admin_order_is_paid 2023-02-16 11:22:42 +01:00
Sylvain
f92a4a741b (bug) ICU translations not interpreted 2023-02-15 16:52:14 +01:00
Sylvain
a179601b97 (quality) lint code 2023-02-15 16:02:49 +01:00
Sylvain
59a0c600f2 (i18n) updated translations 2023-02-15 12:44:57 +01:00
Sylvain
4c938ac6fd (i18n) fix locale after rebase 2023-02-15 10:31:24 +01:00
Sylvain
892ffbe138 (quality) rename proof-of-identity to supporting-document 2023-02-15 10:30:13 +01:00
Sylvain
979042078d (quality) rename proof-of-identity to supporting-documents in notifications 2023-02-15 10:30:13 +01:00
Karen
10473182d4 (feat) Admin can control its notifications preferences 2023-02-15 10:30:08 +01:00
Karen
7a83a38c68 (quality) replace Angular-controlled notifications list with react code 2023-02-15 10:30:08 +01:00
Karen
54dbd5ef4d (quality) replacement of the gem NotifyWith by internal code 2023-02-15 10:30:07 +01:00
Sylvain
c87d2b6364 (i18n) updated translations 2023-02-15 10:30:05 +01:00
Sylvain
2fc4a59670 (bug) prevent buying packs if restricted or no packs for a machine 2023-02-15 10:30:05 +01:00
Sylvain
eb6cd17b7c (feat) export external_id and notes 2023-02-15 10:30:04 +01:00
Sylvain
ef92e607f4 (bug) scheduled tasks wrong time 2023-02-15 10:30:00 +01:00
Karen
0f6f763814 (feat) add custom banner on events 2023-02-15 10:29:58 +01:00
Sylvain
fea26285d6 (feat) improved calendars loading time
+ (feat) ability to choose a machine in the public calendar
2023-02-15 10:29:55 +01:00
Sylvain
9f9a2e616f (feat) slots/availabilities status for pending reservations 2023-02-15 10:29:54 +01:00
Sylvain
473aedbdcb (feat) add reservations in cart/order 2023-02-15 10:29:53 +01:00
Sylvain
05a6f517cd (wip) cart items components 2023-02-15 10:29:53 +01:00
Sylvain
cdc7dc963d (i18n) translate new errors 2023-02-15 10:29:51 +01:00
Sylvain
bfe0936b40 (feat) save both operator/customer for orders 2023-02-15 10:29:50 +01:00
Sylvain
48a44ff4f3 (feat) create cart items from the api 2023-02-15 10:29:50 +01:00
Sylvain
42d830b4f8 (feat) save cart items in db 2023-02-15 10:29:46 +01:00
Sylvain
a1e878eec6 (i18n) updated translations 2023-02-15 10:28:19 +01:00
Vincent
47180755e1 (i18n) update texts 2023-02-15 10:28:19 +01:00
Sylvain
00e5dd487a (i18n) updated translations 2023-02-15 10:28:15 +01:00
Sylvain
becb897e3e (quality) removed unused key 2023-02-15 10:28:14 +01:00
Sylvain
a70b85a300 (bug) invalid validation message 2023-02-15 10:28:14 +01:00
Karen
a1eaa2eae7 (feat) machines custom banner frontend and frontend test 2023-02-15 10:28:09 +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
a05ef1f0ba (feat) auto refund after trainings cancelled and notify 2023-02-15 10:28:05 +01:00
Sylvain
71305bbc8f (wip) notify admin on auto cancel 2023-02-15 10:28:04 +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
Sylvain
305b5425bc (ui) display trainings in list 2023-02-15 10:28:03 +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
49a06a9176 (ui) Update machines layout 2023-02-15 10:27:59 +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
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
4aba30c5e3 (feat) project statuses api 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
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
04f933f94d (bug) deal with DST using Time instead of DateTime 2023-02-14 13:10:58 +01:00
Du Peng
37989aec63 (feat) OpenAPI endpoint to fetch subscription data 2023-02-06 16:46:54 +01:00
Sylvain
aee2c68485 (bug) private method create_statistic_subtype 2023-02-02 15:48:58 +01:00
Sylvain
5cdf01eeca (i18n) updated translations 2023-02-02 11:09:36 +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
41195ccf30 (feat) more context on sentry 2023-01-10 12:07:46 +01:00
Sylvain
10f054256e (feat) payment schedule due in invoices 2023-01-05 12:09:16 +01:00
Sylvain
b6146bad18 (feat) sentry error reporting 2023-01-04 16:05:45 +01:00
Sylvain
8d43db2579 (feat) Report subsription mismatch with user's group 2023-01-04 12:08:37 +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
375f0bd137 (quality) fix typo 2023-01-03 16:31:08 +01:00
Sylvain
e8649818de (feat) help about reservable machine switch 2023-01-03 16:27:15 +01:00
Du Peng
df8f8f6215 (i18n) update translations for calendar filter 2023-01-03 15:31:51 +01:00
Sylvain
50f97fe898 (i18n) changed note help text 2023-01-03 11:17:16 +01:00
Sylvain
16c24e565c (feat) custom message on invoice PDF not found 2023-01-03 11:07:41 +01:00
Sylvain
3fc706f463 (i18n) VAT translations 2023-01-03 10:52:00 +01:00
Sylvain
21f97ff1c5 (i18n) updated translations 2023-01-03 10:26:35 +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
ce183691cb (bug) Active serving static files from the /public folder by default 2023-01-02 12:51:14 +01:00
Du Peng
74fadb3ac9 (i18n) update tranlations from crowdin 2023-01-02 10:19:57 +01:00
Du Peng
10d24f8c2e (i18n) add missing translate for machine category filter 2023-01-02 10:16:10 +01:00
vincent
25d8d09492 Remove 'FabLab' term 2023-01-02 09:09:25 +01:00
Sylvain
5ff022d493 (i18n) updated translations 2022-12-27 17:19:13 +01:00
Sylvain
051f182839 (bug) clear date in suscription extend free days 2022-12-27 17:15:49 +01:00
Sylvain
c7b9d03cd9 (i18n) updated translations 2022-12-27 16:18:18 +01:00
Sylvain
7fc79d44e5 (feat) machines reservable or not 2022-12-27 16:14:29 +01:00
Sylvain
eb635ebb34 (i18n) updated translations 2022-12-27 13:40:02 +01:00
Sylvain
0fafd30486 (i18n) missing translation 2022-12-27 13:38:09 +01:00
Sylvain
4e68058d9d (i18n) updated translations 2022-12-27 13:26:55 +01:00
Sylvain
c70599c65b (i18n) fix typos 2022-12-27 13:24:50 +01:00
Sylvain
ebc72d638e (i18n) fix typos 2022-12-27 13:15:49 +01:00
Sylvain
0977d54efb (i18n) fix typos 2022-12-27 13:13:04 +01:00
Sylvain
71dd2cd7d4 (i18n) fix typos 2022-12-27 12:28: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
18e82c0151 (i18n) updated translations 2022-12-22 14:29:43 +01:00
Sylvain
b567253322 (i18n) fix translations keys 2022-12-22 14:23:22 +01:00
Sylvain
51f2dee7fb (i18n) typo 2022-12-22 13:58:49 +01:00
Sylvain
137b9f3c1b (feat) improved security when changing password 2022-12-22 11:07:14 +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
0ca7c8fb11 (quality) remove dead code 2022-12-21 14:14:32 +01:00
Sylvain
7659597e32 (doc) Updated OpenAPI documentation 2022-12-21 14:14:29 +01:00
Sylvain
4b84963d7f (feat) optional external id 2022-12-21 14:14:29 +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
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
37f30e26a9 (feat) enable/disable advanced accounting 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
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
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