1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-12 23:09:03 +01:00
Commit Graph

2072 Commits

Author SHA1 Message Date
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
Sylvain
2d807e6c94 improved slot price calculation 2021-12-21 15:30:08 +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
6091cec82e api endpoint to create prices 2021-12-21 14:18:03 +01:00
Sylvain
2b834045ef improve price calculation 2021-12-21 11:14:09 +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
d6b30875a4 compute the price based on custom durations 2021-12-20 17:08:14 +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
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
0f57e1081f [bug] unable to create a plan 2021-11-10 17:06:21 +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
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
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
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
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
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
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