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,443 Commits 15 Branches 274 Tags 83 MiB
1e0ece6c89
Commit Graph

1083 Commits

Author SHA1 Message Date
Sylvain
7f1cc92c43 linted supporting-documents/* 2022-06-22 13:01:22 +02:00
Sylvain
4d6af2c1c0 (wip) linting supporting-documents (ex proof-of-identify) 
remaining: type-form, type-modal, types-list
 2022-06-21 17:49:04 +02:00
Sylvain
21ee80ab19 rename proof-of-identity to supporting-documents 2022-06-21 14:39:26 +02:00
Sylvain
18aba05f25 linted profile-custom-fields 2022-06-21 14:10:51 +02:00
Sylvain
00fb384ba5 fixed imports 2022-06-21 12:18:54 +02:00
Sylvain
f28b66068f tidied up the flowing components 2022-06-21 12:18:25 +02:00
Sylvain
c0d5da55ce linted all code expected profile-custom-fields/* and proof-of-identity/* 2022-06-21 12:10:00 +02:00
Sylvain
4a8d8796a3 (wip) lint for scoped-translation 2022-06-20 18:06:15 +02:00
Sylvain
2033329342 linted all front code, excepted profile-completion/ 
and prrofile-custom-fields/
 2022-06-20 15:35:38 +02:00
Sylvain
37bc2b3d43 (bug) the birthday was not shown in user edition form 2022-06-20 10:49:44 +02:00
Sylvain
32259e8876 (bug) birthday, phone, address not marked as required 2022-06-20 10:18:50 +02:00
Du Peng
d45c03d36e Override angular currency filter, use Intl.NumberFormat to format amount 2022-06-15 19:44:55 +02:00
Sylvain
28f873c871 (code) rule to enforce component named like filename 2022-06-15 13:40:57 +02:00
Sylvain
925e109175 all components must have their matching root class 2022-06-15 13:40:54 +02:00
Sylvain
8770adead4 fix typo 2022-06-15 13:39:27 +02:00
Sylvain
0f15127f22 updated eslint rules dependency 2022-06-15 13:39:27 +02:00
Sylvain
ca9eec8579 (lint) add rule to check component class naming 2022-06-15 13:39:27 +02:00
vincent
ed34279cef unable non-required [text-setting] 2022-06-15 13:35:46 +02:00
Sylvain
503ae22c0b (feat) admins can scroll to the featured event 2022-06-15 12:26:44 +02:00
Sylvain
31fe9dea05 (feat) feature the next event in the event page 2022-06-15 10:55:08 +02:00
Sylvain
61080a5188 (feat) feature the first event 2022-06-14 17:50:04 +02:00
vincent
103bf80e81 Standardize card layout 2022-06-14 16:44:26 +02:00
vincent
f30c501948 (wip) React component [EventCard] 2022-06-14 16:44:26 +02:00
vincent
fcfa9513e8 (wip) React component [EventCard] 2022-06-14 16:44:24 +02:00
Du Peng
ac16eca60f fix conflict 2022-06-07 16:57:02 +02:00
Du Peng
c24aad00c4 check shopping cart items is valid before pay online 2022-06-07 16:55:29 +02:00
Sylvain
667272fab6 (bug) list of OIDC scopes are loading indefinitely 2022-06-06 11:44:16 +02:00
Du Peng
f9bd27ea13 Fix a bug: unable to show tours in machines and spaces page 2022-06-03 12:18:15 +02:00
Du Peng
ef5d603065 Fix a bug: admins are shown in select member for reservation by admin 2022-06-03 12:05:55 +02:00
Du Peng
4d3fe6aa2a Fix a bug: if multi VAT no value is filled in, the general rate can't apply 2022-06-01 12:41:19 +02:00
vincent
b45b0ed942 Move calendar header's buttons on the left 2022-06-01 09:33:15 +02:00
Sylvain
2172c102c9 (bug) use arrays for OIDC scopes in front and DB. 
Send the scope as a string separated with spaces to the OIDC provider.
 2022-06-01 09:27:49 +02:00
Sylvain
78f7cdcb8c (bug) unable to remove the last training or the last tag to a member 2022-05-31 17:06:39 +02:00
Sylvain
e914567cf1 (bug) fix multi select behavior 2022-05-31 17:06:06 +02:00
Sylvain
931e19b331 (bug) hide create account links when public registrations disabled 2022-05-30 14:19:32 +02:00
Sylvain
31b4089bd2 (bug) OIDC scopes 2022-05-30 12:56:22 +02:00
Du Peng
384dd43029 Fix a bug: undefined error in new member page 2022-05-27 12:02:02 +02:00
Sylvain
532a896cad (bug) fix #348: open reset password modal when back from notification center 2022-05-23 14:20:08 +02:00
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
Sylvain
d54f30e048 WIP: interface to configure packs 2021-06-21 17:39:48 +02:00
Sylvain
7ac60f6ef3 data architecture of prepaid-packs 2021-06-21 14:58:49 +02:00
Sylvain
2b0130c6be Merge branch 'dev' into prepaid 2021-06-21 11:36:31 +02:00
Sylvain
33e45fd536 [bug] ignored coupon when booking an event with card payment 2021-06-18 17:19:24 +02:00
Sylvain
5a0e7e9374 fix training requred modal when no user logged 2021-06-18 16:42:52 +02:00
Sylvain
870de2b421 reserve machine button in show machine page 2021-06-18 16:40:39 +02:00
Sylvain
fcdc357f89 required training modal 2021-06-18 16:05:36 +02:00
Sylvain
4ecdf431d5 fix pending traning modal 2021-06-18 12:47:04 +02:00
Sylvain
f9a8453b70 fixes in machines galery: 
- display a placeholder when no picture
- display an opacity filter when machine is disabled
- filtering by enabled/disabled
- text in pending training modal
 2021-06-18 11:51:26 +02:00
Sylvain
962f9bc26f WIP: pending training modal 2021-06-17 17:26:35 +02:00
Sylvain
db242e1f27 fix button style 2021-06-17 17:10:48 +02:00
Sylvain
bff5415a1e refactor API services to use only static methods 
Also: separate reserve-button component
 2021-06-17 17:09:10 +02:00
Sylvain
4aa3fdff0e filter machines by status 2021-06-17 10:25:13 +02:00
Sylvain
80d206fc99 responsively styled the machines list 2021-06-17 09:48:29 +02:00
Sylvain
565002a124 WIP: migrate machines list to react 2021-06-16 18:10:29 +02:00
Sylvain
f88e53708d [bug] invalid link to the user's manual 2021-06-16 14:58:32 +02:00
Sylvain
3f08845503 [bug] unable to book a free event 2021-06-16 11:45:11 +02:00
Sylvain
7c65a52fbe [bug] unable to book a free event 2021-06-16 11:44:53 +02:00
Sylvain
99792e8610 WIP: migrate machine card to react 2021-06-15 17:34:12 +02:00
Sylvain
11579fede4 ability to disable the public agenda 2021-06-15 11:57:43 +02:00
Sylvain
72be638869 [bug] unable to select no category in plan creation/edition after a category selection 
Also: Display the category in the plans list instead of the plan type
 2021-06-15 09:22:41 +02:00
Sylvain
ec301ba07e [bug] unable to list user's payment schedules in the dashboard 2021-06-14 14:40:54 +02:00
Sylvain
645efa37f4 [bug] unable to book an event 2021-06-14 14:22:23 +02:00
Sylvain
7ba2d58f50 update VCR to 6.0.0 
Also: - updated cassettes
- Automated stripe secrets filtering in cassettes
- Improved display when no plan-categories exists
 2021-06-11 14:29:30 +02:00
Sylvain
817db8b5eb do not display empty categories titles 2021-06-10 16:17:10 +02:00
Sylvain
e184bf3d3c filter plans y duration 2021-06-10 14:06:53 +02:00
Sylvain
4580bfc7d7 allow user to filter plans by groups 2021-06-10 12:52:14 +02:00
Sylvain
854db568bf Ability to configure the prefix of the payment-schedules' files 2021-06-10 12:04:00 +02:00
Sylvain
a416f8c7ae transactional bulk update + better error handling while configuring the payment gateway 2021-06-10 10:39:42 +02:00
Sylvain
ef69cab179 Merge branch 'hotfix' into dev 2021-06-09 19:40:07 +02:00
Sylvain
f82adc8133 [bug] unable to process stripe payments 2021-06-09 19:24:56 +02:00
Sylvain
c5db9e36ba fix udpate stripe keys modal 2021-06-09 16:49:36 +02:00
Sylvain
57a370bf56 use PlansList component in embedded form 2021-06-09 16:15:23 +02:00
Sylvain
003dd4ce78 refresh plans list after subscription or controlled member changed 2021-06-09 15:46:02 +02:00
Sylvain
05882b3743 display list of plans grouped by category 2021-06-09 13:03:58 +02:00
Sylvain
08ad436351 split plan-catageories management into separate components 2021-06-09 09:24:39 +02:00
Sylvain
4ca16c2688 associate plan w/ category 2021-06-08 17:26:40 +02:00
Sylvain
ae039cdd0c ordering categories 2021-06-08 17:00:52 +02:00
Sylvain
e1e446ab3f API+ interface to CRUD plan categories 2021-06-08 16:43:43 +02:00
Sylvain
b54239eee9 removes unused import 2021-06-07 09:20:40 +02:00
Sylvain
68f64cfc5c update the card for payment schedules 2021-06-04 18:26:20 +02:00
Sylvain
ea774e2080 wait for the first payzen transaction + fix initial amount 2021-06-03 14:28:52 +02:00
Sylvain
dc0a75e52d verify each deadlines on payzen for payment schedules 2021-06-03 12:22:37 +02:00
Sylvain
87cd41794e WIP: payzen subscription 
TODO: retreive the payzen subscription from PayZen::Item
 2021-06-02 20:07:53 +02:00
Sylvain
431ea28448 WIP: payzen recurring payments 2021-06-01 12:20:02 +02:00
Sylvain
d6a6d34105 display correct gateway name in payment schedule confirmation modal 2021-06-01 11:24:43 +02:00
Sylvain
81bc22c494 front-end adaptation for interacting with new object[] API 
Also: [bug] handle not onnected users on subscription page
- fix showing an error message when no gateway is selected
 2021-06-01 11:01:38 +02:00
Sylvain
d942d46632 WIP: migration to object[] 
TODO: fix running tests, fix front-end
 2021-05-28 17:34:20 +02:00
Sylvain
bf3dcd874b display payment confirmation error messages in frontend 2021-05-28 10:22:02 +02:00
Sylvain
b938232c19 Merge branch 'dev' into payzen 2021-05-25 14:06:30 +02:00
Sylvain
faa880f9f6 CAD lists of types and extensions are now ordered alphabetically 2021-05-24 17:33:32 +02:00
Sylvain
ecf80b0591 ability to set invoices as erroneous 2021-05-24 16:34:27 +02:00
Sylvain
c7a59c8cb7 WIP: refactoring to singularize the booking process 
We need to achieve only one process for all booking, not one for subscription, one for reservations, etc.
Moreover we must store one object per invoice_item/payment_schedule_object and stop using Invoice.invoiced or PaymentSchedule.scheduled
 2021-05-21 18:25:18 +02:00
Sylvain
66f81a975e WIP: array of items 
Migration from cart_items:{reservation:{}, subscription:{}, ...}
to cart_items:{items:[{reservation:{}, ...}], ...}
 2021-05-19 18:12:52 +02:00
Sylvain
dd1d05cc3a set payzen public key as invalid if the field is empty 2021-05-19 09:34:31 +02:00
Sylvain
c6bc9f1c15 handle gateway keys invalidation 2021-05-18 16:42:30 +02:00
Sylvain
28c868587b prevent fteched settings to set react components as uncontrolled 2021-05-18 16:31:19 +02:00
Sylvain
9355256909 refresh payzen keys after initial setting 2021-05-18 15:56:22 +02:00
Sylvain
6b99b00d5e handle no key in payzen keys form 2021-05-18 13:50:27 +02:00
Sylvain
5adf15df91 syntax improvements 2021-05-18 09:40:35 +02:00
Sylvain
04b3bfe3c5 update components to match new architecture after merge from dev 2021-05-17 17:09:11 +02:00
Sylvain
6bcd9f6fef Merge branch 'dev' into payzen 2021-05-17 15:07:41 +02:00
Sylvain
bf9a91b479 [bug] about page on small devices 2021-05-14 14:29:36 +02:00
Sylvain
436db80ccf Increased the width of the input field for the prices of the events 
This is especially useful for currencies like FCFA that have large numbers and large currency symbol
 2021-05-12 15:16:10 +02:00
Sylvain
2a7a7fd614 [bug] the event themes are not kept when editing the event again 2021-05-12 14:54:56 +02:00
Sylvain
e3187460ea create payment schedules on payzen 
Also: make generic the creation of products on remote gateway
Also: make generic the call to gateway specific actions
 2021-04-30 16:07:19 +02:00
Sylvain
5f47624d4e WIP: create payment schedule w/ payzen 2021-04-29 17:10:02 +02:00
Sylvain
aaf36dcc0a reserve events w/ payzen 
we cannot use the <cart> directive because the layout is too much different
 2021-04-29 16:29:35 +02:00
Sylvain
ee1cdb417e WIP: move events reservation to use the cart directive 2021-04-28 17:26:07 +02:00
Sylvain
23e38238c8 fix payment on site modal in case of payment schedule 2021-04-28 17:25:42 +02:00
Sylvain
30c1c91590 factorize payment form props 2021-04-28 16:41:15 +02:00
Sylvain
dbdedadf8c fix price computation in front-end 2021-04-28 16:22:22 +02:00
Sylvain
3dc686840c front adaptation to cartItems 
fix payzen customer cart creation
TODO: refactor the payOnSite modals
 2021-04-27 17:18:20 +02:00
Sylvain
a2d870f680 migrate wall-info to use cartitems 2021-04-26 11:46:14 +02:00
Sylvain
6b8f7da98c migrate js clients to new architecture 2021-04-26 11:41:02 +02:00
Sylvain
bc6ef8ef50 WIP: move backend code base to new architecture 
- from stripe only to payment gateway abstract
- from reservation params style to unified cart_items

TODO: fix not passing tests,
subscriptions/renew_as_admin_test.rb fails because InvoiceItem(9).amount = nil
 2021-04-23 17:54:59 +02:00
Sylvain
e456ddc7c9 WIP: refactor the price computation system 2021-04-22 19:24:08 +02:00
Sylvain
26dfbef5e1 WIP: refactor models to use payment_gateway_objects 2021-04-21 17:38:06 +02:00
Sylvain
434ec9c205 refactored Invoices to get rid of stripe references 2021-04-20 17:22:53 +02:00
Sylvain
1bbb8c3965 move the architecture from stripe-only to gateway-generic 2021-04-15 17:01:52 +02:00
Sylvain
ddd1ac52d6 save reservation|subscription to db after payment 2021-04-14 17:56:10 +02:00
Sylvain
07ea6e8c69 renamed SUPERADMIN_EMAIL to ADMINSYS_EMAIL 
The previous was too much subject to confusions
 2021-04-14 15:04:41 +02:00
Sylvain
4e512dda45 validate the payment server side 2021-04-13 17:16:05 +02:00
Sylvain
dbbf6b5f63 fix KryptonConfig 2021-04-13 11:33:15 +02:00
Sylvain
c0afe9419e consolidated the payzen process with types 2021-04-13 11:30:30 +02:00
Sylvain
dca2651fb3 process payements with payzen 2021-04-12 17:37:09 +02:00
Sylvain
ef7dcd37d8 retreive the formToken from PZ API 2021-04-12 12:16:12 +02:00
Sylvain
b3720d7f47 direct the stripe endpoints to /api/stripe 2021-04-12 10:48:30 +02:00
Sylvain
fd5c3a87ce rename /api/payment to /api/stripe 
other payment gateways will have their own separate endpoints
 2021-04-12 10:45:41 +02:00
Sylvain
f232e586ce payment endpoint is specific to stripe 2021-04-12 10:44:20 +02:00
Sylvain
954a35f006 refactor api files 2021-04-12 10:42:54 +02:00
Sylvain
23032c405b WIP: create the formToken server-side 2021-04-09 17:17:58 +02:00
Sylvain
fe5c4e6233 integrate the payzen form widget into the modal 
Also: do not fetch the api from unmounted components
 2021-04-09 12:09:54 +02:00
Sylvain
5e2c50a85f PaymentModal : automatically determines the payment modal to used based on the configured payment gateway 2021-04-09 09:03:59 +02:00
Sylvain
4d0dc808e8 move stripe & payzen components folders into payment/ 2021-04-09 08:47:34 +02:00
Sylvain
b5ab9fbc79 rename PaymentModal to AbstractPaymentModal 2021-04-09 08:40:46 +02:00
Sylvain
4f3a47ae04 move payment modal from /base to /payment 2021-04-09 08:39:03 +02:00
Sylvain
fb2abcc382 integrate payzen logo and other fixes 2021-04-08 17:11:48 +02:00
Sylvain
d70d0dcf7a stripe modal -> generic payment modal 2021-04-08 15:21:24 +02:00
Sylvain
d091c44c11 fix: This object has been frozen and should not be mutated 2021-04-08 11:09:33 +02:00
Sylvain
6da577d4ae reorganized react components 2021-04-08 10:46:09 +02:00
Sylvain
a55dd4dc71 display errors in fab-input 2021-04-08 10:00:19 +02:00
Sylvain
4a344ac9e3 reorganized react components 2021-04-08 09:35:09 +02:00
Sylvain
eea390bdd4 workaround for project rejection 2021-04-07 17:42:15 +02:00
Sylvain
635e8d3356 use HtmlTranslate component 2021-04-07 16:25:14 +02:00
Sylvain
67d0ce24b4 set payzen currency 
also: refactored the comments in the react components to fit high quality
 2021-04-07 16:21:12 +02:00
Sylvain
df7893f65f open modal to edit the keys of the payment gateway 2021-04-07 11:36:04 +02:00
Sylvain
36871a0b34 improved display 2021-04-06 18:00:13 +02:00
Sylvain
667f6f6229 show recapitulative of payzen settings 2021-04-06 17:47:47 +02:00
Sylvain
422acdd162 safely configure and test payzen keys 2021-04-02 17:16:27 +02:00
Sylvain
98bb9d082c fix fab-input and payzen-keys-form 2021-04-02 16:02:50 +02:00
Sylvain
30830b56fd PayZen REST API wrapper ruby + live test keys while configuring 2021-04-01 18:20:26 +02:00
Sylvain
69352c07df validate payzen paramaters in the form 2021-03-31 17:58:09 +02:00
Sylvain
54c1a3cfd9 payzen keys configuration form 2021-03-31 16:03:51 +02:00
Sylvain
1d42fa8781 typos 2021-03-30 16:57:09 +02:00
Sylvain
83cfa710e1 enable online payments 2021-03-30 16:54:43 +02:00
Sylvain
c25e54a6af save & retreive stripe settings 2021-03-30 15:56:36 +02:00
Sylvain
720328ee92 stripe keys form w/ live keys validation 2021-03-30 11:26:47 +02:00
Sylvain
5aacd6695c Merge branch 'dev' into payzen 2021-03-30 09:22:47 +02:00
Sylvain
10dd5d2cca [bug] create a training availability with calendar in month view result in wrong dates 2021-03-29 16:05:53 +02:00
Sylvain
abd6ecabc3 WIP: fab-input component 2021-03-24 17:31:50 +01:00
Sylvain
b5e0572a6b fix devise modal 2021-03-24 15:51:02 +01:00
Sylvain
78b007a9ec [bug] unable to add a new authorized file type for project's CAD files 2021-03-24 15:39:18 +01:00
Sylvain
5b854ea831 Merge branch 'dev' into payzen 2021-03-24 14:34:24 +01:00
Sylvain
7099f1f317 address required 
- Ability to set the address as a mandatory field
- The address is new requested when creating an account
- The profile completion page is less fuzzy for people landing on it without enabled SSO
 2021-03-23 11:49:05 +01:00
Sylvain
f535be5b05 WIP: address_required 2021-03-22 18:02:56 +01:00
Sylvain
a5b3728f8c [bug] various fixes on accouting exports 
- accounting exports may ignore some invoices for the first and last days
- file caching for accounring exports is not used
 2021-03-22 17:42:54 +01:00
Sylvain
b19c78c756 [bug] select all plans for slot restriction 
When using the 'select all' button, to restrict an availbility to subscribers, all plans are selected, even those disabled
 2021-03-22 10:36:41 +01:00
Sylvain
be464a8a61 WIP: migrate stripe keys form to react 2021-03-10 17:15:36 +01:00
Sylvain
18465ee8e9 select gateway modal 2021-03-10 16:46:18 +01:00
Sylvain
141f4f31b1 Merge branch 'dev' into payzen 2021-03-10 15:23:56 +01:00
Sylvain
9d747db095 Ability to disable the trainings module 2021-03-10 13:25:53 +01:00
Sylvain
cd30e0d8d8 [bug] statistics: select machines as default tab if subscriptions is disabled 2021-03-09 12:39:25 +01:00
Sylvain
3d5484918c eslint controllers/admin/statistics.js 2021-03-09 11:41:24 +01:00
Sylvain
6817adc82d Merge branch 'dev' into payzen 2021-03-08 15:50:06 +01:00
Sylvain
5527512b05 Show remaining training credits in the dashboard 2021-03-08 15:17:58 +01:00
Sylvain
2d70a4d07e Do not close login modal when clicking on the backdrop 2021-03-08 14:21:58 +01:00
Sylvain
10fbea9289 Allow writing short rich descriptions for each subscription plan 2021-03-08 14:09:11 +01:00
Sylvain
a74c5d4c95 WIP: plan description 2021-03-03 17:21:11 +01:00
Sylvain
3ea06826ad WIP: select gateway 2021-03-03 15:28:56 +01:00
Sylvain
c9cea041dd updated links to user's guide 2021-02-22 19:26:38 +01:00
Sylvain
c478ade85c fix admin operations on subscriptions w/ schedules 2021-02-10 17:24:03 +01:00
Sylvain
fa686187cd admin can subscribe in member/edit w/ schedule 2021-02-10 15:43:53 +01:00
Sylvain
b48a2738ec prevent allowing payment schedules w/ plans < 1 month 2021-02-10 14:19:14 +01:00
Sylvain
8417c91e6a features tour for payment schedules management interface 2021-02-10 10:58:45 +01:00
Sylvain
9609d96fc3 adjust payment schedule table to usage by admins & members 2021-02-10 10:03:04 +01:00
Sylvain
16bb4bc76d WIP: payment schedules dashboard 2021-02-09 17:18:33 +01:00
Sylvain
f3ad59d33a fix cancel schedule 2021-02-09 16:26:09 +01:00
Sylvain
ff0c69fc58 stripe card update + cancel subscription 2021-02-09 15:44:56 +01:00
Sylvain
b0ef9e097d WIP: stripe update card 2021-02-09 12:09:26 +01:00
Sylvain
0e7226c85c handle stripe requires_action 2021-02-08 15:28:47 +01:00
Sylvain
58af40b8b9 enlight api for cashing checks 2021-02-08 08:56:01 +01:00
Sylvain
b5cdea513d confirm check cashing api 2021-02-04 17:51:16 +01:00
Sylvain
d54846c349 UI to confirm check cashing 2021-02-04 17:00:02 +01:00
Sylvain
d22d011a10 show more results for the payment schedules interface 2021-02-04 15:47:11 +01:00
Sylvain
163976b988 WIP: error handling for card payments on later deadlines 2021-01-27 17:24:10 +01:00
Sylvain
8d08100166 WIP: schedules management inerface 2021-01-27 13:59:41 +01:00
Sylvain
39c3164b47 WIP: admin interface to manage payment schedules 2021-01-26 17:31:11 +01:00
Sylvain
5e06de508d interface to filter list of schedules 2021-01-26 11:37:05 +01:00
Sylvain
def0778a4d basic inteface to retrieve payment schedules 2021-01-25 17:42:30 +01:00
Sylvain
728ae4310c improved testing of payment schedules + some fixes 
TODO: fix the test
rails test test/integration/reservations/create_test.rb
Reservations::CreateTest#test_user_reserves_a_machine_and_renew_a_subscription_with_payment_schedule_and_coupon_and_wallet [test/integration/reservations/create_test.rb:841]
Minitest::Assertion: Expected: "stripe"
  Actual: nil
 2020-12-30 18:43:33 +01:00
Sylvain
dc00df4afc fix stripe subscription w/ coupon + wallet 2020-12-30 12:19:33 +01:00
Sylvain
f4f1464826 fix wallet-info component to use cartItems 2020-12-29 17:32:00 +01:00
Sylvain
1f873979f3 architecture documentation 2020-12-29 13:13:48 +01:00
Sylvain
abe1619392 fix book reservation+subscription 2020-12-29 11:27:59 +01:00
Sylvain
feeed2f450 fix take a reservation + subscription 
FIXME:
ActionView::Template::Error (undefined method `iso8601' for nil:NilClass)
Callstack:
  app/views/api/reservations/show.json.jbuilder:40:in `_app_views_api_reservations_show_json_jbuilder'
  app/controllers/api/payments_controller.rb:91:in `confirm_payment_schedule'
 2020-12-28 18:30:27 +01:00
Sylvain
f661428db2 better error handling in stripe::subscription creation process 2020-12-23 15:29:56 +01:00
Sylvain
bbf88846dd refactored Invoice & PaymentSchedule to use inheritance 2020-12-22 14:43:08 +01:00
Sylvain
609d19e5d1 refactored subscription process + renew (update) subscription/ offre free days 2020-12-21 16:12:34 +01:00
Sylvain
e0ac9d1ac3 Eslint the frontend members controllers 2020-12-21 14:26:38 +01:00
Sylvain
c3c881d2a8 process the schedule to the stripe subscription 
- only for subscriptions for now
- TODO: reservations (see app/services/reservations/reserv.rb:13)
 2020-12-09 16:47:51 +01:00
Sylvain
a20be8ecb2 display legal agreement 2020-12-09 12:51:06 +01:00
Sylvain
66c205d0ed API error handling 2020-12-09 11:35:49 +01:00
Sylvain
8e8fc9b682 validate reservation/subscription after payment schedule creation 2020-12-08 17:30:33 +01:00
Sylvain
1d64c517c9 create stripe's paymentIntent 
associate the paymentMethod (the card) with the customer (the user)
for futur usages in subscriptions
 2020-12-08 12:26:03 +01:00
Sylvain
b6240c5046 handle after payment method was created 2020-12-07 17:13:05 +01:00
Sylvain
96b1cfcbc7 handle successfull stripe payment 2020-12-07 13:49:11 +01:00
Sylvain
1e43dc9518 show indicator while the payment is pending 2020-12-07 12:58:15 +01:00
Sylvain
0d0bf473af see TODOs (stripe-modal.tsx, machines.js.erb) 2020-12-02 17:28:14 +01:00
Sylvain
5941446a72 fixes for card payment 2020-12-02 14:28:41 +01:00
Sylvain
6c39191efa allow payment with stripe-modal react component 2020-12-02 10:06:18 +01:00
Sylvain
4ca2299776 WIP: using <stripe-modal> in cart directive 2020-12-01 17:55:23 +01:00
Sylvain
9813c5d27b style payment modal 2020-11-30 16:52:55 +01:00
Sylvain
f5709ef60e get stripe payment method 2020-11-25 17:13:45 +01:00
Sylvain
7d0abebc22 WIP: stripe modal 2020-11-24 16:26:18 +01:00
Sylvain
1e5f7ea1fd WIP: refactor stripe payment modal to react + do not user angular in react component (use Intl instead) 2020-11-24 13:26:15 +01:00
Sylvain
b88c1009db WIP: create react component to collect card data 2020-11-23 17:36:33 +01:00
Sylvain
34a9084501 pass payment method to the ruby service 2020-11-23 11:48:44 +01:00
Sylvain
6abee0cea0 define payment method before validating schedule 2020-11-18 16:01:05 +01:00
Sylvain
a56112a47f using stripe api 2020-11-17 16:23:55 +01:00
Sylvain
678af0de1f using stripe api + improved ui + ui to configure schedules reference 
TODO: as an admin, I can select if payment_method = (stripe || local)
 2020-11-16 16:37:40 +01:00
Sylvain
b5504d2342 create stripe subscription with all data 2020-11-12 16:44:55 +01:00
Sylvain
9d2dc65958 pay reservation only from cart 2020-11-10 11:57:45 +01:00
Sylvain
a321771040 user consent about payment schedule 2020-11-10 09:51:13 +01:00
Sylvain
2ab7f3bdb9 handle only subscription process in cart 2020-11-10 08:54:52 +01:00
Sylvain
789c6a28fe handle subscription creation only from the cart 2020-11-09 16:54:20 +01:00
Sylvain
2af6c8b9cc style fix 2020-11-09 15:22:22 +01:00
Sylvain
0c456b153e use FabModal component to display ful schedule 2020-11-09 15:17:38 +01:00
Sylvain
0fe4f13110 component to display the payment schedule 2020-11-05 17:32:37 +01:00
Sylvain
0e503e734e select-schedule component 2020-11-05 15:30:25 +01:00
Sylvain
2fc9fd4028 show subscription summary in cart payment modal 2020-11-05 09:57:38 +01:00
Sylvain
b0afa02f1d use cart directive on the plan subscription page 
+ fix payment schedule compute
+ fix price for monthly-payments plans in plan-card
+ TODO: valid_reservation_modal.html
+ TODO: Stripe processing
 2020-11-04 16:22:31 +01:00
Sylvain
21bd1312bc compute payment schedule + basic display 2020-11-03 16:50:11 +01:00
Sylvain
506d9dd5fb typo 2020-11-02 16:50:23 +01:00
Sylvain
f2c81a634a using the <plan-card> component in embedded plans view 2020-11-02 13:37:58 +01:00
Sylvain
7084e88d2d display monthly price for compatible plans 2020-11-02 12:29:08 +01:00
Sylvain
465fe8e913 show link to pdf in component 2020-11-02 11:16:13 +01:00
Sylvain
408531d13a use i18next instead of angular-translate for react components 2020-11-02 11:07:08 +01:00
Sylvain
4f877ab05d react coponent: plan-card + extracted scss from stylesheet.rb into themes/ 2020-10-29 15:53:29 +01:00
Sylvain
f5687f1120 WIP: refactoring of plan card 2020-10-28 17:02:22 +01:00
Sylvain
2b014304ce WIP: plan card 2020-10-28 14:23:27 +01:00
Sylvain
571a273ea2 using typescript for all components 2020-10-28 13:35:31 +01:00