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