From ae5dfaf19251f8b93590989f6cabde7878bd7954 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Sun, 29 Oct 2017 14:20:24 +0630
Subject: [PATCH 1/6] test for no work js,it cause by turbolink

---
 app/assets/javascripts/BSBMaterial/admin.js    |  2 +-
 app/assets/javascripts/BSBMaterial/demo.js     |  2 +-
 .../javascripts/BSBMaterial/pages/index.js     |  2 +-
 app/assets/javascripts/application.js          | 18 +++++++++++++-----
 app/assets/javascripts/custom.js               |  4 ++--
 app/views/settings/zones/_form.html.erb        |  5 -----
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js
index c62b3f87..e93b0186 100755
--- a/app/assets/javascripts/BSBMaterial/admin.js
+++ b/app/assets/javascripts/BSBMaterial/admin.js
@@ -444,7 +444,7 @@ $.AdminBSB.browser = {
 }
 //==========================================================================================================================
 
-$(document).on('turbolinks:load', function () {
+$(document).ready(function(){
     $.AdminBSB.browser.activate();
     $.AdminBSB.leftSideBar.activate();
     $.AdminBSB.rightSideBar.activate();
diff --git a/app/assets/javascripts/BSBMaterial/demo.js b/app/assets/javascripts/BSBMaterial/demo.js
index 87f67674..85f632ea 100755
--- a/app/assets/javascripts/BSBMaterial/demo.js
+++ b/app/assets/javascripts/BSBMaterial/demo.js
@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function () {
+$(document).ready(function(){
     skinChanger();
     activateNotificationAndTasksScroll();
 
diff --git a/app/assets/javascripts/BSBMaterial/pages/index.js b/app/assets/javascripts/BSBMaterial/pages/index.js
index 7c3c3a39..5db70e5c 100755
--- a/app/assets/javascripts/BSBMaterial/pages/index.js
+++ b/app/assets/javascripts/BSBMaterial/pages/index.js
@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function () {
+$(document).ready(function(){
     //Widgets count
     $('.count-to').countTo();
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 050231d3..b0c67ce0 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,9 +16,6 @@
 //= require bootstrap/js/bootstrap-material-design.min
 //= require jquery_nested_form
 //= require jquery_ujs
-//= require turbolinks
-//= require cable
-//= require settings/processing_items
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require multi-select/js/jquery.multi-select.js
@@ -32,12 +29,23 @@
 //= require morrisjs/morris.js
 //= require chartjs/Chart.bundle.js
 //= require fileinput.min
+//= require turbolinks
+//= require cable
+//= require settings/processing_items
 //= require BSBMaterial/admin.js
-//= require BSBMaterial/pages/index.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-$(document).on('turbolinks:load', function() {
+$(document).ready(function(){
+  $('.count-to').countTo();
+
+  //Sales count to
+  $('.sales-count-to').countTo({
+      formatter: function (value, options) {
+          return '$' + value.toFixed(2).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, ' ').replace('.', ',');
+      }
+  });
+
   $('.datetimepicker').bootstrapMaterialDatePicker({
       format: 'DD-MM-YYYY - HH:mm',
       clearButton: true,
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 0a089be7..18e16e8d 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -1,6 +1,6 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function(){
   $('body').bootstrapMaterialDesign();
-  
+
   var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
 
   $('#custom-slimscroll').slimScroll({
diff --git a/app/views/settings/zones/_form.html.erb b/app/views/settings/zones/_form.html.erb
index 5ae4132b..0c80e661 100755
--- a/app/views/settings/zones/_form.html.erb
+++ b/app/views/settings/zones/_form.html.erb
@@ -35,8 +35,3 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
\ No newline at end of file

From 8d12acb530db11777ec38260b8944743d6815426 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 30 Oct 2017 10:09:22 +0630
Subject: [PATCH 2/6] test for select

---
 app/assets/javascripts/application.js   | 1 -
 app/assets/stylesheets/application.scss | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b0c67ce0..6c2b2c4d 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -29,7 +29,6 @@
 //= require morrisjs/morris.js
 //= require chartjs/Chart.bundle.js
 //= require fileinput.min
-//= require turbolinks
 //= require cable
 //= require settings/processing_items
 //= require BSBMaterial/admin.js
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 70824f58..7bb2d879 100755
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -12,6 +12,8 @@
 @import "BSBMaterial/themes/all-themes";
 @import "reset";
 
+/*@import "bootstrap-select/css/bootstrap-select.min";*/
+
 /*----- Order Processing Items -----*/
 .opi_ul {
   display:block;

From 8169da4d52349163743e41b96ec37dffd4debda3 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 30 Oct 2017 10:29:02 +0630
Subject: [PATCH 3/6] edit product form

---
 app/views/settings/products/_form.html.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb
index 1bbd2c7f..c972bca5 100755
--- a/app/views/settings/products/_form.html.erb
+++ b/app/views/settings/products/_form.html.erb
@@ -20,8 +20,7 @@
               <% if f.object.image_path? %>
                 <p><%= f.object.name %></p>
                 <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
-              <% else %>
-                <p>Sample Image</p>
+              <% else %>                
                 <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
               <% end %>          
             </div>

From 7beb4e75636995ed578d5d90a299b73597a13745 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 30 Oct 2017 14:33:05 +0630
Subject: [PATCH 4/6] test for turbolink

---
 app/assets/javascripts/BSBMaterial/admin.js |  2 +-
 app/assets/javascripts/BSBMaterial/demo.js  |  2 +-
 app/assets/javascripts/OQS.js               |  2 +-
 app/assets/javascripts/application.js       |  7 ++--
 app/assets/javascripts/custom.js            |  2 +-
 app/assets/javascripts/origami.js           | 42 ++++++++++-----------
 app/assets/stylesheets/login.scss           |  1 +
 app/views/layouts/login.html.erb            |  9 +++--
 app/views/layouts/login_dashboard.html.erb  |  7 +---
 config/locales/mm.yml                       |  2 +-
 10 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js
index e93b0186..50a3a8a2 100755
--- a/app/assets/javascripts/BSBMaterial/admin.js
+++ b/app/assets/javascripts/BSBMaterial/admin.js
@@ -444,7 +444,7 @@ $.AdminBSB.browser = {
 }
 //==========================================================================================================================
 
-$(document).ready(function(){
+$(document).on('turbolinks:load', function() {
     $.AdminBSB.browser.activate();
     $.AdminBSB.leftSideBar.activate();
     $.AdminBSB.rightSideBar.activate();
diff --git a/app/assets/javascripts/BSBMaterial/demo.js b/app/assets/javascripts/BSBMaterial/demo.js
index 85f632ea..bb09d5ac 100755
--- a/app/assets/javascripts/BSBMaterial/demo.js
+++ b/app/assets/javascripts/BSBMaterial/demo.js
@@ -1,4 +1,4 @@
-$(document).ready(function(){
+$(document).on('turbolinks:load', function() {
     skinChanger();
     activateNotificationAndTasksScroll();
 
diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 620e7490..4d66cfab 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -24,7 +24,7 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-$(document).ready(function(){
+$(document).on('turbolinks:load', function() {
 
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6c2b2c4d..2fe04719 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,11 +11,12 @@
 // about supported directives.
 //
 //= require jquery
+//= require jquery.turbolinks
 //= require tether
+//= require jquery_ujs
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
 //= require jquery_nested_form
-//= require jquery_ujs
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require multi-select/js/jquery.multi-select.js
@@ -26,16 +27,16 @@
 //= 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 cable
+//= require turbolinks
 //= require settings/processing_items
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-$(document).ready(function(){
+$(document).on('turbolinks:load', function() {
   $('.count-to').countTo();
 
   //Sales count to
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 18e16e8d..7d37793c 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -1,4 +1,4 @@
-$(document).ready(function(){
+$(document).on('turbolinks:load', function() {
   $('body').bootstrapMaterialDesign();
 
   var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index d6ad05e6..84799a93 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -1,42 +1,40 @@
 //= require jquery
 //= require tether
+//= require jquery_ujs
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
-//= require jquery_ujs
-//= require turbolinks
-//= require cable
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
+//= require cable
+//= require turbolinks
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-
 $(document).on('turbolinks:load', function() {
-  $('.datetimepicker').bootstrapMaterialDatePicker({
-      format: 'DD-MM-YYYY - HH:mm',
-      clearButton: true,
-      weekStart: 1
-  });
+	$('.datetimepicker').bootstrapMaterialDatePicker({
+	  format: 'DD-MM-YYYY - HH:mm',
+	  clearButton: true,
+	  weekStart: 1
+	});
 
-  $('.datepicker').bootstrapMaterialDatePicker({
-      format: 'DD-MM-YYYY',
-      clearButton: true,
-      weekStart: 1,
-      time: false
-  });
+	$('.datepicker').bootstrapMaterialDatePicker({
+	  format: 'DD-MM-YYYY',
+	  clearButton: true,
+	  weekStart: 1,
+	  time: false
+	});
+
+	$('.timepicker').bootstrapMaterialDatePicker({
+	  format: 'HH:mm',
+	  clearButton: true,
+	  date: false
+	});
 
-  $('.timepicker').bootstrapMaterialDatePicker({
-      format: 'HH:mm',
-      clearButton: true,
-      date: false
-  });
-});
-$(document).ready(function(){
 	// For selected order return
 	var order_status = "";
 	order_status = $(".selected-item").children().find(".orders-order-status").text().substr(0,6).trim();
diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index 29ef2e6e..030b0fe1 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -1,3 +1,4 @@
+@import "material_icons";
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";
 @import "animate-css/animate";
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 7320edf9..213fe705 100755
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -11,8 +11,8 @@
     <link rel="icon" href="favicon.ico" type="image/x-icon">
 
     <!-- Google Fonts -->
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
+    <!-- <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> -->
 
     <!-- Bootstrap Core Css -->
     <!-- <link href="plugins/bootstrap/css/bootstrap.css" rel="stylesheet"> -->
@@ -101,9 +101,10 @@
     </div>
     <script type="text/javascript">
         $(document).on('turbolinks:load', function () {
+            $("#login_form_password").focus();
+
             $(".pin_pad").click(function (event) {
-                event.preventDefault();
-                console.log($(this).data("value"));
+                event.preventDefault();                
                 var value = $(this).data("value");
 
                 if (value == "CLR") {
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 37cf7b1f..060d4739 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -39,9 +39,7 @@
         </div>
     </div>
      <% flash.each do |type, message| %>
-          <% puts type
-          puts message
-          puts "ssssssssssssss" 
+          <%  
           if type == "notice" 
                color = "alert-success"
             elsif type == "error"
@@ -167,8 +165,7 @@
          var animateExit    = $("#noti").attr('data-animate-exit');
          var colorName      = $("#noti").attr('data-color-name');
          var text           = $("#noti").attr('data-message');
-         console.log(text);
-        console.log(colorName);
+
          if (text != null || colorName != null){
             showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
          }
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 52faa938..54239960 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -38,7 +38,7 @@ mm:
   category: "အမျိုးအစား"
   processed: "လုပ်ဆောင်ခဲ့ပြီး"
   completed: "ဆောင်ရွက်ပြီးစီး"
-  tax_profile: "Tad Profile"
+  tax_profile: "Tax Profile"
   payment_methods: "Payment Methods"
   accounts: "Accounts"
   

From da0558b5efc41d1344bc94b0e4c3ca9c25bd902f Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 30 Oct 2017 17:26:38 +0630
Subject: [PATCH 5/6] remove turbolinks in form for conflict

---
 app/assets/javascripts/BSBMaterial/admin.js            |  2 +-
 app/assets/javascripts/BSBMaterial/demo.js             |  2 +-
 app/assets/javascripts/application.js                  | 10 ++++------
 app/assets/javascripts/custom.js                       |  2 +-
 app/assets/javascripts/settings/processing_items.js    |  2 +-
 app/views/layouts/application.html.erb                 |  6 +++---
 app/views/settings/cashier_terminals/_form.html.erb    |  6 +-----
 app/views/settings/commissioners/_form.html.erb        |  6 +-----
 app/views/settings/commissions/_form.html.erb          |  6 +-----
 app/views/settings/item_sets/_form.html.erb            |  6 +-----
 app/views/settings/lookups/_form.html.erb              |  6 +-----
 app/views/settings/membership_actions/_form.html.erb   |  6 +-----
 app/views/settings/membership_settings/_form.html.erb  |  6 +-----
 app/views/settings/menu_categories/_form.html.erb      |  6 +-----
 app/views/settings/menu_item_attributes/_form.html.erb |  6 +-----
 app/views/settings/menu_item_options/_form.html.erb    |  6 +-----
 app/views/settings/menu_item_sets/_form.html.erb       |  6 +-----
 app/views/settings/menus/_form.html.erb                |  6 +-----
 app/views/settings/order_queue_stations/_form.html.erb |  6 +-----
 .../settings/payment_method_settings/_form.html.erb    |  6 +-----
 app/views/settings/processing_items/_form.html.erb     |  6 +-----
 app/views/settings/products/_form.html.erb             |  6 +-----
 app/views/settings/promotion_products/_form.html.erb   |  6 +-----
 app/views/settings/rooms/_form.html.erb                |  6 +-----
 app/views/settings/set_menu_items/_form.html.erb       |  6 +-----
 app/views/settings/simple_menu_items/_form.html.erb    |  6 +-----
 app/views/settings/tables/_form.html.erb               |  6 +-----
 app/views/settings/tax_profiles/_form.html.erb         |  6 +-----
 config/initializers/assets.rb                          |  1 +
 29 files changed, 34 insertions(+), 123 deletions(-)

diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js
index 50a3a8a2..f670db1f 100755
--- a/app/assets/javascripts/BSBMaterial/admin.js
+++ b/app/assets/javascripts/BSBMaterial/admin.js
@@ -444,7 +444,7 @@ $.AdminBSB.browser = {
 }
 //==========================================================================================================================
 
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
     $.AdminBSB.browser.activate();
     $.AdminBSB.leftSideBar.activate();
     $.AdminBSB.rightSideBar.activate();
diff --git a/app/assets/javascripts/BSBMaterial/demo.js b/app/assets/javascripts/BSBMaterial/demo.js
index bb09d5ac..6121099e 100755
--- a/app/assets/javascripts/BSBMaterial/demo.js
+++ b/app/assets/javascripts/BSBMaterial/demo.js
@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
     skinChanger();
     activateNotificationAndTasksScroll();
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 2fe04719..42ae2ce3 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,12 +11,12 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery.turbolinks
-//= require tether
+//= require jquery_nested_form
 //= require jquery_ujs
+//= require cable
+//= require tether
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
-//= require jquery_nested_form
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require multi-select/js/jquery.multi-select.js
@@ -29,14 +29,12 @@
 //= require raphael/raphael.min
 //= require chartjs/Chart.bundle.js
 //= require fileinput.min
-//= require cable
-//= require turbolinks
 //= require settings/processing_items
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
   $('.count-to').countTo();
 
   //Sales count to
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 7d37793c..e33ed566 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
   $('body').bootstrapMaterialDesign();
 
   var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
diff --git a/app/assets/javascripts/settings/processing_items.js b/app/assets/javascripts/settings/processing_items.js
index 60c53ba4..73d8f66a 100755
--- a/app/assets/javascripts/settings/processing_items.js
+++ b/app/assets/javascripts/settings/processing_items.js
@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
   $(".processitems").click(function(event){
     event.preventDefault();
     console.log($(this).data("id"));
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index eb89e4f4..24197c5a 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,14 +4,14 @@
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=Edge">
-    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">    
     <title>SmartSales : Restaurant</title>
     <%= csrf_meta_tags %>
     <!-- Favicon-->
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
+    <%= stylesheet_link_tag    'application', media: 'all' %>
+    <%= javascript_include_tag 'application' %> 
 </head>
 
 <body class="theme-indigo">
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb
index 5de2f98c..454851ba 100755
--- a/app/views/settings/cashier_terminals/_form.html.erb
+++ b/app/views/settings/cashier_terminals/_form.html.erb
@@ -54,8 +54,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
\ No newline at end of file
+ 
\ No newline at end of file
diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb
index c123e434..efdcab31 100755
--- a/app/views/settings/commissioners/_form.html.erb
+++ b/app/views/settings/commissioners/_form.html.erb
@@ -52,8 +52,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb
index a1a2368a..85a3a27d 100755
--- a/app/views/settings/commissions/_form.html.erb
+++ b/app/views/settings/commissions/_form.html.erb
@@ -44,8 +44,4 @@
 </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb
index c26e9b1d..ab600e6d 100755
--- a/app/views/settings/item_sets/_form.html.erb
+++ b/app/views/settings/item_sets/_form.html.erb
@@ -40,8 +40,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/lookups/_form.html.erb b/app/views/settings/lookups/_form.html.erb
index 4beb4ba4..8196a906 100755
--- a/app/views/settings/lookups/_form.html.erb
+++ b/app/views/settings/lookups/_form.html.erb
@@ -28,8 +28,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb
index 6938dcb4..b2524a1c 100755
--- a/app/views/settings/membership_actions/_form.html.erb
+++ b/app/views/settings/membership_actions/_form.html.erb
@@ -30,8 +30,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb
index d81025ea..19361bb4 100755
--- a/app/views/settings/membership_settings/_form.html.erb
+++ b/app/views/settings/membership_settings/_form.html.erb
@@ -32,8 +32,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb
index b40e2579..a0a0137f 100755
--- a/app/views/settings/menu_categories/_form.html.erb
+++ b/app/views/settings/menu_categories/_form.html.erb
@@ -44,8 +44,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/menu_item_attributes/_form.html.erb b/app/views/settings/menu_item_attributes/_form.html.erb
index a6eecce6..71ba75bf 100755
--- a/app/views/settings/menu_item_attributes/_form.html.erb
+++ b/app/views/settings/menu_item_attributes/_form.html.erb
@@ -36,8 +36,4 @@
 		</div>  
 	</div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/menu_item_options/_form.html.erb b/app/views/settings/menu_item_options/_form.html.erb
index f6ff0721..266be9e5 100755
--- a/app/views/settings/menu_item_options/_form.html.erb
+++ b/app/views/settings/menu_item_options/_form.html.erb
@@ -37,8 +37,4 @@
 		</div>  
 	</div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/menu_item_sets/_form.html.erb b/app/views/settings/menu_item_sets/_form.html.erb
index 35178914..31688a80 100755
--- a/app/views/settings/menu_item_sets/_form.html.erb
+++ b/app/views/settings/menu_item_sets/_form.html.erb
@@ -26,8 +26,4 @@
 		</div>  
 	</div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/menus/_form.html.erb b/app/views/settings/menus/_form.html.erb
index 458b4baf..5b103395 100755
--- a/app/views/settings/menus/_form.html.erb
+++ b/app/views/settings/menus/_form.html.erb
@@ -66,8 +66,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb
index 3aca6ff0..97792930 100755
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/app/views/settings/order_queue_stations/_form.html.erb
@@ -59,8 +59,4 @@ div.form-inputs span{
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb
index db1a2aca..43804214 100755
--- a/app/views/settings/payment_method_settings/_form.html.erb
+++ b/app/views/settings/payment_method_settings/_form.html.erb
@@ -46,8 +46,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb
index 3faa3dc4..48b45dfc 100755
--- a/app/views/settings/processing_items/_form.html.erb
+++ b/app/views/settings/processing_items/_form.html.erb
@@ -85,8 +85,4 @@
 </div>
 
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb
index c972bca5..a1a448ba 100755
--- a/app/views/settings/products/_form.html.erb
+++ b/app/views/settings/products/_form.html.erb
@@ -62,8 +62,4 @@
   </div>
 </div>
  
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/promotion_products/_form.html.erb b/app/views/settings/promotion_products/_form.html.erb
index 299c9631..267d23a5 100755
--- a/app/views/settings/promotion_products/_form.html.erb
+++ b/app/views/settings/promotion_products/_form.html.erb
@@ -45,8 +45,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb
index 7567e786..a9f0ff57 100755
--- a/app/views/settings/rooms/_form.html.erb
+++ b/app/views/settings/rooms/_form.html.erb
@@ -77,8 +77,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb
index 24c4cf06..6f08b811 100755
--- a/app/views/settings/set_menu_items/_form.html.erb
+++ b/app/views/settings/set_menu_items/_form.html.erb
@@ -91,8 +91,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb
index 925372ee..e5ca90c1 100755
--- a/app/views/settings/simple_menu_items/_form.html.erb
+++ b/app/views/settings/simple_menu_items/_form.html.erb
@@ -81,8 +81,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb
index 233a28b7..d3701079 100755
--- a/app/views/settings/tables/_form.html.erb
+++ b/app/views/settings/tables/_form.html.erb
@@ -72,8 +72,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
diff --git a/app/views/settings/tax_profiles/_form.html.erb b/app/views/settings/tax_profiles/_form.html.erb
index 718d6811..5f2f3347 100755
--- a/app/views/settings/tax_profiles/_form.html.erb
+++ b/app/views/settings/tax_profiles/_form.html.erb
@@ -41,9 +41,5 @@
   </div>
 </div>
 
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 
 
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index f0799d68..973000b4 100755
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -48,3 +48,4 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
 Rails.application.config.assets.precompile += %w( inventory_definitions.css )
 Rails.application.config.assets.precompile += %w( inventory.js )
 
+

From 35161aae91897e3400b53f38836da8154bb3ce5e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 30 Oct 2017 18:51:05 +0630
Subject: [PATCH 6/6] remove turbolink in backend and update logout

---
 app/assets/javascripts/custom.js           | 4 +++-
 app/assets/javascripts/login.js            | 1 -
 app/controllers/home_controller.rb         | 3 ++-
 app/views/layouts/login.html.erb           | 2 +-
 app/views/layouts/login_dashboard.html.erb | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index e33ed566..91d4cc41 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -38,8 +38,10 @@ $(document).ready(function() {
             type: method,
             url: url ,            
             success: function(data) {
+              // console.log(data.url);
+              location.href = data.url;
             }
-         }); 
+         });          
         } else {
             swal("Cancelled", "Your imaginary file is safe :)", "error");
         }
diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
index db75a715..f2df2d03 100755
--- a/app/assets/javascripts/login.js
+++ b/app/assets/javascripts/login.js
@@ -15,6 +15,5 @@
 //= require tether
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
-//= require turbolinks
 //= require node-waves/waves.js
 //= require BSBMaterial/admin.js
\ No newline at end of file
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 24c4aceb..71ed8d07 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -84,7 +84,8 @@ class HomeController < ApplicationController
     # clear in employee session
     Employee.logout(session[:session_token])
     session[:session_token] = nil
-    redirect_to root_path
+    # redirect_to root_path
+    render :json => {:status=> "Success", :url => root_path }.to_json
   end
 
   private
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 213fe705..e9be4a3f 100755
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -100,7 +100,7 @@
             <% end %>
     </div>
     <script type="text/javascript">
-        $(document).on('turbolinks:load', function () {
+        $(document).ready(function () {
             $("#login_form_password").focus();
 
             $(".pin_pad").click(function (event) {
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 060d4739..0338f614 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -155,7 +155,7 @@
 </html>
 
 <script>   
-    $(document).on('turbolinks:load', function () {
+    $(document).ready(function () {
 
          // for Notificaiotn message