From 18aa3d1e0f1322713dde69078998ddcee16d402e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 27 Oct 2017 11:37:47 +0630
Subject: [PATCH] ui updated

---
 app/assets/javascripts/application.js                     | 2 +-
 app/assets/javascripts/custom.js                          | 5 ++---
 app/views/layouts/application.html.erb                    | 3 +--
 app/views/settings/payment_method_settings/_form.html.erb | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 4a61c6e7..050231d3 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -29,6 +29,7 @@
 //= require autosize/autosize.js
 //= require jquery-countto/jquery.countTo.js
 //= require raphael/raphael.min
+//= require morrisjs/morris.js
 //= require chartjs/Chart.bundle.js
 //= require fileinput.min
 //= require BSBMaterial/admin.js
@@ -36,7 +37,6 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-
 $(document).on('turbolinks:load', function() {
   $('.datetimepicker').bootstrapMaterialDatePicker({
       format: 'DD-MM-YYYY - HH:mm',
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index dc4368d0..bb55203b 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -1,7 +1,6 @@
-
 $(document).on('turbolinks:load', function() {
+  // $("body").boostrapMaterialDesign();
 
-  
   var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
 
   $('#custom-slimscroll').slimScroll({
@@ -54,7 +53,7 @@ $(document).on('turbolinks:load', function() {
   var animateExit    = $("#notify_message").attr('data-animate-exit');
   var colorName      = $("#notify_message").attr('data-color-name');
   var text           = $("#notify_message").attr('data-message');
-  console.log(text);
+
   if (text != null || colorName != null){
      showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
   }
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1a67d050..d6ca28cc 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -57,7 +57,6 @@
             </p>
         <% end %>       
         <%= yield %>     
-    </section>
+    </section>        
 </body>
-
 </html>
\ No newline at end of file
diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb
index 4582167d..a673493f 100755
--- a/app/views/settings/payment_method_settings/_form.html.erb
+++ b/app/views/settings/payment_method_settings/_form.html.erb
@@ -6,7 +6,7 @@
 
     <div class="form-inputs p-l-15">
       <%= f.input :payment_method %>
-      <%= f.input :is_active,:class=> "checkbox" %>
+      <%= f.input :is_active %>
       <%= f.input :gateway_communication_type %>
       <%= f.input :gateway_url %>
       <%= f.input :auth_token %>
@@ -44,4 +44,4 @@
       </div>
     </div>  
   </div>
-</div>
\ No newline at end of file
+</div>