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
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
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
e765267bb5
fix export for missing users
2016-07-13 18:09:32 +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
cbeb78fd7e
fix members full export
2016-07-13 09:20:52 +02:00
Sylvain
3413c3040b
[ongoing] members export full infos
2016-07-12 17:46:19 +02:00
Sylvain
b489b5d270
change export links to xlsx
2016-07-12 13:41:19 +02:00
Sylvain
bfe04c8be6
export reservations: eager load reservables
2016-07-12 13:38:35 +02:00
Sylvain
1b17290395
optimize export subscriptions & reservations queries
2016-07-12 13:16:29 +02:00
Sylvain
827b3334e1
migrate export subscriptions to axlsx
2016-07-12 13:10:06 +02:00
Sylvain
85912603a2
migrate export reservations to axlsx
2016-07-12 13:00:56 +02:00
Sylvain
d72e39f716
migrate export members to axlsx
2016-07-12 12:48:26 +02:00
Sylvain
d84238b331
statistics: global export to excel
2016-07-12 12:03:38 +02:00
Sylvain
569cc1b737
use theme primary in export header
2016-07-07 17:15:54 +02:00
Sylvain
8e968f7813
fix type key transmission
2016-07-07 16:57:23 +02:00
Sylvain
0f7f2c256a
[export] handle data type in custom fields
2016-07-07 16:34:28 +02:00
Sylvain
022db4e486
export all stats indices to excel
2016-07-07 16:26:25 +02:00
Sylvain
8e8bd3f9eb
full subscriptions export
2016-07-07 15:31:22 +02:00
Sylvain
eec004d1ba
cancel button does not trigger the generation
2016-07-06 19:04:04 +02:00
Sylvain
b0f7c634ea
subscriptions export with all rows
2016-07-06 19:00:22 +02:00
Sylvain
e8b1c99d2a
Alleluia git add . Downloading xls from front is working
2016-07-06 15:53:09 +02:00
Peng DU
40038f571c
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2016-07-06 11:22:05 +02:00
Peng DU
e57d5c96e6
cancel cache machine index json
2016-07-06 11:22:01 +02:00
Sylvain
d307f91983
use an hidden form to post export data
2016-07-05 17:23:14 +02:00
Sylvain
4dcab27af2
API generate valid xlsx files
2016-07-05 16:13:11 +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
8ba797bbf2
add filters in event index view
2016-07-04 11:11:00 +02:00
Sylvain
5af4c0b9d5
fix articles image height
2016-07-04 10:53:09 +02:00
Sylvain
3f6890825b
fix events index: box sizes
2016-07-04 10:39:24 +02:00
Sylvain
981999c29f
simplify event view in index if event on a single day
2016-06-30 16:56:13 +02:00
Sylvain
abb91458b1
display filters infos in event show
2016-06-30 16:45:47 +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
e930e04ed6
add age&theme filters to statistics
2016-06-30 12:48: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
812d7a3c05
server-side protection against last category deletion
2016-06-30 09:57:40 +02:00
Sylvain
bb6295c487
prevent from removing the last category
2016-06-30 09:51:06 +02:00
Sylvain
5374d8d0a6
event form: do not display filters with no values
2016-06-30 09:43:24 +02:00
Sylvain
859960ce3e
confirmation on event filter deletion
2016-06-30 09:34:26 +02:00
Sylvain
eb7ee6300e
remove associations with events on filter deletion
2016-06-29 17:26:41 +02:00
Sylvain
e13870555b
ability to link filters to events
2016-06-29 17:05:42 +02:00
Sylvain
09bcd7df2c
do not display events filter if no values exists for this filter
2016-06-29 16:13: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
cbbd697d38
age_range & theme for event model
2016-06-28 15:56:37 +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
6df3c90da2
fix api doc link
2016-06-27 18:08:19 +02:00
Sylvain
841c2dfd3a
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2016-06-27 17:23:16 +02:00
Sylvain
f6f539d2fc
link to openAPI documentation in front interface
2016-06-27 17:23:05 +02:00
cyril
fb73fc23de
fix ui:list openapi
2016-06-27 17:08:18 +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
a4fcede638
fix bug: cant get member training availability
2016-06-27 13:38:50 +02:00
Peng DU
4eea18a479
fix merge
2016-06-27 12:49:20 +02:00
Peng DU
6db26e7a19
fix conflt
2016-06-27 12:47:03 +02:00
Peng DU
df8dbfae8c
fix conflt of changelog
2016-06-27 12:42:57 +02:00
Peng DU
b477353286
cancel cache for plant and training_prcings
2016-06-27 12:37:44 +02:00
Peng DU
68e45c0460
cache last event and optimise last subscript api
2016-06-27 10:55:51 +02:00
Peng DU
0bb4665b4a
avoid N+1 for users list
2016-06-24 18:43:22 +02:00
Peng DU
d64e8a291b
remove order for avoid N+1
2016-06-24 18:36:36 +02:00
Peng DU
702e35650f
event cache
2016-06-24 18:26:11 +02:00
Sylvain
9e728c691f
[feature] prevent unmerged accounts (soo imported) from being displayed in lists/searches
2016-06-23 11:42:10 +02:00
Sylvain
c90f4684b9
[bug] scroll statistics tables not working when elastic is not localhost
2016-06-23 11:11:54 +02:00
Peng DU
60f504c660
event categoriy is required
2016-06-22 18:56:45 +02:00
Peng DU
1383483a54
dont compute member list if not complete
2016-06-22 17:28:04 +02:00
Peng DU
4dff74827b
optimise machine/training availabilities query
2016-06-22 12:54:12 +02:00
Peng DU
e82372fb7b
optimise machine availabilities query
2016-06-21 19:07:47 +02:00
Sylvain
9b8e3eba88
Merge branch 'stats' into dev
2016-06-21 17:11:40 +02:00
Peng DU
d65ecf437b
cache training json
2016-06-21 17:02:44 +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
Peng DU
8b699153cc
update jbuilder and add cache in progress
2016-06-20 19:41:05 +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
3bdecbe7fc
[bug] prevent linking field User.merged_at from SSO
2016-06-20 11:46:41 +02:00
cyril
a8b6d1dcc8
fix:ui display price on list plans
2016-06-16 17:49:09 +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
0339fd8e09
allow multi words search in users autocomplete
2016-06-16 12:55:20 +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
49e23062ee
[bug] full-calendar date display on small devices
2016-06-14 10:57:27 +02:00
Sylvain
027e18a020
fix typo
2016-06-14 10:51:20 +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
80e03916d9
[feature] display project origin even on origin platform
2016-06-01 11:29:23 +02:00
Sylvain
1bc9db2a65
[feature] 'new project' button in dashboard/my projects
2016-06-01 11:15:01 +02:00
Sylvain
306e0322c5
[feature] display 'draft' badge on drafts
2016-06-01 10:47:00 +02:00
Sylvain
31356a02f5
[bug] projects drafts are shown on public profiles
2016-06-01 10:38:42 +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
Sylvain
3593f293ce
[feature] partial load of invoices list
2016-05-31 10:02:27 +02:00
Sylvain
820d8bba53
users list: display only active members
2016-05-30 16:39:20 +02:00
Sylvain
c8e9c6dae5
[feature] partial load of users list
2016-05-30 15:39:19 +02:00
Nicolas Florentin
f158ba2890
refacto code insertion code
2016-05-26 15:14:57 +02:00
Nicolas Florentin
822705c54c
adds necessary code to permit navi gami plugin to add data in user profile view
2016-05-26 15:14:20 +02:00
Nicolas Florentin
a47a78fe9c
simpler way to import scss from plugins
2016-05-26 15:13:36 +02:00
Nicolas Florentin
0c00bf5895
Plugin::Instance can register a stylesheets, enable to import it in application.scss dynamically
2016-05-26 15:13:36 +02:00
Nicolas Florentin
a14130473a
plugin underconstruction... !
2016-05-26 15:13:36 +02:00
Sylvain
26f0aa5e0d
fix css layout of public profile for badge inclusion
2016-05-26 14:23:15 +02:00
Sylvain
0be0935474
[feature] add user's job to profile
2016-05-26 12:34:30 +02:00
Sylvain
d009cf3fc1
[feature] add flickr, lastfm & pinterest
2016-05-26 12:05:28 +02:00
Sylvain
7f050223eb
Merge branch 'hotfix' into dev
...
Conflicts:
CHANGELOG.md
2016-05-24 14:59:07 +02:00
Sylvain
139d7d9f0f
[bug] Google Analytics not loaded
...
- angular-google-analytics plugin update from 0.0.15 to 1.1.7
- google analytics config moved into secrets.yml/production
2016-05-24 14:53:07 +02:00
Sylvain
b19765ad4a
change placeholders for social networks + remove contributor status label top margin
2016-05-18 17:21:10 +02:00
Sylvain
1a8d2db53c
[feature][UI][profile banner] set default picture
2016-05-18 16:53:10 +02:00
Sylvain
a66b314e7b
[feature] background picture of profile banner customization
2016-05-18 16:15:54 +02:00
Sylvain
420d247590
adjust avatar position & bio titles
2016-05-18 14:28:44 +02:00
Sylvain
d8cc1ec107
fix responsive public profile
2016-05-18 11:16:55 +02:00
Sylvain
1869dd0bcf
[bug] project gain collaborator i18n key FR
...
[UI] project display in profile
2016-05-18 10:54:50 +02:00
Sylvain
a3e0954f93
fix profile pictos style
2016-05-18 10:11:50 +02:00
Sylvain
9ee869ee3f
fix regex pattern
2016-05-18 09:47:30 +02:00
Sylvain
c1c981a695
social links validation
2016-05-18 09:38:55 +02:00
Sylvain
d005712662
fix social links position & website icon
2016-05-18 09:11:08 +02:00
Sylvain
196f1be6a3
fix missing i18n import
2016-05-18 08:50:55 +02:00
Sylvain
284879e0d4
private profile
2016-05-17 17:43:29 +02:00
Sylvain
0061c3dca6
reorganize profile header zone
2016-05-17 16:41:32 +02:00
Sylvain
93edd6eaa8
[ongoing] UI refactoring of public profile
2016-05-16 18:20:22 +02:00
Sylvain
88de9c3c75
[feature] profile website + edition of is_allow_contact
2016-05-16 14:46:57 +02:00
Sylvain
a430c0cef7
updated echosciences logo
2016-05-16 13:39:16 +02:00
Sylvain
6b66620686
improve social button workflow
2016-05-16 11:23:19 +02:00
Sylvain
7ec5e5ba03
[feature] allow user to add links to his socials networks
2016-05-16 11:18:30 +02:00
Sylvain
a5dd2153d6
move i18n public profile
2016-05-12 15:46:18 +02:00
Sylvain
c499771433
migrate profile edit to 'my parameters' tab and add public profile in dashboard
2016-05-12 13:53:59 +02:00
Nicolas Florentin
e7590997fc
rm dead code
2016-05-10 09:32:09 +02:00
Nicolas Florentin
2c70903dfd
admin open_api_client managing
2016-05-09 18:15:04 +02:00
Nicolas Florentin
e349adf252
adds open_api's documentation
2016-05-05 15:02:02 +02:00
Nicolas Florentin
7f032526cb
implements open_api various endpoints
2016-05-04 18:17:50 +02:00
Nicolas Florentin
1b0f9575b5
adds a base controller for open_api/v1
2016-05-04 11:59:51 +02:00
Nicolas Florentin
92b3471032
creates models open_api client and calls_count_tracing, adds worker to trace calls count
2016-05-04 11:48:14 +02:00
Sylvain
82a9980c20
[bug] is not defined after sso profile sync
2016-05-03 09:37:15 +02:00
cyril
f84e633f7c
Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab
2016-05-02 16:21:26 +02:00
cyril
31d5fbbb15
fix ui projects list
2016-05-02 16:21:23 +02:00
Nicolas Florentin
d29deaad51
projects/index now save in url query param if whole_network is true
2016-05-02 16:18:24 +02:00
cyril
12bc556038
Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab
2016-05-02 16:10:54 +02:00
cyril
7288834417
ui projects list
2016-05-02 16:10:48 +02:00
Nicolas Florentin
4afb968750
fix select option for machines themes and materials when you get back to page and want your history back
2016-05-02 12:48:26 +02:00
cyril
79b69f21ba
Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab
2016-05-02 11:55:15 +02:00
Nicolas Florentin
faf78b7f82
fix bug custom asset favicon-file favicon file is not set
2016-04-25 17:55:37 +02:00
Sylvain
b483b76042
fix arrows in SSO completion
2016-04-25 15:20:00 +02:00
Sylvain
8b8ed342c1
improve responsivness of SSO completion form
2016-04-25 15:14:12 +02:00
Sylvain
33f83180fa
fix typo and css
2016-04-25 14:34:09 +02:00
Sylvain
b4ad735d7f
change interface for SSO/email already used
2016-04-25 14:30:03 +02:00
Nicolas Florentin
542efe363b
projects#index adds tooltip to explain what search over the whole network means
2016-04-25 12:57:35 +02:00
Nicolas Florentin
960f312dc9
projects search params are saved in url query params and remain in browser history
2016-04-25 12:46:30 +02:00
Sylvain
0ee36ca022
refactor interface for SSO profile completion
2016-04-25 12:35:43 +02:00
Nicolas Florentin
4cfcbb47aa
openlab_projects ctrl, rescue all standard error
2016-04-25 10:07:54 +02:00
Nicolas Florentin
5403386c75
fallback and message if openlab server not available
2016-04-25 10:06:35 +02:00
Nicolas Florentin
1a446bf646
frontend openlab search view, ctrl, services
2016-04-22 18:17:55 +02:00
Nicolas Florentin
5ee27da51e
index updated_at, created_at, published_at datetimes
2016-04-21 18:19:55 +02:00
Nicolas Florentin
ec203a8ef8
adds minimal validation to projects
2016-04-21 17:10:50 +02:00
Nicolas Florentin
f65bb95575
almost finishes synchro with openlab system
2016-04-21 11:42:43 +02:00
Nicolas Florentin
711b18f6cd
initial commit
2016-04-20 18:13:36 +02:00
Nicolas Florentin
ed478f95c7
UsersCredits::Manager accept an event Reservation but do not do nothing, acting as a blackbox
2016-04-20 11:24:28 +02:00
Sylvain
d880a8f0f4
fix unable to reserve Event
2016-04-13 18:21:01 +02:00
Sylvain
eb2bc54cec
Merge branch '2-0-rc1' into tests
2016-04-13 14:03:28 +02:00
Sylvain
a0397a2c15
[bug taiga#25] allow event update if changing ng_places
2016-04-13 13:37:05 +02:00
Sylvain
e1567ba7c5
[bug taiga#25] allow event update if removing nb places
2016-04-13 13:05:16 +02:00
Sylvain
11b43afc9a
[bug taiga#25] allow event update if no places nb was set
2016-04-13 12:09:00 +02:00
Sylvain
ef72d07a9e
[bug taiga#21] undefined method[] on notify_admin_profile_complete
2016-04-12 14:18:07 +02:00
Sylvain
d1a9a69d14
[bug taiga#20] group change not propagated
2016-04-12 10:10:16 +02:00
Sylvain
563266f160
[bug taiga#20] group change not propagated (partial fix)
2016-04-11 19:26:40 +02:00
Sylvain
4b6f3c5ea7
[bug taiga#22] display problem in stats for gender=woman
2016-04-11 18:47:16 +02:00
Sylvain
f9628b4989
prevent subscription creation/modification if card_token is invalid
2016-04-11 18:37:15 +02:00
Sylvain
fb2aee7cc5
[bug] fix VAT row and HT total row on invoices
2016-04-11 17:17:33 +02:00
Nicolas Florentin
1344e09f96
adds comments to model reservation
2016-04-08 16:59:09 +02:00
Nicolas Florentin
fa64fd7a2e
remove useless method
2016-04-08 16:58:46 +02:00
Nicolas Florentin
b46ee9177c
adds comments to service UsersCredits::Manager
2016-04-08 11:26:31 +02:00
Nicolas Florentin
d104403af0
little fix Reservation#generate_invoice_items take into account that plan can be purchased at the same time when reserving machine
2016-04-08 11:17:52 +02:00
Nicolas Florentin
c78e010888
refacto method generate_invoice_items using UsersCredits::Manager service
2016-04-08 11:12:03 +02:00
Nicolas Florentin
d22574dae4
UsersCredits::Manager is more strict about arguments that have to be passed
2016-04-08 11:11:42 +02:00
Nicolas Florentin
aee8146040
users_credits/manager service: initializing service, you can pass a plan to simulate that user have that plan
2016-04-08 10:33:50 +02:00
Nicolas Florentin
7649e953e4
refacto subscription extension with first training using a service
2016-04-07 17:57:48 +02:00
Nicolas Florentin
8c3f2d2862
implements a service to handle subscription extension after reservation, comes with tests
2016-04-07 17:55:36 +02:00
Nicolas Florentin
7748d601f8
uses users_credits/manager service in models reservation and subscription, and adds integration tests
2016-04-07 16:02:09 +02:00
Nicolas Florentin
02b56ed6a7
users_credits/manager service, handle the case if user does not have a plan
2016-04-07 16:01:31 +02:00
Nicolas Florentin
2ab8d04a68
adds comment to model invoice_item
2016-04-07 16:00:12 +02:00
Nicolas Florentin
6004dd409c
Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests
2016-04-07 12:57:15 +02:00
Nicolas Florentin
823b4c5e1d
updates users_credits module and manager and adds tests
2016-04-07 12:57:08 +02:00
Sylvain
b72609c072
test and validation from plan group
2016-04-07 12:28:25 +02:00
Nicolas Florentin
28fcd121b4
renames service of users credits manager
2016-04-06 18:26:02 +02:00
Nicolas Florentin
752f40a951
Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests
2016-04-06 18:24:51 +02:00
Nicolas Florentin
44fcb2e089
draft a service to handle users credits
2016-04-06 18:24:26 +02:00
Nicolas Florentin
f12646aaf9
adds integration tests for reservation
2016-04-06 18:23:32 +02:00
Sylvain
6027fb5f38
Merge branch 'hotfix' into tests
2016-04-06 17:47:10 +02:00
Sylvain
929e756b10
[bug] fix incorrect VAT rate on invoices
2016-04-06 17:46:24 +02:00
Sylvain
150e58d47f
test invalid abuse
2016-04-06 14:58:53 +02:00
Sylvain
773e87ecd4
abuses test
2016-04-06 14:45:39 +02:00
Nicolas Florentin
3e112c13eb
removes model and migrations relative to old model machines_pricings
2016-04-05 10:52:29 +02:00
Nicolas Florentin
5d38f1e3a5
does not validate length of availability if start_at or end_at are blank and already missing
2016-04-05 09:57:09 +02:00
Nicolas Florentin
fafec2153c
setup test environment and add the first test
2016-04-04 17:42:45 +02:00
Sylvain
66a37dc692
fix french typo
2016-03-31 14:08:33 +02:00
Sylvain
32d5184164
[fix taiga#15] empty workshop attachment not added
2016-03-31 14:02:16 +02:00
Sylvain
9bf6025b53
Revert "ask for user agreement to CGV on signup"
...
This reverts commit 2bf5a60ab5
.
2016-03-31 13:00:54 +02:00
Sylvain
2587eaf3cc
[feature] link to CGV in about page
2016-03-31 12:59:29 +02:00
Sylvain
2bf5a60ab5
ask for user agreement to CGV on signup
2016-03-31 12:18:07 +02:00
Sylvain
d97c336512
[ #16 ] add email field to reservations export
2016-03-31 11:52:49 +02:00
Sylvain
fe9fea2748
fix typo + remove wrong todo
2016-03-30 17:31:12 +02:00
Sylvain
9a4eff08d0
[bug] invalid link in migration email
2016-03-30 16:48:47 +02:00
Sylvain
232bdbd102
bug fixes
...
- [bug] credits not reset on new plan subscription
- [bug] admin notification (user merged his account) never sent
2016-03-30 15:37:33 +02:00
Sylvain
d83e44d26f
i18n authentication provider type
2016-03-30 10:05:50 +02:00
Sylvain
305e887112
fix CAD files title translation in projects
2016-03-30 09:46:20 +02:00
Sylvain
8a53ae2d2c
fix invoice attachement name
2016-03-29 18:02:40 +02:00
Sylvain
d14edbdcfa
[bug] unable to edit machine without updating image
2016-03-29 17:01:09 +02:00
Sylvain
ff7e33e5e2
fix training description remain on screen after click
2016-03-29 16:54:51 +02:00
Sylvain
6c32f7e54a
fixes in datepicker
...
- date displayed in inputs has the correct year
- date sent to server match the selected date in html forms
- datepicker date format is configurable for i18n
2016-03-29 13:31:02 +02:00
Sylvain
0ea7e97bd7
[fix] fit plan price to bubble width
2016-03-24 16:23:10 +01:00
Sylvain
e81cc1597a
various fix
...
- handle stripe limitation: plan cannot exceed 1 year
- [bug] unable to change password
- [bug] incorrect value of plans durations in admin list
- [css] plan price was exceeding width of the container
2016-03-24 15:39:24 +01:00
Sylvain
ac0712e5bb
i18n plan duration
2016-03-24 14:29:31 +01:00
Sylvain
b8459ef990
fix i18n libs load checkup + fix README
2016-03-24 11:03:26 +01:00
cyril
d1450f65f6
release 2.0 rc
2016-03-23 18:39:41 +01:00
Sylvain
5fff77d906
[bug] unable to edit event (possible fix for #17 )
2016-01-19 10:48:56 +01:00
Sylvain
b267def130
[bug] #2
...
fixes the lack of user's menu on small devices (can't logout, etc)
2015-10-28 11:55:54 +01:00
Sylvain
15dac71137
Merge branch 'dev' of https://github.com/LaCasemate/fab-manager into dev
2015-10-07 16:31:01 +02:00
Sylvain
097d4d81dc
fix: user without allow_contact get 403 forbidden when accessing api/member/self_id
2015-10-07 16:30:38 +02:00
cyril
a01d54e10f
Merge branch 'master' into dev
2015-10-07 14:07:46 +02:00
Sylvain
9c8f35bd1f
fix UI : dashbord button overflow on SM devices
2015-10-06 12:03:46 +02:00
cyril
e8037beaca
update fonts
2015-09-18 10:32:25 +02:00
cyril
1dc86f1827
remove env DISQUS_SHORTNAME
2015-05-18 22:08:06 +02:00
cyril
0678c2d582
summernote: add default height to config js
2015-05-18 21:48:10 +02:00
cyril
0f13d1ce42
summernote : add white background css
2015-05-18 21:47:13 +02:00
Nicolas Florentin
e0c721cff7
adds licence in projects/show
2015-05-18 10:23:50 +02:00
Nicolas Florentin
4686a8c843
rejects project cao file if all blank
2015-05-18 10:16:21 +02:00
Nicolas Florentin
0561cd81ef
fix step title was missing in project/form
2015-05-18 10:15:36 +02:00
Nicolas Florentin
4ba033d2b1
improves wysiwyg editor projects
2015-05-13 18:30:35 +02:00
cyril
d6652bd39d
fixed label demo above nav
2015-05-08 13:33:24 +02:00
cyril
369be9dd63
fixed delete machine error
2015-05-08 13:31:58 +02:00
cyril
68eab24fa1
init depot fabmanager
2015-05-05 03:10:25 +02:00