rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-10 21:24:20 +01:00
Code Issues Releases Activity
1,820 Commits 15 Branches 273 Tags 82 MiB
a7f68b59dd
Commit Graph

185 Commits

Author SHA1 Message Date
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
73a62bd9a0 [feature] allow setting decimal prices 2017-11-02 15:33:56 +01:00
Sylvain
cc94a19ba6 hide disabled spaces in admin pricing area 2017-10-11 15:50:18 +02:00
Sylvain
02baf9097e hide disabled machine in admin pricing zone + prevent creating negative credits 2017-10-11 14:48:03 +02:00
Sylvain
45465e8b59 prevent associate disabled machines w/ training 2017-10-11 13:00:46 +02:00
Sylvain
c67360771a ability to disable machine 2017-10-11 12:10:05 +02:00
Sylvain
41eef71ead fix c/p issue + prevent link disabled training to user 2017-10-11 11:40:21 +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
33b146d243 hide disabled groups 2017-10-10 15:44:17 +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
dbff2d1745 events list: change buttons to anchors to allow opening in background tab 2017-09-26 09:44:55 +02:00
Sylvain
f874748f74 [bug] fix events monitoring pagination 2017-09-25 15:48:21 +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
siteswapjuggler
52071c7b83 Merge remote-tracking branch 'LaCasemate/master' 2017-09-10 12:01:59 +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
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
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
cyril
3fcf61de24 hide spaces in admin's credit management if spaces are disabled 2017-03-28 20:13:18 +02:00
Sylvain
5abc85ae0a [feature] weekly plans 2017-03-21 13:06:02 +01:00
Sylvain
2c1b65eab9 Merge branch 'hotfix' into dev 2017-03-15 13:07:28 +01:00
Sylvain
8d5966396d [bug] editing a plan remove the rolling attribute 2017-03-15 12:50:19 +01: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
6df0a4090e hide spaces in admin's price management and in plan edition if spaces are disabled 2017-03-01 15:58:40 +01:00
Sylvain
8343c1503d disabled ability to create space availabilities if no spaces 2017-02-16 12:06:44 +01:00
Sylvain
f850c66f01 prevent add space availability if disabled 2017-02-15 16:58:17 +01:00
Sylvain
23b9851218 allow enable/disable spaces -> disabled by default 2017-02-15 15:41:25 +01:00
Sylvain
69130a1309 fix translation mapping in settings 2017-02-15 13:38:16 +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
5b7e8474d4 asterisk on group select in member form 2017-01-03 12:07:16 +01:00
Sylvain
1f0da1194b [bug] fix VAT amount in invoice config 2017-01-02 11:08:40 +01:00
Sylvain
ecbe8a58a2 coupon edition: display internationalized errors 2016-12-13 12:46:00 +01:00
Sylvain
85ee73f0e0 ability to edit coupon expiration 2016-12-13 12:01:54 +01:00
Sylvain
10fc7b69e9 Ability to display optional information message on event reservation page 2016-11-29 16:46:19 +01:00
Sylvain
cf11f6afcf factorize currency symbol into 2016-11-23 14:27:11 +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
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
24a0f5533c fix unable to view dashboard nav buttons on small devices + fix responsive issues on admin views 2016-09-27 09:55:24 +02:00
Peng DU
fc9aeb00a2 remove edit wallet reference from facture 2016-09-23 12:52:43 +02:00
Sylvain
638747ff0e [SSO] improved boolean mapping interface 2016-09-15 18:15:23 +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
Sylvain
dc4c4b678f [sso] fix create mapping w/ datatype display 2016-09-14 17:13:07 +02:00
Sylvain
50543b8d09 [sso] give informations about the expected data in sso mapping 2016-09-14 16:41:45 +02: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
9d599a14e5 display custom aggregations in front statistics 2016-09-06 16:53:04 +02:00
Sylvain
71a111d8ba improved reservations settings validation (delays) 2016-09-01 16:15:41 +02:00
Sylvain
9aef331596 add textual indications about empty fields in coupon form 2016-09-01 14:54:24 +02:00
Sylvain
cb42b46790 [Bug] machine name is not shown in plan edition 2016-08-31 17:01:01 +02:00
Sylvain
4f41aa6554 event custom prices: various fixes and removed artifacts 2016-08-30 13:07:47 +02:00
Sylvain
8aef50660a show custom price reservations in admin/events/show reservations 2016-08-29 17:51:11 +02:00
Sylvain
3d1c852576 show custom prices bookings in admin/editMember 2016-08-29 16:54:10 +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
Sylvain
6c3dfab0a9 API for price categories management 2016-08-24 12:30:48 +02:00
Sylvain
9748ea596f interface structure refactoring for fares' categories 2016-08-23 17:49:43 +02:00
Sylvain
ead7eda76b interface structure refactoring for fares' categories 2016-08-23 17:49:28 +02:00
Sylvain
26aed7a1b5 ability for the admin to set custom settings for the reservation reminders + fix settings customization confirmation message 2016-08-17 12:49:52 +02:00
Sylvain
63e767bd18 refactored settings page 2016-08-17 10:10:23 +02:00
Sylvain
8aa5d5e4f5 allow dashes in coupon codes 2016-08-17 09:53:58 +02:00
Sylvain
428b2db0ea send a coupon to a user 2016-08-16 18:12:13 +02:00
Sylvain
3253290860 [ongoing] send a coupon to a user 2016-08-16 11:33:10 +02:00
Sylvain
e2ea64cf9c coupon edition + refactored coupon status 2016-08-08 15:21:33 +02:00
Sylvain
a6ded12ee9 create/delete coupons on stripe + adjust schema to match stripe requirements 2016-08-08 14:42:17 +02:00
Sylvain
23320104c5 ability to edit coupons 2016-08-08 12:08:09 +02:00
Sylvain
7c434db09a interface to create new coupons 2016-08-04 18:13:19 +02:00
Sylvain
ee03f1a79c admin interface to list coupons 2016-08-04 14:26:07 +02:00
Sylvain
0eaa81b0ba extracted some heavy admin views into sub-templates files & fixed uncomplete users display behavior in admin list 2016-08-04 12:08:33 +02:00
Sylvain
5cacb1d34a notify admin when users exports are running 2016-07-28 10:28:43 +02:00
Sylvain
b3f56cefd4 alert user about ongoing running export 2016-07-27 15:42:29 +02:00
Sylvain
7843cd1f8e fix typo 2016-07-27 12:34:42 +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
773c1adf4a edit invoice reference 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
Peng DU
d0956bb0aa show wallet transactions of user 2016-07-21 16:32:54 +02:00
Peng DU
db8a6e8a32 application can show user wallet 2016-07-21 16:32:53 +02:00