merge with origin

app/assets/javascripts/application.js

@@ -31,16 +31,55 @@
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/pages/index.js
 //= require BSBMaterial/demo.js
-//= require BSBMaterial/pages/forms/basic-form-elements
 
-/*$(document).on('turbolinks:load', function() {
-  $('.datepicker').datepicker({
-     format : 'dd-mm-yyyy',
-     autoclose: true
+$(document).on('turbolinks:load', function() {
+  // $(document).ready(function(){
+  //Datetimepicker plugin
+    $('.datetimepicker').bootstrapMaterialDatePicker({
+        format: 'DD-MM YYYY - HH:mm',
+        clearButton: true,
+        weekStart: 1
+    });
+
+    $('.datepicker').bootstrapMaterialDatePicker({
+        format: 'DD-MM-YYYY',
+        clearButton: true,
+        weekStart: 1,
+        time: false
+    });
+
+    $('.timepicker').bootstrapMaterialDatePicker({
+        format: 'HH:mm',
+        clearButton: true,
+        date: false
+    });
+/*
+    $('.datepicker').attr('ReadOnly','true');
+    $('.datepicker').css('cursor','pointer');*/
+
+});
+
+
+ $(function(){
+   var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
+  $('#custom-slimscroll').slimScroll({
+    height: height,
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0'
   });
-  $('.datepicker').attr('ReadOnly','true');
-  $('.datepicker').css('cursor','pointer');
-});*/
+  
+  $('#order-detail-slimscroll').slimScroll({
+    height: height-180,
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0'
+  });
+});
 
  $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
     $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});