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

1792 Commits

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