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

585 Commits

Author SHA1 Message Date
Sylvain
35b069a4db added gem omniauth-rails_csrf_protection + [ongoing] moving from GET /users/auth/... to POST 2019-10-01 17:14:16 +02:00
Sylvain
0d3cc0fe40 [feature] Ability to disable invoices generation and interfaces 2019-09-30 15:29:20 +02:00
Sylvain
ba3161589c update users through CSV import 2019-09-30 12:19:33 +02:00
Sylvain
ff5de97c92 import new users from CSV and view results in app
TODO:
 - update users though CSV
2019-09-26 17:05:57 +02:00
Sylvain
4deaf1f75a [ongoing] import members from csv 2019-09-25 16:37:42 +02:00
Sylvain
e7bb41f38d [ongoing] import users from csv file: admin inteface 2019-09-24 12:21:19 +02:00
Sylvain
588010ac0b [feature] Optional reCaptcha checkbox in sign-up form 2019-09-23 17:46:46 +02:00
Sylvain
668eb43959 [bug] in case of unexpected server error during stripe payment process, the confirm button is not unlocked 2019-09-19 15:00:27 +02:00
Sylvain
7d26932f6c configure accounting codes & labels for wallet clients and other means clients 2019-09-19 11:51:14 +02:00
Sylvain
276a99c068 improved VAT history service + display dates when VAT was enabled in invoice configuration panel + do not render vat row in accouting export if vat was disabled 2019-09-18 13:28:53 +02:00
Sylvain
aef4cc49f2 fixes accounting codes setting + improved error handling 2019-09-17 13:00:25 +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
f06bdaaf21 provide additional settings to export api 2019-09-16 16:31:16 +02:00
Sylvain
02d28e0b8c improved accounting codes settings page (1 click saves all) + improved export file name 2019-09-16 14:39:47 +02:00
Sylvain
224b0d6dee Merge branch 'sca' into dev 2019-09-12 12:53:56 +02:00
Sylvain
9d2e17d5d6 [bug] once a reservation was made, the reminder of the paid price is always 0 if a coupon was used 2019-09-12 12:25:13 +02:00
Sylvain
53e02622b9 [bug] disabled groups still appears as available in sign-up modal 2019-09-12 11:14:04 +02:00
Sylvain
539eb08b89 ability to disable the online payments through an env var 2019-09-11 17:08:00 +02:00
Sylvain
ac0489a496 [bug] wallet usage is noted on subscription invoices even if wallet was not used + use payment confirm API for subscriptions only (sca) 2019-09-10 17:57:46 +02:00
Sylvain
4d0ac9b3ca using stp_payment_intent_id instead of stp_invoice_id on new invoices 2019-09-10 16:45:45 +02:00
Sylvain
04f17d44d8 handle sca in js frontend 2019-09-10 12:46:02 +02:00
Sylvain
e9e27663cd quick coding rules checking with rubocop 2019-09-09 18:04:31 +02:00
Nicolas Florentin
e94cf46fa4 ongoing work on sca stripe 2019-09-09 17:37:54 +02:00
Sylvain
510533e080 handle 2nd confirmation on server + display confirmation modal on the client 2019-09-05 17:17:51 +02:00
Sylvain
12447698f8 collect card details on the client & create a paymentIntent on the server 2019-09-05 16:17:02 +02:00
Sylvain
967f539ad9 [ongoing] update to stripe-js:v3 to use strong customer authentication 2019-09-04 17:20:18 +02:00
Sylvain
acacd9a19e fixed accounting codes interface + fixed csv generation 2019-08-01 10:24:34 +02:00
Sylvain
e32825675c [ongoing] fixing accounting export service 2019-07-31 16:52:11 +02:00
Sylvain
12d8c65fa2 async generation of export and download cached csv using hidden iframe 2019-07-31 15:47:02 +02:00
Sylvain
fa6a54a422 export notifications 2019-07-31 12:37:31 +02:00
Sylvain
a7f68b59dd connect the export modal to the api 2019-07-31 12:00:52 +02:00
Sylvain
22d84e86f5 export modal 2019-07-31 11:10:10 +02:00
Sylvain
a9ea4057f3 interface to customize accounting codes and labels 2019-07-30 16:06:35 +02:00
Sylvain
0714878bca [bug] unable to generate a refund 2019-07-29 12:07:22 +02:00
Sylvain
26c8d402e1 removed dependency to jquery-ui 2019-07-17 15:30:19 +02:00
Sylvain
50373b6609 [bug] cookie consent modal is not shown 2019-06-17 14:57:11 +02:00
Sylvain
2d92df3ebb do not delete the user if superadmin + fix text alert 2019-06-17 11:12:05 +02:00
Sylvain
84c90cdef3 ignore cookies modal if GA is disabled 2019-06-13 14:00:43 +02:00
Sylvain
f69703f0a0 allow user to change his choice about cookies 2019-06-13 12:52:56 +02:00
Sylvain
249e59bb2a get user consent about cookies 2019-06-13 11:28:55 +02:00
Sylvain
6e5cc2a4c4 typo and syntax 2019-06-12 16:31:45 +02:00
Sylvain
a53c6e80e7 move invoice->operator to invoicing_profile + minor fixes to handle user deletion 2019-06-12 12:22:38 +02:00
Sylvain
86ded2b8d2 [ongoing] fixes for invoices pdf files 2019-06-11 16:56:11 +02:00
Sylvain
cfd33c3a52 migrate projects to statistic_profile 2019-06-06 16:34:53 +02:00
Sylvain
6f87873b2c fix init member group when created from signup modal 2019-06-05 16:09:11 +02:00
Sylvain
5c57bcc7c6 defer member search in admin panel to optimize requesting 2019-06-05 15:35:27 +02:00
Sylvain
17fbd6b465 multiple fixes related to statistic_profile & invoicing_profile + fix users list while sorting by subscription 2019-06-05 12:11:51 +02:00
Sylvain
52992ac9d5 move gender & birthday to statistic_profile 2019-06-04 13:33:00 +02:00
Sylvain
6011f27268 finish moving organization & address to invoiving profile: fix create & edit user 2019-06-03 12:06:01 +02:00
Sylvain
a211ad39ff moving organization & address to invoicingProfile + refactored doc about postgre 2019-05-29 14:28:14 +02:00
Sylvain
9c2598d405 ability to delete processed reports 2019-05-21 12:24:45 +02:00
Sylvain
7bbea22e76 display reports in interface 2019-05-21 11:49:50 +02:00
Sylvain
630809b91f moved abuses panel to admin zone + fix loading template 2019-05-21 11:16:12 +02:00
Sylvain
dd4b6e2cb1 [ongoing] abuses management interface 2019-05-09 18:27:19 +02:00
Sylvain
10a87eb4cb refactored project list translations 2019-05-09 16:09:20 +02:00
Sylvain
21c7484396 notify admin about notifications sent 2019-04-25 12:04:16 +02:00
Sylvain
8369e2e78e fix: restore current policy on dropdown selection 2019-04-25 11:58:42 +02:00
Sylvain
162a56250a notify users after privacy policy update + hide undefined content 2019-04-25 11:40:26 +02:00
Sylvain
c0c9b2a980 privacy policy: fixed admin view after update + display last update date 2019-04-23 12:58:01 +02:00
Sylvain
d0f0a293f3 save as draft or publish 2019-04-18 16:55:50 +02:00
Sylvain
caf6054e66 convert es6 to es5 in erb file 2019-04-18 16:01:58 +02:00
Sylvain
d9ce766f42 using ruby interpretation for SettingsController 2019-04-18 15:58:45 +02:00
Sylvain
7a2fc7c42e [ongoing] save as draft or publish 2019-04-18 15:57:56 +02:00
Sylvain
8fae8b104d admin interface to customize privacy policy page 2019-04-18 12:30:00 +02:00
Sylvain
5bdaebb2f2 privacy policy public page 2019-04-18 12:00:57 +02:00
Sylvain
43ff06c35d fixed and improved translations 2019-04-18 11:35:09 +02:00
Sylvain
44479b5597 allow filtering coupons list 2019-04-04 18:00:19 +02:00
Sylvain
9f8d24ec4f paginate list of coupons 2019-04-04 17:28:29 +02:00
Sylvain
79c3cfaa27 prevent the user to close the modal modal while closing a period 2019-04-03 14:31:39 +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
a50bb63b64 prevent double validation while closing period 2019-03-27 17:37:36 +01:00
Sylvain
fc04886e89 prevent generate refund before first accounting period 2019-03-27 16:46:08 +01:00
Sylvain
be6b82fda1 improved VAT history + updated changelog + added instruction on watermark localisation 2019-03-27 15:50:38 +01:00
Sylvain
2ac0336adb Merge branch 'dev' into host 2019-03-25 16:17:23 +01:00
Sylvain
5cdaa014ef [security] updated devise + updated rails 2019-03-25 14:57:48 +01:00
Sylvain
8530a6f655 superadmin + fixed free space notification 2019-03-20 16:49:38 +01:00
Sylvain
03c0c0d4fb close periods at 1 year minus 1 day + fix alert reminder transalation 2019-03-18 14:45:21 +01:00
Sylvain
4f418cc3fb compute total without taxes + fix close period date pickers + improved archived % number format 2019-03-12 13:36:10 +01:00
Sylvain
4e7a62bc2b [ongoing] close period for max 1 year + force contiguous periods + fix totals 2019-03-12 09:14:20 +01:00
Sylvain
279a958e46 download accounting period archive through interface 2019-02-25 17:22:54 +01:00
Sylvain
cf23fae73c Merge branch 'dev' into host 2019-02-14 16:35:38 +01:00
Sylvain
9f765009a8 [bug] unable to create oauth2 sso
[bug] application failed when sso activated
[bug] missing translations in oauth2 forms
2019-02-14 12:25:37 +01:00
Sylvain
ffe5516d10 prevent closing an accounting period if any checksum error in period 2019-02-12 17:38:44 +01:00
Sylvain
eb69822ce0 Merge branch 'dev' into host 2019-01-14 15:00:55 +01:00
Sylvain
77797db2f1 display VAT rates history 2019-01-14 15:00:33 +01:00
Sylvain
1db5e76bc9 tests on accounting periods + force reload periods when opening periods/avoir modal 2019-01-10 15:12:22 +01:00
Sylvain
2f17d90054 remove button 'generate refund' for invoices within closed periods 2019-01-09 17:07:15 +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
84aa0c75ff fix date on period closing + improved confirmation msg 2019-01-08 11:58:37 +01:00
Sylvain
ccff40b226 handle dates default values and limits in close period modal 2019-01-08 11:19:07 +01:00
Sylvain
12c25389fa Merge branch 'dev' into us78 2019-01-08 09:56:22 +01:00
Sylvain
859544565b [bug] first day of week is ignored in statistics custom filter 2019-01-08 09:38:35 +01:00
Sylvain
d8c8e4f72f set default dates in close modal pickers 2019-01-07 17:21:32 +01:00
Sylvain
5b13c59496 list existing closings in close period modal 2019-01-07 16:45:31 +01:00
Sylvain
d89f9e9301 close an accounting period from interface to db through api 2019-01-07 15:33:09 +01:00
Sylvain
4af3e19cd0 accounting periods API 2019-01-07 12:47:53 +01:00
Sylvain
0a684c8e13 rails DB model for accounting periods 2019-01-07 12:29:52 +01:00
Sylvain
0a59dc6b5d display previous closings in modal 2019-01-07 10:50:10 +01:00
Sylvain
3fda7562d4 Merge branch 'dev' into us78 2019-01-03 17:40:04 +01:00
Sylvain
6637832d00 refactored frontend invoices translations 2019-01-03 17:39:50 +01:00
Sylvain
bd6584f529 code improvement 2019-01-03 16:50:50 +01:00
Sylvain
105bcf6236 [ongoing] interface to close an accounting period 2019-01-03 16:48:52 +01:00
Sylvain
ea0ec47268 [bug] error handling does not work in some cases 2019-01-03 12:22:34 +01:00
Sylvain
39ab5a7ba9 [bug] unable to fetch projects from OpenProjects (#126) 2019-01-02 13:53:27 +01:00
Sylvain
10e3d4c3e4 fix update setting from client 2018-12-27 14:15:58 +01:00
Sylvain
5828513a3a handle error while polling notifications fails 2018-11-27 16:51:30 +01:00
Sylvain
f6cd552c66 migrate to angular 1.6 2018-11-27 16:26:21 +01:00
Sylvain
ab334d504b migrate to angular 1.5 2018-11-27 15:16:23 +01:00
Sylvain
ad3105cbc9 migrate to angular 1.4 2018-11-27 13:57:41 +01:00
Sylvain
0c63405b4d migrate from bower to yarn 2018-11-22 17:09:33 +01:00
Sylvain
2801ab0039 fix controllers imports issues due es6 convertion 2018-11-21 15:29:35 +01:00
Sylvain
6e56ac4286 javascript fixes 2018-11-21 11:32:50 +01:00
Sylvain
f528b2021d added semicolons 2018-11-21 11:08:53 +01:00
Sylvain
8cd533b5a6 eslint problems autofixes 2018-11-21 10:59:07 +01:00
Sylvain
d250dfa1d3 convert coffeescript comments to valid jsdoc 2018-11-21 09:42:31 +01:00
Sylvain
8a03b0b4f2 fix events page + fix disableAnimation directive 2018-11-20 16:25:15 +01:00
Sylvain
c1b1b701ae fixes and improvements after coffeescript migration 2018-11-20 14:44:41 +01:00
Sylvain
bf1a3ce913 fix ERB JS services 2018-11-20 13:46:28 +01:00
Sylvain
0814f8c2fa fix ERB JS directives 2018-11-20 13:44:53 +01:00
Sylvain
cfedb643b5 fix angular router file 2018-11-20 12:57:10 +01:00
Sylvain
74b6afd166 fix ERB JS controllers 2018-11-20 12:26:06 +01:00
Sylvain
aac0e8125c [ongoing] fix erb js controllers 2018-11-19 16:52:48 +01:00
Sylvain
185ea30db3 Merge branch 'erb' into es6 2018-11-19 16:20:46 +01:00
Sylvain
6352087f70 fix comments in erb files 2018-11-19 16:17:49 +01:00
Sylvain
12f74d5d08 fixed javascript for events controllers 2018-11-07 16:37:28 +01:00
Sylvain
39b18933b6 fixed javascript for application controller 2018-11-07 16:36:10 +01:00
Sylvain
e7031c90d5 restablished erb files 2018-10-25 17:08:13 +02:00
decaffeinate
5da4bf6317 decaffeinate: Run post-processing cleanups on about.coffee and 95 other files 2018-10-25 16:51:20 +02:00
decaffeinate
2c4dd31869 decaffeinate: Convert about.coffee and 95 other files to JS 2018-10-25 16:50:16 +02:00
decaffeinate
c4a2635cd9 decaffeinate: Rename about.coffee and 95 other files from .coffee to .js 2018-10-25 16:49:04 +02:00
Sylvain
944fa5f9b9 fixed erb syntax for decaffeinate 2018-10-25 13:10:39 +02:00
Sylvain
41847d75a2 removed erb suffixes 2018-10-25 13:06:09 +02:00
Sylvain
8d4b354199 [bug] change group button overflow 2018-10-15 16:51:44 +02:00
Sylvain
1e3066f6f4 Ability to parametrize machines order on the booking page 2018-09-18 15:30:54 +02:00
Sylvain
1b33f3c865 display the machine reservation user name to other members 2018-07-24 12:24:51 +02:00
Sylvain
05bd65dfb2 migrate es api: top 10 aggregations 2018-07-12 11:26:13 +02:00
Sylvain
17b7e96b67 [ongoing] fix top 10 aggregation 2018-06-12 12:59:23 +02:00
Sylvain
38551e8ac2 [ongoing] migrate es api: graphs (see FIXME) 2018-06-08 17:22:03 +02:00
Sylvain
f66ca9165e migrate es api: statistics 2018-06-08 12:27:11 +02:00
Sylvain
697ea87e37 [bug] unable to filter statistics from age 0 2018-06-08 12:06:22 +02:00
Nicolas Florentin
a29ba926c0 fix events/index order, frontend js code was conflicting with server-side behaviour 2017-12-18 16:15:38 +01:00
Nicolas Florentin
2f4dd4642a adds polyfill for Object.assign, fix for IE11 2017-12-18 14:54:46 +01:00
Sylvain
e091b81187 fix events pagination 2017-12-13 15:20:51 +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
cc94a19ba6 hide disabled spaces in admin pricing area 2017-10-11 15:50:18 +02:00
Sylvain
02a155e7af prevent create availability for disabled space 2017-10-11 15:23:42 +02:00
Sylvain
1631e4ae5c hide disabled spaces & machines in public calendar 2017-10-11 15:18:44 +02:00
Sylvain
f8f45bcb69 filter and hide disabled spaces in list 2017-10-11 15:15:30 +02:00
Sylvain
02baf9097e hide disabled machine in admin pricing zone + prevent creating negative credits 2017-10-11 14:48:03 +02:00
Sylvain
ad288628cc hide disabled trainings in pricing admin zone 2017-10-11 13:09:52 +02:00