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
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
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
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
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
3663f8ab86
full stripe subscription code refacto
...
TODO: test
2021-10-06 17:09:35 +02:00
Sylvain
d494b012d4
[ongoing] refactoring stripe subscription
2021-10-06 09:42:58 +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
f4ed3ca391
fix bug: admin takes a subscription with a payment schedule by stipe
2021-09-10 18:32:39 +02:00
Du Peng
65ba3a686b
disable monthly payment for 1 month of subscription
2021-09-10 15:34:49 +02:00
Du Peng
6b763cc1c9
improve code for stripe subscription payment
2021-09-10 15:19:04 +02:00
Du Peng
c9f20ddc03
fix bug: plans page show an error if admin dont create any plans
2021-09-09 18:46:23 +02:00
Du Peng
334d8ce055
check event event_theme_ids if exist
2021-09-09 18:25:26 +02:00
Du Peng
238d7af1ee
disable monthly payment if interval count == 1
2021-09-08 19:21:44 +02:00
Du Peng
2973dec6a7
rewrite payment schedule workflow by stripe
2021-09-08 18:57:10 +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
a2a32ef3c6
fix bug: error in plans list page
2021-08-24 11:01:21 +02:00
Du Peng
51ec220a3e
fix manager cant reserve training for user
2021-08-06 11:12:14 +02:00
Du Peng
1fdf3d35b5
adjuste packs pricing popover position
2021-08-03 17:03:03 +02:00
Du Peng
b5ab52dd64
bug fix stripe 3D payment
2021-07-09 17:54:25 +02:00
Sylvain
e150e13227
[bug] cookies modal buttons are too small
2021-07-02 14:26:35 +02:00
Sylvain
f6889fbfda
linted TSX files
2021-07-01 12:34:10 +02:00
Sylvain
54c933523d
linted TS files
2021-07-01 12:04:48 +02:00
Sylvain
a6043fe81e
linted JS files
2021-07-01 11:23:58 +02:00
Sylvain
fb3bbacaf0
handle no packs available for the customer
2021-06-30 16:58:16 +02:00
Sylvain
19717d1351
use localPaymentModal in cart directive
2021-06-30 16:35:25 +02:00
Sylvain
d43f719038
buy packs using local payment
2021-06-30 15:32:10 +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
20bd3931d4
[bug] public list of plans fails to render if a group has no plans
2021-06-30 09:18:06 +02:00
Sylvain
9c6a7df0bf
WIP: compute price including prepaid packs
2021-06-29 16:56:40 +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
baf41588d3
packs summary component
2021-06-29 11:14:36 +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
91d2316280
[bug] two empty categories in the plan creation form
2021-06-28 16:53:39 +02:00
Sylvain
bbb1aca4fb
display validity for each pack
2021-06-28 12:24:31 +02:00
Sylvain
86de1f6253
styled packs
2021-06-28 11:49:51 +02:00
Sylvain
f16cbc44ff
WIP: buy pack modal
2021-06-25 17:24:34 +02:00
Sylvain
99bd00949e
fix handling after internal login
2021-06-25 11:10:17 +02:00
Sylvain
c0211cd002
fix handling of external login process
2021-06-25 11:03:01 +02:00
Sylvain
26f98f30f6
edit pack modal
2021-06-25 09:56:39 +02:00
Sylvain
5d3391cd44
move new pack to a separate component
2021-06-25 09:28:05 +02:00
Sylvain
0345d22582
delete & disable packs
2021-06-24 17:59:05 +02:00
Sylvain
1f8fd47317
pack creation and listing
2021-06-23 17:00:15 +02:00
Sylvain
f81e0910c2
packs popover
2021-06-23 11:33:42 +02:00
Sylvain
8cc4811794
edit machines pricings
2021-06-22 17:56:13 +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
7ac60f6ef3
data architecture of prepaid-packs
2021-06-21 14:58:49 +02:00
Sylvain
2b0130c6be
Merge branch 'dev' into prepaid
2021-06-21 11:36:31 +02:00
Sylvain
33e45fd536
[bug] ignored coupon when booking an event with card payment
2021-06-18 17:19:24 +02:00
Sylvain
5a0e7e9374
fix training requred modal when no user logged
2021-06-18 16:42:52 +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
4ecdf431d5
fix pending traning modal
2021-06-18 12:47:04 +02:00
Sylvain
f9a8453b70
fixes in machines galery:
...
- display a placeholder when no picture
- display an opacity filter when machine is disabled
- filtering by enabled/disabled
- text in pending training modal
2021-06-18 11:51:26 +02:00
Sylvain
962f9bc26f
WIP: pending training modal
2021-06-17 17:26:35 +02:00
Sylvain
db242e1f27
fix button style
2021-06-17 17:10:48 +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
4aa3fdff0e
filter machines by status
2021-06-17 10:25:13 +02:00
Sylvain
80d206fc99
responsively styled the machines list
2021-06-17 09:48:29 +02:00
Sylvain
de3ab3b6d0
organize sass files
2021-06-17 09:08:15 +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
3f08845503
[bug] unable to book a free event
2021-06-16 11:45:11 +02:00
Sylvain
7c65a52fbe
[bug] unable to book a free event
2021-06-16 11:44:53 +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
ec301ba07e
[bug] unable to list user's payment schedules in the dashboard
2021-06-14 14:40:54 +02:00
Sylvain
645efa37f4
[bug] unable to book an event
2021-06-14 14:22:23 +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
817db8b5eb
do not display empty categories titles
2021-06-10 16:17:10 +02:00
Sylvain
e184bf3d3c
filter plans y duration
2021-06-10 14:06:53 +02:00
Sylvain
4580bfc7d7
allow user to filter plans by groups
2021-06-10 12:52:14 +02:00
Sylvain
854db568bf
Ability to configure the prefix of the payment-schedules' files
2021-06-10 12:04:00 +02:00
Sylvain
a416f8c7ae
transactional bulk update + better error handling while configuring the payment gateway
2021-06-10 10:39:42 +02:00
Sylvain
ef69cab179
Merge branch 'hotfix' into dev
2021-06-09 19:40:07 +02:00
Sylvain
f82adc8133
[bug] unable to process stripe payments
2021-06-09 19:24:56 +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
c5db9e36ba
fix udpate stripe keys modal
2021-06-09 16:49:36 +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
08ad436351
split plan-catageories management into separate components
2021-06-09 09:24:39 +02:00
Sylvain
4ca16c2688
associate plan w/ category
2021-06-08 17:26:40 +02:00
Sylvain
ae039cdd0c
ordering categories
2021-06-08 17:00:52 +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
b54239eee9
removes unused import
2021-06-07 09:20:40 +02:00
Sylvain
68f64cfc5c
update the card for payment schedules
2021-06-04 18:26:20 +02:00
Sylvain
ea774e2080
wait for the first payzen transaction + fix initial amount
2021-06-03 14:28:52 +02:00
Sylvain
dc0a75e52d
verify each deadlines on payzen for payment schedules
2021-06-03 12:22:37 +02:00
Sylvain
4e109f7edb
retrieve gateway objects with multiple ids
2021-06-03 09:48:21 +02:00
Sylvain
87cd41794e
WIP: payzen subscription
...
TODO: retreive the payzen subscription from PayZen::Item
2021-06-02 20:07:53 +02:00
Sylvain
431ea28448
WIP: payzen recurring payments
2021-06-01 12:20:02 +02:00
Sylvain
d6a6d34105
display correct gateway name in payment schedule confirmation modal
2021-06-01 11:24:43 +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
d942d46632
WIP: migration to object[]
...
TODO: fix running tests, fix front-end
2021-05-28 17:34:20 +02:00
Sylvain
bf3dcd874b
display payment confirmation error messages in frontend
2021-05-28 10:22:02 +02:00
Sylvain
16df7f9506
fix data migrations + update test fixtures
2021-05-27 11:31:07 +02:00
Sylvain
b938232c19
Merge branch 'dev' into payzen
2021-05-25 14:06:30 +02:00
Sylvain
4fe3a204b8
fixes for upgrade to dart-sass
2021-05-25 11:31:22 +02:00
Sylvain
faa880f9f6
CAD lists of types and extensions are now ordered alphabetically
2021-05-24 17:33:32 +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
dd1d05cc3a
set payzen public key as invalid if the field is empty
2021-05-19 09:34:31 +02:00
Sylvain
c6bc9f1c15
handle gateway keys invalidation
2021-05-18 16:42:30 +02:00
Sylvain
28c868587b
prevent fteched settings to set react components as uncontrolled
2021-05-18 16:31:19 +02:00
Sylvain
9355256909
refresh payzen keys after initial setting
2021-05-18 15:56:22 +02:00
Sylvain
6b99b00d5e
handle no key in payzen keys form
2021-05-18 13:50:27 +02:00
Sylvain
4826db7cf0
[bug] typo in allow/prevent booking overlapping slots
2021-05-18 10:52:59 +02:00
Sylvain
5adf15df91
syntax improvements
2021-05-18 09:40:35 +02:00
Sylvain
04b3bfe3c5
update components to match new architecture after merge from dev
2021-05-17 17:09:11 +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
1c4f46f935
[bug] responsiveness of the about page title
2021-05-14 14:55:14 +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
e3187460ea
create payment schedules on payzen
...
Also: make generic the creation of products on remote gateway
Also: make generic the call to gateway specific actions
2021-04-30 16:07:19 +02:00
Sylvain
5f47624d4e
WIP: create payment schedule w/ payzen
2021-04-29 17:10:02 +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
30c1c91590
factorize payment form props
2021-04-28 16:41:15 +02:00
Sylvain
f9b47cf1f4
fix payment on site modal
2021-04-28 16:29:04 +02:00
Sylvain
dbdedadf8c
fix price computation in front-end
2021-04-28 16:22:22 +02:00
Sylvain
953224f1f7
remove top margin on first group
2021-04-28 16:17:56 +02:00
Sylvain
3b2f17d6d8
improved style of subscription page titles
2021-04-28 15:43:36 +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
a2d870f680
migrate wall-info to use cartitems
2021-04-26 11:46:14 +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
e456ddc7c9
WIP: refactor the price computation system
2021-04-22 19:24:08 +02:00
Sylvain
26dfbef5e1
WIP: refactor models to use payment_gateway_objects
2021-04-21 17:38:06 +02:00
Sylvain
434ec9c205
refactored Invoices to get rid of stripe references
2021-04-20 17:22:53 +02:00
Sylvain
1bbb8c3965
move the architecture from stripe-only to gateway-generic
2021-04-15 17:01:52 +02:00
Sylvain
ddd1ac52d6
save reservation|subscription to db after payment
2021-04-14 17:56:10 +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
4e512dda45
validate the payment server side
2021-04-13 17:16:05 +02:00
Sylvain
dbbf6b5f63
fix KryptonConfig
2021-04-13 11:33:15 +02:00
Sylvain
c0afe9419e
consolidated the payzen process with types
2021-04-13 11:30:30 +02:00
Sylvain
dca2651fb3
process payements with payzen
2021-04-12 17:37:09 +02:00
Sylvain
ef7dcd37d8
retreive the formToken from PZ API
2021-04-12 12:16:12 +02:00
Sylvain
b3720d7f47
direct the stripe endpoints to /api/stripe
2021-04-12 10:48:30 +02:00
Sylvain
fd5c3a87ce
rename /api/payment to /api/stripe
...
other payment gateways will have their own separate endpoints
2021-04-12 10:45:41 +02:00
Sylvain
f232e586ce
payment endpoint is specific to stripe
2021-04-12 10:44:20 +02:00
Sylvain
954a35f006
refactor api files
2021-04-12 10:42:54 +02:00
Sylvain
23032c405b
WIP: create the formToken server-side
2021-04-09 17:17:58 +02:00
Sylvain
fe5c4e6233
integrate the payzen form widget into the modal
...
Also: do not fetch the api from unmounted components
2021-04-09 12:09:54 +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
4d0dc808e8
move stripe & payzen components folders into payment/
2021-04-09 08:47:34 +02:00
Sylvain
b5ab9fbc79
rename PaymentModal to AbstractPaymentModal
2021-04-09 08:40:46 +02:00
Sylvain
4f3a47ae04
move payment modal from /base to /payment
2021-04-09 08:39:03 +02:00
Sylvain
fb2abcc382
integrate payzen logo and other fixes
2021-04-08 17:11:48 +02:00
Sylvain
d70d0dcf7a
stripe modal -> generic payment modal
2021-04-08 15:21:24 +02:00
Sylvain
d091c44c11
fix: This object has been frozen and should not be mutated
2021-04-08 11:09:33 +02:00
Sylvain
6da577d4ae
reorganized react components
2021-04-08 10:46:09 +02:00
Sylvain
a55dd4dc71
display errors in fab-input
2021-04-08 10:00:19 +02:00
Sylvain
4a344ac9e3
reorganized react components
2021-04-08 09:35:09 +02:00
Sylvain
eea390bdd4
workaround for project rejection
2021-04-07 17:42:15 +02:00
Sylvain
635e8d3356
use HtmlTranslate component
2021-04-07 16:25:14 +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
94c4d318e1
fix top-margin
2021-04-06 18:05:08 +02:00
Sylvain
0cca08984f
use flex-start
2021-04-06 18:00:55 +02:00
Sylvain
36871a0b34
improved display
2021-04-06 18:00:13 +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
98bb9d082c
fix fab-input and payzen-keys-form
2021-04-02 16:02:50 +02:00
Sylvain
30830b56fd
PayZen REST API wrapper ruby + live test keys while configuring
2021-04-01 18:20:26 +02:00
Sylvain
69352c07df
validate payzen paramaters in the form
2021-03-31 17:58:09 +02:00
Sylvain
54c1a3cfd9
payzen keys configuration form
2021-03-31 16:03:51 +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
720328ee92
stripe keys form w/ live keys validation
2021-03-30 11:26:47 +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
abd6ecabc3
WIP: fab-input component
2021-03-24 17:31:50 +01:00
Sylvain
b5e0572a6b
fix devise modal
2021-03-24 15:51:02 +01:00
Sylvain
78b007a9ec
[bug] unable to add a new authorized file type for project's CAD files
2021-03-24 15:39:18 +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
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
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
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
be464a8a61
WIP: migrate stripe keys form to react
2021-03-10 17:15:36 +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
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
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
9609d96fc3
adjust payment schedule table to usage by admins & members
2021-02-10 10:03:04 +01:00
Sylvain
16bb4bc76d
WIP: payment schedules dashboard
2021-02-09 17:18:33 +01:00
Sylvain
d767cf5f85
improve style of plans presentation
2021-02-09 16:40:04 +01:00
Sylvain
f3ad59d33a
fix cancel schedule
2021-02-09 16:26:09 +01:00
Sylvain
ff0c69fc58
stripe card update + cancel subscription
2021-02-09 15:44:56 +01:00
Sylvain
b0ef9e097d
WIP: stripe update card
2021-02-09 12:09:26 +01:00
Sylvain
0e7226c85c
handle stripe requires_action
2021-02-08 15:28:47 +01:00
Sylvain
58af40b8b9
enlight api for cashing checks
2021-02-08 08:56:01 +01:00
Sylvain
b5cdea513d
confirm check cashing api
2021-02-04 17:51:16 +01:00
Sylvain
d54846c349
UI to confirm check cashing
2021-02-04 17:00:02 +01:00
Sylvain
d22d011a10
show more results for the payment schedules interface
2021-02-04 15:47:11 +01:00
Sylvain
163976b988
WIP: error handling for card payments on later deadlines
2021-01-27 17:24:10 +01:00
Sylvain
8d08100166
WIP: schedules management inerface
2021-01-27 13:59:41 +01:00
Sylvain
39c3164b47
WIP: admin interface to manage payment schedules
2021-01-26 17:31:11 +01:00
Sylvain
5e06de508d
interface to filter list of schedules
2021-01-26 11:37:05 +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
dc00df4afc
fix stripe subscription w/ coupon + wallet
2020-12-30 12:19:33 +01:00
Sylvain
f4f1464826
fix wallet-info component to use cartItems
2020-12-29 17:32:00 +01:00
Sylvain
1f873979f3
architecture documentation
2020-12-29 13:13:48 +01:00
Sylvain
abe1619392
fix book reservation+subscription
2020-12-29 11:27:59 +01:00
Sylvain
feeed2f450
fix take a reservation + subscription
...
FIXME:
ActionView::Template::Error (undefined method `iso8601' for nil:NilClass)
Callstack:
app/views/api/reservations/show.json.jbuilder:40:in `_app_views_api_reservations_show_json_jbuilder'
app/controllers/api/payments_controller.rb:91:in `confirm_payment_schedule'
2020-12-28 18:30:27 +01:00
Sylvain
f661428db2
better error handling in stripe::subscription creation process
2020-12-23 15:29:56 +01:00
Sylvain
bbf88846dd
refactored Invoice & PaymentSchedule to use inheritance
2020-12-22 14:43:08 +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
c3c881d2a8
process the schedule to the stripe subscription
...
- only for subscriptions for now
- TODO: reservations (see app/services/reservations/reserv.rb:13)
2020-12-09 16:47:51 +01:00
Sylvain
a20be8ecb2
display legal agreement
2020-12-09 12:51:06 +01:00
Sylvain
66c205d0ed
API error handling
2020-12-09 11:35:49 +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
b6240c5046
handle after payment method was created
2020-12-07 17:13:05 +01:00
Sylvain
96b1cfcbc7
handle successfull stripe payment
2020-12-07 13:49:11 +01:00
Sylvain
1e43dc9518
show indicator while the payment is pending
2020-12-07 12:58:15 +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
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
9813c5d27b
style payment modal
2020-11-30 16:52:55 +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
1e5f7ea1fd
WIP: refactor stripe payment modal to react + do not user angular in react component (use Intl instead)
2020-11-24 13:26:15 +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
b5504d2342
create stripe subscription with all data
2020-11-12 16:44:55 +01:00
Sylvain
9d2dc65958
pay reservation only from cart
2020-11-10 11:57:45 +01:00
Sylvain
a321771040
user consent about payment schedule
2020-11-10 09:51:13 +01:00
Sylvain
2ab7f3bdb9
handle only subscription process in cart
2020-11-10 08:54:52 +01:00
Sylvain
789c6a28fe
handle subscription creation only from the cart
2020-11-09 16:54:20 +01:00
Sylvain
2af6c8b9cc
style fix
2020-11-09 15:22:22 +01:00
Sylvain
0c456b153e
use FabModal component to display ful schedule
2020-11-09 15:17:38 +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
506d9dd5fb
typo
2020-11-02 16:50:23 +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
7084e88d2d
display monthly price for compatible plans
2020-11-02 12:29:08 +01:00
Sylvain
465fe8e913
show link to pdf in component
2020-11-02 11:16:13 +01:00
Sylvain
408531d13a
use i18next instead of angular-translate for react components
2020-11-02 11:07:08 +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
2b014304ce
WIP: plan card
2020-10-28 14:23:27 +01:00
Sylvain
571a273ea2
using typescript for all components
2020-10-28 13:35:31 +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
85a1cc99cf
Merge branch 'dev' into monthly-payment
2020-10-28 08:54:09 +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
a2d885f447
[bug] members cannot view available trainings slots
2020-10-23 13:08:52 +02:00
Sylvain
01524da0ab
[bug] unable to display details about a closed period
2020-10-23 12:09:36 +02:00
Sylvain
c87adde6f6
[bug] unable to set libraries locales to their default values (en-us)
2020-10-23 11:53:18 +02:00
Sylvain
c7a8668fd6
architecture changes to allow including React.js components into the application
2020-10-21 15:07:01 +02:00
Sylvain
24e6736f51
fix change space/machine reservation
2020-10-20 14:53:00 +02:00
Sylvain
c5ee1ac120
fix translation
2020-10-20 10:01:27 +02:00
Sylvain
f9f21c1496
fix missing fontAwesome icons
2020-10-20 09:53:05 +02:00
Sylvain
61d3fcdb0a
webpack fixes
...
- add missing annotation for esFactory
- removed unused dependency for diacritics service
- removed google_plus from social networks: not relevant anymore
- eslinted services syntax
2020-10-19 15:49:17 +02:00
Sylvain
353ca1f291
remove uneffective erb comments
2020-10-19 15:30:07 +02:00
Sylvain
2bbbe8c7d2
change configuration of auto-ngtemplate-loader to use absolute path
2020-10-19 14:40:18 +02:00
Sylvain
875c7a6df8
WIP: correct angualrJS templates path for production build
...
see: https://github.com/WearyMonkey/ngtemplate-loader
2020-10-12 09:00:22 +02:00
Sylvain
585f01b671
compile angular-ui-tour from the sources
2020-10-07 16:37:01 +02:00
Sylvain
c30e096e53
fix loading ui-tour with webpack
2020-10-07 10:25:27 +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
4f5f54a66a
moved locales files into the main application pack
2020-10-05 17:42:49 +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
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
495a4686d5
load fullcalendar locale
2020-09-30 11:37:55 +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
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
62e45dc998
Updated fullCalendar to 2.9.1
...
+ fix using moment-timezone with webpack
2020-09-28 17:33:18 +02:00
Sylvain
e68397d0c5
Updated bootstrap-switch to 3.4.0
2020-09-28 16:30:07 +02:00
Sylvain
253fb21940
updated jquery-minicolors to 2.3.5
2020-09-28 14:51:45 +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
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
2ef7c06cb2
updated fontawesome to v5 + fix load fonts with webpack
2020-09-22 11:28:42 +02:00
Sylvain
5764233c67
fix stylesheets compilation with webpack
2020-09-22 09:45:18 +02:00
Sylvain
f3be8961cf
fix 404 for no_avatar.png
2020-09-21 15:53:02 +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
e70ecc2670
eslint router
2020-09-21 13:23:42 +02:00
Sylvain
d43516f6fe
fixes [:ctrlreg] The controller with the name '...' is not registered
2020-09-21 13:23:28 +02:00
Sylvain
b2bbbf5c79
renamed router.js without erb extension
2020-09-21 09:40:00 +02:00
Sylvain
734ed09464
removed useless ERB extensions
...
Must speed-up webpack compilation process
2020-09-21 09:27:55 +02:00
Sylvain
45d60952b7
[WIP] fix webpack dependencies with global variables
...
Using:
- expose-loader
- exports-loader
- import-loader
- https://medium.com/@drgenejones/using-webpack-with-legacy-angular-spas-exposing-global-variables-to-child-modules-599e32f373c9
2020-09-16 16:54:56 +02:00
Sylvain
ad2ca33c6f
export Application (shimming)
2020-09-16 15:38:07 +02:00
Sylvain
72d79e8e31
fix erb+nonJS loaders
2020-09-16 14:12:45 +02:00
Sylvain
0cf1b535cd
updated summernote
2020-09-15 17:01:47 +02:00
Sylvain
39682e24e4
fix locales with webpack
2020-09-15 15:00:05 +02:00
Sylvain
b760c10414
fix sass for webpack
2020-09-15 12:57:54 +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
44ca50b4e1
load template and erb with webpack
2020-09-09 11:54:49 +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