diff --git a/app/assets/javascripts/BSBMaterial/pages/index.js b/app/assets/javascripts/BSBMaterial/pages/index.js
index c9ca25e4..3d3749dc 100644
--- a/app/assets/javascripts/BSBMaterial/pages/index.js
+++ b/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;
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index baf62ca4..63c4ad2c 100644
--- a/app/assets/javascripts/application.js
+++ b/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() {
- $('.datepicker').datepicker({
- format : 'dd-mm-yyyy',
- autoclose: true
- });
- $('.datepicker').attr('ReadOnly','true');
- $('.datepicker').css('cursor','pointer');
-});*/
+ $(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');*/
+
+});
$(document).on("focus", "[data-behaviour~='datepicker']", function(e){
$(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index ba52bb08..98a1f17c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/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 {
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 177c3d14..8687d25f 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -89,7 +89,7 @@
-
+
<%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
-
+
-