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
6,630 Commits 15 Branches 274 Tags 83 MiB
82d2f99b77
Commit Graph

795 Commits

Author SHA1 Message Date
Du Peng
7067757f38 Disable to clicking outside or pressing escape to close sign up modal 2022-05-20 15:58:49 +02:00
Du Peng
c404424fb4 fix bug: new category button transalte 2022-05-17 19:31:58 +02:00
Du Peng
cecf8126e0 Fix bug: Unable to create plans for all group 2022-05-17 17:38:00 +02:00
Du Peng
e3d2b53767 Fix a bug: when machines module disabled, Associated machines is still shown in trainings list 2022-05-13 12:24:52 +02:00
Du Peng
8d55f617fe adjuste create groups button width 2022-05-12 15:10:55 +02:00
Du Peng
4d9da0c5f9 hide machines list in edition of training if machines module is disabled 2022-05-12 12:51:52 +02:00
Du Peng
c46a2ba085 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2022-05-12 11:43:18 +02:00
Du Peng
b46ebe9dab fix bug: admin can't show his group 2022-05-12 11:11:50 +02:00
vincent
abf101178b Adjust texts on admin settings about 2022-05-12 10:47:28 +02:00
Sylvain
bdf42f7b5d Merge remote-tracking branch 'origin/user_validation_required' into dev 2022-05-11 18:39:50 +02:00
Du Peng
01191f467c add ProofOfIdentityFile max size in frontend 2022-05-11 18:14:52 +02:00
Sylvain
3fd20cd57d (bug) unable to validate account 2022-05-11 18:06:49 +02:00
Du Peng
78076b7fba user and admin can edit organization field 2022-05-11 16:57:44 +02:00
Du Peng
798941c349 edit organization custom field in member's dashboard profile 2022-05-11 16:57:44 +02:00
Du Peng
3e34b3c7a7 add user validation required setting, user proof of identity upload and organization custom field 2022-05-11 16:57:44 +02:00
Sylvain
6d1852252b (style) Use of CSS variables for main and secondary colors in react components styles 2022-05-11 16:14:52 +02:00
Sylvain
e45872956c (ui) Option to prevent users from changing their group 2022-05-11 15:45:49 +02:00
Sylvain
1d2b814d6f (ui) react component to change user's group 2022-05-11 14:37:39 +02:00
Sylvain
ac1d518ddc (ui) option to disable the machines module 2022-05-11 11:54:00 +02:00
Sylvain
249285ea51 Merge branch 'ics' into v5.4 2022-05-11 10:45:33 +02:00
Sylvain
7da62bb513 (back) generate ICS file for a reservation 2022-05-10 16:48:58 +02:00
vincent
3a8671edbd Add disabled style on text editor 2022-05-10 15:22:01 +02:00
Sylvain
0e8230af48 (ui) use user-profile-form in admin/members/new 2022-05-10 11:18:33 +02:00
Sylvain
89853d3533 (ui) allow admins to change user password without asking for the current 2022-05-10 10:50:41 +02:00
Sylvain
302c55755e (ui) admin edit user: use new user-profile-form component 2022-05-10 10:23:43 +02:00
Sylvain
6e4031523c (bug) allow to set custom scope in openID connect configuration when using discovery 2022-05-09 16:28:18 +02:00
Sylvain
83fef46ceb (bug) unable to edit in rich-text editor component 2022-05-09 15:15:27 +02:00
Sylvain
040858ac1f (ui) refactored profile-completion screen to use more accurate messages 2022-05-09 14:58:26 +02:00
Sylvain
69d595e9f6 (ui) use user-profile-form in profile completion screen 2022-05-09 12:11:37 +02:00
Sylvain
55e76e1523 (ui) disabled fields mapped from the sso 2022-05-09 10:12:27 +02:00
Sylvain
b9b8150e28 (wip)(ui) disabled fields mapped from the sso 2022-05-04 17:15:04 +02:00
Sylvain
9b22286327 Merge remote-tracking branch 'origin/socials-refacto' into profile-form 2022-05-04 15:53:22 +02:00
Sylvain
aa767cfbd2 (bug) do send user edition form when confirming password 2022-05-04 15:29:01 +02:00
vincent
86e792b764 Fix attribute name 2022-05-04 15:22:52 +02:00
Sylvain
1f2d3867aa (ui) allow form inputs to be disabled, possibly with a callback 2022-05-04 14:59:55 +02:00
vincent
521229b87b Add form validation 2022-05-04 14:57:31 +02:00
Sylvain
2f0a8064c2 (ui) remove workaround 2022-05-04 14:36:16 +02:00
Sylvain
fc2169980f (bug) fix minor eslint issues + rebasing issue 2022-05-04 14:32:56 +02:00
Sylvain
51960782ee (code) simplified regexs 2022-05-04 14:12:49 +02:00
Sylvain
048ed4b644 (ui) user profile form: confirmation message + save button 2022-05-04 14:12:49 +02:00
Sylvain
eab523c961 (bug) display date in user form 2022-05-04 14:12:48 +02:00
Sylvain
858e86dbcb (ui) avatar input 2022-05-04 14:12:48 +02:00
Sylvain
1c22bc3cc5 (bug) focus the text edition area when the user clicks on the editor 2022-05-04 14:12:48 +02:00
Sylvain
5cb811e3c3 (wip)(ui) avatar input 2022-05-04 14:12:48 +02:00
Sylvain
11491aeb6c (ui) save profile editions to the API 2022-05-04 14:12:48 +02:00
Sylvain
aae1a5c20e (api) rename user related models to use the _attributes naming convention 2022-05-04 14:12:48 +02:00
Sylvain
cad8484231 (ui) profile data: website, job, cad softwares, interests 2022-05-04 14:12:48 +02:00
Sylvain
d62cb0ac54 (ui) add profile data to user-profile-form 2022-05-04 14:12:48 +02:00
Sylvain
6955a4bba1 (ui) stylized form-switch 2022-05-04 14:12:48 +02:00
Sylvain
03ed350e69 (ui) form-switch component 
+ refactored form components
 2022-05-04 14:12:45 +02:00
Sylvain
c1bf5bee14 (wip)(ui) refactor user edition form 2022-05-04 14:07:12 +02:00
Sylvain
bf0375fdb2 (typing) use TDateISO for typing dates 2022-05-04 14:05:36 +02:00
Sylvain
0d09ddd2fa (wip)(ui) user edition form 2022-05-04 14:05:36 +02:00
Sylvain
6ec6a8c4c9 (api) save which data is really mapped from the sso 2022-05-04 14:05:36 +02:00
Sylvain
c0e8c4d91a (ui) display authorization callback url directly in interface 2022-05-04 14:02:59 +02:00
Sylvain
c2a245ce08 (archi) organize react-hook-form components in a separate folder 2022-05-04 13:18:20 +02:00
Sylvain
a9bbae12a9 (ui) select authentication provier type 2022-05-04 13:14:52 +02:00
vincent
4c6942eba4 merge 2022-05-04 13:02:40 +02:00
vincent
d301053770 Add description to plan category 2022-05-04 12:45:48 +02:00
Sylvain
b3848596bf (bug) unable to create openid connect provider from the interface 2022-05-04 12:36:31 +02:00
Sylvain
eaae10a9b4 (ui) automatic field mapping configuration for openid 2022-05-04 12:29:19 +02:00
Sylvain
07578b5826 (ui)(api) configure data mapping for openid 2022-05-04 12:28:48 +02:00
Sylvain
161ef0792e (gui) auto discover scopes 2022-05-04 12:28:48 +02:00
Sylvain
c85281b29f (api) automatically configure the openID response_type 2022-05-04 12:28:48 +02:00
Sylvain
6c46e5ec81 (api) automatically configure some openID parameters: redirect_uri, display, response_mode 2022-05-04 12:28:48 +02:00
Sylvain
c9e1749bb7 (adminsys) do not require to recompile the assets when switching the authentication provider 2022-05-04 12:28:44 +02:00
Sylvain
d7a38b491b (ui) automatically test for discovery endpoint 2022-05-04 12:28:31 +02:00
Sylvain
5013484104 (ui) add profile edition url for openid 2022-05-04 12:28:31 +02:00
Sylvain
3ff416cf8a (ui) openid connect configuration interface 2022-05-04 12:28:31 +02:00
Sylvain
674abed1d2 (ui) adjust tooltip aspect 
+ (bug) do not ignore clipboard.writeText promise
+ (i18n) fix typo in translation
 2022-05-04 12:28:31 +02:00
Sylvain
f9e5e7f2a8 (ui) display authorization callback url directly in interface 2022-05-04 12:28:29 +02:00
Sylvain
63b03568e4 (i18n) reorganize translations per components 2022-05-04 12:27:48 +02:00
Sylvain
073b0c8eae (ui) add tooltip to FormInput 
+ add tooltip for auth_provider/mappings/API field input
 2022-05-04 12:27:48 +02:00
Sylvain
370a443502 (bug) edit authentication provider 
+ clean legacy code
 2022-05-04 12:27:48 +02:00
Sylvain
c4fb29ea23 (bug) open only selected mapping modal 2022-05-04 12:27:48 +02:00
Sylvain
70803ee41b (api) validate auth providers data 
+ remove legacy code
 2022-05-04 12:27:48 +02:00
Sylvain
04ae91a7d1 (ui) improve the appeareance for the auth provider definition form 2022-05-04 12:27:46 +02:00
Sylvain
470a8284ff (ui) sso data mapping - by type 2022-05-04 12:27:12 +02:00
Sylvain
e51e2d63cb (wip)(ui) type mapping ui 2022-05-04 12:26:42 +02:00
Sylvain
294c47b796 (bug) oauth2 provider attributes under providable_attributes 2022-05-04 12:25:46 +02:00
Sylvain
2baee48eaf (ui) form-select: onChange cb 2022-05-04 12:25:10 +02:00
vincent
08a95dea81 Fix styles on multi-select 2022-05-04 12:25:10 +02:00
vincent
86403cb1f2 Override React-select styles 2022-05-04 12:25:08 +02:00
Sylvain
acf5001b37 (wip)(ui) data mapping configuration interface 2022-05-04 12:23:24 +02:00
Sylvain
7beb1466bf (archi) organize react-hook-form components in a separate folder 2022-05-04 12:23:22 +02:00
Sylvain
5bc20075ed (ui) refactor form components to use props inheritance 2022-05-04 12:20:54 +02:00
Sylvain
4bf05a5024 (ui) select authentication provier type 2022-05-04 12:20:52 +02:00
Sylvain
bf148dd14b (wip) rhf select 2022-05-04 12:17:21 +02:00
Sylvain
7dd5491029 (front) export form component to angular 2022-05-04 12:17:21 +02:00
Sylvain
d751939ee9 WIP: front-end form for openid configuration 2022-05-04 12:17:21 +02:00
Sylvain
b4e53d2039 (db) table to save OpenID connect configuration 
Also refactored OAuth2Mapping to allow usage with any types of providers
 2022-05-04 12:16:38 +02:00
Sylvain
e28c8ab2e9 (front) add is-empty class to the calendar-admin-info side panel if no events are selected 2022-05-04 12:16:38 +02:00
Sylvain
89f62e2d0e (type) fix typing the RHFInput component 2022-05-04 12:14:55 +02:00
vincent
5ca41b862d disable TS rule 2022-05-04 12:14:55 +02:00
vincent
3a7ef3f51d Use Generics 2022-05-04 12:14:35 +02:00
Sylvain
0ea885f73d Apply 1 suggestion(s) to 1 file(s) 2022-05-04 12:13:43 +02:00
Sylvain
4b2ff659ca (style) eslint all code 2022-05-04 11:34:55 +02:00
vincent
4a995b3bd8 merge 2022-05-04 11:30:42 +02:00
vincent
1868be1642 Add labels 2022-05-04 11:20:19 +02:00
vincent
67f678a282 Add image embed in the text editor 2022-05-04 11:20:19 +02:00
vincent
cd5c253b3e Add video embed on the text editor 2022-05-04 11:20:17 +02:00
vincent
7ebdc1b06e Test video embed on the text editor 2022-05-04 11:18:28 +02:00
vincent
3611abe853 Delete unused components 2022-05-04 11:18:28 +02:00
vincent
3f4714861b Add description to plan category 2022-05-04 11:16:51 +02:00
vincent
d2ed4d4bd8 Rename variables 2022-05-04 10:26:22 +02:00
vincent
2b67280fd6 Fix types and reset input function 2022-05-04 10:26:18 +02:00
vincent
cb5dd953ea Edit and display fab's social networks 2022-05-04 10:25:25 +02:00
vincent
5024037ce6 (wip) fab-socials 2022-05-04 10:25:15 +02:00
vincent
7461f6d1d5 (wip) show and edit social networks 2022-05-04 10:21:05 +02:00
Sylvain
2cd0220b80 (code) simplified regexs 2022-05-04 10:03:09 +02:00
Sylvain
654f0880a0 (ui) user profile form: confirmation message + save button 2022-05-03 16:45:06 +02:00
Sylvain
040636da62 (bug) display date in user form 2022-05-03 16:34:27 +02:00
Sylvain
7ee4c8f4c0 (ui) avatar input 2022-05-03 16:14:20 +02:00
Sylvain
48fd47f8d9 (bug) focus the text edition area when the user clicks on the editor 2022-05-03 11:22:27 +02:00
Sylvain
8602fefce6 (wip)(ui) avatar input 2022-05-02 17:34:29 +02:00
Sylvain
b801999ee3 (ui) save profile editions to the API 2022-05-02 16:29:04 +02:00
Sylvain
555ee11d35 (api) rename user related models to use the _attributes naming convention 2022-05-02 15:58:54 +02:00
Sylvain
7a6fe34b90 (ui) profile data: website, job, cad softwares, interests 2022-05-02 15:29:32 +02:00
Nicolas Florentin
5cffdff65a when generating an avoir, the option "by_wallet" is not present anymore if wallet module is off 2022-05-02 14:16:55 +02:00
Sylvain
58f823518f (ui) add profile data to user-profile-form 2022-04-27 16:24:26 +02:00
Sylvain
6be3a4c324 (ui) stylized form-switch 2022-04-27 15:36:36 +02:00
Sylvain
a5ff03334a (ui) form-switch component 
+ refactored form components
 2022-04-27 12:55:43 +02:00
Sylvain
aa432d08b3 (wip)(ui) refactor user edition form 2022-04-26 18:05:18 +02:00
Sylvain
814ebfe52d (typing) use TDateISO for typing dates 2022-04-26 10:12:50 +02:00
Sylvain
b4ae80457e (wip)(ui) user edition form 2022-04-25 17:24:28 +02:00
Sylvain
6f80025adb (api) save which data is really mapped from the sso 2022-04-25 15:45:11 +02:00
Sylvain
0dd6f4bff5 Merge branch 'openid' into v5.4 2022-04-25 15:43:03 +02:00
Du Peng
6f67a5eaff Fix a bug: back bouton can't return to previously page in projects page (list/new/show/edit) 2022-04-20 16:43:16 +02:00
Sylvain
d72de33670 (ui) automatic field mapping configuration for openid 2022-04-20 15:22:07 +02:00
Sylvain
1960c7139f (ui)(api) configure data mapping for openid 2022-04-20 14:12:22 +02:00
Sylvain
0f183e7af6 (gui) auto discover scopes 2022-04-20 10:28:14 +02:00
Du Peng
ff230b5451 Fix a bug: unable to switch OpenLab projets 2022-04-19 18:28:31 +02:00
Sylvain
007c97969d (api) automatically configure the openID response_type 2022-04-19 17:39:42 +02:00
Sylvain
9665368755 (api) automatically configure some openID parameters: redirect_uri, display, response_mode 2022-04-19 16:55:48 +02:00
Sylvain
c3889a27f1 (adminsys) do not require to recompile the assets when switching the authentication provider 2022-04-19 16:53:08 +02:00
Sylvain
79bb235eaa (ui) automatically test for discovery endpoint 2022-04-19 14:57:53 +02:00
Du Peng
a703c00279 Fix a bug: unable to switch OpenLab projets 2022-04-15 12:21:08 +02:00
Sylvain
658ef20bc8 (ui) add profile edition url for openid 2022-04-13 16:23:13 +02:00
Sylvain
0e35616710 (ui) openid connect configuration interface 2022-04-13 15:50:33 +02:00
Sylvain
c77e6c8a65 (front) add is-empty class to the calendar-admin-info side panel if no events are selected 2022-04-12 17:22:47 +02:00
Sylvain
9a0de78da7 (ui) adjust tooltip aspect 
+ (bug) do not ignore clipboard.writeText promise
+ (i18n) fix typo in translation
 2022-04-12 16:53:31 +02:00
Sylvain
c3f7249242 (ui) display authorization callback url directly in interface 2022-04-12 16:34:44 +02:00
Sylvain
ecc7565346 (i18n) reorganize translations per components 2022-04-12 13:54:47 +02:00
Sylvain
e91fa00afc (ui) add tooltip to FormInput 
+ add tooltip for auth_provider/mappings/API field input
 2022-04-12 12:12:04 +02:00
Sylvain
227be2621f (bug) edit authentication provider 
+ clean legacy code
 2022-04-12 10:59:49 +02:00
Sylvain
153d50be77 (bug) open only selected mapping modal 2022-04-12 10:02:39 +02:00
Sylvain
d2c90f4066 (api) validate auth providers data 
+ remove legacy code
 2022-04-11 17:27:56 +02:00
Sylvain
4da6a5fa72 (ui) improve the appeareance for the auth provider definition form 2022-04-11 16:12:13 +02:00
Sylvain
d542292dbf (ui) sso data mapping - by type 2022-04-11 13:19:07 +02:00
Sylvain
6ac3ad4373 (wip)(ui) type mapping ui 2022-04-06 17:14:23 +02:00
Sylvain
907a89c70b (bug) oauth2 provider attributes under providable_attributes 2022-04-06 12:44:27 +02:00
Sylvain
29938957ff (ui) form-select: onChange cb 2022-04-06 12:24:04 +02:00
vincent
c50d94b2a9 Fix styles on multi-select 2022-04-05 19:31:13 +02:00
vincent
1435a46c99 Override React-select styles 2022-04-05 19:09:59 +02:00
Sylvain
8d98fef096 (wip)(ui) data mapping configuration interface 2022-04-05 16:56:44 +02:00
Du Peng
8f3f2ba083 Fix a bug: unable to confirm modification of reservation for client 2022-04-05 16:43:43 +02:00
Sylvain
6254db4ff9 (archi) organize react-hook-form components in a separate folder 2022-04-05 14:25:58 +02:00
Du Peng
08b072e33c Fix a bug: unable to show machine availability slot for admin 2022-04-05 14:21:19 +02:00
Sylvain
f7dd75dca1 (ui) refactor form components to use props inheritance 2022-04-05 12:04:15 +02:00
Sylvain
8fee9c6bb8 (ui) select authentication provier type 2022-04-05 11:43:28 +02:00
Sylvain
431d733ffe (wip) rhf select 2022-04-04 18:19:59 +02:00
Sylvain
1a8dc390f3 (front) export form component to angular 2022-04-04 16:25:17 +02:00
Sylvain
f68c8a492e WIP: front-end form for openid configuration 2022-04-04 16:25:17 +02:00
Sylvain
8495e2a7a0 (db) table to save OpenID connect configuration 
Also refactored OAuth2Mapping to allow usage with any types of providers
 2022-04-04 16:24:27 +02:00
Sylvain
6e5578db0c (type) fix typing the RHFInput component 2022-04-04 16:12:42 +02:00
vincent
fcb59fa9a8 disable TS rule 2022-04-04 11:49:54 +02:00
vincent
9a0a255f8c Use Generics 2022-04-04 11:16:31 +02:00
Sylvain
fa9a7301e9 Apply 1 suggestion(s) to 1 file(s) 2022-04-01 15:49:46 +00:00
Du Peng
97f7a0aac8 Fix bug: unable to show payment modal for stripe 2022-04-01 16:16:32 +02:00
Sylvain
f83dc52610 (type) fix typing issues 2022-03-30 16:44:45 +02:00
vincent
edc34d9836 Add labels 2022-03-29 17:27:17 +02:00
vincent
d1daa55be1 Add image embed in the text editor 2022-03-29 17:27:17 +02:00
vincent
4c6a1fb0fc Add video embed on the text editor 2022-03-29 17:27:17 +02:00
vincent
2916c5b9d8 Test video embed on the text editor 2022-03-29 17:27:17 +02:00
vincent
13732d7de1 Delete unused components 2022-03-29 17:27:17 +02:00
vincent
7b5f656e76 Add description to plan category 2022-03-29 17:26:23 +02:00
Sylvain
7e9745a761 (style) eslint all code 2022-03-29 17:21:29 +02:00
Du Peng
043c5aafc5 Fix a bug: unable to show payment schedules list if active PayZen 2022-03-29 17:01:14 +02:00
Sylvain
2fcda8a0ce (feature) Prepaid-packs purchases are exported to the accounting CSV file 2022-03-23 13:14:34 +01:00
Sylvain
d62c12664a Merge branch 'gtm_analytics_v4' into dev 2022-03-22 14:19:44 +01:00
Sylvain
4fe5b3dc27 (feat) track events in GA4 
page_view, login, purchase
 2022-03-22 14:19:10 +01:00
Sylvain
f4395c88b9 (feat) google analytics V4 2022-03-22 11:27:18 +01:00
Sylvain
c12615aacc (bug) once configured captcha keys are not shown in the admin panel 2022-03-22 10:33:48 +01:00
Sylvain
191052fdef (dependency) remove angular-google-analytics 2022-03-21 13:43:23 +01:00
Sylvain
d58e9b2bd8 fix angular import 2022-03-16 11:38:47 +01:00
Sylvain
59a671e794 updated @uirouter/angularjs to 1.0.30 2022-03-15 17:10:33 +01:00
vincent
8713354d04 Fix line break on home event's card 2022-02-10 15:07:57 +01:00
Nicolas Florentin
93d6aeaf0f [fix regression], $sce.getTrustedHtml removes all dangerous html like iframe (youtube players, ect), replaced by $sce.trustAsHtml which trust the content, it creates a security breach but all contents are created by users to we trust them 2022-02-07 13:53:39 +01:00
Nicolas Florentin
7b12e56521 [bugfix] fix non-blocking js error when there is not payment gateway set 2022-02-07 13:48:01 +01:00
Sylvain
512828931f (bug) members are unable to buy prepaid-packs by wallet 2022-01-18 17:03:16 +01:00
Sylvain
28489e112c renamed PaymentModal to CardPaymentModal 2022-01-18 16:27:12 +01:00
Sylvain
adccc18193 (bug) missing the Other payment method 2022-01-18 16:07:23 +01:00
Sylvain
8097e33ef4 (bug) untranslated string if prepaid pack has no maximum validity 2022-01-18 15:46:15 +01:00
Sylvain
86c595ea30 Merge remote-tracking branch 'origin/fix-extended-prices' into dev 2022-01-17 15:42:21 +01:00
Sylvain
67850a6f9f (feat) optional sso debug logs according to SSO_DEBUG env var 2022-01-17 15:24:07 +01:00
Sylvain
634da414f8 (feat) When a payment schedule is in error or canceled, ability to re-enable it with another payment method 2022-01-17 12:38:53 +01:00
Sylvain
d8f27f0b1a reactored payment-schedules-table to extract buttons to payment-schedule-item-actions 2022-01-17 10:51:27 +01:00
Sylvain
a189190a8e wip: refactor payment schedule table 2022-01-12 17:17:07 +01:00
Sylvain
036f9df35f Specilized VAT rate cannot be defined unless the VAT is enabled and saved 2022-01-12 15:30:54 +01:00
Sylvain
cb6a3a00b6 (bug) the switch to enable/disable the VAT does not reflect the current state of the VAT 2022-01-12 15:17:08 +01:00
Sylvain
4dd5bca55c wip: refactor the payment schedule table to extract the item actions into a separate component 2022-01-11 18:41:04 +01:00
vincent
d54068446a Display hours for extended prices duration 2022-01-11 17:54:38 +01:00
Sylvain
a38d3e31b1 use explicit payment method for check in paymentSchedules and do not include the payment method in the footprint 2022-01-11 16:15:43 +01:00
vincent
f15907c405 Merge branch 'dev' into wip-demo-update 2022-01-07 08:23:34 +01:00
Sylvain
f647ebd9e0 When a payment schedule was canceled by the payment gateway, inform the user in the interface 
TODO: send an in-system notification and an email notification
+ refactor payzen/service and stripe/service to extract notification sending
+ send notifications on state=error
+ in the interface: open a modal dialog to allow the admin to choose an action (cancel/continue by check/continue by transfer)
+ refactor the payment-schedule-tables.ts to extact the item-line logic (the component is getting too big)
 2022-01-05 17:16:25 +01:00
Sylvain
9922812111 Ability to select "bank transfer" as the payment mean for a payment schedule 2022-01-05 15:58:33 +01:00
Sylvain
d7ccbdbb52 [bug] do not load Stripe if no keys were defined 2022-01-05 11:31:27 +01:00
Sylvain
e1256ec551 Ability to disable public account creation 2022-01-04 15:27:58 +01:00
Sylvain
9e742cd1b6 Ability to create slots in the past 2022-01-04 10:28:43 +01:00
Sylvain
f3f15a2b9d Ability to cancel a payement schedule from the interface 2022-01-03 17:13:35 +01:00
Sylvain
effe5c7ba9 optimized the load time of the payment schedules list 
From now, we no longer retrieve the client_secret directly from the API/list but from a specialized component which ask API/get_item.
This highly decrease the laod time needed to fetch API/list
 2022-01-03 11:24:08 +01:00
Sylvain
00b9bce587 export collected VAT by rate 2021-12-29 17:00:54 +01:00
Sylvain
16242d2127 frontend invoice configuration page uses multiVAT 2021-12-29 12:08:50 +01:00
Du Peng
6019767a3b update multi VAT 2021-12-28 13:45:29 +01:00
Sylvain
fe96e01b7f refactor spaces/extended_prices code architecture to match the FM style guide 2021-12-28 11:25:10 +01:00
Sylvain
db4230def1 Revert "Fix classes names" 
This reverts commit c394b3a275.
 2021-12-28 09:47:44 +01:00
vincent
c394b3a275 Fix classes names 2021-12-22 17:25:02 +01:00
Vincent
934ac309a1 Merge branch 'dev' into 'spaces_multiprices' 
# Conflicts:
#   CHANGELOG.md
 2021-12-22 14:29:56 +00:00
Sylvain
b864ba66da Apply 22 suggestion(s) to 6 file(s) 2021-12-22 14:07:48 +00:00
Sylvain
5be06babd7 Apply 1 suggestion(s) to 1 file(s) 2021-12-22 13:51:26 +00:00
vincent
fc83b4d9c3 Create [pricing] sub folders 2021-12-21 20:13:55 +01:00
vincent
0d34bffa6d Merge branch 'spaces_multiprices_front' into spaces_multiprices 2021-12-21 18:06:25 +01:00
vincent
1d38d6ae50 fix + new icon 2021-12-21 18:02:39 +01:00
Sylvain
61f432914c optimize payment schedules list loading 2021-12-21 17:27:51 +01:00
vincent
c3cbc26a1e Merge branch 'spaces_multiprices_front' into spaces_multiprices 2021-12-21 17:14:22 +01:00
vincent
bd781a14e9 Add extended price 2021-12-21 17:13:40 +01:00
Sylvain
ffb0f3e19e ability to limit extended prices to slots in the same day 2021-12-21 16:32:02 +01:00
vincent
af4acc895c Merge branch 'spaces_multiprices' into spaces_multiprices_front 2021-12-21 15:24:20 +01:00
vincent
d6a4675209 wip 2021-12-21 14:37:38 +01:00
Sylvain
6dc2e8e41e modelise space object from API in TS 2021-12-21 09:51:40 +01:00
vincent
f8798e28b5 Convert [spaces] to React 2021-12-20 19:12:01 +01:00
Sylvain
4a8fa65e5f workaround pending for UI 2021-12-20 17:19:43 +01:00
Sylvain
5ebc1017d2 save prices duration in db 2021-12-20 15:47:57 +01:00
Sylvain
94c4be3e61 remove useless code 2021-12-20 15:25:49 +01:00
vincent
163e56d2f2 Add minor style adjustments for the demo 2021-12-03 18:25:25 +01:00
Sylvain
b74570c778 refactor reserve-button component 
we use "user" everywhere, this is more logical and this may fix an unreproductible issue with prepaid packs
 2021-11-22 14:13:39 +01:00
Sylvain
9be0dcddd2 [bug] 3DS confirmation is not asked when an admin is subscribing a user through a payment schedule using PayZen 2021-10-22 17:53:02 +02:00
Sylvain
f273372682 fix function call 2021-10-22 15:55:48 +02:00
Sylvain
4a59f6faed [bug] invalid text shown when a member confirms a free cart 2021-10-22 15:43:33 +02:00
Sylvain
ab53042f21 fix undefined variable sameTimeReservations 2021-10-22 14:59:57 +02:00
Sylvain
840c536c75 Ability to configure data sources for preventing booking on overlapping slots 2021-10-22 14:50:02 +02:00
Sylvain
36086f93df [WIP] ability to select categories of slots for computing overlapping slots 2021-10-21 18:09:36 +02:00
Sylvain
9c55b9d61f [bug] incorrect behavior for the setting 'email confirmation required' 
- when enabled: the user was still logged-in in the backend (F5 and he was logged in the frontend)
- when disabled: the user was not logged in the frontend and received a message to confirm his/her email
 2021-10-21 15:07:18 +02:00
Sylvain
bbf512f674 validate birthday in past 2021-10-21 09:29:29 +02:00
Sylvain
2d61dac9cc refactored admin takes subscription for a member 2021-10-19 12:24:41 +02:00
Sylvain
6ec7ecca9a [WIP] create subscription modal 2021-10-18 17:15:06 +02:00
Sylvain
4b41b29b9d fix using payzen with scheduled subscriptions 2021-10-18 16:34:56 +02:00
Sylvain
a373ea03fc show good start date in payment schedule ui 2021-10-18 10:34:24 +02:00
Sylvain
4c56dffc04 remove deprecated code and endpoints 2021-10-18 10:15:48 +02:00
Sylvain
fd39eaf2f1 fix renew subscription API 
TODO:
- remove old endpoints
- bug in UI (start date invalid)
- fix tests
- payzen
 2021-10-15 17:31:01 +02:00
Sylvain
315e899540 [WIP] fix tests 2021-10-14 18:20:10 +02:00
Sylvain
336a4b789c proceed with payment on subscription renewal 2021-10-13 17:39:39 +02:00
Sylvain
6cd91d0291 [WIP] refactor renew subscription modal 2021-10-12 17:29:35 +02:00
Sylvain
17a0baac7e refactored free subscription extending 2021-10-12 14:07:35 +02:00
Sylvain
70f0e21543 move free extend modal to react 2021-10-11 18:50:53 +02:00
Sylvain
e646eb8cb5 extend subscription UI 2021-10-08 19:14:47 +02:00
Sylvain
a3f680964c handle stripe errors while local payments 2021-10-07 16:43:51 +02:00
Sylvain
3663f8ab86 full stripe subscription code refacto 
TODO: test
 2021-10-06 17:09:35 +02:00
Sylvain
d494b012d4 [ongoing] refactoring stripe subscription 2021-10-06 09:42:58 +02:00
Sylvain
3769afe431 Merge branch 'editor_xss_vulnerability' into dev 2021-10-04 09:31:34 +02:00
Du Peng
235fd2e58a Merge branch 'buy_pack_for_plan_option' into dev 2021-09-21 18:01:54 +02:00
Du Peng
1c54e54c17 use plant.base_name instands of plan.name 2021-09-21 18:00:48 +02:00
Du Peng
f2dd1bbcd2 add an option Subscription valid for purchase and use of a prepaid pack 2021-09-20 19:43:05 +02:00
Du Peng
f4ed3ca391 fix bug: admin takes a subscription with a payment schedule by stipe 2021-09-10 18:32:39 +02:00
Du Peng
65ba3a686b disable monthly payment for 1 month of subscription 2021-09-10 15:34:49 +02:00
Du Peng
6b763cc1c9 improve code for stripe subscription payment 2021-09-10 15:19:04 +02:00
Du Peng
c9f20ddc03 fix bug: plans page show an error if admin dont create any plans 2021-09-09 18:46:23 +02:00
Du Peng
334d8ce055 check event event_theme_ids if exist 2021-09-09 18:25:26 +02:00
Du Peng
238d7af1ee disable monthly payment if interval count == 1 2021-09-08 19:21:44 +02:00
Du Peng
2973dec6a7 rewrite payment schedule workflow by stripe 2021-09-08 18:57:10 +02:00
Du Peng
a910e8999b fix bug: editor xss vulerability, disable code view in new/edit project 2021-08-31 11:30:23 +02:00
Du Peng
a2a32ef3c6 fix bug: error in plans list page 2021-08-24 11:01:21 +02:00
Du Peng
1fdf3d35b5 adjuste packs pricing popover position 2021-08-03 17:03:03 +02:00
Du Peng
b5ab52dd64 bug fix stripe 3D payment 2021-07-09 17:54:25 +02:00
Sylvain
f6889fbfda linted TSX files 2021-07-01 12:34:10 +02:00
Sylvain
54c933523d linted TS files 2021-07-01 12:04:48 +02:00
Sylvain
a6043fe81e linted JS files 2021-07-01 11:23:58 +02:00
Sylvain
fb3bbacaf0 handle no packs available for the customer 2021-06-30 16:58:16 +02:00
Sylvain
19717d1351 use localPaymentModal in cart directive 2021-06-30 16:35:25 +02:00
Sylvain
d43f719038 buy packs using local payment 2021-06-30 15:32:10 +02:00
Sylvain
6c326c7209 compute price according to prepaid hours 
Also: handle prepaid hours decreasing when used
 2021-06-30 10:53:05 +02:00
Sylvain
20bd3931d4 [bug] public list of plans fails to render if a group has no plans 2021-06-30 09:18:06 +02:00
Sylvain
9c6a7df0bf WIP: compute price including prepaid packs 2021-06-29 16:56:40 +02:00
Sylvain
10aaf0042c integration of packs-summary 2021-06-29 15:59:57 +02:00
Sylvain
baf41588d3 packs summary component 2021-06-29 11:14:36 +02:00
Sylvain
f56b8eae75 admin can configure renew threshold 2021-06-29 09:07:11 +02:00
Sylvain
1aad4891c1 buy prepaid-pack a hours from modal 2021-06-28 18:17:11 +02:00
Sylvain
91d2316280 [bug] two empty categories in the plan creation form 2021-06-28 16:53:39 +02:00
Sylvain
bbb1aca4fb display validity for each pack 2021-06-28 12:24:31 +02:00
Sylvain
86de1f6253 styled packs 2021-06-28 11:49:51 +02:00
Sylvain
f16cbc44ff WIP: buy pack modal 2021-06-25 17:24:34 +02:00
Sylvain
99bd00949e fix handling after internal login 2021-06-25 11:10:17 +02:00
Sylvain
c0211cd002 fix handling of external login process 2021-06-25 11:03:01 +02:00
Sylvain
26f98f30f6 edit pack modal 2021-06-25 09:56:39 +02:00
Sylvain
5d3391cd44 move new pack to a separate component 2021-06-25 09:28:05 +02:00
Sylvain
0345d22582 delete & disable packs 2021-06-24 17:59:05 +02:00
Sylvain
1f8fd47317 pack creation and listing 2021-06-23 17:00:15 +02:00
Sylvain
f81e0910c2 packs popover 2021-06-23 11:33:42 +02:00
Sylvain
8cc4811794 edit machines pricings 2021-06-22 17:56:13 +02:00
Sylvain
d7ba83f6a0 WIP: migrate machine pricing edition interface to react 2021-06-22 11:13:44 +02:00