Sylvain
39c3164b47
WIP: admin interface to manage payment schedules
2021-01-26 17:31:11 +01:00
Sylvain
5e06de508d
interface to filter list of schedules
2021-01-26 11:37:05 +01:00
Sylvain
def0778a4d
basic inteface to retrieve payment schedules
2021-01-25 17:42:30 +01:00
Sylvain
728ae4310c
improved testing of payment schedules + some fixes
...
TODO: fix the test
rails test test/integration/reservations/create_test.rb
Reservations::CreateTest#test_user_reserves_a_machine_and_renew_a_subscription_with_payment_schedule_and_coupon_and_wallet [test/integration/reservations/create_test.rb:841]
Minitest::Assertion: Expected: "stripe"
Actual: nil
2020-12-30 18:43:33 +01:00
Sylvain
609d19e5d1
refactored subscription process + renew (update) subscription/ offre free days
2020-12-21 16:12:34 +01:00
Sylvain
678af0de1f
using stripe api + improved ui + ui to configure schedules reference
...
TODO: as an admin, I can select if payment_method = (stripe || local)
2020-11-16 16:37:40 +01:00
Sylvain
dc844bb10c
Enlarged privacy policy display and edition zones
2020-10-26 16:52:05 +01:00
Sylvain
13bc5334cc
ability to configure until when the events are shown on the home page
2020-09-29 09:39:32 +02:00
Sylvain
abd6979ec7
[bug] erroneous translations in english ( #226 )
2020-08-24 16:54:30 +02:00
Sylvain
40dd39304e
enable/disable statistics module fomr the UI
2020-06-17 12:20:51 +02:00
Sylvain
a9cce243fb
updated user's guide to 4.5
2020-06-16 16:47:38 +02:00
Sylvain
6bc2438348
fix translation key
2020-06-16 10:33:56 +02:00
Sylvain
be9ee9d25d
complete features-tour for invoices page
2020-06-15 15:56:55 +02:00
Sylvain
dbbf306bf2
complete features-tour for projects page
2020-06-15 15:43:28 +02:00
Sylvain
6af5f51ff2
complete features-tour for settings page
2020-06-15 15:32:30 +02:00
Sylvain
24155bc009
ability to lock settings from the env vars
2020-06-15 13:20:48 +02:00
Sylvain
42872ab107
configure wallet from UI
2020-06-15 12:44:43 +02:00
Sylvain
f46c78a476
read email_confirmation_required from the UI
2020-06-15 11:57:13 +02:00
Sylvain
48bcf0b838
configure invoices prefix from the DB
2020-06-15 10:58:15 +02:00
Sylvain
78518e17fb
read stripe_currency from the UI
...
We prevent the currency from being changed if any stripe payment was made, because a stripe user cannot made pay with different currencies. If we try to charge a user with a different currency than the currency he used for a previous payment, this will fail; so we must prevent this case
2020-06-10 16:37:11 +02:00
Sylvain
a70668f52a
sync members on stripe after keys update
2020-06-09 14:27:18 +02:00
Sylvain
d5939a9de5
set the stripe keys from the UI
2020-06-09 13:09:31 +02:00
Sylvain
06b5da9df8
configure online payment from the UI
2020-06-08 17:42:59 +02:00
Sylvain
b44a8da73b
set openlab_default from the UI
2020-06-08 16:15:44 +02:00
Sylvain
88f2fb3749
secure the settings API (read) + read the openlab settings from the db
2020-06-08 15:08:07 +02:00
Sylvain
db8de18bd4
set openlab-projects id & secret from the UI
2020-06-08 11:38:49 +02:00
Sylvain
6af3f12917
use the db settings to validate mime types & extensions + fix texts + force lowercase
2020-06-03 17:56:39 +02:00
Sylvain
8f32eb92db
interface to manage file extensions & mime types
2020-06-03 17:39:32 +02:00
Sylvain
5c152412db
test mime type of a file
...
use marcel to test mime types
updated mimemagic
2020-06-03 16:25:13 +02:00
Sylvain
45013be950
configure default_host & default_protocol from env
...
reverts 478a6c40
(partially) & b2434864
2020-06-02 18:29:24 +02:00
Sylvain
9a0f36c245
configure disqus_shortname from the UI
2020-06-01 18:31:43 +02:00
Sylvain
59cb17789c
rename section project_elements to projects
2020-06-01 17:52:39 +02:00
Sylvain
478a6c409d
define default_protocol & default_host from the UI + fix email_from + various minor fixes
2020-06-01 17:32:32 +02:00
Sylvain
0617e4cd26
configure default_mail_from from the UI
2020-06-01 12:15:16 +02:00
Sylvain
434c211ccf
configure the features tour display mode from the UI
2020-05-27 18:49:53 +02:00
Sylvain
0d211e2e31
configure google recaptcha from UI
2020-05-27 16:35:30 +02:00
Sylvain
c3846e7080
configure twitter analytics from the UI
2020-05-27 15:39:39 +02:00
Sylvain
628a0f3bc3
configure facebook_app_id from the UI
2020-05-27 12:29:51 +02:00
Sylvain
2d628d8826
disable the invoicing module from the UI config panel
2020-05-26 18:07:07 +02:00
Sylvain
537743a740
configure the plans module from the admin UI
2020-05-26 15:39:28 +02:00
Sylvain
6cc6bba7ce
refactored app to gather spaces module status from the settings
2020-05-26 13:59:40 +02:00
Sylvain
fd93093f0d
UI to configure the spaces module
2020-05-26 10:53:49 +02:00
Sylvain
acefc325f6
configure events_in_calendar form the UI panel
2020-05-25 17:36:53 +02:00
Sylvain
57ceeec2e7
refactored settings/reservations/confidentiality section
2020-05-25 17:05:54 +02:00
Sylvain
a63340188b
configure default slot duration from settings panel
2020-05-25 12:55:01 +02:00
Sylvain
ddce7f516a
configuration of book concurrent slots through the settings interface
2020-05-25 12:55:00 +02:00
Sylvain
419605e551
configuration of google analytics tracking ID through the settings interface
2020-05-25 12:55:00 +02:00
Sylvain
4841027216
interface to collect the google analytics ID
2020-05-25 12:55:00 +02:00
Sylvain
654d4b1cb4
setting: phone_required
2020-05-25 12:54:19 +02:00
Sylvain
0a336f14e4
updated messages about prices
2020-05-06 16:55:26 +02:00
Sylvain
6d0ed0bfb5
info box for current availabity in admin calendar
2020-05-05 16:19:46 +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
881cc97e8d
The invoices list displays the operator in case of offline payment
2020-05-04 10:56:27 +02:00
Sylvain
b97ff2ec5b
improved feature tour for managers
2020-04-29 16:30:39 +02:00
Sylvain
68fd322398
managers: edit user/edit subscription
2020-04-29 11:11:57 +02:00
Sylvain
6a8746b110
[bug] updating a setting without any changes triggers an error
...
Also:
- Invoices interface for managers
- Refactoring of admin/invoices template: split into multiple files
2020-04-28 16:35:54 +02:00
Sylvain
18895b6a85
manager can create memebrs & credit wallets
2020-04-28 15:34:17 +02:00
Sylvain
e56fba1c03
[bug] Free entry label for events without reservation
2020-04-28 11:21:04 +02:00
Sylvain
2ca5c8c50f
managers interface
2020-04-21 17:24:22 +02:00
Sylvain
f88472eeb3
Interface to manage partners
2020-04-21 16:47:35 +02:00
Sylvain
d717ed704c
adjust nb of slots per availability
2020-04-21 15:20:33 +02:00
Sylvain
d665c71157
non-english transations admit some more accordances
2020-04-20 10:00:24 +02:00
Sylvain
5f90393fb1
updated sentences to match customizable duration of slots
2020-04-20 09:48:20 +02:00
Sylvain
ff75a96ecc
Ability to define, per availability, a custom duration for the reservation slots
2020-04-15 18:08:02 +02:00
Sylvain
37d49c9b84
updated translations
2020-03-31 17:10:31 +02:00
Sylvain
a502a7061e
change translation to prevent button overflow
2020-03-31 16:09:13 +02:00
Sylvain
e44499d7ee
fixed some translations
2020-03-11 10:04:32 +01:00
Sylvain
2c1dbd4d82
[ongoing] help modal
2020-03-10 16:38:29 +01:00
Sylvain
f7980e52f9
refactor translations for crowdin
2020-03-09 12:29:39 +01:00
Sylvain
2e85f39b12
move comments to help translating in crowdin
2020-03-09 12:17:47 +01:00
Sylvain
63d671609f
refactor translations to work with crowdin pull requests
2020-03-09 12:08:01 +01:00
Sylvain
bb752f1218
refactor translations to work with crowdin pull requests
2020-03-09 11:47:18 +01:00
Sylvain
8976336a6a
updated user's manual for v4.3 (fr)
2020-03-04 17:24:06 +01:00
Sylvain
5301a237ca
Change style and pluralize the text of the slot division alert in new availability assistant
2020-03-04 14:42:00 +01:00
Sylvain
8a1518dabc
prevent admin from changing group + add info about configuring groups first
2020-03-03 11:59:17 +01:00
Sylvain
f5955b74d2
reposition tour modals to prevent screen overflow
...
also: fix issue on tour completed
+ fix issue on statistics when no plans created
+ info area on statistics when no plans created
2020-03-03 11:20:17 +01:00
Sylvain
5765e3d2e4
move availability options to new step + wording
2020-03-02 16:52:54 +01:00
Sylvain
a44bf85014
Merge branch 'slot_is_only_subscriptions' into dev
2020-03-02 16:27:26 +01:00
Sylvain
f34b87c597
harmonized translations
2020-03-02 15:29:19 +01:00
Sylvain
fdc8ec6a9e
import icalendars every hours
2020-02-26 16:04:40 +01:00
Sylvain
d833f6d812
harmonize Fab-manager trademark syntax
2020-02-26 10:19:43 +01:00
Sylvain
7b955f616e
fix i18n syntax + missing transaltion
2020-02-24 15:25:15 +01:00
Du Peng
b559d10b87
improve slot is only subscription
2020-02-12 12:58:17 +01:00
Sylvain
e1902b42ac
remove confusing quotes in translations yml
2020-02-11 15:49:43 +01:00
Sylvain
b7dda83060
Merge branch 'edit_event_recurrent' into dev
2020-02-11 15:43:29 +01:00
Sylvain
db26533d94
alert on date change
2020-02-11 15:42:43 +01:00
Sylvain
372d7f936b
typos & syntax
2020-02-11 11:46:40 +01:00
Du Peng
74cc69d1bd
Ability to configure reservation slot restrict for plans
2020-02-07 17:37:00 +01:00
Sylvain
b1a98d3574
improved texts
2020-01-29 17:44:17 +01:00
Du Peng
35d9bec8a5
update event recurrent
2020-01-29 17:20:19 +01:00
Sylvain
81a42e5935
customize home page : full texts
2020-01-28 10:12:29 +01:00
Du Peng
b1419271e6
edit event recurrent in progress
2020-01-27 18:21:46 +01:00
Sylvain
15ab3c1305
Ability to customize the title of the link to the about page
2020-01-21 16:16:12 +01:00
Sylvain
45e4b5c4bc
Create machine availabilities: select all/none in a click
2020-01-21 12:09:24 +01:00
Sylvain
7929d3b198
detailled view of collected data in fabanalytics
2020-01-15 12:48:55 +01:00
Sylvain
1c4f144b8d
Merge branch 'members-filters' into dev
2020-01-07 10:44:55 +01:00
Sylvain
f778ee9016
fix syntax + add missing translations
2020-01-07 10:44:29 +01:00
Sylvain
d4f7ff3603
fixes comments syntax for crowdin compat
2019-12-24 11:47:31 +01:00
Sylvain
997e60edb4
harmonize front translations in spanish with new model
2019-12-18 15:02:10 +01:00
Sylvain
c5604bbdf8
harmonize admin.en
2019-12-18 13:26:37 +01:00
Sylvain
c565d9ff2b
unified front-end i18n interpolations syntax to messageformat
2019-12-16 10:16:11 +01:00
Sylvain
510c802ab1
messages variations depending on slot duration
2019-12-09 10:27:50 +01:00
Sylvain
32e7fc3900
confirm delete icalendar imports + fix display + add translations
2019-12-03 10:48:53 +01:00
Sylvain
36eba99808
[bug] report errors on admin creation
2019-12-02 10:39:42 +01:00
Sylvain
91008b3df1
improved calendar legend
2019-11-27 11:52:37 +01:00
Sylvain
68b17cbe9a
Ability to show the scheduled events in the admin calendar
2019-11-25 14:49:39 +01:00
Sylvain
ce366beaa2
display that an event reservation was canceled
...
also: fixed transtions files
2019-11-21 11:15:05 +01:00
Sylvain
9ec736e6b5
delete recursive slots
2019-11-18 17:29:51 +01:00
Sylvain
0d740c95a9
recapitulative screen
2019-11-13 10:59:10 +01:00
Sylvain
22251e6516
summary screen
...
TODO: eventModal.html.erb:167
2019-11-12 16:28:10 +01:00
Sylvain
2cccbd3486
recurrence UI
2019-11-12 14:25:28 +01:00
Sylvain
f94d8feba6
[feature] admin can delete an user
2019-10-29 09:59:21 +01:00
Sylvain
35fb991cdb
Improved user experience in defining slots in the calendar management
2019-10-23 17:48:31 +02:00
Sylvain
8bd1d72fdf
improved results page
2019-09-30 12:49:50 +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
ad1b7baa05
import members interface
2019-09-24 15:21:18 +02:00
Sylvain
e7bb41f38d
[ongoing] import users from csv file: admin inteface
2019-09-24 12:21:19 +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
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
52afb6ef07
[bug] extend a current subscription for a member, does not reset his credits
2019-09-12 11:37:03 +02:00
Sylvain
acacd9a19e
fixed accounting codes interface + fixed csv generation
2019-08-01 10:24:34 +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
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
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
21c7484396
notify admin about notifications sent
2019-04-25 12:04:16 +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
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
c786ba6edb
notify user about archiving
2019-04-04 11:37:23 +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
bf526458b4
add label to accounting period button
2019-03-20 11:56:03 +01:00
Sylvain
b940ae0327
display complete info set on accounting archives
2019-03-11 16:11:49 +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
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
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
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
1b33f3c865
display the machine reservation user name to other members
2018-07-24 12:24:51 +02:00
Sylvain
12c6cd2a70
Merge branch 'siteswapjuggler-master' into dev
...
also: align translations and mark missings
2017-11-20 11:43:40 +01:00
Sylvain
02baf9097e
hide disabled machine in admin pricing zone + prevent creating negative credits
2017-10-11 14:48:03 +02:00
Sylvain
4090fe2119
filter trainings list by status
2017-10-10 17:38:01 +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
a9cce55855
plan disabling: hide everywhere + filter in admin filter
2017-10-05 15:32:20 +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
404101ccd4
english and portuguese translations
2017-09-07 10:47:18 +02:00
Sylvain
9c6143bd5e
tooltip about images insertion in medium editor
2017-08-29 17:50:57 +02:00
Sylvain
cf6afb817d
[feature] configuration of max visibility for reservations
2017-08-24 18:34:18 +02:00
Sylvain
54154b1713
[feature] ability for admins to create users or organizations
2017-05-16 10:23:25 +02:00
Sylvain
853a3160d3
add notice about availabilities export
2017-03-02 13:39:49 +01:00
Sylvain
504fe49964
export machines availabilities
2017-03-02 12:34:28 +01:00
Sylvain
b48451f9f8
improved space reservation optional explication message
2017-03-01 11:47:20 +01:00
Sylvain
d463d4dd5a
display spaces in admin calendar
2017-02-15 13:18:03 +01:00
Sylvain
1855935322
interface to create space availabilities
2017-02-15 11:32:29 +01:00
Sylvain
30454c4262
manage space info message + refactor settings translations mapping
2017-02-15 09:48:27 +01:00
Sylvain
36a0eafef3
interface to set credits for spaces
2017-02-14 17:29:52 +01:00
Sylvain
ec4a06a0e4
interface to configure space price per plan + refactored plans interface code
2017-02-14 17:06:42 +01:00
Sylvain
1554cfe65d
refactor plan translations mapping
2017-02-14 16:09:07 +01:00
Sylvain
93bceb5517
define spaces prices for non-subscribers
2017-02-14 15:25:28 +01:00
Sylvain
334201e551
refactor admin pricing translations mapping
2017-02-14 14:58:16 +01:00
Sylvain
0adb9e29c6
space edition interface
2017-02-14 13:36:10 +01:00
Sylvain
9d367f95db
[ongoing] new space interface
2017-02-13 17:18:06 +01:00
Sylvain
c2f638934e
added info notice about operation's time of admin delete
2016-12-12 11:18:24 +01:00
Sylvain
10fc7b69e9
Ability to display optional information message on event reservation page
2016-11-29 16:46:19 +01:00
Sylvain
ad2911529c
db model, api and interface for cash coupons
2016-11-23 12:43:42 +01:00
Sylvain
c04ed51f85
[bug] translation conflict
2016-11-09 14:35:02 +01:00
Sylvain
ec0f597067
[sso] display strategy name in providers list
2016-09-13 12:06:25 +02:00
Sylvain
c2533c0590
add custom aggs for machine & trainings stats: available bookings
2016-09-06 17:17:15 +02:00
Sylvain
71a111d8ba
improved reservations settings validation (delays)
2016-09-01 16:15:41 +02:00
Sylvain
4f41aa6554
event custom prices: various fixes and removed artifacts
2016-08-30 13:07:47 +02:00
Sylvain
3d1c852576
show custom prices bookings in admin/editMember
2016-08-29 16:54:10 +02:00
Sylvain
bca77559ed
ability to delete a price category
2016-08-24 17:09:00 +02:00
Sylvain
77db2b2326
ability to edit price category
2016-08-24 16:52:37 +02:00
Sylvain
500a466371
full ability to create price categories
2016-08-24 16:21:43 +02:00