Sylvain
3d2bdaea10
fix missing translation
2022-06-22 15:45:53 +02:00
Sylvain
b25cfe65c1
fix translations
2022-06-22 15:37:41 +02:00
Sylvain
367c05b058
fix <br> tags
2022-06-22 14:53:39 +02:00
Sylvain
521366f616
add missing translation
2022-06-22 14:46:38 +02:00
Sylvain
3307203a47
typo
2022-06-22 14:27:27 +02:00
Sylvain
89c610514d
fix styling issues + rename proof of identity
2022-06-22 14:18:33 +02:00
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
18aba05f25
linted profile-custom-fields
2022-06-21 14:10:51 +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
Du Peng
5f8f6a8e6b
update translates
2022-05-12 15:06:06 +02:00
vincent
a3752f36d5
Fix typo
2022-05-12 11:02:03 +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
c719dccd31
add an alert info for modification of fields of organization
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
e45872956c
(ui) Option to prevent users from changing their group
2022-05-11 15:45:49 +02:00
Sylvain
ac1d518ddc
(ui) option to disable the machines module
2022-05-11 11:54:00 +02:00
Sylvain
0e8230af48
(ui) use user-profile-form in admin/members/new
2022-05-10 11:18:33 +02:00
Sylvain
302c55755e
(ui) admin edit user: use new user-profile-form component
2022-05-10 10:23:43 +02:00
Sylvain
9b22286327
Merge remote-tracking branch 'origin/socials-refacto' into profile-form
2022-05-04 15:53:22 +02:00
vincent
521229b87b
Add form validation
2022-05-04 14:57:31 +02:00
vincent
4c6942eba4
merge
2022-05-04 13:02:40 +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
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
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
vincent
3f4714861b
Add description to plan category
2022-05-04 11:16:51 +02:00
vincent
cb5dd953ea
Edit and display fab's social networks
2022-05-04 10:25:25 +02:00
Sylvain
0dd6f4bff5
Merge branch 'openid' into v5.4
2022-04-25 15:43:03 +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
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
79bb235eaa
(ui) automatically test for discovery endpoint
2022-04-19 14:57:53 +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
Du Peng
b277022f6f
Set invoice reference is required
2022-04-12 17:17:39 +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
Du Peng
08b072e33c
Fix a bug: unable to show machine availability slot for admin
2022-04-05 14:21:19 +02:00
vincent
f25fdd4091
merge
2022-04-01 17:48:32 +02:00
Sylvain
2fcda8a0ce
(feature) Prepaid-packs purchases are exported to the accounting CSV file
2022-03-23 13:14:34 +01:00
Sylvain
f4395c88b9
(feat) google analytics V4
2022-03-22 11:27:18 +01:00
vincent
9d7c890f63
Remove gender variable use on locales
2022-03-10 10:01:21 +01:00
vincent
719c1abd63
Add description to plan category
2022-02-03 15:32:02 +01:00
Sylvain
86c595ea30
Merge remote-tracking branch 'origin/fix-extended-prices' into dev
2022-01-17 15:42:21 +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
vincent
d54068446a
Display hours for extended prices duration
2022-01-11 17:54:38 +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
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
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
vincent
a319bf40b4
Fix typo
2021-12-23 14:36:20 +01:00
Sylvain
b864ba66da
Apply 22 suggestion(s) to 6 file(s)
2021-12-22 14:07:48 +00: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
d6a4675209
wip
2021-12-21 14:37:38 +01:00
Sylvain
affd96ddb3
fix typo
2021-10-22 16:12:43 +02:00
Sylvain
d009381dab
remove unused translations
2021-10-22 16:03:26 +02:00
Sylvain
4a59f6faed
[bug] invalid text shown when a member confirms a free cart
2021-10-22 15:43:33 +02:00
Sylvain
840c536c75
Ability to configure data sources for preventing booking on overlapping slots
2021-10-22 14:50:02 +02:00
Sylvain
2d61dac9cc
refactored admin takes subscription for a member
2021-10-19 12:24:41 +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
94634ed825
remove unused tr key
2021-09-30 11:04:00 +02:00
Du Peng
235fd2e58a
Merge branch 'buy_pack_for_plan_option' into dev
2021-09-21 18:01:54 +02:00
Du Peng
2c78ab9cee
fix bug: book overlapping slot setting labal error
2021-09-21 18:01:47 +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
Sylvain
e2ba4c6f2b
fix typo
2021-07-01 09:01:54 +02:00
Sylvain
89a911c897
fix translation
2021-07-01 08:49:59 +02:00
Sylvain
b6f3fa399a
fix norwegian locale + updated a translation
2021-06-30 17:24:01 +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
f56b8eae75
admin can configure renew threshold
2021-06-29 09:07:11 +02:00
Sylvain
26f98f30f6
edit pack modal
2021-06-25 09:56:39 +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
d7ba83f6a0
WIP: migrate machine pricing edition interface to react
2021-06-22 11:13:44 +02:00
Sylvain
f88e53708d
[bug] invalid link to the user's manual
2021-06-16 14:58:32 +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
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
034d883889
remove unused translation
2021-06-10 14:28:55 +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
08ad436351
split plan-catageories management into separate components
2021-06-09 09:24:39 +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
68f64cfc5c
update the card for payment schedules
2021-06-04 18:26:20 +02:00
Sylvain
dc0a75e52d
verify each deadlines on payzen for payment schedules
2021-06-03 12:22:37 +02:00
Sylvain
b938232c19
Merge branch 'dev' into payzen
2021-05-25 14:06:30 +02:00
Sylvain
ecf80b0591
ability to set invoices as erroneous
2021-05-24 16:34:27 +02:00
Sylvain
da3eb4f8bd
[bug] typo in allow/prevent booking overlapping slots
2021-05-21 17:18:22 +02:00
Sylvain
4826db7cf0
[bug] typo in allow/prevent booking overlapping slots
2021-05-18 10:52:59 +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
667f6f6229
show recapitulative of payzen settings
2021-04-06 17:47:47 +02:00
Sylvain
98bb9d082c
fix fab-input and payzen-keys-form
2021-04-02 16:02:50 +02:00
Sylvain
54c1a3cfd9
payzen keys configuration form
2021-03-31 16:03:51 +02:00
Sylvain
c25e54a6af
save & retreive stripe settings
2021-03-30 15:56:36 +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
937ed72dc7
[bug] the view is not refreshed when deleting a recurring slot
2021-03-24 16:02:35 +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
18465ee8e9
select gateway modal
2021-03-10 16:46:18 +01:00
Sylvain
9d747db095
Ability to disable the trainings module
2021-03-10 13:25:53 +01:00
Sylvain
c9cea041dd
updated links to user's guide
2021-02-22 19:26:38 +01:00
Sylvain
fa686187cd
admin can subscribe in member/edit w/ schedule
2021-02-10 15:43:53 +01:00
Sylvain
2827104f16
more explicit message about renew subscription w/ schedule
2021-02-10 13:37:23 +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
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
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
1a93aadda0
en translations for payment schedules management interface
2021-01-27 14:02:39 +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
609d19e5d1
refactored subscription process + renew (update) subscription/ offre free days
2020-12-21 16:12:34 +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
dc844bb10c
Enlarged privacy policy display and edition zones
2020-10-26 16:52:05 +01:00
Sylvain
13bc5334cc
ability to configure until when the events are shown on the home page
2020-09-29 09:39:32 +02:00
Sylvain
abd6979ec7
[bug] erroneous translations in english ( #226 )
2020-08-24 16:54:30 +02:00
Sylvain
40dd39304e
enable/disable statistics module fomr the UI
2020-06-17 12:20:51 +02:00
Sylvain
a9cce243fb
updated user's guide to 4.5
2020-06-16 16:47:38 +02:00
Sylvain
6bc2438348
fix translation key
2020-06-16 10:33:56 +02:00
Sylvain
be9ee9d25d
complete features-tour for invoices page
2020-06-15 15:56:55 +02:00
Sylvain
dbbf306bf2
complete features-tour for projects page
2020-06-15 15:43:28 +02:00
Sylvain
6af5f51ff2
complete features-tour for settings page
2020-06-15 15:32:30 +02:00
Sylvain
24155bc009
ability to lock settings from the env vars
2020-06-15 13:20:48 +02:00
Sylvain
42872ab107
configure wallet from UI
2020-06-15 12:44:43 +02:00
Sylvain
f46c78a476
read email_confirmation_required from the UI
2020-06-15 11:57:13 +02:00
Sylvain
48bcf0b838
configure invoices prefix from the DB
2020-06-15 10:58:15 +02:00
Sylvain
78518e17fb
read stripe_currency from the UI
...
We prevent the currency from being changed if any stripe payment was made, because a stripe user cannot made pay with different currencies. If we try to charge a user with a different currency than the currency he used for a previous payment, this will fail; so we must prevent this case
2020-06-10 16:37:11 +02:00
Sylvain
a70668f52a
sync members on stripe after keys update
2020-06-09 14:27:18 +02:00
Sylvain
d5939a9de5
set the stripe keys from the UI
2020-06-09 13:09:31 +02:00
Sylvain
06b5da9df8
configure online payment from the UI
2020-06-08 17:42:59 +02:00
Sylvain
b44a8da73b
set openlab_default from the UI
2020-06-08 16:15:44 +02:00
Sylvain
88f2fb3749
secure the settings API (read) + read the openlab settings from the db
2020-06-08 15:08:07 +02:00
Sylvain
db8de18bd4
set openlab-projects id & secret from the UI
2020-06-08 11:38:49 +02:00
Sylvain
6af3f12917
use the db settings to validate mime types & extensions + fix texts + force lowercase
2020-06-03 17:56:39 +02:00
Sylvain
8f32eb92db
interface to manage file extensions & mime types
2020-06-03 17:39:32 +02:00
Sylvain
5c152412db
test mime type of a file
...
use marcel to test mime types
updated mimemagic
2020-06-03 16:25:13 +02:00
Sylvain
45013be950
configure default_host & default_protocol from env
...
reverts 478a6c40
(partially) & b2434864
2020-06-02 18:29:24 +02:00
Sylvain
9a0f36c245
configure disqus_shortname from the UI
2020-06-01 18:31:43 +02:00
Sylvain
59cb17789c
rename section project_elements to projects
2020-06-01 17:52:39 +02:00
Sylvain
478a6c409d
define default_protocol & default_host from the UI + fix email_from + various minor fixes
2020-06-01 17:32:32 +02:00
Sylvain
0617e4cd26
configure default_mail_from from the UI
2020-06-01 12:15:16 +02:00
Sylvain
434c211ccf
configure the features tour display mode from the UI
2020-05-27 18:49:53 +02:00
Sylvain
0d211e2e31
configure google recaptcha from UI
2020-05-27 16:35:30 +02:00
Sylvain
c3846e7080
configure twitter analytics from the UI
2020-05-27 15:39:39 +02:00
Sylvain
628a0f3bc3
configure facebook_app_id from the UI
2020-05-27 12:29:51 +02:00
Sylvain
2d628d8826
disable the invoicing module from the UI config panel
2020-05-26 18:07:07 +02:00
Sylvain
537743a740
configure the plans module from the admin UI
2020-05-26 15:39:28 +02:00
Sylvain
6cc6bba7ce
refactored app to gather spaces module status from the settings
2020-05-26 13:59:40 +02:00
Sylvain
fd93093f0d
UI to configure the spaces module
2020-05-26 10:53:49 +02:00
Sylvain
acefc325f6
configure events_in_calendar form the UI panel
2020-05-25 17:36:53 +02:00
Sylvain
57ceeec2e7
refactored settings/reservations/confidentiality section
2020-05-25 17:05:54 +02:00
Sylvain
a63340188b
configure default slot duration from settings panel
2020-05-25 12:55:01 +02:00
Sylvain
ddce7f516a
configuration of book concurrent slots through the settings interface
2020-05-25 12:55:00 +02:00
Sylvain
419605e551
configuration of google analytics tracking ID through the settings interface
2020-05-25 12:55:00 +02:00
Sylvain
4841027216
interface to collect the google analytics ID
2020-05-25 12:55:00 +02:00
Sylvain
654d4b1cb4
setting: phone_required
2020-05-25 12:54:19 +02:00
Sylvain
0a336f14e4
updated messages about prices
2020-05-06 16:55:26 +02:00
Sylvain
6d0ed0bfb5
info box for current availabity in admin calendar
2020-05-05 16:19:46 +02:00
Sylvain
2d8df2c1cd
Ability to promote a user to a higher role (member > manager > admin)
2020-05-05 11:28:04 +02:00
Sylvain
881cc97e8d
The invoices list displays the operator in case of offline payment
2020-05-04 10:56:27 +02:00
Sylvain
b97ff2ec5b
improved feature tour for managers
2020-04-29 16:30:39 +02:00
Sylvain
68fd322398
managers: edit user/edit subscription
2020-04-29 11:11:57 +02:00
Sylvain
6a8746b110
[bug] updating a setting without any changes triggers an error
...
Also:
- Invoices interface for managers
- Refactoring of admin/invoices template: split into multiple files
2020-04-28 16:35:54 +02:00
Sylvain
18895b6a85
manager can create memebrs & credit wallets
2020-04-28 15:34:17 +02:00