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
Du Peng
18c17cc93c
Fix a bug: form maxlength count to exclude spaces and newline
2022-04-07 15:22:54 +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
431d733ffe
(wip) rhf select
2022-04-04 18:19:59 +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
2fcda8a0ce
(feature) Prepaid-packs purchases are exported to the accounting CSV file
2022-03-23 13:14:34 +01:00
Sylvain
0c51aff748
(feat) OAuth2 scopes are now configurable from the interface
...
Previously, scopes were supported through OAUTH2_SCOPE since v5.3.1.
BREAKING CHANGE: update your oauth2 provider configuration if you need scopes support
2022-03-22 16:40:09 +01:00
Sylvain
49dd0d2dab
(bug) a sentence was not linked to a translation key
2022-03-08 15:48:06 +01:00
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
Sylvain
bff5415a1e
refactor API services to use only static methods
...
Also: separate reserve-button component
2021-06-17 17:09:10 +02:00
Sylvain
67ed329dd7
add button to open reservations
2021-06-17 11:56:00 +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
21a593edf0
[bug] can't see the dates for the next booked training session
2021-06-16 14:48:24 +02:00
Sylvain
7fa89c826a
[bug] can't see the dates for the next booked training session
2021-06-16 14:46:47 +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
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
854db568bf
Ability to configure the prefix of the payment-schedules' files
2021-06-10 12:04:00 +02:00
Sylvain
4368851151
[bug] do not allow users to register with an invalid email address
2021-06-09 19:10:31 +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
b83a9e44d6
fix edition of plan's category
2021-06-09 09:47:56 +02:00
Sylvain
4ca16c2688
associate plan w/ category
2021-06-08 17:26:40 +02:00
Sylvain
e1e446ab3f
API+ interface to CRUD plan categories
2021-06-08 16:43:43 +02:00
Sylvain
3f044513e9
[bug] cannot select the recurrence end date on Safari or Internet Explorer
2021-06-08 10:25:20 +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
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
b938232c19
Merge branch 'dev' into payzen
2021-05-25 14:06:30 +02:00
Sylvain
c3f7f04ec2
[bug] html syntax error result in unable to compile the assets
2021-05-24 17:14:01 +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
da3eb4f8bd
[bug] typo in allow/prevent booking overlapping slots
2021-05-21 17:18:22 +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
9355256909
refresh payzen keys after initial setting
2021-05-18 15:56:22 +02:00
Sylvain
4826db7cf0
[bug] typo in allow/prevent booking overlapping slots
2021-05-18 10:52:59 +02:00
Sylvain
6bcd9f6fef
Merge branch 'dev' into payzen
2021-05-17 15:07:41 +02:00
Sylvain
c8c2300dd2
[bug] unable to change the slots durations for a new availability
2021-05-14 15:03:30 +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
d8656d56ec
allow remove all themes for an event
2021-05-12 15:05:16 +02:00
Sylvain
2a63daffb5
display all themes for the events
2021-05-12 15:00:19 +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
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
f9b47cf1f4
fix payment on site modal
2021-04-28 16:29:04 +02:00
Sylvain
953224f1f7
remove top margin on first group
2021-04-28 16:17:56 +02:00
Sylvain
1bbb8c3965
move the architecture from stripe-only to gateway-generic
2021-04-15 17:01:52 +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
5e2c50a85f
PaymentModal : automatically determines the payment modal to used based on the configured payment gateway
2021-04-09 09:03:59 +02:00
Sylvain
fb2abcc382
integrate payzen logo and other fixes
2021-04-08 17:11:48 +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
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
c50e69b351
Enforced validation on required input fields
2021-03-24 18:24:03 +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
39a7e23881
Improved style of public plans page
2021-03-22 13:13:51 +01:00
Sylvain
ef32532cf5
Links created using medium editor opens in new tabs
2021-03-22 11:32:04 +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
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
ab3ac05aa3
Allow inserting hyperlinks in customized info messages
2021-03-03 15:33:03 +01:00
Sylvain
3ea06826ad
WIP: select gateway
2021-03-03 15:28:56 +01:00
Sylvain
544b00e8a7
[bug] do not display "powered by disqus" if Disqus is disabled
2021-03-02 17:03:03 +01:00
Sylvain
9ed1bbcad8
updated changelog
2021-02-24 08:56:37 +01:00
Sylvain
c9cea041dd
updated links to user's guide
2021-02-22 19:26:38 +01:00
Sylvain
9d667ef54f
allow managers to view/manage schedules
2021-02-22 16:18:08 +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
16bb4bc76d
WIP: payment schedules dashboard
2021-02-09 17:18:33 +01:00
Sylvain
b0ef9e097d
WIP: stripe update card
2021-02-09 12:09:26 +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
d891690ab8
Default texts for the login modal
2020-12-30 15:37:15 +01:00
Sylvain
f4f1464826
fix wallet-info component to use cartItems
2020-12-29 17:32:00 +01:00
Sylvain
609d19e5d1
refactored subscription process + renew (update) subscription/ offre free days
2020-12-21 16:12:34 +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
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
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
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
a321771040
user consent about payment schedule
2020-11-10 09:51:13 +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
7833b0924b
add other cart items to the first schedule
2020-11-05 14:55:06 +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
f2c81a634a
using the <plan-card> component in embedded plans view
2020-11-02 13:37:58 +01:00
Sylvain
187cb9f06d
replace modules.* by .modules.* for more secure access
2020-11-02 13:36:17 +01:00
Sylvain
d4ce5b7dd0
[bug] warning message overflow in credit wallet modal
2020-11-02 13:22:32 +01:00
Sylvain
7776fe13d6
[bug] unable to access embedded plan views
2020-11-02 13:18:31 +01:00
Sylvain
465fe8e913
show link to pdf in component
2020-11-02 11:16:13 +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
106d8be4c8
Merge branch 'dev' into monthly-payment
2020-10-28 12:11:49 +01:00
Sylvain
1699bbf143
[bug] theme primary color is ignored on links
2020-10-28 12:10:25 +01:00
Sylvain
44525f9bad
Merge branch 'dev' into monthly-payment
2020-10-28 09:53:28 +01:00
Sylvain
84fc81e618
Display a message when no plans are available
2020-10-28 09:53:11 +01:00
Sylvain
79b49778a4
[bug] public cards presenting the plans in the public area, have bogus style
2020-10-28 08:52:42 +01:00
Sylvain
5f93e6d3be
plan creation: set if it allows monthly payments
2020-10-27 13:06:37 +01:00
Sylvain
a72473f0b6
added typescript + hmr
2020-10-27 09:41:16 +01:00
Sylvain
dc844bb10c
Enlarged privacy policy display and edition zones
2020-10-26 16:52:05 +01:00
Sylvain
c3139307bc
[bug] in the settings area, boolean switches are always shown as false
2020-10-26 16:38:17 +01:00
Sylvain
01524da0ab
[bug] unable to display details about a closed period
2020-10-23 12:09:36 +02:00
Sylvain
c5ee1ac120
fix translation
2020-10-20 10:01:27 +02:00
Sylvain
353ca1f291
remove uneffective erb comments
2020-10-19 15:30:07 +02:00
Sylvain
6d00d03f8e
replace method raw by html_safe
...
https://stackoverflow.com/questions/19633877/undefined-method-raw-for-controller-for-rails-4
2020-10-06 12:44:05 +02:00
Sylvain
c1564d5eae
Merge branch 'webpacker' into dev
2020-10-05 17:52:46 +02:00
Sylvain
512411eb04
fix angular-bootstrap-switch
2020-10-05 17:22:59 +02:00
Sylvain
be9dfe4ff5
fix angular-ui-tour templates url
2020-10-05 15:34:41 +02:00
Sylvain
d701260fae
fix spaces reservation calendar
2020-10-05 12:12:22 +02:00
Sylvain
8cc0d30ee9
fix fontawesome left arrows
2020-09-29 14:35:42 +02:00
Sylvain
fe88f3ba0f
fix fontawesome with holder.js
2020-09-29 14:27:49 +02:00
Sylvain
39ff1269a3
fix path for template _plan.html
2020-09-23 16:42:43 +02:00
Sylvain
562fb5d8d7
fix requiring templates from ngtemplate-loader
2020-09-22 16:04:42 +02:00
Sylvain
4e4ab9c4c2
load angular templates with webpack
2020-09-22 14:20:47 +02:00
Sylvain
f3be8961cf
fix 404 for no_avatar.png
2020-09-21 15:53:02 +02:00
Sylvain
72d79e8e31
fix erb+nonJS loaders
2020-09-16 14:12:45 +02:00
Sylvain
ec8fe3bf28
fixes import of JS dependencies
2020-09-14 16:08:49 +02:00
Sylvain
4e076c32ee
using bootsrap-sass + erb fixes
2020-09-09 16:26:51 +02:00
Sylvain
85a51e1b46
removed useless erb extensions
2020-09-09 15:42:05 +02:00
Sylvain
6e5713438f
remove useless references to asset_pack_path or equivalents
2020-09-09 15:28:35 +02:00
Sylvain
e37e368e90
updated links to html assets to use webpacker
2020-09-09 08:45:48 +02:00
Sylvain
75aa90070c
moved javascript from sprocket to webpacker
2020-09-09 08:45:02 +02:00