rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-13 23:48:55 +01:00
Code Issues Releases Activity
7,603 Commits 15 Branches 274 Tags 83 MiB
b6f2187d94
Commit Graph

3229 Commits

Author SHA1 Message Date
Sylvain
377daa121b New translations app.shared.en.yml (Portuguese) 2022-01-05 16:00:56 +01:00
Sylvain
fa9e63c250 New translations app.shared.en.yml (Norwegian) 2022-01-05 16:00:55 +01:00
Sylvain
1486885985 New translations app.shared.en.yml (German) 2022-01-05 16:00:53 +01:00
Sylvain
0dd810dedb New translations app.shared.en.yml (Spanish) 2022-01-05 16:00:51 +01:00
Sylvain
fa232afc5b New translations app.shared.en.yml (French) 2022-01-05 16:00:50 +01:00
Sylvain
bdbece061b New translations mails.en.yml (Portuguese) 2022-01-05 16:00:47 +01:00
Sylvain
63ab7eaa91 New translations en.yml (French) 2022-01-05 16:00:39 +01:00
Sylvain
9922812111 Ability to select "bank transfer" as the payment mean for a payment schedule 2022-01-05 15:58:33 +01:00
Sylvain
5e818307ca New translations app.admin.en.yml (Zulu) 2022-01-04 15:35:26 +01:00
Sylvain
c7ff528311 New translations en.yml (Zulu) 2022-01-04 15:35:25 +01:00
Sylvain
7c47f69e75 New translations app.admin.en.yml (Portuguese) 2022-01-04 15:35:24 +01:00
Sylvain
af226d8126 New translations en.yml (Portuguese) 2022-01-04 15:35:23 +01:00
Sylvain
9ec7b4d403 New translations app.admin.en.yml (Norwegian) 2022-01-04 15:35:22 +01:00
Sylvain
c5099b1d03 New translations en.yml (Norwegian) 2022-01-04 15:35:20 +01:00
Sylvain
5057362b75 New translations app.admin.en.yml (German) 2022-01-04 15:35:19 +01:00
Sylvain
9be0d22966 New translations en.yml (German) 2022-01-04 15:35:18 +01:00
Sylvain
b610adaeea New translations app.admin.en.yml (Spanish) 2022-01-04 15:35:17 +01:00
Sylvain
7e78d1575c New translations en.yml (Spanish) 2022-01-04 15:35:16 +01:00
Sylvain
9b7f3951c1 New translations app.admin.en.yml (French) 2022-01-04 15:35:15 +01:00
Sylvain
a355ff44ff New translations en.yml (French) 2022-01-04 15:35:14 +01:00
Sylvain
e1256ec551 Ability to disable public account creation 2022-01-04 15:27:58 +01:00
Sylvain
695ed6928d New translations app.admin.en.yml (French) 2022-01-04 10:32:19 +01:00
Sylvain
148ffc7e60 New translations app.admin.en.yml (Zulu) 2022-01-04 10:30:12 +01:00
Sylvain
c43df736a2 New translations app.admin.en.yml (Portuguese) 2022-01-04 10:30:11 +01:00
Sylvain
a5fee19637 New translations app.admin.en.yml (Norwegian) 2022-01-04 10:30:09 +01:00
Sylvain
651f3ae23d New translations app.admin.en.yml (German) 2022-01-04 10:30:05 +01:00
Sylvain
19858881ca New translations app.admin.en.yml (Spanish) 2022-01-04 10:30:02 +01:00
Sylvain
e6220b1409 New translations app.admin.en.yml (French) 2022-01-04 10:29:57 +01:00
Sylvain
9e742cd1b6 Ability to create slots in the past 2022-01-04 10:28:43 +01:00
Sylvain
effe5c7ba9 optimized the load time of the payment schedules list 
From now, we no longer retrieve the client_secret directly from the API/list but from a specialized component which ask API/get_item.
This highly decrease the laod time needed to fetch API/list
 2022-01-03 11:24:08 +01:00
Sylvain
a0d5a688d2
Merge branch 'dev' into l10n_dev 2021-12-29 22:20:49 +01:00
Sylvain
84536c9176 New translations app.admin.en.yml (Portuguese) 2021-12-29 22:18:08 +01:00
Sylvain
0b0df6d173 New translations en.yml (Portuguese) 2021-12-29 22:18:07 +01:00
Sylvain
d1b52746d6 New translations app.admin.en.yml (Norwegian) 2021-12-29 22:18:06 +01:00
Sylvain
e8e6922adf New translations en.yml (Norwegian) 2021-12-29 22:18:05 +01:00
Sylvain
b8f1010b84 New translations app.admin.en.yml (German) 2021-12-29 22:18:04 +01:00
Sylvain
f30d668f26 New translations en.yml (German) 2021-12-29 22:18:03 +01:00
Sylvain
ccd6c0c50d New translations app.admin.en.yml (Spanish) 2021-12-29 22:18:01 +01:00
Sylvain
f4aeeaeb72 New translations en.yml (Spanish) 2021-12-29 22:18:00 +01:00
Sylvain
157605d8de New translations mails.en.yml (French) 2021-12-29 21:57:26 +01:00
Sylvain
73d3547294 New translations app.admin.en.yml (French) 2021-12-29 21:57:25 +01:00
Sylvain
4be86c4362 New translations en.yml (French) 2021-12-29 21:57:23 +01:00
Sylvain
6ecff924d1 New translations app.admin.en.yml (French) 2021-12-29 21:48:43 +01:00
Sylvain
1ded66c6ec New translations mails.en.yml (Spanish) 2021-12-29 21:27:56 +01:00
Sylvain
1d5f880eb9 New translations mails.en.yml (French) 2021-12-29 21:27:55 +01:00
Sylvain
5c16b33bff New translations mails.en.yml (German) 2021-12-29 21:27:51 +01:00
Sylvain
ee8807a790 New translations app.admin.en.yml (Zulu) 2021-12-29 21:27:50 +01:00
Sylvain
d38b8b85ef New translations app.admin.en.yml (Portuguese) 2021-12-29 21:27:49 +01:00
Sylvain
68b097e6d4 New translations en.yml (Portuguese) 2021-12-29 21:27:48 +01:00
Sylvain
9d2069bc53 New translations app.admin.en.yml (Norwegian) 2021-12-29 21:27:47 +01:00
Sylvain
e33f075684 New translations en.yml (Norwegian) 2021-12-29 21:27:45 +01:00
Sylvain
d95c4f480b New translations app.admin.en.yml (German) 2021-12-29 21:27:44 +01:00
Sylvain
2a0a0a3e30 New translations en.yml (German) 2021-12-29 21:27:43 +01:00
Sylvain
569ca0e81e New translations app.admin.en.yml (Spanish) 2021-12-29 21:27:42 +01:00
Sylvain
ef88114408 New translations en.yml (Spanish) 2021-12-29 21:27:41 +01:00
Sylvain
e5c665db42 New translations en.yml (Zulu) 2021-12-29 21:27:40 +01:00
Sylvain
1841ba27f1 New translations app.admin.en.yml (French) 2021-12-29 21:27:39 +01:00
Sylvain
f5e1a166e6 New translations mails.en.yml (Norwegian) 2021-12-29 21:27:38 +01:00
Sylvain
d671e49951 New translations mails.en.yml (Zulu) 2021-12-29 21:27:37 +01:00
Sylvain
d5407e042a New translations mails.en.yml (Portuguese) 2021-12-29 21:27:28 +01:00
Sylvain
68e12c7b12 New translations en.yml (French) 2021-12-29 21:27:21 +01:00
Sylvain
330b8c3ba4 fix accounting export confirmation message by mail 2021-12-29 17:06:31 +01:00
Sylvain
00b9bce587 export collected VAT by rate 2021-12-29 17:00:54 +01:00
Sylvain
16242d2127 frontend invoice configuration page uses multiVAT 2021-12-29 12:08:50 +01:00
Du Peng
6019767a3b update multi VAT 2021-12-28 13:45:29 +01:00
Du Peng
c5211e98e3 generate invoice with multi vat 2021-12-28 13:45:28 +01:00
Sylvain
fe96e01b7f refactor spaces/extended_prices code architecture to match the FM style guide 2021-12-28 11:25:10 +01:00
vincent
a319bf40b4 Fix typo 2021-12-23 14:36:20 +01:00
Sylvain
6d4f31c33b New translations app.admin.en.yml (Zulu) 2021-12-23 10:26:11 +01:00
Sylvain
d4fa3e4b73 New translations en.yml (Zulu) 2021-12-23 10:26:10 +01:00
Sylvain
a18e440504 New translations app.admin.en.yml (Portuguese) 2021-12-23 10:26:09 +01:00
Sylvain
5b3c7228c8 New translations en.yml (Portuguese) 2021-12-23 10:26:07 +01:00
Sylvain
278dacd6b5 New translations app.admin.en.yml (Norwegian) 2021-12-23 10:26:06 +01:00
Sylvain
9a9ed6538a New translations en.yml (Norwegian) 2021-12-23 10:26:05 +01:00
Sylvain
877b24b9ea New translations app.admin.en.yml (German) 2021-12-23 10:26:03 +01:00
Sylvain
ccd1cea2a5 New translations en.yml (German) 2021-12-23 10:26:02 +01:00
Sylvain
a2715d5c1b New translations app.admin.en.yml (Spanish) 2021-12-23 10:26:00 +01:00
Sylvain
6790a78611 New translations en.yml (Spanish) 2021-12-23 10:25:59 +01:00
Sylvain
b31f9df37f New translations app.admin.en.yml (French) 2021-12-23 10:25:58 +01:00
Sylvain
46c42303ee New translations en.yml (French) 2021-12-23 10:25:56 +01:00
Sylvain
b864ba66da Apply 22 suggestion(s) to 6 file(s) 2021-12-22 14:07:48 +00:00
vincent
c3cbc26a1e Merge branch 'spaces_multiprices_front' into spaces_multiprices 2021-12-21 17:14:22 +01:00
vincent
bd781a14e9 Add extended price 2021-12-21 17:13:40 +01:00
Sylvain
ffb0f3e19e ability to limit extended prices to slots in the same day 2021-12-21 16:32:02 +01:00
vincent
af4acc895c Merge branch 'spaces_multiprices' into spaces_multiprices_front 2021-12-21 15:24:20 +01:00
vincent
d6a4675209 wip 2021-12-21 14:37:38 +01:00
Sylvain
6091cec82e api endpoint to create prices 2021-12-21 14:18:03 +01:00
Sylvain
c91e825496 [bug] minamed sso perperty 2021-12-20 14:10:44 +01:00
Sylvain
3a787ea2a0 support for JSONPath syntax in oAuth2 mapping 2021-12-20 13:40:55 +01:00
Sylvain
6ed130f042 New translations mails.en.yml (Portuguese) 2021-12-04 21:57:29 +01:00
Sylvain
1eb24b9f46 New translations mails.en.yml (Portuguese) 2021-12-04 21:47:12 +01:00
Sylvain
381edce6d6 New translations en.yml (Portuguese) 2021-12-04 21:47:11 +01:00
Sylvain
252d1ae3a0 New translations en.yml (Portuguese) 2021-12-04 21:37:53 +01:00
Sylvain
1b2e4ee3ad New translations en.yml (Portuguese) 2021-12-04 21:28:40 +01:00
Sylvain
e3c56dd3bb New translations en.yml (Portuguese) 2021-12-04 21:18:39 +01:00
Sylvain
032aaeedc8 New translations en.yml (Portuguese) 2021-12-04 21:08:23 +01:00
Sylvain
e40304aa7b New translations en.yml (Portuguese) 2021-12-04 20:59:02 +01:00
Sylvain
862047da83 New translations app.shared.en.yml (Portuguese) 2021-12-04 20:59:01 +01:00
Sylvain
f49cc1aed9 New translations app.shared.en.yml (Portuguese) 2021-12-04 20:47:39 +01:00
Sylvain
588c114c6a New translations app.shared.en.yml (Portuguese) 2021-12-04 20:37:21 +01:00
Sylvain
ac0ba0ca46 New translations app.shared.en.yml (Portuguese) 2021-12-04 20:28:21 +01:00
Sylvain
f776703e87 New translations app.shared.en.yml (Portuguese) 2021-12-04 20:17:19 +01:00
Sylvain
08cc0f7d7a New translations app.shared.en.yml (Portuguese) 2021-12-04 20:07:21 +01:00
Sylvain
ab4b707b88 New translations app.shared.en.yml (Portuguese) 2021-12-04 19:57:50 +01:00
Sylvain
2b7766ded6 New translations app.shared.en.yml (Portuguese) 2021-12-04 19:48:55 +01:00
Sylvain
af0e9b28f9 New translations app.shared.en.yml (Portuguese) 2021-12-04 19:29:14 +01:00
Sylvain
aece5a8a35 New translations app.logged.en.yml (Portuguese) 2021-12-04 19:18:18 +01:00
Sylvain
e62b3d9ce9 New translations app.logged.en.yml (Portuguese) 2021-12-04 19:08:57 +01:00
Sylvain
5780dd2c1c New translations app.admin.en.yml (Portuguese) 2021-12-04 19:08:56 +01:00
Sylvain
2d885bf8fd New translations app.admin.en.yml (Portuguese) 2021-12-04 18:56:21 +01:00
Sylvain
5897f37cf2 New translations app.admin.en.yml (Portuguese) 2021-12-04 18:47:00 +01:00
Sylvain
5fb1400d00 New translations app.admin.en.yml (Portuguese) 2021-12-04 18:37:47 +01:00
Sylvain
0e5837ccc9 New translations app.admin.en.yml (Portuguese) 2021-12-04 18:07:47 +01:00
Sylvain
b6f2d83019 New translations app.admin.en.yml (Portuguese) 2021-12-04 17:17:42 +01:00
Sylvain
3952461497 New translations app.admin.en.yml (Portuguese) 2021-12-04 17:09:11 +01:00
Sylvain
5458f76d5b New translations app.admin.en.yml (Portuguese) 2021-12-03 18:11:39 +01:00
Sylvain
12baacb92f New translations app.admin.en.yml (Portuguese) 2021-11-20 04:28:05 +01:00
Sylvain
35a541060b New translations app.public.en.yml (Portuguese) 2021-11-20 04:14:30 +01:00
Sylvain
7336c227bb New translations app.admin.en.yml (Portuguese) 2021-11-20 04:14:29 +01:00
Sylvain
2bf5ea6de1 New translations app.admin.en.yml (Portuguese) 2021-11-20 03:58:18 +01:00
Sylvain
4570f8bd04 New translations app.admin.en.yml (Portuguese) 2021-11-20 03:48:04 +01:00
Sylvain
e8811df51a New translations app.admin.en.yml (Norwegian) 2021-11-10 14:04:07 +01:00
Sylvain
101be67fc5
Merge pull request #308 from sleede/l10n_dev 
New Crowdin updates
 2021-10-22 16:22:49 +02:00
Sylvain
72a73b3e24 New translations app.shared.en.yml (French) 2021-10-22 16:21:45 +02:00
Sylvain
89c046824c New translations app.admin.en.yml (French) 2021-10-22 16:19:50 +02:00
Sylvain
2fb7840949 New translations en.yml (French) 2021-10-22 16:19:38 +02:00
Sylvain
7332b7ff16 New translations app.admin.en.yml (Zulu) 2021-10-22 16:14:42 +02:00
Sylvain
dde3d0614c New translations app.admin.en.yml (Portuguese) 2021-10-22 16:14:40 +02:00
Sylvain
db4159f81a New translations app.admin.en.yml (German) 2021-10-22 16:14:36 +02:00
Sylvain
10afbf0ce3 New translations app.admin.en.yml (Spanish) 2021-10-22 16:14:34 +02:00
Sylvain
b44030cf92 New translations app.admin.en.yml (Norwegian) 2021-10-22 16:14:31 +02:00
Sylvain
a9eaa46d1f New translations app.admin.en.yml (French) 2021-10-22 16:14:29 +02:00
Sylvain
affd96ddb3 fix typo 2021-10-22 16:12:43 +02:00
Sylvain
f11b620411 New translations app.admin.en.yml (French) 2021-10-22 16:12:24 +02:00
Sylvain
cc21a70500 New translations app.admin.en.yml (Zulu) 2021-10-22 16:04:20 +02:00
Sylvain
951b52cb03 New translations app.admin.en.yml (Portuguese) 2021-10-22 16:04:18 +02:00
Sylvain
a777294231 New translations app.admin.en.yml (German) 2021-10-22 16:04:14 +02:00
Sylvain
f5c47cf609 New translations app.admin.en.yml (Spanish) 2021-10-22 16:04:11 +02:00
Sylvain
a9059eee4e New translations app.admin.en.yml (Norwegian) 2021-10-22 16:04:09 +02:00
Sylvain
2b2ee29d92 New translations app.admin.en.yml (French) 2021-10-22 16:04:08 +02:00
Sylvain
d009381dab remove unused translations 2021-10-22 16:03:26 +02:00
Sylvain
f8e91ce5df New translations app.admin.en.yml (French) 2021-10-22 16:02:28 +02:00
Sylvain
3512d39227 New translations app.shared.en.yml (Zulu) 2021-10-22 15:52:09 +02:00
Sylvain
86e25a0a53 New translations app.admin.en.yml (Zulu) 2021-10-22 15:52:08 +02:00
Sylvain
a8d1e12b7c New translations en.yml (Zulu) 2021-10-22 15:52:06 +02:00
Sylvain
e6f90b1749 New translations app.shared.en.yml (Portuguese) 2021-10-22 15:52:05 +02:00
Sylvain
74f12d7181 New translations app.admin.en.yml (Portuguese) 2021-10-22 15:52:04 +02:00
Sylvain
e295fc0b88 New translations en.yml (Portuguese) 2021-10-22 15:52:03 +02:00
Sylvain
4c350afe35 New translations app.shared.en.yml (Norwegian) 2021-10-22 15:52:01 +02:00
Sylvain
fb6e76258b New translations en.yml (Norwegian) 2021-10-22 15:52:00 +02:00
Sylvain
746e4ead31 New translations app.shared.en.yml (German) 2021-10-22 15:51:59 +02:00
Sylvain
28777a024b New translations app.admin.en.yml (German) 2021-10-22 15:51:58 +02:00
Sylvain
511a6cd087 New translations en.yml (German) 2021-10-22 15:51:57 +02:00
Sylvain
065391637b New translations app.shared.en.yml (Spanish) 2021-10-22 15:51:56 +02:00
Sylvain
c566e61eb0 New translations app.admin.en.yml (Spanish) 2021-10-22 15:51:55 +02:00
Sylvain
ee849d3446 New translations en.yml (Spanish) 2021-10-22 15:51:54 +02:00
Sylvain
45b6a20fe1 New translations app.shared.en.yml (French) 2021-10-22 15:51:53 +02:00
Sylvain
50eb9dc364 New translations app.admin.en.yml (Norwegian) 2021-10-22 15:51:52 +02:00
Sylvain
bbcbb40cc0 New translations app.admin.en.yml (French) 2021-10-22 15:51:50 +02:00
Sylvain
64dc23a933 New translations en.yml (French) 2021-10-22 15:51:35 +02:00
Sylvain
4a59f6faed [bug] invalid text shown when a member confirms a free cart 2021-10-22 15:43:33 +02:00
Sylvain
840c536c75 Ability to configure data sources for preventing booking on overlapping slots 2021-10-22 14:50:02 +02:00
Sylvain
e9740ebf69 validate birth date must be in the past 2021-10-20 17:31:30 +02:00
Sylvain
853b70ed11 New translations app.admin.en.yml (Zulu) 2021-10-19 15:45:12 +02:00
Sylvain
40f1ab0cc8 New translations app.admin.en.yml (Portuguese) 2021-10-19 15:45:11 +02:00
Sylvain
db8004ace7 New translations app.admin.en.yml (Norwegian) 2021-10-19 15:45:10 +02:00
Sylvain
3f3a809002 New translations app.admin.en.yml (German) 2021-10-19 15:45:08 +02:00
Sylvain
58db85118a New translations app.admin.en.yml (Spanish) 2021-10-19 15:45:07 +02:00
Sylvain
8689fa8cd3 New translations app.admin.en.yml (French) 2021-10-19 15:45:05 +02:00
Sylvain
2d61dac9cc refactored admin takes subscription for a member 2021-10-19 12:24:41 +02:00
Sylvain
c8aae6448f New translations app.shared.en.yml (Zulu) 2021-10-19 10:37:19 +02:00
Sylvain
fe93f17b76 New translations app.shared.en.yml (French) 2021-10-19 10:37:18 +02:00
Sylvain
2716d6d737 New translations en.yml (Spanish) 2021-10-19 10:37:17 +02:00
Sylvain
32846995ac New translations app.admin.en.yml (Spanish) 2021-10-19 10:37:16 +02:00
Sylvain
2627fac7ab New translations app.shared.en.yml (Spanish) 2021-10-19 10:37:15 +02:00
Sylvain
94e6b52d62 New translations en.yml (German) 2021-10-19 10:37:14 +02:00
Sylvain
d9a941daaf New translations app.admin.en.yml (German) 2021-10-19 10:37:13 +02:00
Sylvain
7a5a556e3b New translations app.shared.en.yml (German) 2021-10-19 10:37:11 +02:00
Sylvain
897c6b5247 New translations app.admin.en.yml (French) 2021-10-19 10:37:10 +02:00
Sylvain
3804b2c240 New translations en.yml (Norwegian) 2021-10-19 10:37:09 +02:00
Sylvain
6e8b928873 New translations app.shared.en.yml (Norwegian) 2021-10-19 10:37:08 +02:00
Sylvain
a2ae93d9a7 New translations en.yml (Portuguese) 2021-10-19 10:37:07 +02:00
Sylvain
fcbbd61e96 New translations app.admin.en.yml (Portuguese) 2021-10-19 10:37:06 +02:00
Sylvain
5798eb3b32 New translations app.shared.en.yml (Portuguese) 2021-10-19 10:37:05 +02:00
Sylvain
4cdaff951e New translations en.yml (Zulu) 2021-10-19 10:37:04 +02:00
Sylvain
d87333f871 New translations app.admin.en.yml (Zulu) 2021-10-19 10:37:02 +02:00
Sylvain
d355eb6fcc New translations app.admin.en.yml (Norwegian) 2021-10-19 10:37:01 +02:00
Sylvain
5dc095891d New translations en.yml (French) 2021-10-19 10:37:00 +02:00
Sylvain
4c56dffc04 remove deprecated code and endpoints 2021-10-18 10:15:48 +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
676f921d66 fix some errors about stp subscription refacto + improved error handling 2021-10-07 17:07:46 +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
ef989ec341
Merge branch 'dev' into l10n_dev 2021-10-04 17:05:59 +02:00
Sylvain
838eab6b40 New translations app.logged.en.yml (French) 2021-10-04 17:04:06 +02:00
Sylvain
888171d023 New translations app.admin.en.yml (French) 2021-10-04 17:03:50 +02:00
Sylvain
b28a39425f New translations app.admin.en.yml (Zulu) 2021-10-04 11:03:09 +02:00
Sylvain
e61a30b6a9 New translations app.admin.en.yml (Portuguese) 2021-10-04 11:03:08 +02:00
Sylvain
4052a555d8 New translations app.admin.en.yml (Norwegian) 2021-10-04 11:03:07 +02:00
Sylvain
df710de252 New translations app.admin.en.yml (German) 2021-10-04 11:03:05 +02:00
Sylvain
a4fea0c331 New translations app.admin.en.yml (Spanish) 2021-10-04 11:03:04 +02:00
Sylvain
04703615bb New translations app.admin.en.yml (French) 2021-10-04 11:03:03 +02:00
Sylvain
6276944a5a New translations app.logged.en.yml (French) 2021-09-30 11:22:21 +02:00
Sylvain
03f11bab4e New translations app.shared.en.yml (French) 2021-09-30 11:22:16 +02:00
Sylvain
1f89fb6a3e New translations app.admin.en.yml (French) 2021-09-30 11:22:05 +02:00
Sylvain
94634ed825 remove unused tr key 2021-09-30 11:04:00 +02:00
Sylvain
115bdb2776 New translations app.logged.en.yml (Zulu) 2021-09-21 18:26:38 +02:00
Sylvain
b03b01784d New translations app.admin.en.yml (Zulu) 2021-09-21 18:26:37 +02:00
Sylvain
deab5cd42d New translations app.logged.en.yml (Portuguese) 2021-09-21 18:26:35 +02:00
Sylvain
1f5e1dea43 New translations app.admin.en.yml (Portuguese) 2021-09-21 18:26:34 +02:00
Sylvain
2affcb04ad New translations app.logged.en.yml (Norwegian) 2021-09-21 18:26:33 +02:00
Sylvain
f9bf77aabc New translations app.admin.en.yml (Norwegian) 2021-09-21 18:26:32 +02:00
Sylvain
734293891d New translations app.logged.en.yml (German) 2021-09-21 18:26:31 +02:00
Sylvain
ce7c40ea70 New translations app.admin.en.yml (German) 2021-09-21 18:26:30 +02:00
Sylvain
ebea4969bf New translations app.logged.en.yml (Spanish) 2021-09-21 18:26:28 +02:00
Sylvain
c636103a4d New translations app.admin.en.yml (Spanish) 2021-09-21 18:26:27 +02:00
Sylvain
4395032156 New translations app.logged.en.yml (French) 2021-09-21 18:26:26 +02:00
Sylvain
6cf94576d8 New translations app.admin.en.yml (French) 2021-09-21 18:26:25 +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
f2dd1bbcd2 add an option Subscription valid for purchase and use of a prepaid pack 2021-09-20 19:43:05 +02:00
Sylvain
49a8905b44 New translations app.shared.en.yml (Zulu) 2021-09-13 16:40:33 +02:00
Sylvain
98c65da1b4 New translations app.shared.en.yml (French) 2021-09-13 16:40:29 +02:00
Du Peng
6b763cc1c9 improve code for stripe subscription payment 2021-09-10 15:19:04 +02:00
Du Peng
2973dec6a7 rewrite payment schedule workflow by stripe 2021-09-08 18:57:10 +02:00
Sylvain
810d46e40d New translations app.public.en.yml (Norwegian) 2021-08-24 10:57:20 +02:00
Sylvain
9543962538 New translations app.admin.en.yml (Norwegian) 2021-08-24 10:57:20 +02:00
Sylvain
59755f75b3 New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
95bab5ed26 New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
e87f550336 New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
6d88cd38e3 New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
851289b970 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
0b383bbcbd New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
312226bfa3 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
5f05fa09db New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
a5a8cb51d8 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
8f50abf15a New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
d61cc3b369 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
68274801d7 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
8afd04c0c3 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c69791eae9 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c006c24579 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
8d3b99caee New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
5272819f2a New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
0b264ac000 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
b5c205ba62 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
78ee4f915f New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
18569411e0 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
5fc1ed1756 New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c711c07e10 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
8113e6e784 New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
adf6cddeaa New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
766e6271fb New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
33309ef141 New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
3b72f290ec New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
a4b56da5ea New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c8a1de421f New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
581b25bf16 New translations mails.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
f966ccce68 New translations devise.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c145bca833 New translations mails.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
d9e418b7b3 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
878e085828 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
2e3b527cf2 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
7deeffad47 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
e4a09fb0ea New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
53cd77eeb5 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
39b827e920 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
a8271c689c New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
043618eec2 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
95220570cf New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
bda7c0086e New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
645e4449a5 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
42c3f13cce New translations mails.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c4feff1215 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
ff8fb03fff New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
02e1736882 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
8ccbc7bdbb New translations devise.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
ca797867ff New translations en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
852a1793d7 New translations devise.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
174806b0ca New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
df687b668d New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
572989e900 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
bfe64b0ff2 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
5844e20c87 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
edc046fed9 New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c017933df3 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
95cc9e31c4 New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
e8849a3a8d New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
60d746b8de New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
a81ba1af42 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
36824dcf82 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
5aa5611a22 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
9cad07ea41 New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
47f847ee3c New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
73b533b56b New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
6c93253ba5 New translations en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
75491c0581 New translations en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
6873c0ab1a New translations en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
ea37b6e88e New translations en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
24fd0bfb15 New translations en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
34af8a01ab New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
54b5bb67ce New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
ee71092989 New translations en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
4ad9a667f9 New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
a4188ab6ec New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
e397d0f578 New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
091ff1e65e New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
046206ddb0 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
f25eb003d8 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
7b23461310 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
7ee909fc43 New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
364022930b New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
b08c663c6a New translations app.shared.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
200cf7b776 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
b525b80a28 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
5f704b1de0 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
d369f27435 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
54e9838b5c New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
07c4a788bf New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
3e402c0756 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c25fe9f25d New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
7b065afaca New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
93c8881a1a New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
b3e4b603a1 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
81ac967486 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
147148c883 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
5a227b7cfe New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
feadf7f90e New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
636ddefcac New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
d37b6fe66d New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
52934c11d9 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
d2e3eef7bf New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
b8f78b76a5 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
44ec1fc623 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
28c707bcc5 [bug] missing invoice watermark for norwegian 2021-07-02 12:54:13 +02:00
Sylvain
60df8d609f [bug] missing hour format for norwegian 2021-07-02 12:33:51 +02:00
Du Peng
0831d52b64 fix a bug: rename Norwegian locale 2021-07-02 10:03:46 +02:00
Du Peng
04cca4bbff fix conflit 2021-07-02 10:00:50 +02:00
Sylvain
d3ff2ad36b invalid rails locale for Norwegian 2021-07-02 09:58:42 +02:00
Sylvain
8c1c6bca4d invalid rails locale for Norwegian 2021-07-02 09:42:37 +02:00
Du Peng
0b69691a97 Fix a bug: invalid rails locale for Norwegian 2021-07-02 09:29:10 +02:00
Du Peng
4222e87e39 Disable SQL format for the schema 2021-07-01 16:17:37 +02:00
Du Peng
2b920528b1 Fix a bug: config norwegian locale 2021-07-01 16:00:20 +02:00
Sylvain
7e4ab07acd New translations app.logged.en.yml (French) 2021-07-01 09:59:25 +02:00
Sylvain
fdd0a0da1d New translations app.logged.en.yml (French) 2021-07-01 09:56:53 +02:00
Sylvain
fe1d0f5ae1
Merge branch 'dev' into l10n_dev 2021-07-01 09:48:26 +02:00
Sylvain
3b16a4cb5e New translations app.public.en.yml (German) 2021-07-01 09:47:32 +02:00
Sylvain
87d7393347 New translations app.public.en.yml (Spanish) 2021-07-01 09:47:23 +02:00
Sylvain
87198465e2 New translations app.shared.en.yml (Portuguese) 2021-07-01 09:38:35 +02:00
Sylvain
6a746aad89 New translations app.public.en.yml (Portuguese) 2021-07-01 09:38:30 +02:00
Sylvain
239b82d589 New translations app.public.en.yml (Portuguese) 2021-07-01 09:33:55 +02:00
Sylvain
b894854cef New translations app.logged.en.yml (Portuguese) 2021-07-01 09:33:54 +02:00
Sylvain
650ec474d2 New translations app.admin.en.yml (Portuguese) 2021-07-01 09:33:53 +02:00
Sylvain
f711631406 New translations app.shared.en.yml (German) 2021-07-01 09:33:51 +02:00
Sylvain
ff7b568cfe New translations app.logged.en.yml (German) 2021-07-01 09:33:50 +02:00
Sylvain
97c5984be7 New translations app.admin.en.yml (German) 2021-07-01 09:33:49 +02:00
Sylvain
0f6b059980 New translations en.yml (French) 2021-07-01 09:33:46 +02:00
Sylvain
35c1803094 New translations en.yml (Portuguese) 2021-07-01 09:20:01 +02:00
Sylvain
600a9ddb9b New translations en.yml (German) 2021-07-01 09:19:57 +02:00
Sylvain
b43cabbe18 New translations en.yml (Spanish) 2021-07-01 09:19:53 +02:00
Sylvain
8e0b7a80ee New translations app.shared.en.yml (French) 2021-07-01 09:19:52 +02:00
Sylvain
478bf8c0b8 New translations app.public.en.yml (French) 2021-07-01 09:19:51 +02:00
Sylvain
82555cabda New translations app.logged.en.yml (French) 2021-07-01 09:19:50 +02:00
Sylvain
fb6f9cae9d New translations app.admin.en.yml (French) 2021-07-01 09:19:49 +02:00
Sylvain
5888649fde New translations en.yml (Norwegian) 2021-07-01 09:19:43 +02:00
Sylvain
8eee531b0b New translations en.yml (Zulu) 2021-07-01 09:19:38 +02:00
Sylvain
e84a604f6b New translations en.yml (French) 2021-07-01 09:19:36 +02:00
Sylvain
d1c7a9c446 add missing tr key 2021-07-01 09:19:00 +02:00
Sylvain
b17947d420 New translations app.admin.en.yml (German) 2021-07-01 09:02:43 +02:00
Sylvain
b5368c0974 New translations app.admin.en.yml (Portuguese) 2021-07-01 09:02:41 +02:00
Sylvain
ca0d5c0f7a New translations app.admin.en.yml (Spanish) 2021-07-01 09:02:39 +02:00
Sylvain
4e5a732d7a New translations app.admin.en.yml (French) 2021-07-01 09:02:35 +02:00
Sylvain
025a74150e New translations app.admin.en.yml (Norwegian) 2021-07-01 09:02:31 +02:00
Sylvain
b5239c6540 New translations app.admin.en.yml (Zulu) 2021-07-01 09:02:27 +02:00
Sylvain
e2ba4c6f2b fix typo 2021-07-01 09:01:54 +02:00
Sylvain
95843e99a3 New translations app.admin.en.yml (French) 2021-07-01 09:00:09 +02:00
Sylvain
7c5b4df505 New translations app.admin.en.yml (German) 2021-07-01 08:51:13 +02:00
Sylvain
3a9e996dc4 New translations app.admin.en.yml (Portuguese) 2021-07-01 08:51:10 +02:00
Sylvain
da0465ef29 New translations app.admin.en.yml (Spanish) 2021-07-01 08:51:07 +02:00
Sylvain
320d53f0bd New translations app.admin.en.yml (French) 2021-07-01 08:51:02 +02:00
Sylvain
38060935d7 New translations app.admin.en.yml (Norwegian) 2021-07-01 08:50:57 +02:00
Sylvain
f5fc533ee6 New translations app.admin.en.yml (Zulu) 2021-07-01 08:50:51 +02:00
Sylvain
89a911c897 fix translation 2021-07-01 08:49:59 +02:00
Sylvain
da8be8fb12 New translations app.admin.en.yml (French) 2021-07-01 08:49:29 +02:00
Sylvain
123e9f7066 New translations app.admin.en.yml (Norwegian) 2021-06-30 17:36:11 +02:00
Sylvain
79446b81c5 New translations app.admin.en.yml (Zulu) 2021-06-30 17:36:10 +02:00
Sylvain
fa6e6ba460 New translations app.admin.en.yml (Portuguese) 2021-06-30 17:36:08 +02:00
Sylvain
d0502f6a72 New translations app.admin.en.yml (German) 2021-06-30 17:36:07 +02:00
Sylvain
ffaadf3521 New translations app.admin.en.yml (Spanish) 2021-06-30 17:36:06 +02:00
Sylvain
c47d3ebde6 New translations app.admin.en.yml (French) 2021-06-30 17:36:05 +02:00
Sylvain
b6f3fa399a fix norwegian locale + updated a translation 2021-06-30 17:24:01 +02:00
Sylvain
b72704b1aa New translations app.admin.en.yml (French) 2021-06-30 17:18:56 +02:00
Sylvain
9f408f0a46 norwegian language 2021-06-30 17:16:41 +02:00
Sylvain
b400dc3c3c New translations app.shared.en.yml (Norwegian) 2021-06-30 17:06:39 +02:00
Sylvain
c5125b3b78 New translations en.yml (Portuguese) 2021-06-30 17:06:37 +02:00
Sylvain
16bc1450cc New translations app.shared.en.yml (German) 2021-06-30 17:06:36 +02:00
Sylvain
d52800b043 New translations app.public.en.yml (German) 2021-06-30 17:06:35 +02:00
Sylvain
bf7456928b New translations app.logged.en.yml (German) 2021-06-30 17:06:34 +02:00
Sylvain
5f0880530c New translations app.admin.en.yml (German) 2021-06-30 17:06:33 +02:00
Sylvain
70fc584f31 New translations en.yml (German) 2021-06-30 17:06:31 +02:00
Sylvain
93aa183384 New translations app.admin.en.yml (Portuguese) 2021-06-30 17:06:30 +02:00
Sylvain
d69fc2fd4a New translations app.shared.en.yml (Spanish) 2021-06-30 17:06:28 +02:00
Sylvain
7b6225771e New translations app.logged.en.yml (Spanish) 2021-06-30 17:06:27 +02:00
Sylvain
c57425dfcc New translations app.admin.en.yml (Spanish) 2021-06-30 17:06:26 +02:00
Sylvain
da6e8f19d2 New translations en.yml (Spanish) 2021-06-30 17:06:24 +02:00
Sylvain
44d7222393 New translations app.shared.en.yml (French) 2021-06-30 17:06:23 +02:00
Sylvain
26a96b7b66 New translations app.public.en.yml (French) 2021-06-30 17:06:22 +02:00
Sylvain
503063b856 New translations app.logged.en.yml (French) 2021-06-30 17:06:21 +02:00
Sylvain
0cf4193def New translations app.admin.en.yml (French) 2021-06-30 17:06:20 +02:00
Sylvain
4abd13c587 New translations app.public.en.yml (Spanish) 2021-06-30 17:06:18 +02:00
Sylvain
b998bfbd56 New translations app.logged.en.yml (Portuguese) 2021-06-30 17:06:16 +02:00
Sylvain
d9dc6ee563 New translations app.shared.en.yml (Portuguese) 2021-06-30 17:06:15 +02:00
Sylvain
9cce907c7d New translations app.public.en.yml (Norwegian) 2021-06-30 17:06:14 +02:00
Sylvain
90077ece66 New translations app.logged.en.yml (Norwegian) 2021-06-30 17:06:13 +02:00
Sylvain
47d8e2e661 New translations app.admin.en.yml (Norwegian) 2021-06-30 17:06:12 +02:00
Sylvain
dea056f2b6 New translations en.yml (Norwegian) 2021-06-30 17:06:07 +02:00
Sylvain
23c7bd0d48 New translations app.public.en.yml (Zulu) 2021-06-30 17:06:06 +02:00
Sylvain
4f6809499f New translations app.logged.en.yml (Zulu) 2021-06-30 17:06:05 +02:00
Sylvain
d855a70654 New translations app.public.en.yml (Portuguese) 2021-06-30 17:06:04 +02:00
Sylvain
5573898920 New translations app.admin.en.yml (Zulu) 2021-06-30 17:06:03 +02:00
Sylvain
e5b9d23b54 New translations en.yml (Zulu) 2021-06-30 17:05:58 +02:00
Sylvain
b1c267e36a New translations app.shared.en.yml (Zulu) 2021-06-30 17:05:57 +02:00
Sylvain
979c2bc0ae New translations en.yml (French) 2021-06-30 17:05:55 +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
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
bbb1aca4fb display validity for each pack 2021-06-28 12:24:31 +02:00
Sylvain
f16cbc44ff WIP: buy pack modal 2021-06-25 17:24:34 +02:00
Sylvain
26f98f30f6 edit pack modal 2021-06-25 09:56:39 +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
b2d485d230 New translations app.admin.en.yml (Norwegian) 2021-06-23 15:22:03 +02:00
Sylvain
22a7e322be New translations app.admin.en.yml (Norwegian) 2021-06-23 15:04:40 +02:00
Sylvain
7470ff83d6 New translations app.admin.en.yml (Norwegian) 2021-06-23 14:55:46 +02:00
Sylvain
72f8a66bed New translations app.admin.en.yml (Norwegian) 2021-06-23 14:40:14 +02:00
Sylvain
9d9ffe80a0 New translations app.shared.en.yml (Norwegian) 2021-06-23 11:54:23 +02:00
Sylvain
e2f216d1e4 New translations app.public.en.yml (Norwegian) 2021-06-23 11:54:22 +02:00
Sylvain
5e6ae5edeb New translations app.logged.en.yml (Norwegian) 2021-06-23 11:54:22 +02:00
Sylvain
cd48a03bc9 New translations app.admin.en.yml (Norwegian) 2021-06-23 11:54:20 +02:00
Sylvain
184464dc46 New translations mails.en.yml (Norwegian) 2021-06-23 11:54:18 +02:00
Sylvain
ac59e098d1 New translations devise.en.yml (Norwegian) 2021-06-23 11:54:17 +02:00
Sylvain
dc49ed7745 New translations en.yml (Norwegian) 2021-06-23 11:54:16 +02:00
Sylvain
f81e0910c2 packs popover 2021-06-23 11:33:42 +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
2b0130c6be Merge branch 'dev' into prepaid 2021-06-21 11:36:31 +02:00
Sylvain
263b69dc8b [bug] deleting a coupon displays an error message 2021-06-18 17:40:06 +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
962f9bc26f WIP: pending training modal 2021-06-17 17:26:35 +02:00
Sylvain
4aa3fdff0e filter machines by status 2021-06-17 10:25:13 +02:00
Sylvain
565002a124 WIP: migrate machines list to react 2021-06-16 18:10:29 +02:00
Sylvain
3d3fec86f4 New translations app.admin.en.yml (German) 2021-06-16 15:08:36 +02:00
Sylvain
faa649894c New translations app.public.en.yml (German) 2021-06-16 15:08:33 +02:00
Sylvain
2e7654e6b9 New translations app.public.en.yml (French) 2021-06-16 15:08:29 +02:00
Sylvain
0ecf4191bb New translations app.admin.en.yml (French) 2021-06-16 15:08:27 +02:00
Sylvain
a4dbc01216 New translations app.public.en.yml (Portuguese) 2021-06-16 15:08:17 +02:00
Sylvain
518fac5ddf New translations app.admin.en.yml (Portuguese) 2021-06-16 15:08:16 +02:00
Sylvain
2213573480 New translations app.public.en.yml (Zulu) 2021-06-16 15:04:09 +02:00
Sylvain
dc8a4e22cd New translations app.admin.en.yml (Zulu) 2021-06-16 15:04:06 +02:00
Sylvain
ea0c2142ae New translations app.public.en.yml (Portuguese) 2021-06-16 15:04:03 +02:00
Sylvain
52eee3cea2 New translations app.admin.en.yml (Portuguese) 2021-06-16 15:04:02 +02:00
Sylvain
f60b77e0c5 New translations app.public.en.yml (German) 2021-06-16 15:04:01 +02:00
Sylvain
88163498b0 New translations app.admin.en.yml (German) 2021-06-16 15:03:59 +02:00
Sylvain
b9d6df1e82 New translations app.public.en.yml (Spanish) 2021-06-16 15:03:58 +02:00
Sylvain
d3bc55cba2 New translations app.admin.en.yml (Spanish) 2021-06-16 15:03:57 +02:00
Sylvain
c4ab921276 New translations app.public.en.yml (French) 2021-06-16 15:03:55 +02:00
Sylvain
a93477a5b9 New translations app.admin.en.yml (French) 2021-06-16 15:03:54 +02:00
Sylvain
f88e53708d [bug] invalid link to the user's manual 2021-06-16 14:58:32 +02:00
Sylvain
f3f6a61461 New translations app.shared.en.yml (French) 2021-06-16 14:07:34 +02:00
Sylvain
8826cef371 New translations en.yml (French) 2021-06-16 14:07:14 +02:00
Sylvain
a70474adc9 New translations app.admin.en.yml (French) 2021-06-15 12:02:03 +02:00
Sylvain
78ca1a07ec New translations app.admin.en.yml (German) 2021-06-15 11:58:49 +02:00
Sylvain
560f046c37 New translations en.yml (German) 2021-06-15 11:58:47 +02:00
Sylvain
3522c47c47 New translations en.yml (Spanish) 2021-06-15 11:58:43 +02:00
Sylvain
a40ab1474e New translations app.admin.en.yml (French) 2021-06-15 11:58:40 +02:00
Sylvain
0d36668234 New translations app.admin.en.yml (Spanish) 2021-06-15 11:58:38 +02:00
Sylvain
9d14d22fc4 New translations app.admin.en.yml (Zulu) 2021-06-15 11:58:34 +02:00
Sylvain
f22f87d6fa New translations en.yml (Portuguese) 2021-06-15 11:58:30 +02:00
Sylvain
5aec39e6b5 New translations en.yml (Zulu) 2021-06-15 11:58:29 +02:00
Sylvain
dd77dd5f94 New translations app.admin.en.yml (Portuguese) 2021-06-15 11:58:25 +02:00
Sylvain
999e366a23 New translations en.yml (French) 2021-06-15 11:58:23 +02:00
Sylvain
11579fede4 ability to disable the public agenda 2021-06-15 11:57:43 +02:00
Sylvain
d1568c6180 New translations app.admin.en.yml (German) 2021-06-15 09:30:04 +02:00
Sylvain
8c2a55840d New translations app.admin.en.yml (French) 2021-06-15 09:29:55 +02:00
Sylvain
12af582280 New translations app.admin.en.yml (Spanish) 2021-06-15 09:29:53 +02:00
Sylvain
7f823d6e93 New translations app.admin.en.yml (Portuguese) 2021-06-15 09:29:44 +02:00
Sylvain
2258d1f8cd New translations app.admin.en.yml (German) 2021-06-15 09:27:24 +02:00
Sylvain
ddb17b503b New translations app.admin.en.yml (French) 2021-06-15 09:27:15 +02:00
Sylvain
6b18ec9523 New translations app.admin.en.yml (Spanish) 2021-06-15 09:27:13 +02:00
Sylvain
8abf77aa54 New translations app.admin.en.yml (Zulu) 2021-06-15 09:27:09 +02:00
Sylvain
fd5f097dbf New translations app.admin.en.yml (Portuguese) 2021-06-15 09:27:00 +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
803b19b1d3 New translations app.admin.en.yml (German) 2021-06-11 14:33:54 +02:00
Sylvain
4e16e1f929 New translations app.admin.en.yml (French) 2021-06-11 14:33:48 +02:00
Sylvain
91e05dbe93 New translations app.admin.en.yml (Spanish) 2021-06-11 14:33:47 +02:00
Sylvain
b50524f4b5 New translations app.admin.en.yml (Portuguese) 2021-06-11 14:33:38 +02:00
Sylvain
c8ffd34f55 New translations app.admin.en.yml (German) 2021-06-11 14:31:46 +02:00
Sylvain
bc9041aaf3 New translations app.admin.en.yml (French) 2021-06-11 14:31:36 +02:00
Sylvain
3ed410142a New translations app.admin.en.yml (Spanish) 2021-06-11 14:31:35 +02:00
Sylvain
e49ed1a133 New translations app.admin.en.yml (Zulu) 2021-06-11 14:31:30 +02:00
Sylvain
61e6227de6 New translations app.admin.en.yml (Portuguese) 2021-06-11 14:31:21 +02:00
Sylvain
cfaeefdc39 New translations en.yml (French) 2021-06-11 14:31:19 +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
272dd74be6
Merge branch 'dev' into l10n_dev 2021-06-10 15:04:41 +02:00
Sylvain
74cd41b6a9 New translations en.yml (French) 2021-06-10 14:45:40 +02:00
Sylvain
8b76dbb15e New translations en.yml (French) 2021-06-10 14:44:04 +02:00
Sylvain
bb364d3d8a New translations app.public.en.yml (French) 2021-06-10 14:35:27 +02:00
Sylvain
feeb1d639d New translations en.yml (French) 2021-06-10 14:35:25 +02:00
Sylvain
9f129c2556 New translations app.admin.en.yml (German) 2021-06-10 14:29:54 +02:00
Sylvain
b3d723a977 New translations app.admin.en.yml (French) 2021-06-10 14:29:46 +02:00
Sylvain
9d062c0c66 New translations app.admin.en.yml (Spanish) 2021-06-10 14:29:45 +02:00
Sylvain
8da92a4250 New translations app.admin.en.yml (Zulu) 2021-06-10 14:29:40 +02:00
Sylvain
2870eba198 New translations app.admin.en.yml (Portuguese) 2021-06-10 14:29:31 +02:00
Sylvain
034d883889 remove unused translation 2021-06-10 14:28:55 +02:00
Sylvain
faa7f241e2 New translations app.public.en.yml (Zulu) 2021-06-10 14:08:25 +02:00
Sylvain
318126adb6 New translations app.admin.en.yml (Zulu) 2021-06-10 14:08:24 +02:00
Sylvain
0aec367680 New translations en.yml (Zulu) 2021-06-10 14:08:23 +02:00
Sylvain
70190d9bc7 New translations app.public.en.yml (Portuguese) 2021-06-10 14:08:22 +02:00
Sylvain
33070f263e New translations app.admin.en.yml (Portuguese) 2021-06-10 14:08:20 +02:00
Sylvain
d8c37f3be5 New translations en.yml (Portuguese) 2021-06-10 14:08:19 +02:00
Sylvain
54edc15b05 New translations app.public.en.yml (German) 2021-06-10 14:08:18 +02:00
Sylvain
65cc93a47a New translations app.admin.en.yml (German) 2021-06-10 14:08:17 +02:00
Sylvain
f55da5af83 New translations en.yml (German) 2021-06-10 14:08:16 +02:00
Sylvain
9d15e764d9 New translations app.public.en.yml (Spanish) 2021-06-10 14:08:15 +02:00
Sylvain
3d18167f40 New translations app.admin.en.yml (Spanish) 2021-06-10 14:08:14 +02:00
Sylvain
86d1f8dc2c New translations en.yml (Spanish) 2021-06-10 14:08:13 +02:00
Sylvain
8370bf888b New translations app.public.en.yml (French) 2021-06-10 14:08:12 +02:00
Sylvain
07c57093e2 New translations app.admin.en.yml (French) 2021-06-10 14:08:11 +02:00
Sylvain
29bc7a0f55 New translations en.yml (French) 2021-06-10 14:08: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
42dce8c431 New translations app.shared.en.yml (French) 2021-06-09 19:21:36 +02:00
Sylvain
8819d8d230 New translations app.admin.en.yml (French) 2021-06-09 19:21:34 +02:00
Sylvain
0480bf576c New translations app.admin.en.yml (French) 2021-06-09 18:59:10 +02:00
Sylvain
fb3feb4c21 New translations app.admin.en.yml (Zulu) 2021-06-09 16:57:08 +02:00
Sylvain
0377af7ba2 New translations app.shared.en.yml (Zulu) 2021-06-09 16:57:06 +02:00
Sylvain
d68a25dba1 New translations app.shared.en.yml (Portuguese) 2021-06-09 16:57:05 +02:00
Sylvain
43d5e7719d New translations app.admin.en.yml (Portuguese) 2021-06-09 16:57:04 +02:00
Sylvain
e9430b1498 New translations app.shared.en.yml (German) 2021-06-09 16:57:02 +02:00
Sylvain
0d9f87f5da New translations app.admin.en.yml (German) 2021-06-09 16:57:01 +02:00
Sylvain
e7e3053d74 New translations app.shared.en.yml (Spanish) 2021-06-09 16:56:59 +02:00
Sylvain
46b04e747d New translations app.admin.en.yml (Spanish) 2021-06-09 16:56:58 +02:00
Sylvain
855c92c463 New translations app.shared.en.yml (French) 2021-06-09 16:56:57 +02:00
Sylvain
209eaa70e2 New translations app.admin.en.yml (French) 2021-06-09 16:56: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
48721fe96e New translations en.yml (German) 2021-06-07 09:27:51 +02:00
Sylvain
a89fc18c3f New translations en.yml (Spanish) 2021-06-07 09:27:48 +02:00
Sylvain
01e2d1314e New translations en.yml (Portuguese) 2021-06-07 09:27:41 +02:00
Sylvain
545ebbe2e5 New translations en.yml (French) 2021-06-07 09:27:37 +02:00
Sylvain
1d27e2e134 New translations en.yml (German) 2021-06-07 09:22:07 +02:00
Sylvain
483c414f05 New translations en.yml (Spanish) 2021-06-07 09:22:03 +02:00
Sylvain
decf13a037 New translations en.yml (Portuguese) 2021-06-07 09:21:51 +02:00
Sylvain
b4d56034d4 New translations en.yml (Zulu) 2021-06-07 09:21:49 +02:00
Sylvain
8de9dce4f1 New translations en.yml (French) 2021-06-07 09:21:41 +02:00
Sylvain
6af425d272 fix Avoir mode by card 2021-06-07 09:18:11 +02:00
Sylvain
aaf5d20737
Merge branch 'dev' into l10n_dev 2021-06-04 19:20:51 +02:00
Sylvain
2977df88b7 New translations mails.en.yml (German) 2021-06-04 19:17:04 +02:00
Sylvain
8a89a9c170 New translations en.yml (German) 2021-06-04 19:17:03 +02:00
Sylvain
f049b769bf New translations app.shared.en.yml (Spanish) 2021-06-04 19:17:02 +02:00
Sylvain
1fd288d5b5 New translations app.shared.en.yml (German) 2021-06-04 19:16:55 +02:00
Sylvain
e1d0769739 New translations mails.en.yml (Portuguese) 2021-06-04 19:16:54 +02:00
Sylvain
a4bb4f37a2 New translations en.yml (Portuguese) 2021-06-04 19:16:50 +02:00
Sylvain
39ba64183e New translations app.shared.en.yml (Portuguese) 2021-06-04 19:16:48 +02:00
Sylvain
df4d00f26e New translations app.admin.en.yml (Portuguese) 2021-06-04 19:09:32 +02:00
Sylvain
b8f179aa19 New translations app.admin.en.yml (Spanish) 2021-06-04 19:09:31 +02:00
Sylvain
a3d0d30a71 New translations app.admin.en.yml (German) 2021-06-04 19:01:16 +02:00
Sylvain
9989246530 New translations app.admin.en.yml (German) 2021-06-04 18:59:56 +02:00
Sylvain
e948cd8689 New translations app.logged.en.yml (German) 2021-06-04 18:53:29 +02:00
Sylvain
65f15d286b New translations app.admin.en.yml (German) 2021-06-04 18:53:28 +02:00
Sylvain
c8066aebd9 New translations mails.en.yml (German) 2021-06-04 18:53:27 +02:00
Sylvain
dfd6bfb021 New translations en.yml (German) 2021-06-04 18:53:26 +02:00
Sylvain
ec1187a48d New translations app.shared.en.yml (Spanish) 2021-06-04 18:53:25 +02:00
Sylvain
59b3893562 New translations app.logged.en.yml (Spanish) 2021-06-04 18:53:22 +02:00
Sylvain
f50d836b05 New translations mails.en.yml (Spanish) 2021-06-04 18:53:21 +02:00
Sylvain
9cc17e92d3 New translations en.yml (Spanish) 2021-06-04 18:53:20 +02:00
Sylvain
4ba0dc4d72 New translations app.shared.en.yml (French) 2021-06-04 18:53:19 +02:00
Sylvain
fc21a53c32 New translations app.logged.en.yml (French) 2021-06-04 18:53:18 +02:00
Sylvain
3878eece8f New translations app.admin.en.yml (French) 2021-06-04 18:53:17 +02:00
Sylvain
ad87e695b5 New translations app.admin.en.yml (Spanish) 2021-06-04 18:53:16 +02:00
Sylvain
11e26ad5f9 New translations mails.en.yml (French) 2021-06-04 18:53:15 +02:00
Sylvain
5abe58b429 New translations app.shared.en.yml (German) 2021-06-04 18:53:14 +02:00
Sylvain
0738c20f3f New translations mails.en.yml (Portuguese) 2021-06-04 18:53:13 +02:00
Sylvain
ebb1b465ee New translations app.logged.en.yml (Zulu) 2021-06-04 18:53:12 +02:00
Sylvain
3ebc559f70 New translations app.admin.en.yml (Zulu) 2021-06-04 18:53:10 +02:00
Sylvain
fe3443b109 New translations mails.en.yml (Zulu) 2021-06-04 18:53:09 +02:00
Sylvain
fb22ecc59f New translations en.yml (Portuguese) 2021-06-04 18:53:06 +02:00
Sylvain
1824a763b8 New translations en.yml (Zulu) 2021-06-04 18:53:05 +02:00
Sylvain
18a93e2868 New translations app.shared.en.yml (Zulu) 2021-06-04 18:53:03 +02:00
Sylvain
dc0a017043 New translations app.shared.en.yml (Portuguese) 2021-06-04 18:53:02 +02:00
Sylvain
eead7b12f9 New translations app.logged.en.yml (Portuguese) 2021-06-04 18:53:00 +02:00
Sylvain
bf1a3b6b41 New translations app.admin.en.yml (Portuguese) 2021-06-04 18:52:59 +02:00
Sylvain
e7f9c6fd94 New translations en.yml (French) 2021-06-04 18:52:57 +02:00
Sylvain
68f64cfc5c update the card for payment schedules 2021-06-04 18:26:20 +02:00
Sylvain
dc0a75e52d verify each deadlines on payzen for payment schedules 2021-06-03 12:22:37 +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
b938232c19 Merge branch 'dev' into payzen 2021-05-25 14:06:30 +02:00
Sylvain
a654a501c9 New translations app.admin.en.yml (Spanish) 2021-05-25 10:06:55 +02:00
Sylvain
ff5dc421bf New translations app.admin.en.yml (German) 2021-05-25 09:54:51 +02:00
Sylvain
e95143583b New translations app.admin.en.yml (French) 2021-05-24 17:26:01 +02:00
Sylvain
718f2f904b New translations en.yml (French) 2021-05-24 17:25:59 +02:00
Sylvain
b6d432b68c Update source file en.yml 2021-05-24 17:02:51 +02:00
Sylvain
83c989ccc1 Update source file app.admin.en.yml 2021-05-24 17:02:50 +02:00
Sylvain
03f480e73e New translations app.admin.en.yml (Zulu) 2021-05-24 16:38:11 +02:00
Sylvain
17af3e99e1 New translations app.admin.en.yml (French) 2021-05-24 16:38:10 +02:00
Sylvain
7c4a865396 New translations en.yml (Spanish) 2021-05-24 16:38:06 +02:00
Sylvain
cb67c12f77 New translations app.admin.en.yml (Spanish) 2021-05-24 16:38:04 +02:00
Sylvain
c36a4531a0 New translations en.yml (German) 2021-05-24 16:38:01 +02:00
Sylvain
bba7421fca New translations app.admin.en.yml (German) 2021-05-24 16:37:59 +02:00
Sylvain
37e5b2feea New translations en.yml (Portuguese) 2021-05-24 16:37:55 +02:00
Sylvain
0aea4a051d New translations app.admin.en.yml (Portuguese) 2021-05-24 16:37:54 +02:00
Sylvain
fb1949a5f5 New translations en.yml (Zulu) 2021-05-24 16:37:50 +02:00
Sylvain
46dcf7766e New translations en.yml (French) 2021-05-24 16:37:46 +02:00
Sylvain
c00c6f05e1 Update source file en.yml 2021-05-24 16:37:33 +02:00
Sylvain
1b5c2e6c68 Update source file app.admin.en.yml 2021-05-24 16:37:32 +02:00
Sylvain
ecf80b0591 ability to set invoices as erroneous 2021-05-24 16:34:27 +02:00
Sylvain
da3eb4f8bd [bug] typo in allow/prevent booking overlapping slots 2021-05-21 17:18:22 +02:00
Sylvain
6d237a540f New translations app.admin.en.yml (French) 2021-05-20 15:24:14 +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
4826db7cf0 [bug] typo in allow/prevent booking overlapping slots 2021-05-18 10:52:59 +02:00
Sylvain
6bcd9f6fef Merge branch 'dev' into payzen 2021-05-17 15:07:41 +02:00
Sylvain
a57b170f65 New translations app.shared.en.yml (Spanish) 2021-05-17 12:41:40 +02:00
Sylvain
bb099cfbad New translations app.shared.en.yml (French) 2021-05-17 12:41:35 +02:00
Sylvain
ba5e86bcbe New translations app.shared.en.yml (German) 2021-05-17 12:41:29 +02:00
Sylvain
1e3774ae35 New translations app.shared.en.yml (Portuguese) 2021-05-17 12:41:18 +02:00
Sylvain
eaaf42ec48 New translations app.shared.en.yml (Zulu) 2021-05-14 17:34:46 +02:00
Sylvain
dd8b6950bb New translations app.shared.en.yml (French) 2021-05-14 17:34:42 +02:00
Sylvain
68b9104e37 New translations app.shared.en.yml (Spanish) 2021-05-14 17:34:36 +02:00
Sylvain
1b7025e916 New translations app.shared.en.yml (German) 2021-05-14 17:34:29 +02:00
Sylvain
b3ddc79cd8 New translations app.shared.en.yml (Portuguese) 2021-05-14 17:34:24 +02:00
Sylvain
82260d8c62 [bug] invalid currency in notifications for locales with region 2021-05-14 11:57:52 +02:00
Sylvain
7ac119d4cf [bug] invoices are not generated in test/development if the configured locale is composed 
Eg. If locale is fr-CA, it was crashing. If locale was only fr, is was working.
Now, composed locales print the watermark using the base locale and
hour_minute format is fetched from the base locale
 2021-05-12 17:23:42 +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
2a7a7fd614 [bug] the event themes are not kept when editing the event again 2021-05-12 14:54:56 +02:00
Sylvain
2c6b3aaa75 updated README 2021-04-30 16:14:05 +02:00
Sylvain
5f47624d4e WIP: create payment schedule w/ payzen 2021-04-29 17:10:02 +02:00
Sylvain
23e38238c8 fix payment on site modal in case of payment schedule 2021-04-28 17:25:42 +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
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
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
23032c405b WIP: create the formToken server-side 2021-04-09 17:17:58 +02:00
Sylvain
d70d0dcf7a stripe modal -> generic payment modal 2021-04-08 15:21:24 +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
63c81b82c1 Merge branch 'dev' into payzen 2021-04-06 15:03: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
ea6626c7cf New translations app.admin.en.yml (German) 2021-04-01 15:42:22 +02:00
Sylvain
30aa047807 New translations app.admin.en.yml (German) 2021-04-01 15:28:42 +02:00
Sylvain
54c1a3cfd9 payzen keys configuration form 2021-03-31 16:03:51 +02:00
Sylvain
0970844c35 New translations app.admin.en.yml (German) 2021-03-31 14:46:04 +02:00
Sylvain
fb7e128ae4 New translations app.admin.en.yml (French) 2021-03-31 14:45:54 +02:00
Sylvain
1e974f3b1b New translations app.admin.en.yml (Portuguese) 2021-03-31 14:45:35 +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
9943f7910e New translations app.admin.en.yml (Spanish) 2021-03-30 09:12:40 +02:00
Sylvain
d7607c8694 New translations app.admin.en.yml (French) 2021-03-30 09:12:36 +02:00
Sylvain
ff656c3ed2 New translations app.admin.en.yml (Portuguese) 2021-03-30 09:12:30 +02:00
Sylvain
f38ad1a99b New translations app.admin.en.yml (Zulu) 2021-03-30 09:12:26 +02:00
Sylvain
bfa29938e6 New translations app.admin.en.yml (German) 2021-03-30 09:12:23 +02:00
Sylvain
469229cc0a Merge branch 'dev' of github.com:sleede/fab-manager into dev 2021-03-30 09:07:59 +02:00
Sylvain
3b65840de2 New translations app.public.en.yml (French) 2021-03-30 09:06:35 +02:00
Sylvain
f337ae632c New translations app.admin.en.yml (French) 2021-03-30 09:06:33 +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
937ed72dc7 [bug] the view is not refreshed when deleting a recurring slot 2021-03-24 16:02:35 +01:00
Sylvain
5b854ea831 Merge branch 'dev' into payzen 2021-03-24 14:34:24 +01:00
Sylvain
1dcea8944b New translations app.admin.en.yml (French) 2021-03-24 10:09:10 +01:00
Sylvain
35440f4091 New translations app.public.en.yml (French) 2021-03-24 10:09:07 +01:00
Sylvain
8ecb73dfa7 New translations app.admin.en.yml (Spanish) 2021-03-24 10:09:01 +01:00
Sylvain
ef724cdc6e New translations app.public.en.yml (Spanish) 2021-03-24 10:08:59 +01:00
Sylvain
9b2a6a4b14 New translations app.public.en.yml (German) 2021-03-24 10:08:51 +01:00
Sylvain
0b6fd84de1 New translations app.admin.en.yml (Portuguese) 2021-03-24 10:08:45 +01:00
Sylvain
0276c32e06 New translations app.public.en.yml (Portuguese) 2021-03-24 10:08:43 +01:00
Sylvain
9821d8101d New translations app.admin.en.yml (Zulu) 2021-03-24 10:08:40 +01:00
Sylvain
0de4cb0ba3 New translations app.public.en.yml (Zulu) 2021-03-24 10:08:39 +01:00
Sylvain
53e703af27 New translations app.admin.en.yml (German) 2021-03-24 10:08:37 +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
18465ee8e9 select gateway modal 2021-03-10 16:46:18 +01:00
Sylvain
0717535194 New translations app.admin.en.yml (French) 2021-03-10 14:51:00 +01:00
Sylvain
62bc7beda2
Merge pull request #253 from sleede/l10n_dev 
New Crowdin updates
 2021-03-10 14:45:49 +01:00
Sylvain
dea886d2f4 New translations app.admin.en.yml (French) 2021-03-10 14:43:30 +01:00
Sylvain
947baa36f5 New translations app.admin.en.yml (Spanish) 2021-03-10 13:27:11 +01:00
Sylvain
7c4cc7aa98 New translations app.admin.en.yml (French) 2021-03-10 13:27:06 +01:00
Sylvain
978a439998 New translations app.admin.en.yml (Portuguese) 2021-03-10 13:26:58 +01:00
Sylvain
aeabb9f6f4 New translations app.admin.en.yml (Zulu) 2021-03-10 13:26:54 +01:00
Sylvain
33a09973bc New translations app.admin.en.yml (German) 2021-03-10 13:26:52 +01:00
Sylvain
9d747db095 Ability to disable the trainings module 2021-03-10 13:25:53 +01:00
Sylvain
cd19e0c7aa New translations mails.en.yml (French) 2021-03-10 12:52:08 +01:00
Sylvain
ea54a41239 New translations mails.en.yml (Spanish) 2021-03-09 17:38:03 +01:00
Sylvain
88c6e0881c New translations mails.en.yml (German) 2021-03-09 17:37:57 +01:00
Sylvain
1d0d045638 New translations mails.en.yml (Portuguese) 2021-03-09 17:37:53 +01:00
Sylvain
06089144f5 New translations mails.en.yml (Zulu) 2021-03-09 17:37:49 +01:00
Sylvain
1f8b75e611 New translations mails.en.yml (French) 2021-03-09 17:37:47 +01:00
Sylvain
8bc040ae8b show group in email notif on account creation 2021-03-09 11:34:39 +01:00
Sylvain
61453b64b6 New translations app.shared.en.yml (French) 2021-03-08 15:37:25 +01:00
Sylvain
f60ca77706 New translations app.logged.en.yml (French) 2021-03-08 15:37:22 +01:00
Sylvain
285cc6a0c8 New translations app.logged.en.yml (Zulu) 2021-03-08 15:33:18 +01:00
Sylvain
ab9303c6c0 New translations app.shared.en.yml (Spanish) 2021-03-08 15:33:14 +01:00
Sylvain
583a281d83 New translations app.logged.en.yml (Spanish) 2021-03-08 15:33:11 +01:00
Sylvain
048c3e7296 New translations app.shared.en.yml (French) 2021-03-08 15:33:06 +01:00
Sylvain
7d32003f75 New translations app.logged.en.yml (French) 2021-03-08 15:33:04 +01:00
Sylvain
f42566967a New translations app.logged.en.yml (German) 2021-03-08 15:32:59 +01:00
Sylvain
f2e8c6e032 New translations app.shared.en.yml (German) 2021-03-08 15:32:58 +01:00
Sylvain
77f039e0f7 New translations app.shared.en.yml (Zulu) 2021-03-08 15:32:55 +01:00
Sylvain
2154fce13b New translations app.logged.en.yml (Portuguese) 2021-03-08 15:32:48 +01:00
Sylvain
41afe49475 New translations app.shared.en.yml (Portuguese) 2021-03-08 15:32:42 +01:00
Sylvain
5527512b05 Show remaining training credits in the dashboard 2021-03-08 15:17:58 +01:00
Sylvain
a74c5d4c95 WIP: plan description 2021-03-03 17:21:11 +01:00
Sylvain
ca9ff11fd4 [security] fix possible sql injection 2021-02-24 11:03:41 +01:00
Sylvain
919c62ce6f
Merge pull request #247 from sleede/l10n_dev 
New Crowdin updates
 2021-02-23 11:59:50 +01:00
Sylvain
7f43b56b77 restored rails.de.yml 2021-02-23 11:59:00 +01:00
Sylvain
9525b07c26 New translations app.shared.en.yml (French) 2021-02-23 11:54:20 +01:00
Sylvain
d6c43e140b New translations app.shared.en.yml (Spanish) 2021-02-23 11:44:56 +01:00
Sylvain
8f59383844 New translations app.shared.en.yml (French) 2021-02-23 11:44:50 +01:00
Sylvain
a399178b75 New translations app.shared.en.yml (German) 2021-02-23 11:44:44 +01:00
Sylvain
72269d1217 New translations app.shared.en.yml (Zulu) 2021-02-23 11:44:41 +01:00
Sylvain
015c2de00b New translations app.shared.en.yml (Portuguese) 2021-02-23 11:44:32 +01:00
Sylvain
592bf7302d fix translation 2021-02-23 11:43:35 +01:00
Sylvain
f41568db5f New translations app.shared.en.yml (Portuguese) 2021-02-23 11:32:52 +01:00
Sylvain
c5d3c7a1a9 New translations app.shared.en.yml (German) 2021-02-23 11:32:51 +01:00
Sylvain
7ec878c084 New translations app.admin.en.yml (German) 2021-02-23 11:26:53 +01:00
Sylvain
41f6395d9f New translations app.admin.en.yml (Spanish) 2021-02-23 11:26:51 +01:00
Sylvain
091952e253 New translations app.shared.en.yml (German) 2021-02-23 11:26:42 +01:00
Sylvain
1110466375 New translations app.admin.en.yml (Portuguese) 2021-02-23 11:26:33 +01:00
Sylvain
45c024cee7 New translations app.shared.en.yml (Portuguese) 2021-02-23 11:26:30 +01:00
Sylvain
5465ddc972 New translations app.shared.en.yml (French) 2021-02-23 11:11:45 +01:00
Sylvain
921e327c3b New translations app.public.en.yml (German) 2021-02-23 11:11:35 +01:00
Sylvain
5eccf5d49e
Merge branch 'dev' into l10n_dev 2021-02-23 11:11:08 +01:00
Sylvain
987f1d6599 New translations app.shared.en.yml (Spanish) 2021-02-23 11:09:53 +01:00
Sylvain
30e2d578b7 New translations app.admin.en.yml (German) 2021-02-23 11:09:50 +01:00
Sylvain
20efe79fba New translations app.admin.en.yml (Portuguese) 2021-02-23 11:09:44 +01:00
Sylvain
69fbc11399 New translations app.public.en.yml (Portuguese) 2021-02-23 11:09:42 +01:00
Sylvain
83e6e18191 New translations app.shared.en.yml (Portuguese) 2021-02-23 11:09:40 +01:00
Sylvain
5ce443dfe6 New translations app.admin.en.yml (German) 2021-02-23 11:01:26 +01:00
Sylvain
a994840a5a New translations mails.en.yml (German) 2021-02-23 11:01:24 +01:00
Sylvain
0aed67420f New translations en.yml (German) 2021-02-23 11:01:21 +01:00
Sylvain
682d9e3d12 New translations mails.en.yml (French) 2021-02-23 11:01:17 +01:00
Sylvain
abca59d285 New translations app.admin.en.yml (Spanish) 2021-02-23 11:01:13 +01:00
Sylvain
00a731de18 New translations en.yml (Spanish) 2021-02-23 11:01:08 +01:00
Sylvain
360df0e2fb New translations app.logged.en.yml (French) 2021-02-23 11:01:05 +01:00
Sylvain
e332b9c2af New translations app.admin.en.yml (French) 2021-02-23 11:01:04 +01:00
Sylvain
d65d9cd1ac New translations mails.en.yml (Spanish) 2021-02-23 11:01:01 +01:00
Sylvain
86ab07cd00 New translations app.shared.en.yml (Zulu) 2021-02-23 11:00:55 +01:00
Sylvain
13203558c6 New translations mails.en.yml (Zulu) 2021-02-23 11:00:51 +01:00
Sylvain
5957654e0b New translations en.yml (Zulu) 2021-02-23 11:00:48 +01:00
Sylvain
9b5dfd8515 New translations app.shared.en.yml (Portuguese) 2021-02-23 11:00:46 +01:00
Sylvain
444d407411 New translations app.shared.en.yml (Spanish) 2021-02-23 10:45:16 +01:00
Sylvain
aeeea93cb2 New translations app.shared.en.yml (French) 2021-02-23 10:45:15 +01:00
Sylvain
8879ffd20a New translations app.public.en.yml (Zulu) 2021-02-23 10:45:13 +01:00
Sylvain
7a6d20ac4e New translations app.public.en.yml (Portuguese) 2021-02-23 10:45:12 +01:00
Sylvain
bb112d76d1 New translations app.admin.en.yml (Portuguese) 2021-02-23 10:45:12 +01:00
Sylvain
b5d81e609c New translations app.admin.en.yml (Zulu) 2021-02-23 10:45:11 +01:00
Sylvain
52be2b9fd5 New translations mails.en.yml (Portuguese) 2021-02-23 10:45:10 +01:00
Sylvain
10ef7897f3 New translations en.yml (Portuguese) 2021-02-23 10:45:08 +01:00
Sylvain
94579943cc New translations app.public.en.yml (German) 2021-02-23 10:45:06 +01:00
Sylvain
924e79c7a2 New translations rails.en.yml (German) 2021-02-23 10:45:05 +01:00
Sylvain
f9c891662d New translations app.shared.en.yml (German) 2021-02-23 10:45:03 +01:00
Sylvain
d99f75e664 New translations app.public.en.yml (Spanish) 2021-02-23 10:45:03 +01:00
Sylvain
4e1d6ece34 New translations app.public.en.yml (French) 2021-02-23 10:45:01 +01:00
Sylvain
66aa7354a5 New translations app.logged.en.yml (Zulu) 2021-02-23 10:45:00 +01:00
Sylvain
85bb08fd17 New translations app.logged.en.yml (Portuguese) 2021-02-23 10:44:58 +01:00
Sylvain
7f6b30702c New translations app.logged.en.yml (German) 2021-02-23 10:44:55 +01:00
Sylvain
0ed6e54418 New translations app.logged.en.yml (Spanish) 2021-02-23 10:44:54 +01:00
Sylvain
fea82f6325 New translations en.yml (French) 2021-02-23 10:44:53 +01:00
Sylvain
b9dc16c0c2 Merge branch 'monthly-payment' into dev 2021-02-23 09:26:11 +01:00
Sylvain
c9cea041dd updated links to user's guide 2021-02-22 19:26:38 +01:00
Sylvain
56200188a6 fix mail sending in staging envs 2021-02-22 12:00:04 +01:00
Sylvain
fa686187cd admin can subscribe in member/edit w/ schedule 2021-02-10 15:43:53 +01:00
Sylvain
2921d099dc New translations app.admin.en.yml (French) 2021-02-10 15:03:36 +01:00
Sylvain
2827104f16 more explicit message about renew subscription w/ schedule 2021-02-10 13:37:23 +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
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
e4d82070da [bug] unable to configure the app to use a german locale 2021-02-08 16:17:40 +01:00
Sylvain
0e7226c85c handle stripe requires_action 2021-02-08 15:28:47 +01:00
Sylvain
38ac55c35f [bug] no notifications for refunds generated on wallet credit 2021-02-08 13:50:49 +01:00
Sylvain
76ebb3ccb4 run the PaymentScheduleItemWorker more ofter and tell the users that they ahev only 24h to fix the payment 2021-02-08 10:05:54 +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
eddf23622d Merge branch 'dev' into monthly-payment 2021-02-02 17:17:15 +01:00
Sylvain
c9ef4fa9de New translations en.yml (French) 2021-02-02 16:46:32 +01:00
Sylvain
44ef51aaf0 New translations en.yml (French) 2021-02-01 17:58:54 +01:00
Sylvain
1177d9f0d2 New translations en.yml (Spanish) 2021-02-01 17:58:52 +01:00
Sylvain
c87341ddf2 New translations en.yml (German) 2021-02-01 17:58:50 +01:00
Sylvain
bef2cabfc6 New translations en.yml (Portuguese) 2021-02-01 17:58:48 +01:00
Sylvain
82cbc398be New translations en.yml (Zulu) 2021-02-01 17:58:46 +01:00
Sylvain
30e9f6febf OpenAPI endpoints to create/update/show/delete machines 2021-02-01 17:43:15 +01:00
Sylvain
ed2315d717 add german locales for rails 2021-02-01 11:53:32 +01:00
Sylvain
2c9e21ff7b Merge branch 'dev' of github.com:sleede/fab-manager into dev 2021-02-01 11:27:26 +01:00
Sylvain
48d383fffd New translations app.public.en.yml (German) 2021-01-27 19:50:37 +01:00
Sylvain
0f294ef57b New translations app.admin.en.yml (German) 2021-01-27 19:50:35 +01:00
Sylvain
4a6aa6ae32 New translations app.public.en.yml (German) 2021-01-27 19:32:55 +01:00
Sylvain
d7b567b61c New translations app.admin.en.yml (German) 2021-01-27 19:32:53 +01:00
Sylvain
c500f47202 New translations app.public.en.yml (German) 2021-01-27 19:22:46 +01:00
Sylvain
ac95f816a8 New translations app.public.en.yml (German) 2021-01-27 19:10:51 +01:00
Sylvain
14818b373f New translations app.public.en.yml (German) 2021-01-27 18:50:38 +01:00
Sylvain
332f9c1f87 New translations app.public.en.yml (German) 2021-01-27 18:40:07 +01:00
Sylvain
090aee43dd New translations app.public.en.yml (German) 2021-01-27 18:34:33 +01:00
Sylvain
dbbf84d2a6 New translations app.public.en.yml (German) 2021-01-27 18:16:28 +01:00
Sylvain
05fecc649d New translations app.public.en.yml (German) 2021-01-27 18:11:07 +01:00
Sylvain
2b69f1d6b0 New translations app.public.en.yml (German) 2021-01-27 18:04:09 +01:00
Sylvain
c55982b8de New translations app.logged.en.yml (German) 2021-01-27 18:04:07 +01:00
Sylvain
08d67273ac New translations app.logged.en.yml (German) 2021-01-27 17:38:24 +01:00
Sylvain
163976b988 WIP: error handling for card payments on later deadlines 2021-01-27 17:24:10 +01:00
Sylvain
1a93aadda0 en translations for payment schedules management interface 2021-01-27 14:02:39 +01:00
Sylvain
8d08100166 WIP: schedules management inerface 2021-01-27 13:59:41 +01:00
Sylvain
a0533bc313 New translations app.logged.en.yml (German) 2021-01-26 20:08:06 +01:00
Sylvain
db13676bbf New translations app.admin.en.yml (German) 2021-01-26 19:58:13 +01:00
Sylvain
af2a439411 New translations app.admin.en.yml (German) 2021-01-26 19:34:22 +01:00
Sylvain
8cdc4d67a3 New translations app.admin.en.yml (German) 2021-01-26 19:26:02 +01:00
Sylvain
51b227bf44 New translations app.admin.en.yml (German) 2021-01-26 19:09:41 +01:00
Sylvain
665bacc95e New translations app.admin.en.yml (German) 2021-01-26 18:55:57 +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
3b102d1a11 New translations app.admin.en.yml (German) 2021-01-25 20:56:40 +01:00
Sylvain
53004168f0 New translations app.admin.en.yml (German) 2021-01-25 20:29:27 +01:00
Sylvain
0b7d4ffe8a New translations app.admin.en.yml (German) 2021-01-25 20:17:33 +01:00
Sylvain
f898aa5177 New translations app.admin.en.yml (German) 2021-01-25 20:06:41 +01:00
Sylvain
116bde860c New translations app.admin.en.yml (German) 2021-01-25 19:59:47 +01:00
Sylvain
95b3875b42 New translations app.admin.en.yml (German) 2021-01-25 19:39:19 +01:00
Sylvain
3e2792f07a New translations app.admin.en.yml (German) 2021-01-25 19:31:08 +01:00
Sylvain
1e2c8312be New translations app.admin.en.yml (German) 2021-01-25 19:02:46 +01:00
Sylvain
811b3cbad7 New translations app.admin.en.yml (German) 2021-01-25 18:53:20 +01:00
Sylvain
ea4910ae88 New translations app.admin.en.yml (German) 2021-01-25 18:41:59 +01:00
Sylvain
0a91f86ee9 New translations app.admin.en.yml (German) 2021-01-25 18:28:03 +01:00
Sylvain
a2304cedbf New translations app.admin.en.yml (German) 2021-01-25 18:22:43 +01:00
Sylvain
d78752f3cb New translations app.admin.en.yml (German) 2021-01-25 18:14:07 +01:00
Sylvain
3856f45bd0 New translations app.admin.en.yml (German) 2021-01-25 18:04:58 +01:00
Sylvain
def0778a4d basic inteface to retrieve payment schedules 2021-01-25 17:42:30 +01:00
Sylvain
01a0612a4b fix create invoice for each due date 2021-01-25 14:37:07 +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
28f7947244 New translations app.admin.en.yml (German) 2021-01-24 18:39:40 +01:00
Sylvain
8264d872e9 New translations app.admin.en.yml (German) 2021-01-24 18:28:13 +01:00
Sylvain
5c58578949 New translations app.admin.en.yml (German) 2021-01-24 18:18:34 +01:00
Sylvain
47c94046ae New translations app.admin.en.yml (German) 2021-01-24 18:08:40 +01:00
Sylvain
aaec309751 New translations app.admin.en.yml (German) 2021-01-24 17:58:58 +01:00
Sylvain
ae124dbee0 New translations app.admin.en.yml (German) 2021-01-24 17:47:59 +01:00
Sylvain
ce25f228b5 New translations app.admin.en.yml (German) 2021-01-24 17:38:33 +01:00
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