465 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Peng DU	56f2ea4172	always use debit text	2016-07-21 16:32:57 +02:00
Peng DU	5d84dcb666	update locale	2016-07-21 16:32:57 +02:00
Peng DU	9befe091b8	refactoring generate invoice settlement info	2016-07-21 16:32:57 +02:00
Peng DU	85153c201e	test invoice wallet amount	2016-07-21 16:32:56 +02:00
Peng DU	50ba15b5bf	fix bug: dont update wallet amount if invoice disable, cant update wallet amount when user only subscribe subscription	2016-07-21 16:32:56 +02:00
Peng DU	7be60c2d00	fix locale key no found error	2016-07-21 16:32:56 +02:00
Peng DU	f2010e752d	show pay by wallet in invoice	2016-07-21 16:32:56 +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	4f42253d3d	wallet transaction list operation locale	2016-07-21 16:32:55 +02:00
Peng DU	38fafb7a70	wallet credit amount can be a float	2016-07-21 16:32:55 +02:00
Peng DU	220676b4dc	test user reservation/subscription with wallet	2016-07-21 16:32:55 +02:00
Peng DU	61273bd66f	fix test	2016-07-21 16:32:55 +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	1dab903054	refactoring wallet amount to concern	2016-07-21 16:32:54 +02:00
Peng DU	9116e8c04a	wallet transaction type must be credit/debit	2016-07-21 16:32:54 +02:00
Peng DU	b22bae1d8f	wallet amount convert auto to float	2016-07-21 16:32:54 +02:00
Peng DU	cac9e16c17	cant debit/credit a negative	2016-07-21 16:32:53 +02:00
Peng DU	363fd73bc4	add model WalletTransaction	2016-07-21 16:32:53 +02:00
Peng DU	db8a6e8a32	application can show user wallet	2016-07-21 16:32:53 +02:00
cyril	83ed46a4d8	update docker-compose doc with letsencrypt support	2016-07-21 15:21:33 +02:00
cyril	bd83bae0bd	update docker doc with plugins support	2016-07-21 15:16:42 +02:00
cyril	e04e25e825	adding documentation to configure letsencrpyt SSL with docker	2016-07-21 15:11:08 +02:00
Peng DU	61b9cf71f0	add log level to env	2016-07-19 16:37:25 +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	43740b2364	update changelog	2016-07-18 18:16:54 +02:00
Peng DU	608ed8b64f	Merge branch 'calendrier' into dev	2016-07-18 18:11:17 +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	e504f035d3	fix orthographie	2016-07-18 17:52:03 +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	c1cdea18f3	optimise sql query	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	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	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