Sylvain
|
28489e112c
|
renamed PaymentModal to CardPaymentModal
|
2022-01-18 16:27:12 +01:00 |
|
Sylvain
|
c031f099a5
|
Merge branch 'oauth2' into dev
|
2022-01-17 12:46: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
|
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
|
8a149bb947
|
(bug) some links redirect to the home page instead of triggering the requested action
|
2022-01-11 11:03:27 +01:00 |
|
vincent
|
f15907c405
|
Merge branch 'dev' into wip-demo-update
|
2022-01-07 08:23:34 +01:00 |
|
Sylvain
|
e1256ec551
|
Ability to disable public account creation
|
2022-01-04 15:27:58 +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 |
|
vincent
|
c3cbc26a1e
|
Merge branch 'spaces_multiprices_front' into spaces_multiprices
|
2021-12-21 17:14:22 +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 |
|
vincent
|
f8798e28b5
|
Convert [spaces] to React
|
2021-12-20 19:12:01 +01:00 |
|
Sylvain
|
3a787ea2a0
|
support for JSONPath syntax in oAuth2 mapping
|
2021-12-20 13:40:55 +01:00 |
|
vincent
|
163e56d2f2
|
Add minor style adjustments for the demo
|
2021-12-03 18:25:25 +01: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
|
7ffcd68fb7
|
[bug] canceled training reservation in admin/edit member
|
2021-10-21 10:31:21 +02:00 |
|
Sylvain
|
2d61dac9cc
|
refactored admin takes subscription for a member
|
2021-10-19 12:24:41 +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
|
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
|
3769afe431
|
Merge branch 'editor_xss_vulnerability' into dev
|
2021-10-04 09:31:34 +02:00 |
|
Ismaël Sebbane
|
2c0b981c90
|
[machines-edit-view] Replaced a href link by button because more semantically correct + it actually redirects to the homepage (unwanted behaviour)
|
2021-09-22 19:01:10 +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
|
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
|
65ba3a686b
|
disable monthly payment for 1 month of subscription
|
2021-09-10 15:34:49 +02:00 |
|
Du Peng
|
238d7af1ee
|
disable monthly payment if interval count == 1
|
2021-09-08 19:21:44 +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
|
51ec220a3e
|
fix manager cant reserve training for user
|
2021-08-06 11:12:14 +02:00 |
|
Sylvain
|
19717d1351
|
use localPaymentModal in cart directive
|
2021-06-30 16:35:25 +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
|
3a741e79e6
|
[bug] return to the home page when clicking ⟵ on machines/show
|
2021-06-29 16:24:37 +02:00 |
|
Sylvain
|
10aaf0042c
|
integration of packs-summary
|
2021-06-29 15:59:57 +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
|
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
|
2b0130c6be
|
Merge branch 'dev' into prepaid
|
2021-06-21 11:36:31 +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 |
|