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

app/assets/javascripts/application.js

@@ -17,6 +17,8 @@
 //= require turbolinks
 //= require cable
 //= require settings/processing_items
+//= require jquery-ui
+//= require bootstrap-datepicker
 
 $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
     $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
@@ -153,4 +155,3 @@ $(function(){
    }    
 });
 */
->>>>>>> d54fd19d1c18384ee6b21c43ca51587fb7fa843f

app/assets/javascripts/transactions.js

@@ -0,0 +1,7 @@
+//= require jquery
+//= require bootstrap
+//= require jquery_ujs
+//= require turbolinks
+//= require cable
+//= require jquery-ui
+//= require bootstrap-datepicker

app/assets/stylesheets/application.scss

@@ -2,6 +2,8 @@
 @import "bootstrap";
 @import "font-awesome";
 @import "theme";
+@import "jquery-ui";
+@import "bootstrap-datepicker3";
 
 
 /* Show it is fixed to the top */

app/assets/stylesheets/transactions.scss

@@ -0,0 +1,5 @@
+@import "bootstrap";
+@import "font-awesome";
+@import "theme";
+@import "jquery-ui";
+@import "bootstrap-datepicker3";