From 44010e17623469906f7f705ef1768c7bf37cc100 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 11:39:41 +0630
Subject: [PATCH 01/26] add cashier zone terminal

---
 app/controllers/origami/shifts_controller.rb | 15 +++++++++++++--
 app/models/cashier_terminal.rb               |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index d175e36f..c5e52c99 100644
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -8,12 +8,23 @@ class Origami::ShiftsController < ApplicationController#BaseOrigamiController
 
   def new
     @float = Lookup.where('lookup_type=?','float_value')
-    @terminal = CashierTerminal.all
+    @terminal = CashierTerminal.available
   end
 
   def create
     opening_balance = params[:opening_balance]
-    cashier_terminal = params[:cashier_terminal]
+    cashier_terminal_param = params[:cashier_terminal]
+
+    cashier_terminal = CashierTerminal.find(cashier_terminal_param)
+    if cashier_terminal.is_currently_login
+      respond_to do |format|
+        format.html { redirect_to settings_order_queue_stations_url, notice: 'Cashier Terminal already signin!' }        
+      end
+    end
+
+    cashier_terminal.is_currently_login = 1
+    cashier_terminal.save
+
     @shift = ShiftSale.new
     @shift.create(opening_balance,cashier_terminal, current_user)
   end
diff --git a/app/models/cashier_terminal.rb b/app/models/cashier_terminal.rb
index 4f642d0a..b488f7c1 100644
--- a/app/models/cashier_terminal.rb
+++ b/app/models/cashier_terminal.rb
@@ -1,4 +1,6 @@
 class CashierTerminal < ApplicationRecord
 	has_many :cashier_terminal_by_zones 
   	has_many :zones, through: :cashier_terminal_by_zones
+
+  	scope :available, -> {where(is_currently_login: false)}
 end

From ba444956631fc5fae99aedb640f9590747ea52c5 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 12:05:56 +0630
Subject: [PATCH 02/26] shift open fix

---
 app/controllers/origami/shifts_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 41c84a8c..a0e027ba 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -25,8 +25,8 @@ class Origami::ShiftsController < BaseOrigamiController
     cashier_terminal.is_currently_login = 1
     cashier_terminal.save
 
-    @shift = ShiftSale.new
-    @shift.create(opening_balance,cashier_terminal, current_user)
+    @shift_sale = ShiftSale.new
+    @shift_sale.create(opening_balance,cashier_terminal_param, current_user)
   end
 
   def update_shift

From ac42c4a78ecb70f42427cd63ed7cecfc87d9ec3e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 13:20:41 +0630
Subject: [PATCH 03/26] ui edited

---
 app/assets/stylesheets/reset.css   | 10 ++++++++++
 app/views/layouts/_header.html.erb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index c5c3af2f..7f49dc71 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -39,6 +39,16 @@
   margin-top: 0px !important;
 }
 
+.dropdown-menu > li > p:hover {
+  background-color: #ccc;
+}
+
+@media (min-width: 768px){
+  .dropdown-menu {
+      padding: .3rem 0;
+  }
+}
+
 .switch label {
   color: #070707 !important;
 }
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 8f809e47..136f0578 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -32,7 +32,7 @@
             <ul class="dropdown-menu">
                 <li>
                     <%if current_login_employee.role !="waiter" %>
-                        <p class="delete  waves-effect waves-block" style="margin:0.5rem 1rem !important;" data-ref="<%=logout_path%>" data-method="delete">Logout</p>
+                        <p class="delete  waves-effect waves-block" style="padding:0.5rem 1rem; margin-bottom: 0rem;" data-ref="<%=logout_path%>" data-method="delete">Logout</p>
                          <span class="hidden" id="delete_text">
                             <h6>Are you sure you want to Logout ?</h6>
                             <!-- <h6>This action can't be undo. </h6> -->

From 735dc228db83fd8fb42dd2e62c7a13212640b6ac Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 23 Oct 2017 13:58:54 +0630
Subject: [PATCH 04/26] update admin bsb for add order design

---
 app/assets/javascripts/custom.js                |  3 +++
 app/assets/stylesheets/addorder.scss            | 11 ++++-------
 app/controllers/origami/addorders_controller.rb |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index e5b09e92..1509a71b 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -26,6 +26,9 @@ $(function(){
     var method    = $(this).attr('data-method');
     var url       = $(this).attr('data-ref');
     var html_text = $( this ).siblings( "#delete_text" ).html();
+    console.log(method);
+    console.log(url);
+    console.log(html_text);
     swal({
         title: "Confirmation",
         text: html_text,
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index d81a2d85..7d3add13 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -1,9 +1,3 @@
-@import "bootstrap";
-@import "font-awesome";
-@import "theme";
-@import "jquery-ui";
-@import "bootstrap-datepicker3";
-
 .custom-card-head{
     height: 40px;
     background-color: #54A5AF;
@@ -11,7 +5,6 @@
     color :#fff;
 
 }
-
 .custom-card {
     border: 2px solid rgba(0, 0, 0, 0.125) !important;
 }
@@ -126,6 +119,10 @@ element.style {
   margin-bottom:10px;
 }
 
+section.content{
+  padding-top:-50px !important;
+}
+
 /*Loading gif for payment*/
 
 #loading_wrapper{
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 0f1026a2..9e096a04 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -34,7 +34,6 @@ class Origami::AddordersController < BaseOrigamiController
 
   def get_menu_category ()
     if (params[:id])
-      puts "sssssssssssss"
       puts params[:id]
       #Pull this menu
       @menu = MenuCategory.find_by_id(params[:id])

From 1aa335801319cfe8b5fc0dec1e586a0f082cb16b Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 14:44:16 +0630
Subject: [PATCH 05/26] update seed

---
 app/models/seed_generator.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb
index e620472d..a26b70ce 100755
--- a/app/models/seed_generator.rb
+++ b/app/models/seed_generator.rb
@@ -1,8 +1,7 @@
 class SeedGenerator < ApplicationRecord
   # Generate ID for Tables
   def self.generate_id(model, prefix)
-    seed = SeedGenerator.find_by_model(model)
-    next_no = seed.next
+    seed = SeedGenerator.find_by_model(model)    
     new_receipt_no = 0
 
     if (seed.nil?)
@@ -11,6 +10,7 @@ class SeedGenerator < ApplicationRecord
       new_receipt_no = seed.next
       seed.save
     else
+      next_no = seed.next
       # current_no = seed.next
       # seed.next = seed.next + seed.increase_by
       # seed.current = current_no

From 14fc9b1a45185584462204e52cc6a2f060d5ebe0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 23 Oct 2017 16:14:29 +0630
Subject: [PATCH 06/26] update oqs

---
 app/assets/javascripts/OQS.js      | 142 ++++++++++++++++-------------
 app/assets/javascripts/addorder.js |  26 +++---
 app/assets/stylesheets/reset.css   |   4 +-
 app/views/oqs/home/index.html.erb  |  18 ++--
 4 files changed, 100 insertions(+), 90 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index bd59ffad..620e7490 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -46,72 +46,71 @@ $(document).ready(function(){
     }); //End Click
  
 	function show_details(url){  
-	   var oqs_append = $('.oqs_append');
-	   oqs_append.empty();
-	   var filter = $('.filter').text();
-	  //Start Ajax
-	  $.ajax({      
-	    type: "GET",         
-	    url: url, 
-	    data: {'filter':filter},
-	    dataType: "json",
-	    success: function(data) {
-	        for(var field in data) {
-	          var price = parseFloat(data[field].price).toFixed(2);
+	     var oqs_append = $('.oqs_append');
+	     oqs_append.empty();
+	     var filter = $('.filter').text();
+	    //Start Ajax
+	    $.ajax({      
+	      type: "GET",         
+	      url: url, 
+	      data: {'filter':filter},
+	      dataType: "json",
+	      success: function(data) {
+	          for(var field in data) {
+	            var price = parseFloat(data[field].price).toFixed(2);
 
-	          if (data[field]["options"] == "[]" || data[field]["options"] == "") {
-	           var options = "";
-	          }else{
-	           var options = data.options;
+	            if (data[field]["options"] == "[]" || data[field]["options"] == "") {
+	             var options = "";
+	            }else{
+	             var options = data.options;
+	            }
+
+	            var date = new Date(data[field]["created_at"]); 
+	          var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+	             
+	            row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
+	                    +'<div class="card-block">'
+	                        +'<h6 class="card-">'
+	                          +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
+	                          +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
+	                          +'<small class="float-right">'+ data[field]["order_id"] +'</small>'
+	                        +'</h6>'
+
+	                        +'<h6>'
+	                          +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
+	                          +'<span class="order-qty">'+ data[field]["qty"] +' </span>'
+	                        +'</h6>'
+
+	                        +'<p class="card-text item-options">'+ options +'</p>'
+
+	                        +'<p class="card-text">'
+	                          +'<small class="text-muted">Order at'
+	                            +'<span class="order-at">'+ show_date +'</span> - '
+
+	                            +'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
+	                            +'</small> '
+	                        +'</p>'
+
+	                        +'<p class="hidden order-customer">'+ data[field]["customer_name"] +'</p> '
+	                        +'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '
+	                    +'</div>'
+
+	                    +'<div class="card-footer">'
+	                        +'<button id="edit_'+ data[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
+	                        +' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+	                    +'</div>'
+
+	                +'</div>'; 
+	                    
+	                   
+	                   
+	              $('.oqs_append').append(row);
 	          }
-
-	          var date = new Date(data[field]["created_at"]); 
-          var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
-	           
-	          row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
-	                  +'<div class="card-block">'
-	                      +'<h4 class="card-title">'
-	                        +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
-	                        +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
-	                        +'<small class="pull-right">'+ data[field]["order_id"] +'- </small>'
-	                      +'</h4>'
-
-	                      +'<h4>'
-	                        +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
-	                        +'<span class="order-qty">'+ data[field]["qty"] +'- </span>'
-	                      +'</h4>'
-
-	                      +'<p class="card-text item-options">'+ options +'</p>'
-
-	                      +'<p class="card-text">'
-	                        +'<small class="text-muted">Order at'
-	                          +'<span class="order-at">'+ show_date +'</span> - '
-
-	                          +'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
-	                          +'</small> '
-	                      +'</p>'
-
-	                      +'<p class="hidden order-customer">'+ data[field]["customer_name"] +'</p> '
-	                      +'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '
-	                  +'</div>'
-
-	                  +'<div class="card-footer">'
-	                      +'<button id="edit_'+ data[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
-	                      +' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
-	                  +'</div>'
-
-	              +'</div>'; 
-	                  
-	                 
-	                 
-	            $('.oqs_append').append(row);
-	        }
-	        
-	     }
-	  });
-	  //end Ajax 
-
-	}
+	          
+	       }
+	    });
+	    //end Ajax 
+	  }
 
 	$(document).on('click', '.queue_station', function(event){ 
 	    var orderZone=$(this).children().children().children('.order-zone').text().trim();
@@ -198,7 +197,20 @@ $(document).ready(function(){
 	      	// update queue item count in completed station
 	      	$("#completed_count").text(parseInt($("#completed_count").text()) + data.length);
 
-	      	alert("updated!");
+	      	swal({
+		          title: "Infomation !",
+		          text: 'Order has been successfully created',
+		          confirmButtonColor: "green",
+		          confirmButtonText: "Yes!",
+		          closeOnConfirm: false,
+		        }, function () {
+		          if(table_type == "Table"){
+		                  window.location.href = "/origami/table/" + table_id
+		                }
+		                else {
+		                  window.location.href = "/origami/room/" + table_id
+		                }    
+		        });
 	      	// Page reload
 	    	location.reload();
 	      }
diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index d523e7e6..a2d77325 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -663,25 +663,21 @@ $(function(){
       data: params,
       dataType: "json",
       success:function(result){ 
-        $("#loading_wrapper").hide();                         
-        $.confirm({
-          title: 'Infomation!',
-          content: "Order has been successfully created",
-          buttons: {
-            confirm: {
-              text: 'Ok',
-              btnClass: 'btn-green',
-              action: function(){
-                if(table_type == "Table"){
+        $("#loading_wrapper").hide(); 
+        swal({
+          title: "Infomation !",
+          text: 'Order has been successfully created',
+          confirmButtonColor: "green",
+          confirmButtonText: "Yes!",
+          closeOnConfirm: false,
+        }, function () {
+          if(table_type == "Table"){
                   window.location.href = "/origami/table/" + table_id
                 }
                 else {
                   window.location.href = "/origami/room/" + table_id
-                }
-              }
-            }
-          }
-        });                   
+                }    
+        });                 
       }
     });
   });
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index c5c3af2f..dd688ee4 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -177,7 +177,9 @@ section.content {
 .hidden{
   display: none !important;
 }
-
+.hide{
+  display: none !important;
+}
 .sidebar .menu .list a {
   padding: 5px 13px;
 }
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 07374231..a0fc23a7 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+
   <div class="page-header">
     <ul class="breadcrumb">
       <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
@@ -13,7 +13,7 @@
   <!-- Column One -->
   <div class="row clearfix">
     <div class="col-lg-8 col-md-8 col-sm-8">  
-      <div class="body">
+      <div class="body p-l-10">
         <%= form_tag oqs_root_path, :method => :get do %>
         <div class="row clearfix">
           <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
@@ -76,26 +76,26 @@
        <div class="tab-content" id="custom-slimscroll" style="max-height:; overflow:">
         <!--- Panel 0 - Completed -->
 
-        <div class="tab-pane fade in active" id="completed" role="tabpanel">
+        <div class="tab-pane in active" id="completed" role="tabpanel">
           <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
             <%   
             @queue_completed_item.each do |qid|                               
               %>
               <div class="card queue_station">
                 <div class="card-block">
-                  <h4 class="card-title">
+                  <h5 class="card-">
                     <span class="order-zone-type"><%= qid.type %> - </span>
                     <span class="order-zone"><%= qid.zone %></span>
                     <small class="pull-right"><%= qid.order_id %></small>
-                  </h4> 
-                  <h4>
+                  </h5> 
+                  <h5>
                     <span class="order-item">
                       <%= qid.item_name %>
                     </span> [x
                     <span class="order-qty">
                       <%= qid.qty %>
                     </span> ]   
-                  </h4>                  
+                  </h5>                  
 
                   <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
 
@@ -187,7 +187,7 @@
     </div>
   </div>
 </div>
-<script type="text/javascript">
+<!-- <script type="text/javascript">
   $(document).ready(function(){
 
   $(".nav-completed").on("click", function(){
@@ -413,4 +413,4 @@
     });
   });
 });
-</script>
+</script> -->

From 857ab0ae14cb22ce012861dd960d3a17fd74d929 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 16:49:09 +0630
Subject: [PATCH 07/26] update for multiple cashier

---
 app/controllers/origami/shifts_controller.rb | 7 +++++++
 app/models/shift_sale.rb                     | 1 +
 2 files changed, 8 insertions(+)

diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index a0e027ba..34614424 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -15,6 +15,7 @@ class Origami::ShiftsController < BaseOrigamiController
     opening_balance = params[:opening_balance]
     cashier_terminal_param = params[:cashier_terminal]
 
+    # Multiple Cashier
     cashier_terminal = CashierTerminal.find(cashier_terminal_param)
     if cashier_terminal.is_currently_login
       respond_to do |format|
@@ -22,6 +23,7 @@ class Origami::ShiftsController < BaseOrigamiController
       end
     end
 
+    # Update Cashier Terminal
     cashier_terminal.is_currently_login = 1
     cashier_terminal.save
 
@@ -36,8 +38,13 @@ class Origami::ShiftsController < BaseOrigamiController
     if @shift
       @shift.shift_closed_at = DateTime.now.utc
       @shift.closing_balance = closing_balance.to_f
+      @shift.cashier_terminal.is_currently_login = 0
       @shift.save
 
+      # Multiple Cashier
+      #cashier_terminal = @shift.cashier_terminal
+
+
       unique_code = "CloseCashierPdf"
       shop_details = Shop.find(1)
       #get tax
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index 68c64cff..e9a6dd44 100755
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -37,6 +37,7 @@ class ShiftSale < ApplicationRecord
     self.shift_started_at = DateTime.now
     self.employee_id = current_user.id
     self.opening_balance = opening_balance
+    self.other_sales = 0
     self.save
   end
 

From dd08fd429833746ba20020b488657e04c4f87976 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 23 Oct 2017 17:28:48 +0630
Subject: [PATCH 08/26] update addorder button and plus icon etcc..

---
 app/assets/javascripts/addorder.js          | 36 ++++++++++-----------
 app/assets/stylesheets/addorder.scss        |  7 ++--
 app/views/origami/addorders/detail.html.erb | 18 +++++------
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index a2d77325..c8bb6be3 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -37,8 +37,8 @@ $(function(){
             }
 
             row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
-                     +'<div class="custom-card-head card-head" style="line-height:14px;">'
-                      +'<small class="col-md-9">'+ product[field].name +'</small>'
+                     +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
+                      +'<div class="col-md-9">'+ product[field].name +'</div>'
                       +"<div class='col-md-3 add_icon' data-item-code='"
                         + product[field].item_code +"' data-name='"
                         + product[field].name +"' data-qty = '"+ qty +"' data-price = '"
@@ -46,9 +46,8 @@ $(function(){
                         + product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
                         + JSON.stringify(item_attributes) +"' data-options = '"
                         + options +"' data-image='"+image_path+"'>"
-                      +"<i class='fa fa-plus '"
-                      + 'style="margin-top:4px;">'
-                      +'</i>'
+                      +"<i class='fa fa-plus material-icons'>"
+                      +'add</i>'
                       +'</div>'
                      +'</div>'
 
@@ -65,7 +64,7 @@ $(function(){
                     +"</div>"
 
                     +'<div class="card-footer custom-card-footer">'
-                      +'<small>'+ product[field].unit_price +'</small>'
+                      +'<span>'+ product[field].unit_price +'</span>'
                     +'</div>'
                   +'</div>'; 
             $('.menu_items_list').append(row);
@@ -109,6 +108,7 @@ $(function(){
 
             if (JSON.stringify(menu_items[field].item_sets)!='[]') {
               fa_plus = '';
+              add = '';
               menu_item_box = 'set_item_box';
               data_target = 'sx_item_set_detailModal';
 
@@ -120,7 +120,8 @@ $(function(){
                  item_attributes = menu_items[field].attributes;
                  promotion_price =  menu_items[field].promotion_price;
             }else{
-              fa_plus = 'fa-plus';
+              fa_plus = 'material-icons';
+              add = 'add'
               menu_item_box = 'menu_item_box';
               data_target = 'sx_item_detailModal';
 
@@ -146,8 +147,8 @@ $(function(){
             }
 
             row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
-                     +'<div class="custom-card-head card-head" style="line-height:14px;">'
-                      +'<small class="col-md-9">'+ menu_items[field].name +'</small>'
+                     +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
+                      +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
                       +"<div class='col-md-3 add_icon' data-item-code='"
                         + menu_items[field].code +"' data-name='"
                         + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
@@ -155,9 +156,8 @@ $(function(){
                         + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
                         + JSON.stringify(item_attributes) +"' data-options = '"
                         + options +"' data-image='"+image_path+"'>"
-                      +"<i class='fa "+fa_plus+" '"
-                      + 'style="margin-top:4px;">'
-                      +'</i>'
+                      +"<i class='fa "+fa_plus+" '>"
+                      +add+ '</i>'
                       +'</div>'
                      +'</div>'
 
@@ -174,7 +174,7 @@ $(function(){
                     +"</div>"
 
                     +'<div class="card-footer custom-card-footer">'
-                      +'<small>'+ price +'</small>'
+                      +'<span>'+ price +'</span>'
                     +'</div>'
                   +'</div>'; 
             $('.menu_items_list').append(row);
@@ -216,14 +216,14 @@ $(function(){
                             +"' data-max-qty='"+item_sets[field]["max_selectable_qty"]
                             +"'>"
                           +'<div class="custom-card-head card-head" style="line-height:14px;">'
-                             +'<small class="">'+result["name"]+'</small>'
+                             +'<span class="">'+result["name"]+'</span>'
                           +'</div>'
                           +'<div class="card-block custom-card-block">'
                             +'<img id="" src="/image/logo.png" height="40px">'
                             +' <small style="float:" id="instance_option"></small>'
                           +'</div>'
                           +'<div class="card-footer custom-card-footer">'
-                             +' <small>'+result["price"]+'</small>'
+                             +' <span>'+result["price"]+'</span>'
                              // +' <small style="float:right" id="instance_option"></small>'
                           +'</div>'
                         +'</div>'
@@ -433,8 +433,8 @@ $(function(){
           disabled = "disabled";
         }
         row +="<button id='selected-attribute' data-instances='"+JSON.stringify(instances)+"' data-type='"
-        +type+"' data-value='"+value[i]+"' class='btn btn-default attribute_btn "
-        + status +" "+ type +" "+ disabled +" '>"
+        +type+"' data-value='"+value[i]+"' class='btn btn- waves-effect attribute_btn "
+        + status +" "+ type +" '"+ disabled +" >"
         +value[i]
         +"</button>";   
       });
@@ -446,7 +446,7 @@ $(function(){
       type  = item_options[field]["type"];
       row = "<h4>"+type+"</h4>"
       $(value).each(function(i){
-        row +="<button class='btn btn-default option_btn "+ type +"' data-type='"
+        row +="<button class='btn btn- waves-effect option_btn "+ type +"' data-type='"
         +type+"' data-value='"+value[i]+"' data-group='simple_menu'>"+value[i]+"</button>";   
       });
       $(".options-list").append(row); 
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 7d3add13..91976f41 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -1,3 +1,6 @@
+section .content{
+  padding:50px 15px 0 225px !important;
+}
 .custom-card-head{
     height: 40px;
     background-color: #54A5AF;
@@ -78,11 +81,9 @@ element.style {
 }
 
 .selected-attribute {
-  color: #fff !important;
   background-color: green !important;
 }
 .selected-option {
-  color: #fff !important;
   background-color: green !important;
 }
 
@@ -94,12 +95,14 @@ element.style {
   white-space: normal !important;
   margin-bottom: 5px;
   margin-right: 5px;
+  color:#111 !important;
 }
 
 .option_btn {
   white-space: normal !important;
   margin-bottom: 5px;
   margin-right: 5px;
+  color:#111 !important;
 } 
 #logo{
     margin: auto;
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 078d10f4..1056d477 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -23,8 +23,7 @@
     </div>
 
     <div class="col-md-3 col-lg-3 col-sm-3">
-
-        <button type="button" class="btn btn-primary btn-md pull-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br><br>
+        <button type="button" class="btn btn-primary btn-md float-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br>
         <div class="card-header">
           <div>
              <strong id="order-title">ORDER DETAILS </strong> |  Table <%=@table.name%>
@@ -121,13 +120,14 @@
                         <div class="input-group">
                           <span class="input-group-btn">
                               <button type="button" class="btn btn-danger btn-number"  value="-" id="minus">
-                                <span class="glyphicon glyphicon-minus"></span>
+                               <i class="material-icons">remove</i>
+                                
                               </button>
                           </span>
                           <input type="text" value="1" id="count" class="change_qty form-control col-md-12 ">
                           <span class="input-group-btn">
                               <button type="button" class="btn btn-success btn-number" value="+" id="plus">
-                                  <span class="glyphicon glyphicon-plus"></span>
+                                 <i class="material-icons">add</i>
                               </button>
                           </span>
                       </div>
@@ -154,8 +154,8 @@
                 <div class="mr-auto">
                   <h4 class=" pull-left">Total : <span id="total_price"></span></h4>
                 </div>
-                <button type="button" class="btn btn-primary" data-dismiss="modal" id="close">Close</button>
-                <button type="button" class="btn btn-success add_to_order" data-dismiss="modal" id="add_to_order">Add to Order</button>
+                <button type="button" class="btn btn-primary m-r-20" data-dismiss="modal" id="close">Close</button>
+                <button type="button" class="btn btn-success add_to_order m-r-10" data-dismiss="modal" id="add_to_order">Add to Order</button>
             </div>
         </div>
       </div>
@@ -183,13 +183,13 @@
                       <div class="input-group">
                           <span class="input-group-btn">
                               <button type="button" class="btn btn-danger btn-number"  value="-" id="set_minus">
-                                <span class="glyphicon glyphicon-minus"></span>
+                                <i class="material-icons">remove</i>
                               </button>
                           </span>
                           <input type="text" value="1" id="set_count" class="set_change_qty form-control col-md-12 ">
                           <span class="input-group-btn">
                               <button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
-                                  <span class="glyphicon glyphicon-plus"></span>
+                                  <i class="material-icons">add</i>
                               </button>
                           </span>
                       </div>
@@ -207,7 +207,7 @@
 
                   </div>
                   <div class="col-md-8">       
-                     <div class="instance-list"></div>
+                     <div class="instance-list row"></div>
                   </div>
                 </div>
             </div>

From 17926742d51e3c6c16e4fce53f0bb06c9f3ba20c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 23 Oct 2017 17:40:02 +0630
Subject: [PATCH 09/26] update twice scroll  etcc..

---
 app/assets/stylesheets/origami.scss    | 6 ------
 app/views/crm/customers/index.html.erb | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index d0819198..9c2dcbb1 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -39,12 +39,6 @@ select.form-control {
 
 /* End Reset */
 
-.dining {
-	min-height:470px;
-	max-height:570px; 
-	overflow:auto
-}
-
 .order-info {
 	min-height:300px; 
 	max-height:500px; 
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index b74f33a9..c14ec832 100755
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+
     <div class="page-header">
      <ul class="breadcrumb">
       <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
@@ -9,7 +9,7 @@
       </span>
      </ul>
     </div>
-</div>
+
   <div class="row clearfix">
     <div class="col-lg-8 col-md-8 col-sm-8">
       <!-- <div class="main-box-body clearfix"> -->

From 707cae4cf8f151b7a8920ec86c265b8c8d369d84 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 18:10:15 +0630
Subject: [PATCH 10/26] add multi cashier logic

---
 app/controllers/api/bill_controller.rb | 7 ++++++-
 app/models/sale.rb                     | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index ac12e453..108731b6 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -13,10 +13,15 @@ class Api::BillController < Api::ApiController
         # for Job
         table = DiningFacility.find(booking.dining_facility_id)
 
+        cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+
+        shift_by_terminal = ShiftSale.find_by_cashier_terminal_id(cashier_zone.cashier_terminal_id)
+        get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id)
+
           if booking
             if booking.sale_id.nil?
               @sale = Sale.new
-              @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, get_cashier)
+              @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, get_cashier_by_terminal)
             else
               @status = true
               @sale_id = booking.sale_id
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 420b1eda..d0004954 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -71,8 +71,8 @@ class Sale < ApplicationRecord
 
       # set cashier
       if cashier != nil
-        self.cashier_id = cashier[0].id
-        self.cashier_name = cashier[0].name
+        self.cashier_id = cashier.id
+        self.cashier_name = cashier.name
       else
         self.cashier_id = requested_by.id
         self.cashier_name = requested_by.name

From e1dc1d4a8a88216c3958629b5276080b0202814a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 23 Oct 2017 18:11:43 +0630
Subject: [PATCH 11/26] update orgamidesign  etcc..

---
 app/assets/javascripts/origami.js                |  1 +
 app/assets/stylesheets/origami.scss              |  8 ++++----
 app/views/origami/addorders/detail.html.erb      |  3 +++
 app/views/origami/credit_payments/index.html.erb |  6 +++---
 app/views/origami/discounts/index.html.erb       |  5 +++++
 app/views/origami/jcb/index.html.erb             |  6 +++---
 app/views/origami/master/index.html.erb          |  6 +++---
 app/views/origami/mpu/index.html.erb             |  6 +++---
 app/views/origami/payments/show.html.erb         |  2 +-
 app/views/origami/sales/show.html.erb            | 16 ++++++++--------
 app/views/origami/visa/index.html.erb            |  6 +++---
 11 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 2f9fcee4..c799c0be 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -4,6 +4,7 @@
 //= require bootstrap/js/bootstrap-material-design.min
 //= require jquery_ujs
 //= require turbolinks
+//= require cable
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 9c2dcbb1..6e06b1e5 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -97,15 +97,15 @@ select.form-control {
 }
 
 .cash-color{
-	background-color:#80CBC4;
+	background-color:#2196F3;
 }
 
 .credit-color{
-	background-color:#FFCCBC;
+	background-color:#FF5722;
 }
 
 .other-payment-color{
-	background-color:#E1BEE7;
+	background-color:#795548;
 }
 
 .cashier_number:hover{
@@ -201,7 +201,7 @@ select.form-control {
 }
 
 .red {
-	background-color:#ff0000;
+	background-color:#F44336;
 }
 
 .green{
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 1056d477..be16da51 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -1,5 +1,8 @@
 <%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
 <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> 
+<div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
 <div class="row">
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index d8f5a263..2d246ce4 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -90,11 +90,11 @@
    </div>
    <div class="col-lg-6 col-md-6 col-sm-6">
      <div class="row bottom">
-       <div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
+       <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
        <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
      </div>
      <div class="row bottom">
-       <div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
+       <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
        <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
      </div>
      <div class="row bottom">
@@ -106,7 +106,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1">
-  <button type="button" class="btn bg-blue btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
+  <button type="button" class="btn bg-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
 </div>
 </div>
 </div>
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index ada238bb..4fbaff3f 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -1,4 +1,7 @@
  <div class="container-fluid">
+ <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+ </div>
  	<div class="row">
  		<!-- Column One -->
  		<div class="col-lg-6 col-md-6 col-sm-6">
@@ -366,6 +369,7 @@
 	// Pay Discount for Payment
 	$("#pay-discount").on('click', function(e){
 		e.preventDefault();
+		$("#loading_wrapper").show();
 		var sale_id = $('#sale-id').text();
 		var discount_items = JSON.stringify(get_discount_item_rows());
 		var overall_discount = $("#order-discount").text();
@@ -379,6 +383,7 @@
 			url: ajax_url,
 			data: params,
 			success:function(result){	
+				$("#loading_wrapper").hide(); 
 				swal({
 			        title: "Infomation!",
 			        text: result.status,
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index e1ec43d4..c27013d2 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -76,11 +76,11 @@
 			</div>
 			<div class="col-lg-6 col-md-6 col-sm-6">
 				<div class="row bottom">
-					<div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
+					<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
 					<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
 				</div>
 				<div class="row bottom">
-					<div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
+					<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
 					<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
 				</div>
 				<div class="row bottom">
@@ -92,7 +92,7 @@
 	</div>
 
 	<div class="col-lg-1 col-md-1 col-sm-1">
-		<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+		<button type="button" class="btn btn-primary m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 	</div>
 </div>
 
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index bdbbf6d4..b817effd 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -76,11 +76,11 @@
    </div>
    <div class="col-lg-6 col-md-6 col-sm-6">
      <div class="row bottom">
-       <div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
+       <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
        <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
      </div>
      <div class="row bottom">
-       <div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
+       <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
        <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
      </div>
      <div class="row bottom">
@@ -92,7 +92,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1">
- <button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+ <button type="button" class="btn btn-default m-l-3 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 </div>
 </div>
 
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index ce2947fd..92a87dd2 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -79,11 +79,11 @@
 				</div>
 				<div class="col-lg-6 col-md-6 col-sm-6">
 					<div class="row bottom">
-						<div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
+						<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
 						<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
 					</div>
 					<div class="row bottom">
-						<div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
+						<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
 						<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
 					</div>
 					<div class="row bottom">
@@ -95,7 +95,7 @@
 		</div>
 
 		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+			<button type="button" class="btn btn-primary m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 		</div>
 	</div>
 </div>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index af8cde00..0cd18f0f 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -265,7 +265,7 @@
   <!-- Waiter Buttons -->
 
   <button type="button" class="btn bg-default btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
-  <button type="button" class="btn bg-warning btn-block" id="foc"> FOC </button>
+  <button type="button" class="btn bg-deep-purple btn-block" id="foc"> FOC </button>
   <button type="button" class="btn bg-red btn-block" id="void"> Void </button>
 </div>
 
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index 2152deb1..904d5896 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -25,7 +25,7 @@
      <div class="tab-pane active" id="completed" role="tabpanel" style="max-height:600px; overflow:auto">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @complete.each do |sale| %>
-         <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
+         <div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
            <div class="card-block">
               <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
            </div>
@@ -39,7 +39,7 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @tables.each do |table| %>
          <% if table.status == 'occupied' %>
-         <div class="card tables red text-white" data-id="<%= table.id %>">
+         <div class="card tables bg-red text-white" data-id="<%= table.id %>">
            <div class="card-block">
               <%= table.name %>
               <% if table.get_booking.nil? %>
@@ -50,7 +50,7 @@
            </div>
          </div>
          <% else %>
-         <div class="card tables green text-white" data-id="<%= table.id %>">
+         <div class="card tables bg-green text-white" data-id="<%= table.id %>">
            <div class="card-block">
               <%= table.name %>
            </div>
@@ -65,7 +65,7 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @rooms.each do |room| %>
          <% if room.status == 'occupied' %>
-         <div class="card rooms red text-white" data-id="<%= room.id %>">
+         <div class="card rooms bg-red text-white" data-id="<%= room.id %>">
            <div class="card-block">
               <%= room.name %>
               <% if room.get_booking.nil? %>
@@ -76,7 +76,7 @@
            </div>
          </div>
          <% else %>
-         <div class="card rooms green text-white" data-id="<%= room.id %>">
+         <div class="card rooms bg-green text-white" data-id="<%= room.id %>">
            <div class="card-block">
               <%= room.name %>
            </div>
@@ -90,7 +90,7 @@
      <div class="tab-pane" id="orders" role="tabpanel" style="max-height:600px; overflow:auto">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @orders.each do |order| %>
-         <div class="card orders red text-white" data-id = "<%= order.order_id %>">
+         <div class="card orders bg-red text-white" data-id = "<%= order.order_id %>">
            <div class="card-block">
               <%= order.order_id %>
            </div>
@@ -198,9 +198,9 @@
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button type="button" class="btn btn-default btn-block" id='back'>Back</button>
    <% if @sale.sale_status != 'void' %>
-       <button type="button" id="void" class="btn btn-blue btn-block">VOID</button>
+       <button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
    <% end %>
-   <button type="button" id="re-print" class="btn btn-blue btn-block">Re.Print</button>
+   <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
  </div>
 </div>
 </div>
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 53cf8dcf..53589c89 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -76,11 +76,11 @@
    </div>
    <div class="col-lg-6 col-md-6 col-sm-6">
      <div class="row bottom">
-       <div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
+       <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
        <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
      </div>
      <div class="row bottom">
-       <div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
+       <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
        <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
      </div>
      <div class="row bottom">
@@ -92,7 +92,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1">
- <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+ <button type="button" class="btn bg-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 </div>
 </div>
 </div>

From c61c7ac98fa0baa3a912b2fc58a63ce5f802294d Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 18:39:05 +0630
Subject: [PATCH 12/26] print bill by cashier zone

---
 app/controllers/api/bill_controller.rb        |  2 +-
 .../origami/payments_controller.rb            | 30 +++++++++++++++++--
 app/models/printer/receipt_printer.rb         |  6 ++--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 108731b6..aff97bff 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -10,7 +10,7 @@ class Api::BillController < Api::ApiController
       table = 0
       if (params[:booking_id])
         booking  = Booking.find(params[:booking_id])
-        # for Job
+        # for Multiple Cashier by Zone
         table = DiningFacility.find(booking.dining_facility_id)
 
         cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 965d6a4c..fa7e0a4b 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -9,8 +9,19 @@ class Origami::PaymentsController < BaseOrigamiController
     sale_items = SaleItem.where("sale_id=?",sale_id)
     member_info = nil
 
-    # Print for First Bill to Customer
+    # For Cashier by Zone
+    bookings = Booking.find_by_sale_id(sale_id)
+    if bookings.count > 1 
+      # for Multiple Cashier by Zone
+      table = DiningFacility.find(bookings[0].dining_facility_id)
+    else
+      table = DiningFacility.find(bookings.dining_facility_id)        
+    end
 
+    cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+    cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+
+    # Print for First Bill to Customer
     unique_code = "ReceiptBillPdf"
      #shop detail
     shop_details = Shop.find(1)
@@ -33,7 +44,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
     printer = Printer::ReceiptPrinter.new(print_settings)
 
-    printer.print_receipt_bill(print_settings,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt")    
+    printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt")    
   end
 
   def create
@@ -49,6 +60,19 @@ class Origami::PaymentsController < BaseOrigamiController
       render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
       rebate_amount = nil
 
+      # For Cashier by Zone
+      bookings = Booking.find_by_sale_id(sale_id)
+      if bookings.count > 1 
+        # for Multiple Cashier by Zone
+        table = DiningFacility.find(bookings[0].dining_facility_id)
+      else
+        table = DiningFacility.find(bookings.dining_facility_id)        
+      end
+
+      cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
+      cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
+
+      # For Print
       unique_code = "ReceiptBillPdf"
       customer= Customer.find(saleObj.customer_id)
       
@@ -68,7 +92,7 @@ class Origami::PaymentsController < BaseOrigamiController
       discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items)
 
       printer = Printer::ReceiptPrinter.new(print_settings)
-      printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid")   
+      printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid")   
     end    
   end
 
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 18af1dd1..30bd5ed8 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -65,7 +65,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   end
 
   #Bill Receipt Print
-  def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status)
+  def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status)
     #Use CUPS service
     #Generate PDF
     #Print
@@ -77,10 +77,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     begin
       if count == 1
         pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}.pdf"
-        self.print("tmp/receipt_bill_#{sale_data.receipt_no}.pdf")
+        self.print("tmp/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
       else
         pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
-        self.print("tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf")
+        self.print("tmp/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
       end
 
       count -= 1

From 2f254a34ca23e52c7a7190c825138de3e797a029 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 19:23:43 +0630
Subject: [PATCH 13/26] print cashier by zone

---
 app/controllers/origami/payments_controller.rb | 12 ++++++------
 app/controllers/origami/shifts_controller.rb   |  9 +++++----
 app/models/printer/cashier_station_printer.rb  |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index fa7e0a4b..06174935 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -10,12 +10,12 @@ class Origami::PaymentsController < BaseOrigamiController
     member_info = nil
 
     # For Cashier by Zone
-    bookings = Booking.find_by_sale_id(sale_id)
+    bookings = Booking.where("sale_id='#{sale_id}'")
     if bookings.count > 1 
-      # for Multiple Cashier by Zone
+      # for Multiple Booking
       table = DiningFacility.find(bookings[0].dining_facility_id)
     else
-      table = DiningFacility.find(bookings.dining_facility_id)        
+      table = DiningFacility.find(bookings[0].dining_facility_id)        
     end
 
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
@@ -61,12 +61,12 @@ class Origami::PaymentsController < BaseOrigamiController
       rebate_amount = nil
 
       # For Cashier by Zone
-      bookings = Booking.find_by_sale_id(sale_id)
+      bookings = Booking.where("sale_id='#{sale_id}'")
       if bookings.count > 1 
-        # for Multiple Cashier by Zone
+        # for Multiple Booking
         table = DiningFacility.find(bookings[0].dining_facility_id)
       else
-        table = DiningFacility.find(bookings.dining_facility_id)        
+        table = DiningFacility.find(bookings[0].dining_facility_id)        
       end
 
       cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 34614424..851be7e5 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -37,12 +37,13 @@ class Origami::ShiftsController < BaseOrigamiController
     @shift = ShiftSale.find_by_id(shift_id)
     if @shift
       @shift.shift_closed_at = DateTime.now.utc
-      @shift.closing_balance = closing_balance.to_f
-      @shift.cashier_terminal.is_currently_login = 0
+      @shift.closing_balance = closing_balance.to_f     
       @shift.save
 
       # Multiple Cashier
-      #cashier_terminal = @shift.cashier_terminal
+      cashier_terminal = @shift.cashier_terminal      
+      cashier_terminal.is_currently_login = 0
+      cashier_terminal.save
 
 
       unique_code = "CloseCashierPdf"
@@ -62,7 +63,7 @@ class Origami::ShiftsController < BaseOrigamiController
 
       printer = Printer::CashierStationPrinter.new(print_settings)
 
-      printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
+      printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
 
       
     end
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index 91100145..e62ab4d1 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -22,7 +22,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   # end
 
   #Bill Receipt Print
-  def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
+  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
     #Use CUPS service
     #Generate PDF
     #Print
@@ -32,7 +32,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" 
     pdf.render_file filename
-    self.print(filename)
+    self.print(filename, cashier_terminal.printer_name)
   end
 
 

From 19116654a2cdb289a9c89a72e79b9fd62377221e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 24 Oct 2017 10:20:18 +0630
Subject: [PATCH 14/26] print setting for font

---
 app/pdf/order_item_pdf.rb    | 4 ++--
 app/pdf/order_summary_pdf.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 9f916853..9fe198d6 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -17,7 +17,7 @@ class OrderItemPdf < Prawn::Document
     # super(:margin => [10, 5, 30, 5], :page_size => [200,400])
 
     # db font setup
-    if print_settings.font != nil
+    if print_settings.font != ""
         font_families.update("#{print_settings.font}" => {
             :normal => "public/fonts/#{print_settings.font}.ttf",
             :italic => "public/fonts/#{print_settings.font}.ttf",
@@ -26,7 +26,7 @@ class OrderItemPdf < Prawn::Document
         })
 
         font "#{print_settings.font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]        
     end
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 098718a2..b83b2ccf 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -16,7 +16,7 @@ class OrderSummaryPdf < Prawn::Document
     super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
     # db font setup
-    if print_settings.font != nil
+    if print_settings.font != ""
         font_families.update("#{print_settings.font}" => {
             :normal => "public/fonts/#{print_settings.font}.ttf",
             :italic => "public/fonts/#{print_settings.font}.ttf",

From 59c38b2c96e597fa6542e28ceac7fa226b0109f2 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 24 Oct 2017 10:55:02 +0630
Subject: [PATCH 15/26] update dashboard total sale and count

---
 app/controllers/home_controller.rb |  9 ++++++++-
 app/models/sale.rb                 |  9 +++++++++
 app/views/home/dashboard.html.erb  | 10 +++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 73495c70..9cca8f1c 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -72,7 +72,14 @@ class HomeController < ApplicationController
     # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
     # .sum(:grand_total)
     @employee_sales = Sale.employee_sales(today).sum(:grand_total)
-    @inventories = StockJournal.inventory_balances(today).sum(:balance)
+    @inventories    = StockJournal.inventory_balances(today).sum(:balance)
+
+    @total_sale     = Sale.total_sale(today)
+    @total_count    = Sale.total_count(today)
+               
+      puts @grand_total.to_json
+      puts @total_count
+      puts "ssssssssssss"
   end
 
   def destroy
diff --git a/app/models/sale.rb b/app/models/sale.rb
index d0004954..306592c2 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -867,6 +867,15 @@ end
             .order('e.name ASC')
   end
 
+  def self.total_sale(today)
+  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total")
+
+  end
+
+  def self.total_count(today)
+  total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
+  end
+
   private
 
   def generate_custom_id
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 0bffc868..7dda39a4 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -8,11 +8,11 @@
         <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
             <div class="info-box bg-pink hover-expand-effect">
                 <div class="icon">
-                    <i class="material-icons">playlist_add_check</i>
+                    <i class="material-icons">attach_money</i>
                 </div>
                 <div class="content">
-                    <div class="text">NEW TASKS</div>
-                    <div class="number count-to" data-from="0" data-to="125" data-speed="15" data-fresh-interval="20"></div>
+                    <div class="text">TODAY TOTAL SALE</div>
+                    <div class="number count-to" data-from="0" data-to="<%= @total_sale%>" data-speed="15" data-fresh-interval="20"></div>
                 </div>
             </div>
         </div>
@@ -22,8 +22,8 @@
                     <i class="material-icons">help</i>
                 </div>
                 <div class="content">
-                    <div class="text">NEW TICKETS</div>
-                    <div class="number count-to" data-from="0" data-to="257" data-speed="1000" data-fresh-interval="20"></div>
+                    <div class="text">TODAY SALE COUNT</div>
+                    <div class="number count-to" data-from="0" data-to="<%= @total_count%>" data-speed="1000" data-fresh-interval="20"></div>
                 </div>
             </div>
         </div>

From f7d39205541082e207369cd440a5f96dd206333e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 24 Oct 2017 11:42:48 +0630
Subject: [PATCH 16/26] update dashboard total credit and card

---
 app/controllers/home_controller.rb            |  8 ++--
 app/models/sale.rb                            | 19 +++++++++
 app/views/home/dashboard.html.erb             | 39 ++++++++++---------
 app/views/settings/accounts/_form.html.erb    | 27 +++++++++----
 app/views/settings/accounts/edit.html.erb     | 12 +-----
 app/views/settings/accounts/new.html.erb      |  2 +-
 app/views/settings/accounts/show.html.erb     |  2 +-
 .../settings/cashier_terminals/_form.html.erb |  4 +-
 .../settings/cashier_terminals/show.html.erb  |  2 +-
 9 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 9cca8f1c..9a967300 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -76,10 +76,10 @@ class HomeController < ApplicationController
 
     @total_sale     = Sale.total_sale(today)
     @total_count    = Sale.total_count(today)
-               
-      puts @grand_total.to_json
-      puts @total_count
-      puts "ssssssssssss"
+    @total_card     = Sale.total_card_sale(today)
+    @total_credit     = Sale.credit_payment(today)
+puts "ssss"
+puts @total_card.to_json
   end
 
   def destroy
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 306592c2..37e284cb 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -876,6 +876,25 @@ end
   total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
   end
 
+  def self.total_card_sale(today)
+    payment_type = " and payment_method = 'mpu' or payment_method = 'visa' or payment_method = 'master' or payment_method = 'jcb' "
+    # query        = Sale.select("SUM(tax_payable_amount) AS st_amount,tax_name")
+    #                 .where('sale_status = "completed" #{payment_type} and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
+    #                 .joins("join sale_payments on sale_id = sales.sale_id")
+    #                 .group("sales.sale_id")
+
+    query = SalePayment.where('s.sale_status = "completed" and payment_method = "mpu" or payment_method = "visa" or payment_method = "master" or payment_method = "jcb" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+            .sum("payment_amount")
+
+  end
+
+  def self.credit_payment(today)
+    query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
+            .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+            .sum("payment_amount")
+  end
+
   private
 
   def generate_custom_id
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 7dda39a4..6aaa0624 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -5,47 +5,48 @@
 
     <!-- Widgets -->
     <div class="row clearfix">
-        <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-            <div class="info-box bg-pink hover-expand-effect">
-                <div class="icon">
-                    <i class="material-icons">attach_money</i>
-                </div>
-                <div class="content">
-                    <div class="text">TODAY TOTAL SALE</div>
-                    <div class="number count-to" data-from="0" data-to="<%= @total_sale%>" data-speed="15" data-fresh-interval="20"></div>
-                </div>
-            </div>
-        </div>
         <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
             <div class="info-box bg-cyan hover-expand-effect">
                 <div class="icon">
                     <i class="material-icons">help</i>
                 </div>
                 <div class="content">
-                    <div class="text">TODAY SALE COUNT</div>
+                    <div class="text">SALE COUNT</div>
                     <div class="number count-to" data-from="0" data-to="<%= @total_count%>" data-speed="1000" data-fresh-interval="20"></div>
                 </div>
             </div>
         </div>
         <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-            <div class="info-box bg-light-green hover-expand-effect">
+            <div class="info-box bg-pink hover-expand-effect">
                 <div class="icon">
-                    <i class="material-icons">forum</i>
+                    <i class="material-icons">attach_money</i>
                 </div>
                 <div class="content">
-                    <div class="text">NEW COMMENTS</div>
-                    <div class="number count-to" data-from="0" data-to="243" data-speed="1000" data-fresh-interval="20"></div>
+                    <div class="text">TOTAL SALE</div>
+                    <div class="number count-to" data-from="0" data-to="<%= @total_sale%>" data-speed="15" data-fresh-interval="20"></div>
+                </div>
+            </div>
+        </div>
+        
+        <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+            <div class="info-box bg-light-green hover-expand-effect">
+                <div class="icon">
+                    <i class="material-icons">person_add</i>
+                </div>
+                <div class="content">
+                    <div class="text">TOTAL CREDIT</div>
+                    <div class="number count-to" data-from="0" data-to="<%= @total_credit%>" data-speed="1000" data-fresh-interval="20"></div>
                 </div>
             </div>
         </div>
         <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
             <div class="info-box bg-orange hover-expand-effect">
                 <div class="icon">
-                    <i class="material-icons">person_add</i>
+                    <i class="material-icons">credit_card</i>
                 </div>
                 <div class="content">
-                    <div class="text">NEW VISITORS</div>
-                    <div class="number count-to" data-from="0" data-to="1225" data-speed="1000" data-fresh-interval="20"></div>
+                    <div class="text">TOTAL CARD</div>
+                    <div class="number count-to" data-from="0" data-to="<%= @total_card%>" data-speed="1000" data-fresh-interval="20"></div>
                 </div>
             </div>
         </div>
diff --git a/app/views/settings/accounts/_form.html.erb b/app/views/settings/accounts/_form.html.erb
index 7b85dad6..ea80dcd6 100755
--- a/app/views/settings/accounts/_form.html.erb
+++ b/app/views/settings/accounts/_form.html.erb
@@ -1,7 +1,8 @@
-<%= simple_form_for([:settings,@settings_account]) do |f| %>
-  <%= f.error_notification %>
-
-  <div class="form-inputs">
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+   <%= simple_form_for([:settings,@settings_account]) do |f| %>
+   <%= f.error_notification %>
+   <div class="form-inputs p-l-10">
     <%= f.input :title %>
     <%= f.input :account_type, :collection => Lookup.collection_of("account_type") %>
     <%= f.input :discount %>
@@ -9,9 +10,19 @@
     <%= f.input :bonus %>
     <%= f.input :rebate %>
   </div>
-
   <div class="form-actions">
-    <%= f.submit "Create Account",:class => 'btn btn-primary btn-lg waves-effect' %>
+    <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
   </div>
-
-<% end %>
+  <% end %>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+  <div class="card">
+    <div class="body">
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+    </div>
+  </div>  
+</div>
+</div>
diff --git a/app/views/settings/accounts/edit.html.erb b/app/views/settings/accounts/edit.html.erb
index 9c116ea9..d97b8659 100755
--- a/app/views/settings/accounts/edit.html.erb
+++ b/app/views/settings/accounts/edit.html.erb
@@ -1,20 +1,10 @@
-<!-- <div class="span12">
-		<div class="page-header">
-		 <ul class="breadcrumb">
-		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_accounts_path %>">Account</a></li>
-		  	<li>Edit</li>
-		 </ul>
-		</div>
-    <%= render 'form', settings_account: @settings_account %>
-</div> -->
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>">Account</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/accounts/new.html.erb b/app/views/settings/accounts/new.html.erb
index bbdab153..68fc6501 100755
--- a/app/views/settings/accounts/new.html.erb
+++ b/app/views/settings/accounts/new.html.erb
@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>">Account</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/accounts/show.html.erb b/app/views/settings/accounts/show.html.erb
index 8321c487..1f3853d4 100755
--- a/app/views/settings/accounts/show.html.erb
+++ b/app/views/settings/accounts/show.html.erb
@@ -36,7 +36,7 @@
           <!-- <td><%= @settings_account.bonus %></td> -->
           <td><%= @settings_account.rebate %></td>
 
-          <td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %>
+          <td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account),:class => 'btn btn-primary btn-sm waves-effect' %>
             <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_account_path(@settings_account)%>" data-method="delete">
                 <%= t("views.btn.delete") %>
             </button>
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb
index 1ba525e6..513934d4 100755
--- a/app/views/settings/cashier_terminals/_form.html.erb
+++ b/app/views/settings/cashier_terminals/_form.html.erb
@@ -3,7 +3,7 @@
     <%= simple_form_for([:settings, @settings_cashier_terminal]) do |f| %>
     <%= f.error_notification %>
 
-    <div class="form-inputs">
+    <div class="form-inputs p-l-10">
       <%= f.input :name %>
       <%= f.input :is_active %>
       <%= f.input :is_currently_login %>
@@ -19,7 +19,7 @@
     </div>
 
     <div class="form-actions">
-       <%= f.submit "Create Cashier Terminal",:class => 'btn btn-primary btn-lg waves-effect' %>
+       <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
     </div>
   <% end %>
   </div>
diff --git a/app/views/settings/cashier_terminals/show.html.erb b/app/views/settings/cashier_terminals/show.html.erb
index a9232d35..62e02b43 100755
--- a/app/views/settings/cashier_terminals/show.html.erb
+++ b/app/views/settings/cashier_terminals/show.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_cashier_terminal_path %>">Cashier Terminals</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_cashier_terminals_path %>">Cashier Terminals</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminal_path %>

From 06dd5df4329b4eecaeb312f275f86f9c26c98406 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 24 Oct 2017 11:44:31 +0630
Subject: [PATCH 17/26] update puts remove

---
 app/controllers/home_controller.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 9a967300..24fe58ec 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -78,8 +78,6 @@ class HomeController < ApplicationController
     @total_count    = Sale.total_count(today)
     @total_card     = Sale.total_card_sale(today)
     @total_credit     = Sale.credit_payment(today)
-puts "ssss"
-puts @total_card.to_json
   end
 
   def destroy

From 5c80d509421729f7fb9d6962325e182187c13678 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 24 Oct 2017 15:22:03 +0630
Subject: [PATCH 18/26] font in order

---
 app/pdf/order_item_pdf.rb    | 40 +++++++++++++++++++++++-------------
 app/pdf/order_summary_pdf.rb | 34 +++++++++++++++---------------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 9fe198d6..ef30e9a1 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -17,17 +17,17 @@ class OrderItemPdf < Prawn::Document
     # super(:margin => [10, 5, 30, 5], :page_size => [200,400])
 
     # db font setup
-    if print_settings.font != ""
-        font_families.update("#{print_settings.font}" => {
-            :normal => "public/fonts/#{print_settings.font}.ttf",
-            :italic => "public/fonts/#{print_settings.font}.ttf",
-            :bold => "public/fonts/#{print_settings.font}.ttf",
-            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
-        })
+    # if print_settings.font != ""
+    #     font_families.update("#{print_settings.font}" => {
+    #         :normal => "public/fonts/#{print_settings.font}.ttf",
+    #         :italic => "public/fonts/#{print_settings.font}.ttf",
+    #         :bold => "public/fonts/#{print_settings.font}.ttf",
+    #         :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+    #     })
 
-        font "#{print_settings.font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]        
-    end
+    #     font "#{print_settings.font}"
+    #     fallback_fonts ["Courier", "Helvetica", "Times-Roman"]        
+    # end
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
      #font "public/fonts/Chinese.ttf"  
@@ -42,7 +42,7 @@ class OrderItemPdf < Prawn::Document
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
 
     # order items
-    order_items(order_item, options, alt_name, print_settings.precision)
+    order_items(order_item, options, alt_name, print_settings.precision,print_settings.font)
   end
 
   # Write Order Information to PDF
@@ -70,11 +70,11 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items(order_item, options, alt_name, precision)
+  def order_items(order_item, options, alt_name, precision, font)
     y_position = cursor
 
     #Add Order Item    
-    add_order_items(order_item, options, alt_name, precision)
+    add_order_items(order_item, options, alt_name, precision, font)
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
@@ -82,7 +82,19 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Add order items under order info
-  def add_order_items(order_item, options, alt_name, precision)
+  def add_order_items(order_item, options, alt_name, precision, font)
+    # db font setup
+    if font != ""
+        font_families.update("#{font}" => {
+            :normal => "public/fonts/#{font}.ttf",
+            :italic => "public/fonts/#{font}.ttf",
+            :bold => "public/fonts/#{font}.ttf",
+            :bold_italic => "public/fonts/#{font}.ttf"
+        })
+
+        font "#{font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
     y_position = cursor
 
     move_down 5
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index b83b2ccf..b776d992 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -15,18 +15,6 @@ class OrderSummaryPdf < Prawn::Document
 
     super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
-    # db font setup
-    if print_settings.font != ""
-        font_families.update("#{print_settings.font}" => {
-            :normal => "public/fonts/#{print_settings.font}.ttf",
-            :italic => "public/fonts/#{print_settings.font}.ttf",
-            :bold => "public/fonts/#{print_settings.font}.ttf",
-            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
-        })
-
-        font "#{print_settings.font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
-    end
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
     self.header_font_size = 12
@@ -41,9 +29,9 @@ class OrderSummaryPdf < Prawn::Document
 
     # order items
     if order_items == nil
-      order_items(order, alt_name, print_settings.precision)
+      order_items(order, alt_name, print_settings.precision,print_settings.font)
     else
-      order_items(order_items, alt_name, print_settings.precision)
+      order_items(order_items, alt_name, print_settings.precision,print_settings.font)
     end
   end
 
@@ -72,7 +60,7 @@ class OrderSummaryPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items(order_item, alt_name, precision)
+  def order_items(order_item, alt_name, precision,font)    
     y_position = cursor
 
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
@@ -87,12 +75,24 @@ class OrderSummaryPdf < Prawn::Document
     move_down 5
 
     #Add Order Item
-    add_order_items(order_item, alt_name, precision)
+    add_order_items(order_item, alt_name, precision, font)
     
   end
 
   # Add order items under order info
-  def add_order_items(order_item, alt_name, precision)
+  def add_order_items(order_item, alt_name, precision, font)
+    # db font setup
+    if font != ""
+        font_families.update("#{font}" => {
+            :normal => "public/fonts/#{font}.ttf",
+            :italic => "public/fonts/#{font}.ttf",
+            :bold => "public/fonts/#{font}.ttf",
+            :bold_italic => "public/fonts/#{font}.ttf"
+        })
+
+        font "#{font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
     y_position = cursor
 
     move_down 5

From 0d6167eca9761aaaeea142dd07d1d10e2d0c779c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 24 Oct 2017 15:22:34 +0630
Subject: [PATCH 19/26] update setting admin pages

---
 app/assets/javascripts/application.js         |  22 ++++
 app/assets/stylesheets/reset.css              |   4 +
 .../settings/commissioners/_form.html.erb     |   4 +-
 .../settings/commissioners/edit.html.erb      |  12 +-
 app/views/settings/commissions/_form.html.erb |  44 ++++---
 app/views/settings/commissions/edit.html.erb  |  19 +--
 app/views/settings/commissions/new.html.erb   |  19 +--
 app/views/settings/commissions/show.html.erb  |  27 ++--
 .../settings/dining_charges/_form.html.erb    |   6 +-
 .../settings/dining_charges/edit.html.erb     |  18 ---
 app/views/settings/employees/_form.html.erb   |   8 +-
 app/views/settings/employees/show.html.erb    |  76 ++++++-----
 app/views/settings/item_sets/_form.html.erb   |   8 +-
 app/views/settings/item_sets/index.html.erb   |   4 +-
 app/views/settings/item_sets/show.html.erb    |  74 +++++++----
 app/views/settings/lookups/_form.html.erb     |   8 +-
 app/views/settings/lookups/index.html.erb     |   4 +-
 app/views/settings/lookups/show.html.erb      |  11 ++
 .../membership_actions/_form.html.erb         |   8 +-
 .../settings/membership_actions/show.html.erb |   3 +-
 .../membership_settings/_form.html.erb        |   8 +-
 .../order_queue_stations/_form.html.erb       |   8 +-
 .../order_queue_stations/show.html.erb        | 118 ++++++++++--------
 .../payment_method_settings/_form.html.erb    |   8 +-
 .../payment_method_settings/index.html.erb    |   8 +-
 .../payment_method_settings/show.html.erb     |  21 +++-
 .../settings/processing_items/_form.html.erb  |   2 +-
 app/views/settings/products/_form.html.erb    |   8 +-
 app/views/settings/promotions/_form.html.erb  |  50 ++++----
 app/views/settings/promotions/edit.html.erb   |   7 +-
 app/views/settings/promotions/new.html.erb    |   4 +-
 app/views/settings/promotions/show.html.erb   |  45 ++++---
 app/views/settings/rooms/_form.html.erb       |  10 +-
 app/views/settings/tables/_form.html.erb      |   8 +-
 app/views/settings/tables/edit.html.erb       |  10 --
 app/views/settings/tables/new.html.erb        |   5 +-
 app/views/settings/tables/show.html.erb       |   6 +-
 app/views/settings/zones/_form.html.erb       |  10 +-
 app/views/settings/zones/index.html.erb       |   4 +-
 app/views/settings/zones/show.html.erb        |   6 +-
 40 files changed, 422 insertions(+), 303 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 28a1d23d..b4eae256 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -37,6 +37,28 @@
 //= require select2
 //= require custom.js
 
+$(document).on('turbolinks:load', function() {
+    
+    $('.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
+    });
+   
+});
 $(function(){
 
   // Image Upload
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index 5aa94bb9..e79eb0b2 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -194,5 +194,9 @@ section.content {
   padding: 5px 13px;
 }
 
+.dtp .dtp-buttons .dtp-btn-clear ,.dtp-btn-now ,.dtp-btn-ok ,.dtp-btn-cancel {
+    background-color: #007d72 !important;
+}
+
 /* End Reset Theme */
 /* *************************************************** */
\ 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 28ce6fe9..4ff75432 100755
--- a/app/views/settings/commissioners/_form.html.erb
+++ b/app/views/settings/commissioners/_form.html.erb
@@ -37,7 +37,7 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
+<!-- <script type="text/javascript">
 
     $(document).ready(function () {
         $('#joined_date').datepicker({
@@ -51,4 +51,4 @@
         });
     });
 
-</script>
+</script> -->
diff --git a/app/views/settings/commissioners/edit.html.erb b/app/views/settings/commissioners/edit.html.erb
index b5da1ebe..5a8701a5 100755
--- a/app/views/settings/commissioners/edit.html.erb
+++ b/app/views/settings/commissioners/edit.html.erb
@@ -1,14 +1,4 @@
-<!-- <div class="span12">
-	<div class="page-header">
-	 <ul class="breadcrumb">
-	   	<li><a href="<%= settings_commissioners_path %>">Home</a></li>
-			<li><a href="<%= settings_commissioners_path  %>">Commissioners</a></li>
-	  	<li>Edit</li>
-	 </ul>
-	</div>
-    <%= render 'form', commissioner: @commissioner %>
-</div>
- -->
+
  <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb
index 24e10366..8cc04475 100755
--- a/app/views/settings/commissions/_form.html.erb
+++ b/app/views/settings/commissions/_form.html.erb
@@ -1,18 +1,34 @@
-<div class="col-md-3">
-<%= simple_form_for([:settings,@commission]) do |f| %>
-  <%= f.error_notification %>
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+   <div class="p-l-15">
 
-  <div class="form-inputs">
-    <%= f.label :product_code, 'Product' %>
-    <%= f.collection_select :product_code, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %><br/>
-    <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %>
-    <%= f.input :amount %>
-    <label><%= f.check_box :is_active %> Active </label>
+      <%= simple_form_for([:settings,@commission]) do |f| %>
+      <%= f.error_notification %>
+
+      <div class="form-inputs">
+        <%= f.label :product_code, 'Product' %>
+        <%= f.collection_select :product_code, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %><br/>
+        <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %>
+        <%= f.input :amount %>
+        <label><%= f.check_box :is_active %> Active </label>
+
+      </div><br>
+      <div class="form-actions">
+        <%= f.submit 'Submit', class: 'btn btn-primary wave-effects' %>
+      </div>
+      <% end %>
 
-  </div><br>
-  <div class="form-actions">
-    <%= link_to t('.new', :default => t("views.btn.new")), settings_commissions_path, class: 'btn btn-success' %>
-    <%= f.button :submit, class: 'btn btn-info' %>
   </div>
-<% end %>
 </div>
+<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+  <div class="card">
+    <div class="body">
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+    </div>
+  </div>  
+</div>
+</div>
+
diff --git a/app/views/settings/commissions/edit.html.erb b/app/views/settings/commissions/edit.html.erb
index ab93e2bc..13abfa88 100755
--- a/app/views/settings/commissions/edit.html.erb
+++ b/app/views/settings/commissions/edit.html.erb
@@ -1,10 +1,11 @@
-<div class="span12">
-	<div class="page-header">
-	 <ul class="breadcrumb">
-	   	<li><a href="<%= settings_commissions_path %>">Home</a></li>
-			<li><a href="<%= settings_commissions_path   %>">Commissions</a></li>
-	  	<li>Edit</li>
-	 </ul>
-	</div>
-    <%= render 'form', commission: @commission %>
+ <div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_commissions_path %>">Commission</a></li>
+    <li class="breadcrumb-item active">Edit</li>
+    <span class="float-right">
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %>
+    </span>
+  </ol>
 </div>
+    <%= render 'form', commission: @commission %>
\ No newline at end of file
diff --git a/app/views/settings/commissions/new.html.erb b/app/views/settings/commissions/new.html.erb
index 35560940..d0928d4a 100755
--- a/app/views/settings/commissions/new.html.erb
+++ b/app/views/settings/commissions/new.html.erb
@@ -1,10 +1,11 @@
-<div class="span12">
-  <div class="page-header">
-    <ul class="breadcrumb">
-      <li><a href="<%= settings_commissions_path %>">Home</a></li>
-      <li><a href="<%= settings_commissions_path %>">Commissions</a></li>
-      <li>New</li>
-    </ul>
-  </div>
-  <%= render 'form', commission: @commission %>
+ <div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_commissions_path %>">Commission</a></li>
+    <li class="breadcrumb-item active">New</li>
+    <span class="float-right">
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %>
+    </span>
+  </ol>
 </div>
+    <%= render 'form', commission: @commission %>
\ No newline at end of file
diff --git a/app/views/settings/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb
index cc929544..f385890c 100755
--- a/app/views/settings/commissions/show.html.erb
+++ b/app/views/settings/commissions/show.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= settings_commissions_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_commissions_path %>">Commissioner</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_commissions_path %>">Commission</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %>
@@ -9,25 +9,27 @@
   </ol>
 </div>
 
-<div class="card">
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+   <div class="card">
   <div class="card-block">
     <h4 class="card-title">Commission</h4>
     <table class="table">
       <tbody>
       <tr>
-        <td style="width:20%">Product Name</td>
+        <th style="width:20%">Product Name</th>
         <td><%= @commission.menu_item.name rescue '-' %></td>
       </tr>
       <tr>
-        <td style="width:20%">Amount</td>
+        <th style="width:20%">Amount</th>
         <td><%= @commission.amount %></td>
       </tr>
       <tr>
-        <td style="width:20%">Commission Type</td>
+        <th style="width:20%">Commission Type</th>
         <td><%= @commission.commission_type %></td>
       </tr>
       <tr>
-        <td style="width:20%">Active</td>
+        <th style="width:20%">Active</th>
         <td><%= @commission.is_active %></td>
       </tr>
       <tr>
@@ -47,5 +49,16 @@
     </table>
   </div>
 </div>
-
 </div>
+<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+  <div class="card">
+    <div class="body">
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+    </div>
+  </div>  
+</div>
+</div>
+
diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb
index a83f1a7d..acee9616 100755
--- a/app/views/settings/dining_charges/_form.html.erb
+++ b/app/views/settings/dining_charges/_form.html.erb
@@ -1,9 +1,9 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@zone,@settings_dining_facility,@dining_charge]) do |f| %>
       <%= f.error_notification %>
 
-      <div class="form-inputs">
+      <div class="form-inputs p-l-15">
         <%= f.input :item_code, :input_html => { :id => 'item_code' } %>
         <%= f.input :unit_price, :input_html => { :id => 'unit_price'} %>
         <%= f.input :taxable %>
@@ -20,7 +20,7 @@
       </div>
     <% end %>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
diff --git a/app/views/settings/dining_charges/edit.html.erb b/app/views/settings/dining_charges/edit.html.erb
index 12316e27..7ffedcb1 100755
--- a/app/views/settings/dining_charges/edit.html.erb
+++ b/app/views/settings/dining_charges/edit.html.erb
@@ -1,22 +1,4 @@
-<!-- <h1>Editing Dining Charge</h1>
 
-<%= render 'form', dining_charge: @dining_charge %>-->
-
-<!-- <div class="span12">
-		<div class="page-header">
-		 <ul class="breadcrumb">
-		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_zone_path(@zone) %>">Zone</a></li>
-        <% if @table %>
-  			   <li><a href="<%= edit_settings_zone_table_path(@zone,@settings_dining_facility) %>">Table / Room</a></li>
-        <% elsif @room %>
-  			   <li><a href="<%= edit_settings_zone_room_path(@zone,@settings_dining_facility) %>">Table / Room</a></li>
-        <% end %>
-		  	<li>New</li>
-		 </ul>
-		</div>
-    <%= render 'form', dining_charge: @dining_charge %>
-</div> -->
 
 <div class="page-header">
   <ol class="breadcrumb">
diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb
index 0a6986e9..4dcb446c 100755
--- a/app/views/settings/employees/_form.html.erb
+++ b/app/views/settings/employees/_form.html.erb
@@ -1,9 +1,9 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@employee]) do |f| %>
   <%= f.error_notification %>
 
-  <div class="form-inputs">
+  <div class="form-inputs p-l-15">
     <%= f.input :name %>
     <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
     <%= f.input :emp_id, :as => :integer, :label => "Employee Numberic ID (*Unique)" %>
@@ -11,12 +11,12 @@
 
   </div>
 
-  <div class="form-actions">
+  <div class="form-actions p-l-15">
      <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
   </div>
 <% end %>
   </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
           Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb
index 7d2ddd8d..35d3dac4 100755
--- a/app/views/settings/employees/show.html.erb
+++ b/app/views/settings/employees/show.html.erb
@@ -19,43 +19,63 @@
 </div>
 <br>
 
-<div class="card">
-  <div class="card-block">
-    <h4 class="card-title">Employee</h4>
-    <table class="table">
-      <thead>
-        <tr>
-          <th>Name</th>
-          <th>Role</th>
-          <th>Created At</th>
+
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+   <div class="card">
+    <div class="card-block">
+      <h4 class="card-title">Employee</h4>
+      <table class="table">
+        <tbody>
+          <tr>
+            <th>Name</th>
+            <td><%= @employee.name %></td>
+          </tr>
+
+          <tr>
+            <th>Role</th>
+            <td><%= @employee.role %></td>
+          </tr>
+          <tr>
+           <th>Created At</th>
+           <td><%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+         </tr>
+         <tr>
           <th>Updated At</th>
-          <th>Actions</th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <tr>
-          <td><%= @employee.name %></td>
-          <td><%= @employee.role %></td>
-          <td><%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td><%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+        </tr>
+        <tr>
+          <th></th>
           <td>
-              <%= link_to t("views.btn.edit"), edit_settings_employee_path(@employee),:class => 'btn btn-primary btn-lg waves-effect' %>
-              <%if @employee.role != "administrator"%>
+            <%= link_to t("views.btn.edit"), edit_settings_employee_path(@employee),:class => 'btn btn-primary btn-lg waves-effect' %>
+            <%if @employee.role != "administrator"%>
 
-              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_employee_path(@employee)%>" data-method="delete">
-                <%= t("views.btn.delete") %>
-              </button>
+            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_employee_path(@employee)%>" data-method="delete">
+              <%= t("views.btn.delete") %>
+            </button>
 
-              <span class="hidden" id="delete_text">
-                <h6>Are you sure you want to delete this row ?</h6>
-                <h6>This action can't be undo. </h6> 
-              </span>
-             <%end%>
+            <span class="hidden" id="delete_text">
+              <h6>Are you sure you want to delete this row ?</h6>
+              <h6>This action can't be undo. </h6> 
+            </span>
+            <%end%>
           </td>
         </tr>
       </tbody>
     </table>
   </div>
 </div>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+  <div class="card">
+    <div class="body">
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+    </div>
+  </div>  
+</div>
+</div>
+
 
diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb
index 3de13df0..b1f976ba 100755
--- a/app/views/settings/item_sets/_form.html.erb
+++ b/app/views/settings/item_sets/_form.html.erb
@@ -1,23 +1,23 @@
 
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@settings_item_set]) do |f| %>
   <%= f.error_notification %>
 
-  <div class="form-inputs">
+  <div class="form-inputs p-l-15">
     <%= f.input :name %>
     <%= f.input :alt_name %>
     <%= f.input :min_selectable_qty,input_html: {value: f.object.min_selectable_qty || '0'} %>
     <%= f.input :max_selectable_qty,input_html: {value: f.object.max_selectable_qty || '0'} %>
   </div>
 
-  <div class="form-actions">
+  <div class="form-actions p-l-15">
      <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
   </div>
 <% end %>
   </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
           Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb
index 9232f10d..8a9e01e3 100755
--- a/app/views/settings/item_sets/index.html.erb
+++ b/app/views/settings/item_sets/index.html.erb
@@ -37,14 +37,14 @@
             <td><%= link_to t("views.btn.show"), settings_item_set_path(item),:class=>'btn btn-sm btn-success waves-effect' %>
               <%= link_to t("views.btn.edit"), edit_settings_item_set_path(item),:class=>'btn btn-sm btn-primary waves-effect' %>
               
-              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_item_set_path(item)%>" data-method="delete">
+              <!-- <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_item_set_path(item)%>" data-method="delete">
                 <%= t("views.btn.delete") %>
               </button>
 
               <span class="hidden" id="delete_text">
                 <h6>Are you sure you want to delete this row ?</h6>
                 <h6>This action can't be undo. </h6> 
-              </span>
+              </span> -->
 
               </td>
             </tr>
diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb
index 23e290f8..bf285f7a 100755
--- a/app/views/settings/item_sets/show.html.erb
+++ b/app/views/settings/item_sets/show.html.erb
@@ -9,30 +9,60 @@
     </span>
   </ol>
 </div>
-<br>
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+   <div class="card">
+   <div class="card-block">
+      <table class="table">
 
-  <div class="col-md-6">
-    <table class="table">
+        <tbody>
+          <tr>
+            <td><strong>Name:</strong></td>
+            <td><%= @settings_item_set.name %></td>
+          </tr>
+          <tr>
+            <td><strong>Alt Name:</strong></td>
+            <td><%= @settings_item_set.alt_name %></td>
+          </tr>
+          <tr>
+            <td><strong>Min selectable qty:</strong></td>
+            <td> <%= @settings_item_set.min_selectable_qty %></td>
+          </tr>
+          <tr>
+            <td><strong>Max selectable qty:</strong></td>
+            <td><%= @settings_item_set.max_selectable_qty %></td>
+          </tr>
+          <tr>
+            <td></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_item_set_path(@settings_item_set),:class=>'btn btn-sm btn-primary waves-effect' %>
+              
+              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_item_set_path(@settings_item_set)%>" data-method="delete">
+                <%= t("views.btn.delete") %>
+              </button>
 
-      <tbody>
-        <tr>
-          <td><strong>Name:</strong></td>
-          <td><%= @settings_item_set.name %></td>
-        </tr>
-        <tr>
-          <td><strong>Alt Name:</strong></td>
-          <td><%= @settings_item_set.alt_name %></td>
-        </tr>
-        <tr>
-          <td><strong>Min selectable qty:</strong></td>
-          <td> <%= @settings_item_set.min_selectable_qty %></td>
-        </tr>
-        <tr>
-          <td><strong>Max selectable qty:</strong></td>
-          <td><%= @settings_item_set.max_selectable_qty %></td>
-        </tr>
-      </tbody>
-    </table>
+              <span class="hidden" id="delete_text">
+                <h6>Are you sure you want to delete this row ?</h6>
+                <h6>This action can't be undo. </h6> 
+              </span></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+  <div class="card">
+    <div class="body">
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+    </div>
+  </div>  
+</div>
+</div>
+
+
+
 
 
diff --git a/app/views/settings/lookups/_form.html.erb b/app/views/settings/lookups/_form.html.erb
index 556c6de0..18403960 100755
--- a/app/views/settings/lookups/_form.html.erb
+++ b/app/views/settings/lookups/_form.html.erb
@@ -1,22 +1,22 @@
 
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@settings_lookup]) do |f| %>
 	  <%= f.error_notification %>
 
-	  <div class="form-inputs">
+	  <div class="form-inputs p-l-15">
 	    <%= f.input :lookup_type %>
 	    <%= f.input :name %>
 	    <%= f.input :value %>
 	  </div>
 
-	  <div class="form-actions">
+	  <div class="form-actions p-l-15">
        <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
 	  </div>
 	<% end %>
   </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
           Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/lookups/index.html.erb b/app/views/settings/lookups/index.html.erb
index d758a686..85588d6a 100755
--- a/app/views/settings/lookups/index.html.erb
+++ b/app/views/settings/lookups/index.html.erb
@@ -34,14 +34,14 @@
           <!-- <td><%= link_to t("views.btn.show"), settings_lookup_path(settings_lookup),:class => 'btn btn-info btn-sm waves-effect' %></td> -->
           <td>
           <%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-sm waves-effect' %> 
-            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_lookup_path(settings_lookup)%>" data-method="delete">
+          <!--   <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_lookup_path(settings_lookup)%>" data-method="delete">
               <%= t("views.btn.delete") %>
             </button>
 
             <span class="hidden" id="delete_text">
               <h6>Are you sure you want to delete this row ?</h6>
               <h6>This action can't be undo. </h6> 
-            </span>
+            </span> -->
 
           </td>
         </tr>
diff --git a/app/views/settings/lookups/show.html.erb b/app/views/settings/lookups/show.html.erb
index 1dd151be..0989380b 100755
--- a/app/views/settings/lookups/show.html.erb
+++ b/app/views/settings/lookups/show.html.erb
@@ -25,7 +25,18 @@
           <td><strong>Value:</strong></td>
           <td> <%= @settings_lookup.value %></td>
         </tr>
+        <tr>
+          <td></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_lookup_path(settings_lookup),:class => 'btn btn-primary btn-sm waves-effect' %> 
+            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_lookup_path(settings_lookup)%>" data-method="delete">
+              <%= t("views.btn.delete") %>
+            </button>
 
+            <span class="hidden" id="delete_text">
+              <h6>Are you sure you want to delete this row ?</h6>
+              <h6>This action can't be undo. </h6> 
+            </span></td>
+        </tr>
       </tbody>
     </table>
   </div>
diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb
index ab0270e2..ce88a087 100755
--- a/app/views/settings/membership_actions/_form.html.erb
+++ b/app/views/settings/membership_actions/_form.html.erb
@@ -1,10 +1,10 @@
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@settings_membership_action]) do |f| %>
     <%= f.error_notification %>
 
-    <div class="form-inputs">
+    <div class="form-inputs p-l-15">
       <%= f.input :membership_type %>
       <%= f.input :is_active %>
       <%= f.input :gateway_communication_type %>
@@ -14,12 +14,12 @@
       <%= f.input :created_by %>
     </div>
 
-    <div class="form-actions">
+    <div class="form-actions p-l-15">
       <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
     </div>
     <% end %>    
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/membership_actions/show.html.erb b/app/views/settings/membership_actions/show.html.erb
index ca73df77..58193063 100755
--- a/app/views/settings/membership_actions/show.html.erb
+++ b/app/views/settings/membership_actions/show.html.erb
@@ -46,7 +46,8 @@
           <td><%= @settings_membership_action.additional_parameter %></td>
         </tr>
         <tr>
-          <td colspan="2" align="right">
+        <td></td>
+          <td colspan="" align="">
             <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %>
             <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_membership_action_path(@settings_membership_action)%>" data-method="delete" disabled>
                 <%= t("views.btn.delete") %>
diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb
index 68114477..c89be6e4 100755
--- a/app/views/settings/membership_settings/_form.html.erb
+++ b/app/views/settings/membership_settings/_form.html.erb
@@ -1,10 +1,10 @@
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
 
     <%= simple_form_for([:settings, @settings_membership_setting]) do |f| %>
     <%= f.error_notification %>
-    <div class="form-inputs">
+    <div class="form-inputs p-l-15">
       <%= f.input :membership_type %>
       <%= f.input :is_active %>
       <%= f.input :gateway_communication_type %>
@@ -16,12 +16,12 @@
       <label><%= f.check_box :point %>Points</label>
     </div>
 
-    <div class="form-actions">
+    <div class="form-actions p-l-15">
       <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
     </div>
     <% end %>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb
index 79bacf00..86d5d5da 100755
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/app/views/settings/order_queue_stations/_form.html.erb
@@ -6,11 +6,11 @@ div.form-inputs span{
 
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@settings_order_queue_station]) do |f| %>
       <%= f.error_notification %>
 
-      <div class="form-inputs">
+      <div class="form-inputs p-l-15">
         <%= f.input :station_name %>
         <%= f.input :is_active %>
 
@@ -26,12 +26,12 @@ div.form-inputs span{
         <%= f.input :auto_print %>
       </div>
 
-      <div class="form-actions">
+      <div class="form-actions p-l-15">
          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
     <% end %>
   </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
           Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb
index 80b408d8..8df74367 100755
--- a/app/views/settings/order_queue_stations/show.html.erb
+++ b/app/views/settings/order_queue_stations/show.html.erb
@@ -12,62 +12,80 @@
 <br>
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <div class="card">
-  <div class="card-block">
-    <table class="table">
-      <thead>
-        <tr>
-          <th>Station name</th>
-          <th>Is active</th>
-          <th>Auto Print</th>
-          <th>Processing items</th>
-          <th>Print copy</th>
-          <th>Printer name</th>
-          <th>Font size</th>
-          <th>Cut per item</th>
-          <th>Use alternate name</th>
-          <th>Created by</th>
-          <th>Actions</th>
-        </tr>
-      </thead>
+      <div class="card-block">
+        <table class="table">
+          <tbody>
+            <tr>
+              <tr>
+                <th>Station name</th>
+                <td><%= @settings_order_queue_station.station_name %></td>
+              </tr>
+              <tr>
+                <th>Is active</th>
+                <td><%= @settings_order_queue_station.is_active %></td>
+              </tr>
+              <tr>
+                <th>Auto Print</th>
+                <td><%= @settings_order_queue_station.auto_print %></td>
+              </tr>
+              <tr>
+                <th>Processing items</th>
+                <td><%= JSON.parse(@settings_order_queue_station.processing_items).count %></td>
+              </tr>
+              <tr>
+                <th>Print copy</th>
+                <td><%= @settings_order_queue_station.print_copy %></td>
+              </tr>
+              <tr>
+                <th>Printer name</th>
+                <td><%= @settings_order_queue_station.printer_name %></td>
+              </tr>
+              <tr>
+                <th>Font size</th>
+                <td><%= @settings_order_queue_station.font_size %></td>
+              </tr>
+              <tr>
+                <th>Cut per item</th>
+                <td><%= @settings_order_queue_station.cut_per_item %></td>
+              </tr>
+              <tr>
+                <th>Use alternate name</th>
+                <td><%= @settings_order_queue_station.use_alternate_name %></td>
+              </tr>
+              <tr>
+                <th>Created by</th>
+                <td><%= @settings_order_queue_station.created_by %></td>
+              </tr>
+              <tr>
+                <th></th>
+                <td colspan="">
+                  <%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(@settings_order_queue_station),:class => 'btn btn-info btn-sm waves-effect' %>
+                  <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_order_queue_station_path(@settings_order_queue_station)%>" data-method="delete">
+                    <%= t("views.btn.delete") %>
+                  </button>
 
-      <tbody>
-        <tr>
-          <td><%= @settings_order_queue_station.station_name %></td>
-          <td><%= @settings_order_queue_station.is_active %></td>
-          <td><%= @settings_order_queue_station.auto_print %></td>
-          <td><%= JSON.parse(@settings_order_queue_station.processing_items).count %></td>
-          <td><%= @settings_order_queue_station.print_copy %></td>
-          <td><%= @settings_order_queue_station.printer_name %></td>
-          <td><%= @settings_order_queue_station.font_size %></td>
-          <td><%= @settings_order_queue_station.cut_per_item %></td>
-          <td><%= @settings_order_queue_station.use_alternate_name %></td>
-          <td><%= @settings_order_queue_station.created_by %></td>
-          <td colspan="2">
-            <%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(@settings_order_queue_station),:class => 'btn btn-info btn-sm waves-effect' %>
-             <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_order_queue_station_path(@settings_order_queue_station)%>" data-method="delete">
-              <%= t("views.btn.delete") %>
-            </button>
+                  <span class="hidden" id="delete_text">
+                    <h6>Are you sure you want to delete this row ?</h6>
+                    <h6>This action can't be undo. </h6> 
+                  </span>
+                </td>
+              </tr>
 
-            <span class="hidden" id="delete_text">
-              <h6>Are you sure you want to delete this row ?</h6>
-              <h6>This action can't be undo. </h6> 
-            </span>
-          </td>
-        </tr>
-      </tbody>
-    </table>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
   </div>
-</div>
-  </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb
index 3ad65718..7977f524 100755
--- a/app/views/settings/payment_method_settings/_form.html.erb
+++ b/app/views/settings/payment_method_settings/_form.html.erb
@@ -1,10 +1,10 @@
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings, @settings_payment_method_setting]) do |f| %>
     <%= f.error_notification %>
 
-    <div class="form-inputs">
+    <div class="form-inputs p-l-15">
       <%= f.input :payment_method %>
       <%= f.input :is_active %>
       <%= f.input :gateway_communication_type %>
@@ -14,12 +14,12 @@
       <%= f.input :additional_parameters %>
     </div>
 
-    <div class="form-actions">
+    <div class="form-actions p-l-15">
       <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
     </div>
     <% end %>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/payment_method_settings/index.html.erb b/app/views/settings/payment_method_settings/index.html.erb
index 03ecc41a..0d1b0cf9 100755
--- a/app/views/settings/payment_method_settings/index.html.erb
+++ b/app/views/settings/payment_method_settings/index.html.erb
@@ -22,9 +22,9 @@
             <th>Payment method</th>
             <th>Is active</th>
             <th>Gateway Comm type</th>
-            <th>Gateway url</th>
+            <th>Gateway url</th><!-- 
             <th>Auth token</th>
-            <th>Merchant account</th>
+            <th>Merchant account</th> -->
             <th>Actions</th>
           </tr>
         </thead>
@@ -35,9 +35,9 @@
             <td><%= settings_payment_method_setting.payment_method %></td>
             <td><%= settings_payment_method_setting.is_active %></td>
             <td><%= settings_payment_method_setting.gateway_communication_type %></td>
-            <td><%= settings_payment_method_setting.gateway_url %></td>
+            <td><%= settings_payment_method_setting.gateway_url %></td><!-- 
             <td><%= settings_payment_method_setting.auth_token %></td>
-            <td><%= settings_payment_method_setting.merchant_account_id %></td>
+            <td><%= settings_payment_method_setting.merchant_account_id %></td> -->
             <td>
               <%= link_to t("views.btn.show"), settings_payment_method_setting_path(settings_payment_method_setting),:class => 'btn btn-info btn-sm waves-effect' %>
               <%= link_to t("views.btn.edit"), edit_settings_payment_method_setting_path(settings_payment_method_setting),:class => 'btn btn-primary btn-sm waves-effect' %>
diff --git a/app/views/settings/payment_method_settings/show.html.erb b/app/views/settings/payment_method_settings/show.html.erb
index ad7c929b..332c5f56 100755
--- a/app/views/settings/payment_method_settings/show.html.erb
+++ b/app/views/settings/payment_method_settings/show.html.erb
@@ -9,13 +9,13 @@
   </ol>
 </div>
 
+
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-    <div class="card">
-      <table class="table table-striped">
-      <tr>
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+     <table class="table table-">
+      <!-- <tr>
         <td><p id="notice"><%= notice %></p></td>
-      </tr>
+      </tr> -->
 
       <tr>
         <td><strong>Payment method:</strong></td>
@@ -61,6 +61,15 @@
         </td>
       </tr>
       </table>
-    </div>
+  </div>
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+    <div class="card">
+      <div class="body">
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      </div>
+    </div>  
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb
index 8230e4e6..b97f43bb 100755
--- a/app/views/settings/processing_items/_form.html.erb
+++ b/app/views/settings/processing_items/_form.html.erb
@@ -18,7 +18,7 @@
                 <div class="col-lg-3 col-md-3 col-sm-6">
                   <div class="card" style="padding-left:5px">
                     <div class="card-title">
-                    <div> <h4><%= category.name %></div>
+                    <div> <h5><%= category.name %></h5></div>
                        
 
                        <div> <button type="button" data-id="menu_items_category_<%= category.id %>" class="btn btn-info waves-effect processingitems_all" aria-label="Left Align">
diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb
index bc4209bf..ae1e0842 100755
--- a/app/views/settings/products/_form.html.erb
+++ b/app/views/settings/products/_form.html.erb
@@ -1,9 +1,9 @@
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@settings_product]) do |f| %>
       <%= f.error_notification %>
-      <div class="form-group">
+      <div class="form-group p-l-15">
         <%= f.input :item_code, :input_html => { :id => 'item_code' } %>
         <%= f.input :name %>
         <%= f.input :alt_name %>
@@ -29,12 +29,12 @@
           </div>
         </div>
 
-      <div class="form-actions">
+      <div class="form-actions p-l-15">
         <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
     <% end %>
     </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
           Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index ac57343f..5ee3924f 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -1,13 +1,9 @@
-
-
-
-
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_nested_form_for([:settings,@promotion]) do |f| %>
   <%= f.error_notification %>
 
-  <div class="form-inputs">
+  <div class="form-inputs p-l-15">
     <div class="div-border">
         <div class="row">
           <div class="col-md-6"><%= f.input :promo_code  %></div>
@@ -16,12 +12,12 @@
         <div class="row">
           <div class="col-md-6">
             <span>* Promo Start Date</span>
-            <%= f.date_field  :promo_start_date, :placeholder => "From Date" , :class => "form-control"%>
+            <%= f.date_field  :promo_start_date, :placeholder => "From Date" , :class => "form-control datepicker"%>
             <br>
           </div>
           <div class="col-md-6">
             <span>* Promo End Date</span>
-            <%= f.date_field :promo_end_date ,:placeholder => "To Date" , :class => "form-control"%>
+            <%= f.date_field :promo_end_date ,:placeholder => "To Date" , :class => "form-control datepicker"%>
           </div>
         </div>
         <div class="row">
@@ -38,9 +34,9 @@
           <div class="col-md-6">
             <!-- <span>* Promo End Hour</span> -->
             <% if !@promotion.promo_end_hour.nil?%>
-              <%= f.input :promo_end_hour, as: :string, input_html: {:value => @promotion.promo_end_hour.utc.strftime('%H:%M') } %>
+              <%= f.input :promo_end_hour, as: :string, input_html: {:value => @promotion.promo_end_hour.utc.strftime('%H:%M') },:class=>"form-control timepicker" %>
             <% else %>
-              <%= f.input :promo_end_hour, as: :string, input_html: {} %>
+              <%= f.input :promo_end_hour, as: :string, input_html: {},:class=>"form-control timepicker" %>
             <% end %>
           </div>
         </div>
@@ -153,7 +149,7 @@
   </div>
 <% end %>
   </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
           Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
@@ -169,22 +165,22 @@
 
 
 $(document).ready(function(){
-  $('#promotion_promo_start_date').datetimepicker({
-    timepicker:false,
-    format:'Y-m-d'
-  });
-  $('#promotion_promo_end_date').datetimepicker({
-    timepicker:false,
-    format:'Y-m-d'
-  });
-  $('#promotion_promo_start_hour').datetimepicker({
-    datepicker:false,
-    format:'H:m'
-        });
-  $('#promotion_promo_end_hour').datetimepicker({
-    datepicker:false,
-    format:'H:m'
-  });
+  // $('#promotion_promo_start_date').datetimepicker({
+  //   timepicker:false,
+  //   format:'Y-m-d'
+  // });
+  // $('#promotion_promo_end_date').datetimepicker({
+  //   timepicker:false,
+  //   format:'Y-m-d'
+  // });
+  // $('#promotion_promo_start_hour').datetimepicker({
+  //   datepicker:false,
+  //   format:'H:m'
+  //       });
+  // $('#promotion_promo_end_hour').datetimepicker({
+  //   datepicker:false,
+  //   format:'H:m'
+  // });
 
   $('#promotion_promo_start_hour').on('change', function(event) {
     $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00");
diff --git a/app/views/settings/promotions/edit.html.erb b/app/views/settings/promotions/edit.html.erb
index 3360898a..0ce73ac8 100755
--- a/app/views/settings/promotions/edit.html.erb
+++ b/app/views/settings/promotions/edit.html.erb
@@ -1,10 +1,11 @@
+
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_products_path %>">Products</a></li>
-    <li class="breadcrumb-item active">New</li>
+    <li class="breadcrumb-item"><a href="<%= settings_promotions_path %>">Promotion</a></li>
+    <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/promotions/new.html.erb b/app/views/settings/promotions/new.html.erb
index e1991936..55ddeb43 100755
--- a/app/views/settings/promotions/new.html.erb
+++ b/app/views/settings/promotions/new.html.erb
@@ -2,10 +2,10 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_products_path %>">Products</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_promotions_path %>">Promotion</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/promotions/show.html.erb b/app/views/settings/promotions/show.html.erb
index 03441c53..77489879 100755
--- a/app/views/settings/promotions/show.html.erb
+++ b/app/views/settings/promotions/show.html.erb
@@ -1,18 +1,21 @@
-
-<div class="span12">
-		<div class="page-header">
-		 <ul class="breadcrumb">
-		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_promotions_path %>">Promotions</a></li>
-		 </ul>
-		</div>
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_promotions_path %>">Promotions</a></li>
+    <li class="breadcrumb-item active">Details</li>
+    <span class="float-right">
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %>
+    </span>
+  </ol>
 </div>
-<div class="card">
-  <div class="card-block">
-    <h4 class="card-title">Promotion</h4>
-    <table class="table">
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+   <div class="card">
+    <div class="card-block">
+      <h4 class="card-title">Promotion</h4>
+      <table class="table">
 
-      <tbody>
+        <tbody>
 
           <tr><td style="width:20%">Promotion code</td><td><%= @promotion.promo_code  %></td></tr>
           <tr><td style="width:20%">Promotion Start Date</td><td><%= @promotion.promo_start_date %></td></tr>
@@ -22,7 +25,19 @@
           <tr><td style="width:20%"><%= link_to t("views.btn.edit"), edit_settings_promotion_path(@promotion) %></td><td><%= link_to t("views.btn.delete"), settings_promotion_path(@promotion), method: :delete, data: { confirm: 'Are you sure?' } %></td></tr>
 
 
-      </tbody>
-    </table>
+        </tbody>
+      </table>
+    </div>
   </div>
 </div>
+<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
+      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+    </div>
+  </div>  
+</div>
+</div>
diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb
index 9448766b..209ae5c8 100755
--- a/app/views/settings/rooms/_form.html.erb
+++ b/app/views/settings/rooms/_form.html.erb
@@ -1,11 +1,11 @@
 
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@zone,@settings_room]) do |f| %>
     <%= f.error_notification %>
 
-    <div class="form-inputs">
+    <div class="form-inputs p-l-15">
       <%= f.input :name %>
       <%= f.input :status %>
       <%= f.input :seater %>
@@ -35,12 +35,12 @@
       <% end %>
     </div>
 
-    <div class="form-actions">
-       <%= f.submit "Create Table",:class => 'btn btn-primary btn-lg waves-effect' %>
+    <div class="form-actions p-l-15">
+       <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
     </div>
   <% end %>
   </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
           Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb
index e06abdf9..682df12d 100755
--- a/app/views/settings/tables/_form.html.erb
+++ b/app/views/settings/tables/_form.html.erb
@@ -1,9 +1,9 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@zone,@settings_table]) do |f| %>
       <%= f.error_notification %>
 
-      <div class="form-inputs">
+      <div class="form-inputs p-l-15">
         <%= f.input :name %>
         <%= f.input :status %>
         <%= f.input :seater %>
@@ -34,11 +34,11 @@
       </div>
 
       <div class="form-actions">
-         <%= f.submit "Create",:class => 'btn btn-primary btn-lg waves-effect' %>
+         <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
     <% end %>
   </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
diff --git a/app/views/settings/tables/edit.html.erb b/app/views/settings/tables/edit.html.erb
index 42d059df..9765c1a5 100755
--- a/app/views/settings/tables/edit.html.erb
+++ b/app/views/settings/tables/edit.html.erb
@@ -1,13 +1,3 @@
-<!-- <div class="span12">
-		<div class="page-header">
-		 <ul class="breadcrumb">
-		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_zone_tables_path %>">Tables</a></li>
-		  	<li>Edit</li>
-		 </ul>
-		</div>
-    <%= render 'form', settings_table: @settings_table %>
-</div> -->
 
 <div class="page-header">
   <ol class="breadcrumb">
diff --git a/app/views/settings/tables/new.html.erb b/app/views/settings/tables/new.html.erb
index 7a929b75..d2819631 100755
--- a/app/views/settings/tables/new.html.erb
+++ b/app/views/settings/tables/new.html.erb
@@ -5,9 +5,8 @@
     <li class="breadcrumb-item"><a href="<%= settings_zone_path(@zone) %>">Tables</a></li>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-		<%= link_to 'Back', settings_zone_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_zone_path(@zone) %>
     </span>
   </ol>
 </div>
-    <%= render 'form', settings_table: @settings_table %>
-
+ <%= render 'form', settings_table: @settings_table %>
diff --git a/app/views/settings/tables/show.html.erb b/app/views/settings/tables/show.html.erb
index e0ac7d61..e4398267 100755
--- a/app/views/settings/tables/show.html.erb
+++ b/app/views/settings/tables/show.html.erb
@@ -11,7 +11,7 @@
 <br>
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <div class="card">
       <div class="card-block">
         <h4 class="card-title">Table</h4>
@@ -46,7 +46,7 @@
                 <% end %>
                 <td><%= @table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
                 <td>
-                <%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,@table),:class => 'btn btn-primary btn-lg waves-effect' %>
+                <%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,@table),:class => 'btn btn-primary btn-sm waves-effect' %>
                 <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_zone_table_path(@table)%>" data-method="delete">
                     <%= t("views.btn.delete") %>
                 </button>
@@ -62,7 +62,7 @@
       </div>
     </div>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
diff --git a/app/views/settings/zones/_form.html.erb b/app/views/settings/zones/_form.html.erb
index bd35ce0d..f6f427d8 100755
--- a/app/views/settings/zones/_form.html.erb
+++ b/app/views/settings/zones/_form.html.erb
@@ -1,20 +1,20 @@
 <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-7 col-lg-7">
    	<%= simple_form_for([:settings,@settings_zone]) do |f| %>
   <%= f.error_notification %>
 
-  <div class="form-inputs">
+  <div class="form-inputs p-l-15">
     <%= f.input :name %>
     <%= f.input :is_active %>
     <!-- <%= f.input :created_by, :collection => Employee.collection %> -->
   </div>
 
-  <div class="form-group">
-    <%= f.submit "Create Zone",:class => 'btn btn-primary btn-lg waves-effect' %>
+  <div class="form-group p-l-15">
+    <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
   </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-5 col-lg-5">
     <div class="card">
       <div class="body">
         <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
diff --git a/app/views/settings/zones/index.html.erb b/app/views/settings/zones/index.html.erb
index 13679733..554b9dc6 100755
--- a/app/views/settings/zones/index.html.erb
+++ b/app/views/settings/zones/index.html.erb
@@ -36,8 +36,8 @@
               <td><%= settings_zone.created_by %></td>
               <% end %>
               <td>
-                <%= link_to t("views.btn.show"), settings_zone_path(settings_zone),:class => 'btn btn-info btn-lg waves-effect' %>
-                <%= link_to t("views.btn.edit"), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %>
+                <%= link_to t("views.btn.show"), settings_zone_path(settings_zone),:class => 'btn btn-info btn-sm waves-effect' %>
+                <%= link_to t("views.btn.edit"), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-sm waves-effect' %>
               </td>
             </tr>
           <% end %>
diff --git a/app/views/settings/zones/show.html.erb b/app/views/settings/zones/show.html.erb
index c7aba050..9a431987 100755
--- a/app/views/settings/zones/show.html.erb
+++ b/app/views/settings/zones/show.html.erb
@@ -12,7 +12,7 @@
 <br/>
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <div class="card">
       <div class="card-block">
         <h4 class="card-title">Zone</h4>
@@ -36,7 +36,7 @@
               <td><%= @settings_zone.created_by %></td>
               <% end %>
               <td>
-                  <%= link_to t("views.btn.edit"),edit_settings_zone_path(@settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %>
+                  <%= link_to t("views.btn.edit"),edit_settings_zone_path(@settings_zone),:class => 'btn btn-primary btn-sm waves-effect' %>
                   <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_zone_path(@settings_zone)%>" data-method="delete">
                       <%= t("views.btn.delete") %>
                   </button>
@@ -109,7 +109,7 @@
     </div>
   </div>
 </div>
-<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">
     <div class="body">
       <h5>Zone</h5>

From 2e420e7dde3c26bf3dbac26f95bcd6ea9664fa4c Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 24 Oct 2017 15:55:24 +0630
Subject: [PATCH 20/26] font for print

---
 app/models/seed_generator.rb | 37 +++++++++++++-------------
 app/pdf/order_item_pdf.rb    | 50 +++++++++++++++---------------------
 app/pdf/order_summary_pdf.rb | 43 +++++++++++++++++--------------
 app/pdf/receipt_bill_pdf.rb  |  2 +-
 4 files changed, 64 insertions(+), 68 deletions(-)

diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb
index a26b70ce..b05398aa 100755
--- a/app/models/seed_generator.rb
+++ b/app/models/seed_generator.rb
@@ -11,26 +11,26 @@ class SeedGenerator < ApplicationRecord
       seed.save
     else
       next_no = seed.next
-      # current_no = seed.next
-      # seed.next = seed.next + seed.increase_by
-      # seed.current = current_no
-      # seed.save
-      cur_val, next_val = self.update_seed(model, seed.next, seed.increase_by)   
+      current_no = seed.next
+      seed.next = seed.next + seed.increase_by
+      seed.current = current_no
+      seed.save
+      # cur_val, next_val = self.update_seed(model, seed.next, seed.increase_by)   
 
-      if next_no == cur_val   
-        puts "SSS"
-        puts next_val             
-        cur_val2, next_val2 = self.update_seed(model, next_val, seed.increase_by)
-        puts next_val2
-        padding_len = 15 - prefix.length
-        saleOrderId = prefix +"-"+ cur_val2.to_s.to_s.rjust((14-prefix.length)+1,'0')
-        puts saleOrderId
-        return saleOrderId 
-      end 
+      # if next_no == cur_val   
+      #   puts "SSS"
+      #   puts next_val             
+      #   cur_val2, next_val2 = self.update_seed(model, next_val, seed.increase_by)
+      #   puts next_val2
+      #   padding_len = 15 - prefix.length
+      #   saleOrderId = prefix +"-"+ cur_val2.to_s.to_s.rjust((14-prefix.length)+1,'0')
+      #   puts saleOrderId
+      #   return saleOrderId 
+      # end 
         
-      padding_len = 15 - prefix.length
-      saleOrderId = prefix +"-"+ cur_val.to_s.to_s.rjust((14-prefix.length)+1,'0')
-      return saleOrderId 
+      # padding_len = 15 - prefix.length
+      # saleOrderId = prefix +"-"+ cur_val.to_s.to_s.rjust((14-prefix.length)+1,'0')
+      # return saleOrderId 
 
     end
 
@@ -100,7 +100,6 @@ class SeedGenerator < ApplicationRecord
     select_result = ActiveRecord::Base.connection.execute(select_sql);
     
     select_result.each do |row|      
-      p row
       cur_val = row [3]
       next_val = row[4]
     end
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index ef30e9a1..4bc57878 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -17,22 +17,26 @@ class OrderItemPdf < Prawn::Document
     # super(:margin => [10, 5, 30, 5], :page_size => [200,400])
 
     # db font setup
-    # if print_settings.font != ""
-    #     font_families.update("#{print_settings.font}" => {
-    #         :normal => "public/fonts/#{print_settings.font}.ttf",
-    #         :italic => "public/fonts/#{print_settings.font}.ttf",
-    #         :bold => "public/fonts/#{print_settings.font}.ttf",
-    #         :bold_italic => "public/fonts/#{print_settings.font}.ttf"
-    #     })
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
 
-    #     font "#{print_settings.font}"
-    #     fallback_fonts ["Courier", "Helvetica", "Times-Roman"]        
-    # end
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]  
+
+        self.header_font_size = 11
+        self.item_font_size = 9
+    else
+        self.header_font_size = 12
+        self.item_font_size = 10       
+    end
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
-     #font "public/fonts/Chinese.ttf"  
-    self.header_font_size = 12
-    self.item_font_size = 10    
+     #font "public/fonts/Chinese.ttf"     
 
     text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     stroke_horizontal_rule
@@ -42,7 +46,7 @@ class OrderItemPdf < Prawn::Document
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
 
     # order items
-    order_items(order_item, options, alt_name, print_settings.precision,print_settings.font)
+    order_items(order_item, options, alt_name, print_settings.precision)
   end
 
   # Write Order Information to PDF
@@ -70,11 +74,11 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items(order_item, options, alt_name, precision, font)
+  def order_items(order_item, options, alt_name, precision)
     y_position = cursor
 
     #Add Order Item    
-    add_order_items(order_item, options, alt_name, precision, font)
+    add_order_items(order_item, options, alt_name, precision)
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
@@ -82,19 +86,7 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Add order items under order info
-  def add_order_items(order_item, options, alt_name, precision, font)
-    # db font setup
-    if font != ""
-        font_families.update("#{font}" => {
-            :normal => "public/fonts/#{font}.ttf",
-            :italic => "public/fonts/#{font}.ttf",
-            :bold => "public/fonts/#{font}.ttf",
-            :bold_italic => "public/fonts/#{font}.ttf"
-        })
-
-        font "#{font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
-    end
+  def add_order_items(order_item, options, alt_name, precision)
     y_position = cursor
 
     move_down 5
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index b776d992..50858c47 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -15,10 +15,27 @@ class OrderSummaryPdf < Prawn::Document
 
     super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
+    # db font setup
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+
+        self.header_font_size = 11
+        self.item_font_size = 9 
+    else
+        self.header_font_size = 12
+        self.item_font_size = 10       
+    end
+
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
-    self.header_font_size = 12
-    self.item_font_size = 10
 
     text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     stroke_horizontal_rule
@@ -29,9 +46,9 @@ class OrderSummaryPdf < Prawn::Document
 
     # order items
     if order_items == nil
-      order_items(order, alt_name, print_settings.precision,print_settings.font)
+      order_items(order, alt_name, print_settings.precision)
     else
-      order_items(order_items, alt_name, print_settings.precision,print_settings.font)
+      order_items(order_items, alt_name, print_settings.precision)
     end
   end
 
@@ -60,7 +77,7 @@ class OrderSummaryPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items(order_item, alt_name, precision,font)    
+  def order_items(order_item, alt_name, precision)
     y_position = cursor
 
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
@@ -75,24 +92,12 @@ class OrderSummaryPdf < Prawn::Document
     move_down 5
 
     #Add Order Item
-    add_order_items(order_item, alt_name, precision, font)
+    add_order_items(order_item, alt_name, precision)
     
   end
 
   # Add order items under order info
-  def add_order_items(order_item, alt_name, precision, font)
-    # db font setup
-    if font != ""
-        font_families.update("#{font}" => {
-            :normal => "public/fonts/#{font}.ttf",
-            :italic => "public/fonts/#{font}.ttf",
-            :bold => "public/fonts/#{font}.ttf",
-            :bold_italic => "public/fonts/#{font}.ttf"
-        })
-
-        font "#{font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
-    end
+  def add_order_items(order_item, alt_name, precision)
     y_position = cursor
 
     move_down 5
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 28c33ba6..80749528 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -23,7 +23,7 @@ class ReceiptBillPdf < Prawn::Document
     super(:margin => [printer_settings.heading_space, 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",

From d7257776388dc3920e5c6d668e16e1929e0bc505 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 24 Oct 2017 15:56:01 +0630
Subject: [PATCH 21/26] update setting admin pages

---
 .../settings/menu_categories/_form.html.erb   |  8 +++---
 .../settings/menu_categories/index.html.erb   |  4 +--
 app/views/settings/menus/_form.html.erb       | 28 +++++++++++++------
 app/views/settings/rooms/index.html.erb       |  2 +-
 .../settings/set_menu_items/_form.html.erb    |  8 +++---
 .../settings/set_menu_items/show.html.erb     | 11 +++++++-
 app/views/settings/tables/index.html.erb      |  8 +++---
 app/views/settings/tables/show.html.erb       |  4 +--
 8 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb
index 431902f4..728f9454 100755
--- a/app/views/settings/menu_categories/_form.html.erb
+++ b/app/views/settings/menu_categories/_form.html.erb
@@ -1,9 +1,9 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings, @settings_menu_category]) do |f| %>
     <%= f.error_notification %>
 
-    <div class="form-inputs">
+    <div class="form-inputs p-l-15">
       <%= f.input :menu_id, as: :hidden %>    
       <%= f.input :code, label: "Category Code" %>
       <%= f.input :name %>
@@ -13,12 +13,12 @@
       <%= f.association :parent %>
     </div>
 
-    <div class="form-actions">
+    <div class="form-actions p-l-15">
       <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
     </div>
     <% end %>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb
index 99be0dff..e451a70a 100755
--- a/app/views/settings/menu_categories/index.html.erb
+++ b/app/views/settings/menu_categories/index.html.erb
@@ -43,8 +43,8 @@
         <td><%= settings_menu_category.is_available rescue false%></td>
         <td><%= settings_menu_category.order_by rescue ''%></td>
         <td><%= settings_menu_category.parent.name rescue ''%></td>
-        <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-lg waves-effect' %> 
-         <%= link_to t("views.btn.delete"), settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td></td>
+        <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-sm waves-effect' %> 
+         <%= link_to t("views.btn.delete"), settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td></td>
        </tr>
        <% end %>
      </tbody>
diff --git a/app/views/settings/menus/_form.html.erb b/app/views/settings/menus/_form.html.erb
index efb5131f..eecc5d76 100755
--- a/app/views/settings/menus/_form.html.erb
+++ b/app/views/settings/menus/_form.html.erb
@@ -1,9 +1,9 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@settings_menu]) do |f| %>
     <%= f.error_notification %>
 
-    <div class="form-inputs">
+    <div class="form-inputs p-l-15">
       <%= f.input :name %>
       <%= f.input :is_active %>
       <%= f.input :valid_days %>
@@ -11,18 +11,28 @@
       <%= f.input :valid_time_from %>
     </div>
 
-    <div class="form-actions">
+    <div class="form-actions p-l-15">
       <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
     </div>
     <% end %>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
-      <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+       <div class="body">
+        <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
+        <p>
+        1) Name - to write menu name <br>
+        2) Is active - checkbox for is active or not <br>
+        3) Valid days - to write 1 to 7 /Monday to Friday for these menu <br>
+        4) Valid Time From - limit time from  <br>
+        5) Valid Time To - limit time to  <br>
+        </p>
+        <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+        <p>
+        1) SUBMIT - to create menu <br>
+        </p>
+        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
+        <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/rooms/index.html.erb b/app/views/settings/rooms/index.html.erb
index 892bebbd..739a0e37 100755
--- a/app/views/settings/rooms/index.html.erb
+++ b/app/views/settings/rooms/index.html.erb
@@ -31,7 +31,7 @@
         <tbody>
           <% @settings_rooms.each do |room| %>
           <tr>
-            <td><%= link_to room.name, settings_menu_path(room) %></td>
+            <td><%= link_to room.name, settings_zone_rooms_path(room) %></td>
             <td><%= room.status %></td>
             <td>Room</td>
             <td><%= room.seater rescue "-" %></td>
diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb
index da6c7f0d..bdb0d6ea 100755
--- a/app/views/settings/set_menu_items/_form.html.erb
+++ b/app/views/settings/set_menu_items/_form.html.erb
@@ -1,11 +1,11 @@
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
     <%= f.error_notification %>
 
     <div class="col-md- panel">
-      <div class="form-group">
+      <div class="form-group p-l-15">
       <div class="col-md-">
           <%= f.input :item_code %>
           <%= f.input :name %>
@@ -50,13 +50,13 @@
         </div>
       </div>
 
-      <div class="form-actions">
+      <div class="form-actions p-l-15">
         <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
     </div>
     <% end %>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb
index ece40155..592eda2d 100755
--- a/app/views/settings/set_menu_items/show.html.erb
+++ b/app/views/settings/set_menu_items/show.html.erb
@@ -50,7 +50,16 @@
           <td><%= @settings_menu_item.menu_category_id %></td>
           <td><%= @settings_menu_item.min_qty %></td>
           <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td>
-          <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %>
+            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_set_menu_item_path(@category, @settings_menu_item)%>" data-method="delete">
+                  <%= t("views.btn.delete") %>
+                </button>
+
+                <span class="hidden" id="delete_text">
+                    <h6>Are you sure you want to delete this row ?</h6>
+                    <h6>This action can't be undo. </h6> 
+                </span>
+          </td>
         </tr>
       </tbody>
     </table>
diff --git a/app/views/settings/tables/index.html.erb b/app/views/settings/tables/index.html.erb
index aacc15f0..45b7a450 100755
--- a/app/views/settings/tables/index.html.erb
+++ b/app/views/settings/tables/index.html.erb
@@ -9,7 +9,7 @@
 </div>
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <div class="m-b-10 clearfix">
       <%= link_to t("views.btn.new"),new_settings_zone_table_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
     </div>
@@ -43,7 +43,7 @@
             <% end %>
           <td><%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td>
-          <%= link_to t("views.btn.show"), settings_zone_table_path(@zone,table),:class => 'btn btn-info btn-lg waves-effect' %>
+          <%= link_to t("views.btn.show"), settings_zone_table_path(@zone,table),:class => 'btn btn-info btn-sm waves-effect' %>
           <%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,table),:class => "btn btn-info btn-sm waves-effect" %>
           </td>
         </tr>
@@ -51,8 +51,8 @@
       </tbody>
     </table>
   </div>
-
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+</div>
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>
diff --git a/app/views/settings/tables/show.html.erb b/app/views/settings/tables/show.html.erb
index e4398267..863ab04c 100755
--- a/app/views/settings/tables/show.html.erb
+++ b/app/views/settings/tables/show.html.erb
@@ -11,7 +11,7 @@
 <br>
 
 <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">
     <div class="card">
       <div class="card-block">
         <h4 class="card-title">Table</h4>
@@ -62,7 +62,7 @@
       </div>
     </div>
   </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">
         <h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>

From fa554067a3724659d881c6174f416bc981374869 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 24 Oct 2017 17:57:03 +0630
Subject: [PATCH 22/26] fix seed

---
 app/models/seed_generator.rb | 74 ++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 41 deletions(-)

diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb
index b05398aa..1451b11e 100755
--- a/app/models/seed_generator.rb
+++ b/app/models/seed_generator.rb
@@ -1,42 +1,15 @@
 class SeedGenerator < ApplicationRecord
   # Generate ID for Tables
   def self.generate_id(model, prefix)
-    seed = SeedGenerator.find_by_model(model)    
-    new_receipt_no = 0
+    cur_val, next_val = self.update_seed(model)
 
-    if (seed.nil?)
-      seed = SeedGenerator.new()
-      seed.model = model
-      new_receipt_no = seed.next
-      seed.save
-    else
-      next_no = seed.next
-      current_no = seed.next
-      seed.next = seed.next + seed.increase_by
-      seed.current = current_no
-      seed.save
-      # cur_val, next_val = self.update_seed(model, seed.next, seed.increase_by)   
-
-      # if next_no == cur_val   
-      #   puts "SSS"
-      #   puts next_val             
-      #   cur_val2, next_val2 = self.update_seed(model, next_val, seed.increase_by)
-      #   puts next_val2
-      #   padding_len = 15 - prefix.length
-      #   saleOrderId = prefix +"-"+ cur_val2.to_s.to_s.rjust((14-prefix.length)+1,'0')
-      #   puts saleOrderId
-      #   return saleOrderId 
-      # end 
-        
-      # padding_len = 15 - prefix.length
-      # saleOrderId = prefix +"-"+ cur_val.to_s.to_s.rjust((14-prefix.length)+1,'0')
-      # return saleOrderId 
-
-    end
+    if (cur_val == 0)
+      cur_val, next_val = self.execute_query(model)
+    end 
 
     padding_len = 15 - prefix.length
-    saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
-    return saleOrderId
+    saleOrderId = prefix +"-"+ cur_val.to_s.to_s.rjust((14-prefix.length)+1,'0')
+    return saleOrderId 
   end
 
   # Generate Receipt No
@@ -88,22 +61,41 @@ class SeedGenerator < ApplicationRecord
     return next_code
   end
 
-  def self.update_seed(model, current, inc)    
-    cur_val = 0
-    next_val = 0
-    nex = current + inc
+  def self.execute_query(model)
+    current = 0
+    nex = 0
+    
+    sql = "INSERT INTO seed_generators (model, created_at, updated_at)      
+            VALUES('#{ model }', NOW(), NOW()) 
+            ON DUPLICATE KEY UPDATE current = current + 1, next = next + 1;"
 
-    update_sql = "update seed_generators set current= #{current}, next= #{nex} where model='#{model}';";
+    select_sql = "select * from seed_generators where model='#{model}';"           
+    ActiveRecord::Base.connection.execute(sql);
+    select_result = ActiveRecord::Base.connection.execute(select_sql);
+    
+    select_result.each do |row|      
+      current = row [3]
+      nex = row[4]
+    end
+
+    return current, nex
+  end
+
+  def self.update_seed(model)   
+    current = 0
+    nex = 0
+
+    update_sql = "UPDATE seed_generators set current = current + 1, next = next + 1 WHERE model='#{model}';"
     select_sql = "select * from seed_generators where model='#{model}';"
     update_result = ActiveRecord::Base.connection.execute(update_sql);
 
     select_result = ActiveRecord::Base.connection.execute(select_sql);
     
     select_result.each do |row|      
-      cur_val = row [3]
-      next_val = row[4]
+      current = row [3]
+      nex = row[4]
     end
 
-    return cur_val, next_val
+    return current, nex
   end
 end

From 34a4e485af8534851cdf034b84daef12c089e462 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 24 Oct 2017 18:16:03 +0630
Subject: [PATCH 23/26] update setting admin pages

---
 app/assets/javascripts/CRM.js                 | 13 +++++
 app/assets/javascripts/application.js         |  2 +-
 app/assets/javascripts/custom.js              |  2 +-
 app/views/origami/addorders/detail.html.erb   |  8 +--
 app/views/origami/home/show.html.erb          |  4 +-
 .../origami/movetable/move_dining.html.erb    | 54 ++++++++++++-------
 app/views/origami/orders/show.html.erb        | 10 ++--
 app/views/origami/rooms/show.html.erb         | 14 ++---
 app/views/origami/sales/show.html.erb         | 13 +++--
 app/views/settings/item_sets/index.html.erb   | 14 ++++-
 .../settings/menu_categories/index.html.erb   |  9 ++--
 .../settings/menu_categories/show.html.erb    | 25 ++++-----
 .../menu_item_attributes/index.html.erb       | 11 ++--
 .../menu_item_instances/_form.html.erb        |  8 +--
 .../menu_item_instances/index.html.erb        | 12 ++---
 .../menu_item_instances/show.html.erb         | 40 ++++++++------
 .../settings/menu_item_options/index.html.erb | 11 ++--
 app/views/settings/menus/index.html.erb       |  5 +-
 app/views/settings/menus/show.html.erb        | 14 ++---
 .../settings/set_menu_items/index.html.erb    | 11 ++--
 .../settings/set_menu_items/show.html.erb     | 40 +++++++-------
 .../settings/simple_menu_items/index.html.erb | 11 ++--
 .../settings/simple_menu_items/show.html.erb  | 31 ++++++-----
 .../settings/tax_profiles/_form.html.erb      |  4 +-
 .../settings/tax_profiles/index.html.erb      |  2 +-
 app/views/settings/tax_profiles/new.html.erb  |  2 +-
 app/views/settings/tax_profiles/show.html.erb |  6 +--
 .../transactions/credit_notes/index.html.erb  | 31 +++++++----
 app/views/transactions/orders/index.html.erb  | 12 +++--
 app/views/transactions/orders/show.html.erb   |  2 +-
 app/views/transactions/sales/index.html.erb   | 23 ++++++--
 31 files changed, 263 insertions(+), 181 deletions(-)

diff --git a/app/assets/javascripts/CRM.js b/app/assets/javascripts/CRM.js
index e9c764fe..a57de941 100755
--- a/app/assets/javascripts/CRM.js
+++ b/app/assets/javascripts/CRM.js
@@ -16,9 +16,22 @@
 //= require bootstrap/js/bootstrap-material-design.min
 //= require jquery_ujs
 //= require turbolinks
+//= require momentjs/moment
+//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
+
+$(document).on('turbolinks:load', function() {
+
+    $('.datepicker').bootstrapMaterialDatePicker({
+        format: 'DD-MM-YYYY',
+        clearButton: true,
+        weekStart: 1,
+        time: false
+    });
+   
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b4eae256..1bf91306 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -59,7 +59,7 @@ $(document).on('turbolinks:load', function() {
     });
    
 });
-$(function(){
+$(document).on('turbolinks:load', function() {
 
   // Image Upload
   $("#simple_menu_item_image_path").fileinput({
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 1509a71b..46543c6b 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -1,5 +1,5 @@
 
-$(function(){
+$(document).on('turbolinks:load', function() {
 
   $('body').bootstrapMaterialDesign();
   var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index be16da51..fae66e28 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -3,7 +3,7 @@
 <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
-<div class="row">
+<div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
@@ -19,17 +19,17 @@
             </li>
         </ul>
     </div>
-    <div class="col-md-7 col-lg-7 col-sm-7">
+    <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">
       <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 10px;">
          <!-- append data -->
       </div>
     </div>
 
-    <div class="col-md-3 col-lg-3 col-sm-3">
+    <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
         <button type="button" class="btn btn-primary btn-md float-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br>
         <div class="card-header">
           <div>
-             <strong id="order-title">ORDER DETAILS </strong> |  Table <%=@table.name%>
+             <strong id="order-title">ORDER DETAILS </strong>| Table<%=@table.name%>
              <p class="hidden" id="table_id"><%=@table_id%></p>
              <p class="hidden" id="table_type"><%=@table.type%></p>
              <p class="hidden" id="booking_id"><%=@booking_id%></p>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 3f48ac92..66fadd48 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -127,7 +127,7 @@
             </div>
             <div class="card-block">
               <div class="card-title">
-                <div class="row">
+                <div class="row p-l-5 p-r-5">
                   <div class="col-lg-6 col-md-6 col-sm-6">
                      Receipt No: <span id="receipt_no">
                        <% if @status_sale == 'sale' %>
@@ -142,7 +142,7 @@
                     <br>
                   </div>
                 </div>
-                <div class="row">
+                <div class="row p-l-5 p-r-5">
                     <div class="col-lg-6 col-md-6 col-sm-6">
                   <% if @status_sale == 'sale' %>
                       <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 7df2038d..60aa775f 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -220,17 +220,22 @@ $(document).ready(function(){
       var dining_id = $(this).attr("data-id");
       var change_from = "<%= @dining.id %>";
       if (dining_id == change_from) {
-        $.alert({
+        /*$.alert({
           title: 'Alert!',
           content: 'Please Select Another Table',
           type: 'red',
           typeAnimated: true,
           btnClass: 'btn-danger',
-        });
-      }else{
-        $('#moved').text(" ' " + dining_name + " ' ")
-        $('#change_table_value').val(dining_id);
-      }
+        });*/
+          swal({
+             title: "Alert!!",
+             text: 'Please Select Another Table !',
+             type: 'warning',
+          });
+        }else{
+          $('#moved').text(" ' " + dining_name + " ' ")
+          $('#change_table_value').val(dining_id);
+        }
      
   })
 
@@ -241,13 +246,11 @@ $(document).ready(function(){
     var dining_id = $(this).attr("data-id");
     var change_from = "<%= @dining.id %>";
     if (dining_id == change_from) {
-        $.alert({
-          title: 'Alert!',
-          content: 'Please Select Another Table',
-          type: 'red',
-          typeAnimated: true,
-          btnClass: 'btn-danger',
-        });
+        swal({
+             title: "Alert!!",
+             text: 'Please Select Another Table !',
+             type: 'warning',
+          });
       }else{
         $('#moved').text(dining_name)
         $('#change_table_value').val(dining_id);
@@ -258,18 +261,29 @@ $(document).ready(function(){
     change_to = $('#change_table_value').val();
     change_from = "<%= @dining.id %>";
     if (change_to == ""){
-      alert("Please Select Table")
+      swal({
+             title: "Alert!!",
+             text: 'Please Select Table !',
+             type: 'warning',
+          });
     }else{
       $.ajax({type: "POST",
         url: "<%= origami_moving_path %>",
         data: "change_from="+ change_from + "&change_to=" + change_to,
         success:function(result){
-          alert("Moving Success")
-          if (result.get_type == 'Table'){
-            window.location.href = '/origami/table/' + change_to;
-          }else{
-            window.location.href = '/origami/room/' + change_to;
-          }
+          
+          swal({
+             title: "Information!",
+             text: 'Moving Success',
+             type: 'success',
+          }, function (){
+             if (result.get_type == 'Table'){
+              window.location.href = '/origami/table/' + change_to;
+              }else{
+                window.location.href = '/origami/room/' + change_to;
+              }
+          });
+         
         }
       });
     }
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index 7d395ab6..28930adf 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -127,18 +127,18 @@
           <div><strong id="order-title">ORDERS DETAILS </strong></div>
        </div>
        <div class="card-block">
-         <div class="card-title row">
+         <div class="card-title row p-l-5 p-r-5">
            <div class="col-lg-6 col-md-6 col-sm-6">
-             <p> Receipt No: <span id="receipt_no">
-             </span></p>
+              Receipt No: <span id="receipt_no">
+             </span>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+            Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
            </div>
          </div>
          <div class="card-title row customer_detail hide">
            <div class="col-lg-6 col-md-6 col-sm-6">
-             <p>Customer : <span id="customer_name"></span></p>
+             Customer : <span id="customer_name"></span>
            </div>
 
          </div>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 5128e6f5..d0b3804b 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -130,27 +130,27 @@
 
        </div>
        <div class="card-block">
-         <div class="card-title row">
+         <div class="card-title row p-l-5 p-r-5">
            <div class="col-lg-6 col-md-6 col-sm-6">
-             <p> Receipt No: <span id="receipt_no">
+              Receipt No: <span id="receipt_no">
                <% if @status_sale == 'sale' %>
                  <%= @obj_sale.receipt_no rescue '' %>
 
                <% end %>
-             </span></p>
+             </span>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @obj_sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+            Date:  <span id="receipt_date"><%= @obj_sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
            </div>
          </div>
-         <div class="card-title row customer_detail">
+         <div class="card-title row customer_detail p-l-5 p-r-5">
            <div class="col-lg-6 col-md-6 col-sm-6">
              <% if @status_sale == 'sale' %>
               <p class="hidden customer-id"><%= @obj_sale_sale.customer_id rescue '' %></p>
-               <p>Customer : <%= @obj_sale_sale.customer.name rescue '-' %></p>
+               Customer : <%= @obj_sale_sale.customer.name rescue '-' %>
              <%else%>
                <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
-               <p>Customer : <%= @customer.name rescue "-" %></p>
+               Customer : <%= @customer.name rescue "-" %>
              <%end%>
            </div>
 
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index 904d5896..dd8a0b4f 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -112,20 +112,19 @@
           <div><strong id="order-title">INVOICE DETAILS </strong></div>
        </div>
        <div class="card-block">
-         <div class="card-title row">
+         <div class="card-title row p-l-5 p-r-5">
            <div class="col-lg-6 col-md-6 col-sm-6">
-             <p> Receipt No: <span id="receipt_no">
+              Receipt No: <span id="receipt_no">
                  <%= @sale.receipt_no rescue '' %>
-             </span></p>
+             </span>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+             Date:  <span id="receipt_date"><%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
            </div>
          </div>
-         <div class="card-title row customer_detail">
+         <div class="card-title row customer_detail p-l-5 p-r-5">
            <div class="col-lg-6 col-md-6 col-sm-6">
-             
-               <p>Customer : <%= @sale.customer.name rescue "-" %></p>
+             Customer : <%= @sale.customer.name rescue "-" %>
 
            </div>
 
diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb
index 8a9e01e3..2544ae35 100755
--- a/app/views/settings/item_sets/index.html.erb
+++ b/app/views/settings/item_sets/index.html.erb
@@ -11,7 +11,19 @@
 
 
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
+   <div class="card">
+    <ul class="list-group">
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+       <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+    </ul>
+  </div>
+</div>
+  <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
     <div class="m-b-10 clearfix">
       <%= link_to t("views.btn.new"),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
     </div>
diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb
index e451a70a..f41862ba 100755
--- a/app/views/settings/menu_categories/index.html.erb
+++ b/app/views/settings/menu_categories/index.html.erb
@@ -11,11 +11,12 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+       <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
       <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
       <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
     </ul>
   </div>
 </div>
@@ -44,7 +45,7 @@
         <td><%= settings_menu_category.order_by rescue ''%></td>
         <td><%= settings_menu_category.parent.name rescue ''%></td>
         <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-sm waves-effect' %> 
-         <%= link_to t("views.btn.delete"), settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td></td>
+       </td></td>
        </tr>
        <% end %>
      </tbody>
diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb
index f8addee7..65bb50e4 100755
--- a/app/views/settings/menu_categories/show.html.erb
+++ b/app/views/settings/menu_categories/show.html.erb
@@ -12,13 +12,14 @@
 <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
      <div class="card">
-      <ul class="list-group">
-        <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
-        <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
-        <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-        <!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-        <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> -->
-      </ul>
+     <ul class="list-group">
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+    </ul>
     </div>
   </div>
   <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
@@ -31,8 +32,8 @@
               <th>Menu</th>
               <th>Name</th>
               <th>Alt name</th>
-              <th>Is Available</th>
-              <th>Order by</th>
+              <th>Available</th>
+              <!-- <th>Order by</th> -->
               <th>Created At</th>
               <th>Actions</th>
             </tr>
@@ -44,10 +45,10 @@
               <td><%= @settings_menu_category.name  rescue "-" %></td>
               <td><%= @settings_menu_category.alt_name %></td>
               <td><%= settings_menu_category.is_available rescue false%></td>
-              <td><%= @settings_menu_category.order_by %></td>
+              <!-- <td><%= @settings_menu_category.order_by %></td> -->
               <td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
-              <td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %></td>
-              <td>
+              <td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %>
+              
                 <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_path(@settings_menu_category)%>" data-method="delete">
                   <%= t("views.btn.delete") %>
                 </button>
diff --git a/app/views/settings/menu_item_attributes/index.html.erb b/app/views/settings/menu_item_attributes/index.html.erb
index b9f08a18..5e42ec4e 100755
--- a/app/views/settings/menu_item_attributes/index.html.erb
+++ b/app/views/settings/menu_item_attributes/index.html.erb
@@ -12,11 +12,12 @@
    <div class="card">
 
     <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
     </ul>
   </div>
 </div>
diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb
index 90f0c43d..29c09223 100755
--- a/app/views/settings/menu_item_instances/_form.html.erb
+++ b/app/views/settings/menu_item_instances/_form.html.erb
@@ -1,12 +1,12 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
 
     <%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %>
 
     <%= f.error_notification %>
 
     <div class="col-md- panel">
-      <div class="form-group">
+      <div class="form-group p-l-15">
         <%= f.input :item_instance_code %>
         <%= f.input :item_instance_name %>
         <%= f.input :price %>
@@ -28,13 +28,13 @@
         </div>
       </div>
 
-      <div class="form-actions">
+      <div class="form-actions p-l-15">
          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
     </div>
     <% end %>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
         Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
diff --git a/app/views/settings/menu_item_instances/index.html.erb b/app/views/settings/menu_item_instances/index.html.erb
index 3e43ff25..84f24627 100755
--- a/app/views/settings/menu_item_instances/index.html.erb
+++ b/app/views/settings/menu_item_instances/index.html.erb
@@ -83,13 +83,13 @@
             <td><%=l settings_menu_item.created_at, :format => :short %></td>
 
             <% if settings_menu_item.type == "SimpleMenuItem" %>
-            <td><%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
-            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
-            <td><%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <td><%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class=>"btn btn-primary waves-effect btn-sm" %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class=>"btn btn-info waves-effect btn-sm" %></td>
+            <td><%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class=>"btn btn-danger waves-effect btn-sm" %></td>
             <% else %>
-            <td><%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
-            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
-            <td><%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <td><%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ),,:class=>"btn btn-primary waves-effect btn-sm" %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),,:class=>"btn btn-info waves-effect btn-sm" %></td>
+            <td><%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },,:class=>"btn btn-danger waves-effect btn-sm" %></td>
             <% end %>
           </tr>
         <% end %>
diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb
index 0be31de7..9e8b9f6d 100755
--- a/app/views/settings/menu_item_instances/show.html.erb
+++ b/app/views/settings/menu_item_instances/show.html.erb
@@ -28,30 +28,37 @@
   <div class="card-block">
     <h4 class="card-title">Menu Item Instance</h4>
     <table class="table">
-      <thead>
-        <tr>
-          <th>Item Instance code</th>
-          <th>Name</th>
-          <th>Price</th>
-          <th>On Promotion</th>
-          <th>Promotion Price</th>
-          <th>Available</th>
-          <th>Is Default</th>
-          <th>Created At</th>   
-        </tr>
-      </thead>
-
       <tbody>
-        <tr>
-
+        
+          <tr><th>Item Instance code</th>
           <td><%= @settings_menu_item_instances.item_instance_code %></td>
+          </tr>
+          <tr><th>Name</th>
           <td><%= @settings_menu_item_instances.item_instance_name  rescue "-" %></td>
+          </tr>
+          <tr><th>Price</th>
           <td><%= @settings_menu_item_instances.price %></td>
+          </tr>
+          <tr><th>On Promotion</th>
           <td><%= @settings_menu_item_instances.is_on_promotion %></td>
+          </tr>
+          <tr><th>Promotion Price</th>
           <td><%= @settings_menu_item_instances.promotion_price %></td>
+          </tr>
+          <tr><th>Available</th>
           <td><%= @settings_menu_item_instances.is_available %></td>
+          </tr>
+          <tr><th>Is Default</th>
           <td><%= @settings_menu_item_instances.is_default %></td>
+          </tr>
+          <tr><th>Created At</th>   
           <td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+          </tr>
+        
+      </tbody>
+
+      
+          
           <% if params[:simple_menu_item_id] %>
           <!-- td><%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td> 
           <td><button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_simple_menu_item_menu_item_instance_path(@item, @settings_menu_item_instances)%>" data-method="delete">
@@ -76,8 +83,7 @@
           </td>-->
           <% end %>
 
-        </tr>
-      </tbody>
+     
     </table>
   </div>
 </div>
diff --git a/app/views/settings/menu_item_options/index.html.erb b/app/views/settings/menu_item_options/index.html.erb
index cd4b503b..722a0ec8 100755
--- a/app/views/settings/menu_item_options/index.html.erb
+++ b/app/views/settings/menu_item_options/index.html.erb
@@ -13,11 +13,12 @@
    <div class="card">
 
     <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
     </ul>
   </div>
 </div>
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index 6b4a3271..0d2cd99e 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -12,11 +12,12 @@
    <br><br>
    <div class="card">
     <ul class="list-group">
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
       <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
       <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
       <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
     </ul>
   </div>
 </div>
diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb
index 3260c385..14f61299 100755
--- a/app/views/settings/menus/show.html.erb
+++ b/app/views/settings/menus/show.html.erb
@@ -12,11 +12,14 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
+      <ul class="list-group">
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
       <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
       <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
       <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+    </ul>
     </ul>
   </div>
 </div>
@@ -33,7 +36,7 @@
             <th>Valid To</th>
             <th>Created By</th>
             <th>Created At</th> 
-            <th colspan="2">Actions</th>
+            <th >Actions</th>
           </tr>
         </thead>
         <tbody>
@@ -43,9 +46,8 @@
             <td><%= @settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %></td>
             <td><%= @settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td>
             <td><%= @settings_menu.created_by %></td>
-            <td><%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td><%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu),:class => 'btn btn-primary btn-sm waves-effect' %></td>
-            <td>
+            <td><%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu),:class => 'btn btn-primary btn-sm waves-effect' %>
               <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_path(@settings_menu)%>" data-method="delete">
                 <%= t("views.btn.delete") %>
               </button>
diff --git a/app/views/settings/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb
index 3e0bb3d5..f941bc13 100755
--- a/app/views/settings/set_menu_items/index.html.erb
+++ b/app/views/settings/set_menu_items/index.html.erb
@@ -23,11 +23,12 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
     </ul>
   </div>
 </div>
diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb
index 592eda2d..134a52bc 100755
--- a/app/views/settings/set_menu_items/show.html.erb
+++ b/app/views/settings/set_menu_items/show.html.erb
@@ -13,11 +13,12 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
     </ul>
   </div>
 </div>
@@ -25,15 +26,16 @@
     <div class="card">
   <div class="card-block">
     <h4 class="card-title">Menu Item </h4>
-    <table class="table">
+    <div class="body table-responsive">
+      <table class="table">
       <thead>
         <tr>
           <th>Item code</th>
           <th>Name</th>
-          <th>Alt name</th>
+          <!-- <th>Alt name</th> -->
           <th>Type</th>
           <th>Account Type</th>
-          <th>Menu category</th>
+          <!-- <th>Menu category</th> -->
           <th>Min qty</th>
           <th>Created At</th>
           <th>Action</th>
@@ -44,12 +46,12 @@
         <tr>
           <td><%= @settings_menu_item.item_code %></td>
           <td><%= @settings_menu_item.name  rescue "-" %></td>
-          <td><%= @settings_menu_item.alt_name %></td>
+          <!-- <td><%= @settings_menu_item.alt_name %></td> -->
           <td><%= @settings_menu_item.type %></td>
           <td><%= @settings_menu_item.account.title %></td>
-          <td><%= @settings_menu_item.menu_category_id %></td>
+          <!-- <td><%= @settings_menu_item.menu_category_id %></td> -->
           <td><%= @settings_menu_item.min_qty %></td>
-          <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td>
+          <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
           <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %>
             <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_set_menu_item_path(@category, @settings_menu_item)%>" data-method="delete">
                   <%= t("views.btn.delete") %>
@@ -63,6 +65,7 @@
         </tr>
       </tbody>
     </table>
+    </div>
   </div>
 </div>
 
@@ -82,8 +85,8 @@
           <th>Instance name</th>
           <th>Attributes</th>
           <th>price</th>
-          <th>Promotion</th>
-          <th>promotion price</th>
+         <!--  <th>Promotion</th>
+          <th>promotion price</th> -->
           <!-- <th>Created at</th> -->
 
           <th>Actions</th>
@@ -97,13 +100,13 @@
             <td><%= settings_menu_item.item_instance_code %></td>
             <td><%= settings_menu_item.item_instance_name %></td>
             <td><%= settings_menu_item.item_attributes %></td>
-            <td><%= settings_menu_item.price %></td>
+            <td><%= settings_menu_item.price %></td><!-- 
             <td><%= settings_menu_item.is_on_promotion %></td>
-            <td><%= settings_menu_item.promotion_price %></td>
+            <td><%= settings_menu_item.promotion_price %></td> -->
            <!--  <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td> -->
             <td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
             <%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-            <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
+           <!--  <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>--></td>
           </tr>
         <% end %>
       </tbody>
@@ -114,10 +117,7 @@
  <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
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/simple_menu_items/index.html.erb b/app/views/settings/simple_menu_items/index.html.erb
index 10a7abfe..984f8d95 100755
--- a/app/views/settings/simple_menu_items/index.html.erb
+++ b/app/views/settings/simple_menu_items/index.html.erb
@@ -24,11 +24,12 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
     </ul>
   </div>
 </div>
diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb
index 7983b7b3..a30d3b6c 100755
--- a/app/views/settings/simple_menu_items/show.html.erb
+++ b/app/views/settings/simple_menu_items/show.html.erb
@@ -14,11 +14,12 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
     </ul>
   </div>
 </div>
@@ -26,17 +27,18 @@
   <div class="card">
     <div class="card-block">
       <h4 class="card-title">Menu Item </h4>
+      <div class="body table-responsive">
       <table class="table">
         <thead>
           <tr>
             <th>Item code</th>
             <th>Name</th>
-            <th>Alt name</th>
+            <!-- <th>Alt name</th> -->
             <th>Type</th>
             <th>Accout</th>
-            <th>Menu category</th>
+           <!--  <th>Menu category</th> -->
             <!-- <th>Menu item</th> -->
-            <th>Min qty</th>
+            <!-- <th>Min qty</th> -->
           <!-- <th>Min selectable item</th>
           <th>Max selectable item</th> -->
           <th>Created At</th>
@@ -48,15 +50,15 @@
         <tr>
           <td><%= @settings_menu_item.item_code %></td>
           <td><%= @settings_menu_item.name  rescue "-" %></td>
-          <td><%= @settings_menu_item.alt_name %></td>
+         <!--  <td><%= @settings_menu_item.alt_name %></td> -->
           <td><%= @settings_menu_item.type %></td>
           <td><%= @settings_menu_item.account.title %></td>
-          <td><%= @settings_menu_item.menu_category_id %></td>
-          <td><%= @settings_menu_item.min_qty %></td>
+         <!--  <td><%= @settings_menu_item.menu_category_id %></td> -->
+         <!--  <td><%= @settings_menu_item.min_qty %></td> -->
 
           <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
 
-          <td colspan="2">
+          <td colspan="">
             <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %>
             <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_simple_menu_item_path(@category)%>" data-method="delete">
               <%= t("views.btn.delete") %>
@@ -70,6 +72,7 @@
         </tr>
       </tbody>
     </table>
+    </div>
   </div>
 </div>
 
@@ -110,8 +113,8 @@
 
           <!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td> -->
 
-          <td><%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-lg waves-effect' %>
-          <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %>
+          <td><%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
+          <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
           </td>
         </tr>
         <% end %>
diff --git a/app/views/settings/tax_profiles/_form.html.erb b/app/views/settings/tax_profiles/_form.html.erb
index 315a3f00..5a490d13 100755
--- a/app/views/settings/tax_profiles/_form.html.erb
+++ b/app/views/settings/tax_profiles/_form.html.erb
@@ -5,14 +5,14 @@
     <%= simple_form_for([:settings, @settings_tax_profile ]) do |f| %>
     <%= f.error_notification %>
 
-    <div class="form-inputs">
+    <div class="form-inputs p-l-15">
       <%= f.input :name %>
       <%= f.input :rate %>
       <%= f.input :inclusive %>
       <%= f.input :order_by %>
     </div>
 
-    <div class="form-actions">
+    <div class="form-actions p-l-15">
       <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
     </div>
     <% end %>
diff --git a/app/views/settings/tax_profiles/index.html.erb b/app/views/settings/tax_profiles/index.html.erb
index 2f94e0e2..de3ab94e 100755
--- a/app/views/settings/tax_profiles/index.html.erb
+++ b/app/views/settings/tax_profiles/index.html.erb
@@ -35,7 +35,7 @@
               <td><%= settings_tax_profile.order_by %></td>
               <td><%= settings_tax_profile.created_by %></td>
               <td><%= link_to t("views.btn.show"), settings_tax_profile_path(settings_tax_profile), :class => "btn btn-info btn-sm waves-effect" %>
-              <%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-lg waves-effect' %></td>
+              <%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-sm waves-effect' %></td>
             </tr>
             <% end %>
           </tbody>
diff --git a/app/views/settings/tax_profiles/new.html.erb b/app/views/settings/tax_profiles/new.html.erb
index 4ce9ffb0..a5f3663e 100755
--- a/app/views/settings/tax_profiles/new.html.erb
+++ b/app/views/settings/tax_profiles/new.html.erb
@@ -1,4 +1,4 @@
-<%= link_to 'Back', settings_tax_profiles_path %> -->
+
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
diff --git a/app/views/settings/tax_profiles/show.html.erb b/app/views/settings/tax_profiles/show.html.erb
index 5e92bcea..d0808a49 100755
--- a/app/views/settings/tax_profiles/show.html.erb
+++ b/app/views/settings/tax_profiles/show.html.erb
@@ -1,10 +1,10 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= settings_tax_profile_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_tax_profile_path %>">Tax Profiles</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_tax_profiles_path %>">Tax Profiles</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profile_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profiles_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb
index 19327139..451b4eb3 100755
--- a/app/views/transactions/credit_notes/index.html.erb
+++ b/app/views/transactions/credit_notes/index.html.erb
@@ -11,19 +11,19 @@
 </div>
 
 <div class="row">
-  <div class="col-lg-12">
-      <div class="main-box-body clearfix">
+  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+      <div class="main-box-body clearfix p-l-5 p-r-5">
         <div class="table-responsive">
-          <table class="table table-striped">
-            <thead>
+          <table class="table table-">
+            <theadtbody>
                <tr>
-                 <td colspan="8">
+                 <td colspan="">
                     <%= form_tag transactions_credit_notes_path, :method => :get do %>
-                       <div class="form-group col-md-4">
+                       <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
                          <label>Enter Keywords</label>
                          <input type="text" name="receipt_no" class="form-control" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
                        </div>
-                       <div class="form-group col-md-2">
+                       <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                         <label>Select Customer</label>
                          <select class="selectpicker form-control col-md-12" name="customer"  style="height: 40px" >
                           <option value="">Select Customer</option>
@@ -33,22 +33,32 @@
                             <%end %>
                           </select>   
                       </div>
-                       <div class="form-group col-md-2"> 
+                       <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                          <label class="">From</label>
                          <input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date">
                       </div>
-                      <div class="form-group col-md-2">
+                      <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                         <label class="">To</label>
                         <input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date">
                       </div>
                       
-                      <div class="form-group col-md-1">
+                     <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
                         <label> &nbsp;</label>
                         <input type="submit" value="Search" class='btn btn-primary btn-md'>
                       </div>
                     <% end %>
                   </td>
                </tr>
+              
+            </tbody>
+
+            
+          </table>
+        </div>
+        <div class="card">
+          <div class="table-responsive">
+          <table class="table table-striped">
+            <thead>
               <tr>
                 <th>Sale Id </th>
                 <th>Receipt no </th>
@@ -82,6 +92,7 @@
           <br>
           
         </div>
+        </div>
       </div>
 
   </div>
diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb
index 30152ae4..e3f0f91d 100755
--- a/app/views/transactions/orders/index.html.erb
+++ b/app/views/transactions/orders/index.html.erb
@@ -10,7 +10,7 @@
 </div>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-      <div class="main-box-body clearfix ">
+      <div class="main-box-body clearfix p-l-15 p-r-15">
        <%= form_tag transactions_orders_path, :method => :get do %>
             <div class="row clearfix">
               <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
@@ -36,13 +36,14 @@
             </div>
             
             <div class="form-group col-lg-1 col-md-1 col-sm-1 col-xs-1">
-              <label > &nbsp;</label>
-              <input type="submit" value="Search" class='btn btn-primary btn-md'>
+              <label >  &nbsp;</label>
+             <br> <input type="submit" value="Search" class='btn btn-primary btn-md'>
             </div> 
             </div>             
       <% end %>
-        <div class="table-responsive">
-          <table class="table table-striped">
+        <div class="card">
+          <div class="table-responsive">
+          <table class="table ">
             <thead>
               
               <tr>
@@ -76,6 +77,7 @@
             <%= paginate @orders %>
           <%end%>
         </div>
+        </div>
       </div>
 
   </div>
diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb
index 95f39983..4820a4e1 100755
--- a/app/views/transactions/orders/show.html.erb
+++ b/app/views/transactions/orders/show.html.erb
@@ -12,7 +12,7 @@
 
 <div class="row">
    <div class="col-lg-11 col-md-11 col-sm-11">
-      <div class="main-box-body clearfix">
+      <div class="main-box-body clearfix p-l-5 p-r-5">
         <div class="table-responsive">
           <table class="table table-striped">
             <thead>
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb
index c4767553..f918e7b6 100755
--- a/app/views/transactions/sales/index.html.erb
+++ b/app/views/transactions/sales/index.html.erb
@@ -8,11 +8,11 @@
   </ol>
 </div>
 <div class="row">
-  <div class="col-lg-12">
-      <div class="main-box-body clearfix">
+  <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+      <div class="main-box-body clearfix p-l-5 p-r-5">
         <div class="table-responsive">
-          <table class="table table-striped">
-            <thead>
+          <table class="table table-">
+            <tbody>
               <tr>
                  <td colspan="8">
                     <%= form_tag transactions_sales_path, :method => :get do %>
@@ -32,12 +32,24 @@
                       
                       <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
                         <label></label>
-                        <input type="submit" value="Search" class='btn btn-primary btn-md'>
+                        <br><input type="submit" value="Search" class='btn btn-primary btn-md'>
                       </div>
                       </div>
                     <% end %>
                  </td>
               </tr>
+              
+            </tbody>
+
+           
+          </table>
+          
+        </div>
+        <div class="card">
+          <div class="table-responsive">
+          <table class="table table-striped">
+            <thead>
+             
               <tr>
                 <th>Sale Id </th>
                 <th>Receipt no </th>
@@ -72,6 +84,7 @@
                <%= paginate @sales %>
            <% end %>
         </div>
+        </div>
       </div>
 
   </div>

From bbae5cd5cc7dc47687eec26c26657aae4a0c3228 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 25 Oct 2017 13:03:12 +0630
Subject: [PATCH 24/26] update promotion form

---
 app/assets/stylesheets/reset.css             |   6 +
 app/views/settings/promotions/_form.html.erb | 129 ++++++++++++++-----
 2 files changed, 102 insertions(+), 33 deletions(-)

diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index e79eb0b2..db9581fa 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -198,5 +198,11 @@ section.content {
     background-color: #007d72 !important;
 }
 
+/* FORM */
+.input-group-addon {
+    padding: 0rem 0rem;
+}
+/* END FORM */
+
 /* End Reset Theme */
 /* *************************************************** */
\ No newline at end of file
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index 5ee3924f..e68cb665 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -5,41 +5,81 @@
 
   <div class="form-inputs p-l-15">
     <div class="div-border">
-        <div class="row">
-          <div class="col-md-6"><%= f.input :promo_code  %></div>
-          <div class="col-md-6"></div>
-        </div>
         <div class="row">
           <div class="col-md-6">
-            <span>* Promo Start Date</span>
-            <%= f.date_field  :promo_start_date, :placeholder => "From Date" , :class => "form-control datepicker"%>
-            <br>
-          </div>
-          <div class="col-md-6">
-            <span>* Promo End Date</span>
-            <%= f.date_field :promo_end_date ,:placeholder => "To Date" , :class => "form-control datepicker"%>
+            <label>*Promo Code</label>
+            <div class="input-group"> 
+              <span class="input-group-addon">
+                  <i class="material-icons">vpn_key</i>
+              </span>            
+              <input type="text" name="promotion[promo_code]" value="<%= @promotion.promo_code%>" class="form-control" id="promotion_promo_code">    
+            </div>
           </div>
         </div>
+
         <div class="row">
           <div class="col-md-6">
-            <!-- <span>* Promo Start Hour</span> -->
-            <% if !@promotion.promo_start_hour.nil?%>
-              <%= f.input :promo_start_hour, as: :string, input_html: {  :value => @promotion.promo_start_hour.utc.strftime('%H:%M') } %>
-            <% else %>
-              <%= f.input :promo_start_hour, as: :string, input_html: { } %>
-            <% end %>
-            <!-- <span>Promo Start Hour</span>
-            <%= text_field_tag :promo_start_hour , nil, :placeholder => "From Time", :id => "fromtime", :class => 'form-control' %> -->
+            <label>* Start Date</label>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <i class="material-icons">date_range</i>
+              </span>
+              <% if !@promotion.promo_start_date.nil?%>
+                <input type="text" name="promotion[promo_start_date]" value="<%= @promotion.promo_start_date.strftime('%A, %d-%m-%Y') %>" class="datepicker form-control" placeholder="Start Date...">
+              <% else %>
+                 <input type="text" name="promotion[promo_start_date]" class="datepicker form-control" placeholder="Start Date...">
+              <% end %>
+            </div>
           </div>
           <div class="col-md-6">
-            <!-- <span>* Promo End Hour</span> -->
-            <% if !@promotion.promo_end_hour.nil?%>
+            <label>* End Date</label>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <i class="material-icons">date_range</i>
+              </span>
+              <% if !@promotion.promo_end_date.nil?%>
+                <input type="text" name="promotion[promo_end_date]" value="<%= @promotion.promo_end_date.strftime('%A, %d-%m-%Y') %>" class="datepicker form-control" placeholder="Start Date...">
+              <% else %>
+                 <input type="text" name="promotion[promo_end_date]" class="datepicker form-control" placeholder="End Date...">
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-md-6">
+            <label class="control-label">* Start Hour</label>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <i class="material-icons">access_time</i>
+              </span>
+                <% if !@promotion.promo_start_hour.nil?%>
+                  <input type="text" name="promotion[promo_start_hour]" value="<%= @promotion.promo_start_hour.utc.strftime('%H:%M') %>" class="timepicker form-control" placeholder="Start Time...">
+                <% else %>
+                   <input type="text" name="promotion[promo_start_hour]" class="timepicker form-control" placeholder="Start Time...">
+                <% end %>
+            </div>         
+          </div>
+          <div class="col-md-6">
+            <label class="control-label">* End Hour</label>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <i class="material-icons">access_time</i>
+              </span>
+                <% if !@promotion.promo_end_hour.nil?%>
+                  <input type="text" name="promotion[promo_end_hour]" value="<%= @promotion.promo_end_hour.utc.strftime('%H:%M') %>" class="timepicker form-control" placeholder="End Time...">
+                <% else %>
+                   <input type="text" name="promotion[promo_end_hour]" class="timepicker form-control" placeholder="End Time...">
+                <% end %>
+            </div> 
+          <!--  <% if !@promotion.promo_end_hour.nil?%>
               <%= f.input :promo_end_hour, as: :string, input_html: {:value => @promotion.promo_end_hour.utc.strftime('%H:%M') },:class=>"form-control timepicker" %>
             <% else %>
               <%= f.input :promo_end_hour, as: :string, input_html: {},:class=>"form-control timepicker" %>
-            <% end %>
+            <% end %> -->
           </div>
         </div>
+
         <br>
         <div class="row checkboxes">
          <div class="col-md-2"><label class="control-label"><abbr title="required">*</abbr>  Promotion Day</label></div>
@@ -53,12 +93,19 @@
           <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Saturday" value="6" id="6"> Sat</label></div>
         </div>
         <br>
+
         <div class="row">
           <div class="col-md-6">
-            <%= f.input :promo_type,input_html: { class: "" },
-          collection: %w{Quantity Net_off Net_price Percentage},:class => 'form-control' ,:label => "Promotion Type" %>
+            <select name="promotion[promo_type]" class="form-control">
+                <option>Quantity</option>
+                <option>Net_off</option>
+                <option>Net_price</option>
+                <option>Percentage</option>
+            </select>
+          <!--   <%= f.input :promo_type, collection: %w{Quantity Net_off Net_price Percentage},:class => 'form-control' ,:label => "Promotion Type" %> -->
           </div>
         </div>
+
         <div class="row">
           <% arr =  MenuItem.active.order("name desc").pluck(:name,:item_code) %>
           <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
@@ -182,18 +229,31 @@ $(document).ready(function(){
   //   format:'H:m'
   // });
 
-  $('#promotion_promo_start_hour').on('change', function(event) {
-    $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00");
+  // $('#promotion_promo_start_hour').on('change', function(event) {
+  //   $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00");
+  // });
+
+  // $('#promotion_promo_end_hour').on('change', function(event) {
+  //   $('#promotion_promo_end_hour').val($('#promotion_promo_end_hour').val().split(":")[0]+":00");
+  // });
+
+  $('.datepicker').bootstrapMaterialDatePicker({
+      format: 'dddd DD MM YYYY',
+      clearButton: true,
+      weekStart: 1,
+      time: false
   });
 
-  $('#promotion_promo_end_hour').on('change', function(event) {
-    $('#promotion_promo_end_hour').val($('#promotion_promo_end_hour').val().split(":")[0]+":00");
+  $('.timepicker').bootstrapMaterialDatePicker({
+      format: 'HH:mm',
+      clearButton: true,
+      date: false
   });
 
-  var dayy = $("#promotion_promo_day").val().replace("[","").replace("]","");
-  jQuery.each( dayy.split(","), function( i, d ) {
-    $("input.selectDay[value='"+d+"']").prop( "checked", true );
-  });
+  // var dayy = $("#promotion_promo_day").val().replace("[","").replace("]","");
+  // jQuery.each( dayy.split(","), function( i, d ) {
+  //   $("input.selectDay[value='"+d+"']").prop( "checked", true );
+  // });
 
   var form = document.getElementById("new_promotion");
   var inputs = $("input");
@@ -202,7 +262,6 @@ $(document).ready(function(){
   var day = "[";
 
 $(".selectDay").click(function() {
-
       // debugger;
       day = "[";
       for (var j = 8; j <=15; j += 1){
@@ -226,6 +285,7 @@ $(".selectDay").click(function() {
 
   $("#promotion_original_product").select2();
   $(".item_code_place").select2();
+
   $(".item_code_place").on('change', function(event) {
     var ajax_url = "<%= settings_find_item_instance_path %>";
     var item_code =  this.value;
@@ -244,9 +304,12 @@ $(".selectDay").click(function() {
         }
     });
   });
+
   $(".promotion_promotion_products_item_code select").select2();
   $(".item_code_place1").select2();
+
   callforpromoproduct();
+
   $(".addProduct").on('click', function(event) {
     setTimeout(function(){
       $(".promotion_promotion_products_item_code select").select2();

From da6d85eaf57a6216bf119a34a6388202df9370c3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 25 Oct 2017 14:03:15 +0630
Subject: [PATCH 25/26] update report and inventory layout design

---
 app/assets/stylesheets/reset.css              |  15 ++
 .../reports/commission_controller.rb          |  17 +-
 .../reports/stock_check_controller.rb         |  15 +-
 .../inventory/_inventory_list.html.erb        |  78 +++----
 app/views/inventory/inventory/index.html.erb  |  57 +++--
 .../inventory_definitions/_form.html.erb      |  43 ++--
 .../inventory_definitions/new.html.erb        |   2 +-
 .../inventory/stock_checks/index.html.erb     | 162 +++++++-------
 .../inventory/stock_checks/show.html.erb      | 146 ++++++------
 .../_commission_report_filter.html.erb        |  74 ++++---
 app/views/reports/commission/index.html.erb   |   4 +-
 .../_shift_sale_report_filter.html.erb        |  83 +++----
 .../reports/credit_payment/index.html.erb     |  16 +-
 .../_shift_sale_report_filter.html.erb        |  13 +-
 app/views/reports/dailysale/index.html.erb    |  39 ++--
 .../_shift_sale_report_filter.html.erb        |  88 ++++----
 app/views/reports/receipt_no/index.html.erb   |   6 +-
 .../_shift_sale_report_filter.html.erb        | 208 +++++++++---------
 app/views/reports/saleitem/index.html.erb     |   2 +-
 .../_shift_sale_report_filter.html.erb        |  80 +++----
 app/views/reports/shiftsale/index.html.erb    |   2 +-
 .../_stock_check_report_filter.html.erb       | 123 ++++++-----
 app/views/reports/stock_check/index.html.erb  |   2 +-
 .../_shift_sale_report_filter.html.erb        |  27 +--
 config/locales/en.yml                         |   2 +-
 25 files changed, 693 insertions(+), 611 deletions(-)

diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index e79eb0b2..3fe9898f 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -198,5 +198,20 @@ section.content {
     background-color: #007d72 !important;
 }
 
+.m-t-1{
+  margin-top: 1px;
+}
+.m-t-2{
+  margin-top: 2px;
+}
+.m-t-3{
+  margin-top: 3px;
+}
+.m-t-4{
+  margin-top: 4px;
+}
+.m-t-7{
+  margin-top: 7px;
+}
 /* End Reset Theme */
 /* *************************************************** */
\ No newline at end of file
diff --git a/app/controllers/reports/commission_controller.rb b/app/controllers/reports/commission_controller.rb
index 98f98457..aeaa0a11 100755
--- a/app/controllers/reports/commission_controller.rb
+++ b/app/controllers/reports/commission_controller.rb
@@ -2,18 +2,21 @@ class Reports::CommissionController < BaseReportController
   # authorize_resource :class => false
 
   def index
-    from_date = DateTime.now.beginning_of_day.utc.getlocal
-    to_date = DateTime.now.end_of_day.utc.getlocal
-    unless params[:daterange].blank?
-      from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal
-      to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
-      @daterange = params[:daterange]
-    end
+    # from_date = DateTime.now.beginning_of_day.utc.getlocal
+    # to_date = DateTime.now.end_of_day.utc.getlocal
+    # unless params[:daterange].blank?
+    #   from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal
+    #   to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
+    #   @daterange = params[:daterange]
+    # end
+    from_date, to_date  = get_date_range_from_params
+
     commissioner = params[:commissioner].to_i
     @com_id = commissioner
     @commissioner = Commissioner.active.all
 
     @transaction = ProductCommission.get_transaction(from_date, to_date, commissioner)
+  
     @from       = from_date
     @to         = to_date
 
diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb
index c6799cb1..c9622999 100755
--- a/app/controllers/reports/stock_check_controller.rb
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -2,13 +2,14 @@ class Reports::StockCheckController < BaseReportController
   # authorize_resource :class => false
 
   def index
-    from_date = DateTime.now.beginning_of_day.utc.getlocal
-    to_date = DateTime.now.end_of_day.utc.getlocal
-    unless params[:daterange].blank?
-      from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal
-      to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
-      @daterange = params[:daterange]
-    end
+    # from_date = DateTime.now.beginning_of_day.utc.getlocal
+    # to_date = DateTime.now.end_of_day.utc.getlocal
+    # unless params[:daterange].blank?
+    #   from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal
+    #   to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
+    #   @daterange = params[:daterange]
+    # end
+    from_date, to_date  = get_date_range_from_params
     @item_code = params[:item_code]
     @inventory_definitions = InventoryDefinition.active.all
 
diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb
index 91a4ac94..bd5f5c38 100755
--- a/app/views/inventory/inventory/_inventory_list.html.erb
+++ b/app/views/inventory/inventory/_inventory_list.html.erb
@@ -1,48 +1,34 @@
 
-<div class="row">
-  <div class="col-md-8"><h2> Inventoy Product Lists</h2></div>
-  <div class="col-md-4"><button id='new_inventory_product' class='btn bg-blue waves-effect' style='margin-top:15px;'>New Inventory Product</button></div>
-</div>
+<table class="table table-striped">
+  <tr>
+    <th>#</th>
+    <th>Product</th>
+    <th>Min Order</th>
+    <th>Max Stock</th>
+    <th>Created by</th>
+    <th>Created Time</th>
+  </tr>
+  <%
+  count = 0
+  @products.each do |item|
+    count += 1
+    %>
+    <tr>
+      <td><%= count %></td>
+      <td>
+        <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
+        <% if menu_item.nil? %>
+        <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
+        <% else %>
+        <%= menu_item.menu_item.name rescue "-" %>
+        - <%= menu_item.item_instance_name rescue "-" %>
+        <% end %>
+      </td>
+      <td><%= item.min_order_level %></td>
+      <td><%= item.max_stock_level %></td>
+      <td><%= Employee.find(item.created_by).name rescue '-' %></td>
+      <td><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
+    </tr>
+    <% end %>
+  </table>
 
-<div class="row">
-  <div class="col-md-12">
-    <table class="table table-striped">
-      <tr>
-        <th>#</th>
-        <th>Product</th>
-        <th>Min Order</th>
-        <th>Max Stock</th>
-        <th>Created by</th>
-        <th>Created Time</th>
-      </tr>
-      <%
-      count = 0
-      @products.each do |item|
-      count += 1
-      %>
-        <tr>
-          <td><%= count %></td>
-          <td>
-            <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
-            <% if menu_item.nil? %>
-                <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
-            <% else %>
-                <%= menu_item.menu_item.name rescue "-" %>
-                - <%= menu_item.item_instance_name rescue "-" %>
-            <% end %>
-          </td>
-          <td><%= item.min_order_level %></td>
-          <td><%= item.max_stock_level %></td>
-          <td><%= Employee.find(item.created_by).name rescue '-' %></td>
-          <td><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
-        </tr>
-      <% end %>
-    </table>
-  </div>
-</div>
-
-<script>
-$('#new_inventory_product').on('click',function(){
-   window.location.href = '/inventory/inventory_definitions/new';
-})
-</script>
diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb
index 6149198b..ab6b3855 100755
--- a/app/views/inventory/inventory/index.html.erb
+++ b/app/views/inventory/inventory/index.html.erb
@@ -1,17 +1,48 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-lg-10 col-md-10 col-sm-10">
+<div class="page-header">
+ <ol class="breadcrumb">
+  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>">Home</a></li>
+  <li class="breadcrumb-item active">Inventory</li>
+  <span class="float-right">
+    <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+  </span>
+</ol>
+</div>
+
+
+<div class="row">
+    <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+      <div class="m-b-10 clearfix">
+          <button id="stock_check_report" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> Stock Check Report
+          </button>
+          <button id="stock_taking" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> New Stock Taking</button>
+          <button id='new_inventory_product' class='btn btn-primary  float-right waves-effect' style='margin-left:5px;'><%= t("views.btn.new") + " " + (t :inventory) %>
+         </button>     
+      </div>
+      <div class="card">
       <%= render 'inventory_list' %>
     </div>
-    <div class="col-lg-2 col-md-2 col-sm-2">
-      <% if current_login_employee.role == "administrator" || current_login_employee.role == 'manager' %>
-      <button id="back" type="button" class="btn bg-default waves-effect"> Back</button>
-      <% end %>
-      <button id="stock_taking" type="button" class="btn bg-blue waves-effect"> New Stock Taking</button>
-      <button id="stock_check_report" type="button" class="btn bg-blue waves-effect"> Stock Check Report</button>
-    </div>
+  </div>
+  <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">list BUTTON LISTS</i> </h5>
+        <p>
+        1) <%= t("views.btn.new") + " " + (t :inventory) %> - to create new inventory <br>
+        </p>
+        <p>
+        2) New Stock Taking - to create new Stock Taking <br>
+        </p>
+        <p>
+        3) Stock Check Report - to go Stock Check Report List <br>
+        </p>
+        <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
+        <p>1) Home / Back - go to dashboard</p>
+      </div>
+    </div>  
   </div>
 </div>
+
+
 <script>
   $('#stock_taking').on('click', function () {
     window.location.href = '<%= inventory_stock_checks_path %>';
@@ -21,8 +52,8 @@
     window.location.href = '<%= reports_stock_check_index_path %>';
   });
 
-  $('#back').on('click', function () {
-    window.location.href = '<%= dashboard_path %>';
-  });
+  $('#new_inventory_product').on('click',function(){
+   window.location.href = '/inventory/inventory_definitions/new';
+})
 
 </script>
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index 7a5f06ff..e7f3198d 100755
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
    <div class="p-l-10">
      <%= simple_form_for([:inventory, @inventory_definition]) do |f| %>
     <%= f.error_notification %>
@@ -10,8 +10,8 @@
         <% Product.order("name desc").pluck(:name, :item_code).each do |p| %>
             <% arr.push(p) %>
         <% end %>
-        <div class="col-md-3">
-          <label class="control-label"><abbr title="required">*</abbr> Item</label>
+        <div class="col-md-4">
+          <label class="control-label"><abbr title="required">*</abbr>Select Item</label>
           <select class="form-control item_code_place" id="item">
             <% if !@inventory_definition.item_code.nil? %>
                 <% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code) %>
@@ -21,7 +21,7 @@
                     <% code = menuiteminstance.menu_item.item_code %>
                 <% end %>
             <% end %>
-            <option value=""></option>
+            <option value="">Select Item</option>
             <% arr.each do |a| %>
                 <% if a[1] == code %>
                     <option value="<%= a[1] %>" selected><%= a[0] %></option>
@@ -48,19 +48,32 @@
     </div>
 
     <div class="form-actions">
-      <%= f.submit 'Submit', class: 'btn bg-blue waves-effect' %>
+      <%= f.submit t("views.btn.submit"), class: 'btn bg-blue waves-effect' %>
     </div>
 
 <% end %>
    </div>
     </div>
- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+ <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+         <h5><i class="material-icons md-18">list INPUT LISTS</i> </h5>
+          <p>
+          1) Select Item - select to create for new inventory <br>
+          </p>
+           <p>
+          2) Min Order Level - to write  minimun number with type Integer/Numeric <br>
+          </p>
+           <p>
+          3) Max Stock Level - to write  minimun number with type Integer/Numeric for check stock<br>
+          </p>
+          <h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
+          <p>
+          1) <%= t("views.btn.submit") %> - to create new inventory <br>
+          </p>
+          
+          <h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
+          <p>1) Home / Back - go to dashboard</p>
       </div>
     </div>  
   </div>
@@ -70,10 +83,10 @@
 <script>
 
     $(document).ready(function () {
-        $(".item_code_place").select2({
-            placeholder: 'Select Item'
-        });
-        $("select#inventory_definition_item_code").select2();
+        // $(".item_code_place").select2({
+        //     placeholder: 'Select Item'
+        // });
+        // $("select#inventory_definition_item_code").select2();
 
         $(".item_code_place").on('change', function (event) {
             var ajax_url = "<%= settings_find_item_instance_path	 %>";
@@ -90,7 +103,7 @@
                         $("select#inventory_definition_item_code").append(itemlist);
                     }
 //                    $("select#inventory_definition_item_code").append(itemlist);
-                    $("select#inventory_definition_item_code").select2();
+                    // $("select#inventory_definition_item_code").select2();
                 }
             });
         });
diff --git a/app/views/inventory/inventory_definitions/new.html.erb b/app/views/inventory/inventory_definitions/new.html.erb
index 621a2f1e..db699913 100755
--- a/app/views/inventory/inventory_definitions/new.html.erb
+++ b/app/views/inventory/inventory_definitions/new.html.erb
@@ -2,7 +2,7 @@
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item"><a href="<%= inventory_path %>">Product Inventory</a></li>
-    <li class="breadcrumb-item active">Edit</li>
+    <li class="breadcrumb-item active">New</li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %>
     </span>
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index 69af59a4..8d133815 100755
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -1,85 +1,95 @@
+<div class="page-header">
+ <ol class="breadcrumb">
+  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>">Home</a></li>
+  <li class="breadcrumb-item active">Stock Check</li>
+  <span class="float-right">
+    <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+  </span>
+</ol>
+</div>
+
+
 <div class="row">
-  <div class="col-md-6">
-    <div class="row">
-      <div class="col-md-12">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <!-- <div class="m-b-10 clearfix">
+      <%= link_to t("views.btn.new"),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+    </div -->
+    <div class="card">
+      <div class="p-l-15 p-r-15 p-t-10">
+        <div class="row">
+          <div class="col-md-6">
+                <div class="form-group">
+                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+                        <!-- <label for="remark">Remark</label> -->
+                         <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+                     <!-- <label for="password_2">Item</label> -->
+                        <select class='form-control' id='product_sku'>
+                          <option value="">Select Product</option>
+                          <% @inventory_definitions.each do |id| %>
+                          <option value="<%= id.item_code %>">
+                            <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
+                            <% if menu_item.nil? %>
+                            <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
+                            <% else %>
+                            <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                            <% end %>
+                          </option>
+                          <% end %>
+                        </select>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+                    <!-- <label for="email_address_2">Qty</label> -->
+                        <input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''/>
+                  </div>
+                </div>
+                
+                <div class="form-group">
+                  <div class="col-md-4">
+                     <button class="btn btn-primary form-control" id='save_to_stock_check'> Save</button>
+                  </div>
+                </div>
+          </div>
 
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-12">
-        <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <div class="col-md-2"></div>
-      <div class="col-md-2">
-        Item
-      </div>
-      <div class="col-md-7">
-        <select class='form-control' id='product_sku'>
-          <option value="">Select Product</option>
-          <% @inventory_definitions.each do |id| %>
-              <option value="<%= id.item_code %>">
-                <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
-                <% if menu_item.nil? %>
-                    <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
-                <% else %>
-                    <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
-                <% end %>
-              </option>
-          <% end %>
-        </select>
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <div class="col-md-2"></div>
-      <div class="col-md-2">
-        Qty
-      </div>
-      <div class="col-md-7">
-        <input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''/>
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <div class="col-md-4"></div>
-      <div class="col-md-7">
-        <button class="btn btn-primary form-control" id='save_to_stock_check'> Save</button>
+          <div class="col-md-6">
+            <table class="table table-striped" id='stock_item'>
+              <tr>
+                <!--<th>#</th>-->
+                <th>Product</th>
+                <th>Balance</th>
+                <th><button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button></th>
+              </tr>
+              <!-- <tr>
+                <td colspan="3">
+                  <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button></td>
+                </tr> -->
+              </table>
+          </div>
+          
+        </div>
       </div>
     </div>
   </div>
-
-  <div class="col-md-5">
-    <div class="row">
-      <div class="col-md-12">
-        <table class="table table-striped" id='stock_item'>
-          <tr>
-            <!--<th>#</th>-->
-            <th>Product</th>
-            <th>Balance</th>
-            <th></th>
-          </tr>
-        </table>
+  <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
+        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
       </div>
-    </div>
-  </div>
-  <div class="col-md-1">
-    <div class="row">
-      <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='back'> Back</button>
-      <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button>
-    </div>
+    </div>  
   </div>
 </div>
 
 <script>
-    $(document).ready(function () {
-        $('#product_sku').select2({
-            allowClear: true,
-            placeholder: 'Select Product'
-        })
-    });
 
     var count = 0;
 
@@ -92,8 +102,8 @@
             //+ '<td>' + count + '</td>'
             + '<td><input type=hidden value="' + product_sku + '" id="item_sku_' + count + '" name=' + count + '/>'
             + product_name + '</td>'
-            + '<td><input type=text value="' + product_qty + '" id="item_qty_' + count + '" name=' + count + '/></td>'
-            + '<td><input type=button value="X" id="item_remove_' + count + '" name=' + count + ' onclick="remove_row('+ count +')"/></td>'
+            + '<td><input type=text value="' + product_qty + '" class="form-control col-md-9" id="item_qty_' + count + '" name=' + count + '/></td>'
+            + '<td><input type=button value="X" class="btn btn-danger p-l-15 p-r-15" id="item_remove_' + count + '" name=' + count + ' onclick="remove_row('+ count +')"/></td>'
             + '</tr>';
         $('#stock_item').append(tr);
 //        $('#product_sku').val('');
@@ -124,10 +134,6 @@
         })
     });
 
-    $('#back').on('click', function () {
-        window.location.href = '/inventory';
-    });
-
     function remove_row(row) {
         $("#item_remove_"+row).parent().parent().remove();
     }
diff --git a/app/views/inventory/stock_checks/show.html.erb b/app/views/inventory/stock_checks/show.html.erb
index f4af6db0..fca98c9b 100755
--- a/app/views/inventory/stock_checks/show.html.erb
+++ b/app/views/inventory/stock_checks/show.html.erb
@@ -1,72 +1,92 @@
+<div class="page-header">
+ <ol class="breadcrumb">
+  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>">Home</a></li>
+  <li class="breadcrumb-item"><a href="<%=inventory_stock_checks_path%>"></a>Stock Check</li>
+  <li class="breadcrumb-item active">Detail</li>
+  <span class="float-right">
+    <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+  </span>
+</ol>
+</div>
+
 <div class="row">
-  <input type='hidden' id='stock_check_id' value='<%= @check.id %>'/>
-  <div class="col-md-10">
-    <div class="row">
-      <div class="col-md-2">
-        Check by
-      </div>
-      <div class="col-md-8">
-        <%= Employee.find(@check.check_by).name rescue '' %>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-2">
-        Check At
-      </div>
-      <div class="col-md-8">
-        <%= @check.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></div>
-    </div>
-    <div class="row">
-      <div class="col-md-2">
-        Reason
-      </div>
-      <div class="col-md-8">
-        <%= @check.reason %>
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <table class="table table-striped col-md-12">
-        <tr>
-          <th>#</th>
-          <th>Product</th>
-          <th>Stock Count</th>
-          <th>Stock Balance</th>
-          <th>Different</th>
-          <th>Remark</th>
-        </tr>
-        <%
-          count = 0
-          @check.stock_check_items.each do |item|
-            count += 1
-        %>
-            <tr>
-              <td><%= count %></td>
-              <td>
-                <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
-                <% if menu_item.nil? %>
-                    <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
-                <% else %>
-                    <%= menu_item.menu_item.name rescue "-" %>
-                    - <%= menu_item.item_instance_name rescue "-" %>
-                <% end %>
-              </td>
-              <td><%= item.stock_count %></td>
-              <td><%= item.stock_balance %></td>
-              <td><%= item.different %></td>
-              <td><%= item.remark %></td>
-            </tr>
-        <% end %>
-      </table>
+  <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10">
+    <div class="card">
+        <input type='hidden' id='stock_check_id' value='<%= @check.id %>'/>
+        <div class="p-l-20 p-t-15">
+           <div class="row">
+            <div class="col-md-2">
+              Check by
+            </div>
+            <div class="col-md-8">
+              <%= Employee.find(@check.check_by).name rescue '' %>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-2">
+              Check At
+            </div>
+            <div class="col-md-8">
+              <%= @check.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %>
+            </div>
+          </div>
+          <div class="row">
+              <div class="col-md-2">
+                Reason
+              </div>
+              <div class="col-md-8">
+                <%= @check.reason %>
+              </div>
+          </div>
+        </div>
+        <br>
+        <div class="table-responsive">
+              <table class="table table-striped col-md-12">
+                <tr>
+                  <th>#</th>
+                  <th>Product</th>
+                  <th>Stock Count</th>
+                  <th>Stock Balance</th>
+                  <th>Different</th>
+                  <th>Remark</th>
+                </tr>
+                <%
+                count = 0
+                @check.stock_check_items.each do |item|
+                  count += 1
+                  %>
+                  <tr>
+                    <td><%= count %></td>
+                    <td>
+                      <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
+                      <% if menu_item.nil? %>
+                      <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
+                      <% else %>
+                      <%= menu_item.menu_item.name rescue "-" %>
+                      - <%= menu_item.item_instance_name rescue "-" %>
+                      <% end %>
+                    </td>
+                    <td><%= item.stock_count %></td>
+                    <td><%= item.stock_balance %></td>
+                    <td><%= item.different %></td>
+                    <td><%= item.remark %></td>
+                  </tr>
+                  <% end %>
+                </table>
+         </div>
     </div>
   </div>
-  <div class="col-md-2">
-    <button id="back" type="button" class="btn btn-block btn-primary"> Back</button>
-    <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal</button>
-    <button id="print" type="button" class="btn btn-block btn-primary"> Print</button>
+  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
+
+      <div class="body">
+              <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal</button>
+              <button id="print" type="button" class="btn btn-block btn-primary"> Print</button>
+      </div>
+
   </div>
 </div>
 
+
 <script>
 
     $('#save_to_journal').on('click', function () {
diff --git a/app/views/reports/commission/_commission_report_filter.html.erb b/app/views/reports/commission/_commission_report_filter.html.erb
index b5791993..bb04b4f5 100755
--- a/app/views/reports/commission/_commission_report_filter.html.erb
+++ b/app/views/reports/commission/_commission_report_filter.html.erb
@@ -1,41 +1,50 @@
-
+<div class="p-l-15">
 <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
   <% if period_type != false %>
-  <div class="row">
+    <div class="row">
 
-    <div class="col-lg-2 col-md-2 col-sm-2">
-      <label class="">Select Date Range</label>
-      <% if @daterange %>
-      <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
-      <% else %>
-      <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
-      <% end %>
+        <!-- <div class="col-lg-2 col-md-2 col-sm-2">
+          <label class="">Select Date Range</label>
+          <% if @daterange %>
+          <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
+          <% else %>
+          <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
+          <% end %>
+        </div> -->
+        <div class="col-lg-3 col-md-3 col-sm-3">          
+        <!-- <label class="">Select Shift Period</label> -->
+        <label class="font-14">From</label>
+        <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+      </div>
+      <div class="col-lg-3 col-md-3 col-sm-3">
+        <label class="font-14">To</label>
+        <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+      </div>
+        <div class="col-lg-2 col-md-2 col-sm-2">
+          <label class="font-14">Commissioner</label>
+          <select class="form-control" name="commissioner" id="commissioner">
+            <option value=""></option>
+            <% @commissioner.each do |c| %>
+            <% if @com_id == c.id %>
+            <option value="<%= c.id %>" selected><%= c.name %></option>
+            <% else %>
+            <option value="<%= c.id %>"><%= c.name %></option>
+            <% end %> %>
+            <% end %>
+          </select>
+        </div>
+        <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+        <br>
+          <input type="submit" value="Generate Report" class='btn btn-info wave-effects'>
+        </div>
+        <!-- <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+          <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
+        </div> -->
     </div>
-    <div class="col-lg-2 col-md-2 col-sm-2">
-      <label class="">Commissioner</label>
-      <select class="form-control" name="commissioner" id="commissioner">
-        <option value=""></option>
-        <% @commissioner.each do |c| %>
-        <% if @com_id == c.id %>
-        <option value="<%= c.id %>" selected><%= c.name %></option>
-        <% else %>
-        <option value="<%= c.id %>"><%= c.name %></option>
-        <% end %> %>
-        <% end %>
-      </select>
-    </div>
-    <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
-      <input type="submit" value="Generate Report" class='btn btn-primary'>
-    </div>
-    <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
-      <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
-    </div>
-  </div>
   <% end %>
-
 <% end %>
-
-<script type="text/javascript">
+</div>
+<!-- <script type="text/javascript">
 
     $(document).ready(function () {
 
@@ -80,3 +89,4 @@
     });
 
 </script>
+ -->
\ No newline at end of file
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb
index 31e333f7..fd67c441 100755
--- a/app/views/reports/commission/index.html.erb
+++ b/app/views/reports/commission/index.html.erb
@@ -18,7 +18,7 @@
 <!-- <div class="container"> -->
   <!-- <div class="row"> -->
     <div class="text-right">
-      <a href="javascript:export_to('<%= reports_commission_index_path %>.xls')" class="btn btn-default">Export to
+      <a href="javascript:export_to('<%= reports_commission_index_path %>.xls')" class="btn btn-info wave-effects">Export to
         Excel</a>
     </div>
   <!-- </div> -->
@@ -30,7 +30,7 @@
       <table class="table table-striped">
         <thead>
         <tr>
-          <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
+          <th colspan="9"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
         </tr>
         <tr>
           <th>Sale</th>
diff --git a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
index 83575970..9423e4b5 100755
--- a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
@@ -1,45 +1,46 @@
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+		<% if period_type != false %>
+			<div class="row">
+				<div class="form-group col-md-2">
+					<label class="font-20">Select Period</label>
+					<select name="period" id="sel_period" class="form-control">
+						<option value="">Select Period</option>
+						<option value="0">Today</option>
+						<option value="1">Yesterday</option>
+						<option value="2">This week</option>
+						<option value="3">Last week</option>
+						<option value="4">Last 7 days</option>
+						<option value="5">This month</option>
+						<option value="6">Last month</option>
+						<option value="7">Last 30 days</option>
+						<option value="8">This year</option>
+						<option value="9">Last year</option>
+					</select>
+				</div>
 
-<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-	<% if period_type != false %>
-		<div class="row">
-			<div class="form-group col-md-2">
-				<label>Select Period</label>
-				<select name="period" id="sel_period" class="form-control">
-					<option value="">Select Period</option>
-					<option value="0">Today</option>
-					<option value="1">Yesterday</option>
-					<option value="2">This week</option>
-					<option value="3">Last week</option>
-					<option value="4">Last 7 days</option>
-					<option value="5">This month</option>
-					<option value="6">Last month</option>
-					<option value="7">Last 30 days</option>
-					<option value="8">This year</option>
-					<option value="9">Last year</option>
-				</select>
-			</div>
-
-			<div class="form-group col-md-2">					
-				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
-				<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
-			</div>
-			<div class="form-group col-md-2">
-				<label class="">To</label>
-				<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
-			</div>
-			<div class="form-group col-md-3">
-				<label class="">All Shift</label>
-				<select class="form-control select" name="shift_name" id="shift_name" >
-				</select>
-			</div>
-			<div class="form-group col-md-1 margin-top-20">
-				<input type="submit" value="Generate Report" class='btn btn-primary'>
-			</div>							
-		</div>													
-	<% end %>
-
-<% end %>		
+				<div class="form-group col-md-2">					
+					<!-- <label class="">Select Shift Period</label> -->
+					<label class="font-20">From</label>
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+				</div>
+				<div class="form-group col-md-2">
+					<label class="font-20">To</label>
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+				</div>
+				<div class="form-group col-md-3">
+					<label class="font-20">All Shift</label>
+					<select class="form-control select" name="shift_name" id="shift_name" >
+					</select>
+				</div>
+				<div class="form-group col-md-1 ">
+				<br>
+					<input type="submit" value="Generate Report" class='btn btn-primary'>
+				</div>							
+			</div>													
+		<% end %>
+	<% end %>	
+</div>	
 
 <script type="text/javascript">
 	$(function(){
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 7cc0112c..38afa734 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -1,10 +1,12 @@
 <div class="page-header">
-	<ul class="breadcrumb">
-		<li><a href="<%= dashboard_path %>">Home</a></li>
-		<li>Credit Payment List Report</li>
-	</ul>
+	<ol class="breadcrumb">
+		<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+		<li class="breadcrumb-item active">Credit Payment Report</li>
+		<span class="float-right">
+			<%= link_to 'Back', dashboard_path %>
+		</span>
+	</ol>
 </div>
-
 <!-- <div class="container"> -->
 	<%= render :partial=>'shift_sale_report_filter',
 	:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_credit_payment_index_path} %>
@@ -14,7 +16,7 @@
  <!-- <div class="container"> -->
 	<!-- <div class="row"> -->
 		<div class="text-right">
-			<a href="javascript:export_to('<%=reports_credit_payment_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+			<a href="javascript:export_to('<%=reports_credit_payment_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
 		</div>	  			
 	<!-- </div> -->
    <!--  </div>  -->
@@ -32,7 +34,7 @@
 				<% end %>		  
 				<tr>
 					<th> Shift Name </th>
-				  	<th> Receive No</th>
+				  	<th> Receipt No</th>
 				   	<th> Cashier Name</th>
 				  	<th> Customer Name</th>		   
 				  	<th> Credit Amount </th>
diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
index 1e26d28f..d2625750 100755
--- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
@@ -1,9 +1,10 @@
-
+<div class="p-l-15">
+	
 <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
 	<% if period_type != false %>
 		<div class="row">
 			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Period</label>
+				<label class="font-14">Select Period</label>
 				<select name="period" id="sel_period" class="form-control">
 					<option value="">Select Period</option>
 					<option value="0">Today</option>
@@ -22,14 +23,15 @@
 
 			<div class="col-lg-3 col-md-3 col-sm-3">					
 				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
+				<label class="font-14">From</label>
 				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
 			</div>
 			<div class="col-lg-3 col-md-3 col-sm-3">
-				<label class="">To</label>
+				<label class="font-14">To</label>
 				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
 			</div>
 			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+			    <label></label><br>
 				<input type="submit" value="Generate Report" class='btn btn-primary'>
 			</div>							
 		</div>													
@@ -84,7 +86,8 @@
 		</div>
     </div>
 				
-<% end %>		
+<% end %>	
+</div>	
 
 <script type="text/javascript">
 	$(function(){
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index c9adbe47..cc5de623 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -1,33 +1,22 @@
 
 <div class="page-header">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item active">Daily Sale Report</li>
-    <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
-    </span>
-  </ol>
+	<ol class="breadcrumb">
+		<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+		<li class="breadcrumb-item active">Daily Sale Report</li>
+		<span class="float-right">
+			<%= link_to 'Back', dashboard_path %>
+		</span>
+	</ol>
 </div>
 <div class="row">
-	<div class="col-md-12">
+	<div class="col-md-12 col-lg-12 col-sm-12 ">
 
-		<!-- <div class="row">
-			<div class="col-md-12 col-lg-12"> -->
-				<!-- <div class="container"> -->
-				<%= render :partial=>'shift_sale_report_filter',
-				:locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
-				<hr />
-				<!-- </div> -->
-		<!-- 	</div>
-		</div> -->
-
-		<!-- <div class="row"> -->
-			<!-- <div class="container"> -->
-			<div class=" text-right">
-				<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
-			</div>	  			
-			<!-- </div> -->
-		<!-- </div> -->
+		<%= render :partial=>'shift_sale_report_filter',
+		:locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
+		<hr />
+		<div class=" text-right">
+		<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
+		</div>	  			
 
 		<div class="row">
 			<div class="col-md-12 col-lg-12">
diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
index c11f98c7..1f5f4e2c 100755
--- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
@@ -1,50 +1,52 @@
-<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
 	<% if period_type != false %>
-		<div class="row">
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Period</label>
-				<select name="period" id="sel_period" class="form-control">
-					<option value="">Select Period</option>
-					<option value="0">Today</option>
-					<option value="1">Yesterday</option>
-					<option value="2">This week</option>
-					<option value="3">Last week</option>
-					<option value="4">Last 7 days</option>
-					<option value="5">This month</option>
-					<option value="6">Last month</option>
-					<option value="7">Last 30 days</option>
-					<option value="8">This year</option>
-					<option value="9">Last year</option>
-				</select>
-			</div>
-			<% if defined? payments %>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Payments</label>
-				<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
-			</div>
-			<% end %>
-			<div class="col-lg-2 col-md-2 col-sm-2">					
-				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label class="">To</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label class="">All Shift</label>
-				<select class="form-control select" name="shift_name" id="shift_name" >
-				</select>
-			</div>
-			<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
+	<div class="row">
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">Select Period</label>
+			<select name="period" id="sel_period" class="form-control">
+				<option value="">Select Period</option>
+				<option value="0">Today</option>
+				<option value="1">Yesterday</option>
+				<option value="2">This week</option>
+				<option value="3">Last week</option>
+				<option value="4">Last 7 days</option>
+				<option value="5">This month</option>
+				<option value="6">Last month</option>
+				<option value="7">Last 30 days</option>
+				<option value="8">This year</option>
+				<option value="9">Last year</option>
+			</select>
+		</div>
+		<% if defined? payments %>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">Select Payments</label>
+			<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
+		</div>
+		<% end %>
+		<div class="col-lg-2 col-md-2 col-sm-2">					
+			<!-- <label class="">Select Shift Period</label> -->
+			<label class="font-14">From</label>
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">To</label>
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">All Shift</label>
+			<select class="form-control select" name="shift_name" id="shift_name" >
+			</select>
+		</div>
+		<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
 			<br>
-				<input type="submit" value="Generate Report" class='btn btn-primary'>
-			</div>							
-		</div>													
+			<input type="submit" value="Generate Report" class='btn btn-primary'>
+		</div>							
+	</div>													
 	<% end %>
 
-<% end %>		
+	<% end %>	
+</div>	
 
 <script type="text/javascript">
 	$(function(){
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 51b66b2d..a526d205 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -19,7 +19,7 @@
 		<!-- <div class="container"> -->
 		<!-- <div class="row"> -->
 			<div class="text-right">
-				<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+				<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
 			</div>	  			
 		<!-- </div> -->
 		<!-- </div> --> 
@@ -30,14 +30,14 @@
 					<thead>
 
 						<tr>
-							<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+							<th colspan="9"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
 						</tr>
 						<% if @shift_from %>
 						<tr>
 							<% if @shift_data.employee %>		
 							<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
 							<% end %>			
-							<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+							<th colspan="9">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 						</tr>
 						<% end %>	 
 
diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
index 5436a82e..52ff9036 100755
--- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
@@ -1,130 +1,120 @@
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+	<div class="row">
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">Select Period</label>
+			<select name="period" id="sel_period" class="form-control">
+				<option value="">Select Period</option>
+				<option value="0">Today</option>
+				<option value="1">Yesterday</option>
+				<option value="2">This week</option>
+				<option value="3">Last week</option>
+				<option value="4">Last 7 days</option>
+				<option value="5">This month</option>
+				<option value="6">Last month</option>
+				<option value="7">Last 30 days</option>
+				<option value="8">This year</option>
+				<option value="9">Last year</option>
+			</select>
+		</div>
+		<!-- <input type="hidden" name="report_type" value="sale_item" id="sel_sale_type"> -->		
+		<div class="col-lg-3 col-md-3 col-sm-3">					
+			<!-- <label class="">Select Shift Period</label> -->
+			<label class="font-14">From</label>
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date">
+		</div>
+		<div class="col-lg-3 col-md-3 col-sm-3">
+			<label class="font-14">To</label>
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14">All Shift</label>
+			<select class="form-control select" name="shift_name" id="shift_name" >
+			</select>
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+			<br>
+			<input type="submit" value="Generate Report" class='btn btn-primary'>
+		</div>							
+	</div>													
+	<% end %>
 
-			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-				<% if period_type != false %>
-					<div class="row">
-						<div class="col-lg-2 col-md-2 col-sm-2">
-							<label>Select Period</label>
-							<select name="period" id="sel_period" class="form-control">
-							   <option value="">Select Period</option>
-								<option value="0">Today</option>
-								<option value="1">Yesterday</option>
-								<option value="2">This week</option>
-								<option value="3">Last week</option>
-								<option value="4">Last 7 days</option>
-								<option value="5">This month</option>
-								<option value="6">Last month</option>
-								<option value="7">Last 30 days</option>
-								<option value="8">This year</option>
-								<option value="9">Last year</option>
-							</select>
-						</div>
-						<!-- <input type="hidden" name="report_type" value="sale_item" id="sel_sale_type"> -->
-						<!-- <div class="form-group col-md-2">
-							<label>Select Type</label>
-							<select name="sale_type" id="sel_sale_type" class="form-control">
-								<option value="0">All Sale Type</option>
-								<option value="1">Revenue Only</option>
-								<option value="2">Discount Only</option>
-								<option value="3">Void Only</option>
-								<option value="4">Taxes Only</option>
-								<option value="5">Other Amount Only</option>
-							</select>
-						</div> -->
-						<div class="col-lg-3 col-md-3 col-sm-3">					
-							<!-- <label class="">Select Shift Period</label> -->
-				  			<label class="">From</label>
-							<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
-						</div>
-						<div class="col-lg-3 col-md-3 col-sm-3">
-							<label class="">To</label>
-							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
-						</div>
-						<div class="col-lg-2 col-md-2 col-sm-2">
-						<label class="">All Shift</label>
-							<select class="form-control select" name="shift_name" id="shift_name" >
-							</select>
-						</div>
-						<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
-						    <br>
-							<input type="submit" value="Generate Report" class='btn btn-primary'>
-						</div>							
-					</div>													
-				<% end %>
-				
-			<% end %>		
+	<% end %>	
+</div>	
 
 <script type="text/javascript">
-$(function(){
-	$('#custom_excel').hide();
-	
-	$('#custom_excel').click(function(){
-		var url = $('#custom_excel').attr('data-url');
-		$('#frm_report').attr('action',url)
-		$('#frm_report').submit();
+	$(function(){
+		$('#custom_excel').hide();
+
+		$('#custom_excel').click(function(){
+			var url = $('#custom_excel').attr('data-url');
+			$('#frm_report').attr('action',url)
+			$('#frm_report').submit();
 		// window.location = url;
 	});
-	
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-	
-	if(item == 'order'){
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}		
-	}
-	else if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();
-	}
-	else{
-		$('#waiter').hide();
-		$('#cashier').show();		
-		$("#item").val('sale');
-	}
-});
 
- <% if params[:shift_name].to_i > 0%>
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+
+		if(item == 'order'){
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}		
+		}
+		else if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();
+		}
+		else{
+			$('#waiter').hide();
+			$('#cashier').show();		
+			$("#item").val('sale');
+		}
+	});
+
+	<% if params[:shift_name].to_i > 0%>
 	shift_id = '<%= params[:shift_name] %>'
 	local_date = '<%= @shift_from %> - <%= @shift_to %> '
 	var shift = $('#shift_name');
 	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
 	shift.append(str);
-<% end %>
+	<% end %>
 
- $("#from").val("<%=params[:from] rescue '-'%>");
- $("#to").val("<%=params[:to] rescue '-'%>");
-  $("#sel_period").val(<%=params[:period] rescue '-'%>);
- $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+	$("#from").val("<%=params[:from] rescue '-'%>");
+	$("#to").val("<%=params[:to] rescue '-'%>");
+	$("#sel_period").val(<%=params[:period] rescue '-'%>);
+	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
 
 
-<% if params[:period_type] == 1 || params[:period_type] == "1" %>
+	<% if params[:period_type] == 1 || params[:period_type] == "1" %>
 	$("#rd_period_type_1").attr("checked","checked");
-<% else %>
+	<% else %>
 	$("#rd_period_type_0").attr("checked","checked");
-<% end %>
-$(".btn-group button").removeClass("active");
-<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
-$("#btn_report_type_<%= report_type %>").addClass("active");
+	<% end %>
+	$(".btn-group button").removeClass("active");
+	<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+	$("#btn_report_type_<%= report_type %>").addClass("active");
 
-$('#item').change(function(){
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
+	$('#item').change(function(){
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
 
-	if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();		
-		if(payment_type){
-			$('#payment_type').show();
+		if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();		
+			if(payment_type){
+				$('#payment_type').show();
+			}
 		}
-	}
-	else{
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
+		else{
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}
 		}
-	}
-});
+	});
 </script>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index ced2cc17..485ea3ed 100755
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -20,7 +20,7 @@
 		<!-- <div class="container"> -->
 		<!-- <div class="row"> -->
 			<div class="text-right">
-				<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+				<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-info wave-effects ">Export to Excel</a>
 			</div>	  			
 		<!-- </div> -->
 		<!-- </div> -->
diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
index e83183ba..5e44051e 100755
--- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
@@ -1,44 +1,44 @@
-
-<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-	<% if period_type != false %>
-		<div class="row">
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Period</label>
-				<select name="period" id="sel_period" class="form-control">
-					<option value="0">Today</option>
-					<option value="1">Yesterday</option>
-					<option value="2">This week</option>
-					<option value="3">Last week</option>
-					<option value="4">Last 7 days</option>
-					<option value="5">This month</option>
-					<option value="6">Last month</option>
-					<option value="7">Last 30 days</option>
-					<option value="8">This year</option>
-					<option value="9">Last year</option>
-				</select>
-			</div>
-			
-			<div class="col-lg-3 col-md-3 col-sm-3">					
-				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
-			</div>
-			<div class="col-lg-3 col-md-3 col-sm-3">
-				<label class="">To</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label class="">All Shift</label>
-				<select class="form-control select" name="shift_name" id="shift_name" >
-				</select>
-			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20"><br>
-				<input type="submit" value="Generate Report" class='btn btn-primary'>
-			</div>							
-		</div>													
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+		<% if period_type != false %>
+			<div class="row">
+				<div class="col-lg-2 col-md-2 col-sm-2">
+					<label class="font-14">Select Period</label>
+					<select name="period" id="sel_period" class="form-control">
+						<option value="0">Today</option>
+						<option value="1">Yesterday</option>
+						<option value="2">This week</option>
+						<option value="3">Last week</option>
+						<option value="4">Last 7 days</option>
+						<option value="5">This month</option>
+						<option value="6">Last month</option>
+						<option value="7">Last 30 days</option>
+						<option value="8">This year</option>
+						<option value="9">Last year</option>
+					</select>
+				</div>
+				
+				<div class="col-lg-3 col-md-3 col-sm-3">					
+					<!-- <label class="font-14">Select Shift Period</label> -->
+					<label class="font-14">From</label>
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+				</div>
+				<div class="col-lg-3 col-md-3 col-sm-3">
+					<label class="font-14">To</label>
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+				</div>
+				<div class="col-lg-2 col-md-2 col-sm-2">
+					<label class="font-14">All Shift</label>
+					<select class="form-control select" name="shift_name" id="shift_name" >
+					</select>
+				</div>
+				<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20"><br>
+					<input type="submit" value="Generate Report" class='btn btn-primary'>
+				</div>							
+			</div>													
+		<% end %>
 	<% end %>
-
-<% end %>		
+</div>		
 
 
 <script type="text/javascript">
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 8a3f4339..3b37708a 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -19,7 +19,7 @@
 		<!-- <div class="container"> -->
 			<!-- <div class="row"> -->
 			<div class="text-right">
-					<a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+					<a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
 				</div>	  			
 			<!-- </div> -->
 		<!-- </div> -->
diff --git a/app/views/reports/stock_check/_stock_check_report_filter.html.erb b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
index 01850483..b7bb304d 100755
--- a/app/views/reports/stock_check/_stock_check_report_filter.html.erb
+++ b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
@@ -1,86 +1,95 @@
-
+<div class="p-l-15">
     <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
-        <% if period_type != false %>
-            <div class="row">
+    <% if period_type != false %>
+    <div class="row">
 
-              <div class="form-group col-md-3">
+              <!-- <div class="form-group col-md-3">
                 <label class="">Select Date Range</label>
                 <% if @daterange %>
                     <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
                 <% else %>
                     <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
                 <% end %>
-              </div>
-              <div class="form-group col-md-4">
-                <label class="">Definition Item</label>
+            </div> -->
+            <div class="col-lg-3 col-md-3 col-sm-3">          
+                <!-- <label class="">Select Shift Period</label> -->
+                <label class="font-14">From</label>
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+            </div>
+            <div class="col-lg-3 col-md-3 col-sm-3">
+                <label class="font-14">To</label>
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+            </div>
+            <div class="form-group col-md-4">
+                <label class="font-14">Definition Item</label>
                 <select class="form-control" name="item_code" id="item_code">
                   <option value="">Select Product</option>
                   <% @inventory_definitions.each do |id| %>
-                      <option value="<%= id.item_code %>">
-                        <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
-                        <% if menu_item.nil? %>
-                            <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
-                        <% else %>
-                            <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
-                        <% end %>
-                      </option>
-                  <% end %>
-                </select>
-              </div>
-              <div class="form-group col-md-2 margin-top-20">
-                <input type="submit" value="Generate Report" class='btn btn-primary'>
-              </div>
-              <div class="form-group col-md-2 margin-top-20">
+                  <option value="<%= id.item_code %>">
+                    <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
+                    <% if menu_item.nil? %>
+                    <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
+                    <% else %>
+                    <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                    <% end %>
+                </option>
+                <% end %>
+            </select>
+        </div>
+        <div class="form-group col-md-2 margin-top-20"><br>
+            <input type="submit" value="Generate Report" class='btn btn-primary'>
+        </div>
+              <!-- <div class="form-group col-md-2 margin-top-20">
                 <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
-              </div>
-            </div>
+            </div> -->
+        </div>
         <% end %>
 
-    <% end %>
-
+        <% end %>
+    </div>
 
 <script type="text/javascript">
 
     $(document).ready(function () {
 
-        $('#item_code').select2({
+       /* $('#item_code').select2({
             placeholder: 'Select Product',
             allowClear: true
-        });
+        });*/
 
-        $('#clear_filter').click(function () {
-            $('#daterange').val('');
-            $('#item_code').val('').text('');
-        });
+        // $('#clear_filter').click(function () {
+        //     $('#daterange').val('');
+        //     $('#item_code').val('').text('');
+        // });
 
-        $('input[name="daterange"]').daterangepicker({
-                autoUpdateInput: false,
-                ranges: {
-                    'Today': [moment(), moment()],
-                    'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-                    'Last 7 Days': [moment().subtract(6, 'days'), moment()],
-                    'Last 30 Days': [moment().subtract(29, 'days'), moment()],
-                    'This Month': [moment().startOf('month'), moment().endOf('month')],
-                    'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
-                },
-                locale: {
-                    format: 'YYYY-MM-DD'
-                }
-            },
-            function (start, end, label) {
-                $('input[name="daterange"]').val(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
-            });
+        // $('input[name="daterange"]').daterangepicker({
+        //         autoUpdateInput: false,
+        //         ranges: {
+        //             'Today': [moment(), moment()],
+        //             'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+        //             'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+        //             'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+        //             'This Month': [moment().startOf('month'), moment().endOf('month')],
+        //             'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+        //         },
+        //         locale: {
+        //             format: 'YYYY-MM-DD'
+        //         }
+        //     },
+        //     function (start, end, label) {
+        //         $('input[name="daterange"]').val(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
+        //     });
 
-        $('input[name="daterange"]').on('apply.daterangepicker', function (ev, picker) {
-            $('input[name="daterange"]').val(picker.startDate.format('YYYY-MM-DD') + ' - ' + picker.endDate.format('YYYY-MM-DD'));
+        // $('input[name="daterange"]').on('apply.daterangepicker', function (ev, picker) {
+        //     $('input[name="daterange"]').val(picker.startDate.format('YYYY-MM-DD') + ' - ' + picker.endDate.format('YYYY-MM-DD'));
 
-            from_date = picker.startDate.format('YYYY-MM-DD 00:00:00');
-            to_date = picker.endDate.format('YYYY-MM-DD 23:59:59');
-        });
+        //     from_date = picker.startDate.format('YYYY-MM-DD 00:00:00');
+        //     to_date = picker.endDate.format('YYYY-MM-DD 23:59:59');
+        // });
 
-        $('input[name="daterange"]').on('cancel.daterangepicker', function (ev, picker) {
-            $('input[name="daterange"]').val('');
-        });
+        // $('input[name="daterange"]').on('cancel.daterangepicker', function (ev, picker) {
+        //     $('input[name="daterange"]').val('');
+        // });
 
     });
 
diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb
index 4de80a59..0230e54a 100755
--- a/app/views/reports/stock_check/index.html.erb
+++ b/app/views/reports/stock_check/index.html.erb
@@ -19,7 +19,7 @@
     <!-- <div class="container"> -->
     <!-- <div class="row"> -->
     <div class="text-right">
-      <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-default">Export to
+      <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-info wave-effects">Export to
         Excel</a>
       </div>
       <!-- </div> -->
diff --git a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
index f9801429..bdce131e 100755
--- a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
@@ -1,9 +1,9 @@
-
+<div class="p-l-15">
 <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
 	<% if period_type != false %>
 		<div class="row">
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label>Select Period</label>
+			<div class="form-group col-lg-2 col-md-2 col-sm-2">
+				<label class="font-20">Select Period</label>
 				<select name="period" id="sel_period" class="form-control">
 					<option value="">Select Period</option>
 					<option value="0">Today</option>
@@ -19,27 +19,28 @@
 				</select>
 			</div>
 
-			<div class="col-lg-2 col-md-2 col-sm-2">					
+			<div class="form-group col-lg-2 col-md-2 col-sm-2">					
 				<!-- <label class="">Select Shift Period</label> -->
-				<label class="">From</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
+				<label class="font-20">From</label>
+				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
 			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label class="">To</label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
+			<div class="form-group col-lg-2 col-md-2 col-sm-2">
+				<label class="font-20">To</label>
+				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
 			</div>
-			<div class="col-lg-3 col-md-3 col-sm-3">
-				<label class="">All Shift</label>
+			<div class="form-group col-lg-3 col-md-3 col-sm-3">
+				<label class="font-20">All Shift</label>
 				<select class="form-control select" name="shift_name" id="shift_name" >
 				</select>
 			</div>
-			<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
+			<div class=" col-lg-1 col-md-1 col-sm-1 margin-top-20">
+			<br>
 				<input type="submit" value="Generate Report" class='btn btn-primary'>
 			</div>							
 		</div>													
 	<% end %>
 <% end %>
-
+</div>
 <script type="text/javascript">
 	$(function(){
 		$('#custom_excel').hide();
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 56843505..249900ef 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -36,7 +36,7 @@ en:
   category: "Category"
   processed: "Processed"
   competed: "Completed"
-  tax_profile: "Tad Profile"
+  tax_profile: "Tax Profile"
   payment_methods: "Payment Methods"
   accounts: "Accounts"
 

From fa5b544416cedf7378116cdae86eb63c2773c75f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 25 Oct 2017 15:06:28 +0630
Subject: [PATCH 26/26] update site bar and credit note view in transaction

---
 app/views/layouts/_left_sidebar.html.erb      | 32 +++++++--
 .../transactions/credit_notes/index.html.erb  | 68 +++++++++++--------
 app/views/transactions/sales/show.html.erb    |  7 +-
 config/locales/en.yml                         |  2 +
 config/locales/mm.yml                         |  2 +
 5 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index bf91713e..76d51afc 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -153,12 +153,8 @@
 					<span><%= t :printer %></span>
 				</a>
 			</li>
-			<li>
-				<a href="<%= settings_products_path %>">
-					<i class="material-icons col-brown">donut_large</i>
-					<span><%= t :products %></span>
-				</a>
-			</li>
+			
+
 			<li>
 				<a href="<%= settings_tax_profiles_path %>">
 					<i class="material-icons col-green">donut_large</i>
@@ -177,6 +173,30 @@
 					<span><%= t :accounts %></span>
 				</a>
 			</li>
+			<li>
+				<a href="<%= settings_products_path %>">
+					<i class="material-icons col-brown">donut_large</i>
+					<span><%= t :products %></span>
+				</a>
+			</li>
+			<li>
+				<a href="<%= settings_promotions_path %>">
+					<i class="material-icons col-red">donut_large</i>
+					<span><%= t :promotions %></span>
+				</a>
+			</li>
+			<li>
+				<a href="<%= settings_commissions_path %>">
+					<i class="material-icons col-green">donut_large</i>
+					<span><%= t :commissions %></span>
+				</a>
+			</li>
+			<li>
+				<a href="<%= settings_commissioners_path %>">
+					<i class="material-icons col-teal">donut_large</i>
+					<span><%= t :commissioners %></span>
+				</a>
+			</li>
 		</ul>
 	</div>
 	<!-- #Menu -->
diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb
index 451b4eb3..3250fd2d 100755
--- a/app/views/transactions/credit_notes/index.html.erb
+++ b/app/views/transactions/credit_notes/index.html.erb
@@ -1,4 +1,4 @@
-<div class="row">
+<!-- <div class="row">
   <div class="col-lg-12">
     <ol class="breadcrumb">
        <li><a href="<%= crm_root_path %>">Home</a></li>
@@ -8,44 +8,54 @@
        
     </ol>
   </div>
+</div> -->
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item active">Credit Note</li>
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ol>
 </div>
-
 <div class="row">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
       <div class="main-box-body clearfix p-l-5 p-r-5">
         <div class="table-responsive">
           <table class="table table-">
-            <theadtbody>
+            <tbody>
                <tr>
                  <td colspan="">
                     <%= form_tag transactions_credit_notes_path, :method => :get do %>
-                       <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-                         <label>Enter Keywords</label>
-                         <input type="text" name="receipt_no" class="form-control" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
+                       <div class="row clearfix">
+                         <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+                           <label class="font-14">Enter Keywords</label>
+                           <input type="text" name="receipt_no" class="form-control m-t-3" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
+                         </div>
+                         <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                          <label class="font-14">Select Customer</label>
+                           <select class="selectpicker form-control col-md-12 " name="customer"  style="height: 40px" >
+                            <option value="">Select Customer</option>
+                              <%  @customers.each do |customer| %>
+                                 <option value="<%= customer.customer_id %>">
+                                <%= customer.name %></option>
+                              <%end %>
+                            </select>   
+                        </div>
+                         <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                           <label class="font-14">From</label>
+                           <input class="form-control datepicker m-t-3" name="from" id="date" type="text" placeholder="From date">
+                        </div>
+                        <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                          <label class="font-14">To</label>
+                          <input class="form-control datepicker m-t-3" name="to" id="date" type="text" placeholder="To date">
+                        </div>
+                        
+                        <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
+                          <label class="font-14"> &nbsp;</label><br>
+                          <input type="submit" value="Search" class='btn btn-primary btn-md'>
+                        </div>
                        </div>
-                       <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                        <label>Select Customer</label>
-                         <select class="selectpicker form-control col-md-12" name="customer"  style="height: 40px" >
-                          <option value="">Select Customer</option>
-                            <%  @customers.each do |customer| %>
-                               <option value="<%= customer.customer_id %>">
-                              <%= customer.name %></option>
-                            <%end %>
-                          </select>   
-                      </div>
-                       <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                         <label class="">From</label>
-                         <input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date">
-                      </div>
-                      <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                        <label class="">To</label>
-                        <input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date">
-                      </div>
-                      
-                     <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
-                        <label> &nbsp;</label>
-                        <input type="submit" value="Search" class='btn btn-primary btn-md'>
-                      </div>
                     <% end %>
                   </td>
                </tr>
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 13ecd291..4aa9a4b8 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -36,9 +36,7 @@
                 <div class="table-responsive">
                     <table class="table table-striped">
                       <thead>
-                        <tr>
-                          <td colspan="6">&nbsp;</td>
-                        </tr>
+                       
                         <tr>
                           <th>Receipt Date </th>
                           <th>Receipt no</th>
@@ -129,9 +127,6 @@
                 <div class="table-responsive">
                     <table class="table table-striped">
                       <thead>
-                        <tr>
-                          <td colspan="8">&nbsp;</td>
-                        </tr>
                         <tr>
                           <th>Order ID</th>
                           <th>Menu Item</th>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 249900ef..6f51a9ac 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -20,6 +20,8 @@ en:
   staff: "Staff"
   products: "Products"
   promotions: "Promotions"
+  commissions: "Commissions"
+  commissioners: "Commissioners"
   printer: "Printer"
   logout: "Logout"
   sale: "Sale"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 22b8722e..52faa938 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -20,6 +20,8 @@ mm:
   staff: "၀န်ထမ်းများ"
   products: "ကုန်စည်များ"
   promotions: "အရောင်းမြှင့်တင်ရေး"
+  commissions: "ကော်မရှင်များ"
+  commissioners: "ကော်မရှင်များ"
   printer: "ပရင့်တာ"
   logout: "ထွက်ရန်"
   sale: "အရောင်း"