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

1761 Commits

Author SHA1 Message Date
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