merge with origin

app/assets/javascripts/BSBMaterial/pages/index.js

@@ -17,7 +17,7 @@
 var realtime = 'on';
 function initRealTimeChart() {
     //Real time ==========================================================================================
-    var plot = $.plot('#real_time_chart', [getRandomData()], {
+    /*var plot = $.plot('#real_time_chart', [getRandomData()], {
         series: {
             shadowSize: 0,
             color: 'rgb(0, 188, 212)'
@@ -57,7 +57,7 @@ function initRealTimeChart() {
     $('#realtime').on('change', function () {
         realtime = this.checked ? 'on' : 'off';
         updateRealTime();
-    });
+    });*/
     //====================================================================================================
 }
 
@@ -69,7 +69,7 @@ function initSparkline() {
 }
 
 function initDonutChart() {
-    Morris.Donut({
+    /*Morris.Donut({
         element: 'donut_chart',
         data: [{
             label: 'Chrome',
@@ -92,7 +92,7 @@ function initDonutChart() {
         formatter: function (y) {
             return y + '%'
         }
-    });
+    });*/
 }
 
 var data = [], totalPoints = 110;

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});

app/assets/stylesheets/application.scss

@@ -2,6 +2,7 @@
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";
 @import "animate-css/animate";
+@import "multi-select/css/multi-select";
 @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker";
 @import "bootstrap-select/css/bootstrap-select";
 @import "morrisjs/morris";
@@ -71,7 +72,7 @@ section.content {
 }
 
 .nav-tabs li a.active {
-  color: #222 !important; 
+  color: #000 !important; 
 }
 
 .info-box {
@@ -81,6 +82,15 @@ section.content {
 .card {
   margin-bottom: 20px;
 }
+.card .card-header {
+    padding: 0.5rem;
+}
+.card .card-title{
+  margin-bottom:0.5rem;
+}
+.card .card-block {
+    padding: 0.5rem 1rem 1rem;
+}
 
 .checkbox label, label.checkbox-inline {
   padding-left: 0;
@@ -124,7 +134,7 @@ select.form-control {
 }
 
 /* End Reset */
-
+/*
 .dining {
   min-height:470px;
   max-height:570px; 
@@ -136,7 +146,7 @@ select.form-control {
   max-height:500px; 
   overflow:auto
 }
-
+*/
 .others-payment{
   line-height:100px;
   text-align:center;