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

551 Commits

Author SHA1 Message Date
Sylvain
539eb08b89 ability to disable the online payments through an env var 2019-09-11 17:08:00 +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
Sylvain
12447698f8 collect card details on the client & create a paymentIntent on the server 2019-09-05 16:17:02 +02:00
Sylvain
a0961314a4 [ongoing] upgrade stripe gem & api version to allow SCA 2019-09-05 11:03:22 +02:00
Sylvain
967f539ad9 [ongoing] update to stripe-js:v3 to use strong customer authentication 2019-09-04 17:20:18 +02:00
David O' Rojo
304abff919 Use the default database config file to reduce duplication 2019-09-02 22:04:45 -05:00
Sylvain
15f858ba9c Merge branch 'acd' into dev 2019-08-01 13:07:05 +02:00
Sylvain
35c31b96ea fix vat history usage in invoice test + fix sidekiq delay extension 2019-08-01 11:50:03 +02:00
Sylvain
acacd9a19e fixed accounting codes interface + fixed csv generation 2019-08-01 10:24: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
a7f68b59dd connect the export modal to the api 2019-07-31 12:00:52 +02:00
Sylvain
a9ea4057f3 interface to customize accounting codes and labels 2019-07-30 16:06:35 +02:00
Sylvain
f772bc3509 api endpoint and worker to export accounting data 2019-07-30 11:43:51 +02:00
Sylvain
ab295f064d service to export invoices into a given period to CSV lines for an accounting sofware 2019-07-29 17:51:53 +02:00
Sylvain
74e5461c02 [bug] do not remove member role if last user was deleted 2019-07-18 16:07:20 +02:00
Sylvain
f69703f0a0 allow user to change his choice about cookies 2019-06-13 12:52:56 +02:00
Sylvain
e9b18fda6c allow google analytics in staging 2019-06-13 11:32:08 +02:00
Sylvain
249e59bb2a get user consent about cookies 2019-06-13 11:28:55 +02:00
Sylvain
7fc03af6bc [ongoing] cookies consent modal 2019-06-12 16:53:37 +02:00
Sylvain
d0cd5a90d2 handle deleted users in notifications 2019-06-12 15:49:35 +02:00
Sylvain
ddce997e12 display data collection purpose on each input field + fix notifications on deleted user 2019-06-12 15:34:03 +02:00
Sylvain
0e18defe53 handle deleted user in statistics 2019-06-12 12:40:43 +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
fe2a6f7120 migrate trainings to statistic_profile and adjust code 2019-06-06 12:00:21 +02:00
Sylvain
52992ac9d5 move gender & birthday to statistic_profile 2019-06-04 13:33:00 +02:00
Sylvain
b423d9fce7 add link to interface in abuse report mail 2019-05-21 12:38:07 +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
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
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
936495e596 [bug] when paying reservation with wallet, the invoice footprint is not correctly updated 2019-04-08 17:04:53 +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
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
a4e1b93051 add es6 support for staging envs 2019-03-27 11:49:01 +01:00
Sylvain
ea2a73cdc1 add asterisks on required fields 2019-03-26 17:20:10 +01:00
Sylvain
75310d599f Merge branch 'host' into dev 2019-03-26 14:33:30 +01:00
Sylvain
01ac73a1a1 removed capistrano & unicorn + cleaned lacasemate brading 2019-03-26 10:40:58 +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
bf526458b4 add label to accounting period button 2019-03-20 11:56:03 +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
b940ae0327 display complete info set on accounting archives 2019-03-11 16:11:49 +01:00
Sylvain
9854a4b965 prevent memory saturation with periodic checks 2019-02-26 15:18:19 +01:00
Sylvain
279a958e46 download accounting period archive through interface 2019-02-25 17:22:54 +01:00
Sylvain
333eb3658b Merge branch 'dev' into host 2019-02-25 15:04:49 +01:00
Sylvain
a7586eaeb9 fix routes.rb syntax 2019-02-25 15:04:38 +01:00
Sylvain
cf23fae73c Merge branch 'dev' into host 2019-02-14 16:35:38 +01:00
Sylvain
0d0c378b33 missing translations in new authentication provider form 2019-02-14 10:00: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
da672ea8b6 Merge branch 'dev' into host 2019-01-21 16:34:06 +01:00
Sylvain
d2c4773ac9 [bug] unable to delete an admin who has changed a setting 2019-01-16 17:09:27 +01:00
Sylvain
b9e7276394 fix missing translation 2019-01-16 12:08:27 +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
a1ba272538 Merge branch 'dev' into host 2019-01-14 13:00:24 +01:00
Sylvain
f6e236aeb5 refactored roles methods to match ruby conventions 2019-01-14 12:57:31 +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
5bee554fa5 Merge branch 'dev' into us78 2019-01-09 10:55:22 +01:00
Sylvain
3536ae95b1 [bug] invalid rails DSB locale 2019-01-08 17:34:12 +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
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
0a59dc6b5d display previous closings in modal 2019-01-07 10:50:10 +01:00
Sylvain
c35029d205 i18n for close period modal 2019-01-03 17:51:24 +01:00
Sylvain
6637832d00 refactored frontend invoices translations 2019-01-03 17:39:50 +01:00
Sylvain
9fe828f51c improved translations 2019-01-02 17:11:18 +01:00
Sylvain
9b4eac57b6 fix doc: references for external locales 2019-01-02 15:47:12 +01:00
Sylvain
56a62e975c updated uglifier with es6 support 2018-12-03 10:22:10 +01:00
Sylvain
ffbe3e0b4a updated procedure to setup development env, using docker 2018-11-26 15:14:43 +01:00
Sylvain
0c63405b4d migrate from bower to yarn 2018-11-22 17:09:33 +01:00
Sylvain
7d8b4ba2e5 fine-grained smtp configuration 2018-10-04 12:02:16 +02:00
Sylvain
2126a199e0 Ability to set a neutral gender for the fablab's title (#108) 2018-09-18 16:40:50 +02:00
Sylvain
1e3066f6f4 Ability to parametrize machines order on the booking page 2018-09-18 15:30:54 +02:00
Sylvain
0b1ae3482e updated test suite to reflect elastic api upgrade + updated cassettes 2018-07-24 14:36:18 +02:00
Sylvain
1b33f3c865 display the machine reservation user name to other members 2018-07-24 12:24:51 +02:00
Nicolas Florentin
53245fcc86 Merge branch 'dev' of github.com:LaCasemate/fab-manager into dev 2018-03-08 12:13:39 +01:00
Nicolas Florentin
3db93dbc41 fix stripe api version, all fabmanagers has to use this version because codebase relies on it 2018-03-07 16:04:20 +01:00
David O' Rojo
e342a070de Disable assets debug on development environment only when running with Vagrant 2018-02-26 18:18:24 -06:00
David O' Rojo
17259f8903 Improve the performance for the development environment 2018-02-14 12:47:49 -06:00
David O' Rojo
aa135f1876 Include database configuration for the virtual machine 2018-02-14 12:47:49 -06:00
Juan Pedro Torres
3a1dd822f5
Solved sign_up/sign_in error
Changed traduction on Sign_up and Sign_in.
2018-01-24 14:31:39 +01:00
jmrodriguesgoncalves
40f6796743 Missing translation fixed 2017-12-12 10:14:21 -05:00
jmrodriguesgoncalves
7e640b9508 Removed #translation_fixed comments 2017-12-12 09:57:13 -05:00
jmrodriguesgoncalves
0a1b64f1de Added missing translation bits 2017-12-11 18:56:38 -05:00
Sylvain
12c6cd2a70 Merge branch 'siteswapjuggler-master' into dev
also: align translations and mark missings
2017-11-20 11:43:40 +01:00
Sylvain
5438fa4b16 added newlines at end of files 2017-11-20 09:58:37 +01:00
Sylvain
aa2f45ee6e Merge branch 'clemclemmm-master' into dev 2017-11-20 09:52:36 +01:00
Sylvain
a8803cb7bc Merge branch 'master' of https://github.com/clemclemmm/fab-manager into clemclemmm-master 2017-11-20 09:52:17 +01:00
Sylvain
e043e76f47 add newline at end of file 2017-11-20 09:48:35 +01:00
Sylvain
06cf85d733 fix rails.fa-CM.yml syntax 2017-11-20 09:39:05 +01:00
Sylvain
8500bff648 Merge branch 'dev' of https://github.com/alexcvcoelho/fab-manager into alexcvcoelho-dev 2017-11-20 09:34:11 +01:00
Sylvain
c4e93eeb27 Merge branch 'master' of https://github.com/bmohamet/fab-manager into bmohamet-master 2017-11-20 09:29:33 +01:00
bmohamet
5809f9d6db
Create rails.fr-CM.yml
Adding FCA currency for Cameroon and Central Africa
2017-11-17 12:10:28 +01:00
Alex Coelho
1316550f40 Update Portuguese translations 2017-11-16 01:08:34 -02:00
Alex Coelho
5241801a3b Merge branch 'dev' of github.com:alexcvcoelho/fab-manager 2017-11-15 23:36:43 -02:00
Clément CHADEYRON
4a3995604c add spanish translation
translation made spain by :
Smart Open Lab
2017-11-06 14:15:22 +01:00
Sylvain
18b8d516ee Merge branch 'disable' into dev 2017-10-11 16:11:02 +02:00
Sylvain
f8f45bcb69 filter and hide disabled spaces in list 2017-10-11 15:15:30 +02:00
Sylvain
1c8d362f11 ability to disable space 2017-10-11 14:58:38 +02:00
Sylvain
02baf9097e hide disabled machine in admin pricing zone + prevent creating negative credits 2017-10-11 14:48:03 +02:00
Sylvain
c9c7fe00c5 filter disabled machines in list + improve responsiveness 2017-10-11 12:54:13 +02:00
Sylvain
c67360771a ability to disable machine 2017-10-11 12:10:05 +02:00
Sylvain
5ce6d4486e fix profile complete mail template for non imported users 2017-10-11 11:56:43 +02:00
Sylvain
4090fe2119 filter trainings list by status 2017-10-10 17:38:01 +02:00
Sylvain
05d9e62dd2 ability to disabled training 2017-10-10 17:16:43 +02:00
Sylvain
189665e53b [ongoing] prevent disable group with users + [ongoing] hide disabled groups 2017-10-05 17:54:44 +02:00
Sylvain
fb092afc8c filter enabled/disabled groups 2017-10-05 17:12:22 +02:00
Sylvain
c5f0501df2 enable/disable group 2017-10-05 16:48:18 +02:00
Sylvain
40bf22279e add warning on plan disabling 2017-10-05 15:44:06 +02:00
Sylvain
a9cce55855 plan disabling: hide everywhere + filter in admin filter 2017-10-05 15:32:20 +02:00
Sylvain
61c59349cd updated OpenAPI documentation 2017-10-05 11:33:51 +02:00
Sylvain
26d79e5b12 disable a plan 2017-10-04 18:56:39 +02:00
Sylvain
25eb24e516 Confirmation and error handling while deleting an event 2017-10-02 13:14:15 +02:00
siteswapjuggler
70cf6ebfa8 cancel and sold out badge in event list
Public event list prompte cancelled and sold out badge for more clarity
to the public users.

Correction for « sold_out » test in home, show and public list. 0
subscriber with 0 free_place should be a free entry case and it appears
to be sold out.

Another error occurs (negative free place)  if an admin change the
number of free places or decide to go free entry with an event.

Home and public list better display with access and price separate.
2017-09-24 21:51:58 +02:00
siteswapjuggler
37bdfcb96f pull request modification
Modification as requested for the pull request.
2017-09-24 15:12:46 +02:00
Sylvain
8d92f8492a removed full-calendar hack, improved remove slot precess 2017-09-18 12:42:45 +02:00
Sylvain
03b5b8bfae fix typo in FR 2017-09-18 11:00:42 +02:00
siteswapjuggler
52071c7b83 Merge remote-tracking branch 'LaCasemate/master' 2017-09-10 12:01:59 +02:00
Sylvain
404101ccd4 english and portuguese translations 2017-09-07 10:47:18 +02:00
Sylvain
273ec5317d disallow locking availabilities if it has any non-cancelled reservations 2017-09-06 18:07:56 +02:00
Sylvain
d092a1c5ea admin can lock and unlock availbilities 2017-09-06 15:01:41 +02:00
siteswapjuggler
e13817176f event monitor improvement
Many imrovement for the event monitoring admin module.
2017-09-04 00:09:08 +02:00
Nicolas Florentin
d602055e67 In login modal, displays an alert if Caps lock key is pressed 2017-08-31 17:11:46 +02:00
Sylvain
3d4260a3f7 [bug] unable to delete standard group 2017-08-30 14:57:06 +02:00
Sylvain
9c6143bd5e tooltip about images insertion in medium editor 2017-08-29 17:50:57 +02:00
Sylvain
dcf55d8351 [bug] invalid notification text when sending amount coupon 2017-08-29 16:10:16 +02:00
Sylvain
cf6afb817d [feature] configuration of max visibility for reservations 2017-08-24 18:34:18 +02:00
Sylvain
2ccc9e9dbd [bug] missing translation for EN and PT 2017-08-24 12:46:58 +02:00
Nicolas Florentin
739d9562fd removes ADMIN_EMAIL and ADMIN_PASSWORD from Rails env because they are only used once when seeding the db 2017-07-13 11:07:09 +02:00