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

392 Commits

Author SHA1 Message Date
Sylvain
8119f54e4c Statistics about hours available for machine reservations and tickets available for training reservations, now handle custom filtering on date and type 2017-01-03 17:07:23 +01:00
Sylvain
94abdb9eec revert last commit 2017-01-02 17:01:52 +01:00
Sylvain
a39be14718 fix number of remaining notifications 2017-01-02 15:56:52 +01:00
Sylvain
9bfaaaccd9 improved numerous notifications display 2016-12-19 17:08:11 +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
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
85ee73f0e0 ability to edit coupon expiration 2016-12-13 12:01:54 +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
4c8b661750 display coupon application result in inline message instead of growl notification 2016-11-30 10:17:05 +01:00
Sylvain
10fc7b69e9 Ability to display optional information message on event reservation page 2016-11-29 16:46:19 +01:00
Sylvain
852437ebf8 remove coupon from memory after payment 2016-11-29 15:35:54 +01:00
Sylvain
0c05b45d08 improved error message on machine reservation w/ stripe payment 2016-11-29 09:15:30 +01:00
Sylvain
70a369a2b9 display error message on server error when paying by card 2016-11-28 16:47:40 +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
ff11694e05 check cash coupons does not exceed cart amount for events 2016-11-24 15:01:35 +01:00
Sylvain
04e10c8bb6 check cash coupons does not exceed cart amount for trainings & machines 2016-11-24 13:58:41 +01:00
Sylvain
3dc5f1a0e4 real fix for coupon change slot's original price (reverts cfd92cdc40) 2016-11-24 11:33:45 +01:00
Sylvain
30ab25b5a0 normalize ProjectsController code structure 2016-11-23 15:01:33 +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
6c9fdaaf83 [bug] fix machine hours stats graph 2016-11-21 11:35:56 +01:00
Peng DU
ba5e5752a4 allow add more picture for project step 2016-11-02 14:58:06 +01:00
Sylvain
91f70e2c47 [bug] statistics graphs not working 2016-10-24 09:31:29 +02:00
Sylvain
7d54341d98 Merge remote-tracking branch 'github/master' into dev 2016-10-11 15:37:35 +02: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
611652ccb5 [bug] many fixes on admin calendar 
- [bug] after creating an element (training/machine), browse through the calendar and come back: the element appears duplicated
- [bug] deleting an element have an erronous confirmation message
- [bug] deleting an element cause the message "cannot read property 'length' of undefined" to be displayed in the console
 2016-10-05 11:06:58 +02:00
Sylvain
c2d2786515 fix default_host for dev and test environments 2016-09-29 10:02:31 +02:00
Sylvain
785e9a42f8 test fix asset:precompile 2016-09-28 10:52:25 +02:00
Sylvain
e48bb88f1f use slug in traning show url 2016-09-27 16:00:22 +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
9a71dc5ea2 trainings monitoring: open current year/month by default on training selection 2016-09-27 14:56:57 +02:00
Sylvain
36524d4cd9 display list of allowed extensions in project's CAD attachments 2016-09-27 14:08:04 +02:00
Sylvain
6e94850522 prevent project step reordering to trigger unsaved-changes dialog 2016-09-27 11:31:20 +02:00
Sylvain
1195451863 [bug] embedded video not working in tranings/machines descriptions 2016-09-27 10:45:07 +02:00
Sylvain
30c52dfe95 share on twitter with title 2016-09-26 16:44:45 +02:00
Sylvain
205c45060a update version on user login according to their role 2016-09-22 17:01:40 +02:00
Sylvain
6401b321ef [feature] display fab-manager's version, when logged as admin 2016-09-22 16:46:14 +02:00
Peng DU
1008a6dd1b fix bug: cant show correct payment modal when pay by wallet and code promo 2016-09-21 13:09:10 +02:00
Peng DU
cfd92cdc40 fix bug: code promotion change slot's price original 2016-09-20 18:39:28 +02:00
Peng DU
e5341b0b89 fix bug: cant subscribe a plan 2016-09-20 14:37:35 +02:00
Sylvain
64bae54bce [Bug] move event reservation is not limited by admin settings (prior-delay & disable) 2016-09-15 18:43:27 +02:00
Sylvain
3c277428bf [SSO] field data mapping transformation on data reception 2016-09-15 17:10:41 +02:00
Sylvain
13f416a101 [sso] save and restore field data mapping 2016-09-15 15:58:21 +02:00
Sylvain
77626aa674 [SSO] interface for transforming boolean and dates datatypes 2016-09-14 18:52:18 +02:00
Sylvain
a0fb6fb683 [sso] show mapping datatype in provider edition 2016-09-14 17:32:11 +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
019cfcadea [sso] fix endpoint regexp 2016-09-13 12:09:55 +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
53dd54b175 working custom aggs w/ result tidy in stats query 2016-09-06 16:32:41 +02:00
Sylvain
1fec50accf ability to run custom aggregation with query and append result to query 2016-09-06 14:21:52 +02:00
Sylvain
9aef331596 add textual indications about empty fields in coupon form 2016-09-01 14:54:24 +02:00
Sylvain
670e9371d8 improved machine reservation tag display 2016-09-01 14:34:08 +02:00
Sylvain
434234c235 [Bug] machine slots with tags are not displayed correctly on reservation calendar 2016-09-01 14:31:21 +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
63a9f8bf95 update nummber of free places after event reservation payment 2016-08-30 12:45:35 +02:00
Sylvain
b9411366c2 update nb of free places after moving an event reservation with custom prices 2016-08-30 12:34:36 +02:00
Sylvain
7de896feb9 display 'pay' button when booking only custom prices tickets 2016-08-30 12:11:51 +02:00
Sylvain
feda4861f2 ability to move reservation with custom fares reservations 2016-08-30 11:27:25 +02:00
Sylvain
8aef50660a show custom price reservations in admin/events/show reservations 2016-08-29 17:51:11 +02:00
Sylvain
af883ea1ec show custom price tickets booked in event show 2016-08-29 16:28:26 +02:00
Sylvain
06d65c785a reserve event with custom prices 2016-08-29 15:43:47 +02:00
Sylvain
12eadb8ceb interface for booking event custom prices 2016-08-29 11:09:36 +02:00
Sylvain
c6a83e98cb [ongoing] db architecture for custom prices reservation 2016-08-25 18:41:33 +02:00
Sylvain
4fd31c3e9b display custom prices in event show 2016-08-25 15:36:52 +02:00
Sylvain
5d91756ace ability to edit event with custom prices 2016-08-25 13:56:07 +02:00
Sylvain
7dc359e4ee associate custom price categories to an event 2016-08-25 13:16:47 +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
Sylvain
6c3dfab0a9 API for price categories management 2016-08-24 12:30:48 +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
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
8ae3cf25b8 fix display success after admin subscribe plan 2016-08-11 18:30:59 +02:00
Sylvain
ba559d87fb use coupon in plan subscription 2016-08-11 18:17:28 +02:00
Sylvain
d955f5d3e1 use coupon in event reservation 2016-08-11 12:34:55 +02:00
Sylvain
5af64d1cd0 fix: go to training planning when trying to book not trained machine 2016-08-10 18:07:57 +02:00
Sylvain
e122b99ebb coupon usage in trainings 2016-08-10 16:53:40 +02:00
Sylvain
6a87467f7c rebase coupon usage on code instead of id (more secure) 2016-08-10 15:34:47 +02:00
Sylvain
def5384a38 validation of validity_per_user on coupon usage 2016-08-10 11:08:01 +02:00
Sylvain
b4e28b94f3 apply coupon in payment modal + fix update user w/o organization 2016-08-09 17:20:38 +02:00
Sylvain
a679bc1638 compute price including coupon discount 2016-08-09 16:36:14 +02:00
Sylvain
d1c1a614a9 i18n coupon directive 2016-08-09 10:22:01 +02:00
Sylvain
5ce0097aa3 [ongoing] coupon validation and usage directive 2016-08-08 17:09:05 +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
35b324e108 coupon safe destroy 2016-08-08 12:25:27 +02:00
Sylvain
23320104c5 ability to edit coupons 2016-08-08 12:08:09 +02:00
Sylvain
01b77b3179 fixed delete coupon + fixed coupon status 2016-08-08 10:11:36 +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
2afd6ade8a allow user to set his organization on registration 2016-08-02 12:27:45 +02:00
Sylvain
bd54ad8158 ability to share events on social networks twitter & fb 2016-08-01 16:19:50 +02:00
Sylvain
26d5e5e42c allow social share of projects on twitter & facebook 2016-08-01 15:45:56 +02:00
Sylvain
5f96c9916d [feature] newsletter : ask conscent + export in xlsx 2016-07-28 12:20:51 +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
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
Sylvain
32d239f723 [Bug #28] Event type disappear when editing the event 2016-07-25 16:16:25 +02:00
Sylvain
3b9d1b398b Fix i18n for payment dialog 2016-07-25 12:10:10 +02:00
Peng DU
c220678ea5 change some texts in reservation on site 2016-07-21 16:32:58 +02:00
Peng DU
5d84dcb666 update locale 2016-07-21 16:32:57 +02:00
Peng DU
773c1adf4a edit invoice reference 2016-07-21 16:32:56 +02:00
Peng DU
2c49285740 avoir by wallet 2016-07-21 16:32:56 +02:00
Peng DU
2dbc026db1 pay subscription by wallet 2016-07-21 16:32:55 +02:00
Peng DU
31d5c6d3b3 pay totalement/partialement reservation by wallet 2016-07-21 16:32:54 +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
Peng DU
79ef7f4188 refactoring show training controller and add a new action avaibilities 2016-07-19 12:16:41 +02:00
Peng DU
0b053b11ed change calendar default view to agendDay if screen width <= 480px 2016-07-18 18:10:39 +02:00
Peng DU
dd7f67116d change machines list icon 2016-07-18 17:57:50 +02:00
Peng DU
38bf35d06f hide popup of training description 2016-07-18 17:51:49 +02:00
Peng DU
120df2e716 add an aside for filter caldendar in mobile 2016-07-18 16:31:14 +02:00
Peng DU
9638b775fc fix bug: cant set correct default date for fullcalendar 2016-07-18 10:37:54 +02:00
Peng DU
70d623f65a filter calendar by machine/formation/event or disponible 2016-07-14 18:36:52 +02:00
Peng DU
0b1a19cd76 calendar training slot redirect to fetch of training 2016-07-14 12:20:04 +02:00
Peng DU
f26e211acb update locale 2016-07-14 12:20:03 +02:00
Peng DU
dbc9a388a8 fix bug: cant click machines event in < today and > first day of week 2016-07-14 12:20:03 +02:00
Peng DU
066458ca70 availability type filter 2016-07-14 12:20:03 +02:00
Peng DU
b3ca940880 show tag in availability 2016-07-14 12:20:03 +02:00
Peng DU
1fc4439df8 click slot to show machine fetch 2016-07-14 12:20:03 +02:00
Peng DU
2b08cc8594 fix bug cant navigate to yestoday in agendaDay view 2016-07-14 12:20:02 +02:00
Peng DU
68e1b959ff disable slotEventOverlap for agendaDay view 2016-07-14 12:20:02 +02:00
Peng DU
e9c1584968 availability public api 2016-07-14 12:20:02 +02:00
Peng DU
fb26a2e358 add public calendar menu, view, controller, routes and refactoring calldendar config 2016-07-14 12:20:02 +02:00
Peng DU
44b0fd8aa8 get availability border color in helper 2016-07-14 12:20:01 +02:00
Peng DU
0af0cc7878 update angular-ui-calendar and ajax load availabilites 2016-07-14 12:20:01 +02:00
Peng DU
1529e4b14e allow active/disactive a training to show in training lists 2016-07-14 12:18:24 +02:00
Peng DU
503e8fc95f fix bug: check text is exist in breakFilter 2016-07-14 11:26:03 +02:00
Sylvain
6839e8db38 Merge branch 'events' into dev 
Conflicts:
	CHANGELOG.md
	config/locales/app.shared.en.yml
	config/locales/app.shared.fr.yml
 2016-07-13 18:32:30 +02:00
Sylvain
90142ae3bb Merge branch 'training' into dev 2016-07-13 18:15:14 +02:00
Sylvain
68f9324725 Merge branch 'steps' into dev 
Conflicts:
	app/assets/javascripts/controllers/projects.coffee.erb
	db/schema.rb
 2016-07-13 16:10:18 +02:00
Sylvain
3d7b0bbdfc Merge remote-tracking branch 'origin/machines' into dev 2016-07-13 16:03:12 +02:00
Sylvain
2c8001f38f Merge branch 'projects' into dev 
Conflicts:
	app/views/api/members/show.json.jbuilder
 2016-07-13 15:57:45 +02:00
Sylvain
c863975e9c statistics tables: sort by date 2016-07-13 11:12:16 +02:00
Sylvain
ad19bfbd79 fix custom filter CA=0 2016-07-13 10:19:43 +02:00
Sylvain
d84238b331 statistics: global export to excel 2016-07-12 12:03:38 +02:00
Sylvain
8e968f7813 fix type key transmission 2016-07-07 16:57:23 +02:00
Sylvain
8e8bd3f9eb full subscriptions export 2016-07-07 15:31:22 +02:00
Sylvain
e8b1c99d2a Alleluia git add . Downloading xls from front is working 2016-07-06 15:53:09 +02:00
Sylvain
d307f91983 use an hidden form to post export data 2016-07-05 17:23:14 +02:00
Sylvain
b26bbd18ef API accessing service & conforming server-side access points 2016-07-05 12:21:55 +02:00
Sylvain
38c00391fc basic UI and API for exporting stats to excel 2016-07-04 17:15:37 +02:00
Sylvain
683bc835df [bug] statistics: sum of stats does not work 2016-07-04 12:53:56 +02:00
Sylvain
981999c29f simplify event view in index if event on a single day 2016-06-30 16:56:13 +02:00
Sylvain
fda619e422 add info message on categories management + fix existing categories slugs 2016-06-30 16:12:24 +02:00
Sylvain
894f836286 fix the 'load more events' button 2016-06-30 15:26:34 +02:00
Sylvain
0557cb991f rake task for correct event statistics mapping in elastic 2016-06-30 14:14:46 +02:00
Sylvain
5a0bb86394 fix events pagniation 2016-06-30 12:41:47 +02:00
Sylvain
e36df94f0f server-side protection against deleting used filters 2016-06-30 11:39:56 +02:00
Sylvain
c8b42f1b7f add slugs to event filters + add categories into statistics + prevent remove linked elements in front 2016-06-30 11:24:57 +02:00
Sylvain
bb6295c487 prevent from removing the last category 2016-06-30 09:51:06 +02:00
Sylvain
859960ce3e confirmation on event filter deletion 2016-06-30 09:34:26 +02:00
Sylvain
e13870555b ability to link filters to events 2016-06-29 17:05:42 +02:00
Sylvain
bdda4cd7b0 [feature] ability to filter events by category, theme and age 2016-06-29 16:09:27 +02:00
Sylvain
79b97eb113 [feature] manage event's age range 2016-06-29 11:21:21 +02:00
Sylvain
51cce7bbc3 [feature] manage event themes 2016-06-29 10:38:04 +02:00
Sylvain
9adc219edb [feature] manage events categories 2016-06-28 17:06:33 +02:00
Sylvain
7d02fa9d9a rename Courses/Workshops to Events 2016-06-28 11:42:20 +02:00
Sylvain
d5b06d08ad [feature] confirmation on project deletion 2016-06-28 10:02:36 +02:00
Sylvain
875e513f1c Merge remote-tracking branch 'origin/open-api' into dev 2016-06-27 16:31:50 +02:00
Sylvain
8e07460deb [feature] redirect to slugged-url on publish project 2016-06-27 15:34:08 +02:00
Peng DU
df8dbfae8c fix conflt of changelog 2016-06-27 12:42:57 +02:00
Peng DU
60f504c660 event categoriy is required 2016-06-22 18:56:45 +02:00
Sylvain
9b8e3eba88 Merge branch 'stats' into dev 2016-06-21 17:11:40 +02:00
Peng DU
85a40db603 price cache 2016-06-21 16:04:44 +02:00
Peng DU
4d0d3d6af0 optimise load plans json 2016-06-21 14:49:39 +02:00
Sylvain
3e24d328a9 [feature] statistics: username link leads to admin edition 2016-06-21 14:46:00 +02:00
Sylvain
24f963645b optimize usernames mapping in statistics 2016-06-21 14:39:44 +02:00
Sylvain
4639a15e2f [feature] paginate statistics 2016-06-21 13:16:42 +02:00
Peng DU
2df2d8796d add ngSanitize 2016-06-21 13:03:54 +02:00
Sylvain
cb3cd8ee11 [ongoing] paginate statistics results 2016-06-20 17:13:39 +02:00
Peng DU
9e1468cb31 remove ngAnimate for fix bug cant click element on Chrome 51 2016-06-20 13:20:54 +02:00
Sylvain
ba4115a1da Merge remote-tracking branch 'origin/plugin' into dev 2016-06-16 17:13:36 +02:00
Sylvain
f7d8d18bc8 [feature] paginate public list of members 2016-06-16 16:09:22 +02:00
Sylvain
ddbb043a41 do not retrieve full users list on plans page 2016-06-16 14:26:10 +02:00
Sylvain
dbeb0717df fix show existing collaborator name in project edition 2016-06-16 11:11:03 +02:00
Sylvain
a325211552 optimization collaborators of a project 2016-06-16 09:30:38 +02:00
Sylvain
08244d53dc improve trainings load times 
- do not eager load trainings availabilities in INDEX action if not requsted
- in trainings monitoring (font), do not load all availabilities for all traninings by default, by select a training first to load its availabilities
 2016-06-15 12:01:09 +02:00
Sylvain
e503d6edd8 optimize trainings API 2016-06-14 15:42:28 +02:00
Sylvain
4bc57c43d2 fix admin user select 2016-06-14 11:30:17 +02:00
Sylvain
f924144fda [feature] member select with lazy loading 2016-06-14 09:57:39 +02:00
Sylvain
48a90bb7b4 advanced project step modulation with automatic re-ordering 2016-06-02 16:02:08 +02:00
Sylvain
2b1d1fc4dd [feature] basic ability manage steps order 2016-06-02 12:49:00 +02:00
Sylvain
0e6698a9ed fix short descriptions in machines index 2016-06-01 13:53:55 +02:00
Sylvain
525f46aba6 [feature] ability to use HTML in machine specs and description 2016-06-01 13:08:09 +02:00
Sylvain
1bc9db2a65 [feature] 'new project' button in dashboard/my projects 2016-06-01 11:15:01 +02:00
Sylvain
70ff027792 fix AdminMembersController init 2016-06-01 08:55:54 +02:00
Sylvain
fae013d973 members & invoices lists: display 20 items by default + do not display 'load more' button if all items were initially loaded 2016-05-31 17:01:26 +02:00