1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-03 14:24:23 +01:00
Commit Graph

200 Commits

Author SHA1 Message Date
Sylvain
9609d96fc3 adjust payment schedule table to usage by admins & members 2021-02-10 10:03:04 +01:00
Sylvain
0e7226c85c handle stripe requires_action 2021-02-08 15:28:47 +01:00
Sylvain
26636254bd generate the invoices for each schedule item and notify if something goes wrong 2021-01-25 13:05:27 +01:00
Sylvain
dc00df4afc fix stripe subscription w/ coupon + wallet 2020-12-30 12:19:33 +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
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
f5709ef60e get stripe payment method 2020-11-25 17:13:45 +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
2af6c8b9cc style fix 2020-11-09 15:22:22 +01:00
Sylvain
0fe4f13110 component to display the payment schedule 2020-11-05 17:32:37 +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
5f93e6d3be plan creation: set if it allows monthly payments 2020-10-27 13:06:37 +01:00
Sylvain
57b76d156b Alert before cancelling a reservation that credits will be lost 2020-09-29 12:03:13 +02:00
Sylvain
518e302385 New translations app.shared.en.yml (French) 2020-09-23 15:43:26 +02:00
Sylvain
daa4026c1d New translations app.shared.en.yml (French) 2020-09-23 15:40:11 +02:00
Sylvain
842d6c950f New translations app.shared.en.yml (French) 2020-06-24 11:19:57 +02:00
Sylvain
6858ff496e New translations app.shared.en.yml (French) 2020-06-24 11:11:48 +02:00
Sylvain
42cbf83074 New translations app.shared.en.yml (French) 2020-06-24 11:06:40 +02:00
Sylvain
6eb8de6149 New translations app.shared.en.yml (French) 2020-06-24 10:53:47 +02:00
Sylvain
48126fe9d8 New translations app.shared.en.yml (French) 2020-06-17 15:52:12 +02:00
Sylvain
8611a2753b fix text 2020-06-16 12:31:27 +02:00
Sylvain
c668583965 New translations app.shared.en.yml (French) 2020-05-06 17:09:17 +02:00
Sylvain
b0ac7f54c6 New translations app.shared.en.yml (French) 2020-05-06 17:00:37 +02:00
Sylvain
d0e6764f24 New translations app.shared.en.yml (French) 2020-04-22 09:32:00 +02:00
Sylvain
93210a3b86 New translations app.shared.en.yml (French) 2020-04-20 10:54:49 +02:00
Sylvain
48374a9e9d New translations app.shared.en.yml (French) 2020-04-20 10:25:41 +02:00
Sylvain
ebefd721fd New translations app.shared.en.yml (French) 2020-03-11 15:27:36 +01:00
Sylvain
d0abc2f757 New translations app.shared.en.yml (French) 2020-03-11 15:04:40 +01:00
Sylvain
0c0fbd0bab New translations app.shared.en.yml (French) 2020-03-11 14:44:34 +01:00
Sylvain
1c9ea10500 New translations app.shared.en.yml (French) 2020-03-11 12:26:15 +01:00
Sylvain
bdb22a293a New translations app.shared.en.yml (French) 2020-03-11 10:40:28 +01:00
Sylvain
60cf79a2b4
Merge pull request #186 from sleede/l10n_dev
New Crowdin translations
2020-03-11 10:33:40 +01:00
Sylvain
4e272dfbc4 New translations app.shared.en.yml (French) 2020-03-11 10:08:41 +01:00
Sylvain
2c1dbd4d82 [ongoing] help modal 2020-03-10 16:38:29 +01:00
Sylvain
3a3fc22b94 New translations app.shared.en.yml (French) 2020-03-09 12:51:54 +01:00
Sylvain
721d7ac0fa
Update app.shared.fr.yml 2020-03-09 12:40:41 +01:00
Sylvain
31e331202e New translations app.shared.en.yml (French) 2020-03-09 12:10:58 +01:00
Sylvain
bb752f1218 refactor translations to work with crowdin pull requests 2020-03-09 11:47:18 +01:00
Sylvain
5765e3d2e4 move availability options to new step + wording 2020-03-02 16:52:54 +01:00
Sylvain
a44bf85014 Merge branch 'slot_is_only_subscriptions' into dev 2020-03-02 16:27:26 +01:00
Sylvain
07b21f5094 Merge branch 'book_slot_at_same_time' into dev 2020-03-02 15:52:05 +01:00
Sylvain
7b955f616e fix i18n syntax + missing transaltion 2020-02-24 15:25:15 +01:00
Sylvain
05a29a54b3 trainings tour 2020-02-19 10:22:32 +01:00
Du Peng
b559d10b87 improve slot is only subscription 2020-02-12 12:58:17 +01:00
Sylvain
372d7f936b typos & syntax 2020-02-11 11:46:40 +01:00
Sylvain
392ddc6aa5 wording 2020-02-11 11:01:24 +01:00
Du Peng
74cc69d1bd Ability to configure reservation slot restrict for plans 2020-02-07 17:37:00 +01:00
Du Peng
7c86adde4b Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time 2020-02-05 16:53:47 +01:00
Sylvain
97660924cb fix typo and wording 2020-01-21 11:16:49 +01:00
Du Peng
3c26c6d4bd disable add plan with reserve slot in the past 2020-01-20 16:17:10 +01:00
Sylvain
d4f7ff3603 fixes comments syntax for crowdin compat 2019-12-24 11:47:31 +01:00
Sylvain
ff8319b166 harmonize front translations in english with new model 2019-12-18 14:35:29 +01:00
Sylvain
14c3abb449 refactoring i18n keys: trainings + modals + various missings 2019-12-18 13:04:38 +01:00
Sylvain
1124159f2e refactoring i18n keys: projects 2019-12-18 11:08:14 +01:00
Sylvain
a7b423b151 refactoring i18n keys - admin 2019-12-17 18:06:56 +01:00
Sylvain
88c48e4e69 [ongoing] refactoring i18n keys - admin 2019-12-17 12:40:36 +01:00
Sylvain
d21f616283 [ongoing] refactoring i18n keys 2019-12-16 16:54:40 +01:00
Sylvain
c565d9ff2b unified front-end i18n interpolations syntax to messageformat 2019-12-16 10:16:11 +01:00
Sylvain
510c802ab1 messages variations depending on slot duration 2019-12-09 10:27:50 +01:00
Sylvain
22251e6516 summary screen
TODO: eventModal.html.erb:167
2019-11-12 16:28:10 +01:00
Sylvain
aef4cc49f2 fixes accounting codes setting + improved error handling 2019-09-17 13:00:25 +02:00
Sylvain
539eb08b89 ability to disable the online payments through an env var 2019-09-11 17:08:00 +02:00
Sylvain
04f17d44d8 handle sca in js frontend 2019-09-10 12:46:02 +02:00
Sylvain
e9e27663cd quick coding rules checking with rubocop 2019-09-09 18:04:31 +02:00
Sylvain
967f539ad9 [ongoing] update to stripe-js:v3 to use strong customer authentication 2019-09-04 17:20:18 +02:00
Sylvain
43ff06c35d fixed and improved translations 2019-04-18 11:35:09 +02:00
Sylvain
b9e7276394 fix missing translation 2019-01-16 12:08:27 +01:00
Sylvain
a2eb10331e [ongoing] remove invoicing disabled per user 2019-01-10 16:50:54 +01:00
Sylvain
12c6cd2a70 Merge branch 'siteswapjuggler-master' into dev
also: align translations and mark missings
2017-11-20 11:43:40 +01:00
Sylvain
1c8d362f11 ability to disable space 2017-10-11 14:58:38 +02:00
Sylvain
c67360771a ability to disable machine 2017-10-11 12:10:05 +02:00
Sylvain
05d9e62dd2 ability to disabled training 2017-10-10 17:16:43 +02:00
Sylvain
40bf22279e add warning on plan disabling 2017-10-05 15:44:06 +02:00
Sylvain
26d79e5b12 disable a plan 2017-10-04 18:56:39 +02:00
siteswapjuggler
e13817176f event monitor improvement
Many imrovement for the event monitoring admin module.
2017-09-04 00:09:08 +02:00
Sylvain
5abc85ae0a [feature] weekly plans 2017-03-21 13:06:02 +01:00
Sylvain
71a3c8b41f pluralize selection helper in cart 2017-02-22 16:53:58 +01:00
Sylvain
c2c400107d improved tag management in cart 2017-02-22 11:23:32 +01:00
Sylvain
ce087ae778 refacto wording to make cart reservableType agnostic 2017-02-22 10:51:07 +01:00
Sylvain
7a21a907a8 offer slot from cart + [ongoing] refacto cart translations 2017-02-22 09:44:15 +01:00
Sylvain
a463ad6a2a [ongoing] refacto cart translations 2017-02-21 17:45:53 +01:00
Sylvain
42819b18cb refactor plan form translations mapping 2017-02-14 16:19:10 +01:00
Sylvain
0adb9e29c6 space edition interface 2017-02-14 13:36:10 +01:00
Sylvain
da95e6e0d8 space creation interface 2017-02-14 11:28:07 +01:00
Sylvain
b44089a33d interface & api to build avoir for a wallet credit 2016-12-12 14:20:26 +01:00
Sylvain
3ce41f0c5c [to test] send cash coupon to user by mail 2016-11-24 18:17:49 +01:00
Sylvain
ce6877b484 success message when applying cash coupon 2016-11-24 18:05:16 +01:00
Sylvain
0a08c4c32d check cash coupons does not exceed cart amount for subscriptions 2016-11-24 16:38:22 +01:00
Sylvain
04e10c8bb6 check cash coupons does not exceed cart amount for trainings & machines 2016-11-24 13:58:41 +01:00
Sylvain
51faeedfa8 fix translation name in plan form 2016-11-23 12:57:33 +01:00
Sylvain
ad2911529c db model, api and interface for cash coupons 2016-11-23 12:43:42 +01:00
Sylvain
fc747c55c7 wallet credit confirmation 2016-09-29 13:02:24 +02:00
Sylvain
36524d4cd9 display list of allowed extensions in project's CAD attachments 2016-09-27 14:08:04 +02:00
Sylvain
13f416a101 [sso] save and restore field data mapping 2016-09-15 15:58:21 +02:00
Sylvain
ee333df53f improved transformation interface 2016-09-14 18:54:53 +02:00