Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

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();

app/assets/javascripts/BSBMaterial/demo.js

@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function () {
+$(document).ready(function() {
     skinChanger();
     activateNotificationAndTasksScroll();
 

app/assets/javascripts/BSBMaterial/pages/index.js

@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function () {
+$(document).ready(function(){
     //Widgets count
     $('.count-to').countTo();
 

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')

app/assets/javascripts/application.js

@@ -11,14 +11,12 @@
 // about supported directives.
 //
 //= require jquery
+//= 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 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
@@ -29,15 +27,23 @@
 //= 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 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,

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({
@@ -38,8 +38,10 @@ $(document).on('turbolinks:load', 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");
         }

app/assets/javascripts/login.js

@@ -15,7 +15,6 @@
 //= 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
 //= require bootstrap-notify/bootstrap-notify.js

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();

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"));

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;

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";

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

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">

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"> -->
@@ -100,10 +100,11 @@
             <% end %>
     </div>
     <script type="text/javascript">
-        $(document).on('turbolinks:load', function () {
+        $(document).ready(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") {

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"
@@ -157,7 +155,7 @@
 </html>
 
 <script>   
-    $(document).on('turbolinks:load', function () {
+    $(document).ready(function () {
 
          // for Notificaiotn message
 console.log("hi");
@@ -167,8 +165,7 @@ console.log("hi");
          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); 
          }

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>
+ 

app/views/settings/commissioners/_form.html.erb

@@ -55,11 +55,3 @@
     </div>  
   </div>
 </div>
-
-<script type="text/javascript">
-$(document).on('page:load', function() {
-
-  // $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
@@ -63,8 +62,4 @@
   </div>
 </div>
  
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 

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>
+ 
 

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>

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 )
 
+

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"