rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00
Code Issues Releases Activity
8,084 Commits 15 Branches 273 Tags 82 MiB
staging
Commit Graph

3549 Commits

Author SHA1 Message Date
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
Du Peng
e8228ce48f (bug) event cannot update nb of free places 2023-07-12 12:26:49 +02:00
Du Peng
25d8b25808 (feat) add reservation status registered 2023-07-12 11:23:00 +02:00
Du Peng
b6f2187d94 (feat) add child age will be 18 worker 2023-07-12 09:29:16 +02:00
Du Peng
03d71d7a84 (feat) hide child birthday > 18 years ago 2023-07-12 08:44:02 +02:00
Du Peng
67f5e68fd7 (feat) user cannot reserve 2 times for event family 2023-07-11 19:13:38 +02:00
Du Peng
9dc85ee80b (bug) cannot create event 2023-07-11 16:07:37 +02:00
Du Peng
e43d4918e1 (feat) show present status for pre registration evnet if amount == 0 2023-07-11 15:42:46 +02:00
Du Peng
61fbb37fb2 (feat) add invalidate pre registration notification 2023-07-11 14:57:38 +02:00
Du Peng
8b4150a888 (feat) show age of child in event reservation 2023-07-11 14:17:03 +02:00
Du Peng
8771eb8ccc (feat) admin can confirm the prensence of pre-registration event 2023-07-11 13:53:41 +02:00
Du Peng
d271fa59e6 (feat) valid/invalid pre registration event 2023-07-11 10:36:44 +02:00
Du Peng
1ff61c9380 (bug) unable to confirm payment of store for admin 2023-07-10 13:49:39 +02:00
Du Peng
b0a204dd1d (feat) Improved performance when marking all notifications as read 2023-07-07 16:17:34 +02:00
Du Peng
9bc146d037 (bug) unable to create plan with plan limitation 2023-07-07 09:15:14 +02:00
Du Peng
d7d996bc6d (feat) Ability to show all availabilities in calender for admin 2023-07-07 09:15:13 +02:00
Vincent
a8dedfe040 (ui) Add radio buttons for event validation 2023-07-06 11:24:50 +02:00
Du Peng
bd6e4fe0ab (bug) unable to update Store Order sub type in statistics 2023-07-06 10:15:05 +02:00
Du Peng
ab5497dcc6 (bug) unable to show project step image in markdown file 2023-07-04 17:01:05 +02:00
Du Peng
168d804eb9 (bug) variable is not defined 2023-07-04 17:01:04 +02:00
Vincent
ead7e79f01 (ui) Fix projects filters font-weight 2023-07-04 16:57:41 +02:00
Vincent
9cc6a8a552 (ui) Events dashboard layout 2023-07-04 15:05:47 +02:00
Du Peng
e15bbf0b15 (feat) re-make event reservation item view 2023-07-04 15:05:46 +02:00
Du Peng
524404e7fa (feat) some improvements for family account 2023-07-04 15:05:45 +02:00
Du Peng
ab35fdf976 (feat) new pre registration mail and notification 2023-07-04 15:05:44 +02:00
Du Peng
2a57a7e505 (feat) add success info after reservation is paid 2023-07-04 15:05:43 +02:00
Du Peng
83ced44741 (bug) cannot save pre registration end date is empty 2023-07-04 15:05:42 +02:00
Du Peng
26cf72a846 (feat) pre-register event for family compte and nominatif 2023-07-04 15:05:41 +02:00
Du Peng
a60e587187 (feat) admin can confirm the payment of pre-registration reservation 2023-07-04 15:05:40 +02:00
Du Peng
172f09661f (wip) admin confirm payment of reservation pre-registration 2023-07-04 15:05:39 +02:00
Du Peng
0f9a5ff8af (feat) validate pre-registration reservation 2023-07-04 15:05:36 +02:00
Du Peng
94e839f647 (feat) pre-book a event 2023-07-04 15:02:40 +02:00
Du Peng
219e7f5913 (wip) add pre-registration to event 2023-07-04 15:02:36 +02:00
Du Peng
b7bcce75f3 (bug) hide member and child select if admin dont select a member before reserve event 2023-07-04 15:01:25 +02:00
Du Peng
26f1c939cd (feat) edit/delete child in members list 2023-07-04 15:01:24 +02:00
Vincent
050ae9be67 (ui) fix gap 2023-07-04 15:01:22 +02:00
Vincent
e392cc1803 (ui) restor deleted table's style 2023-07-04 15:01:21 +02:00
Vincent
d4b2b16425 (ui) integration 2023-07-04 15:01:20 +02:00
Du Peng
f64e76a463 (bug) child validated_at type 2023-07-04 15:01:19 +02:00
Du Peng
e7bac208a7 (feat) child's supporting document file created/updated notification 2023-07-04 15:01:18 +02:00
Du Peng
78d8b3bfe6 (feat) show event reservation booking users in events of member dashbaord 2023-07-04 15:01:17 +02:00
Du Peng
d729ded4d5 (feat) add birthday alert for event reservation 2023-07-04 15:01:16 +02:00
Du Peng
3de8d664e1 (bug) child birthday < 18 years ago 2023-07-04 15:01:15 +02:00
Du Peng
426c74c46f (feat) filter child in member list 2023-07-04 15:01:14 +02:00
Du Peng
387fc3ffb3 (feat) confirmation required for delete child 2023-07-04 15:01:13 +02:00
Du Peng
f6883ea43e (feat) show event booking users in member edit page 2023-07-04 15:01:12 +02:00
Du Peng
b577cd1ae2 (feat) child compte validation notification 2023-07-04 15:01:11 +02:00
Du Peng
562dfcb010 (feat) new child notification 2023-07-04 15:01:10 +02:00
Du Peng
d08e4ff9cd (feat) admin can refuse child's supporting document file 2023-07-04 15:01:09 +02:00
Du Peng
ec1a736601 (feat) child validation 2023-07-04 15:01:06 +02:00
Du Peng
3d542ce6d4 (feat) add supporting document for child 2023-07-04 14:59:42 +02:00
Du Peng
e935b23631 (wip) family account css 2023-07-04 14:59:02 +02:00
Du Peng
04795ba629 (wip) show event reservation users 2023-07-04 14:59:01 +02:00
Du Peng
e85e2d7b47 (wip) pay family and nominative event 2023-07-04 14:59:00 +02:00
Du Peng
07b47d7956 (wip) add event type 2023-07-04 14:58:58 +02:00
Du Peng
177748169a (wip) save booking user for event nominatif 2023-07-04 14:58:21 +02:00
Du Peng
9373f50706 (wip) event reservation naminative 2023-07-04 14:57:42 +02:00
Du Peng
39178b5d96 (wip) create/update user children 2023-07-04 14:56:34 +02:00
Du Peng
5365cbdaba (wip) add/edit user children 2023-07-04 14:56:33 +02:00
Du Peng
7d10132953 (feat) add Family account setting 2023-07-04 14:56:29 +02:00
Peng
bc320693cf Merge branch 'dev' into 'projects-improvements' 
# Conflicts:
#   Gemfile.lock
 2023-07-03 16:13:21 +00:00
Peng
6ed79fe215 Merge branch 'navbar-my-orders-link' into 'dev' 
displays "my orders" link only if store module is active

See merge request projets/fab-manager!11
 2023-07-03 15:44:58 +00:00
Du Peng
e50c90b30d (bug) Accouning Line in duplicate 2023-07-03 17:43:27 +02:00
Nicolas Florentin
b3970da1c4 displays "my orders" link only if store module is active 2023-07-03 16:31:45 +02:00
Nicolas Florentin
b8fd8d8172 Merge remote-tracking branch 'origin/projects-to-markdown' into projects-improvements 2023-07-03 14:37:57 +02:00
Nicolas Florentin
a3a5527141 Merge branch 'project-categories' into projects-improvements 2023-07-03 14:32:35 +02:00
Nicolas Florentin
bc284e7813 filter projects by date 2023-07-03 11:42:29 +02:00
Nicolas Florentin
94b0b062bc fix 2023-07-03 07:57:54 +02:00
Nicolas Florentin
af69ba67df wip 2023-06-30 11:26:26 +02:00
Nicolas Florentin
50ed3c9ed2 projects to markdown in zip 2023-06-30 11:15:37 +02:00
Nicolas Florentin
82823dd4cc download project to markdown file 2023-06-29 16:37:16 +02:00
Nicolas Florentin
97c652f785 filter projects list by member 2023-06-29 14:32:06 +02:00
Nicolas Florentin
8217bb1a59 adds project categories 2023-06-29 08:47:42 +02:00
Du Peng
11a079b3e2 (bug) unable to refresh machine/space/training calender after pay an reservation 2023-06-22 11:59:52 +02:00
Du Peng
75259773d5 (bug) check object = nil 2023-06-19 21:01:01 +02:00
Du Peng
4fdbd4fcf1 (bug) unable to modify the price of prepaid pack 2023-06-08 10:50:00 +02:00
Du Peng
6c5b4d9595 (bug) OpenAPI accounting gateway_object_id missing error 2023-06-02 18:33:07 +02:00
Du Peng
2756502131 (bug) invalid duration for machine/spaces reservations in statistics, when using slots of not 1 hour 2023-05-04 14:15:14 +02:00
Du Peng
6bb74bbc6a (quality) error message for event reservation 2023-05-02 18:07:21 +02:00
Du Peng
acbe748157 (bug) unable to show calendar 2023-05-02 18:05:42 +02:00
Du Peng
47370723a8 (bug) unable to show calendar for Firefox and Safari 2023-05-02 05:49:45 -04:00
Du Peng
5bc34971d1 (bug) unable to show calendar 2023-04-25 15:11:46 +02:00
Du Peng
b588f1c780 (bug) broken notifications email 2023-04-24 19:17:07 +02:00
Du Peng
57683125a8 (bug) window end time < window start time 2023-04-21 19:28:33 +02:00
Du Peng
112df59c96 (bug) date shift in event creation/update 2023-04-21 19:27:32 +02:00
Du Peng
e39c5638b8 (quality) payzen order status 2023-04-18 10:07:30 +02:00
Du Peng
acc081a413 (bug) logout error in payment_schedules page 2023-04-17 12:20:36 +02:00
Du Peng
b4250b2ce6 (bug) abus notification error 2023-04-17 11:31:01 +02:00
Sylvain
f33a0d7657 (bug) broken notifications 2023-04-05 11:31:38 +02:00
Du Peng
60793815ce (bug) unable to show order_paid_html notification 2023-04-05 11:07:47 +02:00
Sylvain
ef732f759b (i18n) updated italian translations 2023-04-05 10:50:06 +02:00
Sylvain
6b98f21300 (bug) list supporting documents types for a deleted group 2023-04-05 09:59:22 +02:00
Sylvain
758827f231 (bug) notification is broken when updating payzen currency 2023-04-05 09:48:28 +02:00
Sylvain
bb717336e6 (feat) reporting ruby exceptions in the UI 2023-04-05 09:47:38 +02:00
Sylvain
5b14a9a4a7 (feat) error message on payzen misconfigured currency 2023-04-05 09:46:00 +02:00
Sylvain
7e36d49035 (bug) unable to bulk_update settings 2023-04-04 17:40:53 +02:00
Sylvain
68bee8c3e3 (bug) broken admin notifications if an order has been paid 2023-04-04 15:41:24 +02:00
Sylvain
4506038401 (merge) Merge branch 'v6' into dev 2023-04-03 11:10:57 +02:00
Sylvain
674d0ce939 (bug) by default, invoices should be ordered by date descending 2023-04-03 10:22:40 +02:00
Sylvain
a25a31b95c (bug) invoice with esoteric ref pattern 2023-03-31 17:21:33 +02:00
Sylvain
e9205775ce (bug) find_by_number should consider the number period 
Also: added progress indicators
 2023-03-31 15:09:24 +02:00
Sylvain
2e406aba7f (bug) reload config on change 2023-03-31 11:33:50 +02:00
Sylvain
48d0957bac (bug) updating the current provider must be reflected in yml 2023-03-30 17:17:02 +02:00
Sylvain
3811e7a6d5 (api) availabilities 2023-03-30 13:22:36 +02:00
Sylvain
1f618d29f7 (bug) meta_data does not exists 
Also: improved writing auth provider config to file
 2023-03-30 10:51:18 +02:00
Sylvain
0c3780a3f6 (bug) use directly object-to-formdata-tz 
instead of overriting object-to-formdata, which result in a yarn conflict:
["object-to-formdata-tz@4.4.3"] is trying to unpack in the same destination "[...]/node_modules/object-to-formdata"
 2023-03-30 10:36:14 +02:00
Sylvain
68aad57b14 (bug) unable to read provider config if no file 2023-03-30 10:28:31 +02:00
Sylvain
05aaa885a1 (feat) do no notify on filling-invoice creation 2023-03-30 09:54:59 +02:00
Sylvain
66f740104a (feat) cache auth provider config 2023-03-29 18:01:16 +02:00
Sylvain
8f0dfe7514 (bug) unable to fetch members list 2023-03-28 14:01:05 +02:00
Sylvain
ffd7de0bcb (security) upgrade to rails 7 2023-03-28 12:44:00 +02:00
Sylvain
3cff0d4c28 (feat) generate invoices for missing references 2023-03-28 11:18:27 +02:00
Du Peng
f04b93baec (bug) unable to update recurring event 2023-03-27 12:44:55 +02:00
Sylvain
227c6d1844 (bug) associate order/payment-schedule with invoice before saving 
Also: timezone in fixtures
 2023-03-27 11:43:36 +02:00
Sylvain
f9123fe20f (feat) recover order numbers 2023-03-24 17:21:44 +01:00
Sylvain
71a9a87315 (feat) improved chaining system 2023-03-24 10:16:21 +01:00
Sylvain
5295cc94ef (feat) task to fix missing references 2023-03-23 09:33:43 +01:00
Sylvain
cc830d7deb (security) updated ruby to 3.1.3 2023-03-22 16:05:25 +01:00
Sylvain
f6a9a43767 (bug) broken display after a plan category was deleted 2023-03-22 11:03:20 +01:00
Sylvain
01df96dc20 (security) upgrade to rails 6 2023-03-22 10:58:22 +01:00
Sylvain
cfd9f193a9 (bug) logical sequence of invoices references 2023-03-21 15:11:08 +01:00
Sylvain
1e0ece6c89 (quality) typo in comments 2023-03-20 16:14:57 +01:00
Sylvain
7ceb03ef8a (bug) unable to export to excel 2023-03-20 16:14:57 +01:00
Sylvain
779dd070b7 (bug) undefined local variable or method 'reservation_deadline' 
(quality) linted code
 2023-03-20 11:44:04 +01:00
Sylvain
c4fa240091 (bug) unable to set machine visibility to null 2023-03-20 11:42:01 +01:00
Sylvain
9409de4fa0
Merge pull request #445 from Guichaguri/fix/event-date-timezone 
(Bug) Fix event date being changed to a day before from the browser timezone
 2023-03-20 10:49:29 +01:00
Sylvain
a24fe8cd71 Merge branch 'feature/each-reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/each-reservation-deadlines 2023-03-20 10:19:29 +01:00
Sylvain
98e58cbc25 (bug) fix invalid invoice reference 2023-03-20 10:13:42 +01:00
Vincent
abc5fa6691 (ui) Add label for user profil form gender field 2023-03-17 18:36:25 +01:00
Guilherme Chaguri
4f8af521d9 (Bug) Fix date input offsetting by the frontend timezone 2023-03-17 10:05:58 -03:00
Sylvain
940ee06e58 (feat) display validation before payment 2023-03-16 12:25:27 +01:00
Sylvain
328529809d (bug) plan visibility is not applied 
(bug) plan limit error message
(quality) improved error message
(ui) plan visibility cannot be under 7
 2023-03-16 12:02:08 +01:00
Guilherme Chaguri
27a946b7d3 Fix syntax error 2023-03-15 16:48:13 -03:00
Guilherme Chaguri
855df4b552 Fix merge conflicts with dev 2023-03-15 16:26:45 -03:00
Sylvain
6089e636e4 (feat) limit machine visibility per plan 2023-03-15 14:17:06 +01:00
Sylvain
7ad1f8da3f (quality) delete a plan limitation 2023-03-15 10:19:39 +01:00
Sylvain
25cbf63b48 (feat) notify member on limit reached 2023-03-14 16:45:01 +01:00
Sylvain
8a32c029d3 (feat) machine limit override category limit 2023-03-14 12:35:58 +01:00
Sylvain
0ac99e3b6b (quality) improved error message 2023-03-14 11:54:41 +01:00
Sylvain
8504864c20 (feat) limit reservation depending on current suscription 2023-03-14 11:15:40 +01:00
Sylvain
c3d6206dba (quality) typed CartItem::Reservation 2023-03-13 14:19:52 +01:00
Sylvain
2316cc5b1e (feat) destroy a limitation 2023-03-13 14:19:51 +01:00
Sylvain
2b3b123a02 (ui) improved limitation add/edit/destroy 2023-03-13 14:19:50 +01:00
Sylvain
6abea03182 (feat) update limitations 2023-03-13 14:19:50 +01:00
Sylvain
622a14909a (feat) save new limitations 2023-03-13 14:19:49 +01:00
Sylvain
dad3babbe4 (ui) add alert on leaving plan form with unsaved changes 2023-03-13 14:19:48 +01:00
Sylvain
2b8a7008bd (quality) use a single component for unsaved list 2023-03-13 14:19:47 +01:00
Sylvain
0f142680b8 (wip) configure usage limits for plans 2023-03-13 14:19:46 +01:00
Sylvain
65afcbe2a9 (quality) use EditDestroyButtons in product list 2023-03-13 14:19:45 +01:00
Sylvain
3f1f267e42 (bug) unable to select a new machine for an existing category 2023-03-13 14:19:41 +01:00
Sylvain
ffe6e59681 (test) fix running test 
Also: (quality) updated browserbd on caniuse
(ui) improved help text
 2023-03-13 14:18:48 +01:00
vincent
38aec6b1fd (ui) Fix responsive 2023-03-13 14:18:48 +01:00
vincent
c964ec8a6d (ui) Plan limit form and modal 2023-03-13 14:18:47 +01:00
vincent
9294bc4c88 (ui) Plan form layout 2023-03-13 14:18:46 +01:00
Sylvain
c2739f73a7 (bug) unable to select a new machine for an existing category 2023-03-13 12:11:56 +01:00
Sylvain
cd612f4c77 (bug) URL validation regex was wrong 2023-03-13 11:10:36 +01:00
Sylvain
ccd3899ebc (bug) store: admins cant order free carts for themselves 2023-03-13 10:28:26 +01:00
Sylvain
9b4c47d733 (feat) usage history of prepaid packs 2023-03-09 13:23:42 +01:00
Sylvain
ed3353ce7c (bug) wrong minutes used when booking with a prepaid pack 2023-03-09 10:41:52 +01:00
Sylvain
f4d0df04c0 (api) users: invoicing_profile_id 2023-03-08 09:43:12 +01:00
Sylvain
8ef114ed43 (api) filter reservations by date 2023-03-06 16:35:50 +01:00
Sylvain
92d3cbcd3e (bug) invalid style in accounting codes settings 2023-03-06 13:13:22 +01:00
Sylvain
dbd88f9889 (bug) empty advanced accounting code 2023-03-06 13:05:33 +01:00
Sylvain
782b4bfa0f (bug) unable to reserve an event 2023-03-03 16:37:14 +01:00
Sylvain
ec7a367114 (feat) messages if the user cannot buy prepaid packs 2023-03-03 11:56:13 +01:00
Sylvain
0c3463a2ec (api) required pagination + new data 2023-03-03 10:09:07 +01:00
Sylvain
5e186ebf14 (api) events: category,themes,age_range,url 2023-03-02 17:42:10 +01:00
Sylvain
00583a25ff (bug) unable to add OIDC scopes without discovery 2023-03-02 17:14:39 +01:00
Sylvain
18447f8371 (test) OIDC testing 2023-03-02 17:13:46 +01:00
Sylvain
6ae8c965f3 (quality) add unique constraints in db 
Also: code lint in SSO models
 2023-03-02 13:26:05 +01:00
Sylvain
66a55b62d9 (bug) do not crash if stripe does not answer 2023-03-02 11:53:09 +01:00
Sylvain
1cfcf0a8b5 (bug) prevent selecting same price category twice 2023-03-02 11:35:35 +01:00
Sylvain
df725c6dbf (bug) admin events view defaults to the list tab 2023-03-02 09:45:13 +01:00
Sylvain
06c66d896b (bug) members can't change/cancel their reservations 2023-03-02 09:27:06 +01:00
Guilherme Chaguri
1aa9b2fe39 Added reservation deadlines for each type of reservation 2023-03-01 17:44:01 -03:00
Sylvain
4dd7b1345f (bug) members can change/cancel their reservations 2023-02-24 15:24:09 +01:00
Sylvain
ee2cbc332f (bug) invalid border color for slots 2023-02-24 15:16:57 +01:00
Sylvain
6d9b4b2c70 (bug) unable to update recurrent events 2023-02-24 14:03:31 +01:00
Sylvain
ef78e4a473 (bug) ignored timezone in opening/closing time 2023-02-20 17:12:38 +01:00
Sylvain
733fd9840c (bug) unable to export store orders 2023-02-20 15:37:51 +01:00
Sylvain
adcb6812aa (bug) maximum must be a nonnegative Integer 2023-02-20 15:00:35 +01:00
Sylvain
874b9b3ed9 (feat) Check SCSS syntax before saving home page style 2023-02-17 16:56:17 +01:00
Sylvain
7f53abfbf9 (bug) members cannot update their cards for payment schedules 2023-02-17 16:07:18 +01:00
Sylvain
8740c4971d (bug) cannot cancel a subscription after offering free days 2023-02-17 15:35:06 +01:00
Sylvain
6c53b01741 (test) update an availability 2023-02-17 13:34:34 +01:00
Sylvain
6bca75e79a (feat) notify admin when supporting document was udpated 
Previously, if the user's account was validated, the notification was not sent.
Now, we send the notification in every cases
 2023-02-17 13:26:58 +01:00
Sylvain
b4e2f3b549 (bug) undefined method privileged for nilClass 2023-02-17 13:01:30 +01:00
Sylvain
56120f886a (bug) filter already assign machines from new category modal 2023-02-17 12:18:48 +01:00
Sylvain
67d06b5da0 (quality) filter machines from the API 2023-02-17 12:06:32 +01:00
Sylvain
142eceb661 (quality) replace DateTime by Time 2023-02-17 11:45:07 +01:00
Vincent
a5eba1db11 (bug) Fix member date of birth input 2023-02-17 10:46:37 +01:00