1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-10 21:24:20 +01:00
Commit Graph

617 Commits

Author SHA1 Message Date
Peng DU
ba5e5752a4 allow add more picture for project step 2016-11-02 14:58:06 +01:00
Peng DU
84c03a690b add padding for summernote editor modal 2016-11-02 11:12:23 +01:00
Sylvain
f9220d44a0 fix i_accept_to_receive_information_from_the_fablab in sign-up modal 2016-10-26 16:35:10 +02:00
Sylvain
42f7b3c75c add HTML in event description 2016-10-26 16:33:21 +02:00
Sylvain
91f70e2c47 [bug] statistics graphs not working 2016-10-24 09:31:29 +02:00
Sylvain
c500518c28 [bug] sharing project or event w/o image on social network render error 500 2016-10-11 16:07:34 +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
fc747c55c7 wallet credit confirmation 2016-09-29 13:02:24 +02:00
Sylvain
1ef2c11355 add links to RSS feeds into application header 2016-09-29 11:54:08 +02:00
Sylvain
34ad1c9056 move RSS code into separate folders 2016-09-29 10:53:20 +02:00
Sylvain
376cb6dbe9 Merge branch 'rss_feeds' of git://github.com/Vincent14/fab-manager into Vincent14-rss_feeds 2016-09-29 10:09:15 +02:00
Sylvain
c2d2786515 fix default_host for dev and test environments 2016-09-29 10:02:31 +02:00
cyril
a0fef8d046 bug fix: not to force https in env production for root_url helper 2016-09-28 13:58:22 +02:00
Sylvain
785e9a42f8 test fix asset:precompile 2016-09-28 10:52:25 +02:00
Sylvain
60d60fdd65 use slugs in projects URL opened from notifications 2016-09-27 16:58:57 +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
d45ca7213f updated changelog 2016-09-27 14:10:00 +02:00
Sylvain
36524d4cd9 display list of allowed extensions in project's CAD attachments 2016-09-27 14:08:04 +02:00
Sylvain
bf9ea40648 [feature #40] project images will show in full-size on a click 2016-09-27 11:50:05 +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
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
Sylvain
30c52dfe95 share on twitter with title 2016-09-26 16:44:45 +02:00
Sylvain
a1fd69f309 auth provider safe destroy 2016-09-26 12:41:59 +02:00
cyril
b2b66e7910 display the edit button for admin 2016-09-23 14:43:34 +02:00
cyril
c14a4d03c5 ui: machines and trainings list : remove the description 2016-09-23 14:42:53 +02:00
cyril
70a95ffcd7 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2016-09-23 14:40:47 +02:00
cyril
eed8f6519e display caret icon for small screen in profil nav 2016-09-23 14:40:41 +02:00
Peng DU
fc9aeb00a2 remove edit wallet reference from facture 2016-09-23 12:52:43 +02:00
Peng DU
0f7238bbba fix wallet amount display error 2016-09-23 11:46:58 +02:00
Peng DU
972a5e0a89 fix bug: admin cant pay a plan with code promo by wallet 2016-09-22 18:04:13 +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
270b279ffb user can use a code promo for pay le plan by wallet and carte visa 2016-09-21 16:19:04 +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
afb026bdc9 clear invoice_item of wallet/group if payment has a error 2016-09-20 17:42:30 +02:00
Peng DU
802e239d5b calcul total price of reservation with coupon when use wallet 2016-09-20 16:54:23 +02:00
Peng DU
e5341b0b89 fix bug: cant subscribe a plan 2016-09-20 14:37:35 +02:00
Peng DU
5d6aa163b5 change groups cache key name 2016-09-20 11:39:49 +02:00
Vincent
6920793ce1 add RSS feed to events index 2016-09-15 22:22:35 +02:00
Vincent
a5c6ba5f7d add RSS feed to projects index 2016-09-15 21:50:08 +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
32a79bec1b [bug] clicking on the text in stripe's payment modal, does not validate the checkbox 2016-09-15 18:22:52 +02:00
Sylvain
638747ff0e [SSO] improved boolean mapping interface 2016-09-15 18:15:23 +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
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
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
ec0f597067 [sso] display strategy name in providers list 2016-09-13 12:06:25 +02:00
Sylvain
627073f2be [SSO] updated user's documentation 2016-09-12 17:29:44 +02:00
Sylvain
336158c5ad [SSO] fix re-mapping of avatar, address and organization 2016-09-12 12:10:46 +02:00
Sylvain
d233297469 check coupon code server side + integration test for wrong copon 2016-09-08 15:19:12 +02:00
Sylvain
d99d090814 remove duplicate in mime types 2016-09-07 16:30:14 +02:00
Sylvain
19e89cce3d [feature] validate project attachement by mime type 2016-09-07 15:44:19 +02:00
Sylvain
6bbb45c953 add more extensions to the allowed projects attachements 2016-09-07 12:17:21 +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
ea671d03a4 database structure for custom aggregations in statistics 2016-09-05 17:16:23 +02:00
Sylvain
d0837706b6 fixed rake tasks 2016-09-05 15:30:46 +02:00
Sylvain
701b913eb1 [ongoing] elastic data structure for storing availabilities info 2016-09-05 15:15:31 +02:00
Sylvain
3dea7a63a9 prevent sending multiple reminders for reservations with multiple slots 2016-09-01 16:26:08 +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
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
401e88cd88 fix event hover color for age range and theme 2016-09-01 11:44:18 +02:00
Sylvain
c3505c1419 fix coupon discount if reservation+subscription when pay by stripe 2016-09-01 11:36:51 +02:00
Sylvain
cb42b46790 [Bug] machine name is not shown in plan edition 2016-08-31 17:01:01 +02:00
Sylvain
87104a6b97 remove unused recuced_amount from event + allow to rollback migrations + openAPI will display custom prices for events 2016-08-31 11:58:37 +02:00
Sylvain
4c9879768b fix statistic generation for events with custom prices 2016-08-30 17:03:05 +02:00
Sylvain
ea73b9a88b fix create event without custom price + fix test fixtures 2016-08-30 14:48:22 +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
f175b4b28e display custom prices places names in reservation summary after booking an event 2016-08-30 10:17:52 +02:00
Sylvain
d8e467d261 fix coupon usage with on-site payment 2016-08-30 09:47:03 +02:00
Sylvain
cd038a8550 custom price on all occurrences with recursive event creation 2016-08-30 09:37:05 +02:00
Sylvain
8aef50660a show custom price reservations in admin/events/show reservations 2016-08-29 17:51:11 +02:00
Sylvain
60a8f60be8 display custom prices in events index 2016-08-29 17:33:21 +02:00
Sylvain
7bc19f540d show custom price event bookings in dashboard 2016-08-29 17:21:20 +02:00
Sylvain
3d1c852576 show custom prices bookings in admin/editMember 2016-08-29 16:54:10 +02:00
Sylvain
d47a5aea5f statistics generation for event with custom prices 2016-08-29 16:44:07 +02:00
Sylvain
d86cccf98c custom prices in invoice generation 2016-08-29 16:37:51 +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
05b010b83f fix ability to edit custom prices 2016-08-25 14:13:30 +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
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
ea7410a738 reservation reminder: tested and fixed 2016-08-23 10:10:58 +02:00
Sylvain
cc1d6e4f21 [not tested] send reminder notification every hours for upcoming reservations 2016-08-17 17:39:12 +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
63e767bd18 refactored settings page 2016-08-17 10:10:23 +02:00
Sylvain
1799ab9bf5 fix error message 2016-08-17 09:54:31 +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
396d7b4df7 include coupons discounts in statistics CA 2016-08-16 10:29:08 +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
1e0d809db9 handle coupon in refunds 2016-08-11 13:44:42 +02:00
Sylvain
d955f5d3e1 use coupon in event reservation 2016-08-11 12:34:55 +02:00
Sylvain
a63c1830cd better fix for events categories 2016-08-11 11:33:55 +02:00
Sylvain
0c3a2a7832 fix events categories 2016-08-11 11:07:49 +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
8a68445d2e fix stripe coupon creation 2016-08-10 17:48:34 +02:00
Sylvain
4be571e6d2 fix coupon usage with stripe 2016-08-10 17:37:17 +02:00
Sylvain
e122b99ebb coupon usage in trainings 2016-08-10 16:53:40 +02:00
Sylvain
6e1dfda8f5 show coupon details in invoice 2016-08-10 16:33:26 +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
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
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
ce31c1412b coupons usages are counted with invoices 2016-08-04 09:45:00 +02:00
Sylvain
84a7e81813 API for coupons 2016-08-03 17:56:36 +02:00
Sylvain
3a932e75c0 coupon data model & tests 2016-08-03 17:25:00 +02:00
Sylvain
c9a7c599c0 notify admin about organization registration & organization server validation 2016-08-02 18:06:07 +02:00
Sylvain
e3774230d3 use organization name & address in invoices if any 2016-08-02 15:55:49 +02:00
Sylvain
af94b62ff1 add organization infos to members xlsx export 2016-08-02 15:28:24 +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
ccc1eaf3a0 database structure for organizations 2016-08-01 17:36:38 +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
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
Sylvain
32d239f723 [Bug #28] Event type disappear when editing the event 2016-07-25 16:16:25 +02:00
Sylvain
54740d13f8 Fix i18n for stripe payment dialog 2016-07-25 12:14:38 +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
7650ec5a5a fix bug: dont get plan object in compute amount of wallet in reservation 2016-07-21 16:32:57 +02:00
Peng DU
909c204af5 show invoice download link in wallet transaction debit operator 2016-07-21 16:32:57 +02:00
Peng DU
9ba8e46450 refactroing wallet service, credit/debit in transaction of db, if have an error we rollback all 2016-07-21 16:32:57 +02:00
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
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
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
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