ui review and edited

2017-10-26 17:54:22 +06:30
parent fe6d8a4be0
commit 0da1aeaeb9
29 changed files with 110 additions and 114 deletions
--- a/11
+++ b/11
@@ -32,8 +32,9 @@ gem 'coffee-rails', '~> 4.2'
 # gem 'therubyracer', platforms: :ruby
 gem 'simple_form'
 gem 'nested_form'
-gem 'bootstrap', '~> 4.0.0.alpha3'
+# gem 'bootstrap', '~> 4.0.0.alpha3'
 gem 'tether-rails'
+gem 'material_icons'
 gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2'
 gem 'rack-cors'

@@ -115,7 +116,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'httparty', '~> 0.15.5'

 gem 'momentjs-rails' # for date-range selector
-gem 'bootstrap-daterangepicker-rails' # date-range picker
-gem 'bootstrap-datepicker-rails' # date picker
-gem 'jquery-datetimepicker-rails'
-gem 'select2-rails' # for multi-select and auto-complete select box
+# gem 'bootstrap-daterangepicker-rails' # date-range picker
+# gem 'bootstrap-datepicker-rails' # date picker
+# gem 'jquery-datetimepicker-rails'
+# gem 'select2-rails' # for multi-select and auto-complete select box
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,13 +40,8 @@ GEM
      tzinfo (~> 1.1)
    aescrypt (1.0.0)
    arel (8.0.0)
-    autoprefixer-rails (7.1.1.2)
-      execjs
    bcrypt (3.1.11)
    bindex (0.5.0)
-    bootstrap (4.0.0.alpha6)
-      autoprefixer-rails (>= 6.0.3)
-      sass (>= 3.4.19)
    bootstrap-datepicker-rails (1.6.4.1)
      railties (>= 3.0)
    bootstrap-daterangepicker-rails (0.0.8)
@@ -118,6 +113,8 @@ GEM
      nokogiri (>= 1.5.9)
    mail (2.6.6)
      mime-types (>= 1.16, < 4)
+    material_icons (2.2.1)
+      railties (>= 3.2)
    method_source (0.8.2)
    mime-types (3.1)
      mime-types-data (~> 3.2015)
@@ -260,7 +257,6 @@ PLATFORMS
 DEPENDENCIES
  aescrypt
  bcrypt (~> 3.1.7)
-  bootstrap (~> 4.0.0.alpha3)
  bootstrap-datepicker-rails
  bootstrap-daterangepicker-rails
  byebug
@@ -280,6 +276,7 @@ DEPENDENCIES
  jquery-ui-rails
  kaminari (~> 1.0.1)
  listen (~> 3.0.5)
+  material_icons
  momentjs-rails
  mysql2 (>= 0.3.18, < 0.5)
  nested_form
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,17 +11,16 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery_nested_form
 //= 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 bootstrap/js/bootstrap.js
 //= require multi-select/js/jquery.multi-select.js
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
@@ -34,33 +33,28 @@
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/pages/index.js
 //= require BSBMaterial/demo.js
-//= require select2
 //= 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
-    });
-
-    $('.timepicker').bootstrapMaterialDatePicker({
-        format: 'HH:mm',
-        clearButton: true,
-        date: false
-    });
-   
-});
-$(document).on('turbolinks:load', function() {
+  $('.datepicker').bootstrapMaterialDatePicker({
+      format: 'DD-MM-YYYY',
+      clearButton: true,
+      weekStart: 1,
+      time: false
+  });

+  $('.timepicker').bootstrapMaterialDatePicker({
+      format: 'HH:mm',
+      clearButton: true,
+      date: false
+  });
+  
  // Image Upload
  $("#simple_menu_item_image_path").fileinput({
      previewFileType: "image",
@@ -104,6 +98,10 @@ $(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();
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -1,7 +1,7 @@

 $(document).on('turbolinks:load', function() {

-  $('body').bootstrapMaterialDesign();
+  
  var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));

  $('#custom-slimscroll').slimScroll({
--- a/app/assets/javascripts/inventory.js
+++ b/app/assets/javascripts/inventory.js
@@ -10,4 +10,3 @@
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
-//= require select2
--- a/app/assets/stylesheets/BSBMaterial/style.css
+++ b/app/assets/stylesheets/BSBMaterial/style.css
@@ -3428,7 +3428,7 @@ section.content {

 /* Checkbox & Radio ============================ */
 [type="checkbox"] + label {
-  padding-left: 26px;
+  padding-left: 5px;
  height: 25px;
  line-height: 21px;
  font-size: 13px;
--- a/app/assets/stylesheets/CRM.scss
+++ b/app/assets/stylesheets/CRM.scss
@@ -1,9 +1,4 @@
-//@import "bootstrap";
-//@import "font-awesome";
-//@import "theme";
-//@import "jquery-ui";
-//@import "bootstrap-datepicker3";
-//@import "bootstrap/modal";
+@import "material_icons";
@import "tether";
@import "bootstrap/css/bootstrap-material-design.min";
@import "node-waves/waves";
--- a/app/assets/stylesheets/OQS.scss
+++ b/app/assets/stylesheets/OQS.scss
@@ -1,3 +1,4 @@
+@import "material_icons";
@import "tether";
@import "bootstrap/css/bootstrap-material-design.min";
@import "node-waves/waves";
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,3 +1,4 @@
+@import "material_icons";
@import "tether";
@import "bootstrap/css/bootstrap-material-design.min";
@import "node-waves/waves";
--- a/app/assets/stylesheets/inventory_definitions.scss
+++ b/app/assets/stylesheets/inventory_definitions.scss
@@ -1,3 +1,4 @@
+@import "material_icons";
@import "tether";
@import "bootstrap/css/bootstrap-material-design.min";
@import "node-waves/waves";
@@ -9,8 +10,6 @@
@import "BSBMaterial/style";
@import "BSBMaterial/themes/all-themes";
@import "reset";
-@import "select2";
-

 /* Show it is fixed to the top */
 // body {
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -1,12 +1,4 @@
-/*
-@import "bootstrap";
-@import "font-awesome";
-@import "theme";
-@import "jquery-ui";
-@import "bootstrap-datepicker3";
-@import "jquery.datetimepicker";
-*/
-
+@import "material_icons";
@import "tether";
@import "bootstrap/css/bootstrap-material-design.min";
@import "node-waves/waves";
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -1,3 +1,28 @@
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;  /* Preferred icon size */
+  display: inline-block;
+  line-height: 1;
+  text-transform: none;
+  letter-spacing: normal;
+  word-wrap: normal;
+  white-space: nowrap;
+  direction: ltr;
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing: antialiased;
+  /* Support for Safari and Chrome. */
+  text-rendering: optimizeLegibility;
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Support for IE. */
+  font-feature-settings: 'liga';
+}
+
 /* Start Reset Theme */
 .col, .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col-auto, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-auto, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md-auto, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-auto, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl-auto {
  padding-left: 10px;
@@ -32,7 +57,7 @@

 .navbar-right a.dropdown-toggle {
  position: relative;
-  top: -5px;
+  top: 0px;
 }

 .dropdown-menu {
--- a/app/assets/stylesheets/settings.scss
+++ b/app/assets/stylesheets/settings.scss
@@ -1,7 +1,3 @@
-@import "bootstrap";
-@import "font-awesome";
-@import "theme";
-
 /* Show it is fixed to the top */
 // body {
 //   min-height: 75rem;
--- a/app/pdf/queue_no_pdf.rb
+++ b/app/pdf/queue_no_pdf.rb
@@ -15,7 +15,7 @@ class QueueNoPdf < Prawn::Document
    super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])

    # db font setup
-    if printer_settings.font != nil
+    if printer_settings.font != ""
        font_families.update("#{printer_settings.font}" => {
            :normal => "public/fonts/#{printer_settings.font}.ttf",
            :italic => "public/fonts/#{printer_settings.font}.ttf",
--- a/app/views/crm/dining_queues/_form.html.erb
+++ b/app/views/crm/dining_queues/_form.html.erb
@@ -14,7 +14,7 @@
      </div>
      <br>
      <div class="form-actions">
-        <%= f.button :submit,"Create Queue" ,:class=>"btn btn-primary bg-blue"%>
+        <%= f.submit "Create Queue",:class=>"btn btn-primary btn-lg waves-effect"%>
      </div>
  </div>
 <% end %>
--- a/app/views/crm/dining_queues/edit.html.erb
+++ b/app/views/crm/dining_queues/edit.html.erb
@@ -2,9 +2,9 @@
 <div class="span12">
 		<div class="page-header">
 		 <ul class="breadcrumb">
-		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= crm_dining_queues_path %>">Queue</a></li>
-		  	<li>Edit</li>
+		   	<li class="breadcrumb-item"><a href="<%= root_path %>">Home</a></li>
+  			<li class="breadcrumb-item"><a href="<%= crm_dining_queues_path %>">Queue</a></li>
+		  	<li class="breadcrumb-item active">Edit</li>
 		 </ul>
 		</div>
    <%= render 'form', dining_queue: @dining_queue %>
--- a/app/views/crm/dining_queues/index.html.erb
+++ b/app/views/crm/dining_queues/index.html.erb
@@ -2,7 +2,7 @@
 <div class="page-header">
 <ul class="breadcrumb">
  <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-  <li class="breadcrumb-item active">CRM</li>
+  <li class="breadcrumb-item active">Queue</li>
  <span class="float-right">
    <%= link_to 'Back', dashboard_path %>
  </span>
@@ -54,7 +54,7 @@

    <button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" disabled>Assign</button>
    <button type="button" id="cancel" class="btn btn-danger btn-block btn-lg waves-effect" disabled>Cancel</button>
-    <a href="<%= dashboard_path %>" class="btn btn-default btn-block waves-effect" role="button" aria-haspopup="true" aria-expanded="false"> Back </a>
+   <!--  <a href="<%= dashboard_path %>" class="btn btn-default btn-block waves-effect" role="button" aria-haspopup="true" aria-expanded="false"> Back </a> -->
  </div>
 </div>
 </div>
--- a/app/views/crm/dining_queues/new.html.erb
+++ b/app/views/crm/dining_queues/new.html.erb
@@ -2,10 +2,10 @@
 <div class="page-header">
 <ul class="breadcrumb">
  <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-  <li class="breadcrumb-item">CRM</li>
-  <li class="breadcrumb-item active"><a href="<%= crm_dining_queues_path %>">Queue</a></li>
+  <li class="breadcrumb-item"><a href="<%= crm_dining_queues_path %>">Queue</a></li>
+  <li class="breadcrumb-item active">New</li>
  <span class="float-right">
-    <%= link_to 'Back', dashboard_path %>
+    <%= link_to 'Back', crm_dining_queues_path %>
  </span>
 </ul>
 </div>
--- a/app/views/layouts/CRM.html.erb
+++ b/app/views/layouts/CRM.html.erb
@@ -10,10 +10,6 @@
    <!-- Favicon-->
    <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">
-
     <%= stylesheet_link_tag    'CRM', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %>
 </head>
--- a/app/views/layouts/OQS.html.erb
+++ b/app/views/layouts/OQS.html.erb
@@ -11,9 +11,9 @@
    <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/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">
-
+ -->
     <%= stylesheet_link_tag    'OQS', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %>
 </head>
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -15,7 +15,7 @@
        <div class="navbar-header">
            <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
            <a href="javascript:void(0);" class="bars"></a>
-            <a class="navbar-brand" href="index.html">
+            <a class="navbar-brand" href="<%=dashboard_path%>">
                <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                <span class="navbar-brand-txt">SX Restaurant</span>
            </a>           
@@ -40,9 +40,10 @@
                    <%end%>
                </li>   
            </ul>
+            <!-- NO Need for color Change
            <a href="javascript:void(0);" class="js-right-sidebar" data-close="true">
                <i class="material-icons">more_vert</i>
-            </a>
+            </a> -->
        </div>
    </div>
 </nav>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,12 +10,7 @@
    <!-- Favicon-->
    <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">
-
    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-
    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
 </head>

--- a/app/views/layouts/inventory.html.erb
+++ b/app/views/layouts/inventory.html.erb
@@ -10,10 +10,6 @@
    <!-- Favicon-->
    <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">
-
    <%= stylesheet_link_tag    'inventory_definitions', media: 'all', 'data-turbolinks-track': 'reload' %>
    <%= javascript_include_tag 'inventory', 'data-turbolinks-track': 'reload' %>
 </head>
--- a/app/views/layouts/origami.html.erb
+++ b/app/views/layouts/origami.html.erb
@@ -10,10 +10,6 @@
    <!-- Favicon-->
    <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">
-
     <%= stylesheet_link_tag    'origami', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'origami', 'data-turbolinks-track': 'reload' %>
 </head>
--- a/app/views/settings/dining_charges/_form.html.erb
+++ b/app/views/settings/dining_charges/_form.html.erb
@@ -15,22 +15,22 @@
                <i class="material-icons">access_time</i>
              </span>
                <% if !@dining_charge.minimum_free_time.nil?%>
-                  <input type="text" name="minimum_free_time" value="<%= @dining_charge.minimum_free_time.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
+                  <input type="text" name="dining_charge[minimum_free_time]" value="<%= @dining_charge.minimum_free_time.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Free Time...">
                <% else %>
-                   <input type="text" name="minimum_free_time" class="timepicker form-control col-md-8" placeholder="Start Time...">
+                   <input type="text" name="dining_charge[minimum_free_time]" class="timepicker form-control col-md-8" placeholder="Free Time...">
                <% end %>
            </div>         
        <!--<%= f.input :charge_block, :input_html => { :id => 'charge_block'} %>-->
       <div class="form-group">
-          <label class="control-label required"> Change Block</label>
+          <label class="control-label required"> Charges Block</label>
          <div class="input-group">
            <span class="input-group-addon">
              <i class="material-icons">access_time</i>
            </span>
            <% if !@dining_charge.charge_block.nil?%>
-            <input type="text" name="charge_block" value="<%= @dining_charge.charge_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
+            <input type="text" name="dining_charge[charge_block]" value="<%= @dining_charge.charge_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Time for Charges...">
            <% else %>
-            <input type="text" name="charge_block" class="timepicker form-control col-md-8" placeholder="Start Time...">
+            <input type="text" name="dining_charge[charge_block]" class="timepicker form-control col-md-8" placeholder="Time for Charges...">
            <% end %>
          </div> 
       </div>
@@ -43,9 +43,9 @@
              <i class="material-icons">access_time</i>
            </span>
            <% if !@dining_charge.time_rounding_block.nil?%>
-            <input type="text" name="time_rounding_block" value="<%= @dining_charge.time_rounding_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
+            <input type="text" name="dining_charge[time_rounding_block]" value="<%= @dining_charge.time_rounding_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Rounding Time...">
            <% else %>
-            <input type="text" name="time_rounding_block" class="timepicker form-control col-md-8" placeholder="Start Time...">
+            <input type="text" name="dining_charge[time_rounding_block]" class="timepicker form-control col-md-8" placeholder="Rounding Time...">
            <% end %>
          </div> 
       </div>
@@ -91,33 +91,40 @@
 function price(){
    var unit_price = $("#unit_price").val();

-    var hour1 = $("select[name='dining_charge[time_rounding_block(4i)]']").val();
-    var min1 = $("select[name='dining_charge[time_rounding_block(5i)]']").val();
-    var time1=(parseInt(hour1)*60)+parseInt(min1);
+    var time_rounding_block = $("input[name='dining_charge[time_rounding_block]']").val();
+    var charge_block = $("input[name='dining_charge[charge_block]']").val();
+    var rounding = time_rounding_block.split(':');
+    var charge_block_time = charge_block.split(':');
+    var time1=(parseInt(rounding[0])*60)+parseInt(rounding[1]);
+    var time2=(parseInt(charge_block_time[0])*60)+parseInt(charge_block_time[1]);

-    var hour2 = $("select[name='dining_charge[charge_block(4i)]']").val();
-    var min2 = $("select[name='dining_charge[charge_block(5i)]']").val();
-    var time2=(parseInt(hour2)*60)+parseInt(min2);
+    // var hour1 = $("select[name='dining_charge[time_rounding_block(4i)]']").val();
+    // var min1 = $("select[name='dining_charge[time_rounding_block(5i)]']").val();
+    // var time1=(parseInt(hour1)*60)+parseInt(min1);
+
+    // var hour2 = $("select[name='dining_charge[charge_block(4i)]']").val();
+    // var min2 = $("select[name='dining_charge[charge_block(5i)]']").val();
+    // var time2=(parseInt(hour2)*60)+parseInt(min2);

    var result=(unit_price*time1)/time2;
    $("#time_rounding_block_price").val(result);
-    // return result;
+    return result;
 }


 $( "#unit_price" ).change(function() {
  price();
 });
-$( "select[name='dining_charge[time_rounding_block(4i)]']" ).change(function() {
+$("input[name='dining_charge[time_rounding_block]']").change(function() {
  price();
 });
-$( "select[name='dining_charge[time_rounding_block(5i)]']" ).change(function() {
+$("input[name='dining_charge[time_rounding_block]']").change(function() {
  price();
 });
-$( "select[name='dining_charge[charge_block(4i)]']" ).change(function() {
+$("input[name='dining_charge[charge_block]']").change(function() {
  price();
 });
-$( "select[name='dining_charge[charge_block(5i)]']" ).change(function() {
+$("input[name='dining_charge[charge_block]']").change(function() {
  price();
 });

--- 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 %>
+      <%= f.input :is_active,:class=> "checkbox" %>
      <%= f.input :gateway_communication_type %>
      <%= f.input :gateway_url %>
      <%= f.input :auth_token %>
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
    <%= simple_nested_form_for([:settings,@promotion]) do |f| %>
  <%= f.error_notification %>

@@ -197,7 +197,7 @@
  </div>
 <% end %>
  </div>
- <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+ <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
    <div class="card">
      <div class="body">
          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
--- a/app/views/settings/zones/index.html.erb
+++ b/app/views/settings/zones/index.html.erb
@@ -48,7 +48,9 @@
  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
    <div class="card">
      <div class="body">
-        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <h5>
+          <i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i>          
+        </h5>
        <p>
        1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.data_txt") %> <br>
        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -11,7 +11,6 @@ Rails.application.config.assets.version = '1.0'
 # Rails.application.config.assets.precompile += %w( search.js )

 # -- Initial Layout -----
-Rails.application.config.assets.precompile += %w( sx_font.css )
 Rails.application.config.assets.precompile += %w( login.css )
 Rails.application.config.assets.precompile += %w( login.js )