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

714 Commits

Author SHA1 Message Date
Du Peng
d7d996bc6d (feat) Ability to show all availabilities in calender for admin 2023-07-07 09:15:13 +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
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
0f9a5ff8af (feat) validate pre-registration reservation 2023-07-04 15:05:36 +02:00
Du Peng
e7bac208a7 (feat) child's supporting document file created/updated notification 2023-07-04 15:01:18 +02:00
Du Peng
426c74c46f (feat) filter child in member list 2023-07-04 15:01:14 +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
3d542ce6d4 (feat) add supporting document for child 2023-07-04 14:59:42 +02:00
Du Peng
177748169a (wip) save booking user for event nominatif 2023-07-04 14:58:21 +02:00
Peng
bc320693cf Merge branch 'dev' into 'projects-improvements'
# Conflicts:
#   Gemfile.lock
2023-07-03 16:13:21 +00:00
Du Peng
e50c90b30d (bug) Accouning Line in duplicate 2023-07-03 17:43:27 +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
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
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
112df59c96 (bug) date shift in event creation/update 2023-04-21 19:27:32 +02:00
Sylvain
6b98f21300 (bug) list supporting documents types for a deleted group 2023-04-05 09:59:22 +02:00
Sylvain
4506038401 (merge) Merge branch 'v6' into dev 2023-04-03 11:10:57 +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
1f618d29f7 (bug) meta_data does not exists
Also: improved writing auth provider config to file
2023-03-30 10:51:18 +02:00
Sylvain
05aaa885a1 (feat) do no notify on filling-invoice creation 2023-03-30 09:54:59 +02:00
Sylvain
8f0dfe7514 (bug) unable to fetch members list 2023-03-28 14:01:05 +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
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
7ceb03ef8a (bug) unable to export to excel 2023-03-20 16:14:57 +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
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
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
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
c2739f73a7 (bug) unable to select a new machine for an existing category 2023-03-13 12:11:56 +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
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
Guilherme Chaguri
1aa9b2fe39 Added reservation deadlines for each type of reservation 2023-03-01 17:44:01 -03: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
874b9b3ed9 (feat) Check SCSS syntax before saving home page style 2023-02-17 16:56:17 +01:00
Sylvain
8740c4971d (bug) cannot cancel a subscription after offering free days 2023-02-17 15:35:06 +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
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
Sylvain
8669cc82da (bug) admin should see locked availabilities 2023-02-16 16:53:52 +01:00
Sylvain
ed072184bf (feat) notify_admin_order_is_paid 2023-02-16 11:22:42 +01:00
Sylvain
892ffbe138 (quality) rename proof-of-identity to supporting-document 2023-02-15 10:30:13 +01:00
Sylvain
979042078d (quality) rename proof-of-identity to supporting-documents in notifications 2023-02-15 10:30:13 +01:00
Karen
9b69aad9df (feat) backend for notifications preference system 2023-02-15 10:30:07 +01:00
Karen
54dbd5ef4d (quality) replacement of the gem NotifyWith by internal code 2023-02-15 10:30:07 +01:00
Sylvain
23ba44bc57 (bug) auto cancel trainings
- Wrong trainings sessions was cancelled (in the past instead of in the futur)
- Notifications about auto refunds was incorrect
2023-02-15 10:30:01 +01:00
Sylvain
e5b199f8ed (quality) improved calendar loading time 2023-02-15 10:29:57 +01:00
Sylvain
ed6a397b89 (test) test places cache 2023-02-15 10:29:56 +01:00
Sylvain
fea26285d6 (feat) improved calendars loading time
+ (feat) ability to choose a machine in the public calendar
2023-02-15 10:29:55 +01:00
Sylvain
d0239a0e25 (wip) move slot status request 2023-02-15 10:29:55 +01:00
Sylvain
986a663c40 (feat) places cache for slots 2023-02-15 10:29:54 +01:00
Sylvain
9f9a2e616f (feat) slots/availabilities status for pending reservations 2023-02-15 10:29:54 +01:00
Sylvain
473aedbdcb (feat) add reservations in cart/order 2023-02-15 10:29:53 +01:00
Sylvain
c24673fefa (quality) log errors to the JS console 2023-02-15 10:29:52 +01:00
Sylvain
bbaac2c122 (wip) use cartitem from order api 2023-02-15 10:29:51 +01:00
Sylvain
bfe0936b40 (feat) save both operator/customer for orders 2023-02-15 10:29:50 +01:00
Sylvain
48a44ff4f3 (feat) create cart items from the api 2023-02-15 10:29:50 +01:00
Sylvain
42d830b4f8 (feat) save cart items in db 2023-02-15 10:29:46 +01:00
Sylvain
6fa12d3996 (test) training default settings 2023-02-15 10:28:17 +01:00
Sylvain
2b42858229 (feat) display special style if a training override general settings 2023-02-15 10:28:16 +01:00
Sylvain
ddc2dd4c6e (feat) training auto cancel authorization and invalidation rule 2023-02-15 10:28:07 +01:00
Sylvain
78cb8b7854 (quality) isolate auto cancel features in separate service 2023-02-15 10:28:07 +01:00
Sylvain
a05ef1f0ba (feat) auto refund after trainings cancelled and notify 2023-02-15 10:28:05 +01:00
Sylvain
71305bbc8f (wip) notify admin on auto cancel 2023-02-15 10:28:04 +01:00
Sylvain
c804c84113 (feat) per training settings for auto cancel 2023-02-15 10:28:04 +01:00
Sylvain
e2edbb419a (feat) auto cancel trainings under the threshold 2023-02-15 10:28:04 +01:00
Karen
d80cc4769a (feat) filter for status in project gallery 2023-02-15 10:27:49 +01:00
Sylvain
4c4ebe3b47 (feat) report status of user's prepaid packs in dashboard 2023-02-15 10:27:08 +01:00
Sylvain
eba0c99ae5 (bug) date shift in event creation/update 2023-02-14 16:47:06 +01:00
Sylvain
04f933f94d (bug) deal with DST using Time instead of DateTime 2023-02-14 13:10:58 +01:00
Du Peng
e5eb24a9dc (bug) change event date with wrong timezone 2023-02-13 11:39:36 +01:00