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
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
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
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
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
Sylvain
6cbdbc932c
fix interpolation variable in portuguese
2017-06-07 17:20:57 +02:00
Sylvain
3ca6b9c9c1
fix about title concordance in portuguese
2017-06-07 16:51:11 +02:00
Sylvain
b4332c9bc7
fix html closing tags in portuguese translations
2017-06-07 16:46:42 +02:00
Sylvain
3bf91efe8f
fixed messageformat syntax in Portuguese
2017-06-07 16:26:39 +02:00
Sylvain
3a6af68b67
Merge branch 'dev' into alexcvcoelho-master
2017-06-07 16:03:31 +02:00
Alex Coelho
1ef80f8bd8
Prtuguese translations in app.*.pt.yml files
2017-06-01 14:33:16 -03:00
Sylvain
54154b1713
[feature] ability for admins to create users or organizations
2017-05-16 10:23:25 +02:00
Alex Coelho
f3634e6891
Translate pt-BR
2017-05-11 14:15:23 -03:00
Alex Coelho
0ac53733c9
Translate pt-BR for version 2.5.4
2017-05-11 11:31:12 -03:00
Alex Coelho
e8cacb36a1
Update branch
2017-05-11 11:00:37 -03:00
Sylvain
ca012322fb
fixed rails locales files
2017-04-27 17:08:17 +02:00
Sylvain
1f7bf2a591
Rails l10n support for 115 new locations
2017-04-27 14:22:07 +02:00
Sylvain
5abc85ae0a
[feature] weekly plans
2017-03-21 13:06:02 +01: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
853a3160d3
add notice about availabilities export
2017-03-02 13:39:49 +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
1503e9b83f
fix typo
2017-03-01 14:20:50 +01:00
Sylvain
cf9181770b
export space statistics
2017-03-01 12:56:11 +01:00
Sylvain
b48451f9f8
improved space reservation optional explication message
2017-03-01 11:47:20 +01:00
Sylvain
a0e7e7951f
[ongoing] display spaces in public calendar
2017-02-28 11:59:48 +01:00
Sylvain
b48557fd96
invoice generation for space reservation
2017-02-27 17:42:36 +01:00
Sylvain
8e86c4b212
[ongoing] spaces reservation calendar
2017-02-23 17:45:55 +01:00
Sylvain
32a2a220bf
clean trainings reservation locales
2017-02-23 12:52:54 +01:00
Sylvain
71a3c8b41f
pluralize selection helper in cart
2017-02-22 16:53:58 +01:00
Sylvain
c2c400107d
improved tag management in cart
2017-02-22 11:23:32 +01:00
Sylvain
ce087ae778
refacto wording to make cart reservableType agnostic
2017-02-22 10:51:07 +01:00
Sylvain
7a21a907a8
offer slot from cart + [ongoing] refacto cart translations
2017-02-22 09:44:15 +01:00
Sylvain
a463ad6a2a
[ongoing] refacto cart translations
2017-02-21 17:45:53 +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
42819b18cb
refactor plan form translations mapping
2017-02-14 16:19:10 +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
73a5689140
inteface to display spaces
2017-02-14 12:41:51 +01:00
Sylvain
da95e6e0d8
space creation interface
2017-02-14 11:28:07 +01:00
Sylvain
9d367f95db
[ongoing] new space interface
2017-02-13 17:18:06 +01:00
Sylvain
40952600e7
basic interface structure for space management
2017-02-13 17:00:27 +01:00
Sylvain
560bb46383
space db model
2017-02-13 14:38:28 +01:00
Alex Coelho
09af61ab3f
Translate to portuguese-br rails
2017-02-03 15:28:14 -02:00
Alex Coelho
592d7be448
Translate to portuguese-br mails
2017-02-03 15:27:01 -02:00
Alex Coelho
9911566d51
Translate to portuguese-br pt-BR
2017-02-03 15:25:57 -02:00
Alex Coelho
8f40eee51a
Translate to portuguese-br devise
2017-02-03 15:25:25 -02:00
Alex Coelho
d613ab7fb2
Translate to portuguese-br app.shared
2017-02-03 15:24:04 -02:00
Alex Coelho
6b2b15b4c3
Translate to portuguese-br app.public
2017-02-03 15:23:03 -02:00
Alex Coelho
91d5b23dad
Translate to portuguese-br app.logged
2017-02-03 15:22:11 -02:00
Alex Coelho
e558fb4106
Translate to portuguese-br app.admin
2017-02-03 15:20:47 -02:00
Sylvain
c479502dd0
[bug] too many unread notifications cause system memory overflow
2017-01-05 15:06:54 +01:00
Sylvain
9bfaaaccd9
improved numerous notifications display
2016-12-19 17:08:11 +01:00
Sylvain
12aaa7007c
fix a bug about notification email for refunf invoices
2016-12-15 14:27:58 +01:00
Sylvain
102eecdc8a
ability to send again auth migration code
2016-12-15 14:16:24 +01:00
Sylvain
5e1b85832c
[ongoing] resend sso fusion token
2016-12-14 17:14:53 +01:00
Sylvain
d8b6848b1b
sso wording
2016-12-14 15:14:33 +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
b44089a33d
interface & api to build avoir for a wallet credit
2016-12-12 14:20:26 +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
f0e11cf718
fix pdf invoice generation with cash coupon
2016-11-28 09:57:09 +01:00
Sylvain
3ce41f0c5c
[to test] send cash coupon to user by mail
2016-11-24 18:17:49 +01:00
Sylvain
ce6877b484
success message when applying cash coupon
2016-11-24 18:05:16 +01:00
Sylvain
0a08c4c32d
check cash coupons does not exceed cart amount for subscriptions
2016-11-24 16:38:22 +01:00
Sylvain
04e10c8bb6
check cash coupons does not exceed cart amount for trainings & machines
2016-11-24 13:58:41 +01:00
Sylvain
21d887945e
improve translation to make it sex-agnostic
2016-11-23 14:31:58 +01:00
Sylvain
51faeedfa8
fix translation name in plan form
2016-11-23 12:57:33 +01:00
Sylvain
ad2911529c
db model, api and interface for cash coupons
2016-11-23 12:43:42 +01:00
Sylvain
d46e6cf9c9
[members excel export] invoicing disabled
2016-11-16 15:08:24 +01:00
Sylvain
73e4439036
front-end modifications to cancel a booked event
2016-11-09 17:07:48 +01:00
Sylvain
da71ba783c
[bug] exports for events reservation always have seats=1 ( fixes #54 )
2016-11-09 15:01:58 +01:00
Sylvain
c04ed51f85
[bug] translation conflict
2016-11-09 14:35:02 +01:00
Peng DU
99cca406d5
fix bug: event date period dant show correct in invoice
2016-11-03 12:17:19 +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
fc747c55c7
wallet credit confirmation
2016-09-29 13:02:24 +02:00
Sylvain
b715078e83
[admin] button to delete training from view + confirmation on machine/training deletion from view
2016-09-27 15:32:49 +02:00
Sylvain
36524d4cd9
display list of allowed extensions in project's CAD attachments
2016-09-27 14:08:04 +02:00
Sylvain
6401b321ef
[feature] display fab-manager's version, when logged as admin
2016-09-22 16:46:14 +02:00
Sylvain
13f416a101
[sso] save and restore field data mapping
2016-09-15 15:58:21 +02:00
Sylvain
ee333df53f
improved transformation interface
2016-09-14 18:54:53 +02:00
Sylvain
77626aa674
[SSO] interface for transforming boolean and dates datatypes
2016-09-14 18:52:18 +02:00