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

1515 Commits

Author SHA1 Message Date
Sylvain
6d21d078f2 New translations app.admin.en.yml (German) 2021-01-24 17:28:13 +01:00
Sylvain
3303a97da0 New translations app.admin.en.yml (German) 2021-01-24 17:17:56 +01:00
Sylvain
52355ab694 New translations app.admin.en.yml (German) 2021-01-24 17:08:26 +01:00
Sylvain
4f1750309d New translations app.admin.en.yml (German) 2021-01-24 16:59:33 +01:00
Sylvain
24503ddd75 New translations app.admin.en.yml (German) 2021-01-24 16:48:47 +01:00
Sylvain
1a21256610 New translations app.admin.en.yml (German) 2021-01-24 16:37:49 +01:00
Sylvain
d57478c4a6 New translations app.admin.en.yml (German) 2021-01-24 16:27:53 +01:00
Sylvain
ae71a4b5fb New translations app.public.en.yml (German) 2021-01-21 15:37:13 +01:00
Sylvain
33e1c2eb98 New translations app.admin.en.yml (German) 2021-01-20 21:18:53 +01:00
Sylvain
40b3367a98 New translations app.admin.en.yml (German) 2021-01-20 21:09:22 +01:00
Sylvain
ba4dd8b9e5 New translations app.admin.en.yml (German) 2021-01-20 20:57:57 +01:00
Sylvain
2aba43f433 New translations app.admin.en.yml (German) 2021-01-20 20:42:49 +01:00
Sylvain
385bebfd32 New translations app.admin.en.yml (German) 2021-01-20 20:31:20 +01:00
Sylvain
c7b1b8e9e3 New translations app.admin.en.yml (German) 2021-01-20 20:20:56 +01:00
Sylvain
b298f1bfa3 New translations app.admin.en.yml (German) 2021-01-20 20:11:20 +01:00
Sylvain
5a801f62e6 New translations app.admin.en.yml (German) 2021-01-20 19:59:52 +01:00
Sylvain
f3287cd0f4 New translations app.admin.en.yml (German) 2021-01-20 19:52:55 +01:00
Sylvain
ca4e83f125 New translations app.admin.en.yml (German) 2021-01-20 19:29:26 +01:00
Sylvain
6ac4c4d1ec New translations app.admin.en.yml (German) 2021-01-20 19:21:16 +01:00
Sylvain
85d29aa8d2 New translations app.admin.en.yml (German) 2021-01-20 19:09:13 +01:00
Sylvain
35b29619bf New translations app.admin.en.yml (German) 2021-01-20 18:57:00 +01:00
Sylvain
d9b20e9a81 New translations app.admin.en.yml (German) 2021-01-20 18:40:35 +01:00
Sylvain
f23231a25f New translations app.admin.en.yml (German) 2021-01-20 18:21:38 +01:00
Sylvain
57dd5155c7 New translations app.admin.en.yml (German) 2021-01-20 18:11:42 +01:00
Sylvain
ecdec70755 WIP: generate invoices for each payment schedule item 2021-01-20 17:00:23 +01:00
Sylvain
1235ca6942 New translations app.admin.en.yml (German) 2021-01-19 20:36:36 +01:00
Sylvain
e9844a1b96 New translations app.admin.en.yml (German) 2021-01-19 20:10:27 +01:00
Sylvain
c26520851a New translations app.admin.en.yml (German) 2021-01-19 20:00:59 +01:00
Sylvain
51a9875446 New translations app.admin.en.yml (German) 2021-01-19 19:31:07 +01:00
Sylvain
b8ee8430e3 New translations app.admin.en.yml (German) 2021-01-19 19:19:56 +01:00
Sylvain
e5439901d6 fix generate payment schedule pdf + send by mail
TODO: total amount does not match with sum of all lines
- generate invoices for each PS-item
- interface to access the payment schedules
2021-01-19 16:47:51 +01:00
Sylvain
b3b286ee66 New translations app.admin.en.yml (German) 2021-01-18 16:12:08 +01:00
Sylvain
4094c8f711 New translations app.shared.en.yml (German) 2021-01-18 15:46:09 +01:00
Sylvain
84ece00a5d New translations app.shared.en.yml (German) 2021-01-18 15:30:16 +01:00
Sylvain
90d2107ac0 New translations app.shared.en.yml (German) 2021-01-18 15:17:10 +01:00
Sylvain
d9a70cad8c New translations app.shared.en.yml (German) 2021-01-18 15:02:02 +01:00
Sylvain
29c8e026e1 New translations app.shared.en.yml (German) 2021-01-18 14:28:48 +01:00
Sylvain
59134320ef New translations app.shared.en.yml (German) 2021-01-18 14:17:07 +01:00
Sylvain
e7c7431dc6 New translations app.shared.en.yml (German) 2021-01-18 14:08:36 +01:00
Sylvain
f3310e885e New translations app.shared.en.yml (German) 2021-01-18 13:58:13 +01:00
Sylvain
378ef0a0f2 New translations app.shared.en.yml (German) 2021-01-16 23:29:49 +01:00
Sylvain
07c710b08f New translations app.shared.en.yml (German) 2021-01-16 23:09:09 +01:00
Sylvain
c0e1d77f1a New translations app.shared.en.yml (German) 2021-01-16 22:58:32 +01:00
Sylvain
2089e2a369 New translations mails.en.yml (German) 2021-01-16 22:49:34 +01:00
Sylvain
f1f177638d New translations mails.en.yml (German) 2021-01-16 22:38:28 +01:00
Sylvain
472dc56278 New translations mails.en.yml (German) 2021-01-16 22:28:39 +01:00
Sylvain
e4b2b1ca7f New translations mails.en.yml (German) 2021-01-16 22:19:35 +01:00
Sylvain
e5e9c5d025 New translations mails.en.yml (German) 2021-01-16 22:08:30 +01:00
Sylvain
a8cdb2986f New translations mails.en.yml (German) 2021-01-16 21:58:23 +01:00
Sylvain
f67e12ccea New translations mails.en.yml (German) 2021-01-16 21:49:13 +01:00
Sylvain
615d3dcc49 New translations mails.en.yml (German) 2021-01-16 21:38:17 +01:00
Sylvain
4026b31591 New translations mails.en.yml (German) 2021-01-16 21:29:09 +01:00
Sylvain
c4ee96fd4b New translations devise.en.yml (German) 2021-01-15 20:10:47 +01:00
Sylvain
b69e78414f New translations devise.en.yml (German) 2021-01-15 19:59:34 +01:00
Sylvain
738ae0e1c6 New translations devise.en.yml (German) 2021-01-15 19:50:25 +01:00
Sylvain
4353ab41e0 New translations devise.en.yml (German) 2021-01-15 19:40:21 +01:00
Sylvain
fdb987ebd1 New translations en.yml (German) 2021-01-15 19:40:19 +01:00
Sylvain
2f25319d32 New translations en.yml (German) 2021-01-15 19:29:51 +01:00
Sylvain
dd13f18c31 New translations en.yml (German) 2021-01-15 19:19:08 +01:00
Sylvain
60d4295fd7 New translations en.yml (German) 2021-01-15 19:12:39 +01:00
Sylvain
26f723d565 New translations en.yml (German) 2021-01-15 19:03:00 +01:00
Sylvain
bfc68d67a0 New translations en.yml (German) 2021-01-15 18:50:38 +01:00
Sylvain
f476f46f57 New translations en.yml (German) 2021-01-15 18:40:50 +01:00
Sylvain
8110b8d6d4 New translations en.yml (German) 2021-01-15 18:32:44 +01:00
Sylvain
17d6b247c1 New translations en.yml (German) 2021-01-15 18:24:00 +01:00
Sylvain
3f44721120 New translations app.public.en.yml (German) 2021-01-15 08:50:34 +01:00
Sylvain
eafaa15b16 New translations app.shared.en.yml (German) 2021-01-15 08:43:17 +01:00
Sylvain
06d6ce7d35 New translations app.public.en.yml (German) 2021-01-15 08:43:15 +01:00
Sylvain
bf1570b4b3 New translations app.public.en.yml (German) 2021-01-15 08:31:46 +01:00
Sylvain
638c2a5f89 New translations mails.en.yml (German) 2021-01-15 08:31:44 +01:00
Sylvain
ec9a0d189c New translations mails.en.yml (German) 2021-01-15 08:21:37 +01:00
Sylvain
ab790d7749 New translations app.shared.en.yml (German) 2021-01-14 23:20:55 +01:00
Sylvain
ac2b3867ac New translations app.logged.en.yml (German) 2021-01-14 23:20:53 +01:00
Sylvain
21fd02a99a New translations app.shared.en.yml (German) 2021-01-14 23:09:01 +01:00
Sylvain
17ae644ca9 New translations app.public.en.yml (German) 2021-01-14 23:08:58 +01:00
Sylvain
06f9d863e5 New translations app.shared.en.yml (German) 2021-01-14 23:01:32 +01:00
Sylvain
0e8fd19a01 New translations app.public.en.yml (German) 2021-01-14 23:01:30 +01:00
Sylvain
e52bbd6e96 New translations app.logged.en.yml (German) 2021-01-14 23:01:28 +01:00
Sylvain
52803760ab New translations app.admin.en.yml (German) 2021-01-14 23:01:26 +01:00
Sylvain
8cc428c347 New translations app.shared.en.yml (German) 2021-01-14 22:49:15 +01:00
Sylvain
5b9591149e New translations app.public.en.yml (German) 2021-01-14 22:49:13 +01:00
Sylvain
8568a43f74 New translations app.public.en.yml (German) 2021-01-14 22:40:19 +01:00
Sylvain
cc22e61b10 New translations app.shared.en.yml (German) 2021-01-14 22:30:10 +01:00
Sylvain
cab60499ce New translations app.admin.en.yml (German) 2021-01-14 22:30:08 +01:00
Sylvain
30b5d04d7b New translations app.shared.en.yml (German) 2021-01-14 22:22:17 +01:00
Sylvain
405f467d1d New translations app.public.en.yml (German) 2021-01-14 22:22:15 +01:00
Sylvain
ccfa59f09d New translations app.admin.en.yml (German) 2021-01-14 22:22:13 +01:00
Sylvain
2529ae6f1d New translations app.public.en.yml (German) 2021-01-14 22:12:17 +01:00
Sylvain
d80b6819a1 New translations app.logged.en.yml (German) 2021-01-14 22:12:16 +01:00
Sylvain
ce0bc469d6 New translations en.yml (German) 2021-01-14 22:12:14 +01:00
Sylvain
08055f1b9c New translations app.shared.en.yml (German) 2021-01-14 22:03:58 +01:00
Sylvain
4984a2cc3a New translations app.public.en.yml (German) 2021-01-14 22:03:56 +01:00
Sylvain
b854b4f9e6 New translations app.public.en.yml (German) 2021-01-14 21:49:56 +01:00
Sylvain
f3611cf556 New translations app.public.en.yml (German) 2021-01-14 21:40:06 +01:00
Sylvain
94dc841367 New translations en.yml (German) 2021-01-14 18:51:40 +01:00
Sylvain
4c1b4637c0 New translations app.admin.en.yml (German) 2021-01-14 18:45:24 +01:00
Sylvain
e06d3e322b New translations en.yml (German) 2021-01-14 18:45:22 +01:00
Sylvain
fcde4aaec0 New translations en.yml (German) 2021-01-14 18:31:09 +01:00
Sylvain
5b64b2363f New translations en.yml (German) 2021-01-14 18:22:17 +01:00
Sylvain
7f68309dfd New translations en.yml (German) 2021-01-14 18:00:09 +01:00
Sylvain
44c75a1617 New translations en.yml (German) 2021-01-14 17:48:49 +01:00
Sylvain
e6bb748a95 New translations en.yml (German) 2021-01-14 17:40:08 +01:00
Sylvain
ea2aa88b7a New translations en.yml (German) 2021-01-14 17:28:43 +01:00
Sylvain
815f0a1572 New translations app.shared.en.yml (German) 2021-01-14 16:13:30 +01:00
Sylvain
96de83b3b5 New translations en.yml (German) 2021-01-14 16:13:28 +01:00
Sylvain
96622b6dc9 New translations app.shared.en.yml (German) 2021-01-14 16:02:01 +01:00
Sylvain
1494c5744f New translations app.public.en.yml (German) 2021-01-14 16:01:59 +01:00
Sylvain
4c4aed36df New translations app.logged.en.yml (German) 2021-01-14 16:01:57 +01:00
Sylvain
6b63561bd0 New translations app.admin.en.yml (German) 2021-01-14 16:01:55 +01:00
Sylvain
df4980cc15 New translations en.yml (German) 2021-01-14 16:01:53 +01:00
Sylvain
cf85b72d51 New translations app.shared.en.yml (German) 2021-01-14 14:37:01 +01:00
Sylvain
6885339fc0 New translations app.public.en.yml (German) 2021-01-14 14:36:58 +01:00
Sylvain
5dcec2d5ff New translations app.logged.en.yml (German) 2021-01-14 14:36:56 +01:00
Sylvain
dc8dca97c1 New translations app.admin.en.yml (German) 2021-01-14 14:36:54 +01:00
Sylvain
224c9bda3b New translations mails.en.yml (German) 2021-01-14 14:36:52 +01:00
Sylvain
4cc5b44071 New translations devise.en.yml (German) 2021-01-14 14:36:51 +01:00
Sylvain
c7bc328aa0 New translations en.yml (German) 2021-01-14 14:36:49 +01:00
Sylvain
12e99f4c9c generate payment schedule pdf 2021-01-04 18:12:44 +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
dc00df4afc fix stripe subscription w/ coupon + wallet 2020-12-30 12:19:33 +01:00
Sylvain
ffc3051444 TODO: handle coupon w/ stripe subscription 2020-12-29 19:08:43 +01:00
Sylvain
609d19e5d1 refactored subscription process + renew (update) subscription/ offre free days 2020-12-21 16:12:34 +01:00
Sylvain
2950eddb07 Updated environment documentation + removed unused rails.*.yml 2020-12-21 10:15:59 +01:00
Sylvain
ccff463165 test subscription with schedule by user 2020-12-15 15:48:13 +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
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
7ed0f6141a Merge branch 'dev' into monthly-payment 2020-12-07 10:29:34 +01:00
Sylvain
17907061db New translations app.admin.en.yml (Portuguese) 2020-11-26 00:01:37 +01:00
Sylvain
b72a1991d6 New translations app.admin.en.yml (Portuguese) 2020-11-25 23:51:43 +01:00
Sylvain
9813bef907 New translations app.admin.en.yml (Portuguese) 2020-11-25 23:38:20 +01:00
Sylvain
8fe3ab8d36 New translations app.admin.en.yml (Portuguese) 2020-11-25 23:21:36 +01:00
Sylvain
4e556696cf New translations app.admin.en.yml (Portuguese) 2020-11-25 22:52:55 +01:00
Sylvain
7b88f870c7 New translations app.admin.en.yml (Portuguese) 2020-11-25 22:42:27 +01:00
Sylvain
108206c527 New translations app.admin.en.yml (Portuguese) 2020-11-25 22:32:43 +01:00
Sylvain
04c20cf046 New translations app.public.en.yml (Portuguese) 2020-11-25 22:32:41 +01:00
Sylvain
d18d58b9bf New translations app.public.en.yml (Portuguese) 2020-11-25 22:24:48 +01:00
Sylvain
bf62425c4e New translations app.shared.en.yml (Portuguese) 2020-11-25 22:18:15 +01:00
Sylvain
65e4a62c12 New translations app.public.en.yml (Portuguese) 2020-11-25 22:18:13 +01:00
Sylvain
5cd7a2ad06 New translations app.shared.en.yml (Portuguese) 2020-11-25 22:05:21 +01:00
Sylvain
2ab881d9b5 New translations devise.en.yml (Portuguese) 2020-11-25 22:05:19 +01:00
Sylvain
d9317a52d5 New translations en.yml (Portuguese) 2020-11-25 22:05:17 +01:00
Sylvain
298589fe1b New translations mails.en.yml (Portuguese) 2020-11-25 21:53:05 +01:00
Sylvain
cf86bd90dd New translations app.logged.en.yml (Portuguese) 2020-11-25 21:53:03 +01:00
Sylvain
17e8e27830 New translations app.public.en.yml (Portuguese) 2020-11-25 21:42:01 +01:00
Sylvain
2f6707b8ff New translations app.logged.en.yml (Portuguese) 2020-11-25 21:41:59 +01:00
Sylvain
f5709ef60e get stripe payment method 2020-11-25 17:13:45 +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
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
21bd1312bc compute payment schedule + basic display 2020-11-03 16:50:11 +01:00
Sylvain
7084e88d2d display monthly price for compatible plans 2020-11-02 12:29:08 +01:00
Sylvain
4bdcb44e33 Merge branch 'dev' into monthly-payment 2020-10-29 15:53:38 +01:00
Sylvain
5ad7a317ab
Merge pull request #235 from sleede/l10n_dev
New Crowdin updates
2020-10-28 12:22:56 +01:00
Sylvain
d1f28900cb New translations app.public.en.yml (French) 2020-10-28 12:14:50 +01:00
Sylvain
9afd7842b8 New translations app.public.en.yml (French) 2020-10-28 12:13:29 +01:00
Sylvain
d9055bb7c5 New translations app.public.en.yml (Spanish) 2020-10-28 12:13:23 +01:00
Sylvain
42ef888f15 New translations app.public.en.yml (Portuguese) 2020-10-28 12:13:17 +01:00
Sylvain
cb205920a0 New translations app.public.en.yml (Zulu) 2020-10-28 12:13:08 +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
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
26c8453f4b New translations app.admin.en.yml (French) 2020-10-27 08:10:56 +01:00
Sylvain
3651164d56 New translations app.admin.en.yml (Zulu) 2020-10-26 16:59:33 +01:00
Sylvain
5acf3fa5a1 New translations app.admin.en.yml (French) 2020-10-26 16:59:31 +01:00
Sylvain
dc844bb10c Enlarged privacy policy display and edition zones 2020-10-26 16:52:05 +01:00
Sylvain
c7a8668fd6 architecture changes to allow including React.js components into the application 2020-10-21 15:07:01 +02:00
Sylvain
0c1f5f5f25 webpack production configuration: path to ngtemplates 2020-10-19 15:03:11 +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
1f03155eb0 fix compilation of angular-ui-tour 2020-10-07 14:25:48 +02:00
Sylvain
4f441e46aa provide ui-tour dependencies 2020-10-07 11:09:10 +02:00
Sylvain
0d28da1e44 re-enable minifying in production + use fork w/ dependencies injection for angular-ui-codemirror 2020-10-07 10:34:27 +02:00
Sylvain
c30e096e53 fix loading ui-tour with webpack 2020-10-07 10:25:27 +02:00
Sylvain
ac4dcfd5fd disable uglify in production to find the unknown provider 2020-10-07 09:06:36 +02:00
Sylvain
67b0655272 add prefix to ngtemplate-loader 2020-10-06 16:05:23 +02:00
Sylvain
c1564d5eae Merge branch 'webpacker' into dev 2020-10-05 17:52:46 +02:00
Sylvain
6b097e9ea4
Merge pull request #232 from sleede/l10n_dev
New Crowdin updates
2020-09-29 12:11:37 +02:00
Sylvain
29237e1592 New translations app.shared.en.yml (Spanish) 2020-09-29 12:11:05 +02:00
Sylvain
d536f1f39f New translations app.shared.en.yml (Portuguese) 2020-09-29 12:11:01 +02:00
Sylvain
93c157c38e New translations app.shared.en.yml (French) 2020-09-29 12:07:52 +02:00
Sylvain
93b65d63ea New translations app.admin.en.yml (French) 2020-09-29 12:07:45 +02:00
Sylvain
57b76d156b Alert before cancelling a reservation that credits will be lost 2020-09-29 12:03:13 +02:00
Sylvain
510af9d53b New translations app.shared.en.yml (French) 2020-09-29 12:02:30 +02:00
Sylvain
139af2c768 New translations app.admin.en.yml (Spanish) 2020-09-29 12:02:28 +02:00
Sylvain
2d86f4b8b0 New translations app.shared.en.yml (Spanish) 2020-09-29 12:02:24 +02:00
Sylvain
137286ea5b New translations app.admin.en.yml (Portuguese) 2020-09-29 12:02:22 +02:00
Sylvain
dda606e91e New translations app.admin.en.yml (French) 2020-09-29 12:02:18 +02:00
Sylvain
b84e569ab0 New translations app.shared.en.yml (Portuguese) 2020-09-29 12:02:16 +02:00
Sylvain
1462eccc9f New translations app.admin.en.yml (Zulu) 2020-09-29 12:02:06 +02:00
Sylvain
6d2b833ebd New translations app.shared.en.yml (Zulu) 2020-09-29 12:02:03 +02:00