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
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
ca603f85af
fix uninitialized constant PayZen::Service
2021-10-22 15:12:25 +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
b1245a5248
updated setup instructions with new prepare-vps script
2021-10-22 10:41:15 +02:00
Sylvain
36086f93df
[WIP] ability to select categories of slots for computing overlapping slots
2021-10-21 18:09:36 +02:00
Sylvain
a51dec9c72
removed ourdated comment
2021-10-21 15:11:47 +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
7ffcd68fb7
[bug] canceled training reservation in admin/edit member
2021-10-21 10:31:21 +02:00
Sylvain
bbf512f674
validate birthday in past
2021-10-21 09:29:29 +02:00
Sylvain
e9740ebf69
validate birth date must be in the past
2021-10-20 17:31:30 +02:00
Sylvain
351360bfa2
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2021-10-20 17:19:20 +02:00
Sylvain
a28a3ad651
[bug] upgrade script add env var already present
2021-10-20 17:19:07 +02:00
Sylvain
2d61dac9cc
refactored admin takes subscription for a member
2021-10-19 12:24:41 +02:00
Sylvain
fd53c44a83
Merge pull request #306 from sleede/dependabot/bundler/sidekiq-6.2.1
...
Bump sidekiq from 6.0.7 to 6.2.1
2021-10-19 10:25:36 +02:00
Sylvain
af6838a63a
updated changelog
2021-10-19 10:25:19 +02:00
Sylvain
a6bcb2bd7e
Merge branch 'dev' of github.com:sleede/fab-manager into dev
2021-10-19 10:22:52 +02:00
Sylvain
07f263ccc5
Merge pull request #307 from sleede/dependabot/bundler/puma-4.3.9
...
Bump puma from 4.3.8 to 4.3.9
2021-10-19 10:22:32 +02:00
Sylvain
74b1b6ec37
Merge branch 'dev' into dependabot/bundler/puma-4.3.9
2021-10-19 10:22:23 +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
1a672b0644
stave start date in subscription schedule
2021-10-18 15:19:58 +02:00
Sylvain
d0eebddcee
[bug] payzen amount for non 2-decimals currencies
2021-10-18 12:14:51 +02:00
Sylvain
1237870450
Merge branch 'extend_subscription' into dev
2021-10-18 11:49:28 +02:00
Sylvain
f250f58317
fix subscription renewal tests
2021-10-18 11:47:28 +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
3349cc3a2d
fix test on paymentSchedules
2021-10-15 11:55:30 +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
4e4849e7bc
Updated SSO documentation
2021-10-13 09:09:58 +02:00
dependabot[bot]
cf55b2eb1c
Bump puma from 4.3.8 to 4.3.9
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.8 to 4.3.9.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.3.8...v4.3.9 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-12 18:12:38 +00: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
Ismaël Sebbane
c62d334c7f
Updated CHANGELOG (5.1.10 release oversight)
2021-10-11 17:01:03 +02:00
Sylvain
e646eb8cb5
extend subscription UI
2021-10-08 19:14:47 +02:00
Sylvain
2b088ff035
Merge branch 'extend_subscription' into dev
2021-10-07 18:04:38 +02:00
Sylvain
de7c021716
updated production doc
2021-10-07 17:41:38 +02:00
Sylvain
676f921d66
fix some errors about stp subscription refacto + improved error handling
2021-10-07 17:07:46 +02:00
Sylvain
a3f680964c
handle stripe errors while local payments
2021-10-07 16:43:51 +02:00
dependabot[bot]
564b63181c
Bump sidekiq from 6.0.7 to 6.2.1
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.7 to 6.2.1.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.7...v6.2.1 )
---
updated-dependencies:
- dependency-name: sidekiq
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-06 23:15:31 +00: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
8b811a1b3e
improved syntax
2021-10-06 08:56:16 +02:00
Du Peng
a9f431a6a2
fix bug: offer and extends subscription
2021-10-06 08:56:16 +02:00
