update admin bsb

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

@@ -19,35 +19,49 @@
 //= require turbolinks
 //= require cable
 //= require settings/processing_items
-//= require bootstrap-select/js/bootstrap-select
+//= require bootstrap/js/bootstrap.js
+//= require bootstrap-select/js/bootstrap-select.js
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
 //= require autosize/autosize.js
+//= require momentjs/moment.js
+//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js
 //= require jquery-countto/jquery.countTo.js
 //= require raphael/raphael.min
 //= require morrisjs/morris
-//= require chartjs/Chart.bundle.js
-//= require flot-charts/jquery.flot
-//= require flot-charts/jquery.flot.resize
-//= require flot-charts/jquery.flot.pie
-//= require flot-charts/jquery.flot.categories
-//= require flot-charts/jquery.flot.time
 //= require jquery-sparkline/jquery.sparkline
 //= 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() {
+ $(document).on('turbolinks:load', function() {
-  $('.datepicker').datepicker({
+  // $(document).ready(function(){
-     format : 'dd-mm-yyyy',
+  //Datetimepicker plugin
-     autoclose: true
+    $('.datetimepicker').bootstrapMaterialDatePicker({
-  });
+        format: 'DD-MM YYYY - HH:mm',
-  $('.datepicker').attr('ReadOnly','true');
+        clearButton: true,
-  $('.datepicker').css('cursor','pointer');
+        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');*/
+
+});
 
  $(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";
@@ -67,7 +68,7 @@ section.content {
 }
 
 .nav-tabs li a.active {
-  color: #222 !important; 
+  color: #000 !important; 
 }
 
 .info-box {

app/views/crm/customers/_new_form.html.erb

@@ -89,7 +89,7 @@
 
     <div class="form-group">
     <label>Select Customer Type</label>
-      <select class="form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: " >
+      <select class="form-control col-md-12 selectpicker  show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
         <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
            <option value="<%= ct.value %>">
           <%= ct.name %></option>
@@ -121,13 +121,14 @@
 
    <div class="form-group">
    <label>Select Member Group</label>
-        <select class="form-control col-md-12" name="member_group_id"  style="height: " >
+        <select class="form-control col-md-12 selectpicker  show-tick"  name="member_group_id"  style="height: " >
           <option value="">Select Membership Group</option>
             <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
                <option value="<%= member.value %>">
               <%= member.name %></option>
             <%end %>
-          </select>            
+          </select>   
+
   </div>
   
   <div class="form-group">

app/views/crm/customers/index.html.erb

@@ -99,7 +99,7 @@
       </div>
     <!-- </div> -->
     </div>
-    <div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll">
+    <div class="col-lg-4 col-md-4 col-sm-4 slimScrollDiv" style="min-height:600px; max-height:600px; overflow-x:scroll">
     <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
     </div>
     <!-- <div class="col-lg-1 col-md-1 col-sm-1 ">

app/views/crm/customers/show.html.erb

@@ -1,17 +1,18 @@
 <div class="row">
   <div class="col-lg-11 col-md-11 col-sm-11">
     <!-- Column One -->
-
+  
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist">
+    <ul class="nav nav-tabs tab-col-purple" role="tablist">
-      <li class="nav-item">
+      
-        <a class="nav-link active" data-toggle="tab" href="#customer" role="tab">Customer Details</a>
+      <li role="presentation" class="nav-item">
+        <a class="nav-link active" data-toggle="tab" href="#customer" aria-expanded="true">Customer Details</a>
       </li>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
-        <a class="nav-link " data-toggle="tab" href="#order" role="tab">Order Details</a>
+        <a class="nav-link " data-toggle="tab" href="#order" aria-expanded="true">Order Details</a>
       </li>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
-        <a class="nav-link" data-toggle="tab" href="#sale" role="tab">Sale Details</a>
+        <a class="nav-link" data-toggle="tab" href="#sale" aria-expanded="true">Sale Details</a>
       </li>
     </ul>
     <!-- Nav tabs - End -->