merge with origin

app/assets/javascripts/application.js

@@ -23,6 +23,7 @@
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require multi-select/js/jquery.multi-select.js
 //= require jquery-slimscroll/jquery.slimscroll.js
+//= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
 //= require autosize/autosize.js
@@ -35,6 +36,7 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
+
 $(document).on('turbolinks:load', function() {
   $('.datetimepicker').bootstrapMaterialDatePicker({
       format: 'DD-MM-YYYY - HH:mm',
@@ -73,7 +75,7 @@ $(document).on('turbolinks:load', function() {
         image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
                 '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
                 '</div>\n',
-    }
+      }
   });
 
   $("#product_image_path").fileinput({
@@ -96,16 +98,11 @@ $(document).on('turbolinks:load', function() {
     }
   });
 
-});
-
-$(document).ready(function() {
-    $('body').bootstrapMaterialDesign();
-});
-
 // $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
 //   $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
 //   $('.dropdown-toggle').dropdown();
 // });
+});
 
 function export_to(path)
 {
@@ -114,3 +111,4 @@ function export_to(path)
 }
 
 
+