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
6bcd9f6fef
Merge branch 'dev' into payzen
2021-05-17 15:07:41 +02:00
Sylvain
bf9a91b479
[bug] about page on small devices
2021-05-14 14:29:36 +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
3dc686840c
front adaptation to cartItems
...
fix payzen customer cart creation
TODO: refactor the payOnSite modals
2021-04-27 17:18:20 +02:00
Sylvain
6b8f7da98c
migrate js clients to new architecture
2021-04-26 11:41:02 +02:00
Sylvain
bc6ef8ef50
WIP: move backend code base to new architecture
...
- from stripe only to payment gateway abstract
- from reservation params style to unified cart_items
TODO: fix not passing tests,
subscriptions/renew_as_admin_test.rb fails because InvoiceItem(9).amount = nil
2021-04-23 17:54:59 +02:00
Sylvain
26dfbef5e1
WIP: refactor models to use payment_gateway_objects
2021-04-21 17:38:06 +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
eea390bdd4
workaround for project rejection
2021-04-07 17:42:15 +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
422acdd162
safely configure and test payzen keys
2021-04-02 17:16:27 +02:00
Sylvain
1d42fa8781
typos
2021-03-30 16:57:09 +02:00
Sylvain
83cfa710e1
enable online payments
2021-03-30 16:54:43 +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
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
a5b3728f8c
[bug] various fixes on accouting exports
...
- accounting exports may ignore some invoices for the first and last days
- file caching for accounring exports is not used
2021-03-22 17:42:54 +01:00
Sylvain
b19c78c756
[bug] select all plans for slot restriction
...
When using the 'select all' button, to restrict an availbility to subscribers, all plans are selected, even those disabled
2021-03-22 10:36:41 +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
3d5484918c
eslint controllers/admin/statistics.js
2021-03-09 11:41:24 +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
3ea06826ad
WIP: select gateway
2021-03-03 15:28:56 +01:00
Sylvain
c478ade85c
fix admin operations on subscriptions w/ schedules
2021-02-10 17:24:03 +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
f4f1464826
fix wallet-info component to use cartItems
2020-12-29 17:32:00 +01:00
Sylvain
abe1619392
fix book reservation+subscription
2020-12-29 11:27:59 +01:00
Sylvain
609d19e5d1
refactored subscription process + renew (update) subscription/ offre free days
2020-12-21 16:12:34 +01:00
Sylvain
e0ac9d1ac3
Eslint the frontend members controllers
2020-12-21 14:26:38 +01:00
Sylvain
96b1cfcbc7
handle successfull stripe payment
2020-12-07 13:49:11 +01:00
Sylvain
0d0bf473af
see TODOs (stripe-modal.tsx, machines.js.erb)
2020-12-02 17:28:14 +01:00
Sylvain
5941446a72
fixes for card payment
2020-12-02 14:28:41 +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
2ab7f3bdb9
handle only subscription process in cart
2020-11-10 08:54:52 +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
4f877ab05d
react coponent: plan-card + extracted scss from stylesheet.rb into themes/
2020-10-29 15:53:29 +01:00
Sylvain
5f93e6d3be
plan creation: set if it allows monthly payments
2020-10-27 13:06:37 +01:00
Sylvain
a2d885f447
[bug] members cannot view available trainings slots
2020-10-23 13:08:52 +02:00
Sylvain
24e6736f51
fix change space/machine reservation
2020-10-20 14:53:00 +02:00
Sylvain
2bbbe8c7d2
change configuration of auto-ngtemplate-loader to use absolute path
2020-10-19 14:40:18 +02:00
Sylvain
c1564d5eae
Merge branch 'webpacker' into dev
2020-10-05 17:52:46 +02:00
Sylvain
6fa9347c75
fix training reservation calendar
2020-10-05 12:54:37 +02:00
Sylvain
d701260fae
fix spaces reservation calendar
2020-10-05 12:12:22 +02:00
Sylvain
5a0185dd48
fix machine reservation calendar
2020-09-30 16:32:01 +02:00
Sylvain
f6183dbafb
fix public calendar filter
2020-09-30 11:59:50 +02:00
Sylvain
c0a46e5bf1
fix public calendar
2020-09-30 11:45:44 +02:00
Sylvain
8ee91ef7d5
fixes fullCalendar for admin agenda
2020-09-30 11:23:42 +02:00
Sylvain
5caceec57b
WIP: debug fullcalendar with webpack
...
see https://stackoverflow.com/questions/44220534/uncaught-typeerror-cannot-read-property-hastime-of-undefined
2020-09-29 16:22:34 +02:00
Sylvain
a398ba8b8e
fix loading angular-ui-tour templates + use templateUrl instead of template:require()
2020-09-22 14:46:13 +02:00
Sylvain
4e4ab9c4c2
load angular templates with webpack
2020-09-22 14:20:47 +02:00
Sylvain
31d1071f87
revert real usage of templateUrl
2020-09-21 15:11:39 +02:00
Sylvain
9b6e5408f9
refactor usage of html templates in JS to make it compatible with webpack html-loader
2020-09-21 14:50:28 +02:00
Sylvain
734ed09464
removed useless ERB extensions
...
Must speed-up webpack compilation process
2020-09-21 09:27:55 +02:00
Sylvain
4e076c32ee
using bootsrap-sass + erb fixes
2020-09-09 16:26:51 +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
