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
576 Commits 15 Branches 273 Tags 82 MiB
5d91756ace
Commit Graph

114 Commits

Author SHA1 Message Date
Sylvain
7dc359e4ee associate custom price categories to an event 2016-08-25 13:16:47 +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
b166d6abc6 renamed FlowWorkers to more consistant name (Processors) 2016-08-17 15:43:13 +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
428b2db0ea send a coupon to a user 2016-08-16 18:12:13 +02:00
Sylvain
ba559d87fb use coupon in plan subscription 2016-08-11 18:17:28 +02:00
Sylvain
0c3a2a7832 fix events categories 2016-08-11 11:07:49 +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
a679bc1638 compute price including coupon discount 2016-08-09 16:36:14 +02:00
Sylvain
c23b6fa3e0 fix coupons test 2016-08-08 15:43:02 +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
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
84a7e81813 API for coupons 2016-08-03 17:56:36 +02:00
Sylvain
33358c2fb5 ability to edit organization in profile & ablity to link its params from an sso 2016-08-02 15:11:26 +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
dbc199cbba project preview in facebook open graph 2016-07-28 17:44:58 +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
a2066d8c09 [feature]async generation of users exports 2016-07-27 17:00:06 +02:00
Sylvain
b3f56cefd4 alert user about ongoing running export 2016-07-27 15:42:29 +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
Sylvain
32d239f723 [Bug #28] Event type disappear when editing the event 2016-07-25 16:16:25 +02:00
Peng DU
909c204af5 show invoice download link in wallet transaction debit operator 2016-07-21 16:32:57 +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
70d623f65a filter calendar by machine/formation/event or disponible 2016-07-14 18:36:52 +02:00
Peng DU
066458ca70 availability type filter 2016-07-14 12:20:03 +02:00
Peng DU
c1cdea18f3 optimise sql query 2016-07-14 12:20:03 +02:00
Peng DU
49ee5011c1 show availability with reservation state 2016-07-14 12:20:02 +02:00
Peng DU
a67320121c rename a variable 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
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
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
3413c3040b [ongoing] members export full infos 2016-07-12 17:46:19 +02:00
Sylvain
bfe04c8be6 export reservations: eager load reservables 2016-07-12 13:38:35 +02:00