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

3539 Commits

Author SHA1 Message Date
Nicolas Florentin
08b4127331 updates sidekiq and sidekiq-scheduler, fix a bug: wrong locale was causing wrong currency in cron jobs, now we manually set the currency locale in number_to_currency 2023-11-14 10:36:12 +01:00
Vincent
931032b086 (ui) Replace original image by large generated version 2023-11-10 15:59:21 +01:00
Nicolas Florentin
bdf94c6826 (feat) when deleting an event, all reservations are canceled 2023-11-10 09:13:23 +01:00
Vincent
dfea3f744d (ui) Small fix on modals 2023-11-08 11:14:10 +01:00
Nicolas Florentin
f15af0292b Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2023-11-08 10:49:27 +01:00
Nicolas Florentin
519dbefd2f (fix) statistic_subtype.label of plan was nil 2023-11-08 10:36:40 +01:00
Du Peng
8fa9567eae (bug) unable to show wallet payment mean for avoir 2023-11-07 09:34:02 +01:00
Nicolas Florentin
ce90bbf186 improvement: dynamic label (i18n) for stats structure tables 2023-11-03 12:56:13 +01:00
Nicolas Florentin
046cc1b05b rm dead code 2023-11-03 10:21:16 +01:00
Du Peng
b70d095e37 (bug) unable to load api reservations/user_trainings 2023-10-30 11:05:54 +01:00
Nicolas Florentin
910bdcb080 (fix) api/products/index bug when sorting by amount 2023-10-30 10:45:52 +01:00
Du Peng
2b9cb8ca96 (feat) change the param delted_user to including_deleted_users 2023-10-30 08:52:49 +01:00
Du Peng
614abec39e (feat) add deleted_user param for open api users 2023-10-30 08:08:35 +01:00
Du Peng
0803eb0833 (bug) pre-registration event reservations ilimit places 2023-10-26 14:35:18 +02:00
Nicolas Florentin
3ee63d4613 do not log Notifications#polling action anymore, by default, can be enable via env variable ENABLE_NOTIFICATIONS_POLLING_LOGGING=true 2023-10-20 08:58:33 +02:00
Nicolas Florentin
ddadfca9ff (fix) machine list bug : when there is no user logged in and access machines list with at least one machine associated to a space 2023-10-13 15:30:46 +02:00
Nicolas Florentin
1068aff9cc Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2023-10-13 15:20:24 +02:00
Vincent
7fcad292d9 (ui) Remove px unit on email images 2023-10-13 10:38:59 +02:00
Vincent
1290874811 (ui) update the layout of detailed views + image format tooltip 2023-10-12 17:09:38 +02:00
Du Peng
2c7a37f770 (bug) unable to save OpenID extra_authorize_params as json 2023-10-12 14:14:13 +02:00
Nicolas Florentin
62a8094e68 (fix) members tour (help), a selector was not valid anymore 2023-10-12 14:12:44 +02:00
Nicolas Florentin
8833fe593a (fix) fix back button on space edit page 2023-10-12 13:58:00 +02:00
Nicolas Florentin
637ced05dc Fix a bug: admin could not create new SupportingDocumentType (problem was on js side) 2023-10-10 11:14:47 +02:00
Nicolas Florentin
7365a56e51 Fix a bug: fix ReservationReminderWorker, was sending reservation reminder to users with a event reservation not validated by admin + adds tests for all scenarios 2023-10-05 13:49:29 +02:00
Nicolas Florentin
3d2169634c Fix a bug: when getting status of users/subscriptions export 2023-10-02 15:14:23 +02:00
Nicolas Florentin
1220e0e8fe Fix a bug: when calling .to_json on an "avoir", there was a bug because order_number delegates on invoice which can be nil, it was causing errors in notifications rendering 2023-09-29 15:26:36 +02:00
Nicolas Florentin
b35acdffaf Fix a bug: minor pb (exception raised) when a bot or unauthenticated user hit api/auth_providers actions 2023-09-29 14:40:59 +02:00
Nicolas Florentin
64620a2759 Fix a bug: minor pb when bot hit api/projects#search without beeing authenticated 2023-09-29 14:31:23 +02:00
Nicolas Florentin
d95e2ac56c improvement : performance of members#show and reservations#index 2023-09-28 15:57:30 +02:00
Nicolas Florentin
d197f16cd9 adds tests for public availabilities 2023-09-28 10:00:37 +02:00
Nicolas Florentin
b11bb11968 Fix a bug: rss/projects was failing with project without image 2023-09-28 08:49:36 +02:00
Nicolas Florentin
7cbf75c37f Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2023-09-27 15:41:12 +02:00
Nicolas Florentin
73f30de587 Fix a bug: public availabilities (no user) was buggy (server error) 2023-09-27 15:39:00 +02:00
Nicolas Florentin
fe1b555990 Fix a bug: unable to sync projects with openprojects 2023-09-27 15:36:19 +02:00
Vincent
13ff17cdea (ui) Fix projects grid button 2023-09-27 15:36:00 +02:00
Du Peng
fc1689cf2e (bug) unable to generate stats 2023-09-27 12:39:04 +02:00
Du Peng
3bf30cf3a4 (i18n) update translates 2023-09-25 12:57:24 +02:00
Du Peng
84a9e42161 Merge branch 'family_compte_pre_inscription' into dev 2023-09-25 12:09:45 +02:00
Du Peng
801ca4f8b2 (bug) pre registration end date dont set empty if pre registration is false 2023-09-21 18:40:01 +02:00
Du Peng
e9e0749bdb (bug) unbale to update card bank of payment schedule 2023-09-20 18:13:30 +02:00
Du Peng
eb4c89cd68 (bug) unbale to export projects 2023-09-19 14:41:06 +02:00
Du Peng
bed4a93585 (bug) user is_allow_contact is actived by default 2023-09-19 14:18:40 +02:00
Du Peng
f346c4bb1f (bug) unable to update card for payment schedule 2023-09-18 11:59:40 +02:00
Du Peng
ca8d3b1939 (bug) unable to show prepaid packs in member's reservations page 2023-09-14 15:32:41 +02:00
Nicolas Florentin
ba8a8e5f1b admin can see reservations of a member 2023-09-14 09:13:40 +02:00
Du Peng
b70bc7661d (bug) cannot re-book event after cancel latest reservation 2023-09-13 15:59:53 +02:00
Du Peng
0e599bf9bb (bug) cancel payment schedule subscription after update the payment mean 2023-09-13 14:36:37 +02:00
Du Peng
0d4d0ec801 (bug) Polymorphic joins for table supporting_document_files supportable 2023-09-11 18:04:02 +02:00
Du Peng
12b1ff5f0e Merge branch 'pre_inscription' into family_compte_pre_inscription 2023-09-11 17:59:14 +02:00
Du Peng
00a53281a6 Merge branch 'stats-improvements' into dev 2023-09-11 15:53:01 +02:00
Du Peng
33d81c6c36 (feat) add a notification to remind users to upload their supporting documents 2023-09-11 15:52:05 +02:00
Nicolas Florentin
35c72cc5ce fix comment 2023-09-11 14:21:51 +02:00
Du Peng
fb2b762015 Merge branch 'spaces-machines-tree' into dev 2023-09-11 09:54:08 +02:00
Nicolas Florentin
a1938201ca fix NotificationsController#polling failing request 2023-09-11 09:07:27 +02:00
Du Peng
e4bd077907 (feat) Add extra_authorize_params to OpenIdConnect config 2023-09-07 16:22:57 +02:00
Nicolas Florentin
a72c2e580c improves api/notification controller to avoid failing when there is a notification with wrong notification_type in db 2023-09-07 10:30:48 +02:00
Du Peng
ccfa7aeb39 (bug) unable to generate stat for reservation no invoice 2023-09-06 16:34:18 +02:00
Vincent
dd2fcbd352 (ui) Remove liste style on statistics table 2023-09-06 15:52:05 +02:00
Nicolas Florentin
b458f03e43 add a notification to remind users to upload their supporting documents 2023-09-05 11:15:12 +02:00
Du Peng
45959b1fa4 (bug) unable to update user profile by admin 2023-09-04 11:48:58 +02:00
Du Peng
f3b5e2b240 (bug) fix notification list is shown in notification settings page 2023-09-01 15:18:29 +02:00
Nicolas Florentin
7925040d33 manager can configure his notifications 2023-09-01 14:39:53 +02:00
Du Peng
a10f3cffe4 (feat) statistics improvements 2023-09-01 12:43:36 +02:00
Du Peng
d70501e066 (merge) Merge remote-tracking branch 'origin/members-filter-not-validated' into dev 2023-09-01 09:43:59 +02:00
Du Peng
ad89e4f278 (bug) user cant book event after has reservation canceled 2023-08-31 17:11:18 +02:00
Du Peng
37aa4fb2ff (feat) add is_confirm to slots_reservations 2023-08-31 16:10:43 +02:00
Du Peng
a5c73b64c7 (bug) unable to generate statistic 2023-08-30 18:51:09 +02:00
Nicolas Florentin
fcfa4f018b Feature: add a filter in members list (admin) to show only "not validated" members 2023-08-30 11:56:24 +02:00
Vincent
0f7f32f256 (ui) change editorial-block cta target 2023-08-29 16:22:53 +02:00
Nicolas Florentin
ffaeb7e5c8 Fix a bug: for project categories, if there is no category : do not show categories panel in show view, do not show categories input field in edit view 2023-08-29 08:29:30 +02:00
Du Peng
be69befb6b (feat) add adds coupon in statistic export 2023-08-24 18:31:16 +02:00
Du Peng
581e08ea1e (bug) missing reservation context in statistic global export 2023-08-24 18:00:15 +02:00
Nicolas Florentin
bdc5729141 (feat) space associate machines 2023-08-24 14:41:29 +02:00
Du Peng
6b183969c7 Merge branch 'reservation-context' into dev 2023-08-24 10:37:53 +02:00
Vincent
9000c97aaf (ui) Fix link 2023-08-22 19:10:08 +02:00
Du Peng
14f404dfb6 (bug) unable to cancel a payment schedule 2023-08-21 18:24:56 +02:00
Du Peng
7187e53835 (bug) unable to show projects next page button 2023-08-11 11:26:09 +02:00
Du Peng
cfe2cbdda1 (bug) 403 error when manager edit an event 2023-08-01 10:47:56 +02:00
Du Peng
65a6a80670 (feat) add submiting to save event form 2023-07-31 15:10:46 +02:00
Du Peng
2a2c451d6e (bug) admin valid/pay event reservaiton error 2023-07-31 10:18:15 +02:00
Du Peng
cc46103eca (bug) family event nb free place error 2023-07-28 16:25:39 +02:00
Du Peng
4f26f52d85 (feat) hide child supporting document if dont any type of supporting document 2023-07-28 14:28:54 +02:00
Vincent
3139430761 (ui) Fix select dropdown z-index 2023-07-28 10:35:36 +02:00
Du Peng
c9f17309f9 (bug) child validited cannot reserve event 2023-07-27 17:54:34 +02:00
Du Peng
5a23b8d5e5 (bug) unable to remove supporting document type 2023-07-27 17:47:22 +02:00
Du Peng
ea83265b87 (bug) child cannot be updated 2023-07-27 17:34:54 +02:00
Du Peng
af57e59ccd (bug) event canceled places error 2023-07-26 16:10:05 +02:00
Du Peng
8a3110cd0f (feat) add not valid status for event reservaiton 2023-07-26 15:48:14 +02:00
Du Peng
d5fa71e113 (bug) event pre-registration status 2023-07-25 18:53:12 +02:00
Du Peng
768b5d7e0e (bug) cannot create slot 2023-07-24 18:13:34 +02:00
Du Peng
5e46d8c45e (bug) event reserved places compute error 2023-07-24 14:08:12 +02:00
Vincent
06d917f7d3 (i18n) Update user profil form 2023-07-21 15:07:29 +02:00
Nicolas Florentin
f466826e8b Fix a bug: hide project categories filter if there is no project categories, Improvement : dialog confirm to remove a project category 2023-07-21 10:21:08 +02:00
Nicolas Florentin
043ff6d47e wip 2023-07-20 16:55:22 +02:00
Vincent
a4d6723413 (ui) Fix machines padding 2023-07-20 09:35:58 +02:00
Du Peng
2ceb4f1119 (bug) incorrect date range in statistics 2023-07-18 11:56:51 -04:00
Du Peng
e4b996654b (bug) event reserved places compute error 2023-07-13 15:04:57 +02:00
Du Peng
aa6aab48b2 (feat) admin cannot validate pre-registration > nb total places 2023-07-12 15:07:14 +02:00
Du Peng
a2a970cba4 (bug) cannot show event reservation success info 2023-07-12 14:46:30 +02:00
Du Peng
3b5e087b7a (feat) family compte setting in panel 2023-07-12 12:47:35 +02:00