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

159 Commits

Author SHA1 Message Date
Sylvain
840c536c75 Ability to configure data sources for preventing booking on overlapping slots 2021-10-22 14:50:02 +02:00
Sylvain
e9740ebf69 validate birth date must be in the past 2021-10-20 17:31:30 +02:00
Sylvain
17a0baac7e refactored free subscription extending 2021-10-12 14:07:35 +02:00
Sylvain
d1c7a9c446 add missing tr key 2021-07-01 09:19:00 +02:00
Sylvain
6c326c7209 compute price according to prepaid hours
Also: handle prepaid hours decreasing when used
2021-06-30 10:53:05 +02:00
Sylvain
1aad4891c1 buy prepaid-pack a hours from modal 2021-06-28 18:17:11 +02:00
Sylvain
11579fede4 ability to disable the public agenda 2021-06-15 11:57:43 +02:00
Sylvain
a416f8c7ae transactional bulk update + better error handling while configuring the payment gateway 2021-06-10 10:39:42 +02:00
Sylvain
6af425d272 fix Avoir mode by card 2021-06-07 09:18:11 +02:00
Sylvain
68f64cfc5c update the card for payment schedules 2021-06-04 18:26:20 +02:00
Sylvain
87cd41794e WIP: payzen subscription
TODO: retreive the payzen subscription from PayZen::Item
2021-06-02 20:07:53 +02:00
Sylvain
b938232c19 Merge branch 'dev' into payzen 2021-05-25 14:06:30 +02:00
Sylvain
ecf80b0591 ability to set invoices as erroneous 2021-05-24 16:34:27 +02:00
Sylvain
26dfbef5e1 WIP: refactor models to use payment_gateway_objects 2021-04-21 17:38:06 +02:00
Sylvain
eddf23622d Merge branch 'dev' into monthly-payment 2021-02-02 17:17:15 +01:00
Sylvain
30e9f6febf OpenAPI endpoints to create/update/show/delete machines 2021-02-01 17:43:15 +01:00
Sylvain
26636254bd generate the invoices for each schedule item and notify if something goes wrong 2021-01-25 13:05:27 +01:00
Sylvain
e5439901d6 fix generate payment schedule pdf + send by mail
TODO: total amount does not match with sum of all lines
- generate invoices for each PS-item
- interface to access the payment schedules
2021-01-19 16:47:51 +01:00
Sylvain
12e99f4c9c generate payment schedule pdf 2021-01-04 18:12:44 +01:00
Sylvain
190e815f73 [bug] unable to export subscriptions 2020-07-22 12:33:35 +02:00
Sylvain
e5cef6e6bf [bug] unable to export reservations 2020-07-21 17:25:19 +02:00
Sylvain
dbda82ac9b notify after members sync on stripe 2020-06-09 15:06:46 +02:00
Sylvain
a5e1b77ce4 check the file content with mimemagic for project CAD files 2020-06-03 12:28:04 +02:00
Sylvain
1a38a8750b updated carrierware + validate file upload in front 2020-06-02 17:57:24 +02:00
Sylvain
6cc6bba7ce refactored app to gather spaces module status from the settings 2020-05-26 13:59:40 +02:00
Sylvain
7e1edef8a0 [bug] when an admin logs on the subscription page, his view is broken
Also: Prevent admins from leaving their dedicated group
2020-05-13 08:37:49 +02:00
Sylvain
2d8df2c1cd Ability to promote a user to a higher role (member > manager > admin) 2020-05-05 11:28:04 +02:00
Sylvain
3917d6042c [bug] no statistics for subscriptions (#196)
+ [bug] issing translation for subscriptions statistics > duration
2020-04-01 17:25:55 +02:00
Sylvain
f4e8150a22 fixes translation string 2020-03-11 15:57:12 +01:00
Sylvain
bb752f1218 refactor translations to work with crowdin pull requests 2020-03-09 11:47:18 +01:00
Sylvain
f34b87c597 harmonized translations 2020-03-02 15:29:19 +01:00
Sylvain
1a7d7258d8 [bug] in some cases, bogus admin notification on profile completed 2020-03-02 10:20:10 +01:00
Sylvain
6aa3c0caeb Notify all admins on the creation of a refund invoice 2019-12-09 11:55:31 +01:00
Sylvain
510c802ab1 messages variations depending on slot duration 2019-12-09 10:27:50 +01:00
Sylvain
a60a39ff9e [ongoing] create multiple availabilities according to UI 2019-11-13 12:13:22 +01:00
Sylvain
1ed3eba129 [feature] export last connection date to members.xlsx 2019-10-29 11:09:17 +01:00
Sylvain
e8930924e4 [bug] do not display each days in invoices for multiple days event reservation 2019-10-16 16:11:37 +02:00
Sylvain
4deaf1f75a [ongoing] import members from csv 2019-09-25 16:37:42 +02:00
Sylvain
c76563f22f wallet label in accounting export 2019-09-19 11:25:12 +02:00
Sylvain
3348539fdf export labels: user name + reference + summary, only on client line. Also: handling new export parameters (decimal separator, label length, export zeros) 2019-09-17 12:35:34 +02:00
Sylvain
26c98394ac fixed export service 2019-08-01 09:49:09 +02:00
Sylvain
fa6a54a422 export notifications 2019-07-31 12:37:31 +02:00
Sylvain
d0cd5a90d2 handle deleted users in notifications 2019-06-12 15:49:35 +02:00
Sylvain
162a56250a notify users after privacy policy update + hide undefined content 2019-04-25 11:40:26 +02:00
Sylvain
43ff06c35d fixed and improved translations 2019-04-18 11:35:09 +02:00
Sylvain
c786ba6edb notify user about archiving 2019-04-04 11:37:23 +02:00
Sylvain
8a6ff0c093 prevent closing a period not in the past 2019-04-03 17:27:25 +02:00
Sylvain
722d5d36e7 check server-side that periods match length requirements + explain requirements to user before closing 2019-04-03 13:04:19 +02:00
Sylvain
8530a6f655 superadmin + fixed free space notification 2019-03-20 16:49:38 +01:00
Sylvain
7b0824a4a3 notify admins when no accounting period closed for 1 year 2019-03-18 14:33:30 +01:00
Sylvain
857b1cebba fix accounting period checksum + improved period validation 2019-03-12 15:26:17 +01:00
Sylvain
9854a4b965 prevent memory saturation with periodic checks 2019-02-26 15:18:19 +01:00
Sylvain
ffe5516d10 prevent closing an accounting period if any checksum error in period 2019-02-12 17:38:44 +01:00
Sylvain
a1ba272538 Merge branch 'dev' into host 2019-01-14 13:00:24 +01:00
Sylvain
a2eb10331e [ongoing] remove invoicing disabled per user 2019-01-10 16:50:54 +01:00
Sylvain
35638d611b validates invoice&avoir creation to prevent any creation in closed period 2019-01-09 16:54:09 +01:00
Sylvain
9fac706da8 validates accounting periods on creation + prevent refunding on closed periods (client only) 2019-01-08 17:32:45 +01:00
Sylvain
12c6cd2a70 Merge branch 'siteswapjuggler-master' into dev
also: align translations and mark missings
2017-11-20 11:43:40 +01:00
Sylvain
3d4260a3f7 [bug] unable to delete standard group 2017-08-30 14:57:06 +02:00
Sylvain
dcf55d8351 [bug] invalid notification text when sending amount coupon 2017-08-29 16:10:16 +02:00
Sylvain
8e206cd3c5 [bug] subscription name is not shown in invoices 2017-03-15 16:31:51 +01:00
Sylvain
796f0a87ae ability to remove an unused custom price for an event (#61) 2017-03-02 18:36:54 +01:00
Sylvain
d8b8c39cb3 add day of week to availabilities export 2017-03-02 13:31:12 +01:00
Sylvain
c21f7ed5dc export events availabilities 2017-03-02 13:05:29 +01:00
Sylvain
056060a88d export spaces availabilities 2017-03-02 12:57:07 +01:00
Sylvain
d9b30fa2b0 export trainings availabilities 2017-03-02 12:44:59 +01:00
Sylvain
504fe49964 export machines availabilities 2017-03-02 12:34:28 +01:00
Sylvain
cf9181770b export space statistics 2017-03-01 12:56:11 +01:00
Sylvain
b48557fd96 invoice generation for space reservation 2017-02-27 17:42:36 +01:00
Sylvain
560bb46383 space db model 2017-02-13 14:38:28 +01:00
Sylvain
102eecdc8a ability to send again auth migration code 2016-12-15 14:16:24 +01:00
Sylvain
76c1412177 Merge branch 'wallet_avoir' into dev 2016-12-13 15:33:56 +01:00
Sylvain
ecbe8a58a2 coupon edition: display internationalized errors 2016-12-13 12:46:00 +01:00
Sylvain
9190e61f5f basic avoir invoice for wallet credit 2016-12-12 15:32:01 +01:00
Sylvain
f0e11cf718 fix pdf invoice generation with cash coupon 2016-11-28 09:57:09 +01:00
Sylvain
d46e6cf9c9 [members excel export] invoicing disabled 2016-11-16 15:08:24 +01:00
Sylvain
da71ba783c [bug] exports for events reservation always have seats=1 (fixes #54) 2016-11-09 15:01:58 +01:00
Kenneth Lim
18bc37749b
locale: informations --> information
Not sure if this helps but information does not require an `s`. :)

Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>
2016-10-07 17:11:58 +08:00
Sylvain
e281a20ada database migration to event price category 2016-08-30 18:30:21 +02:00
Sylvain
d47a5aea5f statistics generation for event with custom prices 2016-08-29 16:44:07 +02:00
Sylvain
d86cccf98c custom prices in invoice generation 2016-08-29 16:37:51 +02:00
Sylvain
cc1d6e4f21 [not tested] send reminder notification every hours for upcoming reservations 2016-08-17 17:39:12 +02:00
Sylvain
428b2db0ea send a coupon to a user 2016-08-16 18:12:13 +02:00
Sylvain
6e1dfda8f5 show coupon details in invoice 2016-08-10 16:33:26 +02:00
Sylvain
af94b62ff1 add organization infos to members xlsx export 2016-08-02 15:28:24 +02:00
Sylvain
5f96c9916d [feature] newsletter : ask conscent + export in xlsx 2016-07-28 12:20:51 +02:00
Sylvain
a2066d8c09 [feature]async generation of users exports 2016-07-27 17:00:06 +02:00
Sylvain
4d2f46ca95 [feature] Async statistics export to XLSX
- fix tests due to removal of event_categories
- rake task for generating statistics
2016-07-27 11:28:54 +02:00
Sylvain
74154cf1f3 Merge branch 'xls' into dev
Conflicts:
	CHANGELOG.md
	app/helpers/application_helper.rb
	config/locales/en.yml
	config/locales/fr.yml
2016-07-25 16:56:22 +02:00
Peng DU
5d84dcb666 update locale 2016-07-21 16:32:57 +02:00
Peng DU
f2010e752d show pay by wallet in invoice 2016-07-21 16:32:56 +02:00
Peng DU
2c49285740 avoir by wallet 2016-07-21 16:32:56 +02:00
Peng DU
fc7eaaab94 add notification and alert when user wallet credit 2016-07-21 16:32:54 +02:00
Sylvain
3413c3040b [ongoing] members export full infos 2016-07-12 17:46:19 +02:00
Sylvain
827b3334e1 migrate export subscriptions to axlsx 2016-07-12 13:10:06 +02:00
Sylvain
85912603a2 migrate export reservations to axlsx 2016-07-12 13:00:56 +02:00
Sylvain
d72e39f716 migrate export members to axlsx 2016-07-12 12:48:26 +02:00
Sylvain
022db4e486 export all stats indices to excel 2016-07-07 16:26:25 +02:00
Sylvain
471fe971bc remove course & workshop from seeds file 2016-06-30 15:13:58 +02:00
Sylvain
e930e04ed6 add age&theme filters to statistics 2016-06-30 12:48:46 +02:00