Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

2017-11-15 13:28:46 +06:30
parent e263ba2433 9647a28f91
commit 71a4b9b7e3
6 changed files with 114 additions and 279 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -26,7 +26,8 @@
 //= require autosize/autosize.js
 //= require jquery-countto/jquery.countTo.js
 //= require raphael/raphael.min
-//= require chartjs/Chart.bundle.js
+//= require Chart.bundle
+//= require chartkick
 //= require fileinput.min
 //= require settings/processing_items
 //= require BSBMaterial/admin.js