diff --git a/.gitignore b/.gitignore
index 6e0c5583..4f0ac524 100755
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ pickle-email-*.html
 .rbenv-version
 config/deploy/config/*
 config/puma.rb
+config/shops.json
 !/log/.keep
 !/tmp/.keep
 .ruby-version
diff --git a/Gemfile b/Gemfile
index 1432e3af..de22a68c 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-
+ruby '2.4.0'
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
@@ -89,10 +89,10 @@ gem 'cancancan', '~> 1.10'
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
-group :development, :test do
+#group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platform: :mri
-end
+#  gem 'byebug', platform: :mri
+#end
 
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
@@ -103,6 +103,10 @@ group :development do
   gem 'spring-watcher-listen', '~> 2.0.0'
   gem 'rspec-rails', '~> 3.5'
   gem 'schema_to_scaffold'
+  gem 'capistrano'
+  gem 'capistrano-bundler'
+  gem 'capistrano-rails'
+  gem 'capistrano-rbenv', github: "capistrano/rbenv"
 end
 
 group :test do
@@ -122,4 +126,4 @@ gem 'momentjs-rails' # for date-range selector
 # gem 'bootstrap-datepicker-rails' # date picker
 # gem 'jquery-datetimepicker-rails'
 # gem 'select2-rails' # for multi-select and auto-complete select box
-gem "chartkick" #chart lib
\ No newline at end of file
+gem "chartkick" #chart lib
diff --git a/Gemfile.lock b/Gemfile.lock
index d29f4058..b7804803 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/capistrano/rbenv.git
+  revision: c029e4128e4a8f25adda35795f5729bd4f62e51f
+  specs:
+    capistrano-rbenv (2.1.3)
+      capistrano (~> 3.1)
+      sshkit (~> 1.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -39,12 +47,24 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     aescrypt (1.0.0)
+    airbrussh (1.3.0)
+      sshkit (>= 1.6.1, != 1.7.0)
     arel (8.0.0)
     bcrypt (3.1.11)
     bindex (0.5.0)
     builder (3.2.3)
-    byebug (9.1.0)
     cancancan (1.17.0)
+    capistrano (3.10.1)
+      airbrussh (>= 1.0.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (>= 1.9.0)
+    capistrano-bundler (1.3.0)
+      capistrano (~> 3.1)
+      sshkit (~> 1.2)
+    capistrano-rails (1.3.1)
+      capistrano (~> 3.1)
+      capistrano-bundler (~> 1.1)
     carrierwave (1.2.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
@@ -128,6 +148,9 @@ GEM
     multi_xml (0.6.0)
     mysql2 (0.4.9)
     nested_form (0.3.2)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (4.2.0)
     nio4r (2.1.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
@@ -228,6 +251,9 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sshkit (1.15.1)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
     tether-rails (1.4.0)
       rails (>= 3.1)
     thor (0.20.0)
@@ -260,8 +286,11 @@ PLATFORMS
 DEPENDENCIES
   aescrypt
   bcrypt (~> 3.1.7)
-  byebug
   cancancan (~> 1.10)
+  capistrano
+  capistrano-bundler
+  capistrano-rails
+  capistrano-rbenv!
   carrierwave (~> 1.0)
   chartkick
   coffee-rails (~> 4.2)
@@ -306,5 +335,8 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   whenever
 
+RUBY VERSION
+   ruby 2.4.0p0
+
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/README.md b/README.md
index ef68d0b7..5ff1aeda 100755
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ ruby 2.4.1p111
 		
 	    Campaign Id       => {"campaign_type_id": 1}
 
-
+java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
 * ToDo list
 
diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index f7d517ea..6068b53f 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -61,11 +61,11 @@ $(document).on('turbolinks:load', function() {
 	            if (data[field]["options"] == "[]" || data[field]["options"] == "") {
 	             var options = "";
 	            }else{
-	             var options = data.options;
+	             var options = data[field]["options"];
 	            }
 
 	            var date = new Date(data[field]["created_at"]); 
-	            var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+	            var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
 	             
 	            row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
@@ -80,7 +80,7 @@ $(document).on('turbolinks:load', function() {
 	                          +'<span class="order-qty"> [x'+ data[field]["qty"] +'] </span>'
 	                         +'</p>'
 
-	                        +'<p class="card-text item-options">'+ options +'</p>'
+	                        +'<br/><p class="card-text item-options">'+ options +'</p>'
 
 	                        +'<span class="card-text">'
 	                          +'<span class="text-muted">Order at - '
@@ -223,8 +223,9 @@ $(document).on('turbolinks:load', function() {
   		var params = { 'options':options };
 
   		$.ajax({
-			type: 'GET',
+			type: 'POST',
 	     	url: '/oqs/print/print/'+assigned_item_id,
+	     	data: params,
 	     	success: function(data){	}
   		});
   	});
@@ -243,21 +244,4 @@ $(document).on('turbolinks:load', function() {
 	     	success: function(data){	}
   		});
   	});
-
-	// Qty update for OQS Edit Controller
-	$('#qty-update').on('click', function(){
-		var qty_weight = $("input[name='qty_weight']").val();
-		var remarks = $("textarea[name='remarks']").val();
-		var order_items_id = $(this).attr('data-id');
-		var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks }
-		$.ajax({
-			type: 'POST',
-			url: '/oqs/' + order_items_id,
-			data: params,
-			success: function(result){
-				alert("Updated!");
-				window.location.href = '/oqs';
-			}
-		});
-	});
 });
diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 427f9e7b..d8608481 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -73,8 +73,9 @@ $(function() {
   }
   //end show list function
   //click menu sidebar menu category
-  $(".menu_category").on("click", function(){
-    var menu_id = $(this).find(".menu-id").text();
+  // $(".menu_category").on("click", function(){
+  $(document).on('click', '.menu_category', function(event){
+    var menu_id = $(this).attr("data-id");
     var url = "get_menu_category/"+menu_id;
     show_menu_item_list(url); 
   }); 
@@ -525,7 +526,7 @@ $(function() {
       }
     });
     if (active) {
-      $(this).revoveClass('selected-option');
+      $(this).removeClass('selected-option');
     }else{
       $(this).addClass('selected-option');
     }
@@ -855,12 +856,12 @@ $(function() {
 
     $('#'+minus).on("click", function(){
 
-      var count   = parseInt($('#'+id).val());
-      var countEl = document.getElementById(id);
+      // var count   = parseInt($('#'+id).val());
+      // var countEl = document.getElementById(id);
       
       if (count > 1) {
         count--;
-         countEl.value = count;
+        $('#'+id).val(count);
 
         if (id=="count") {
           price = $("#unit_price").text();
@@ -918,6 +919,47 @@ $(function() {
         }
     });
 
+   //click menu sidebar menu category
+
+  $(".sub_click").on("click", function(){
+    var menu_id = $(this).attr("data-id");
+    var url = "get_menu_sub_category/"+menu_id;
+    sub_category = $(this).find('.sub_category_list');
+    show_sub_category_list(url,sub_category); 
+  }); 
+  //End menu category Click
+
+  //show menu item list when click menu category
+  function show_sub_category_list(url,sub_category){ 
+
+    var menu_list = $('.sub_category_list');
+    menu_list.empty();
+    //Start Ajax
+    $.ajax({      
+      type: "GET",         
+      url: url, 
+      data: {},
+      dataType: "json",
+      success: function(data) {
+        var sub_category_list = $('.sub_category_list');
+        sub_category_list.empty();
+        data = data.sub_category;
+
+        if (data.length>0) {
+          $(sub_category).removeClass('hidden');
+        for(var i in data) { 
+
+              row = '<li class="menu_category fadeInTop animated" data-id="'+data[i].id+'">'
+                       +'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ data[i].name+'</a>'
+                     +'</li>' ; 
+              $(sub_category).append(row);
+          //end is_sub_item false
+        }
+        }
+      }
+    });
+    //end Ajax 
+  }
  /*  $("input").keypress(function(){
     $("span").text(i += 1);
 });*/
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 92fab4ab..76341958 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -62,9 +62,6 @@ $(document).ready(function() {
       clearButton: true,
       date: false
   });
-
-  // first input focus for all form
-  $("body").has("form").find("input:first").focus();
   
   // Image Upload
   $("#simple_menu_item_image_path").fileinput({
@@ -107,6 +104,9 @@ $(document).ready(function() {
     }
   });
 
+  // first input focus for all form
+  $('form:first *input[data-behaviour!=datepicker]:input[type!=hidden]:first').focus();
+
 // $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
 //   $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
 //   $('.dropdown-toggle').dropdown();
diff --git a/app/assets/javascripts/channels/bill.js b/app/assets/javascripts/channels/bill.js
index ab8e0898..b4016b1c 100755
--- a/app/assets/javascripts/channels/bill.js
+++ b/app/assets/javascripts/channels/bill.js
@@ -5,10 +5,15 @@ App.order = App.cable.subscriptions.create('BillChannel', {
 
   disconnected: function() {},
 
-  received: function(data) {                 
-     $('.table_'+data.table.id).removeClass('blue');
-     $('.table_'+data.table.id).addClass('red');
-     $('.new_text_'+data.table.id).removeClass('hide')
+  received: function(data) { 
+  	if($('.table_'+data.table.id).hasClass('blue')){
+  		$('.table_'+data.table.id).removeClass('blue');
+     	$('.table_'+data.table.id).addClass('red');
+  	}else{
+  		$('.table_'+data.table.id).removeClass('orange');
+     	$('.table_'+data.table.id).addClass('red');
+  	} 
+    $('.new_text_'+data.table.id).removeClass('hide');
  }
 });
 
diff --git a/app/assets/javascripts/channels/call_waiter.js b/app/assets/javascripts/channels/call_waiter.js
new file mode 100644
index 00000000..941a6359
--- /dev/null
+++ b/app/assets/javascripts/channels/call_waiter.js
@@ -0,0 +1,61 @@
+App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
+//  App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {                 
+   table = data.table
+   
+    // for Notificaiotn message
+    var element        = "#notify-wrapper"
+    var placementFrom  = "top";
+    var placementAlign = "center";
+    var animateEnter   = "";
+    var animateExit    = "";
+    var colorName      = "alert-warning";
+    var text           = " Calling Waiter <br>  "+table.name ;
+
+    if (text != null || colorName != null){
+     showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
+   }
+
+   function showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
+    if (colorName === null || colorName === '') { colorName = 'bg-black'; }
+    if (animateEnter === null || animateEnter === '') { animateEnter = 'animated fadeInDown'; }
+    if (animateExit === null || animateExit === '') { animateExit = 'animated fadeOutUp'; }
+    var allowDismiss = true;
+
+    $.notify({
+      message: text
+    },
+    {
+      element: element,
+      type: colorName,
+      allow_dismiss: allowDismiss,
+      timer: 200000000000000,
+      placement: {
+        from: placementFrom,
+        align: placementAlign
+      },
+      animate: {
+        enter: animateEnter,
+        exit: animateExit
+      },
+      template: '<div data-notify="container" style="width:180px !important;" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
+      '<button type="button" aria-hidden="true" class="close notify-close float-right m-l-5 m-t--5" data-notify="dismiss">×</button>' +
+      '<span data-notify="icon"></span> ' +
+      '<span data-notify="title">{1}</span> ' +
+      '<span data-notify="message">{2}</span>' +
+      '<div class="progress" data-notify="progressbar">' +
+      '<div class="progress-bar progress-bar-{0}" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div>' +
+      '</div>' +
+      '<a href="{3}" target="{4}" data-notify="url"></a>' +
+      '</div>'
+    });
+  }
+  //end Notificaiotn message
+}
+});
+
diff --git a/app/assets/javascripts/channels/check_in_booking.js b/app/assets/javascripts/channels/check_in_booking.js
new file mode 100644
index 00000000..18597f4d
--- /dev/null
+++ b/app/assets/javascripts/channels/check_in_booking.js
@@ -0,0 +1,16 @@
+App.checkin = App.cable.subscriptions.create('CheckInBookingChannel', {
+//	App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {    
+  	if($('.table_'+data.table.id).hasClass('green')){
+  		$('.table_'+data.table.id).removeClass('green');
+	    $('.table_'+data.table.id).addClass('blue');
+  	} 
+  	$('.new_text_'+data.table.id).removeClass('hide');
+ }
+});
+
diff --git a/app/assets/javascripts/channels/checkin.js b/app/assets/javascripts/channels/checkin.js
new file mode 100644
index 00000000..03159170
--- /dev/null
+++ b/app/assets/javascripts/channels/checkin.js
@@ -0,0 +1,26 @@
+App.order = App.cable.subscriptions.create('CheckinChannel', {
+//	App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {        	
+	$.each(data.table,function(key,value){      
+		if($('.table_'+value.table_id).hasClass('blue')){
+			$('.table_'+value.table_id).removeClass('blue');
+	    	$('.table_'+value.table_id).addClass('orange');
+		}
+		else if($('.table_'+value.table_id).hasClass('red')){
+			$('.table_'+value.table_id).removeClass('red');
+	    	$('.table_'+value.table_id).addClass('orange');
+		}
+	    else {
+	        $('.table_'+value.table_id).removeClass('green');
+	        $('.table_'+value.table_id).addClass('orange');
+	   	}
+		$('.new_text_'+value.table_id).removeClass('hide');
+	});  		  
+ }
+});
+
diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js
index 4e169f19..d2b502d4 100755
--- a/app/assets/javascripts/channels/order_queue_station.js
+++ b/app/assets/javascripts/channels/order_queue_station.js
@@ -14,7 +14,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
   		if (items[field]["options"] == "[]" || items[field]["options"] == "") {
   			var options = "";
   		}else{
-  			var options = items.options;
+  			var options = items[field]["options"];
   		}
   		//for count
   		test = document.getElementsByClassName("oqs_count");
@@ -30,7 +30,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
         //end count
 
   		var date = new Date(items[field]["created_at"]); 
-  		var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+  		var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
 
   		if (oqs_id == items[field]["order_queue_station_id"]) {
 
@@ -49,7 +49,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
            +'<span class="order-qty"> [x'+ items[field]["qty"] +'] </span>'
           +'</p>'
 
-		  		+'<p class="card-text item-options">'+ options +'</p>'
+		  		+'<br/><p class="card-text item-options">'+ options +'</p>'
 
 		  		+'<span class="card-text">'
             +'<span class="text-muted">Order at - '
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index f23d13c6..33252efa 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -143,3 +143,55 @@ $(document).on('turbolinks:load', function() {
 		return false;
 	});
 });
+
+/* start check first bill or not funs: */
+function checkReceiptNoInFirstBillData(receipt_no,payment) {
+	// localStorage.removeItem('receipt_lists');
+	var status = false;
+	if((receipt_no!=undefined) && (receipt_no!="")){
+		if(localStorage.hasOwnProperty("receipt_lists")===true){
+			var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+			if (payment) {
+				var json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
+			}else{
+				var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+			}
+
+			if((arr_data.length) > (json_data.length)){
+				status = true;
+			}
+		}
+	}
+	if (payment) {
+		return json_data[0]["payment"];
+	}else{
+		return status;
+	}
+}
+
+function createReceiptNoInFirstBillData(receipt_no,payment) {
+	var arr_data = [];
+	var json_data = [];
+	if(localStorage.hasOwnProperty("receipt_lists") === true){
+		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
+		if (payment) {
+			jdata = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+			jdata.push({'receipt_no':receipt_no,'payment':payment});
+		   localStorage.setItem("receipt_lists",JSON.stringify(jdata));
+		}
+	}
+	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
+		arr_data.push({'receipt_no':receipt_no,'payment':payment});
+		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
+	}
+}
+
+function deleteReceiptNoInFirstBillData(receipt_no) {
+	if(localStorage.hasOwnProperty("receipt_lists") ===true ){
+		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
+	}
+}
+/* end check first bill or not funs: */
\ No newline at end of file
diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss
index 7f9192f2..8b652eac 100755
--- a/app/assets/stylesheets/CRM.scss
+++ b/app/assets/stylesheets/CRM.scss
@@ -114,9 +114,11 @@
 .green{
   background-color: #009900;
 }
-.left{
+
+.left-margin-1 {
   margin-left:1px;
 }
+
 .bottom{
   margin-bottom:1px;
 }
@@ -149,3 +151,9 @@ nav.pagination .page a:hover,
   text-decoration: none;
 
 }
+
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss
index 12fbd548..88b00402 100755
--- a/app/assets/stylesheets/OQS.scss
+++ b/app/assets/stylesheets/OQS.scss
@@ -100,3 +100,8 @@ select.form-control {
   border-left:1px solid #fff;
 }
 
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 8c535855..bf09f726 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -69,7 +69,17 @@ section .content{
     font-weight: bold;
     border-color: #fff #fff #fff #54A5AF;
 }
-
+.sub_category_list{
+  background:#fff;
+  margin-top:8px;
+}
+.sub_category_list > li{
+  list-style:none;
+  margin-left:-40px;
+}
+.sub_category_list > li > a.nav-link{
+  border-bottom:1px solid #eee;
+}
 .custom-modal-dialog {
     left:auto;
     right: auto;
@@ -157,4 +167,10 @@ section.content{
 
 .add_icon{
    cursor: pointer; 
+}
+
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 9caef6fe..2249d049 100755
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -93,3 +93,9 @@ nav.pagination .page a:hover,
   text-decoration: none;
 
 }
+
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/inventory_definitions.scss b/app/assets/stylesheets/inventory_definitions.scss
index 9d2c2775..aa02f08d 100755
--- a/app/assets/stylesheets/inventory_definitions.scss
+++ b/app/assets/stylesheets/inventory_definitions.scss
@@ -275,3 +275,8 @@ tr.discount-item-row:hover {
   -moz-opacity: 1; /* mozilla */
 
 }
+/*Logout Icon*/
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index e097b448..30d8a090 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -262,6 +262,10 @@ select.form-control {
 	margin-left:1px;
 }
 
+.dtp-date .left{
+	margin-left:0px;
+}
+
 .bottom{
 	margin-bottom:1px;
 }
@@ -357,3 +361,32 @@ tr.discount-item-row:hover {
 }
 
 /* End Payment Page */
+
+/* Logout Icon */
+
+i.logout_icon{
+  position: relative;
+  top: 5px;
+}
+
+/* End Logout Icon */
+
+/* Notify */
+
+#notify-wrapper {
+	position: absolute;
+	top: 55px;
+	left: 10px;
+	z-index: 9999;
+	opacity: 0.8;
+}
+
+[data-notify="container"] {
+	margin-bottom: 5px !important;
+	margin-left:5px !important;
+	position:relative !important;
+	top: 25% !important;
+    width: 100% !important;
+}
+
+/* End Notify */
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index e118c9f8..ea0aaa4f 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -265,5 +265,13 @@ section.content {
     color: #F44336;
 }
 
+
+/*notification */
+.alert {
+    padding: .25rem .25rem !important;
+}
+.alert-dismissible .close {
+  padding: 0.5rem 0.44rem;
+}
 /* End Reset Theme */
 /* *************************************************** */
\ No newline at end of file
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
index b2cb741f..89fe509d 100755
--- a/app/channels/application_cable/channel.rb
+++ b/app/channels/application_cable/channel.rb
@@ -15,4 +15,9 @@ module ApplicationCable
 	class BillChannel < ActionCable::Channel::Base
 		
 	end
+
+	# Call Waiter Channel
+	class CallWaiterChannel < ActionCable::Channel::Base
+		
+	end
 end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
index 9da60bf4..4efdb70d 100755
--- a/app/channels/application_cable/connection.rb
+++ b/app/channels/application_cable/connection.rb
@@ -1,7 +1,7 @@
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
   	def connect
-  		logger.add_tags "ActionCable"
+  		logger.add_tags "SX-ActionCable"
   	end
   end
 end
diff --git a/app/channels/call_waiter_channel.rb b/app/channels/call_waiter_channel.rb
new file mode 100644
index 00000000..53eb7e61
--- /dev/null
+++ b/app/channels/call_waiter_channel.rb
@@ -0,0 +1,14 @@
+class CallWaiterChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "call_waiter_channel"
+  end
+
+  def unsubscribed
+    stop_all_streams
+    # Any cleanup needed when channel is unsubscribed
+  end
+
+  def order(message)
+    # ToDo
+  end
+end
\ No newline at end of file
diff --git a/app/channels/check_in_booking_channel.rb b/app/channels/check_in_booking_channel.rb
new file mode 100644
index 00000000..f9df89ba
--- /dev/null
+++ b/app/channels/check_in_booking_channel.rb
@@ -0,0 +1,10 @@
+class CheckInBookingChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "check_in_booking_channel"
+  end
+
+  def unsubscribed
+  	stop_all_streams
+    # Any cleanup needed when channel is unsubscribed
+  end
+end
diff --git a/app/channels/checkin_channel.rb b/app/channels/checkin_channel.rb
new file mode 100644
index 00000000..c2e78132
--- /dev/null
+++ b/app/channels/checkin_channel.rb
@@ -0,0 +1,10 @@
+class CheckinChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "checkin_channel"
+  end
+
+  def unsubscribed
+  	stop_all_streams
+    # Any cleanup needed when channel is unsubscribed
+  end
+end
diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index aff97bff..387b7bf8 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -5,7 +5,8 @@ class Api::BillController < Api::ApiController
   def create
     @status = false
     @error_message = "Order ID or Booking ID is require to request for a bill."
-    if ShiftSale.current_shift
+
+    if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
     #create Bill by Booking ID
       table = 0
       if (params[:booking_id])
@@ -15,16 +16,18 @@ class Api::BillController < Api::ApiController
 
         cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
 
-        shift_by_terminal = ShiftSale.find_by_cashier_terminal_id(cashier_zone.cashier_terminal_id)
+        shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
         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_by_terminal)
+              @sale_data = Sale.find_by_sale_id(@sale_id)
             else
               @status = true
               @sale_id = booking.sale_id
+              @sale_data = Sale.find_by_sale_id(@sale_id)
             end
           end
 
@@ -36,6 +39,11 @@ class Api::BillController < Api::ApiController
         booking  = Booking.find_by_sale_id(@sale_id)
         table = DiningFacility.find(booking.dining_facility_id)
       end
+    
+      # Bind shift sale id to sale
+      @sale_data.shift_sale_id = shift_by_terminal.id
+      @sale_data.save
+
       Promotion.promo_activate(@sale)
 
       BillBroadcastJob.perform_later(table)
diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
new file mode 100644
index 00000000..a778af12
--- /dev/null
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -0,0 +1,20 @@
+class Api::CallWaitersController < ActionController::API
+
+  #List all active customers by name
+  def index
+    @table_id = params[:dining_id]
+    @time     = params[:time]
+    @table    = DiningFacility.find(@table_id)
+    CallWaiterJob.perform_later(@table,@time)
+
+    # get printer info
+    # @shop          = Shop::ShopDetail 
+    # unique_code    = "CallWaiterPdf" 
+    # print_settings = PrintSetting.find_by_unique_code(unique_code)
+    # printer        = Printer::ReceiptPrinter.new(print_settings)   
+    # printer.print_call_waiter(print_settings,@table,@time,@shop)
+  
+  end
+
+  
+end
diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 0baa258a..488684e7 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -1,23 +1,47 @@
 class Api::CheckInProcessController < Api::ApiController
 
+	def check_in_time
+		if params[:dining_id]	
+			dining_facility = DiningFacility.find(params[:dining_id])		
+			booking = dining_facility.get_current_checkout_booking
+			if !booking.nil?
+
+				DiningFacility.check_in_booking(params[:dining_id])
+				
+				check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
+				check_out_time = booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
+
+				lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
+				alert_time_min = 0
+				if !lookup_checkout_time.nil?
+					if lookup_checkout_time[0][0] == 'min'
+					  alert_time_min = (lookup_checkout_time[0][1]).to_i
+					else
+					  alert_time_min = 15
+					end
+				end
+
+				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min }
+			else 
+				render :json => { :status => false, :error_message => "No current booking!" }
+			end
+		end
+	end
+
 	def check_in_process
 		if params[:dining_id]
 			dining_facility = DiningFacility.find(params[:dining_id])
 			if dining_facility.status == "available"
-				dining_charge = DiningCharge.select('charge_type','charge_block')
-							.where('dining_facility_id = ?',params[:dining_id])
-							.first()
+				lookup_checkout_time = Lookup.collection_of("checkout_time")
 
 				checkout_at = Time.now.utc
 
-				if !dining_charge.nil?
-					hr = (dining_charge.charge_block.utc.strftime("%H").to_i).to_int
-					min = (dining_charge.charge_block.utc.strftime("%M").to_i).to_int
-					# if dining_charge.charge_type == 'hr'
-						checkout_at = checkout_at + hr.hour + min.minutes
-					# else
-
-					# end
+				if !lookup_checkout_time.nil?
+					if lookup_checkout_time[0][0] == 'hr'
+						checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.hour
+					else
+						checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.minutes
+					end
 				end
 
 				dining_facility.status = "occupied"
@@ -28,12 +52,12 @@ class Api::CheckInProcessController < Api::ApiController
 				else
 					type = "RoomBooking"
 				end
-
+				
 				booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-		                                :checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign" })
+		                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
 				booking.save!
 
-				render :json => { :status => true, :checkout_at => booking.checkout_at.utc.strftime("%Y-%m-%d %H:%M") }
+				render :json => { :status => true, :checkout_at => booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") }
 			else
       			error_message = "#{dining_facility.type} is not available!"
       			render :json => { :status => false, :error_message => error_message }
@@ -58,7 +82,7 @@ class Api::CheckInProcessController < Api::ApiController
 			booking.checkout_at = checkout_at
 			booking.save!
 
-			render :json => { :status => true, :checkout_at => booking.checkout_at.utc.strftime("%Y-%m-%d %H:%M") }
+			render :json => { :status => true, :checkout_at => booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") }
 		elsif !params[:booking_id].nil? && params[:time].nil? 
 			error_message = "time is required!"
       		render :json => { :status => false, :error_message => error_message }
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 83222004..7fafd6bd 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -22,9 +22,10 @@ class ApplicationController < ActionController::Base
     { locale: I18n.locale }
   end
 
-  def lookup_domain
-    if request.subdomain.present? && request.subdomain != "www"
-      @license = cache_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase) # request.subdomain.downcase
+  def lookup_domain 
+    if request.subdomain.present? && request.subdomain != "www" 
+      from = request.subdomain.downcase  + "." + request.domain.downcase    
+      @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
       if (!@license.nil?)
         # logger.info "Location - " + @license.name
         ActiveRecord::Base.establish_connection(website_connection(@license))
@@ -35,31 +36,32 @@ class ApplicationController < ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    else
+    else      
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 
-  def current_license(url)
+  def current_license(url)  
     @license = License.new(url)
-
-    if (@license.detail_with_local_file() == true)
-      puts "RUN SAY BYAR"
+    flag = @license.detail_with_local_file()
+    if (flag == 0)
+      flash[:notice] = 'Expired or No License!'      
+    elsif (flag == 2)
+      flash[:notice] = 'Expiring! Please, License extend...'      
     else
-      return nil
+      puts "RUN SAY BYAR"
     end
   end
 
-  def cache_license(url, lookup)
-    @license = License.new(url, lookup)
-    # Export for Key   
-    aes = MyAesCrypt.new 
-    aes_key, aes_iv = aes.export_key(lookup)
+  def cache_license(url, lookup)    
+    @license = License.new(url, lookup)        
 
-    if (@license.detail_with_local_cache(lookup, aes_key, aes_iv) == true)
+    if (@license.detail_with_local_cache(lookup) == true)
       return @license
     else
       return nil
@@ -109,9 +111,8 @@ class ApplicationController < ActionController::Base
   def check_license
     if License.check_license_file
       return true
-    else
-      redirect_to install_path
     end
+    return false
   end
 end
 
diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb
index 9f0914c4..1bf5b4d4 100755
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -1,4 +1,5 @@
 class BaseController < ActionController::Base
   layout "installation"
   protect_from_forgery with: :exception
+  
 end
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 979fdf02..ec415bad 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -2,6 +2,8 @@ class BaseOrigamiController < ActionController::Base
   include LoginVerification
   layout "origami"
 
+  # before_action :checkin_process
+
   #before_action :check_installation
   protect_from_forgery with: :exception
   rescue_from CanCan::AccessDenied do |exception|
@@ -13,4 +15,7 @@ class BaseOrigamiController < ActionController::Base
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
+  # def checkin_process
+  #   CheckinJob.set(wait: 1.minute).perform_later()
+  # end
 end
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index f95b54a9..51ddc9eb 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -72,7 +72,9 @@ class Crm::CustomersController < BaseCrmController
     #get customer amount
       @customer        = Customer.find(params[:id])
       @response        = Customer.get_membership_transactions(@customer)
- puts @response.to_json
+
+      Rails.logger.debug "get membership transactions response"
+      Rails.logger.debug @response.to_json
       # @response = ""
       #end customer amount
 
@@ -156,7 +158,8 @@ class Crm::CustomersController < BaseCrmController
                  rescue SocketError
                    response = {"status" => false, "message" => "Can't open membership server "}
               end
-
+              Rails.logger.debug "--------------Create Member---------"
+              Rails.logger.debug response.to_json
               if response["status"] == true
                   customer = Customer.find(@crm_customers.customer_id)
                   status   = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
@@ -235,7 +238,7 @@ end
         id              = @crm_customer.membership_id
         member_group_id = params[:member_group_id]        
 
-        if id.nil? && !member_group_id.nil?
+        if !id.present? && !member_group_id.nil?
             membership      = MembershipSetting.find_by_membership_type("paypar_url")
             memberaction    = MembershipAction.find_by_membership_type("create_membership_customer")
             merchant_uid    = memberaction.merchant_account_id.to_s
@@ -277,10 +280,9 @@ end
             rescue SocketError
               response = { status: false}
             end
-            puts "ssssssss"
-            puts response.to_json
             customer = Customer.find(@crm_customer.customer_id)
-
+            Rails.logger.debug "--------Update Member response -------"
+            Rails.logger.debug response.to_json
             if response["status"] == true
               
               status   = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
@@ -337,10 +339,8 @@ end
             rescue SocketError
               response = { status: false}
             end
-
-            puts "ssssssss"
-            puts response.to_json
-            
+            Rails.logger.debug "--------Update Member response -------"
+            Rails.logger.debug response.to_json
             if response["status"] == true
               customer = Customer.find(@crm_customer.customer_id)
               # Check membership id and bind to user
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 8c3d7cc4..1ee30bab 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -3,7 +3,8 @@ class HomeController < ApplicationController
   skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]  
 
   def index
-    @employees = Employee.all_emp_except_waiter.order("name asc")
+    # @employees = Employee.all_emp_except_waiter.order("name asc")
+    @employees = Employee.all.order("name asc")
      @login_form = LoginForm.new()
     render "layouts/login_dashboard", layout: false
   end
@@ -45,7 +46,7 @@ class HomeController < ApplicationController
       elsif @employee.role == "manager"
         session[:session_token] = @employee.token_session
         redirect_to dashboard_path
-      elsif @employee.role == "supervisor"
+      elsif @employee.role == "supervisor" || @employee.role == "waiter"
         session[:session_token] = @employee.token_session
         redirect_to origami_root_path
       elsif @employee.role == "account"
@@ -72,7 +73,8 @@ class HomeController < ApplicationController
     @hourly_sales = Sale.hourly_sales(today).sum(:grand_total)
     # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
     # .sum(:grand_total)
-    @employee_sales = Sale.employee_sales(today).sum(:grand_total)
+    @employee_sales = Sale.employee_sales(today)
+                    .sum('(CASE WHEN sp.payment_method="cash" THEN (sp.payment_amount - sales.amount_changed) ELSE sp.payment_amount END)')
     @inventories    = StockJournal.inventory_balances(today).sum(:balance)
 
     @total_sale     = Sale.total_sale(today)
@@ -86,10 +88,10 @@ class HomeController < ApplicationController
     @total_payment_methods.each do |payment|
       if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
         pay = Sale.payment_sale('card', today)
-        @sale_data.push({'card' => pay})
+        @sale_data.push({'card' => pay.payment_amount})
       else 
         pay = Sale.payment_sale(payment.payment_method, today)
-        @sale_data.push({payment.payment_method => pay})
+        @sale_data.push({payment.payment_method => pay.payment_amount})
       end
     end
     @summ_sale              = Sale.summary_sale_receipt(today)
diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb
index cf16adfe..fac74926 100755
--- a/app/controllers/install_controller.rb
+++ b/app/controllers/install_controller.rb
@@ -1,42 +1,77 @@
 class InstallController < BaseController
+  skip_before_action :verify_authenticity_token
+  # before_action :check_license
+
 	def index
 	end
 
-	def create
+	def activate
+    flag = "<%= ENV['AES_IV'] %>"
+    key_base = "<%= ENV['secret_key_base'] %>"
+    
 		restaurant = params[:restaurant_name]
 		license_key = params[:license_key]
-		admin_user = params[:admin_user]
-		admin_password = params[:admin_password]
+		# admin_user = params[:admin_user]
+		# admin_password = params[:admin_password]
+    db_host = params[:db_host]
+    db_schema = params[:db_schema]
+    db_user = params[:db_user]
+    db_password = params[:db_password]
+    phrase = license_key    
+   
+    # Check Exists IV
+    # if flag == "<%= ENV['AES_IV'] %>"
+    #   # Export for Key 
+    #   aes = MyAesCrypt.new 
+    #   aes_key, aes_iv = aes.export_key(phrase)
+    # else      
+    #   aes_key = ENV["AES_KEY"]
+    #   aes_iv = ENV["AES_IV"]
+    # end
+
+    @license = License.new(ENV["SX_PROVISION_URL"])
+    response = @license.license_activate(restaurant, license_key, db_host, db_schema, db_user, db_password)
+    if response[:status]
+      redirect_to root_url, notice: response["message"]
+    else
+      redirect_to activate_path, notice: response["message"]
+    end
 	end
 
-	def lookup_domain
-    if request.subdomain.present? && request.subdomain != "www"
-      @license = current_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase)
-      if (!@license.nil?)
-        # logger.info "Location - " + @license.name
-        ActiveRecord::Base.establish_connection(website_connection(@license))
-        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
-      else
-        # reconnect_default_db
-        logger.info 'License is nil'
-        # redirect_to root_url(:host => request.domain) + "store_error"
-         render :json => [{ status: false, message: 'Invalid Access!'}]
-      end
+  def check_license  
+    if License.check_license_file
+      redirect_to root_url
     end
   end
 
-  def current_license(url, key)
-    @license = License.new(url, key)
+	# def lookup_domain
+ #    if request.subdomain.present? && request.subdomain != "www"
+ #      @license = current_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase)
+ #      if (!@license.nil?)
+ #        # logger.info "Location - " + @license.name
+ #        ActiveRecord::Base.establish_connection(website_connection(@license))
+ #        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
+ #      else
+ #        # reconnect_default_db
+ #        logger.info 'License is nil'
+ #        # redirect_to root_url(:host => request.domain) + "store_error"
+ #         render :json => [{ status: false, message: 'Invalid Access!'}]
+ #      end
+ #    end
+ #  end
 
-    ##creating md5 hash
-    md5_hostname = Digest::MD5.new
-    md5key = md5_hostname.update(request.host)
-    if (@license.detail_with_local_cache(key, md5key.to_s) == true)
-    #if (@license.detail == true)
+ #  def current_license(url, key)
+ #    @license = License.new(url, key)
 
-      return @license
-    else
-      return nil
-    end
-  end
+ #    ##creating md5 hash
+ #    md5_hostname = Digest::MD5.new
+ #    md5key = md5_hostname.update(request.host)
+ #    if (@license.detail_with_local_cache(key, md5key.to_s) == true)
+ #    #if (@license.detail == true)
+
+ #      return @license
+ #    else
+ #      return nil
+ #    end
+ #  end
 end
diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb
index 673cf943..1a311552 100755
--- a/app/controllers/inventory/inventory_controller.rb
+++ b/app/controllers/inventory/inventory_controller.rb
@@ -1,5 +1,5 @@
 class Inventory::InventoryController < BaseInventoryController
-
+   load_and_authorize_resource
    def index
      @products = InventoryDefinition.all.active.order('created_at desc') 
    end
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 33ffd8a6..8ec0725e 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -2,7 +2,7 @@ class Oqs::EditController < BaseOqsController
   def index
   	assigned_item_id = params[:id]
     assigned_item = AssignedOrderItem.find(assigned_item_id)
-    @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_code='#{ assigned_item.item_code }'");    
+    @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'");    
   end
 
   def update
@@ -17,7 +17,7 @@ class Oqs::EditController < BaseOqsController
     order_item.save
 
     # print
-    assigned_item = AssignedOrderItem.find_by_item_code(order_item.item_code)    
+    assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
     # order queue stations
     oqs = assigned_item.order_queue_station
     
@@ -25,6 +25,6 @@ class Oqs::EditController < BaseOqsController
 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    order_queue_printer.print_order_item(print_settings, oqs,assigned_item.order_id, assigned_item.item_code, print_status=" (Edited)" )
+    order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
   end
 end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index e3001098..f432ad29 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -4,11 +4,12 @@ class Oqs::PrintController < ApplicationController
   	unique_code="OrderItemPdf"
   	assigned_item_id = params[:id]
     options = params[:options]
-    assigned_item = AssignedOrderItem.find(assigned_item_id)  	
+    assigned_item = AssignedOrderItem.find(assigned_item_id) 
     assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
     # order queue stations
     oqs = assigned_item.order_queue_station
+    order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
 
     # Check Printed
     print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
@@ -16,7 +17,7 @@ class Oqs::PrintController < ApplicationController
     # print when complete click 
   	print_settings = PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-  	order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, assigned_item.instance_code, print_status, options )
+  	order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
   	
     # update print status for completed same order items
     assigned_items.each do |ai|
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index d97212f3..d283b06e 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -43,6 +43,17 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
       MenuCategory.current_menu
     end
   end
+
+
+  def get_menu_sub_category ()
+    id = params[:id]
+    if (id)
+      #Pull this menu
+      @sub_menu = MenuCategory.where("menu_category_id = #{id}").active
+      # puts @menu.menu_items[1].item_attributes.to_json
+      return @sub_menu
+    end
+  end
   
   def get_all_product()
       @product = Product.all   
@@ -58,9 +69,6 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
        items_arr.push(items)
      }
 
-puts "sssssssssss"
-puts params[:customer_id]
-puts params.to_json
     # begin
     @order = Order.new
     @order.source = params[:order_source]
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 8e9a1f38..37f58d8f 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -1,20 +1,15 @@
 class Origami::CheckInProcessController < BaseOrigamiController
 
 	def check_in_process
-		dining_charge = DiningCharge.select('charge_type','charge_block')
-						.where('dining_facility_id = ?',params[:dining_id])
-						.first()
-
+		lookup_checkout_time = Lookup.collection_of("checkout_time")
 		checkout_at = Time.now.utc
 
-		if !dining_charge.nil?
-			hr = (dining_charge.charge_block.utc.strftime("%H").to_i).to_int
-			min = (dining_charge.charge_block.utc.strftime("%M").to_i).to_int
-			# if dining_charge.charge_type == 'hr'
-				checkout_at = checkout_at + hr.hour + min.minutes
-			# else
-
-			# end
+		if !lookup_checkout_time.nil?
+			if lookup_checkout_time[0][0] == 'hr'
+				checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.hour
+			else
+				checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.minutes
+			end
 		end
 		@dining_facility = DiningFacility.find(params[:dining_id])
 		@dining_facility.status = "occupied"
@@ -25,9 +20,9 @@ class Origami::CheckInProcessController < BaseOrigamiController
 		else
 			type = "RoomBooking"
 		end
-
+		
 		@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-                                :checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign" })
+                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
 		@booking.save!
 
 		respond = {:status => 'ok'}
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index a4978a6f..404b1506 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -4,11 +4,20 @@ class Origami::CreditPaymentsController < BaseOrigamiController
 
     # limit visa_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total     = sale_data.grand_total
     @creditcount = 0
     others = 0
+
+    @shop        = Shop::ShopDetail 
+    if @shop.is_rounding_adj
+         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+    else
+        new_total    = sale_data.grand_total
+    end
+    @rounding_adj = new_total-sale_data.grand_total  
+
     sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "visa"
+        if sale_payment.payment_method == "creditnote"
           @creditcount = @creditcount + sale_payment.payment_amount
         else
           others = others + sale_payment.payment_amount
@@ -21,6 +30,16 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     cash = params[:amount]
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "creditnote")
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index cf723fd6..1166a705 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -29,8 +29,6 @@ class Origami::DiscountsController < BaseOrigamiController
       # sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax;  
       # sale.save   
       if discount_items.length > 0
-        puts discount_items.to_json
-        puts "dddddddddddd"
 
         #save sale item for discount
         discount_items.each do |di|
@@ -159,11 +157,15 @@ class Origami::DiscountsController < BaseOrigamiController
     is_card         = params[:is_card]
     sub_total       = params[:sub_total]
     sale            = Sale.find(sale_id)
-
+    if is_card == 'true'
+      is_card = true
+      else is_card.to_s == 'false'
+      is_card = false
+    end
     # Check for Card Payment
-    is_card_payment = SaleItem.get_sale_payments_by_card(sale.sale_payments)
+    is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments)
    
-    if is_card_payment  != true
+    # if is_card  != "true"
       account_types =  Account.where("discount=?",true)
       table_id      = sale.bookings[0].dining_facility_id
       table_type    = DiningFacility.find(table_id).type
@@ -180,8 +182,7 @@ class Origami::DiscountsController < BaseOrigamiController
           end
         end 
       end
-
-      generic_customer_id = sale.customer.membership_id
+      generic_customer_id = sale.customer.membership_id      
       receipt_no          = sale.receipt_no
       membership          = MembershipSetting.find_by_membership_type("paypar_url")
       memberaction        = MembershipAction.find_by_membership_type("member_discount")
@@ -189,12 +190,13 @@ class Origami::DiscountsController < BaseOrigamiController
       campaign_type_id    = memberaction.additional_parameter["campaign_type_id"]
       auth_token          = memberaction.auth_token.to_s
       url                 = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+      account_no = sale.customer.paypar_account_no rescue nil
 
       # Check for items for Paypar Cloud
       if acc_prices.length > 0
           begin
           response        = HTTParty.post(url, 
-                                  :body => { account_no: nil,
+                                  :body => { account_no: account_no,
                                             generic_customer_id:generic_customer_id ,
                                              campaign_type_id: campaign_type_id,
                                              receipt_no: receipt_no,
@@ -221,8 +223,8 @@ class Origami::DiscountsController < BaseOrigamiController
       else 
           response = {"status": false, "message": "You have no selected discount item" }
       end
-      puts "discountttttttttttt"
-      puts response.to_json
+      Rails.logger.debug "-------------- Member Discount Osaka ---------"
+      Rails.logger.debug response.to_json
       # Re-calc All Amount in Sale
       if response["status"] == true
           discount_amount   = response["discount_earned"]
@@ -239,7 +241,7 @@ class Origami::DiscountsController < BaseOrigamiController
       
       render :json => result.to_json
 
-    end #end Is Card Payment
+    # end #end Is Card Payment
   end
 
   #discount for selected order
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 12c7fb76..22ca34c2 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -6,7 +6,7 @@ class Origami::HomeController < BaseOrigamiController
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders   = Order.all.order('date desc')
-    @shop     = Shop.find_by_id(1)
+    @shop     = Shop::ShopDetail
 
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
@@ -22,6 +22,10 @@ class Origami::HomeController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
+    @shop =  Shop::ShopDetail
+    @membership = MembershipSetting::MembershipSetting
+    @payment_methods = PaymentMethodSetting.all
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
diff --git a/app/controllers/origami/in_duties_controller.rb b/app/controllers/origami/in_duties_controller.rb
index 2c30bbd9..5607939a 100755
--- a/app/controllers/origami/in_duties_controller.rb
+++ b/app/controllers/origami/in_duties_controller.rb
@@ -1,6 +1,5 @@
 class Origami::InDutiesController < BaseOrigamiController
   before_action :set_in_duty, only: %i[show edit update edit_in_duty update_for_in_duty destroy destroy_in_duty]
-
   # GET /in_duties
   # GET /in_duties.json
   def index
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index a8b77861..a3b93efd 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -8,6 +8,15 @@ class Origami::JcbController < BaseOrigamiController
     total = sale_data.grand_total
     @jcbcount = 0
     others = 0
+
+    @shop        = Shop::ShopDetail 
+    if @shop.is_rounding_adj
+         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+    else
+        new_total    = sale_data.grand_total
+    end
+    @rounding_adj = new_total-sale_data.grand_total  
+    
     sale_data.sale_payments.each do |sale_payment|
         if sale_payment.payment_method == "jcb"
           @jcbcount = @jcbcount + sale_payment.payment_amount
@@ -26,6 +35,16 @@ class Origami::JcbController < BaseOrigamiController
     cash = params[:amount]
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb")
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index ba97cad9..8eb2e02b 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -8,6 +8,15 @@ class Origami::MasterController < BaseOrigamiController
     total = sale_data.grand_total
     @mastercount = 0
     others = 0
+    
+    @shop        = Shop::ShopDetail 
+    if @shop.is_rounding_adj
+         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+    else
+        new_total    = sale_data.grand_total
+    end
+    @rounding_adj = new_total-sale_data.grand_total  
+
     sale_data.sale_payments.each do |sale_payment|
         if sale_payment.payment_method == "master"
           @mastercount = @mastercount + sale_payment.payment_amount
@@ -25,6 +34,16 @@ class Origami::MasterController < BaseOrigamiController
     cash = params[:amount]
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master")
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 8e62ecda..6bd0778f 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -8,6 +8,14 @@ class Origami::MpuController < BaseOrigamiController
     @mpucount = 0
     others    = 0
 
+    @shop        = Shop::ShopDetail 
+    if @shop.is_rounding_adj
+         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+    else
+        new_total    = sale_data.grand_total
+    end
+    @rounding_adj = new_total-sale_data.grand_total  
+    
     sale_data.sale_payments.each do |sale_payment|
         if sale_payment.payment_method == "mpu"
           @mpucount = @mpucount + sale_payment.payment_amount
@@ -26,6 +34,16 @@ class Origami::MpuController < BaseOrigamiController
     cash = params[:amount]
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu")
diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index ae3d1073..51a1f7db 100755
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -37,7 +37,7 @@ class Origami::OtherChargesController < BaseOrigamiController
 	          sale_item.qty = 1
 	          sale_item.unit_price = di["price"]
 	          sale_item.taxable_price = di["price"] * 1
-	          sale_item.is_taxable = 1
+	          sale_item.is_taxable = di["is_taxable"]
 	          sale_item.account_id = 0
 
 	          sale_item.price = di["price"] * 1
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index fdd55f06..02e0c4ef 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -24,13 +24,30 @@ class Origami::PaymentsController < BaseOrigamiController
     # Print for First Bill to Customer
     unique_code = "ReceiptBillPdf"
      #shop detail
-    shop_details = Shop.find(1)
+    shop_details =  Shop::ShopDetail 
     # customer= Customer.where('customer_id=' +.customer_id)
-    customer= Customer.find(sale_data.customer_id)
+    customer = Customer.find(sale_data.customer_id)
+
+    # rounding adjustment
+      if shop_details.is_rounding_adj
+        a = sale_data.grand_total % 25 # Modulus
+        b = sale_data.grand_total / 25 # Division
+        #not calculate rounding if modulus is 0 and division is even
+        #calculate rounding if modulus is zero or not zero and division are not even
+        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+          rounding_adj = new_total-sale_data.grand_total
+          sale_data.update_attributes(grand_total: new_total,old_grand_total: sale_data.grand_total,rounding_adjustment:rounding_adj)        
+        end
+      end
+      #end rounding adjustment
+
     # get member information
     rebate = MembershipSetting.find_by_rebate(1)
     if customer.membership_id != nil && rebate
       member_info = Customer.get_member_account(customer)
+      # current_balance = SaleAudit.paymal_search(sale_id)
+      current_balance = 0
     end
     # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -44,7 +61,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
     printer = Printer::ReceiptPrinter.new(print_settings)
 
-    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")    
+    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",current_balance)    
   end
 
   def create
@@ -54,6 +71,22 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        a = saleObj.grand_total % 25 # Modulus
+        b = saleObj.grand_total / 25 # Division
+        #not calculate rounding if modulus is 0 and division is even
+        #calculate rounding if modulus is zero or not zero and division are not even
+        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+          new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+          rounding_adj = new_total-saleObj.grand_total
+          saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+        end
+      end
+      #end rounding adjustment
+
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, @user, cash, "cash")
 
@@ -75,16 +108,17 @@ class Origami::PaymentsController < BaseOrigamiController
       # For Print
       unique_code = "ReceiptBillPdf"
       customer= Customer.find(saleObj.customer_id)
-      
-       #shop detail
-      shop_details = Shop.find(1)
+       
       # get member information
       rebate = MembershipSetting.find_by_rebate(1)
-      if customer.membership_id != nil && rebate
+      credit_data = SalePayment.find_by_sale_id_and_payment_method(sale_id,'creditnote')
+      
+      if customer.membership_id != nil && rebate && credit_data.nil?
         member_info    = Customer.get_member_account(customer)
         rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+        current_balance = SaleAudit.paymal_search(sale_id)
       end
-
+      
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       # Calculate Food and Beverage Total
@@ -92,7 +126,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,cashier_terminal,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",current_balance)   
     end    
   end
 
@@ -114,6 +148,14 @@ class Origami::PaymentsController < BaseOrigamiController
       @accountable_type = ''
       @table_no = ''
 
+      @shop        =  Shop::ShopDetail  
+      if @shop.is_rounding_adj
+          new_total    = Sale.get_rounding_adjustment(@sale_data.grand_total)
+      else
+          new_total    = @sale_data.grand_total
+      end
+      @rounding_adj = new_total-@sale_data.grand_total
+
       #get customer amount
       @customer = Customer.find(@sale_data.customer_id)
       accounts = @customer.tax_profiles
@@ -127,7 +169,6 @@ class Origami::PaymentsController < BaseOrigamiController
       # get member information
       if @customer.membership_id != nil && rebate
         response = Customer.get_member_account(@customer)
-        puts response.to_json
         if response["status"]==true
          response["account_data"].each do |res|
           if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount"
@@ -191,12 +232,13 @@ class Origami::PaymentsController < BaseOrigamiController
     customer= Customer.find(saleObj.customer_id)
 
     #shop detail
-    shop_details = Shop.find(1)
+    shop_details =  Shop::ShopDetail 
     # get member information
     rebate = MembershipSetting.find_by_rebate(1)
     if customer.membership_id != nil && rebate
       member_info = Customer.get_member_account(customer)
       rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+      current_balance = SaleAudit.paymal_search(sale_id)
     end
     # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -206,7 +248,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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print")
+    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, "Re-print",current_balance)
   end
 
   def foc    
@@ -215,6 +257,7 @@ class Origami::PaymentsController < BaseOrigamiController
     sub_total       = params[:sub_total]
     member_info   = nil
     rebate_amount = nil
+    current_balance = nil
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
@@ -240,7 +283,7 @@ class Origami::PaymentsController < BaseOrigamiController
       customer= Customer.find(saleObj.customer_id)
       
        #shop detail
-      shop_details = Shop.find(1)
+      shop_details =  Shop::ShopDetail 
 
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -249,7 +292,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,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC")   
+      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, "FOC",nil)   
     end    
   end
 
@@ -259,14 +302,15 @@ class Origami::PaymentsController < BaseOrigamiController
       @shop        = Shop.find_by_id(1)
       
       if @shop.is_rounding_adj
-        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-      else
-        new_total    = saleObj.grand_total
+        a = saleObj.grand_total % 25 # Modulus
+        b = saleObj.grand_total / 25 # Division 
+        #not calculate rounding if modulus is 0 and division is even
+        #calculate rounding if modulus is zero or not zero and division are not even
+        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) 
+          new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+          rounding_adj = new_total-saleObj.grand_total
+          saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)
+        end
       end
-      
-      rounding_adj = new_total-saleObj.grand_total
-
-      saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)
-
   end
-end
+end
\ No newline at end of file
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index 0c3ea11f..5a15aa8c 100755
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -6,6 +6,15 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 		payment_method = "paypar"
 		if(Sale.exists?(sale_id))
 			saleObj = Sale.find(sale_id)
+			shop_details =  Shop::ShopDetail 
+      
+			# rounding adjustment
+				if shop_details.is_rounding_adj
+				new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+				rounding_adj = new_total-saleObj.grand_total
+				saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+			end
+			
       		sale_payment = SalePayment.new
       		status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method)
       		if status == true
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 802ba51b..b0f40d34 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -5,76 +5,65 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
-    # limit redeem_amount
-    # rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items)
-    # nonrebate_prices = sale_data.total_amount - rebate_prices
-    # @payparcount = 0
-    # others = 0
-    # sale_data.sale_payments.each do |sale_payment|
-    #     if sale_payment.payment_method == "paypar"
-    #       @payparcount = @payparcount + sale_payment.payment_amount
-    #     else
-    #       others = others + sale_payment.payment_amount
-    #     end
-    # end
-    # non_rebate_exceed = others - (nonrebate_prices +  sale_data.total_tax)
-    # if non_rebate_exceed < 0
-    #   @redeem_prices = rebate_prices - @payparcount
-    # else
-    #   @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed
-    # end
-
-    @payparcount = 0
-    others = 0
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "paypar"
-          @payparcount = @payparcount + sale_payment.payment_amount
+        @shop        = Shop::ShopDetail 
+        if @shop.is_rounding_adj
+             new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
         else
-          others = others + sale_payment.payment_amount
+            new_total    = sale_data.grand_total
         end
-    end
-    @redeem_prices = sale_data.grand_total - @payparcount -others
+        @rounding_adj = new_total-sale_data.grand_total  
+
+        @payparcount = 0
+        others = 0
+        sale_data.sale_payments.each do |sale_payment|
+            if sale_payment.payment_method == "paypar"
+              @payparcount = @payparcount + sale_payment.payment_amount
+            else
+              others = others + sale_payment.payment_amount
+            end
+        end
+        @redeem_prices = sale_data.grand_total - @payparcount -others
 
 
- 		if sale_data
- 			if sale_data.customer_id
- 				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
- 				if customer_data
- 					@membership_id = customer_data.membership_id
- 					if !@membership_id.nil?
- 						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
- 						if membership_setting.gateway_url
- 							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
- 							if member_actions.gateway_url
- 								@campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
- 								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
- 								merchant_uid= member_actions.merchant_account_id
- 								auth_token = member_actions.auth_token.to_s
-		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
-		 						if membership_data["status"]==true
-		 							@membership_rebate_balance=membership_data["balance"]
-		 							@out = true, @membership_rebate_balance,@membership_id
-		 						end
-		 					else
-		 						@out =false,0
- 							end
- 						else
- 							@out = false,0
- 						end
+     		if sale_data
+     			if sale_data.customer_id
+     				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+     				if customer_data
+     					@membership_id = customer_data.membership_id
+     					if !@membership_id.nil?
+     						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+     						if membership_setting.gateway_url
+     							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
+     							if member_actions.gateway_url
+     								@campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
+     								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+     								merchant_uid= member_actions.merchant_account_id
+     								auth_token = member_actions.auth_token.to_s
+    		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
+    		 						if membership_data["status"]==true
+    		 							@membership_rebate_balance=membership_data["balance"]
+    		 							@out = true, @membership_rebate_balance,@membership_id
+    		 						end
+    		 					else
+    		 						@out =false,0
+     							end
+     						else
+     							@out = false,0
+     						end
 
 
- 					else
- 						@out = false, 0
- 					end
- 				else
- 					@out = false, 0
- 				end
- 			else
- 				@out = false, 0
- 			end
- 		else
- 			@out = false, 0
- 		end
- 		@out = false, 0
- 	end
+     					else
+     						@out = false, 0
+     					end
+     				else
+     					@out = false, 0
+     				end
+     			else
+     				@out = false, 0
+     			end
+     		else
+     			@out = false, 0
+     		end
+     		@out = false, 0
+     	end
 end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 6c0b98c8..5e5b42cb 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -19,6 +19,10 @@ class Origami::RoomsController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
+    @shop =  Shop::ShopDetail
+    @membership = MembershipSetting::MembershipSetting
+    @payment_methods = PaymentMethodSetting.all
+    
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
            @order_items = Array.new
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index a4dcb31d..c00c35f0 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -43,7 +43,7 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem = saleitemObj.dup
     @newsaleitem.save
     @newsaleitem.qty = saleitemObj.qty * -1      
-    @newsaleitem.unit_price = saleitemObj.unit_price * -1
+    @newsaleitem.unit_price = saleitemObj.unit_price * 1
     @newsaleitem.taxable_price = saleitemObj.taxable_price * -1
     @newsaleitem.price = saleitemObj.price * -1
     @newsaleitem.product_name = saleitemObj.product_name + ' (FOC)'
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index 3c895b91..e5350706 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -5,6 +5,10 @@ class Origami::SalesController < BaseOrigamiController
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders = Order.all.order('date desc')
     @sale = Sale.find(params[:sale_id])
+    @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
+    @booking = BookingOrder.find_by_order_id(@order).booking_id
+    @table_id = Booking.find(@booking).dining_facility_id
+    @dining  = DiningFacility.find(@table_id)
   end
 
   def add_to_existing_invoice
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 4f750fb5..3e2e56a3 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -7,6 +7,15 @@ class Origami::VisaController < BaseOrigamiController
     total = sale_data.grand_total
     @visacount = 0
     others = 0
+
+    @shop        = Shop::ShopDetail 
+    if @shop.is_rounding_adj
+         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+    else
+        new_total    = sale_data.grand_total
+    end
+    @rounding_adj = new_total-sale_data.grand_total  
+    
     sale_data.sale_payments.each do |sale_payment|
         if sale_payment.payment_method == "visa"
           @visacount = @visacount + sale_payment.payment_amount
@@ -25,6 +34,17 @@ class Origami::VisaController < BaseOrigamiController
     sale_id = params[:sale_id]
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      shop_details =  Shop::ShopDetail 
+      
+      # rounding adjustment
+      if shop_details.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+        rounding_adj = new_total-saleObj.grand_total
+        saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)        
+      end
+      
+      saleObj = Sale.find(sale_id)
+      #end rounding adjustment
       sale_payment = SalePayment.new
       @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa")
     end
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 80594a26..242a1c2e 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -8,12 +8,19 @@ class Origami::VoidController < BaseOrigamiController
       sale = Sale.find_by_sale_id(sale_id)
       
       # update count for shift sale
-      # if(sale.sale_status == "completed")
+      if(sale.sale_status == "completed")
         if sale.shift_sale_id != nil
           shift = ShiftSale.find(sale.shift_sale_id)
           shift.calculate(sale_id, "void")
         end
-      # end
+      else
+        # void before sale payment complete
+        if sale.shift_sale_id != nil
+          shift = ShiftSale.find(sale.shift_sale_id)
+          shift.total_void = shift.total_void + sale.grand_total
+          shift.save
+        end
+      end
 
       sale.payment_status = 'void'
       sale.sale_status = 'void'
@@ -73,6 +80,7 @@ class Origami::VoidController < BaseOrigamiController
       if customer.membership_id != nil && rebate
         member_info = Customer.get_member_account(customer)
         rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+        current_balance = SaleAudit.paymal_search(sale_id)
       end
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -81,7 +89,7 @@ class Origami::VoidController < BaseOrigamiController
       discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
 
       printer = Printer::ReceiptPrinter.new(print_settings)
-      printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID")   
+      printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance)   
       
       #end print
 
@@ -93,6 +101,5 @@ class Origami::VoidController < BaseOrigamiController
         end
       end
     end
-  end
-
+  end 
 end
\ No newline at end of file
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index 421c31a0..c4b3c840 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -7,6 +7,15 @@ class Origami::VoucherController < BaseOrigamiController
     total = sale_data.grand_total
     @vouchercount = 0
     others = 0
+
+    @shop        = Shop::ShopDetail 
+    if @shop.is_rounding_adj
+         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+    else
+        new_total    = sale_data.grand_total
+    end
+    @rounding_adj = new_total-sale_data.grand_total  
+    
     sale_data.sale_payments.each do |sale_payment|
         if sale_payment.payment_method == "voucher"
           @vouchercount = @vouchercount + sale_payment.payment_amount
diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb
index 23c256d3..bbff8900 100644
--- a/app/controllers/reports/payment_method_controller.rb
+++ b/app/controllers/reports/payment_method_controller.rb
@@ -21,8 +21,6 @@ class Reports::PaymentMethodController < BaseReportController
 	    end
 	    @payment_type = params[:payment_type]
         @sale_data,@pyament_method = Sale.get_payment_method_by_shift(@shift_sale_range,@shift,from,to,@payment_type) 
-       puts @pyament_method.to_json
-       puts "sssssssssssss"
         @from       = from
         @to         = to
 
diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index 3ca19e9d..2bd5e813 100755
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -20,7 +20,7 @@ authorize_resource :class => false
 	    payment_type = params[:payment_type]
         @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) 
         @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
-
+        @tax_profiles = TaxProfile.order('order_by asc')
         @from       = from
         @to         = to
 
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index bd933f83..7e7469f9 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -15,9 +15,10 @@ class Reports::SaleitemController < BaseReportController
         shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
       end
     end
-    @sale_data, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
-    puts @sale_data.to_json
-    puts "SSSSSSSSSSS"
+    @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
+
+    @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
+
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
 
 
diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb
index 336bf7c8..596887c3 100755
--- a/app/controllers/settings/menu_item_instances_controller.rb
+++ b/app/controllers/settings/menu_item_instances_controller.rb
@@ -26,8 +26,6 @@ class Settings::MenuItemInstancesController < ApplicationController
 
   def get_instance
     @id = MenuItemInstance.find(params[:id])
-    puts "iddddddddd"
-    puts @id.to_json
   end
 
   # GET /settings/menu_item_instances/1/edit
@@ -67,12 +65,13 @@ class Settings::MenuItemInstancesController < ApplicationController
 
     respond_to do |format|
       if @settings_menu_item_instances.save
-        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
+        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split(" ")
         @settings_menu_item_instances.save
         format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully created.' }
         format.json { render :show, status: :created, location: @settings_menu_item_instances }
       else
-        format.html { render :new }
+        flash[:instance_code_error] = @settings_menu_item_instances.errors
+        format.html { redirect_to new_settings_simple_menu_item_menu_item_instance_path }
         format.json { render json: @settings_menu_item_instances.errors, status: :unprocessable_entity }
       end
     end
@@ -105,9 +104,9 @@ class Settings::MenuItemInstancesController < ApplicationController
     end
     
     respond_to do |format|
-
       if @settings_menu_item_instances.update(settings_menu_item_instance_params)
-        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
+        #@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
+        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split(" ")
         @settings_menu_item_instances.save
         format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_menu_item_instances }
@@ -154,6 +153,9 @@ class Settings::MenuItemInstancesController < ApplicationController
       else
         @item = MenuItem.find(params[:set_menu_item_id])
       end
+
+      # To Only show in Menu item selected attrs
+      @item.item_attributes = MenuItemAttribute.where(id: @item.item_attributes).select("id, name").map { |e| [e.name, e.id] }      
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb
index ec09aaab..ec00c5f6 100755
--- a/app/controllers/settings/promotions_controller.rb
+++ b/app/controllers/settings/promotions_controller.rb
@@ -29,8 +29,12 @@ class Settings::PromotionsController < ApplicationController
   def create
     @promotion = Promotion.new(promotion_params)
     @promotion.created_by = current_login_employee.id
-    @promotion.promo_start_hour = @promotion.promo_start_hour.to_datetime.advance(hours: +6, minutes: +30)
-    @promotion.promo_end_hour = @promotion.promo_end_hour.to_datetime.advance(hours: +6, minutes: +30)
+    if !@promotion.promo_start_hour.nil?
+      @promotion.promo_start_hour = @promotion.promo_start_hour.to_datetime.advance(hours: +6, minutes: +30)
+    end
+    if !@promotion.promo_end_hour.nil?
+      @promotion.promo_end_hour = @promotion.promo_end_hour.to_datetime.advance(hours: +6, minutes: +30)
+    end
     respond_to do |format|
       if @promotion.save
         promo_pros = @promotion.promotion_products
@@ -95,16 +99,23 @@ class Settings::PromotionsController < ApplicationController
 
   def find_parent_item
     res = []
-    item = MenuItemInstance.find_by_item_instance_code(params[:item_instance_code])
-    if item.nil?
+    arr_inst = []
+    item_inst = MenuItemInstance.find_by_item_instance_code(params[:item_instance_code])
+    if item_inst.nil?
       product = Product.where("item_code = ?",params[:item_instance_code]).pluck(:name,:item_code)
       res.push(product.name)
       res.push(product.item_code)
     else
-      # menu_item = item.menu_item.pluck(:name,:item_code)
-      res.push(item.item_instance_name)
-      res.push(item.menu_item.item_code)
+      # menu_item = item_inst.menu_item.pluck(:name,:item_code)
+      # res.push(item_inst.item_instance_name)
+      # res.push(item_inst.menu_item.item_code)
+      item_inst.menu_item.menu_item_instances.each do |inst|
+        arr_inst.push({inst.item_instance_code => inst.item_instance_name})
+      end
+      res.push({item_inst.menu_item.item_code => arr_inst})
     end
+    puts "res"
+    p res
     render json: res
   end
 
diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb
index 1fbeb148..c460c362 100755
--- a/app/controllers/settings/set_menu_items_controller.rb
+++ b/app/controllers/settings/set_menu_items_controller.rb
@@ -141,6 +141,6 @@ class Settings::SetMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets, :unit)
+      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets, :unit, :taxable)
     end
 end
diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb
index 35af3b83..9a7c46db 100755
--- a/app/controllers/settings/simple_menu_items_controller.rb
+++ b/app/controllers/settings/simple_menu_items_controller.rb
@@ -157,6 +157,6 @@ class Settings::SimpleMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets, :unit)
+      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets, :unit, :taxable)
     end
 end
diff --git a/app/controllers/sym_control_controller.rb b/app/controllers/sym_control_controller.rb
new file mode 100644
index 00000000..816b8f2c
--- /dev/null
+++ b/app/controllers/sym_control_controller.rb
@@ -0,0 +1,35 @@
+class SymControlController < BaseController
+  skip_before_action :verify_authenticity_token
+
+  def run
+  	sym_path = "/home/yan/symmetric/"
+  	check_sym_proc_str = `#{"service SymmetricDS status"}`
+      # Check Sym Installed
+      # if sym_install_status[1] == "false"
+      #   response = { "status": false, "message": "Activation is success but Symmetric service not Installed. \n Please contact code2lab call center!"}
+      # end
+
+      if check_sym_proc_str.include? "Active: active (running)" || "Active: active (exited)"   #"Server is already running"
+        # Create Sym Table
+        check_sym_table = system(sym_path + "bin/symadmin --engine sx create-sym-tables")
+        if check_sym_table
+          sym_sql = Rails.root + "db/sym_master.sql"
+          
+          if File.exist? (sym_sql)
+            # Import Sym Sql to db and start sym
+            run_sym_sql = system(sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+            stop_sym = system("service SymmetricDS stop")
+            run_sym = system("service SymmetricDS start")
+            if run_sym
+              render :text => "<h1>Success!</h1>"
+            end
+          else
+            render :text => "<h1>Sym Sql file not found!</h1>"
+          end
+        end
+      else      
+        render :text => "<h1>Sym not running!</h1>"
+      end
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/transactions/bookings_controller.rb b/app/controllers/transactions/bookings_controller.rb
index 3b8e241e..63090c9c 100644
--- a/app/controllers/transactions/bookings_controller.rb
+++ b/app/controllers/transactions/bookings_controller.rb
@@ -4,7 +4,7 @@ class Transactions::BookingsController < ApplicationController
 
   def index
 
-    filter     = params[:filter]
+    filter     = params[:receipt_no]
     from       = params[:from]
     to         = params[:to]
 
diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb
index 09f48d66..e35baa77 100755
--- a/app/controllers/transactions/credit_notes_controller.rb
+++ b/app/controllers/transactions/credit_notes_controller.rb
@@ -14,7 +14,8 @@ class Transactions::CreditNotesController < ApplicationController
       to       = params[:to]
 
       if filter.nil? && from.nil? && to.nil? && customer.nil?
-          @credit_notes = Sale.where('payment_status = ?', Sale::SALE_STATUS_OUTSTANDING)
+        @credit_notes = Sale.where('payment_status = ?', Sale::SALE_STATUS_OUTSTANDING)
+        @credit_notes = Kaminari.paginate_array(@credit_notes).page(params[:page]).per(20)
       else
           sale = Sale.search_credit_sales(customer,filter,from,to) 
           if sale.count > 0
diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb
index a76fa385..17a117bb 100755
--- a/app/controllers/transactions/orders_controller.rb
+++ b/app/controllers/transactions/orders_controller.rb
@@ -3,16 +3,13 @@ class Transactions::OrdersController < ApplicationController
 	def index
 
 		filter = params[:filter]
-		count  = params[:count]
 		from   = params[:from]
 		to     = params[:to]
 
-		if filter.nil? && from.nil? && to.nil? && count.nil?
+		if filter.nil? && from.nil? && to.nil?
 		    orders = Order.order("order_id desc")
-		    
 		else
-		    orders = Order.search(filter,from,to,count)
-		     
+		    orders = Order.search(filter,from,to)
 		end    
 		    
 		if !orders.nil?
diff --git a/app/jobs/call_waiter_job.rb b/app/jobs/call_waiter_job.rb
new file mode 100644
index 00000000..89c1b9ae
--- /dev/null
+++ b/app/jobs/call_waiter_job.rb
@@ -0,0 +1,8 @@
+class CallWaiterJob < ApplicationJob
+  queue_as :default
+
+  def perform(table,time)    
+     ActionCable.server.broadcast "call_waiter_channel",table: table,time:time
+     # Rails.logger.debug "Testing: I'm performing my job with arguments: #{table}"
+  end
+end
diff --git a/app/jobs/check_in_booking_job.rb b/app/jobs/check_in_booking_job.rb
new file mode 100644
index 00000000..7f8d39d3
--- /dev/null
+++ b/app/jobs/check_in_booking_job.rb
@@ -0,0 +1,9 @@
+class CheckInBookingJob < ApplicationJob
+  queue_as :default
+
+  def perform(table)
+     ActionCable.server.broadcast "check_in_booking_channel",table: table
+  end
+end
+
+
diff --git a/app/jobs/checkin_job.rb b/app/jobs/checkin_job.rb
new file mode 100644
index 00000000..298a42f5
--- /dev/null
+++ b/app/jobs/checkin_job.rb
@@ -0,0 +1,12 @@
+class CheckinJob < ApplicationJob
+  queue_as :default
+
+  def self.perform()
+  	table = DiningFacility.get_checkin_booking
+  	if table.length > 0
+	    ActionCable.server.broadcast "checkin_channel",table: table
+	end
+  end
+
+
+end
diff --git a/app/jobs/order_queue_processor_job.rb b/app/jobs/order_queue_processor_job.rb
index d8e5d6e1..18fdc2dd 100755
--- a/app/jobs/order_queue_processor_job.rb
+++ b/app/jobs/order_queue_processor_job.rb
@@ -3,9 +3,8 @@ class OrderQueueProcessorJob < ApplicationJob
 
   def perform(order_id, table_id)
     # Do something later
-    #Order ID    
-    
-    order        = Order.find(order_id)    
+    #Order ID     
+    order = Order.find(order_id)    
 
     #Execute orders and send to order stations
     if order
diff --git a/app/models/ability.rb b/app/models/ability.rb
index c2947fe1..4470fb4b 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -25,11 +25,6 @@ class Ability
         can :manage, TaxProfile
         can :manage, PrintSetting
         can :manage, Account
-        can :manage, Commission
-        can :manage, Commissioner
-        can :manage, Promotion
-        can :manage, Product
-
 
         can :manage, Order
         can :manage, Booking
@@ -46,6 +41,13 @@ class Ability
         can :index, :credit_payment
         can :index, :void_sale
 
+        can :show, :dailysale
+        can :show, :saleitem
+        can :show, :receipt_no
+        can :show, :shiftsale
+        can :show, :credit_payment
+        can :show, :void_sale
+
         can :get_customer, Customer
         can :add_customer, Customer  
         can :update_sale_by_customer, Customer  
@@ -79,6 +81,13 @@ class Ability
 
         can :overall_void, :void
 
+        can :manage, Commission
+        can :manage, Commissioner
+        can :manage, Promotion
+        can :manage, Product
+
+        can :manage, Inventory
+
     elsif user.role == "cashier"
         
         # can :overall_void, :void
@@ -112,6 +121,11 @@ class Ability
         can :move_dining, :moveroom
 
         can :manage, DiningQueue
+
+        can :manage, Commission
+        can :manage, Commissioner
+        can :manage, Promotion
+        can :manage, Product
                                                
     elsif user.role == "account"
 
@@ -121,6 +135,12 @@ class Ability
         can :index, :shiftsale
         can :index, :credit_payment
         can :index, :void_sale
+        can :show, :dailysale
+        can :show, :saleitem
+        can :show, :receipt_no
+        can :show, :shiftsale
+        can :show, :credit_payment
+        can :show, :void_sale
 
     elsif user.role == "supervisor"
 
@@ -148,6 +168,12 @@ class Ability
         can :show, :payment
         can :reprint, :payment
         can :rounding_adj, :payment
+
+        can :manage, Commission
+        can :manage, Commissioner
+        can :manage, Promotion
+        can :manage, Product
+
     end
   end
 end
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 13e6c277..8865448f 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -46,7 +46,8 @@ class Customer < ApplicationRecord
     rescue SocketError
       response = { status: false, message: "Can't connect server"}
     end
-
+    Rails.logger.debug "--------Get Member Account response -------"
+    Rails.logger.debug response.to_json
     return response;
 
   end
@@ -131,6 +132,8 @@ class Customer < ApplicationRecord
       rescue SocketError
         response = { status: false, message: "Can't connect server"}
       end
+      Rails.logger.debug "--------Update Membership response -------"
+      Rails.logger.debug response.to_json
       if response["status"] == true
         status   = customer.update_attributes(membership_id: response["customer_datas"]["id"])
       end
@@ -141,7 +144,11 @@ class Customer < ApplicationRecord
     sales    = Sale.where("rebate_status = 'false'")
     sales.each do |sale|
       if sale.customer.membership_id
-          response = self.rebat(Sale.find(sale.sale_id))           
+          response = self.rebat(Sale.find(sale.sale_id))
+           #record an payment in sale-audit
+            remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.received_amount} "
+            sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, 1)   
+
            if response["status"] == true
              status   = sale.update_attributes(rebate_status: "true")
            end
@@ -184,12 +191,17 @@ class Customer < ApplicationRecord
 
         # Control for Paypar Cloud
         begin
-          response        = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_sale_transaction_amount: sObj.grand_total,merchant_uid:merchant_uid,total_amount: total_amount,campaign_type_id: campaign_type_id,
-                                                        receipt_no: receipt_no,auth_token:auth_token}.to_json,
-                                             :headers => {
-                                                      'Content-Type' => 'application/json',
-                                                      'Accept'       => 'application/json; version=2'
-                                              }, :timeout => 10)
+          response        = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,
+                             total_sale_transaction_amount: sObj.grand_total,
+                             merchant_uid:merchant_uid,
+                             total_amount: total_amount,
+                             campaign_type_id: campaign_type_id,
+                              receipt_no: receipt_no,
+                              auth_token:auth_token}.to_json,
+                         :headers => {
+                                  'Content-Type' => 'application/json',
+                                   'Accept'       => 'application/json; version=2'
+                          }, :timeout => 10)
         rescue Net::OpenTimeout
            response = { "status": false , "message": "Connect To" }
         
@@ -201,7 +213,9 @@ class Customer < ApplicationRecord
            response = { "status": false, "message": "Can't connect server"}
           
         end
-        return response         
+        return response    
+        Rails.logger.debug "--------Update Rebate response -------"
+        Rails.logger.debug response.to_json  
         end
     end
   end
@@ -236,6 +250,8 @@ class Customer < ApplicationRecord
     rescue SocketError
       response = { status: false, message: "Can't connect server"}
     end
+    Rails.logger.debug "--------Search Paypar Account No response -------"
+    Rails.logger.debug response.to_json
     return response
   end
 
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index 1130003e..bd6f3436 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -67,7 +67,7 @@ class DiningFacility < ApplicationRecord
   end
 
   def get_current_checkout_booking
-    booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and sale_id is null and checkout_at is not null and checkout_by is null").limit(1)
+    booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and reserved_by is not null and checkout_by is null").limit(1)
     if booking.count > 0 then
       return booking[0]
     else
@@ -78,19 +78,75 @@ class DiningFacility < ApplicationRecord
   def get_checkout_booking
     booking = self.get_current_checkout_booking
     if booking
+      lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
+      free_time_min = 0
+      if !lookup_checkout_time.nil?
+        if lookup_checkout_time[0][0] == 'min'
+          free_time_min = (lookup_checkout_time[0][1]).to_i
+        else
+          free_time_min = 15
+        end
+      end
+
       now = Time.now.utc
       hr = (now.strftime("%H").to_i).to_int
       min = (now.strftime("%M").to_i).to_int
-
-      checkout_at = booking.checkout_at.utc 
-      
-      checkout_at = checkout_at - hr.hour
-      checkout_at = checkout_at - min.minutes
-      checkout_at = checkout_at.utc.strftime("%M").to_i
-      
-      if checkout_at <= 15
-        return booking
+      if !booking.checkout_at.nil?
+        checkout_at = booking.checkout_at.utc
+        checkout_at_hr = (checkout_at.strftime("%H").to_i).to_int
+        checkout_at_min = (checkout_at.strftime("%M").to_i).to_int
+        checkout_at_min -= min
+        if (checkout_at_hr < hr)
+          return booking
+        elsif (checkout_at_hr == hr && checkout_at_min <= free_time_min)
+          return booking
+        else 
+          return nil
+        end
+      else 
+        return nil
       end
     end
   end
+
+  def self.get_checkin_booking
+    bookings = Booking.where("booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and reserved_by is not null and checkout_by is null")
+    arr_booking = Array.new
+    if bookings
+      lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
+      free_time_min = 0
+      if !lookup_checkout_time.nil?
+        if lookup_checkout_time[0][0] == 'min'
+          free_time_min = (lookup_checkout_time[0][1]).to_i
+        else
+          free_time_min = 15
+        end
+      end
+      
+      bookings.each do |booking|
+        now = Time.now.utc
+        hr = (now.strftime("%H").to_i).to_int
+        min = (now.strftime("%M").to_i).to_int
+        if !booking.checkout_at.nil?
+          checkout_at = booking.checkout_at.utc
+          checkout_at_hr = (checkout_at.strftime("%H").to_i).to_int
+          checkout_at_min = (checkout_at.strftime("%M").to_i).to_int
+          checkout_at_min -= min
+          if (checkout_at_hr < hr)
+            arr_booking.push({'table_id' => booking.dining_facility_id})
+          elsif (checkout_at_hr == hr && checkout_at_min <= free_time_min)
+            arr_booking.push({'table_id' => booking.dining_facility_id})
+          end
+        end
+      end
+    end
+    return arr_booking
+  end
+
+  #send order items and send to order queue
+  def self.check_in_booking(table_id)
+    table = DiningFacility.find(table_id)
+    #Send to background job for processing
+    CheckInBookingJob.perform_later(table)
+  end
 end
diff --git a/app/models/license.rb b/app/models/license.rb
index 23b19aae..36ce9b29 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -18,127 +18,122 @@ class License
     if (server != "")
      self.class.base_uri server
     end
-
-     # @secret = ENV["aes_key"]
-     # @params = { query: { device: "SX", token: SECRETS_CONFIG['provision_key'] } }
-  end
-
-  def shop_code
-    if ( self.subdomain.length > 3)
-      return self.subdomain[0,3].upcase
-    else
-      return self.subdomain.upcase
-    end
   end  
 
-  def detail_with_local_cache(lookup, key, iv)
+  # For Cloud
+  def detail_with_local_cache(lookup)  
+    aes = MyAesCrypt.new
+    aes_key, aes_iv = aes.export_to_file(lookup)  
+    
     ##Check from local redis - if available load local otherwise get from remote
-    cache_key = "#{lookup}:license:#{key}:hostname"
-
-    # No Needs for current
-    # @secret = key
+    cache_key = "#{lookup}:license:#{aes_key}:hostname"    
 
     cache_license = nil
 
     ##Get redis connection from connection pool
-    Redis.current do |conn|
-      cache_license = conn.get(cache_key)
-    end
+    redis = Redis.new
+    cache_license = redis.get(cache_key)    
 
     Rails.logger.info "Cache key - " + cache_key.to_s
     if cache_license.nil?
       ##change the d/e key
       # @options = { query: {device: "SXlite", lookup: lookup, skey: @secret, token: SECRETS_CONFIG['provision_key']} }
-      @params = { query: { lookup_type: self.server_mode, lookup: lookup, encrypted_key: key, iv_key: iv} }
+      @params = { query: { lookup_type: self.server_mode, lookup: lookup, iv_key: aes_iv} }
       response = self.class.get("/subdomain", @params)
       @license = response.parsed_response
 
       if (@license["status"] == true)
-
-        assign()
+        assign(aes_key, aes_iv)
 
         Rails.logger.info "License - " + response.parsed_response.to_s
-
-        Redis.current do |conn|
-          ##Remote - store the remote response in local redis cache
-          conn.set(cache_key, Marshal.dump(@license))
-          ##ADD to List to remove later
-          conn.sadd("License:cache:keys", cache_key)
-        end
+        
+        redis = Redis.new
+        redis.set(cache_key, Marshal.dump(@license))
+        # redis.sadd("License:cache:keys", cache_key)
+        # Redis.current do |conn|
+        #   ##Remote - store the remote response in local redis cache
+        #   conn.set(cache_key, Marshal.dump(@license))
+        #   ##ADD to List to remove later
+        #   conn.sadd("License:cache:keys", cache_key)
+        # end
 
         return true
       end
-
-      Rails.logger.info 'API License'
+    else         
+      @license = Marshal.load(cache_license)
+      assign(aes_key, aes_iv)
+      Rails.logger.info 'API License'           
+      return true
     end
   end
 
+  # For Local System
+  def detail_with_local_file()    
+    renewal_date_str = read_license("renewable_date")
+    
+    if check_expiring(renewal_date_str)   
+      # return for all ok 
+      return 1
+    else
+      has_license = verify_license()
 
-  def detail_with_local_file()
-    has_license = true #verify_license()
-
-    if has_license
-      # puts "VERIFIED"
+      if has_license
+        # return for expiring 
+        return 2
+      else
+        return 0
+      end
     end
+    # end    
+  end    
 
-    # if cache_license.nil?
-    #   ##change the d/e key
-    #   @params = { query: { lookup_type: self.server_mode, lookup: lookup, encrypted_key: key, iv_key: iv} }
+  # License Activation
+  def license_activate (shop, license_key, db_host, db_schema, db_user, db_password)
+    aes = MyAesCrypt.new 
+    aes_key, aes_iv = aes.export_key(license_key)     
 
-    #   response = self.class.get("/request_license", @params)
-    #   @license = response.parsed_response
+    @params = { query: { lookup_type: self.server_mode, iv_key: aes_iv, license_key: license_key } }
+    response = self.class.get("/activate", @params)
+    @activate = response.parsed_response
 
-    #   if (@license["status"] == true)
+    if (@activate["status"])
+      ##Check from local redis - if available load local otherwise get from remote
+      cache_key = "shop:#{@activate["shop_name"]}"    
 
-    #     assign()
+      cache_license = nil    
 
-    #     Rails.logger.info "License - " + response.parsed_response.to_s
+      ##Get redis connection from connection pool
+      redis = Redis.new
+      cache_license = redis.get(cache_key)    
 
-    #     Redis.current do |conn|
-    #       ##Remote - store the remote response in local redis cache
-    #       conn.set(cache_key, Marshal.dump(@license))
-    #       ##ADD to List to remove later
-    #       conn.sadd("License:cache:keys", cache_key)
-    #     end
+      Rails.logger.info "Cache key - " + cache_key.to_s
 
-    #     return true
-    #   end
+      if cache_license.nil?   
+        cache = {"shop" => @activate["shop_name"], "key" => aes_key, "iv" => @activate["iv_key"], "renewable_date" => @activate["renewable_date"] }           
+        redis = Redis.new
+        redis.set(cache_key, Marshal.dump(cache))
+      end 
 
-    #   Rails.logger.info 'API License'
+      Rails.logger.info "License - " + response.parsed_response.to_s
 
-    # else
-    #   @license = Marshal.load(cache_license) if cache_license
-
-    #   Rails.logger.info 'Cache License'
-
-    #   if (@license["status"] == true)
-    #     assign()
-    #     return true
-    #   end
-    # end
-    # return false
+      response =  create_license_file(@activate)
+      if(response[:status])
+        sym_path = "/home/yan/symmetric/"
+        response = create_symmetric_config(sym_path, db_host, db_schema, db_user, db_password)
+        if(response[:status])
+          response = run_symmetric(sym_path)
+        end
+      end
+    else
+      response = { "status": false, "message": "Activation Failed! Please contact code2lab call center!"}
+    end 
+    return response
   end
 
-  def detail
-     response = self.class.get("/subdomain", @options)
-     @license = response.parsed_response
-
-     Rails.logger.debug "License - " + response.parsed_response.to_s
-
-
-     if (@license["status"] == true)
-       assign()
-
-       return true
-     end
-
-     return false
-  end
-
-  def verify_license
-    api_token = read_license("api_token")
-    @options = { query: {lookup_type: "application", token: api_token} }
-    response = self.class.get("/verify", @options)
+  def verify_license    
+    api_token = read_license_no_decrypt("api_token")    
+    @params = { query: {lookup_type: "application", api_token: api_token} }
+    response = self.class.get("/verify", @params)
     @varified = response.parsed_response
 
     Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
@@ -152,38 +147,23 @@ class License
     return false  
   end
 
-  def check_remote_license(license_key)
-    # @options = { query: {device: "cloud", key: license_key, skey: @secret, token: Rails.application.secrets.provision_key} }
-    @options = { query: {lookup_type: "application", encrypted_key: @secret, token: SECRETS_CONFIG['provision_key']} }
-    response = self.class.get("/license", @options)
-
-    @license = response.parsed_response
-
-    Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
-    if (@license["status"])
-      assign()
+  # Check Expired before 30 days
+  def check_expiring(renewal_date_str)        
+    if !renewal_date_str.empty?
+      renewal_date = DateTime.parse(renewal_date_str)      
+      renewal_date >  Date.today.advance(:days => 30)
     end
-    return @license["status"]
-
   end
 
-  def verify_by_api_token(api_token)
-    @options = { query: {device: "SX", api_token: api_token, skey: @secret, token: SECRETS_CONFIG['provision_key']} }
-    response = self.class.get("/verify", @options)
-
-    @license = response.parsed_response
-
-    Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
-    if (@license["status"])
-      assign()
+  # Check License expired date from PROVISION SERVER
+  def check_expired(renewal_date_str)    
+    expired_date_str = read_license("renewable_date")
+    renewal_date = DateTime.parse(renewal_date_str)
+   
+    if(renewal_date_str != expired_date_str)
+      update_license("renewable_date", renewal_date_str)
     end
 
-    return @license["status"]
-  end
-  #Load License is remove from the cloud license because - this license is must be validated against subdmain instead of license.data from file.
-
-
-  def check_expired(renewal_date)
     if (renewal_date < Date.today)
       return true
     else
@@ -191,67 +171,259 @@ class License
     end
   end
   
+  # Check License File exists
   def self.check_license_file
     return File.exist?("config/license.yml")      
   end
 
   # read line by key for license file
-  def read_license(key)
+  def read_license(key_name)    
+    decrypted_line = "" 
+    key, iv = get_redis_key()
+
+    if File.exist?("config/license.yml")  
+      File.open("config/license.yml").each do |line|
+        if line.include? (key_name)          
+          decrypted_line_array = line.split(": ")                            
+          decrypted_line = AESCrypt.decrypt_data(decode_str(decrypted_line_array[1]), decode_str(key), decode_str(iv), ENV['CIPHER_TYPE'])
+        end
+      end
+    end    
+    return decrypted_line
+  end
+
+  # read line by key for license file without decrypt
+  def read_license_no_decrypt(key)
     decrypted_line = ""
     if File.exist?("config/license.yml")  
       File.open("config/license.yml").each do |line|
         if line.include? (key)
-          decrypted_line_array = line.split(":")
-          decrypted_line = AESCrypt.decrypt(decrypted_line_array[1])
+          decrypted_line_array = line.split(": ")
+          decrypted_line = decrypted_line_array[1]
         end
       end
     end
+    return decrypted_line
   end
 
-   private
-   def assign
-    # self.name = @license["name"]
-    # self.address_1 = @license["address_1"]
-    # self.address_2 = @license["address_2"]
-    # self.township = @license["township"]
-    # self.city = @license["city"]
-    # self.country = @license["country"]
-    # self.email = @license["email"]
-    # self.phone = @license["phone"]
-    # self.fax = @license["fax"]
-    # self.logo = @license["logo"]
-    # self.localhost_address = @license["localhost_address"]
-    # self.subdomain = @license["subdomain"]
-    # self.plan_activation_date = Date.parse(@license["plan_activation_date"])
-    # self.plan_next_renewal_date = Date.parse(@license["plan_next_renewal_date"])
+  # Update license file for line
+  def update_license(content, new_content)
+    key, iv = get_redis_key()
 
-    ## self.plan_activation_date = Date.strptime(@license["plan_activation_date"], "%Y-%m-%d")
-    ## self.plan_next_renewal_date = Date.strptime(@license["plan_next_renewal_date"], "%Y-%m-%d")
+    if !new_content.include? "=="      
+      crypted_str = AESCrypt.encrypt_data(new_content, decode_str(key), decode_str(iv), ENV['CIPHER_TYPE'])
+    end
+    
+    content_str = read_license_no_decrypt(content)
+    if File.exist?("config/license.yml")  
+      file_str = File.read("config/license.yml")
+      new_file_str = file_str.gsub(content_str, encode_str(crypted_str))
 
+      # To write changes to the file, use:
+      File.open("config/license.yml", "w") {|file| file.puts new_file_str }
+      
+      # File.open("config/license.yml").each do |line|
+      #   new_file_str = line.gsub(content, crypted_str)
+      #   f.put
+      # end
+    end
+  end  
 
-    # self.plan_max_products = @license["plan_max_products"].to_i
-    # self.plan_max_customers = @license["plan_max_customers"].to_i
-    # self.plan_active_connections = @license["plan_active_connections"].to_i
-    salt = @license["secret_key"]
+  private
+  def get_redis_key
+    iv = ""
+    key = ""
+    shop = read_license_no_decrypt("shop_name")
+    ##Check from local redis - if available load local otherwise get from remote
+    cache_key = "shop:#{shop.chomp}"     
 
-    if (@license["dbhost"] || @license["dbschema"] || @license["dbusername"] || @license["dbpassword"] )
-      self.dbhost = AESCrypt.decrypt(@license["dbhost"], salt)
-      self.dbschema = AESCrypt.decrypt(@license["dbschema"], salt)
-      self.dbusername = AESCrypt.decrypt(@license["dbusername"], salt)
-      self.dbpassword = AESCrypt.decrypt(@license["dbpassword"], salt)
+    cache_shop = nil    
+
+    ##Get redis connection from connection pool
+    redis = Redis.new
+    cache_shop = redis.get(cache_key)    
+
+    if !cache_shop.nil? 
+      @shop = Marshal.load(cache_shop) 
+      key = @shop["key"] 
+      iv = @shop["iv"] 
+    end
+    return key, iv
+  end
+
+  def encode_str(str)
+    return Base64.encode64(str)
+  end
+
+  def decode_str(str)
+    return Base64.decode64(str)
+  end
+
+  # License File Creation
+  def create_license_file(response_data)
+    if File.exist?("config/license.yml") 
+      delete_license_file
     end
 
-    # self.exchange_unqiue_id = @license["exchange_unqiue_id"]
+    begin
+      # Licese File Creation
+      File.open("config/license.yml", "w") do |f|    
+        f.puts("iv_key: #{response_data['iv_key']}")
+        f.puts("shop_name: #{response_data['shop_name']}")
+        f.puts("email: #{response_data['email']}")
+        f.puts("telephone: #{response_data['telephone']}")
+        f.puts("fax: #{response_data['fax']}")
+        f.puts("address: #{response_data['address']}")
+        f.puts("dbhost: #{response_data['dbhost']}")
+        f.puts("dbschema: #{response_data['dbschema']}")
+        f.puts("dbusername: #{response_data['dbusername']}")
+        f.puts("dbpassword: #{response_data['dbpassword']}")
+        f.puts("api_token: #{response_data['api_token']}")
+        f.puts("app_token: #{response_data['app_token']}")  
+        f.puts("plan_sku: #{response_data['plan_sku']}")
+        f.puts("renewable_date: #{response_data['renewable_date']}")
+        f.puts("plan_name: #{response_data['plan_name']}")
+      end          
+    rescue IOError
+       response = { "status": false, "message": "Activation is success but something is wrong. \n Please contact code2lab call center!"}
+    end
+    response = { "status": true, "message": "Success Activation. License also created."}
+  end
 
-    # self.localqueue_host= @license["localqueue_host"]
-    # self.localqueue_user= @license["localqueue_user"]
-    # self.localqueue_password= @license["localqueue_password"]
+  # Symmetric Configuration
+  def create_symmetric_config(sym_location, db_host, db_schema, db_user, db_password)
+    if File.directory? (sym_location)
+      begin
+        # sx properties create
+        f = File.open(sym_location + "engines/sx.properties", "w")
+        f.write("engine.name=sx\n")
+        f.write("db.driver=com.mysql.jdbc.Driver\n")
+        f.write("db.url=jdbc:mysql://#{db_host}/#{db_schema}?tinyInt1isBit=false\n")
+        f.write("db.user=#{db_user}\n")
+        f.write("db.password=#{db_password}\n")
+        f.write("registration.url=\n")
+        f.write("sync.url=http://#{db_host}:31415/sync/sx\n")
+        f.write("group.id=sx\n")
+        f.write("external.id=000\n")
+        f.write("job.purge.period.time.ms=7200000\n")
+        f.write("job.routing.period.time.ms=5000\n")  
+        f.write("job.push.period.time.ms=10000\n")  
+        f.write("job.pull.period.time.ms=10000\n")  
+        f.write("initial.load.create.first=true\n")  
+        f.write("initial.load.use.extract.job.enabled=true\n")         
+        f.close 
 
-    # self.remotequeue_host = @license["remotequeue_host"]
-    # self.remotequeue_user = @license["remotequeue_user"]
-    # self.remotequeue_password = @license["remotequeue_password"]
+        # read from license file 
+        shop_name = read_license_no_decrypt("shop_name")
+        dbhost = read_license("dbhost")
+        dbschema = read_license("dbschema")
+        dbusername = read_license("dbusername")
+        dbpassword = read_license("dbpassword")
 
-    # self.api_token = @license["api_token"]
-    # self.app_token = @license["app_token"]
+        # shop properties create
+        f = File.open(sym_location + "engines/#{shop_name}.properties", "w")
+        f.write("engine.name=#{shop_name}\n")
+        f.write("db.driver=com.mysql.jdbc.Driver\n")
+        f.write("db.url=jdbc:mysql://#{dbhost}/#{dbschema}?tinyInt1isBit=false\n")
+        f.write("db.user=#{dbusername}\n")
+        f.write("db.password=#{dbpassword}\n")
+        f.write("registration.url=http://#{db_host}:31415/sync/sx\n")
+        f.write("group.id=store\n")
+        f.write("external.id=001\n")
+        f.write("job.routing.period.time.ms=5000\n")  
+        f.write("job.push.period.time.ms=10000\n")  
+        f.write("job.pull.period.time.ms=10000\n")  
+        # f.write("initial.load.create.first=true\n")  
+        # f.write("initial.load.use.extract.job.enabled=true\n")         
+        f.close
+      rescue IOError
+         response = { "status": false, "message": "Activation is success but something is wrong. \n Please contact code2lab call center!"}
+      end
+      response = { "status": true, "message": "Success Activation. License also created."}
+    end
+  end
+
+  # Run Symmetric 
+  def run_symmetric(sym_path)
+    # check_sym_proc_str = `#{sym_path + "bin/sym_service status"}`
+    # check_sym_proc_str = check_sym_proc_str.split("\n")
+    # sym_install_status = check_sym_proc_str[0].split(": ")
+    
+    check_sym_proc_str = `#{"service SymmetricDS status"}`
+
+    # Check Sym Installed
+    # if sym_install_status[1] == "false"
+    #   response = { "status": false, "message": "Activation is success but Symmetric service not Installed. \n Please contact code2lab call center!"}
+    # end
+
+    # Run Sym Service
+    sym_run_status = check_sym_running(check_sym_proc_str, sym_path)
+    if sym_run_status
+      # Create Sym Table
+      check_sym_table = system(sym_path + "bin/symadmin --engine sx create-sym-tables")
+      if check_sym_table
+        sym_sql = Rails.root + "db/sym_master.sql"
+        
+        if File.exist? (sym_sql)
+          # Import Sym Sql to db and start sym
+          run_sym_sql = system(sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+          stop_sym = system("service SymmetricDS stop")
+          run_sym = system("service SymmetricDS start")
+          if run_sym
+            response = { "status": true, "message": "Activation is success and Configuration done..."}
+          end
+        else
+          response = { "status": false, "message": "Activation is success but Symmetric Sql not found. \n Please contact code2lab call center!"}
+        end
+      end
+    else      
+      response = { "status": false, "message": "Activation is success but Symmetric not running. \n Please contact code2lab call center!"}
+    end
+  end
+
+  # Check Symmetric Running
+  def check_sym_running(status, sym_path)
+    # Run Sym Service
+    # if status.include? "Server is already running" 
+    #   return true
+    # elsif status.include? "false"
+    #   sym_start_str = `#{sym_path + "bin/sym_service start"}`
+    #   if sym_start_str.include? "Started"
+    #     return true
+    #   else
+    #     check_sym_running(sym_start_status[0])
+    #   end  
+    # else
+    #   return true      
+    # end
+
+    if status.include? "Active: active (running)" || "Active: active (exited)"   #"Server is already running"
+      return true
+    end
+    return false
+  end
+
+  # Delete License File
+  def delete_license_file
+    File.delete("config/license.yml") if File.exist?("config/license.yml")   
+  end
+
+    # Assign db info for Cloud
+  def assign(aes_key, aes_iv)    
+    key = Base64.decode64(aes_key)
+    iv = Base64.decode64(aes_iv)
+    
+    if (@license["dbhost"] || @license["dbschema"] || @license["dbusername"] || @license["dbpassword"] )           
+      host = Base64.decode64(@license["dbhost"])
+      dbschema = Base64.decode64(@license["dbschema"])
+      dbusername = Base64.decode64(@license["dbusername"])
+      dbpassword = Base64.decode64(@license["dbpassword"])
+
+      self.dbhost = AESCrypt.decrypt_data(host, key, iv, ENV['CIPHER_TYPE'])
+      self.dbschema = AESCrypt.decrypt_data(dbschema, key, iv, ENV['CIPHER_TYPE'])
+      self.dbusername = AESCrypt.decrypt_data(dbusername, key, iv, ENV['CIPHER_TYPE'])
+      self.dbpassword = AESCrypt.decrypt_data(dbpassword, key, iv, ENV['CIPHER_TYPE'])      
+    end
+    
   end
 end
diff --git a/app/models/membership_setting.rb b/app/models/membership_setting.rb
index 89f9eb14..3b60c781 100755
--- a/app/models/membership_setting.rb
+++ b/app/models/membership_setting.rb
@@ -1,2 +1,3 @@
 class MembershipSetting < ApplicationRecord
+	MembershipSetting = MembershipSetting.find_by_id(1)
 end
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 9bfcdb85..67a3c823 100755
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -13,7 +13,7 @@ class MenuItem < ApplicationRecord
   has_many :menu_item_sets
   has_many :item_sets, through: :menu_item_sets
 
-  validates_presence_of :item_code, :name, :type, :min_qty, :taxable,:account_id
+  validates_presence_of :item_code, :name, :type, :min_qty,:account_id
   validates_uniqueness_of :item_code
   
   default_scope { order('item_code asc') }
diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb
index a51a94c4..baad6392 100755
--- a/app/models/menu_item_instance.rb
+++ b/app/models/menu_item_instance.rb
@@ -4,8 +4,9 @@ class MenuItemInstance < ApplicationRecord
   has_many :menu_instance_item_sets
   has_many :item_sets, through: :menu_instance_item_sets
   # before_create :generate_menu_item_instance_code
-  validates_presence_of :item_instance_code
-  # validates_uniqueness_of :item_instance_code
+  # validates_presence_of :item_instance_code
+
+  validates_uniqueness_of :item_instance_code
 
   def self.findParentCategory(item)
     if item.menu_category_id
diff --git a/app/models/my_aes_crypt.rb b/app/models/my_aes_crypt.rb
index 7427a000..680d0624 100644
--- a/app/models/my_aes_crypt.rb
+++ b/app/models/my_aes_crypt.rb
@@ -1,3 +1,7 @@
+require 'openssl'
+require 'base64'
+require 'json'
+
 class MyAesCrypt
 	@cipher = ""
 
@@ -7,14 +11,51 @@ class MyAesCrypt
 
 	def export_key(passphrase)
 		# We want a 256 bit key symetric key based on passphrase
+		# for cloud is lookup
+		# for local is license_key
+		# iv_salt = passphrase+"c2l"
+		passphrase = passphrase + ENV['SX_KEY']
+		passphrase = passphrase.gsub(".","_")
 		digest = Digest::SHA256.new
-		key = digest.update(passphrase)
-		key = digest.digest 
-		ENV['AES_KEY']  = cipher_key = key # stores the key in key, and also sets the generated key on the @cipher
-		ENV['AES_IV']  = cipher_iv = @cipher.random_iv # stores the iv in iv, and also sets the generated iv on the @cipher
+		key_digest = digest.update(passphrase)			
+		key = key_digest.digest
+		
+		# iv = iv_digest.digest
+		ENV['AES_KEY']  = cipher_key = Base64.encode64(key) # stores the key in key, and also sets the generated key on the @cipher
+		ENV['AES_IV']  = cipher_iv = Base64.encode64(@cipher.random_iv) # stores the iv in iv, and also sets the generated iv on the @cipher
 		return cipher_key, cipher_iv
 	end
 
+	def export_to_file(passphrase)
+		file_path = "config/shops.json"
+		aes_key, aes_iv = export_key(passphrase)
+		tmpHash = { 			
+			"lookup" => passphrase,
+			"value" => 
+			{
+				"key"	 => aes_key,
+				"iv"	 => aes_iv
+			}
+		}
+
+		shop_data = File.read(file_path)
+
+		shop_json = JSON.parse(shop_data)	
+		shop_json["data"].each do |j|
+			if j["lookup"] == passphrase				
+				return j["value"]["key"], j["value"]["iv"]
+			end
+		end
+
+		shop_json["data"] << tmpHash
+
+		File.open(file_path, "w") { |io|
+			io.puts JSON.pretty_generate(shop_json)
+		}
+
+		return aes_key, aes_iv
+	end
+
 	private
 	def encrypt(data)
 		cipher.encrypt
diff --git a/app/models/order.rb b/app/models/order.rb
index 33022eec..ba8adc8f 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -133,7 +133,7 @@ class Order < ApplicationRecord
 
           OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id],
                           item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
-                          self.employee_name)
+                          self.employee_name, menu_item[:taxable])
 
         #end
       end
@@ -363,18 +363,18 @@ class Order < ApplicationRecord
 
   end
 
-  def self.search(filter,from,to,count)
-    if count.to_i > 0
-      item_count = "and item_count = '#{count}'"
+  def self.search(filter,from,to)
+    if filter.blank?
+        keyword = ''
     else
-      item_count = ''
+        keyword = "order_id LIKE ? OR status LIKE ? OR order_type LIKE ? OR source='#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%"
     end
-   if from.present? && to.present?
-      Order.where("DATE_FORMAT(date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(date,'%d-%m-%Y') <= ? #{item_count}", from,to)
-    elsif !from.present? && !to.present? && count.present?
-      Order.where("item_count = '#{count}'")
+
+    if from.present? && to.present?
+      order = Order.where("DATE_FORMAT(date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(date,'%d-%m-%Y') <= ?", from,to)
+      query = order.where(keyword)
     else  
-      Order.where("order_id LIKE ? OR status LIKE ? OR order_type LIKE ? OR source='#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
+      where("order_id LIKE ? OR status LIKE ? OR order_type LIKE ? OR source='#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%")
     end
   end
 
diff --git a/app/models/order_item.rb b/app/models/order_item.rb
index 12c8c378..776bb94c 100755
--- a/app/models/order_item.rb
+++ b/app/models/order_item.rb
@@ -20,7 +20,7 @@ class OrderItem < ApplicationRecord
   #     option_values : [],
   #     sub_order_items : [],
   # }
-  def self.processs_item (item_code, instance_code, menu_name, alt_name, account_id, qty,price, options, set_menu_items, order_id, item_order_by)
+  def self.processs_item (item_code, instance_code, menu_name, alt_name, account_id, qty,price, options, set_menu_items, order_id, item_order_by, taxable)
 
     orderitem = OrderItem.create do |oitem|
       oitem.order_id = order_id
@@ -31,6 +31,7 @@ class OrderItem < ApplicationRecord
       oitem.account_id = account_id
       oitem.qty       = qty
       oitem.price   = price
+      oitem.taxable = taxable
       oitem.options     = options
       oitem.set_menu_items = set_menu_items
       oitem.item_order_by = item_order_by #person who order this. * If emenu - it will be login user on the app
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index fcdb4983..c8a3a552 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -116,13 +116,13 @@ class OrderQueueStation < ApplicationRecord
   end
 
   #Print order_item in 1 slip per item
-  def print_slip_item(oqs, assigned_order_item)
+  def print_slip_item(oqs, assigned_item)
     unique_code="OrderItemPdf"    
-
+    order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
     # print when complete click 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    order_queue_printer.print_order_item(print_settings, oqs,item.order_id, item.item_code, print_status="" )
+    order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
     
     # update print status for completed same order items
     assigned_order_item.each do |ai|
diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb
index c326f715..a13229dc 100755
--- a/app/models/print_setting.rb
+++ b/app/models/print_setting.rb
@@ -1,4 +1,4 @@
 class PrintSetting < ApplicationRecord
 	# validations
-	validates_presence_of :name, :unique_code, :printer_name, :page_width, :page_height
+	validates_presence_of :name, :unique_code, :printer_name, :page_width, :page_height, :print_copies
 end
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 13d8a20a..cc08f9ba 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -1,12 +1,18 @@
 class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
-  def print_order_item(print_settings,oqs,order_id, item_code, print_status, options="")
+  def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, options="")
     #Use CUPS service
     #Generate PDF
     #Print
-    order_item =  print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code)  
+    # Must be one print  
+    if print_settings.print_copies == 0
+      print_settings.print_copies = 1
+      print_settings.save!
+    end
 
-    filename = "tmp/order_item.pdf" 
+    order_item =  print_query('order_item', order_item_id) #OrderItem.find_by_item_code(item_code)  
+
+    filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
     # check for item not to show 
     # if order_item[0].price != 0 
@@ -14,12 +20,13 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       pdf.render_file filename    
 
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)
-        self.print(filename, oqs.printer_name)
+        self.print(filename, oqs.printer_name)        
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
+        print_settings.print_copies = 1
+        print_settings.save!
         self.print(filename, oqs.printer_name)
       end 
     # end   
@@ -29,42 +36,51 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   def print_order_summary(print_settings,oqs, order_id, order_items, print_status)
     #Use CUPS service
     #Generate PDF
-    #Print   
-    order=print_query('order_summary', order_id)
+    #Print 
+    # Must be one print  
+    if print_settings.print_copies == 0
+      print_settings.print_copies = 1
+      print_settings.save!
+    end 
 
+    order=print_query('order_summary', order_id)    
     # For Print Per Item
     if oqs.cut_per_item
-      order.each do|odi|
-        filename = "tmp/order_item.pdf"
+
+      order_items.each do|odi|
+        odi_item=print_query('order_item', odi.order_items_id)   
+        filename = "tmp/order_item_#{order_id}" + ".pdf" 
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi, print_status, options, oqs.use_alternate_name)
+          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
           # pdf.render_file "tmp/order_item.pdf"
           pdf.render_file filename
-          if oqs.print_copy
-            self.print(filename, oqs.printer_name)
+          if oqs.print_copy               
             self.print(filename, oqs.printer_name)
             # self.print(filename.gsub(".","-copy."), oqs.printer_name)
           else
+            print_settings.print_copies = 1
+            print_settings.save!
             self.print(filename, oqs.printer_name)
           end
         #end 
       end
     # For Print Order Summary
     else      
-      filename = "tmp/order_summary.pdf"
+      filename = "tmp/order_summary_#{order_id}" + ".pdf"
       pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
       pdf.render_file filename
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)
-        self.print(filename, oqs.printer_name)
+        self.print(filename, oqs.printer_name)        
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
+        print_settings.print_copies = 1
+        print_settings.save!
         self.print(filename, oqs.printer_name)
       end
     end
@@ -72,11 +88,17 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
   # Print for orders in booking
   def print_booking_summary(print_settings,oqs, booking_id, print_status)
+    # Must be one print  
+    if print_settings.print_copies == 0
+      print_settings.print_copies = 1
+      print_settings.save!
+    end 
+
     order=print_query('booking_summary', booking_id)
     # For Print Per Item
     if oqs.cut_per_item
       order.each do|odi|
-        filename = "tmp/order_item.pdf"
+        filename = "tmp/order_item_#{booking_id}" + ".pdf"
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
 
@@ -89,25 +111,29 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             self.print(filename, oqs.printer_name)
 
             #For print copy
-            pdf.render_file filename.gsub(".","-copy.")
-            self.print(filename.gsub(".","-copy."), oqs.printer_name)
+            # pdf.render_file filename.gsub(".","-copy.")
+            # self.print(filename.gsub(".","-copy."), oqs.printer_name)
           else
+            print_settings.print_copies = 1
+            print_settings.save!
             self.print(filename, oqs.printer_name)
           end 
         #end
       end
     # For Print Order Summary
     else      
-      filename = "tmp/booking_summary.pdf"      
+      filename = "tmp/booking_summary_#{booking_id}" + ".pdf"      
       pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
       pdf.render_file filename
       if oqs.print_copy
         self.print(filename, oqs.printer_name)
 
         #For print copy
-        pdf.render_file filename.gsub(".","-copy.")
-        self.print(filename.gsub(".","-copy."), oqs.printer_name)
+        # pdf.render_file filename.gsub(".","-copy.")
+        # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
+        print_settings.print_copies = 1
+        print_settings.save!
         self.print(filename, oqs.printer_name)
       end
     end
@@ -117,13 +143,13 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   def print_query(type, id)
     if type == "order_item"
       OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
-        .joins("left join orders ON orders.order_id = order_items.order_id
+        .joins("left join orders ON orders.order_id = order_items.order_id                
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id
                 left join menu_items as item ON item.item_code = order_items.item_code")
-        .where("order_items.item_instance_code = '#{ id }'")
+        .where("order_items.order_items_id = '#{ id }'")
         .group("order_items.item_code")
     elsif type == "order_summary"                                
       OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb
index 832e24bf..ad844cfe 100755
--- a/app/models/printer/printer_worker.rb
+++ b/app/models/printer/printer_worker.rb
@@ -33,7 +33,6 @@ class Printer::PrinterWorker
   end
 
   def print(file_path,printer_destination = nil )
-
     if printer_destination.nil?
       printer_destination = self.printer_destination
     end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 30bd5ed8..adcb187e 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -65,15 +65,19 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   end
 
   #Bill Receipt Print
-  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)
+  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,balance)
     #Use CUPS service
     #Generate PDF
     #Print
 
-    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status)
+    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
 
     # print as print copies in printer setting
     count = printer_settings.print_copies
+
+    # override print copies for print worker loop
+    print_settings.print_copies = 1
+    print_settings.save!
     begin
       if count == 1
         pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}.pdf"
@@ -100,7 +104,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Generate PDF
     #Print
     pdf = QueueNoPdf.new(printer_settings,queue)
-        pdf.render_file "tmp/print_queue_no.pdf"
+    pdf.render_file "tmp/print_queue_no.pdf"
     self.print("tmp/print_queue_no.pdf")
   end
 
@@ -113,4 +117,15 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
         pdf.render_file "tmp/print_crm_order.pdf"
     self.print("tmp/print_crm_order.pdf")
   end
+
+  #Queue No Print
+  def print_call_waiter(printer_settings,table,time,shop_detail)
+    #Use CUPS service
+    #Generate PDF
+    #Print
+    pdf = CallWaiterPdf.new(printer_settings,table,time,shop_detail)
+    pdf.render_file "tmp/print_call_waiter.pdf"
+    self.print("tmp/print_call_waiter.pdf")
+  end
+
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 7cacedf3..b97c529e 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -225,7 +225,11 @@ class Sale < ApplicationRecord
       puts "item.sales_item_id ddd"
       puts item.sale_item_id
       subtotal_price = subtotal_price + item.price
-      total_taxable = total_taxable + item.taxable_price
+
+      # only calc tax when true
+      if(item.is_taxable)
+        total_taxable = total_taxable + item.taxable_price
+      end
       # total_taxable = total_taxable + (item.taxable_price * item.qty)
     end
 
@@ -287,7 +291,11 @@ class Sale < ApplicationRecord
       if item.remark != 'void' && item.remark != 'foc'
         #compute each item and added to total
         subtotal_price = subtotal_price + item.price
-        total_taxable = total_taxable + item.price
+
+        # only calc tax when true
+        if(item.is_taxable)
+          total_taxable = total_taxable + item.taxable_price
+        end
       end
     end
 
@@ -449,7 +457,7 @@ class Sale < ApplicationRecord
        sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and NOT sale_status = 'void' ", from,to)
        query = sale.where(keyword)
     else
-        where("receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%",)
+        where("receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%")
     end
 
   end
@@ -519,10 +527,10 @@ def self.daily_sales_list(from,to)
      SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
      SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
      SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
-    SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
-    SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount")
+     SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
+     SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount")
   .joins("join (select * from sale_payments group by sale_payments.sale_id, sale_payments.payment_method) sale_payments on sale_payments.sale_id = sales.sale_id")
-  .where("sale_status = ? AND sales.receipt_date between ? and ? AND total_amount != 0", 'completed', from, to)
+  .where("sale_status = ? AND sales.receipt_date between ? and ? ", 'completed', from, to)
   .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')")
 
     daily_total = Array.new
@@ -562,7 +570,7 @@ def self.daily_sales_list(from,to)
                  :grand_total => grand_total,
                  :old_grand_total => old_grand_total,
                  :void_amount => void_amount,
-                   :rounding_adj => sale.rounding_adj}
+                 :rounding_adj => sale.rounding_adj}
         daily_total.push(total)
       end
 
@@ -591,11 +599,40 @@ def self.get_by_range_by_saleitems(from,to,status,report_type)
 end
 
 def self.get_by_shiftsales(from,to,shift)
-   if !shift.blank?
-     ShiftSale.where("id =?",shift.id)
-   else
-     ShiftSale.where("(shift_started_at between ? and ? OR shift_closed_at between ? and ? )", from, to, from, to)
-   end
+  if !shift.blank?
+    query = ShiftSale.where("shift_sales.id =?",shift.id)
+  else
+    query = ShiftSale.where("(shift_started_at between ? and ? OR shift_closed_at between ? and ? )", from, to, from, to)
+  end
+
+  shift_sale_data = Hash.new
+
+  query.each do |shift_sale|
+    foc = 0
+    foc_data = Sale.select("SUM(sp.payment_amount) as foc_sales")
+              .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
+              .where("sales.shift_sale_id=? and sp.payment_method='foc'",shift_sale.id)
+              .first()
+    
+    if !foc_data.foc_sales.nil? && foc_data.foc_sales > 0
+      shift_sale.other_sales -= foc_data.foc_sales
+      foc = foc_data.foc_sales
+    end
+
+    shift_sale_data[shift_sale.id] = {
+      :cashier_terminal_name => shift_sale.cashier_terminal.name,
+      :employee_name => shift_sale.employee.name,
+      :shift_started_at => shift_sale.shift_started_at,
+      :shift_closed_at => shift_sale.shift_closed_at,
+      :cash_sales => shift_sale.cash_sales,
+      :credit_sales => shift_sale.credit_sales,
+      :other_sales => shift_sale.other_sales.to_f,
+      :foc_sales => foc,
+      :grand_total => shift_sale.grand_total
+    }
+  end
+
+  return shift_sale_data.values
 end
 
 def self.get_by_shift_sale(from,to,status)
@@ -608,41 +645,38 @@ def self.get_by_shift_sale(from,to,status)
 end
 
 def self.get_item_query()
-    #  query = SaleItem.select("acc.title as account_name,account_id, item_instance_code as item_code, " +
-    #                       "SUM(qty * unit_price) as grand_total,SUM(qty) as total_item," +
-    #                       " unit_price as unit_price,product_name as product_name, 'cat' as" +
-    #                       " menu_category_name,'test' as menu_category_id ")
+  query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
+                     "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
+                     "i.remark as status_type,"+
+                     " i.unit_price as unit_price,i.product_name as product_name, mc.name as" +
+                     " menu_category_name,mc.id as menu_category_id ")
 
-    #   query = query.joins("JOIN sales s ON s.sale_id = sale_items.sale_id" +
-    #                       " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id")
-    #             # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
+  query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
+                     " JOIN menu_item_instances mii ON i.item_instance_code = mii.item_instance_code" +
+                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+                     " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id" + 
+                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+                     # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
+  query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
+  # query = query.where("i.item_instance_code IS NOT NULL")
+  query = query.group("i.product_name").order("mi.account_id desc")
+end
 
-    # query = query.joins(" JOIN accounts acc ON acc.id = account_id")
-    # query = query.where("item_instance_code is not NULL")
-    # query = query.group("item_instance_code").order("account_id")
-
-      query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code, " +
-                          "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item," +
-                          "i.remark as status_type,"+
-                          " i.unit_price as unit_price,i.product_name as product_name, mc.name as" +
-                          " menu_category_name,mc.id as menu_category_id ")
-
-      query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
-                          " JOIN menu_item_instances mii ON i.item_instance_code = mii.item_instance_code" +
-                         " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
-                         " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id" + 
-                         " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
-                # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
-
-    query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
-    query = query.where("i.item_instance_code IS NOT NULL")
-    query = query.group("i.product_name").order("mi.account_id, mi.menu_category_id")
+def self.get_other_charges()
+  query = Sale.select("i.account_id as account_id, " +
+                     "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item," +
+                     "i.remark as status_type,"+
+                     " i.unit_price as unit_price,i.product_name as product_name")
+  query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id")
+  query = query.where("i.item_instance_code IS NULL AND i.product_code = 'Other Charges'")
+  query = query.group("i.sale_item_id")
 end
 
 def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
   # date_type_selection = get_sql_function_for_report_type(report_type)
 
   query = self.get_item_query()
+
   discount_query = 0
   total_card_amount = 0
   total_cash_amount = 0
@@ -650,10 +684,13 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
   total_foc_amount = 0
   total_grand_total = 0
 
+  other_charges = self.get_other_charges()
+
   if shift.present?
       query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
+      other_charges  = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
       discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount)
-      change_amount = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed)
+      change_amount  = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed)
       sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
@@ -671,8 +708,9 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
       ### => get all sales range in shift_sales
   elsif shift_sale_range.present?
       query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
+      other_charges  = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
       discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount)
-      change_amount = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
+      change_amount  = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
       sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
@@ -685,12 +723,14 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
         total_credit_amount += s_c.credit_amount.to_f
         total_foc_amount += s_c.foc_amount.to_f
       end
+
       total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
 
   else
       query          = query.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to)
+      other_charges  = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to)
       discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount)
-      change_amount = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed)
+      change_amount  = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed)
       sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                     SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
                                     SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
@@ -707,7 +747,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
 
   end
 
-  return query, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
+  return query,other_charges, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
 end
 
 def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_type)
@@ -724,23 +764,19 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
 
     query = Sale.all
     if shift.present?
-
-      query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a)
+      query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.payment_status= 'paid' and sale_payments.payment_amount != 0", shift.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
-
     elsif shift_sale_range.present?
-
-      query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.shift_sale_id in (?)",shift_sale_range.to_a)
+      query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.payment_status= 'paid' and sales.shift_sale_id in (?)",shift_sale_range.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
-
     else
-
-      query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sale_payments.payment_amount != 0",from,to)
+      query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sales.payment_status= 'paid' and sale_payments.payment_amount != 0",from,to)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
     end
+    return query
 end
 
 def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to)
@@ -795,27 +831,28 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
            .where("sales.shift_sale_id in (?) and sale_status= 'completed'", shift.to_a)
            .group("sale_taxes.tax_name")
-           .order("sale_taxes.sale_tax_id asc")
+           .order("sale_taxes.tax_name desc")
   elsif shift_sale_range.present?
     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
            .where("sales.shift_sale_id in (?) and sale_status= 'completed'", shift_sale_range.to_a)
            .group("sale_taxes.tax_name")
-           .order("sale_taxes.sale_tax_id asc")
+           .order("sale_taxes.tax_name desc")
   else
     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
            .where("sales.receipt_date between ? and ? and sale_status= 'completed'", from,to)
            .group("sale_taxes.tax_name")
-           .order("sale_taxes.sale_tax_id asc")
+           .order("sale_taxes.tax_name desc")
   end
 end
 
 def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type)
     
-    sale_payment   = SalePayment.select("s.receipt_no, sale_payments.*,s.receipt_date as sale_date,
+    sale_payment   = SalePayment.select("s.amount_changed as change_amount,s.receipt_no, sale_payments.*,s.receipt_date as sale_date,
                                 s.cashier_name as cashier_name")
                       .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+                      .order('s.receipt_no DESC')
 
     payments_total = SalePayment.select("CAST((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')) AS DATE) as sale_date,
                        SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount,
@@ -824,6 +861,7 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type
                        SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
                        SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
                        SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
+                       SUM(case when (sale_payments.payment_method='cash') then sales.amount_changed else 0 end) as total_change_amount,
                       SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
                       SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount")
                     .joins("join sales on sales.sale_id = sale_payments.sale_id")            
@@ -875,7 +913,7 @@ end
 # end
 
 def grand_total_after_rounding
-    return self.old_grand_total.to_f + self.rounding_adjustment.to_f
+    return self.grand_total.to_f + self.rounding_adjustment.to_f
 end
 
   def get_cash_amount
@@ -941,16 +979,16 @@ end
   def self.hourly_sales(today)
     query= Sale.select("grand_total")
             .where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
-            .group("date_format(receipt_date, '%I %p')")
+            .group("date_format(CONVERT_TZ(receipt_date,'+00:00', 'SYSTEM'), '%I %p')")
+            .order('receipt_date')
   end
 
   def self.employee_sales(today)
-    query = Sale.select("e.name as employee_name,grand_total")
-            .where('sales.payment_status="paid" and sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-            .joins("join employees e on e.id=sales.cashier_id")
-            .joins("join sale_payments sp on sp.sale_id=sales.sale_id")
-            .group("sp.payment_method","e.name")
-            .order('e.name')
+    query = Sale.joins("JOIN employees as e on e.id=sales.cashier_id")
+                .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id")
+                .where("sales.payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = '#{today}'")
+                .group("(CASE WHEN (sp.payment_method='mpu' or sp.payment_method='visa' or sp.payment_method='master' or sp.payment_method='jcb') THEN 'card' ELSE sp.payment_method END)","e.name")
+                .order("e.name")
   end
 
   def self.total_sale(today)
@@ -1000,24 +1038,31 @@ end
           else
             query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           end
-          query.sum("sp.payment_amount")
+          query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
   end
 
   def self.total_customer(today)
-    query = Sale.select("count(distinct sales.customer_id) as total_cus")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ?',today)
-          .first()
+    dinein_cnt = self.total_dinein(today)
+    takeaway_cnt = self.total_takeaway(today)
+    membership_cnt = self.total_membership(today)
+
+    total_cus = 0
+    if !dinein_cnt.nil? || !takeaway_cnt.nil? || !membership_cnt.nil?
+      total_cus = dinein_cnt.total_dinein_cus.to_int + takeaway_cnt.total_take_cus.to_int + membership_cnt.total_memb_cus.to_int
+    end
+
+    return total_cus
   end
 
   def self.total_dinein(today)
-    query = Sale.select("count(distinct sales.customer_id) as total_dinein_cus")
+    query = Sale.select("count(sales.customer_id) as total_dinein_cus")
           .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
           .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Dinein" and c.membership_id is null',today)
           .first()
   end
 
   def self.total_takeaway(today)
-    query = Sale.select("count(distinct sales.customer_id) as total_take_cus")
+    query = Sale.select("count(sales.customer_id) as total_take_cus")
           .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
           .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is null',today)
           .first()
@@ -1026,12 +1071,12 @@ end
   def self.total_membership(today)
     query = Sale.select("count(distinct sales.customer_id) as total_memb_cus")
           .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
-          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type = "Takeaway" and c.membership_id is not null',today)
+          .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and ((c.customer_type = "Dinein" and c.membership_id is not null) or (c.customer_type = "Takeaway" and c.membership_id is not null))',today)
           .first()
   end
 
   def self.total_other_customer(today)
-    query = Sale.select("count(distinct sales.customer_id) as total_cus")
+    query = Sale.select("count(sales.customer_id) as total_cus")
           .joins("JOIN customers as c ON c.customer_id = sales.customer_id")
           .where('sales.sale_status = "completed" and DATE_FORMAT(sales.receipt_date,"%Y-%m-%d") = ? and c.customer_type is null and c.membership_id is null',today)
           .first()
@@ -1062,16 +1107,16 @@ end
   def self.top_items(today)
     query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
           .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+          .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           .group("a.product_code")
-          .order("SUM(a.price) DESC")
+          .order("SUM(a.qty) DESC")
           .first()
   end
 
   def self.total_foc_items(today)
     query = Sale.joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and a.remark='foc' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
-          .count()
+          .where("sales.sale_status = 'completed' and a.remark='foc' and a.product_name not like '%FOC%' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+          .sum("a.qty")
   end
 
   private
diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb
index 3129a4a5..55541851 100755
--- a/app/models/sale_audit.rb
+++ b/app/models/sale_audit.rb
@@ -78,6 +78,36 @@ class SaleAudit < ApplicationRecord
     sale_audit.save!
   end
 
+  def self.record_paymal(sale_id, remark, action_by)
+    sale_audit = SaleAudit.new()
+    sale_audit.sale_id = sale_id
+    sale_audit.action = "PAYMAL"
+    sale_audit.action_at = DateTime.now.utc
+    sale_audit.action_by = action_by
+    sale_audit.remark = remark
+    sale_audit.approved_by = Time.now
+    sale_audit.save!
+  end
+
+  def self.paymal_search(sale_id)
+    paymal = SaleAudit.where("sale_id =? and action = 'PAYMAL'",sale_id)
+     remark = paymal[0].remark.split("}")
+     response = "["+remark[0]+'}]'
+     response = JSON.parse(response)
+      puts response
+     if response[0]["status"]  == true
+        if response[0]["current_rebate_amount"].present?
+          amount = response[0]["current_rebate_amount"]
+        else
+          amount = response[0]["current_balance_amount"]
+        end
+     else
+       amount = nil
+     end
+     return amount
+
+  end
+
   private
   def generate_custom_id
     self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI")
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index a757b7fd..465af104 100755
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -27,27 +27,32 @@ class SaleItem < ApplicationRecord
   end
 
   def self.update_existing_item(qty, item, sale_id, type, item_price, price)
-    sale_item = SaleItem.new
-    sale_item.product_code = item.product_code
-    sale_item.product_name = item.product_name + "(#{type})"
-    sale_item.product_alt_name = item.product_alt_name
-    sale_item.account_id = item.account_id
-    sale_item.remark = type
-    if type == "foc" || type == "promotion" || type == "void"
-      sale_item.qty = qty * (-1)
-    else
-      sale_item.qty = qty
-    end
+      # Original Item to add remark
+      item.remark = type
+      item.save
 
-    sale_item.unit_price = item_price # * (-1)
-    sale_item.taxable_price = (price) * (-1)
-    sale_item.price = (price) * (-1)
+      sale_item = SaleItem.new
+      sale_item.product_code = item.product_code
+      sale_item.item_instance_code = item.item_instance_code
+      sale_item.product_name = item.product_name + " (#{type.upcase})"
+      sale_item.product_alt_name = item.product_alt_name
+      sale_item.account_id = item.account_id
+      sale_item.remark = type
+      if type == "foc" || type == "promotion" || type == "void"
+        sale_item.qty = qty * (-1)
+      else
+        sale_item.qty = qty
+      end
 
-    sale_item.is_taxable = 1
-    sale_item.sale_id = sale_id
-    sale_item.save
-    sale =  Sale.find(sale_id)
-    sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount)
+      sale_item.unit_price = item_price # * (-1)
+      sale_item.taxable_price = (price) * (-1)
+      sale_item.price = (price) * (-1)
+
+      sale_item.is_taxable = 1
+      sale_item.sale_id = sale_id
+      sale_item.save
+      sale =  Sale.find(sale_id)
+      sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount)
   end
 
   def self.get_order_items_details(sale_id)
@@ -94,9 +99,9 @@ class SaleItem < ApplicationRecord
       discount_account = {:name => a.title, :price => 0}
 
       # Check for actual sale items
-      sale_items.where("is_taxable = false AND remark = 'Discount'").find_each do |si|
+      sale_items.where("remark = 'Discount'").find_each do |si|
         if si.account_id == a.id
-          discount_account[:price] = (discount_account[:price].abs + si.price.abs) * (-1)
+          discount_account[:price] = (discount_account[:price].abs + si.price.abs) * (1)
         end
       end
       discount_accounts.push(discount_account)
@@ -145,17 +150,6 @@ class SaleItem < ApplicationRecord
     return price,type
   end
 
-  # Check for Card Payment
-  def self.get_sale_payments_by_card(sale_payments)
-
-      # Check for Card Payment
-      sale_payments.each do |sp|
-        if sp.payment_method == "jcb" || sp.payment_method == "mpu" || sp.payment_method == "visa" || sp.payment_method == "master"
-          return true;
-        end
-      end
-      
-  end
   # def self.get_overall_discount(sale_id)
   #   price = 0.0
   #   item=SaleItem.where("product_code=?", sale_id)
@@ -170,6 +164,5 @@ class SaleItem < ApplicationRecord
   private
   def generate_custom_id
     self.sale_item_id = SeedGenerator.generate_id(self.class.name, "SLI")
-
   end
 end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index cb6b1249..f9d16873 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -97,6 +97,8 @@ class SalePayment < ApplicationRecord
     rescue SocketError
       response = { status: false}
     end
+    Rails.logger.debug "Get Paypar Account "
+    Rails.logger.debug response.to_json
     return response;
   end
 
@@ -151,19 +153,40 @@ class SalePayment < ApplicationRecord
       else
         response =false;
       end
+
+      Rails.logger.debug "Redeem response"
+      Rails.logger.debug response.to_json
+
       return response;
 
   end
 
+    # Check for Card Payment
+  def self.get_sale_payments_by_card(sale_payments)
+    # Check for Card Payment
+    sale_payments.each do |sp|
+      if sp.payment_method == "jcb" || sp.payment_method == "mpu" || sp.payment_method == "visa" || sp.payment_method == "master"
+        return true;
+      end
+    end  
+  end
+
   private
   def cash_payment
+    status = false
+    sale_payments_data = SalePayment.find_by_sale_id(self.sale_id)
+    if sale_payments_data.nil?
+      status = true
+    end
+
     payment_status = false
     self.payment_method = "cash"
     self.payment_amount = self.received_amount
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount)
+
+    sale_update_payment_status(self.received_amount,status)
     return payment_status
   end
 
@@ -171,7 +194,7 @@ class SalePayment < ApplicationRecord
     payment_status = false
 
     # add to sale item with foc
-    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }'")
+    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }' and remark is null")
     
     sale_items.each do|item|
       SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price)
@@ -201,16 +224,14 @@ class SalePayment < ApplicationRecord
     return payment_status
   end
 
-  def external_terminal_card_payment(method)
+  def external_terminal_card_payment(method)    
     payment_status = false
-
     self.payment_method = method
     self.payment_amount = self.received_amount
     self.payment_reference  = self.card_payment_reference
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-
     sale_update_payment_status(self.received_amount)
     return payment_status
   end
@@ -255,6 +276,10 @@ class SalePayment < ApplicationRecord
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
     membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
 
+     #record an payment in sale-audit
+      remark = "#{membership_data} Redeem- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
+      sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
+
     if membership_data["status"]==true
       self.payment_method = "paypar"
       self.payment_amount = self.received_amount
@@ -272,7 +297,7 @@ class SalePayment < ApplicationRecord
 
   end
 
-  def sale_update_payment_status(paid_amount)
+  def sale_update_payment_status(paid_amount,check_foc = false)    
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
     self.sale.save!
@@ -305,9 +330,13 @@ class SalePayment < ApplicationRecord
      
       self.sale.sale_status = "completed"
 
-      if MembershipSetting.find_by_rebate(1) && is_foc == 0
+      if MembershipSetting.find_by_rebate(1) && is_foc == 0 && is_credit == 0
         response = rebat(sObj)
-      
+        
+         #record an payment in sale-audit
+         remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
+         sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
+
         if !response.nil?
           if response["status"] == true
           self.sale.rebate_status = 'true'
@@ -327,8 +356,10 @@ class SalePayment < ApplicationRecord
 
       self.sale.save!
       table_update_status(sObj)
-      
-      if paid_amount != "0.0"
+
+      if check_foc
+        update_shift
+      elsif paid_amount != "0.0"
         update_shift
       end
     end
@@ -341,12 +372,18 @@ class SalePayment < ApplicationRecord
       shift.update(self.sale)
       self.sale.shift_sale_id = shift.id
       self.sale.save
+    else
+      shift = ShiftSale.current_shift
+      shift.update(self.sale)
+      self.sale.shift_sale_id = shift.id
+      self.sale.save
     end
   end
 
   def table_update_status(sale_obj)
     status = true
     booking = Booking.find_by_sale_id(sale_obj.id)
+
     if booking
       table = DiningFacility.find(booking.dining_facility_id)
       bookings = table.bookings
@@ -355,12 +392,15 @@ class SalePayment < ApplicationRecord
           if tablebooking.sale_id
             if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void'
               status = false
+            else
+              status = true
             end
           else
             status = false
           end
         end
       end
+
       if status
          table.status = "available"
          table.save
@@ -388,6 +428,7 @@ class SalePayment < ApplicationRecord
       # overall_dis = SaleItem.get_overall_discount(sObj.id)
       overall_dis   = sObj.total_discount
       
+      if credit != 1
         membership        = MembershipSetting.find_by_membership_type("paypar_url")
         memberaction      = MembershipAction.find_by_membership_type("get_member_campaign")
         merchant_uid      = memberaction.merchant_account_id.to_s
@@ -416,89 +457,93 @@ class SalePayment < ApplicationRecord
         rescue SocketError
            response = { "status": false, "message": "Can't connect server"}
         end
-      redeem_amount = payparcost + overall_dis
 
-      total_percentage = 0
+        redeem_amount = payparcost + overall_dis
 
-      type_arr = []
-      # Check for present response fields
-      if response["membership_campaign_data"].present?
-        response["membership_campaign_data"].each do |a|
-          data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i}
-          total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i
-        
-          type_arr.push(data)
-        end
-      end
+        total_percentage = 0
 
-      rebate_arr =[]
-      campaign_method.each do |a|
-        data = {:type => a[:type], :amount => a[:amount]}
-        type_arr.each do |si|
-          if si[:type] == a[:type]
-            if credit == 1
-               data[:amount] = 0
-            else
-              amount = (redeem_amount / total_percentage)*si[:percentage]
-              actual = a[:amount] - amount
-              data[:amount] = actual
-            end
-            
+        type_arr = []
+        Rails.logger.debug "Get Member Campaign"
+        Rails.logger.debug response.to_json
+        # Check for present response fields
+        if response["membership_campaign_data"].present?
+          response["membership_campaign_data"].each do |a|
+            data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i}
+            total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i
+          
+            type_arr.push(data)
           end
         end
-        rebate_arr.push(data)
-      end
 
-   		total_amount = rebate_prices - payparcost - overall_dis
-
-      if credit == 1
-        total_amount = 0
-      end
-      if total_amount >= 0
-     		receipt_no        = sObj.receipt_no
-        membership        = MembershipSetting.find_by_membership_type("paypar_url")
-        memberaction      = MembershipAction.find_by_membership_type("rebate")
-        merchant_uid      = memberaction.merchant_account_id.to_s
-        campaign_type_id  = memberaction.additional_parameter["campaign_type_id"]
-        auth_token        = memberaction.auth_token.to_s
-        url               = membership.gateway_url.to_s + memberaction.gateway_url.to_s
-
-        # Control for Paypar Cloud
-        begin
-          response = HTTParty.post(url, 
-                                :body => { 
-                                  generic_customer_id:generic_customer_id ,
-                                  total_sale_transaction_amount: sObj.grand_total,
-                                  merchant_uid:merchant_uid,
-                                  total_amount: total_amount,
-                                  campaign_type_id: campaign_type_id,
-                                  receipt_no: receipt_no,
-                                  campaign_method: rebate_arr.to_json,
-                                  auth_token:auth_token
-                                }.to_json,
-                                :headers => {
-                                  'Content-Type' => 'application/json',
-                                  'Accept'       => 'application/json; version=2'
-                                }, :timeout => 10)
-        rescue Net::OpenTimeout
-           response = { "status": false , "message": "Connect To" }
-        rescue OpenURI::HTTPError
-           response = { "status": false, "message": "Can't connect server"}
-          
-        rescue SocketError
-           response = { "status": false, "message": "Can't connect server"}
+        rebate_arr =[]
+        campaign_method.each do |a|
+          data = {:type => a[:type], :amount => a[:amount]}
+          type_arr.each do |si|
+            if si[:type] == a[:type]
+              if credit == 1
+                 data[:amount] = 0
+              else
+                amount = (redeem_amount / total_percentage)*si[:percentage]
+                actual = a[:amount] - amount
+                data[:amount] = actual
+              end
+              
+            end
+          end
+          rebate_arr.push(data)
+        end
+
+     		total_amount = rebate_prices - payparcost - overall_dis
+
+        if credit == 1
+          total_amount = 0
+        end
+
+        if total_amount >= 0
+       		receipt_no        = sObj.receipt_no
+          membership        = MembershipSetting.find_by_membership_type("paypar_url")
+          memberaction      = MembershipAction.find_by_membership_type("rebate")
+          merchant_uid      = memberaction.merchant_account_id.to_s
+          campaign_type_id  = memberaction.additional_parameter["campaign_type_id"]
+          auth_token        = memberaction.auth_token.to_s
+          url               = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+
+          # Control for Paypar Cloud
+          begin
+            response = HTTParty.post(url, 
+                                  :body => { 
+                                    generic_customer_id:generic_customer_id ,
+                                    total_sale_transaction_amount: sObj.grand_total,
+                                    merchant_uid:merchant_uid,
+                                    total_amount: total_amount,
+                                    campaign_type_id: campaign_type_id,
+                                    receipt_no: receipt_no,
+                                    campaign_method: rebate_arr.to_json,
+                                    auth_token:auth_token
+                                  }.to_json,
+                                  :headers => {
+                                    'Content-Type' => 'application/json',
+                                    'Accept'       => 'application/json; version=2'
+                                  }, :timeout => 10)
+          rescue Net::OpenTimeout
+             response = { "status": false , "message": "Connect To" }
+          rescue OpenURI::HTTPError
+             response = { "status": false, "message": "Can't connect server"}
+            
+          rescue SocketError
+             response = { "status": false, "message": "Can't connect server"}
+          end
+          Rails.logger.debug "Rebage Response"
+          Rails.logger.debug response.to_json
+          return response
         end
-        return response
       end
     else
-       response = { "status": "no_member", "message": "Not membership"}
-   
+       response = { "status": "no_member", "message": "Not membership"}  
     end
 
   end
 
-
-
   private
   def generate_custom_id
     self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI")
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index baf11cb3..57816948 100755
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -52,10 +52,10 @@ class ShiftSale < ApplicationRecord
     self.total_taxes = self.total_taxes + saleobj.total_tax
     self.grand_total = self.grand_total + saleobj.grand_total
     self.cash_sales = self.cash_sales.to_f + cash.to_f
-    self.credit_sales = self.credit_sales.to_i + credit.to_f
-    self.other_sales = self.other_sales.to_i + other_sales.to_f
-    self.nett_sales = self.nett_sales + (saleobj.total_amount.to_f - self.total_discounts)  #self.grand_total.to_i -  self.commercial_taxes
-    self.commercial_taxes = self.commercial_taxes.to_i + tax.to_f
+    self.credit_sales = self.credit_sales.to_f + credit.to_f
+    self.other_sales = self.other_sales.to_f + other_sales.to_f
+    self.nett_sales = self.nett_sales + (saleobj.total_amount.to_f - saleobj.total_discount)  #self.grand_total.to_f -  self.commercial_taxes
+    self.commercial_taxes = self.commercial_taxes.to_f + tax.to_f
     self.total_rounding = self.total_rounding + saleobj.rounding_adjustment
     self.total_receipt = self.total_receipt + 1
     if saleobj.customer.customer_type == "Dinein"
@@ -79,10 +79,10 @@ class ShiftSale < ApplicationRecord
       self.total_taxes = self.total_taxes - saleobj.total_tax
       self.grand_total = self.grand_total - saleobj.grand_total
       self.cash_sales = self.cash_sales.to_f - cash.to_f
-      self.credit_sales = self.credit_sales.to_i - credit.to_f
-      self.other_sales = self.other_sales.to_i - other_sales.to_f
+      self.credit_sales = self.credit_sales.to_f - credit.to_f
+      self.other_sales = self.other_sales.to_f - other_sales.to_f
       self.nett_sales = self.nett_sales - (saleobj.total_amount.to_f - self.total_discounts)  #self.grand_total.to_i -  self.commercial_taxes
-      self.commercial_taxes = self.commercial_taxes.to_i - tax.to_f
+      self.commercial_taxes = self.commercial_taxes.to_f - tax.to_f
       self.total_rounding = self.total_rounding - saleobj.rounding_adjustment
       self.total_void = self.total_void + saleobj.grand_total
       if saleobj.customer.customer_type == "Dinein"
@@ -121,7 +121,7 @@ class ShiftSale < ApplicationRecord
                           "JOIN accounts acc ON acc.id = i.account_id" + 
                           " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id")
       if type == 'discount'
-        query = query.where("sales.shift_sale_id =? and sale_status = 'completed' and i.is_taxable = false and i.remark = 'Discount'", shift.id)
+        query = query.where("sales.shift_sale_id =? and sale_status = 'completed' and i.remark = 'Discount'", shift.id)
                 .group("acc.title").order("acc.id")
       else
         query = query.where("sales.shift_sale_id =? and sale_status = 'completed'", shift.id)
diff --git a/app/models/shop.rb b/app/models/shop.rb
index 9e8217df..c722adc2 100755
--- a/app/models/shop.rb
+++ b/app/models/shop.rb
@@ -1,3 +1,3 @@
 class Shop < ApplicationRecord
-
+	ShopDetail = Shop.find_by_id(1)
 end
diff --git a/app/pdf/call_waiter_pdf.rb b/app/pdf/call_waiter_pdf.rb
new file mode 100644
index 00000000..a1ea756b
--- /dev/null
+++ b/app/pdf/call_waiter_pdf.rb
@@ -0,0 +1,71 @@
+class CallWaiterPdf < Prawn::Document
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
+  def initialize(printer_settings, table,time,shop_detail)
+    self.page_width = printer_settings.page_width
+    self.page_height = printer_settings.page_height
+    self.margin = 5
+    self.price_width = 35
+    self.qty_width = 20
+    self.total_width = 35
+    self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width))
+    self.item_height = 15
+    self.item_description_width = (self.page_width-20) / 2
+    self.label_width = 100
+
+    super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    # db font setup
+    if printer_settings.font != ""
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
+
+    self.header_font_size = 10
+    self.item_font_size = 8
+
+    header( shop_detail.name, printer_settings.name)
+
+    call_waiter(table)
+    stroke_horizontal_rule
+
+    # date_info(queue)
+
+  end
+
+  def header (shop_name, name)
+    text "#{shop_name}", :left_margin => -10, :size => self.header_font_size,:align => :center
+    text "#{name}", :size => self.header_font_size,:align => :center
+    # move_down self.item_height
+    move_down 5
+    stroke_horizontal_rule
+    move_down 5
+  end
+
+  def call_waiter (table)
+    move_down 3
+    text "Table Name : #{table.name}",:align => :center
+  end
+
+  # def date_info(queue)
+  #       move_down 5
+
+  #       y_position = cursor
+  #       bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+  #           text "Date:", :size => self.item_font_size,:align => :left
+  #       end
+  #       bounding_box([self.label_width,y_position], :width => self.item_width) do
+  #           text "#{queue.created_at.strftime('%Y-%m-%d %I:%M %p')}" , :size => self.item_font_size,:align => :left
+  #       end
+
+  #       move_down 5
+        
+  # end
+
+end
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 1f456a07..93cd7ab9 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -5,7 +5,7 @@ class CloseCashierPdf < Prawn::Document
     self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
     self.margin = 5
-    self.price_width = 40
+    self.price_width = 60
     self.qty_width = 20
     self.total_width = 40
     self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width))
@@ -133,7 +133,6 @@ class CloseCashierPdf < Prawn::Document
          text "#{shift_sale.cash_in}", :size => self.item_font_size, :align => :right
         end
 
-
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Cash Out:", :size => self.item_font_size, :align => :right
@@ -142,26 +141,11 @@ class CloseCashierPdf < Prawn::Document
          text "#{shift_sale.cash_out}", :size => self.item_font_size, :align => :right
         end
 
-        y_position = cursor
-        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Net Sales:", :size => self.item_font_size, :align => :right
-        end
-        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.nett_sales}", :size => self.item_font_size, :align => :right
-        end
-
-        y_position = cursor
-        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total Tax :", :size => self.item_font_size, :align => :right
-        end
-        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.total_taxes}", :size => self.item_font_size, :align => :right
-        end
-
         move_down -5
         stroke_horizontal_rule
         move_down 7
 
+        @total_foc = 0
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Cash Payment :", :size => self.item_font_size, :align => :right
@@ -180,14 +164,7 @@ class CloseCashierPdf < Prawn::Document
         #start other payment details 
         if shift_sale.other_sales > 0
             other_payment.each do |other|
-              y_position = cursor
-              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-               text "Other Payment Details", :size => self.item_font_size, :align => :right
-              end
-              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "", :size => self.item_font_size, :align => :right
-              end
-
+              @total_foc = other.foc_amount.round(2)
               y_position = cursor
               bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
                text "MPU Payment :", :size => self.item_font_size, :align => :right
@@ -204,14 +181,6 @@ class CloseCashierPdf < Prawn::Document
                text "#{other.visa_amount.round(2)}", :size => self.item_font_size, :align => :right
               end
 
-              y_position = cursor
-              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-               text "JCB Payment :", :size => self.item_font_size, :align => :right
-              end
-              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.jcb_amount.round(2)}", :size => self.item_font_size, :align => :right
-              end
-
               y_position = cursor
               bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
                text "Master Payment :", :size => self.item_font_size, :align => :right
@@ -220,6 +189,14 @@ class CloseCashierPdf < Prawn::Document
                text "#{other.master_amount.round(2)}", :size => self.item_font_size, :align => :right
               end
 
+              y_position = cursor
+              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+               text "JCB Payment :", :size => self.item_font_size, :align => :right
+              end
+              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+               text "#{other.jcb_amount.round(2)}", :size => self.item_font_size, :align => :right
+              end
+
               y_position = cursor
               bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
                text "Reedem Payment :", :size => self.item_font_size, :align => :right
@@ -227,15 +204,6 @@ class CloseCashierPdf < Prawn::Document
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
                text "#{other.paypar_amount.round(2)}", :size => self.item_font_size, :align => :right
               end
-
-              y_position = cursor
-              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-               text "FOC :", :size => self.item_font_size, :align => :right
-              end
-              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.foc_amount.round(2)}", :size => self.item_font_size, :align => :right
-              end
-
             end
         else
             y_position = cursor
@@ -247,30 +215,63 @@ class CloseCashierPdf < Prawn::Document
             end
         end
 
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{shift_sale.total_rounding.round(2)}", :size => self.item_font_size, :align => :right
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{shift_sale.grand_total.round(2)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
+        end
+
         # end other payment details 
         move_down -5
         stroke_horizontal_rule
         move_down 7
-        #start total amount by Account Like Food / Beverage /..
-        total_amount_by_account.each do |amount|        
+
+        #start service charges and commercial tax
+        sale_taxes.each do |tax|
           y_position = cursor
           bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-           text "Total #{amount.account_name} Amount:", :size => self.item_font_size, :align => :right
+           text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right
+           text "#{tax.st_amount.round(2)}", :size => self.item_font_size, :align => :right
           end
         end
-        #end total amount by Account 
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total Sale :", :size => self.item_font_size, :align => :right
+         text "Total Taxes :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.total_revenue}", :size => self.item_font_size, :align => :right
+         text "#{shift_sale.total_taxes}", :size => self.item_font_size, :align => :right
         end
 
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Net Sales :", :style => :bold, :size => self.header_font_size - 1, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{shift_sale.nett_sales}", :style => :bold , :size => self.header_font_size - 1, :align => :right
+        end
+        #end for service charges and commercial tax
+#COMMENTED FOR NO NEED AND NOT CORRECT WHEN OTHER CHARGES
+        # y_position = cursor
+        # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+        #  text "Total Sale :", :size => self.item_font_size, :align => :right
+        # end
+        # bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+        #  text "#{shift_sale.total_revenue}", :size => self.item_font_size, :align => :right
+        # end
+
         move_down -5
         stroke_horizontal_rule
         move_down 7
@@ -304,47 +305,66 @@ class CloseCashierPdf < Prawn::Document
         
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total Overall Discount :", :size => self.item_font_size, :align => :right
+         text "Total Discount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
          text "#{@overall}", :size => self.item_font_size, :align => :right
+        end 
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total FOC :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "(#{@total_foc})", :size => self.item_font_size, :align => :right
         end     
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total Discount Amount :", :size => self.item_font_size, :align => :right
+         text "Total Void :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.total_discounts}", :size => self.item_font_size, :align => :right
+         text "(#{shift_sale.total_void})", :size => self.item_font_size, :align => :right
         end
+
+        # y_position = cursor
+        # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+        #  text "Grand Total :", :size => self.item_font_size, :align => :right
+        # end
+        # bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+        #  text "#{shift_sale.grand_total}", :size => self.item_font_size, :align => :right
+        # end
         
         move_down -5
         stroke_horizontal_rule
         move_down 7
 
-        sale_taxes.each do |tax|
-        
+        #start total amount by Account Like Food / Beverage /..
+        total_amount_by_account.each do |amount|        
           y_position = cursor
           bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-           text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right
+           text "Total #{amount.account_name} Amount :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{tax.st_amount.round(2)}", :size => self.item_font_size, :align => :right
+           text "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right
           end
         end
+        #end total amount by Account 
+
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Rounding Adjustment :", :size => self.item_font_size, :align => :right
+         text "Total Dine-in Count :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.total_rounding.round(2)}", :size => self.item_font_size, :align => :right
+         text "#{shift_sale.dining_count}", :size => self.item_font_size, :align => :right
         end
-         y_position = cursor
+
+        y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Grand Total :", :size => self.item_font_size, :align => :right
+         text "Total Takeaway Count :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.grand_total}", :size => self.item_font_size, :align => :right
+         text "#{shift_sale.takeaway_count}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -355,31 +375,7 @@ class CloseCashierPdf < Prawn::Document
          text "#{shift_sale.total_receipt}", :size => self.item_font_size, :align => :right
         end
 
-        y_position = cursor
-        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Dining Count :", :size => self.item_font_size, :align => :right
-        end
-        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.dining_count}", :size => self.item_font_size, :align => :right
-        end
-
-        y_position = cursor
-        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Takeaway Count :", :size => self.item_font_size, :align => :right
-        end
-        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.takeaway_count}", :size => self.item_font_size, :align => :right
-        end
-
-        y_position = cursor
-        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total Void:", :size => self.item_font_size, :align => :right
-        end
-        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{shift_sale.total_void})", :size => self.item_font_size, :align => :right
-        end
-
-         move_down 5
+        move_down 5
         stroke_horizontal_rule
         move_down 5
 		move_down 5
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 4bc57878..e9887c62 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -40,7 +40,7 @@ class OrderItemPdf < Prawn::Document
 
     text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     stroke_horizontal_rule
-    move_down 5
+    move_down 3
 
     #order_info
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
@@ -56,13 +56,13 @@ class OrderItemPdf < Prawn::Document
         text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
     end
 
-    move_down 5
+    move_down 2
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
         text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
     end
 
-    move_down 5
+    move_down 2
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
         text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
@@ -105,18 +105,22 @@ class OrderItemPdf < Prawn::Document
     end
 
     if alt_name
-    move_down 4
-        font("public/fonts/NotoSansCJKtc-Regular.ttf") do
-            text "(#{order_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+        if !(order_item.alt_name).empty?
+            move_down 4
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+                text "(#{order_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
         end
     end
 
-    move_down 5
+    if !options.empty?
+        move_down 5
 
-    # add option
-    y_position = cursor
-    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-        text "#{options}", :size => self.item_font_size,:align => :left
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "#{options}", :size => self.item_font_size,:align => :left
+        end
     end
 
     move_down 5
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
new file mode 100644
index 00000000..6887d201
--- /dev/null
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -0,0 +1,129 @@
+class OrderItemSlimPdf < Prawn::Document
+  include ActionView::Helpers::NumberHelper
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
+  def initialize(print_settings,order_item_slim, print_status, options, alt_name)
+    self.page_width = print_settings.page_width
+    self.page_height = print_settings.page_height
+    self.margin = 0
+    self.price_width = 40 # No Need for item
+    self.qty_width = 40
+    self.total_width = 40  # No Need for item
+    self.item_width = self.page_width - (self.qty_width - self.margin)
+    self.item_height = 15   
+    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
+    self.label_width=90   
+
+    super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    # 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"
+        })
+
+        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"     
+
+    text "#{ order_item_slim.type + '-' + order_item_slim.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    stroke_horizontal_rule
+    move_down 1
+
+    #order_info
+    order_info(order_item_slim.order_id, order_item_slim.order_by,order_item_slim.order_at)
+
+    # order items slim
+    order_items_slim(order_item_slim, options, alt_name, print_settings.precision)
+  end
+
+  # Write Order Information to PDF
+  def order_info(order_no, order_by, order_at)  
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 3
+  end
+
+  # Write Order items to PDF
+  def order_items_slim(order_item_slim, options, alt_name, precision)
+    y_position = cursor
+
+    #Add Order Item    
+    add_order_items_slim(order_item_slim, options, alt_name, precision)
+
+    dash(1, :space => 1, :phase => 1)
+    stroke_horizontal_line 0, (self.page_width - self.margin)
+    move_down 1
+  end
+
+  # Add order items slim under order info
+  def add_order_items_slim(order_item_slim, options, alt_name, precision)
+    y_position = cursor
+
+    move_down 1
+
+    bounding_box([0,y_position], :width => self.item_width) do
+        text "#{order_item_slim.item_name}", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([self.item_width,y_position], :width => self.qty_width) do
+        text "[#{number_with_precision(order_item_slim.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([0,y_position], :width => self.item_width) do
+      text "#{order_item_slim.item_name}", :size => self.item_font_size,:align => :left
+
+    end
+
+    # if alt_name
+    #     if !(order_item_slim.alt_name).empty?
+    #         move_down 1
+    #         font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+    #             text "(#{order_item_slim.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+    #         end
+    #     end
+    # end
+
+    if !options.empty?
+        move_down 1
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "#{options}", :size => self.item_font_size,:align => :left
+        end
+    end
+    move_down 1
+
+  end
+
+end
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index ea0d4502..f48564a9 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -122,19 +122,21 @@ class OrderSummaryPdf < Prawn::Document
         end
         
         if alt_name
-          move_down 4
-          font("public/fonts/NotoSansCJKtc-Regular.ttf") do
-            text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+          if !(odi.alt_name).empty?
+            move_down 4
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+              text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
           end
               
         end
 
-        move_down 5
-
         # add option
         options = odi.options == "[]"? "" : odi.options
         
         if options != ""
+          move_down 5
+          
           y_position = cursor
           bounding_box([0,y_position], :width => self.item_width) do
               text "#{options}", :size => self.item_font_size,:align => :left
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
new file mode 100644
index 00000000..87aba403
--- /dev/null
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -0,0 +1,155 @@
+class OrderSummarySlimPdf < Prawn::Document
+  include ActionView::Helpers::NumberHelper
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
+  def initialize(print_settings,order, print_status, order_items = nil,alt_name)
+    self.page_width = print_settings.page_width
+    self.page_height = print_settings.page_height
+    self.margin = 0
+    self.price_width = 40 # No Need for item
+    self.qty_width = 40
+    self.total_width = 40  # No Need for item
+    self.item_width = self.page_width - (self.qty_width - self.margin)
+    self.item_height = 15   
+    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
+    self.label_width=90     
+
+    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"
+
+    text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    stroke_horizontal_rule
+    move_down 1
+
+    #order_info
+    order_info(order[0].order_id, order[0].order_by,order[0].order_at)
+
+    # order items
+    if order_items == nil
+      order_items(order, alt_name, print_settings.precision)
+    else
+      order_items(order_items, alt_name, print_settings.precision)
+    end
+  end
+
+  # Write Order Information to PDF
+  def order_info(order_no, order_by, order_at)    
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 1
+  end
+
+  # Write Order items to PDF
+  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
+        text "Item", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do
+        text "Qty", :size => self.item_font_size,:align => :left
+    end
+
+    stroke_horizontal_rule
+    move_down 1
+
+    #Add Order Item
+    add_order_items(order_item, alt_name, precision)
+    
+  end
+
+  # Add order items under order info
+  def add_order_items(order_item, alt_name, precision)
+    y_position = cursor
+
+    move_down 1
+
+    order_item.each do|odi|
+      # check for item not to show 
+      # if odi.price != 0
+        y_position = cursor
+
+        bounding_box([0,y_position], :width => self.item_width) do
+          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+
+        end
+
+        bounding_box([self.item_width,y_position], :width => self.qty_width) do
+          text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
+        end
+
+        bounding_box([0,y_position], :width => self.item_width) do
+          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+
+        end
+        
+        if alt_name
+          if !(odi.alt_name).empty?
+            move_down 1
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+              text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
+          end
+        end
+
+        # add option
+        options = odi.options == "[]"? "" : odi.options
+        
+        if options != ""
+          move_down 1
+
+          y_position = cursor
+          bounding_box([0,y_position], :width => self.item_width) do
+              text "#{options}", :size => self.item_font_size,:align => :left
+          end
+
+          move_down 1
+        end
+
+        move_down 1
+
+        dash(1, :space => 1, :phase => 1)
+        stroke_horizontal_line 0, (self.page_width - self.margin)
+        move_down 1
+      # end
+    end        
+  end
+end
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index ebdfa147..ae02b22d 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -1,16 +1,16 @@
 class ReceiptBillPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
-  def initialize(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 initialize(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,current_balance)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.margin = 5
-    self.price_width = 40
-    self.qty_width = 20
-    self.total_width = 40
-    self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width))
+    self.margin = 0
+    self.price_width = 60
+    self.qty_width = 25
+    self.total_width = 60
+    self.item_width = self.page_width - ((self.qty_width + self.price_width + self.total_width))
     self.item_height = 15
-    self.item_description_width = (self.page_width-20) / 2
+    self.item_description_width = (self.page_width-5) / 2
     self.label_width = 100
 
     self.description_width = 150
@@ -22,6 +22,11 @@ class ReceiptBillPdf < Prawn::Document
     #setting page margin and width
     super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
+    #precision checked
+    if printer_settings.precision.to_i > 2
+        printer_settings.precision = 2
+    end
+
     # db font setup
     if printer_settings.font != ""
         font_families.update("#{printer_settings.font}" => {
@@ -55,7 +60,7 @@ class ReceiptBillPdf < Prawn::Document
 
 
     if member_info != nil
-        member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter)
+        member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter,current_balance)
     end
 
     customer(customer_name)
@@ -74,7 +79,7 @@ class ReceiptBillPdf < Prawn::Document
   end
 
   def header (shop_details)
-    move_down 7
+    move_down 5
     text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center
     move_down 5
     text "#{shop_details.address}", :size => self.item_font_size,:align => :center
@@ -124,15 +129,27 @@ class ReceiptBillPdf < Prawn::Document
   end
 
     def line_items(sale_items,precision,delimiter)
+        if precision.to_i > 0
+            item_label_qty_front_width = (self.item_width+self.price_width) + 5
+            item_label_qty_end_width = self.qty_width + 4
+            item_label_total_front_width = (self.item_width+self.price_width) + 10
+            item_label_total_end_width = self.total_width + 9
+        else
+            self.item_width = self.item_width.to_i + 8
+            item_label_qty_front_width = (self.item_width+self.price_width) + 8
+            item_label_qty_end_width = self.qty_width + 7
+            item_label_total_front_width = (self.item_width+self.price_width) + 5
+            item_label_total_end_width = self.total_width + 4
+        end
         move_down 5
         y_position = cursor
         move_down 5
         pad_top(15) {
             # @item_width.to_i + @half_qty.to_i
             text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
-            text_box "Price", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
-            text_box "Qty", :at =>[(self.item_width+self.price_width),y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
-            text_box "Total", :at =>[(self.item_width+self.price_width+4),y_position], :width => self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+            text_box "Price", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+            text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+            text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
         }
         move_down -5
         stroke_horizontal_rule
@@ -140,7 +157,19 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     def add_line_item_row(sale_items,precision,delimiter)
-        item_name_width = (self.item_width+self.price_width)
+        if precision.to_i > 0
+            item_name_width = (self.item_width+self.price_width)
+            item_qty_front_width = (self.item_width+self.price_width) + 5
+            item_qty_end_width = self.qty_width + 4
+            item_total_front_width = item_name_width + 10
+            item_total_end_width = self.total_width + 9
+        else
+            item_name_width = (self.item_width+self.price_width)
+            item_qty_front_width = item_name_width + 8
+            item_qty_end_width = self.qty_width + 7
+            item_total_front_width = item_name_width + 5
+            item_total_end_width = self.total_width + 4
+        end
         y_position = cursor
         move_down 5
         sub_total = 0.0
@@ -162,8 +191,8 @@ class ReceiptBillPdf < Prawn::Document
                   end
                    # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size                
                    text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
-                   text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_name_width,y_position], :width => self.qty_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
-                   text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
+                   text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
+                   text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
                 }
                 move_down 5
             end
@@ -254,7 +283,8 @@ class ReceiptBillPdf < Prawn::Document
     def sale_payment(sale_data,precision,delimiter)        
         stroke_horizontal_rule
         move_down 5
-        SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment|
+        sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method").where('sale_id = ?', sale_data.sale_id).group("payment_method")
+        sale_payments.each do |payment|
             y_position = cursor
             if payment.payment_method == "paypar"
                 bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
@@ -285,7 +315,7 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     # show member information
-    def member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter)
+    def member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter,current_balance)
         if rebate_amount != nil        
             if rebate_amount["status"] == true
                 stroke_horizontal_rule
@@ -293,6 +323,7 @@ class ReceiptBillPdf < Prawn::Document
                 balance = 0
                 rebate_balance =0
                 redeem = 0
+                redeem_count = 0
                 rebate_amount["data"].each do |res|
                     total = total + res["balance"]
                 #total redeem amount
@@ -317,7 +348,7 @@ class ReceiptBillPdf < Prawn::Document
                         
                     end 
                 # Total Rebate Amount if birthday
-                    if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebateBonusAccount" && res["status"]== "Rebate"
+                    if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate"
                          rebate_balance = rebate_balance + res["deposit"]
                         move_down 5
                         y_position = cursor
@@ -331,29 +362,24 @@ class ReceiptBillPdf < Prawn::Document
                 #end Total rebate if birthday
                 end
 
-                move_down 5
-                    y_position = cursor
-                 bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
-                     text "Redeem Amount", :size => self.item_font_size,:align => :left
-                 end
-                  bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                    text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
-                 end
-
-                 
-                 if redeem == 0
-                    old = total - rebate_balance
-                 else
-                    old = balance + redeem
-                 end
-
                  move_down 5
                     y_position = cursor
-                 bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
-                     text "Old Balance", :size => self.item_font_size,:align => :left
-                 end
+                  bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+                     text "Redeem Amount", :size => self.item_font_size,:align => :left
+                  end
                   bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                    text "#{number_with_precision(old, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                    text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                  end
+
+                 if current_balance != nil
+                     move_down 5
+                    y_position = cursor
+                     bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+                         text "Old Balance", :size => self.item_font_size,:align => :left
+                     end
+                      bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+                        text "#{number_with_precision(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                     end
                  end
                 
             end
@@ -367,7 +393,6 @@ class ReceiptBillPdf < Prawn::Document
                     total_balance = total_balance + res["balance"]
                     
                 end
-
             end
             move_down 5
             y_position = cursor
@@ -441,6 +466,7 @@ class ReceiptBillPdf < Prawn::Document
                    move_down 73
                    text "Approved By" , :size => self.item_font_size,:align => :center
                 end
+                break;
             end
         end
         if sale_data.payment_status == "foc"
@@ -472,7 +498,7 @@ class ReceiptBillPdf < Prawn::Document
             text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left
         end    
         bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
-            text "Thank You! See you Again", :left_margin => -10, :size => self.item_font_size,:align => :left
+            text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :left
         end        
 
         move_down 5
diff --git a/app/views/api/call_waiters/index.json.jbuilder b/app/views/api/call_waiters/index.json.jbuilder
new file mode 100644
index 00000000..9173b340
--- /dev/null
+++ b/app/views/api/call_waiters/index.json.jbuilder
@@ -0,0 +1,6 @@
+if (@table)
+  json.table_id @table.id
+  json.name @table.name
+  json.type @table.type
+  json.time @time
+end
\ No newline at end of file
diff --git a/app/views/api/orders/view_orders.json.jbuilder b/app/views/api/orders/view_orders.json.jbuilder
index b2c960af..0ac1b92f 100755
--- a/app/views/api/orders/view_orders.json.jbuilder
+++ b/app/views/api/orders/view_orders.json.jbuilder
@@ -19,6 +19,13 @@ if (@booking)
   @total_amount = 0.00
   @total_tax = 0.00
 
+  # For YGN BBQ
+  adult_count = 0    
+  child_count = 0
+  adult_spent = 0
+  child_spent = 0
+  # End YGN BBQ
+
   if @booking.booking_orders
     order_items = []
     @booking.booking_orders.each do |bo|
@@ -26,21 +33,45 @@ if (@booking)
       if (order.status == "new")
         order_items = order_items + order.order_items
       end
-    end
+    end    
 
     json.order_items order_items do |item|
-        json.item_instance_code    item.item_code
-        json.item_name             item.item_name
-        json.price                 item.price
-        json.qty                   item.qty
-        json.options               item.options
-        json.remark                item.remark
-        json.item_status           item.order_item_status
-        @total_amount = @total_amount + (item.price * item.qty)
+      # For YGN BBQ
+      if item.item_code == "P00001"
+        adult_count += item.qty 
+        adult_spent += (item.price * item.qty)       
+      end
+      if item.item_code == "P00002"
+        child_count += item.qty
+        child_spent += (item.price * item.qty)  
+      end
+      # End YGN BBQ
+      json.item_code             item.item_code
+      json.item_instance_code    item.item_instance_code
+      json.item_name             item.item_name
+      json.price                 item.price
+      json.qty                   item.qty
+      json.options               item.options
+      json.remark                item.remark
+      json.item_status           item.order_item_status
+      @total_amount = @total_amount + (item.price * item.qty)
     end
 
   end
 
+  # For YGN BBQ
+  if adult_count > 0
+    json.per_adult_spent (adult_spent/adult_count) * 0.05
+  else
+    json.per_adult_spent 0
+  end
+  if child_count > 0
+    json.per_child_spent (child_spent/child_count) * 0.05
+  else
+    json.per_child_spent 0
+  end
+  # End YGN BBQ
+
   json.sub_total @total_amount
   json.commerical_tax @total_amount * 0.05
   json.total @total_amount + (@total_amount * 0.05)
diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder
index 29982631..8dcdf6fe 100755
--- a/app/views/api/restaurant/menu/_menu.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu.json.jbuilder
@@ -7,8 +7,12 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 if (menu.menu_categories)
   json.categories  menu.menu_categories do |category|
     json.id category.id
+    json.code category.code
+    json.order_by category.order_by
     json.name category.name
     json.alt_name category.alt_name
+    json.order_by category.order_by
+    json.parent_id category.menu_category_id
     json.is_available category.is_available
 
     if category.menu_items
diff --git a/app/views/api/restaurant/zones/index.json.jbuilder b/app/views/api/restaurant/zones/index.json.jbuilder
index e2d040c6..4a8666b4 100755
--- a/app/views/api/restaurant/zones/index.json.jbuilder
+++ b/app/views/api/restaurant/zones/index.json.jbuilder
@@ -1,42 +1,48 @@
 if @zones
   json.array! @zones do |zone|
-    json.id zone.id
-    json.name zone.name
-    #List all tables
-    json.tables zone.tables do |table|
+    if zone.is_active
+      json.id zone.id
+      json.name zone.name
+      #List all tables
+      json.tables zone.tables do |table|
+        if table.is_active
+          json.id table.id
+          json.name table.name
+          json.status table.status
+          json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
+          json.current_booking table.get_current_booking.booking_id rescue ""
+        end
+      end
+
+      json.rooms zone.rooms do |room|
+        if room.is_active
+          json.id room.id
+          json.name room.name
+          json.status room.status
+          json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
+          json.current_booking room.get_current_booking.booking_id rescue ""
+        end
+      end
+    end
+  end
+else #list all tables and rooms with out zones
+  json.tables @all_tables do |table|
+    if table.is_active
       json.id table.id
       json.name table.name
       json.status table.status
       json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
       json.current_booking table.get_current_booking.booking_id rescue ""
     end
+  end
 
-    json.rooms zone.rooms do |room|
+  json.rooms @all_rooms do |room|
+    if room.is_active
       json.id room.id
       json.name room.name
       json.status room.status
       json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
       json.current_booking room.get_current_booking.booking_id rescue ""
-
     end
-  end
-else #list all tables and rooms with out zones
-  json.tables @all_tables do |table|
-    json.id table.id
-    json.name table.name
-    json.status table.status
-    json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
-    json.current_booking table.get_current_booking.booking_id rescue ""
-
-  end
-
-  json.rooms @all_rooms do |room|
-    json.id room.id
-    json.name room.name
-    json.status room.status
-    json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
-    json.current_booking room.get_current_booking.booking_id rescue ""
-
-
   end
 end
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 091d8e51..2682f203 100755
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -11,79 +11,90 @@
     </div>
 
   <div class="row clearfix">
-    <div class="col-lg-9 col-md-9 col-sm-9">
+    <div class="col-lg-8 col-md-8 col-sm-8">
       <div class="card">
-          <div class="body table-responsive">
-            <table class="table table-hover table-striped">
-          <!-- <div class="table-responsive">
-            <table class="table table-striped"> -->
-              <thead>
-                <tr>
-                <td colspan="7">
-                 <!--  <button id="member_acc_no" class="btn btn-success btn-md"><span class="fa fa-credit-card"></span> Member Card</button>
-                  <button id="qr_code" class="btn btn-danger btn-md">
-                    <span class="fa fa-credit-card"></span> QR CODE
-                  </button> -->
-                <div class="body">
-                  <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
-                  <div class="row clearfix">
-                    <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
-                          <input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control">
-                          <input type="hidden" name="type" id="type" value="">
-                    </div>
-                    <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
-                      <button type="submit" class="btn bg-blue waves-effect" style="margin-right: 10px;"><%= t("views.btn.search") %></button>
-                    <!-- </div> -->
-                      <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
-                      <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
+        <div class="body">
+          <div class="row p-l-20 p-t-20">
+            <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+              <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
+                <div class="row clearfix">
+                  <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
+                        <input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control">
+                        <input type="hidden" name="type" id="type" value="">
                   </div>
-                  <% end %>
+                  <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
+                    <button type="submit" class="btn btn-sm bg-blue waves-effect" style="margin-right: 10px;"><%= t("views.btn.search") %></button>
+                  <!-- </div> -->
+                    <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
+                    <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
                 </div>
-              </td>
-              </tr>
-              <tr>
-                <th></th>
-                <th><%= t("views.right_panel.detail.sr_no") %></th>
-                <th><%= t("views.right_panel.detail.name") %></th>
-                <th><%= t("views.right_panel.detail.card_no") %></th>
-                <th><%= t("views.right_panel.detail.contact_no") %></th>
-                <th><%= t("views.right_panel.detail.email") %></th>
-                <th><%= t("views.right_panel.detail.action") %></th>
-              </tr>
-            </thead>
-
-            <tbody>
-              <% if @crm_customers.count > 0 %>
-                <% @i = 0 %>
-                <% @crm_customers.each do |crm_customer| %>
-                  <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
-                   <td>
-                     <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
-                     <td>
-                      <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %>
-                      <%= @i += 1 %>
-                      <%else%>
-                      -
-                      <% end %>
-                    </td>
-                    <td><%= crm_customer.name %></td>
-                    <td><%= crm_customer.card_no rescue '-' %></td>
-                    <td><%= crm_customer.contact_no %></td>
-                    <td><%= crm_customer.email %></td>
-                    <td><%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %></td>
-                  </tr>
                 <% end %>
-              <% else %>
-                    <tr><td colspan="7"><strong><p style="text-align: center;margin-bottom: -1px">There is no data for search <%=@filter%>....</p></strong></td></tr>
-              <% end %>
-            </tbody>
-            </table>
-            <br>
-            <%= paginate @crm_customers %>
+            </div>
           </div>
+          <div class="row">
+            <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+              <div class="table-responsive">
+                <table class="table table-hover table-striped" style="width:100%">
+              <!-- <div class="table-responsive">
+                <table class="table table-striped"> -->
+                  <thead>
+                    <!-- <tr>
+                      <td colspan="7">
+                         <button id="member_acc_no" class="btn btn-success btn-md"><span class="fa fa-credit-card"></span> Member Card</button>
+                        <button id="qr_code" class="btn btn-danger btn-md">
+                          <span class="fa fa-credit-card"></span> QR CODE
+                        </button> 
+                        
+                      </td>
+                    </tr>-->
+                    <tr>
+                      <th></th>
+                      <th><%= t("views.right_panel.detail.sr_no") %></th>
+                      <th><%= t("views.right_panel.detail.name") %></th>
+                      <th><%= t("views.right_panel.detail.card_no") %></th>
+                      <th style="width:20%"><%= t("views.right_panel.detail.contact_no") %></th>
+                      <th style="width:20%"><%= t("views.right_panel.detail.email") %></th>
+                      <th><%= t("views.right_panel.detail.action") %></th>
+                    </tr>
+                  </thead>
+
+                  <tbody>
+                    <% if @crm_customers.count > 0 %>
+                      <% @i = 0 %>
+                      <% @crm_customers.each do |crm_customer| %>
+                        <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
+                          <td>
+                           <input type="radio" name="checkbox" class="checkbox_check" >
+                          </td>
+                          <td>
+                            <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %>
+                            <%= @i += 1 %>
+                            <%else%>
+                            -
+                            <% end %>
+                          </td>
+                          <td><%= crm_customer.name %></td>
+                          <td><%= crm_customer.card_no rescue '-' %></td>
+                          <td style="width:20px%;word-break: break-all;"><%= crm_customer.contact_no %></td>
+                          <td style="width:20px%;word-break: break-all;"><%= crm_customer.email %></td>
+                          <td><%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %></td>
+                        </tr>
+                      <% end %>
+                    <% else %>
+                        <tr><td colspan="7"><strong><p style="text-align: center;margin-bottom: -1px">There is no data for search <%=@filter%>....</p></strong></td></tr>
+                    <% end %>
+                  </tbody>
+                </table>
+                <br>
+                <%= paginate @crm_customers %>
+              </div>
+            </div>
+          </div>
+          
+        </div>
       </div>
     </div>
-    <div class="col-lg-3 col-md-3 col-sm-3">
+    <div class="col-lg-4 col-md-4 col-sm-4">
       <div class="card">
         <div class="body" id="custom-slimscroll">
           <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb
index 338aea1d..26ce197a 100755
--- a/app/views/crm/customers/show.html.erb
+++ b/app/views/crm/customers/show.html.erb
@@ -77,7 +77,7 @@
               </tr>
             </thead>
             <tbody>
-              <% if @response["status"] == true %>
+              <% if @response["status"] == true && @response["data"].count > 0 %>
                 <% @response["data"].each do |transaction| %>
                   <tr>
                     <td><%= transaction["date"]%></td>
@@ -101,7 +101,7 @@
                 <%end%>
               <%else%>
                 <tr style="border-top:2px solid #666;">
-                  <td colspan="5"><p class="align-center">There is no transaction coz of <%=@response["data"]%> ...</p>
+                  <td colspan="5"><p class="align-center">There is no transaction coz of <%=@response["message"]%> ...</p>
                   </td>
                 </tr>
               <% end %>
diff --git a/app/views/crm/dining_queues/_form.html.erb b/app/views/crm/dining_queues/_form.html.erb
index 7796e9a9..51e2c097 100755
--- a/app/views/crm/dining_queues/_form.html.erb
+++ b/app/views/crm/dining_queues/_form.html.erb
@@ -29,9 +29,9 @@
                 <div class="row bottom">
                   <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 m-l--5">
                     <div class="row m-l--5">
-                      <div class="col-md-3 left cashier_number" data-value="1" data-type="num">1</div>
-                      <div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
-                      <div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="1" data-type="num">1</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="2" data-type="num">2</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="3" data-type="num">3</div>
                     </div>
                   </div>
                 </div>
@@ -39,9 +39,9 @@
                 <div class="row bottom">
                   <div class="col-md-12 m-l--5">
                     <div class="row m-l--5">
-                      <div class="col-md-3 left cashier_number" data-value="4" data-type="num">4</div>
-                      <div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
-                      <div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="4" data-type="num">4</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="5" data-type="num">5</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="6" data-type="num">6</div>
                     </div>
                   </div>
                 </div>
@@ -49,9 +49,9 @@
                 <div class="row bottom">
                   <div class="col-md-12 m-l--5">
                     <div class="row m-l--5">
-                      <div class="col-md-3 left cashier_number" data-value="7" data-type="num">7</div>
-                      <div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
-                      <div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="7" data-type="num">7</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="8" data-type="num">8</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="9" data-type="num">9</div>
                     </div>
                   </div>
                 </div>
@@ -59,9 +59,9 @@
                 <div class="row bottom">
                   <div class="col-md-12 m-l--5">
                     <div class="row m-l--5">
-                      <div class="col-md-3 left cashier_number" data-value="0" data-type="num">0</div>
-                      <div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div>
-                      <div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="0" data-type="num">0</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="." data-type="num">.</div>
+                      <div class="col-md-3 left-margin-1 cashier_number" data-value="00" data-type="num">00</div>
                     </div>
                   </div>
                 </div>
@@ -69,9 +69,9 @@
                 <div class="row bottom">
                   <div class="col-md-12 m-l--5">
                     <div class="row m-l--5">
-                      <div class="col-md-3 left cashier_number"></div>
-                      <div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
-                      <div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
+                      <div class="col-md-3 left-margin-1 cashier_number"></div>
+                      <div class="col-md-3 left-margin-1 cashier_number red" data-type="del">DEL</div>
+                      <div class="col-md-3 left-margin-1 cashier_number green" data-type="clr">CLR</div>
                     </div>
                   </div>
                 </div>  
diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb
index 8eb9904e..a935cf38 100755
--- a/app/views/crm/dining_queues/index.html.erb
+++ b/app/views/crm/dining_queues/index.html.erb
@@ -100,8 +100,8 @@
     <%= link_to t("views.btn.new"),new_crm_dining_queue_path,:class => 'btn bg-green btn-block btn-lg btn-block', 'data-no-turbolink' => true %>
     <hr>
 
-    <button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" disabled>Assign</button>
-    <button type="button" id="cancel" class="btn btn-danger btn-block btn-lg waves-effect" disabled>Cancel</button>
+    <button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" style="font-size: 11px" disabled>Assign</button>
+    <button type="button" id="cancel" class="btn btn-danger btn-block btn-lg waves-effect" style="font-size: 11px" disabled>Cancel</button>
    <!--  <a href="<%= dashboard_path %>" class="btn btn-default btn-block waves-effect" role="button" aria-haspopup="true" aria-expanded="false"> Back </a> -->
   </div>
 </div>
diff --git a/app/views/crm/home/index.html.erb b/app/views/crm/home/index.html.erb
index d73a0cdc..2c8fe695 100755
--- a/app/views/crm/home/index.html.erb
+++ b/app/views/crm/home/index.html.erb
@@ -118,7 +118,7 @@
     </button> -->
      <!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button> -->
      <button id="assign" value="" disabled="disabled" data-type="assign" class="btn assign btn-primary btn-lg btn-block">ASSIGN</button>
-     <button id="cancel" value="" disabled="disabled" data-type="cancel" class="btn btn-danger cancel btn-lg btn-block">CANCLE</button>
+     <button id="cancel" value="" disabled="disabled" data-type="cancel" class="btn btn-danger cancel btn-lg btn-block">CANCEL</button>
 
   </div>
 </div>
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index f6dd86b8..3ed5e068 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -56,7 +56,7 @@
 
   <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
   <div class="row">
-    <div class="col-xs-9 col-sm-9 col-md-9 col-lg-9">
+    <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
           <div class="card">
@@ -111,32 +111,32 @@
         </div>
       </div>
     </div>
-    <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
+    <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
     <% if !@summ_sale.nil? %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
           <div class="card">
             <div class="body">
-              <h6>Sale</h6>
+              <h6><%= t :sale %></h6>
               <table class="table">
                 <tr>
-                  <td>Total Receipt : </td>
+                  <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.receipt") %> : </td>
                   <td align="right"><%= @summ_sale.total_receipt %></td>
                 </tr>
                 <tr>
-                  <td>Total Sale : </td>
+                  <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
                   <td align="right"><%= @summ_sale.total_amount %></td>
                 </tr>
                 <tr>
-                  <td>Total Discount : </td>
+                  <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
                   <td align="right"><%= @summ_sale.total_discount %></td>
                 </tr>
                 <tr>
-                  <td>Total Tax : </td>
+                  <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
                   <td align="right"><%= @summ_sale.total_tax %></td>
                 </tr>
                 <tr>
-                  <td>Grand Total : </td>
+                  <td><%= t("views.right_panel.detail.grand_total") %> : </td>
                   <td align="right"><%= @summ_sale.grand_total %></td>
                 </tr>
               </table>
@@ -144,16 +144,7 @@
                 <% if !(@total_payment_methods.nil?) %>
                   <% @total_payment_methods.each do |payment| %>
                     <% if !@sale_data[0].empty? %>
-                      <% if payment.payment_method == 'mpu' || payment.payment_method == 'visa' || payment.payment_method == 'master' || payment.payment_method == 'jcb' %>
-                        <tr>
-                          <td>Card Sale : </td>
-                          <td align="right">
-                            <% @sale_data.each do |data| %>
-                              <%= data["card"] %>
-                            <% end %>
-                          </td>
-                        </tr>
-                      <% else %>
+                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
                         <tr>
                           <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
                           <td align="right">
@@ -166,6 +157,17 @@
                       <% end %>
                     <% end %>
                   <% end %>
+
+                  <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %>
+                      <% if !total_card.nil? %>
+                      <tr>
+                        <td><%= t("views.right_panel.detail.card_sale") %> : </td>
+                        <td align="right">
+                            <%= total_card["card"].to_f %>
+                        </td>
+                      </tr>
+                  <% end %>
+                  
                 <% end %>
               </table>
             </div>
@@ -178,35 +180,35 @@
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
           <div class="card">
             <div class="body">
-              <h6>Customer</h6>
+              <h6><%= t :customer %></h6>
               <table class="table">
                 <% if !@total_customer.nil? %>
                   <tr>
-                    <td>Total Customer : </td>
-                    <td align="right"><%= @total_customer.total_cus %></td>
+                    <td><%= t("views.right_panel.detail.total") %> <%= t :customer %> : </td>
+                    <td align="right"><%= @total_customer %></td>
                   </tr>
                 <% end %>
                 <% if !@total_dinein.nil? %>
                   <tr>
-                    <td>Dine in : </td>
+                    <td><%= t("views.right_panel.detail.dine_in") %> : </td>
                     <td align="right"><%= @total_dinein.total_dinein_cus %></td>
                   </tr>
                 <% end %>
                 <% if !@total_takeaway.nil? %>
                   <tr>
-                    <td>Takeaway : </td>
+                    <td><%= t("views.right_panel.detail.takeaway") %> : </td>
                     <td align="right"><%= @total_takeaway.total_take_cus %></td>
                   </tr>
                 <% end %>
                 <% if !@total_other_customer.nil? %>
                   <tr>
-                    <td>Customer : </td>
+                    <td><%= t :customer %> : </td>
                     <td align="right"><%= @total_other_customer.total_cus %></td>
                   </tr>
                 <% end %>
                 <% if !@total_membership.nil? %>
                   <tr>
-                    <td>Membership : </td>
+                    <td><%= t("views.right_panel.detail.membership") %> : </td>
                     <td align="right"><%= @total_membership.total_memb_cus %></td>
                   </tr>
                 <% end %>
@@ -220,20 +222,20 @@
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
           <div class="card">
             <div class="body">
-              <h6>Order</h6>
+              <h6><%= t("views.right_panel.detail.order") %></h6>
               <table class="table">
                 <% if !@total_order.nil? %>
                   <tr>
-                    <td width="40px">Total Order : </td>
-                    <td align="right" width="60px" style="padding: 5px"><%= @total_order.total_order %></td>
+                    <td width="40px"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.order") %> : </td>
+                    <td align="right" width="60px"><%= @total_order.total_order %></td>
                   </tr>
                 <% end %>
         
-                <% if !(@total_accounts.nil?) %>
+                <% if !@total_accounts.nil? %>
                   <% @total_accounts.each do |account| %>
                     <tr>
                       <td width="40px"><%= account.title %> (Account) : </td>
-                      <td align="right" width="60px" style="padding: 5px">
+                      <td align="right" width="60px">
                         <% @account_data.each do |data| %>
                           <% acc = account.title %>
                           <%= data[""+acc+""] %> <% if !data[''+acc+''].nil? %> ( <%= data[''+acc+'_amount'] %> ) <% end %>
@@ -244,15 +246,15 @@
                 <% end %>
                 <% if !@top_items.nil? %>
                 <tr>
-                  <td width="40px">Top Item : </td>
-                  <td align="right" width="60px" style="padding: 5px"><%= @top_items.item_name %> 
+                  <td width="40px"><%= t :top %> <%= t("views.right_panel.detail.item") %> : </td>
+                  <td align="right" width="60px"><%= @top_items.item_name %> 
                   <br>(<%= @top_items.item_total_price %>)</td>
                 </tr>
                 <% end %>
                 <% if !@total_foc_items.nil? %>
                   <tr>
-                    <td width="40px">Total FOC Item : </td>
-                    <td align="right" width="60px" style="padding: 5px"><%= @total_foc_items %></td>
+                    <td width="40px"><%= t("views.right_panel.detail.total") %> <%= t("views.btn.foc") %> <%= t("views.right_panel.detail.item") %> : </td>
+                    <td align="right" width="60px"><%= @total_foc_items.to_int %></td>
                   </tr>
                 <% end %>
               </table>
diff --git a/app/views/install/_form.html.erb b/app/views/install/_form.html.erb
index 288c431a..c4520cd6 100755
--- a/app/views/install/_form.html.erb
+++ b/app/views/install/_form.html.erb
@@ -1,4 +1,4 @@
-<form action="/install" method="POST" class="row">
+<form action="/activate" method="POST" class="row">
   <div class="col-md-6">
     <div class="form-group">
       <label for="exampleInputEmail1">Business Name</label>
@@ -10,7 +10,7 @@
       <input type="text" class="form-control" name="license_key" aria-describedby="license_key" placeholder="Add License Key">
       <small class="form-text text-muted">Add License Key from Email</small>
     </div>
-    <div class="form-group">
+    <!-- <div class="form-group">
       <label for="lblAdministrator">Administrator Username</label>
       <input type="text" class="form-control" name="admin_user" aria-describedby="admin_user" placeholder="Administrator Username">
       <small id="admin_user" class="form-text text-muted">First Employee who will be assign as administrator</small>
@@ -18,9 +18,17 @@
     <div class="form-group">
       <label for="admin_password">Password</label>
       <input type="password" class="form-control" name="admin_password" placeholder="Password">
-    </div>
+    </div> -->
   </div>
   <div class="col-md-6">
+    <div class="form-group">
+      <label for="lblDBHost">Database Host</label>
+      <input type="text" class="form-control" name="db_host" aria-describedby="db_host" placeholder="Database Host" />
+    </div>
+    <div class="form-group">
+      <label for="lblDBName">Database Schema</label>
+      <input type="text" class="form-control" name="db_schema" aria-describedby="db_schema" placeholder="Database Schema">      
+    </div>
     <div class="form-group">
       <label for="lblAdministrator">Database Username</label>
       <input type="text" class="form-control" name="db_user" aria-describedby="db_user" placeholder="Database Username">      
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index f7ca56f2..67746ba6 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -14,11 +14,16 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
-            <a href="javascript:void(0);" class="bars"></a>
-            <a class="navbar-brand" href="<%=dashboard_path%>">
+            <%if current_login_employee.role !="waiter" %>
+                <a href="javascript:void(0);" class="bars"></a>
+                <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
+            <% else %>
+                <a class="navbar-brand m-0" href="<%=dashboard_path%>">
+            <%end%>
                 <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
-            </a>           
+            </a>
+                       
         </div>
         <!-- Start Delete confirrm text !-->
         <div class="navbar-right">
@@ -29,16 +34,16 @@
             </a>
             <ul class="dropdown-menu">
                 <li>
-                    <%if current_login_employee.role !="waiter" %>
-                        <p class="delete waves-effect waves-block p-l-30 m-t-15" data-ref="<%=logout_path%>" data-method="delete">
-                            <i class="material-icons">exit_to_app</i>
-                            <span class="font-18 m-b-5">Logout</span>
-                        </p>
-                         <span class="hidden" id="delete_text">
-                            <h6>Are you sure you want to Logout ?</h6>
-                            <!-- <h6>This action can't be undo. </h6> -->
-                        </span>
-                    <%end%>
+                    <!-- <%if current_login_employee.role !="waiter" %> -->
+                    <!-- <%end%> -->  
+                    <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
+                        <i class="material-icons font-10 logout_icon">exit_to_app</i>
+                        <span class="font-18">Logout</span>
+                    </p>
+                     <span class="hidden" id="delete_text">
+                        <h6>Are you sure you want to Logout ?</h6>
+                        <!-- <h6>This action can't be undo. </h6> -->
+                    </span>
                 </li>   
             </ul>
             <!-- NO Need for color Change
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 1ec77487..80ea2fb1 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -65,12 +65,14 @@
 				</ul>
 			</li>
 			<% end %>
-			<li>
+			<% if can? :menage, Inventory %>
+			<!-- <li>
 				<a href="<%= inventory_path %>">
 					<i class="material-icons">store</i>
 					<span><%= t :inventory %></span>
 				</a>
-			</li>
+			</li> -->
+			<%end%>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">widgets</i>
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 7df224a3..f847ae54 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -65,13 +65,10 @@
 		        </p> 
 	    	</div>
 	    </div>
-	    <div class="row bg-white">
-            <!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> -->
+	    <div class="row bg-white">            
             <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
-                <div class="row justify-content-center form-group">
-                    <!-- <span class="col-md-4"></span> -->
-                	   <input type="text" class="form-control col-4" id="emp_id" onkeypress="empID()" placeholder="Access PIN">
-                	<!-- <span class="col-md-4"></span> -->
+                <div class="row justify-content-center form-group">                    
+                	<input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID">
                 </div>                
 
             	<div class="row">
@@ -148,6 +145,31 @@
 		           		<% end %>
            			<% end %>
                 </div>
+
+                <div class="row">
+                    <div class="col-1 col-black">
+                        <span>Waiter</span> 
+                    </div>
+                    <div class="col-11">
+                        <hr />
+                    </div>
+                </div>
+               
+                <div class="row m-b-15">
+                    <% @employees.each do |employee| %>
+                        <%if employee.role == "waiter" %>
+                            <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" > 
+                                <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
+                                </form>
+                                <div class="card emp-body">
+                                    <div class="body bg-teal">
+                                    <%=  employee.name%>
+                                </div>
+                                </div>
+                            </div>
+                        <% end %>
+                    <% end %>
+                </div>
             </div>
             <!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> -->
         </div>
@@ -157,9 +179,7 @@
 
 <script>   
     $(document).ready(function () {
-
          // for Notificaiotn message
-
          var placementFrom  = $("#noti").attr('data-placement-from');
          var placementAlign = $("#noti").attr('data-placement-align');
          var animateEnter   = $("#noti").attr('data-animate-enter');
@@ -177,20 +197,22 @@
             $(item).submit();
         });
 
-    });     
-    function empID(){          
-    	$('#emp_id').keyup(function(e) {
-    		var txtVal = this.value;
-    		if ($.isNumeric(txtVal)) {
-    			if( txtVal.length === 3 ) { 
-    				window.location.href = '/auth/'+txtVal;
-    			}
-    		}else{
-    			alert("Please Enter Numeric Number")
-    		}
-    	});
+        $('#emp_id').keyup(function(e) {
+            e.preventDefault();
+            var txtVal = this.value; 
+            
+            if(txtVal!=''){
+                if ($.isNumeric(txtVal)) {                
+                    if( txtVal.length === 3 ) { 
+                        window.location.href = '/auth/'+txtVal;
+                    }
+                }else{
+                    alert("Please Enter Numeric Number");
+                }
+            }
+        });
 
-    }
+    });     
 
     function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
     if (colorName === null || colorName === '') { colorName = 'bg-black'; }
diff --git a/app/views/layouts/origami.html.erb b/app/views/layouts/origami.html.erb
index 9f175511..744ab87a 100755
--- a/app/views/layouts/origami.html.erb
+++ b/app/views/layouts/origami.html.erb
@@ -41,6 +41,10 @@
         <%= render 'layouts/right_sidebar' %>  
     </section>
 
+    <!-- Notify -->
+    <div id="notify-wrapper"></div>
+    <!-- Notify -->
+
     <!-- Main Content -->
     <section class="content"> 
       <% flash.each do |type, message| %>
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 0cae40ce..24599bd1 100755
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -98,10 +98,17 @@
 
 <script type="text/javascript">
 $(document).ready(function(){
-  // Qty update for OQS Edit Controller
   original_value = $('#qty').val();
+
+  // Qty update for OQS Edit Controller
   $('#qty-update').on('click', function(){
     var qty_weight = $("input[name='qty_weight']").val();
+
+    if(parseInt(qty_weight) > parseInt(original_value)){      
+      swal("Alert!", "Not allowed over quantity", "warning");
+      return;
+    }
+    
     var remarks = $("textarea[name='remarks']").val();
     var order_items_id = $(this).attr('data-id');
     var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks }
@@ -110,7 +117,7 @@ $(document).ready(function(){
       url: '/oqs/' + order_items_id,
       data: params,
       success: function(result){
-        alert("Updated!");
+        // alert("Updated!");
         window.location.href = '/oqs';
       }
     });
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 7f7f2d24..f5868fa5 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -84,8 +84,8 @@
                     <%= qid.qty %>
                   </span> ]   
                 </p>                  
-
-                <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+                
+                <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
 
                 <span class="card-text">
                   <span class="text-muted">Order at - 
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 48081ea7..d8909915 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -7,17 +7,36 @@
 <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| %>
-            <!-- <li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>">
-             -->
-             <li class="nav-item menu_category">
-              <p class="hidden menu-id"><%= menu.id  %></p> 
-              <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
-            </li>
-            <% end %>
+            <% @menu.each do |menu|  %>
+                <%   if menu.menu_category_id.nil?%>
+                  <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                    <p class="hidden menu-id"><%= menu.id  %></p> 
+                    <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                       <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                      </ul>
+                    </a>
+                     
+                  </li>
+                  <% end%>
+            <%end %>
+            <!-- <li class="nav-item menu_category">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu 1 <b class="caret"></b></a>
+              <ul class="dropdown-menu multi-level">
+                <li><a href="#">Action</a></li>
+                <li><a href="#">Another action</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li><a href="#">Separated link</a></li>
+                <li class="divider"></li>
+                <li><a href="#">One more separated link</a></li>
+                
+              </ul>
+            </li> -->
             <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
               <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
             </li>
+
+
         </ul>
     </div>
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">
diff --git a/app/views/origami/addorders/get_menu_sub_category.json.jbuilder b/app/views/origami/addorders/get_menu_sub_category.json.jbuilder
new file mode 100644
index 00000000..d391e4c5
--- /dev/null
+++ b/app/views/origami/addorders/get_menu_sub_category.json.jbuilder
@@ -0,0 +1,9 @@
+if @sub_menu
+	json.sub_category @sub_menu.each do |sub_cat|
+		json.id                 sub_cat.id
+		json.code               sub_cat.code
+		json.name               sub_cat.name
+		json.menu_id            sub_cat.menu_id
+		json.menu_category_id   sub_cat.menu_category_id
+	end
+end
diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index e9ccc8c4..82e66d7e 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -21,6 +21,7 @@
               <label>You can pay up to </label>
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6">
+            <%@can_credit = @can_credit +@rounding_adj%>
               <input type="text" name="validamount" id="validamount" class="form-control"  readonly="" value="<%=@can_credit %>" data-member-value="">
             </div>
           </div>
@@ -40,15 +41,13 @@
           <!-- </div> -->
           <% end %>
           <!-- <div class="row"> -->
-          <div class="row">
+          <!-- <div class="row">
            <div class="col-lg-5 col-md-5 col-sm-5">
              <label >Recent Credit Amount</label>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6">
             <input type="text" name="valid_amount" id="valid_amount" class="form-control" value="" data-value="<%=@sale_id %>" data-member-value="">
-          </div>
-        </div>
-        <hr>
+          </div> -->
         <!-- </div> -->
         <div class="row">
          <div class="col-lg-5 col-md-5 col-sm-5">
@@ -170,6 +169,7 @@
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+      $(this).off("click");
       $.ajax({type: "POST",
         url: "<%= origami_payment_credit_path  %>",
         data: "amount="+ amount + "&sale_id="+ sale_id,
@@ -178,7 +178,11 @@
             swal({
               title: "Information!",
               text: "Payment Success",
-              type: "success"
+              type: "success",
+              html: true,
+              closeOnConfirm: false,
+              closeOnCancel: false,
+              allowOutsideClick: false
             }, function () {
               window.location.href = '/origami/sale/'+ sale_id  + "/payment";
             });            
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 18512b93..03c73fea 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -14,86 +14,84 @@
 <div class="row">
   <div class="col-lg-8 col-md-8 col-sm-8">
     <div class="card">
-      <div class="main-box-body clearfix" id="order-detail-slimscroll" style="">
-        <div class="table-responsive">
-          <table id="origami-crm-table" class="table table-striped">
+      <div class="body">
+        <div class="row p-t-20 p-l-20">
+          <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <!--  <% path ="/origami/#{@sale_id}/customers" %>
+            <%= form_tag path, :id => "filter_form", :method => :get do %>
+              <div class="input-append col-md-7 form-group pull-left">
+                <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-9">
+                <input type="hidden" name="type" id="type" value="">
+                <button type="submit" class="btn btn-primary btn-sm">Search</button>                        
+              </div>
+            <% end %>
+            <button id="member_acc_no" class="btn btn-success btn-sm"><span class="fa fa-credit-card"></span> Member Card</button> -->
+              <% path ="/origami/#{@sale_id}/customers" %>
+              <%= form_tag path, :id => "filter_form", :method => :get do %>
+              <div class="row clearfix">
+                <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
 
-            <thead>
+                 <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
+                 <!-- <input type="hidden" name="type" id="type" value="<%= @dining_facility.type %>"> -->
 
-              <tr>
-               <td colspan="6">
-                  <!--  <% path ="/origami/#{@sale_id}/customers" %>
-                      <%= form_tag path, :id => "filter_form", :method => :get do %>
-                        <div class="input-append col-md-7 form-group pull-left">
-                          <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-9">
-                          <input type="hidden" name="type" id="type" value="">
-                          <button type="submit" class="btn btn-primary btn-sm">Search</button>                        
-                        </div>
-                      <% end %>
-                      <button id="member_acc_no" class="btn btn-success btn-sm"><span class="fa fa-credit-card"></span> Member Card</button> -->
-                      <div class="body">
-                        <% path ="/origami/#{@sale_id}/customers" %>
-                        <%= form_tag path, :id => "filter_form", :method => :get do %>
-                        <div class="row clearfix">
-                          <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
+               </div>
+               <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
+                <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
+              </div>
 
-                           <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
-                           <input type="hidden" name="type" id="type" value="<%= @dining_facility.type %>">
+              <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">Member Card</button>
 
-                         </div>
-                         <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
-                          <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
-                        </div>
+            </div>
+            <% end %>
+          </div>
+        </div>
+        <div class="main-box-body clearfix" id="order-detail-slimscroll" style="">
+          <div class="table-responsive">
+            <table id="origami-crm-table" class="table table-striped" style="width:100%">
+              <thead>
+                  <tr>
+                    <th></th>
+                    <th><%= t("views.right_panel.detail.sr_no") %></th>
+                    <th><%= t("views.right_panel.detail.name") %></th>
+                    <th><%= t("views.right_panel.detail.card_no") %></th>
+                    <th style="width:20%"><%= t("views.right_panel.detail.contact_no") %></th>
+                    <th style="width:20%"><%= t("views.right_panel.detail.email") %></th>
+                    <!-- <th>Paypar No</th> -->
+                  </tr>
+                </thead>
 
-                        <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">Member Card</button>
+                <tbody>
+                  <% if @crm_customers.count > 0  %> 
+                  <% @i = 0 %>
+                  <% @crm_customers.each do |crm_customer| %>
 
-                      </div>
-                      <% end %>
-                    </div>
-                  </td>
-                </tr>
-                <tr>
-                  <th></th>
-                  <th><%= t("views.right_panel.detail.sr_no") %></th>
-                  <th><%= t("views.right_panel.detail.name") %></th>
-                  <th><%= t("views.right_panel.detail.card_no") %></th>
-                  <th><%= t("views.right_panel.detail.contact_no") %></th>
-                  <th><%= t("views.right_panel.detail.email") %></th>
-                  <!-- <th>Paypar No</th> -->
-                </tr>
-              </thead>
-
-              <tbody>
-                <% if @crm_customers.count > 0  %> 
-                <% @i = 0 %>
-                <% @crm_customers.each do |crm_customer| %>
-
-                <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
-                 <td>
-                   <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
+                  <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
                    <td>
-                    <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
-                    <%= @i += 1 %>
-                    <%else%>
-                    -
-                    <% end %>
-                  </td>
-                  <td><%= crm_customer.name %></td>
-                  <td><%= crm_customer.company rescue '-' %></td>
-                  <td><%= crm_customer.contact_no %></td>
-                  <td><%= crm_customer.email %></td>
-                  <!-- <td><%= crm_customer.paypar_account_no %></td> -->
+                     <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
+                     <td>
+                      <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
+                      <%= @i += 1 %>
+                      <%else%>
+                      -
+                      <% end %>
+                    </td>
+                    <td><%= crm_customer.name %></td>
+                    <td><%= crm_customer.company rescue '-' %></td>
+                    <td style="width:20%;word-break: break-all;"><%= crm_customer.contact_no %></td>
+                    <td style="width:20%;word-break: break-all;"><%= crm_customer.email %></td>
+                    <!-- <td><%= crm_customer.paypar_account_no %></td> -->
 
-                </tr>
-                <% end %>
-                <%else%>
-                <tr><td colspan="5"><p style="text-align:center"><strong>There are no record for your search</strong></p></td></tr>
-                <% end %>
-              </tbody>
-            </table>
-            <br>
+                  </tr>
+                  <% end %>
+                  <%else%>
+                  <tr><td colspan="5"><p style="text-align:center"><strong>There are no record for your search</strong></p></td></tr>
+                  <% end %>
+                </tbody>
+              </table>
+              <br>
 
-            <%= paginate @crm_customers %>
+              <%= paginate @crm_customers %>
+            </div>
           </div>
         </div>
       </div>
@@ -425,13 +423,13 @@
         success: function(data) {
           if(data.status == true)
           {
-            var id       = $("#table_id").val()
-            var type     = $("#type").val()
+            var id       = $("#table_id").val();
+            var type     = $("#type").val();
             if (type=="Table") {
               window.location.href = '/origami/table/'+id
             }else{
-              window.location.href = '/origami/room/'+id
-            }
+             window.location.href = '/origami/room/'+id
+           }
           }else{
             swal("Alert!", "Record not found!", "error");
             location.reload();
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 3035d1c1..72f4fd3c 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -38,7 +38,7 @@
       						<% @sale_data.sale_items.each do |sale_item| %>
       						<% 
       						sub_total += sale_item.qty*sale_item.unit_price 
-      						if sale_item.price != 0 && sale_item.remark != "void"
+      						if sale_item.price != 0 && sale_item.remark != "void" && sale_item.remark != "foc"
       							%>
       							<tr class="item-row" id=<%= sale_item.sale_item_id %> >
       								<td style="width:60%; text-align:left">
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index ad7c8b58..42434d51 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -41,7 +41,11 @@
          <% @tables.each do |table| %>
              <% if table.status == 'occupied' %>
                  <% if table.get_booking.nil? %>
+                    <% if table.get_checkout_booking.nil? %>
                      <div class="card tables red text-white" data-id="<%= table.id %>">
+                    <% else %>
+                     <div class="card tables orange text-white" data-id="<%= table.id %>">
+                    <% end %>
                        <div class="card-block">
                           Zone <%= table.zone_id %> <br>
                           Table <%= table.name %>  ( <%= table.seater %> Seat )
@@ -114,12 +118,13 @@
       <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
       </button>
    <%end%>
+   <%if current_login_employee.role != "waiter" %>
    <button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
    <button id="cash_out" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_out") %> </button>
    <!-- Temporary Disabled -->
 
    <button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
-
+   <%end%>
  </div>
  </div>
  </div>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0fd7fa89..4343e230 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.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 clearfix">
         <!-- Column One -->
         <div class="col-lg-6 col-md-6 col-sm-6">
@@ -37,22 +40,26 @@
               <!--- Panel 1 - Table Orders -->
               <div class="tab-pane dining active " id="tables" role="tabpanel">
                 <div class="card-columns">
-                  <% @tables.each do |table| %>          
+                  <% @tables.each do |table| %>       
                       <% if table.status == 'occupied' %>
                           <% if table.get_booking.nil? %>
+                            <% if table.get_checkout_booking.nil? %>
                               <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                            <% else %>                            
+                              <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
+                            <% end %>                         
                                 <div class="card-block">
                                   <%= table.name %>
                                   <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                                   <div style="font-size:12px;"></div>
                                 </div>
                               </div>
-                          <% else %>
+                          <% else %>         
                             <% if table.get_checkout_booking.nil? %>
                               <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                            <% else %>
+                            <% else %>                       
                               <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
-                            <% end %>
+                            <% end %>                   
                             <div class="card-block">
                                 <%= table.name %>
                                 <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
@@ -128,7 +135,11 @@
                   <div id="save_order_id" data-order="">
                   <% end %>
                     <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
-                    <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                    <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %>
+                      <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                    <% else %>
+                      <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                    <% end %>
                   </div>
               <% elsif @status_sale == 'sale' %>
                   <div><strong id="order-title">INVOICE DETAILS </strong> | Table <%= @dining.name rescue "" %>
@@ -145,8 +156,7 @@
                     <div class="col-lg-6 col-md-6 col-sm-6">
                       &nbsp; Receipt No: <span id="receipt_no">
                          <% if @status_sale == 'sale' %>
-                           <%= @sale_array[0].receipt_no rescue '' %>
-
+                          <%= @sale_array[0].receipt_no rescue '' %>
                          <% end %>
                        </span>
                        <br>
@@ -212,7 +222,7 @@
                           <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
                           <%
                             # Can't check for discount
-                            unless sale_item.price == 0
+                            # unless sale_item.price == 0
                               count += 1
                           %>
                               <tr>
@@ -223,19 +233,18 @@
                               </tr>
 
                           <%
-
-                            end
+                            # end
                             end
                             end
 
                             if @status_order == 'order' && @status_sale != 'sale'
-                              unless @order_items.nil?
+                              unless @order_items.nil? || @order_items.empty?
                                 count = 0
                                 @order_items.each do |order_item|
                                   count += 1
                                   sub_total = sub_total + (order_item.price * order_item.qty)
 
-                                  unless order_item.price == 0 %>
+                                  # unless order_item.price == 0 %>
                                   <tr>
                                     <td><%= count %></td>
                                     <td class='item-name'><%= order_item.item_name %></td>
@@ -244,7 +253,7 @@
                                   </tr>
                               <%
 
-                                end
+                                # end
                                 end
                                 end
                                 end
@@ -257,7 +266,7 @@
                 <table class="table" id="order-charges-table" border="0">
                   <tr>
                     <td class="charges-name"><strong>Sub Total:</strong></td>
-                    <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+                    <td class="item-attr"><strong id="sub-total"><%= sub_total %></strong></td>
                   </tr>
                   <tr>
                     <% if @obj_sale != nil && @obj_sale.discount_type == 'member_discount' %>
@@ -284,7 +293,8 @@
                       <tr>
                         <td class="charges-name"><strong>Rounding Adj:</strong></td>
                         <td class="item-attr">
-                          <strong id="order-round-adj"><%= @obj_sale.rounding_adjustment rescue 0 %></strong></td>
+                          <strong id="order-round-adj"><%= @obj_sale.rounding_adjustment 
+                          %></strong></td>
                       </tr>
                       <tr>
                         <td class="charges-name"><strong>Grand Total:</strong></td>
@@ -298,7 +308,7 @@
 
               <%
                 if @status_sale == 'sale'
-                  unless @order_items.nil?
+                  unless @order_items.nil? || @order_items.empty?
               %>
                       Pending New Order
                       <table class="table table-striped">
@@ -359,6 +369,7 @@
              <%= t("views.btn.back") %>
           </button>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
+          <% if current_login_employee.role != "waiter" %>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
           <% if @dining.status != "available" %> 
               <% if @status_order == 'order' && @status_sale != 'sale' %>
@@ -374,14 +385,20 @@
               <% end %>
               <% if @status_sale == 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
-                  <button type="button" class="btn btn-block bg-blue waves-effect" id='edit'>Edit</button>
+                  <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' active="<%= can? :edit, :sale_edit %>">Edit</button>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
+
                   <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
                   <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
-                  <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+
+                  <%if @membership.discount && @obj_sale.customer.membership_id %>
+                    <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
+                  <%else%>
+                    <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+                  <%end%>              
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
-                  <button type="button" id="void" class="btn btn-block bg-blue waves-effect"> Void</button>
+                  <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
               <% end %>
               <!-- Cashier Buttons -->
 
@@ -389,11 +406,51 @@
           <% else %>
             <button type="button" id="check_in" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.check_in") %></button>
           <% end %>
+           <span class="hidden" id="member_discount"><%= @membership.discount%></span>
+           <span class="hidden" id="membership_id"><%= @obj_sale.customer.membership_id rescue 0%></span>
+          <div class="modal fade" id="paymentModal" tabindex="-1" role="dialog">
+                <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
+                        </div>
+                        <div class="modal-body">
+                           <select class="form-control show-tick payment_method"  id="payment_method" >
+                             <option value="Cash">Cash</option>
+                            <% @payment_methods.each do |pay| %>
+                              <option value="<%= pay.payment_method %>">
+                                <%= pay.payment_method %>
+                              </option>
+                            <%end %>
+                            
+                            </select>   
+                        </div>
+                        <div class="modal-footer  p-r-30">
+                            <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                            &nbsp;  &nbsp;
+                           <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+          <% end %>
         </div>
     </div>
 </div>
 <script>
     $(document).ready(function () {
+      /* start check first bill or not*/
+        var receipt_no = "";
+        if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+          receipt_no = ($("#receipt_no").html()).trim();
+        }
+        // console.log(checkReceiptNoInFirstBillData(receipt_no));
+        if(checkReceiptNoInFirstBillData(receipt_no,"")){
+          $("#pay").show();
+        }else{
+          $("#pay").hide();
+        }
+      /* end check first bill or not*/
 
         $('.invoicedetails').on('click', function () {
             var dining_id = "<%= @dining.id %>";
@@ -482,7 +539,7 @@
                 window.location.href = '/origami/' + sale_id + '/other_charges'
             }
             else {
-                alert("Please select an table!");
+                swal ( "Oops" ,  "Please select an table!" ,  "warning" );
             }
 
             return false;
@@ -501,13 +558,12 @@
                 window.location.href = '/origami/' + sale_id + '/discount'
             }
             else {
-                alert("Please select an table!");
+              swal ( "Oops" ,  "Please select an table!" ,  "warning" );
             }
 
             return false;
         });
     });
-
     // Print for first bill
     $("#first_bill").on('click', function () {
         var sale_id = $('#sale_id').val();
@@ -517,24 +573,68 @@
             type: "GET",
             url: ajax_url,
             success: function (result) {
-                location.reload();
+              receipt_no = ($("#receipt_no").html()).trim();
+              if((receipt_no!=undefined) && (receipt_no!=""))
+                createReceiptNoInFirstBillData(receipt_no,"");
+              
+              location.reload();
             }
-        });
+        });  
     });
+    $(".choose_payment").on('click', function () {
+      $( "#loading_wrapper").show();
 
+        var sale_id = $('#sale_id').val();
+          type = $('.payment_method').val();
+
+          calculate_member_discount(sale_id,type);
+
+          var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+          $.ajax({
+              type: "GET",
+              url: ajax_url,
+              success: function (result) {
+                  $( "#loading_wrapper" ).hide();
+                  receipt_no = ($("#receipt_no").html()).trim();
+                  if((receipt_no!=undefined) && (receipt_no!=""))
+                    createReceiptNoInFirstBillData(receipt_no,type);
+                  
+                  location.reload();
+              }
+          });  
+    });
+    function calculate_member_discount(sale_id,type) {
+       var sub_total = $('#sub-total').text();
+         if (type == "Cash") {
+           is_card = false
+         }else{
+          is_card = true
+         }
+        $.ajax({
+          type: "POST",
+          url: "/origami/" + sale_id + "/member_discount",
+          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
+          async: false,
+          success:function(result){ 
+          }
+        });
+      
+    }
+
+    // $('#pay').on('click', function () {
+    //     var sale_id = $('#sale_id').val();
+    //     var url = '/origami/sale/' + sale_id + "/rounding_adj";
+    //     $.ajax({
+    //         type: "POST",
+    //         url: '/origami/sale/' + sale_id + "/rounding_adj",
+    //         success: function (result) {
+    //             window.location.href = '/origami/sale/' + sale_id + "/payment";
+    //         }
+    //     });
+    // });
     $('#pay').on('click', function () {
         var sale_id = $('#sale_id').val();
-
-        var url = '/origami/sale/' + sale_id + "/rounding_adj";
-        $.ajax({
-            type: "POST",
-            url: '/origami/sale/' + sale_id + "/rounding_adj",
-            success: function (result) {
-                window.location.href = '/origami/sale/' + sale_id + "/payment";
-            }
-        });
-
-
+        window.location.href = '/origami/sale/' + sale_id + "/payment";
     });
 
     // Bill Request
@@ -546,18 +646,19 @@
             url: ajax_url,
             // data: 'order_id='+ order_id,
             success: function (result) {
+
                 if (!result.status) {
                   swal("Information!", result.error_message);
                 }
-                else {
-                    location.reload();
+                else {              
+                  location.reload();
                 }
             }
         });
     });
 
     $('#move').on('click', function () {
-        var dining_id = "<%= @dining.id %>"
+        var dining_id = "<%= @dining.id %>";
         window.location.href = '/origami/table/' + dining_id + "/movetable";
     })
 
@@ -574,8 +675,16 @@
             url: ajax_url,
             data: 'dining_id=' + dining_id + "&sale_id=" + sale_id,
             success: function (result) {
-                alert("Invoice updated")
+              swal({
+                title: "Information!",
+                text: "Invoice updated",
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
                 window.location.reload();
+              });
             }
         });
     })
@@ -617,7 +726,12 @@
     $('#edit').on('click', function () {
         var dining_id = "<%= @dining.id %>"
         var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
-        window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
+        if ($(this).attr('active')=== "true") {
+           window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
+        }else{
+          swal("Opps","You are not authorized for void","warning")
+        }
+       
     });
 
     $('#commissions').on('click', function () {
@@ -632,6 +746,7 @@
     });
 
     $('#void').on('click', function () {
+      if ($(this).attr('active')=== "true") {
         swal({
             title: "Alert",
             text: "Are you sure want to Void?",
@@ -652,7 +767,10 @@
                 }
             });
           }
-        });
+        }); 
+      }else{
+        swal("Opps","You are not authorized for void","warning")
+      }
     });
 
     $('#add_order').on('click', function () {
@@ -666,7 +784,7 @@
 
       $.ajax({
         type: 'POST',
-        data: {dining_id : dining_id},
+        data: {'dining_id' : dining_id},
         datatype: 'JSON',
         url: '/origami/check_in',
         success: function(data) {
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 0f38afcf..c7cc79f9 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -20,6 +20,7 @@
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
 							<label>You can pay up to </label>
+							<%@can_jcb = @can_jcb +@rounding_adj%>
 							<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_jcb %>" data-member-value="">
 						</div>
 						<hr>
@@ -160,19 +161,20 @@ $('#jcb_pay').on('click',function(){
 	var amount = $('#amount').text();
 	var sale_id = "<%= @sale_id %>";
 	if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
-			//start member discount 5% by pay card	
-			var sub_total = $('#sub-total').text();
-			var member_id = $('#membership_id').text();
-			var member_discount = $('#member_discount').text();
-			if (member_id && member_discount) {
-				$.ajax({
-					type: "POST",
-					url: "/origami/" + sale_id + "/member_discount",
-					data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-	              // success:function(result){           
-	              // }
-	          });
-			}
+		$(this).off("click");
+		  //start member discount 5% by pay card	
+			// var sub_total = $('#sub-total').text();
+			// var member_id = $('#membership_id').text();
+			// var member_discount = $('#member_discount').text();
+			// if (member_id && member_discount) {
+			// 	$.ajax({
+			// 		type: "POST",
+			// 		url: "/origami/" + sale_id + "/member_discount",
+			// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+	        //       success:function(result){           
+	        //           }
+	        //         });
+			// }
 	    //end member discount
 	    $.ajax({type: "POST",
 	    	url: "<%= origami_payment_jcb_path  %>",
@@ -182,6 +184,10 @@ $('#jcb_pay').on('click',function(){
 	    			swal({
 	    				title: "Information!",
 	    				text: "Payment Successfully",
+	    				html: true,
+						closeOnConfirm: false,
+						closeOnCancel: false,
+						allowOutsideClick: false
 	    			},function () {
 	    				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
 	    			});
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 497bfa3b..94a9e7c8 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -20,6 +20,7 @@
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
           <label>You can pay up to </label>
+          <%@can_master = @can_master +@rounding_adj%>
           <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_master %>" data-member-value="">
         </div>
         <hr>
@@ -157,19 +158,20 @@
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+      $(this).off("click");
       //start member discount 5% by pay card  
-      var sub_total = $('#sub-total').text();
-      var member_id = $('#membership_id').text();
-      var member_discount = $('#member_discount').text();
-      if (member_id && member_discount) {
-        $.ajax({
-          type: "POST",
-          url: "/origami/" + sale_id + "/member_discount",
-          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-                // success:function(result){           
-                // }
-              });
-      }
+        // var sub_total = $('#sub-total').text();
+        // var member_id = $('#membership_id').text();
+        // var member_discount = $('#member_discount').text();
+        // if (member_id && member_discount) {
+        //   $.ajax({
+        //     type: "POST",
+        //     url: "/origami/" + sale_id + "/member_discount",
+        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+        //           // success:function(result){           
+        //           // }
+        //         });
+        // }
       //end member discount
       $.ajax({type: "POST",
         url: "<%= origami_payment_master_path  %>",
@@ -179,6 +181,10 @@
             swal({
               title: "Information!",
               text: "Payment Successfully",
+              html: true,
+              closeOnConfirm: false,
+              closeOnCancel: false,
+              allowOutsideClick: false
             },function () {
               window.location.href = '/origami/sale/'+ sale_id  + "/payment";
             });
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 89196450..722cd548 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -21,7 +21,8 @@
 						<div class="row">
 							<div class="form-group col-lg-12 col-md-12 col-sm-12">
 								<label>You can pay up to </label>
-								<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_mpu %>" data-member-value="">
+								<%@can_mpu = @can_mpu +@rounding_adj%>
+								<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%= @can_mpu %>" data-member-value="">
 							</div>
 							<hr>
 						</div>
@@ -160,19 +161,20 @@
 		var amount = $('#amount').text();
 		var sale_id = "<%= @sale_id %>";
 		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+			$(this).off("click");
 		//start member discount 5% by pay card	
-		var sub_total = $('#sub-total').text();
-		var member_id = $('#membership_id').text();
-		var member_discount = $('#member_discount').text();
-		if (member_id && member_discount) {
-			$.ajax({
-				type: "POST",
-				url: "/origami/" + sale_id + "/member_discount",
-				data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-	              // success:function(result){           
-	              // }
-	          });
-		}
+			// var sub_total = $('#sub-total').text();
+			// var member_id = $('#membership_id').text();
+			// var member_discount = $('#member_discount').text();
+			// if (member_id && member_discount) {
+			// 	$.ajax({
+			// 		type: "POST",
+			// 		url: "/origami/" + sale_id + "/member_discount",
+			// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+		    //              success:function(result){           
+		    //              }
+		    //          });
+			// }
 	    //end member discount
 	         //Mpu Payment
 	         $.ajax({type: "POST",
@@ -183,6 +185,10 @@
 	         			swal({
 	         				title: "Information!",
 	         				text: "Payment Successfully",
+	         				html: true,
+							closeOnConfirm: false,
+							closeOnCancel: false,
+							allowOutsideClick: false
 	         			}, function () {
 	         				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
 	         			});
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index 5b677d3e..627e7342 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -8,7 +8,7 @@
           <div><strong id="order-title">ORDER DETAILS</strong></div>
       </div> -->
       <div class="card-block">
-      	<div class="card-title row">
+      	<div class="row card-title">
       		<div class="col-lg-6 col-md-6 col-sm-6">
       			<p id="sale-id" class="hidden"><%=@sale_data.sale_id %></p>
       			<p>Receipt No: <span id="receipt_no"><%=@sale_data.receipt_no rescue ' '%></span></p>
@@ -95,12 +95,17 @@
   			<div class="card-title">
   				<div class="form-horizontal">
   					<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">	
-  					<div class="-group">										
-  							<input type="text" id="other-charges-amount" name="other-charges-amount" class="form-control" placeholder="Amount" />							
+  					  <div class="bottom-5">										
+  							<input type="text" id="other-charges-amount" name="other-charges-amount" class="form-control" placeholder="Amount" onkeypress="return isNumberKey(event);" />		
+                <br><span id="other-charges-amountErr" style="color:red;"></span>					
   						</div>						
-  						<div class="-group">
+  						<div class="bottom-5">
   							<textarea id="reasons" name="reasons" rows="2" class="form-control" placeholder="Reasons"></textarea>
-  						</div>	
+  						</div>
+              <div class="bottom-5">                
+                <input type="checkbox" id="is_taxable" name="is_taxable" />  
+                <lable for="is_taxable">Is Taxable</lable> 
+              </div>	
   					</div>					
   				</div>
   			</div>
@@ -199,7 +204,7 @@
 </div>
 </div>
 <script type="text/javascript">
-	$(document).ready(function(){
+	$(document).ready(function(){     
 		$(".cashier_number").on('click', function(event){
 			if(event.handled !== true) {
 				var original_value=0;
@@ -270,12 +275,23 @@
 			var sub_total = $('#order-sub-total').text();
 			var charge_amount = $("#other-charges-amount").val();
 			var reasons = $("#reasons").val();	
+      var is_taxable = 0
+      if ($("#is_taxable:checked").length > 0) {
+        is_taxable = 1
+      }      
+      $("#other-charges-amountErr").html("");
+      if(charge_amount != ""){
+        $("#other-charges-amount").val("");
+        $("#reasons").val("");
+        // Update sub total
+        $('#order-sub-total').text(parseFloat(sub_total) + parseFloat(charge_amount));    
 
-			// Update sub total
-			$('#order-sub-total').text(parseFloat(sub_total) + parseFloat(charge_amount));		
-
-			var item_row = item_row_template(sale_id, charge_amount, reasons);
-			$("#order-items-table tbody").append(item_row);								
+        var item_row = item_row_template(sale_id, charge_amount, reasons, is_taxable);
+        $("#order-items-table tbody").append(item_row);
+      }
+			else{
+        $("#other-charges-amountErr").html("can't be blank");
+      }						
 		});
 
 		// Calculate Other Charges for Payment
@@ -323,13 +339,14 @@
 			var sale_item = {};
 			sale_item.id = $(this).attr('id');
 			sale_item.name = $(this).find('#item-name-price').text();
-			sale_item.price = $(this).find('#item-total-price').text();
+			sale_item.price = $(this).find('#item-total-price').text()
+      sale_item.is_taxable = $(this).find('#item_taxable').text();
 			sale_items.push(sale_item);
 		});	
 		return sale_items;
 	}	
 
-	function item_row_template(sale_id, charge_amount, reasons){
+	function item_row_template(sale_id, charge_amount, reasons, is_taxable){
 		var item_row = "<tr class='other-item-row' id='SLI-000000000000'>" +
 		"<td style='width: 60%; text-align: left;'>" + 
 		"<span id='item_account_type' class='hidden'>" + 
@@ -338,6 +355,7 @@
 		"<span id='item-name-price'>" + 
 		reasons + 
 		"</span>" + 
+    "<span id='item_taxable' class='hidden'>" + is_taxable + "</span>" +
 		"</td>" +
 		"<td style='width: 20%; text-align: right;'>" + 
 		"<span id='item-qty'>1</span>" +
@@ -351,4 +369,13 @@
 		return  item_row; 					   		
 	}
 
+  function isNumberKey(evt) {
+      var charCode = (evt.which) ? evt.which : event.keyCode;
+      if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
+          return false;
+      } else {
+          return true;
+      }      
+  }
+
 </script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index a911acf4..b9d2cf8b 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -94,7 +94,7 @@
             </tr>
             <tr>
               <td class="charges-name"><strong>Rounding Adj:</strong></td>
-              <td class="item-attr"><strong><span><%=@sale_data.rounding_adjustment rescue 0%></span></strong></td>
+              <td class="item-attr"><strong><%= @sale_data.rounding_adjustment rescue 0%></strong></td>
             </tr>
             <tr>
               <td class="charges-name"><strong>Grand Total</strong></td>
@@ -109,7 +109,7 @@
           </tfooter>
         </table>
       </div>
-      <!-- <div> -->
+     <!-- <div> -->
   <!-- <INPUT TYPE="Button" class='btn btn-primary' VALUE="Reprint" onClick="" style='width:120px'/>
   <INPUT TYPE="Submit" class='btn btn-primary' VALUE="CANCEL" action="origami/index" style='width:120px'/> -->
   <!-- </div> -->
@@ -121,7 +121,11 @@
     <div class="card-header">
       <div class="row m-l-5 m-r-5">
         <div class="col-md-8"><strong>Amount Due</strong></div>
-        <div class="col-md-4"><strong><span id="amount_due"><%= @sale_data.grand_total %></span></strong></div>
+        <div class="col-md-4">
+          <strong>
+            <span id="grand_total" class="hidden"><%= @sale_data.grand_total rescue 0%></span>
+            <span id="amount_due"><%= @sale_data.grand_total rescue 0%></span></strong>
+        </div>
       </div>
      
       <div class="row payment cash-color p-l-5 p-r-5">
@@ -219,7 +223,7 @@
         <!-- <br> -->
         <div class="row m-l-5 m-r-5">
           <div class="col-md-8"><strong>Balance</strong></div>
-          <div class="col-md-4"><strong><span id='balance'><%= @sale_data.grand_total %></span></strong></div>
+          <div class="col-md-4"><strong><span id='balance'><%= @sale_data.grand_total rescue 0 %></span></strong></div>
         </div>
         <!-- <br> -->
       </div>
@@ -276,8 +280,8 @@
     <i class="material-icons">reply</i>
      Back
   </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>
+  <button type="button" class="btn bg-deep-purple btn-block" id="foc" active="<%= can? :foc, :payment %>"> FOC </button>
+  <button type="button" class="btn bg-red btn-block" id="void" active="<%= can? :overall_void, :void %>"> Void </button>
   <!-- Waiter Buttons -->
 </div>
 
@@ -286,6 +290,21 @@
 
 <script>
   $(document).ready(function(){
+    /* start check first bill or not*/
+        var receipt_no = "";
+        if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+          receipt_no = ($("#receipt_no").html()).trim();
+        }
+
+      payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+        if(payment_type=="Cash"){
+           $("#card_payment").hide();
+           $("#credit_payment").hide();
+        }else if(payment_type=="Credit"){
+           $("#card_payment").hide();
+        }
+    
+      /* end check first bill or not*/
     var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
 
     $("#back").on('click', function() {
@@ -359,95 +378,128 @@
   });
 
   $( document ).ready(function() {
-  // Disable click event cash to prevent
-  $(".payment .cash-color").off('click');
+    // Disable click event cash to prevent
+    $(".payment .cash-color").off('click');
 
-  $('#credit_payment').click(function() {
-    var sale_id = $('#sale_id').text();
-    window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"
-    return false;
-  });
-
-  $('#card_payment').click(function() {
-   localStorage.setItem("cash",$('#cash').text() );
-   var sale_id = $('#sale_id').text();
-   window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
-   return false;
- });
-
-  $('#pay').click(function() {
-    $('#pay').text("Processing, Please wait!")
-
-    $( "#loading_wrapper" ).show();
-
-    if($('#balance').text() > 0){
-      swal ( "Oops" ,  "Insufficient Amount!" ,  "error" );
-      $( "#loading_wrapper" ).hide();
-    }else{
-      var sale_id   = $('#sale_id').text();
-      var item_row  = $('.is_card');
-      if (item_row.length < 1) {
-        calculate_member_discount(sale_id);
-      }
-
-        //  payment
-        var cash = $('#cash').text();
-        var credit = $('#credit').text();
-        var card = $('#card').text();
-        
-        $.ajax({type: "POST",
-          url: "<%= origami_payment_cash_path %>",
-          data: "cash="+ cash + "&sale_id=" + sale_id,
-          async: false,
-          success:function(result){
-
-            localStorage.removeItem("cash");             
-            if (result.status) {
-              var msg = result.message;
-            }
-            else{
-              var msg = '';
-            }
-            $( "#loading_wrapper" ).hide();
-            if($('#balance').text() < 0){
-              swal({
-                title: "Information!",
-                text: 'Changed amount  ' + $('#balance').text() * (-1),
-              }, function () {
-                window.location.href = '/origami';
-              });
-            }else{         
-              $('#pay').text("Pay");
-              swal({
-               title: "Information!",
-               text: 'Thank You !',
-             }, function () {
-              window.location.href = '/origami';
-            });
-            }
-          }
-        });
-      }
+    $('#credit_payment').click(function() {
+      var sale_id = $('#sale_id').text();
+      window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"
+      return false;
     });
 
-  $('#void').on('click',function () {
-    swal({
-     title: "Information!",
-     text: 'Are you sure want to Void !',
-   }, function () {
-    var sale_id = $('#sale_id').text();
-    var ajax_url = "/origami/sale/" + sale_id + '/void';
-    $.ajax({
-      type: 'POST',
-      url: ajax_url,
-      success: function () {
-        window.location.href = '/origami/';
-      }
-    })
-  });
-  });
+    $('#card_payment').click(function() {
+      localStorage.setItem("cash",$('#cash').text() );
+      var sale_id = $('#sale_id').text();
+      window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
+      return false;
+    });
 
-});
+    $('#pay').click(function() {
+      sub_total = $('#sub-total').text();
+      if (payment_type == 'MPU' && $('.mpu').text() == 0 && sub_total != 0.0) {
+          swal("Opps","Please Pay with MPU Payment","warning");
+      }else if(payment_type == "Redeem" && $('#ppamount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with Redeem Payment","warning");
+      }else if(payment_type == "VISA" && $('#visacount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with Visa Payment","warning");
+        
+      }else if(payment_type == "JCB" && $('#jcbcount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with jcb Payment","warning");
+      }
+      else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with Master Payment","warning");
+      }else{
+
+        $( "#loading_wrapper").show();
+        if($('#balance').text() > 0){
+          swal ( "Oops", "Insufficient Amount!" ,  "error" );
+          $("#loading_wrapper").hide();
+        }else{
+          $(this).off("click");
+          var sale_id   = $('#sale_id').text();
+          // var item_row  = $('.is_card');
+
+          // if (item_row.length < 1) {
+            calculate_member_discount(sale_id);
+          // }
+         
+            //  payment
+            var cash = $('#cash').text();
+            var credit = $('#credit').text();
+            var card = $('#card').text();
+            
+            $.ajax({type: "POST",
+              url: "<%= origami_payment_cash_path %>",
+              data: "cash="+ cash + "&sale_id=" + sale_id,
+              async: false,
+              success:function(result){
+                /* start delete receipt no in first bill*/
+                if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+                  var receipt_no = ($("#receipt_no").html()).trim();
+                  deleteReceiptNoInFirstBillData(receipt_no);
+                }
+                /* end delete receipt no in first bill*/
+
+                localStorage.removeItem("cash");             
+                if (result.status) {
+                  var msg = result.message;
+                }
+                else{
+                  var msg = '';
+                }
+                $( "#loading_wrapper" ).hide();
+                if($('#balance').text() < 0){
+                  swal({
+                    title: "Information!",
+                    text: 'Changed amount  ' + $('#balance').text() * (-1),
+                    html: true,
+                    closeOnConfirm: false,
+                    closeOnCancel: false,
+                    allowOutsideClick: false
+                  }, function () {
+                    window.location.href = '/origami';
+                  });
+                }else{         
+                  $('#pay').text("Pay");
+                  swal({
+                   title: "Information!",
+                   text: 'Thank You !',
+                   html: true,
+                   closeOnConfirm: false, 
+                   closeOnCancel: false,
+                   allowOutsideClick: false
+                 }, function () {
+                  window.location.href = '/origami';
+                });
+                }
+              }
+            });
+          }
+        }
+    });
+
+    $('#void').on('click',function () {
+      if ($(this).attr('active') === "true") { 
+        swal({
+           title: "Information!",
+           text: 'Are you sure want to Void !',
+          }, function () {
+            var sale_id = $('#sale_id').text();
+            var ajax_url = "/origami/sale/" + sale_id + '/void';
+            $.ajax({
+              type: 'POST',
+              url: ajax_url,
+              success: function () {
+                window.location.href = '/origami/';
+              }
+            })
+         });
+      }else{
+        swal("Opps","You are not authorized for void","warning")
+      }
+      
+    });
+  });
 
   function update_balance(){
     var cash = $('#cash').text();
@@ -464,21 +516,23 @@
   }
 
   $('#foc').click(function() {
-    $( "#loading_wrapper" ).show();
+    //$( "#loading_wrapper" ).show();
         //  payment
-        var cash = $('#amount_due').text();
+        var cash = $('#grand_total').text();
         var sub_total = $('#sub-total').text();
         var sale_id = $('#sale_id').text();
         var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total };
 
-        $.ajax({type: "POST",
+        if ($(this).attr('active')=== "true") {  
+        $.ajax({
+          type: "POST",
           url: "<%= origami_payment_foc_path %>",
           data: params,
           success:function(result){          
 
-            $( "#loading_wrapper" ).hide();
+            //$( "#loading_wrapper" ).hide();
             
-            if (cash > 0) {
+            if (cash >= 0) {
               swal({
                title: "Information!",
                text: 'Thank You !',
@@ -489,21 +543,29 @@
             
           }
         });
+        }else{
+          swal("Opps","You are not authorized for foc","warning")
+        }
       });
 
   function calculate_member_discount(sale_id) {
    var sub_total = $('#sub-total').text();
    var member_id = $('#membership_id').text();
    var member_discount = $('#member_discount').text();
+   var item_row  = $('.is_card');
 
    if (member_id && member_discount) {
+     if (item_row.length < 1) {
+       is_card = false
+     }else{
+      is_card = true
+     }
     $.ajax({
       type: "POST",
       url: "/origami/" + sale_id + "/member_discount",
-      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':false },
+      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
       async: false,
       success:function(result){ 
-
       }
     });
   }
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index 23b6dc29..d250e0b7 100755
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -17,6 +17,7 @@
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
 							<label class="">You can redeem up to </label>
+							<%@redeem_prices = @redeem_prices +@rounding_adj%>
 							<input type="text" name="" id="redeemamt" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @redeem_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 						</div>
 						<hr>
@@ -146,7 +147,7 @@
 				$('#used_amount').text(cash.substr(0,cash.length-1));
 				break;
 				case 'nett':
-				var remain_amount = $('#valid_amount').val();
+				var remain_amount = $('#redeemamt').val();
 				$('#used_amount').text(remain_amount);
 				break;
 
@@ -168,6 +169,7 @@
 			swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
 		}else{
 			if(redeem_amount <= "<%= @redeem_prices %>"){
+				$(this).off("click");
 				$.ajax({
 					type: "POST",
 					url:  "<%=origami_payment_paypar_path%>",
@@ -178,6 +180,10 @@
 							swal({
 								title: "Information!",
 								text: result.message,
+								html: true,
+								closeOnConfirm: false,
+								closeOnCancel: false,
+								allowOutsideClick: false
 							}, function () {
 								window.location.href = '/origami/sale/'+ sale_id  + "/payment"
 							});
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 5e461650..3b7a5144 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.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">
@@ -39,15 +42,23 @@
          <div class="card-columns">
            <% @tables.each do |table| %>
            <% if table.status == 'occupied' %>
-              <% if table.get_booking.nil? %>
-                  <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% if table.get_booking.nil? %>  
+                <% if table.get_checkout_booking.nil? %>            
+                  <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>"> 
+                <% else %>               
+                  <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">  
+                <% end %>              
                     <div class="card-block">
                        <%= table.name %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                     </div>
                   </div>
-              <% else %>
-                  <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <% else %>                
+                  <% if table.get_checkout_booking.nil? %>
+                    <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>"> 
+                  <% else %>                
+                    <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">      
+                  <% end %>           
                     <div class="card-block">
                        <%= table.name %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
@@ -124,12 +135,20 @@
        <div class="card-header">
          <% if @status_order == 'order' %>
             <div id="save_order_id" data-order="<%= @obj_order.order_id %>"><strong id="order-title">ORDER DETAILS </strong> |  Table <%= @room.name rescue "" %>
-            <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %>
+              <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% else %>
+              <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% end %>
             </div>
 
          <% elsif @status_sale == 'sale' %>
             <div><strong id="order-title">INVOICE DETAILS </strong> |  Table <%= @room.name rescue "" %>
-            <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %>
+              <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% else %>
+              <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% end %>
             </div>
 
          <% end %>
@@ -167,7 +186,7 @@
          <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 class="hidden customer-id"><%= @obj_sale.customer_id rescue '' %></p>
               &nbsp; Customer : <%= @obj_sale.customer.name rescue '-' %>
              <%else%>
                <p class="hidden customer-id"><%= @obj_order.customer_id rescue "-" %></p>
@@ -199,7 +218,7 @@
                  <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
                  <%
                  # Can't check for discount
-                  unless sale_item.price == 0
+                  # unless sale_item.price == 0
                       count += 1
                   %>
                  <tr>
@@ -211,18 +230,18 @@
 
                  <%
 
-                       end
+                       # end
                      end
                    end
 
                    if @status_order == 'order' && @status_sale != 'sale'
-                      unless @order_items.nil?
+                      unless @order_items.nil? || @order_items.empty?
                          count = 0
                       @order_items.each do |order_item |
                           count += 1
                       sub_total = sub_total + (order_item.price * order_item.qty)
 
-                  unless order_item.price == 0 %>
+                  # unless order_item.price == 0 %>
                  <tr>
                    <td><%= count %></td>
                    <td class='item-name'><%= order_item.item_name %></td>
@@ -231,7 +250,7 @@
                  </tr>
                  <%
 
-                       end
+                       # end
                       end
                      end
                    end
@@ -244,7 +263,7 @@
            <table class="table" id="order-charges-table" border="0">
              <tr>
                <td class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+               <td class="item-attr"><strong id="sub-total"><%= sub_total %></strong></td>
              </tr>
              <tr>
                <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%>
@@ -275,7 +294,7 @@
          <br>
           <%
             if @status_sale == 'sale'
-                unless @order_items.nil?
+                unless @order_items.nil? || @order_items.empty?
                   %>
                   Pending New Order
                    <table class="table table-striped">
@@ -337,25 +356,61 @@
        <!-- <button type="button" class="btn bg-blue btn-block" disabled >Edit</button> -->
        <!-- <button type="button" id="discount" class="btn bg-blue btn-block" disabled >Discount</button> -->
         <!-- <button type="button" id="other-charges" class="btn bg-blue btn-block" disabled>Charges</button> -->
+        <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
        <button type="button" class="btn bg-blue btn-block" id='move'>Move</button>
        <button type="button" id="request_bills" class="btn bg-blue btn-block">Req.Bill</button>
        <!-- <button type="button" id="first_bill" class="btn bg-blue btn-block" disabled>First Bill</button> -->
        <!-- <button type="button" id="pay" class="btn bg-blue btn-block" disabled>Pay</button> -->
        <!-- <button type="button" class="btn bg-blue btn-block" disabled=""> Void </button> -->
-    <% else %>
+    <% end %>
+    <% if @status_sale == 'sale' %>
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
         <button type="button" class="btn bg-blue btn-block" id='edit'>Edit</button>
         <button type="button" id="discount" class="btn bg-blue btn-block" >Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
+        
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
         <!-- <button type="button" class="btn bg-blue btn-block" id='move' disabled="">Move</button> -->
         <!-- <button type="button" id="request_bills" class="btn bg-blue btn-block" disabled> Req.Bill</button> -->
-        <button type="button" id="first_bill" class="btn bg-blue btn-block">First Bill</button>
+        <%if @membership.discount && @obj_sale.customer.membership_id %>
+          <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
+        <%else%>
+          <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+        <%end%> 
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
         <button type="button" id="void" class="btn bg-blue btn-block" > Void </button>
      <% end %>
+
+
+           <span class="hidden" id="member_discount"><%= @membership.discount%></span>
+           <span class="hidden" id="membership_id"><%= @obj_sale.customer.membership_id rescue 0%></span>
+          <div class="modal fade" id="paymentModal" tabindex="-1" role="dialog">
+                <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
+                        </div>
+                        <div class="modal-body">
+                           <select class="form-control show-tick payment_method"  id="payment_method" >
+                             <option value="Cash">Cash</option>
+                            <% @payment_methods.each do |pay| %>
+                              <option value="<%= pay.payment_method %>">
+                                <%= pay.payment_method %>
+                              </option>
+                            <%end %>
+                            
+                            </select>   
+                        </div>
+                        <div class="modal-footer  p-r-30">
+                            <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                            &nbsp;  &nbsp;
+                           <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
      <!-- Cashier Buttons -->
 
    <!-- <button type="button" id="re-print" class="btn bg-blue btn-block" >Re.Print</button> -->
@@ -394,6 +449,19 @@ $(document).ready(function(){
   //   window.location.href = '/origami/order/' + order_id;
   // })
 
+  /* start check first bill or not*/
+    var receipt_no = "";
+    if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+      receipt_no = ($("#receipt_no").html()).trim();
+    }
+    // console.log(checkReceiptNoInFirstBillData(receipt_no));
+    if(checkReceiptNoInFirstBillData(receipt_no,"")){
+      $("#pay").show();
+    }else{
+      $("#pay").hide();
+    }
+  /* end check first bill or not*/
+
   $('.invoicedetails').on('click',function(){
     var dining_id = "<%= @room.id %>";
     var sale_id = this.id;
@@ -481,7 +549,7 @@ $(document).ready(function(){
       window.location.href = '/origami/' + sale_id + '/discount'
     }
     else {
-      alert("Please select an table!");
+      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
     }
 
     return false;
@@ -500,7 +568,7 @@ $(document).ready(function(){
       window.location.href = '/origami/' + sale_id + '/other_charges'
     }
     else {
-      alert("Please select an table!");
+      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
     }
 
     return false;
@@ -516,11 +584,54 @@ $("#first_bill").on('click', function(){
       type: "GET",
         url: ajax_url,
         success:function(result){
+          receipt_no = ($("#receipt_no").html()).trim();
+          if((receipt_no!=undefined) && (receipt_no!=""))
+            createReceiptNoInFirstBillData(receipt_no,"");
+          
           location.reload();
         }
     });
 });
 
+$(".choose_payment").on('click', function () {
+  $( "#loading_wrapper").show();
+  var sale_id = $('#sale_id').val();
+  type = $('.payment_method').val();
+
+  calculate_member_discount(sale_id,type);
+
+  var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+  $.ajax({
+    type: "GET",
+    url: ajax_url,
+    success: function (result) {
+      $( "#loading_wrapper" ).hide();
+      receipt_no = ($("#receipt_no").html()).trim();
+      if((receipt_no!=undefined) && (receipt_no!=""))
+        createReceiptNoInFirstBillData(receipt_no,type);
+      
+      location.reload();
+    }
+  });  
+});
+function calculate_member_discount(sale_id,type) {
+ var sub_total = $('#sub-total').text();
+ if (type == "Cash") {
+   is_card = false
+ }else{
+  is_card = true
+}
+$.ajax({
+  type: "POST",
+  url: "/origami/" + sale_id + "/member_discount",
+  data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
+  async: false,
+  success:function(result){ 
+  }
+});
+
+}
+
 $('#pay').on('click',function() {
    var sale_id = $('#sale_id').val();
    var url = '/origami/sale/'+ sale_id + "/rounding_adj" ;
@@ -583,8 +694,16 @@ $('#add_invoice').on('click',function(){
       url: ajax_url,
       data: 'dining_id='+ dining_id + "&sale_id=" + sale_id,
       success:function(result){
-        alert("Invoice updated")
-        window.location.reload();
+        swal({
+          title: "Information!",
+          text: "Invoice updated",
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.reload();
+        });
       }
   });
 });
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index 7c008977..0eaabce1 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -109,7 +109,7 @@
   <div class="col-lg-5 col-md-5 col-sm-5">
      <div class="card"  >
        <div class="card-header">
-          <div><strong id="order-title">INVOICE DETAILS </strong></div>
+          <div><strong id="order-title">INVOICE DETAILS </strong>| Table <%= @dining.name rescue "" %></div>
        </div>
        <div class="card-block">
          <div class="card-title row p-l-5 p-r-5">
@@ -146,7 +146,7 @@
                   sub_total = sub_total + sale_item.price
                %>
                <input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
-               <% unless sale_item.price <= 0 %>
+               <% #unless sale_item.price <= 0 %>
                <tr>
                  <td class='item-name'><%= sale_item.product_name %></td>
                  <td class='item-attr'><%= sale_item.qty %></td>
@@ -154,7 +154,7 @@
                </tr>
                <%
 
-                   end
+                   #end
                  end
 
                 %>
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index d50853b4..cf0bd605 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -20,6 +20,7 @@
        <div class="row">
         <div class="form-group col-lg-12 col-md-12 col-sm-12">
           <label>You can pay up to </label>
+          <%@can_visa = @can_visa +@rounding_adj%>
           <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_visa %>" data-member-value="">
         </div>
         <hr>
@@ -159,19 +160,20 @@
     console.log(amount);
     console.log($("#validamount").attr("value"));
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+      $(this).off("click");
       //start member discount 5% by pay card  
-      var sub_total = $('#sub-total').text();
-      var member_id = $('#membership_id').text();
-      var member_discount = $('#member_discount').text();
-      if (member_id && member_discount) {
-        $.ajax({
-          type: "POST",
-          url: "/origami/" + sale_id + "/member_discount",
-          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':false },
-                // success:function(result){           
-                // }
-              });
-      }
+        // var sub_total = $('#sub-total').text();
+        // var member_id = $('#membership_id').text();
+        // var member_discount = $('#member_discount').text();
+        // if (member_id && member_discount) {
+        //   $.ajax({
+        //     type: "POST",
+        //     url: "/origami/" + sale_id + "/member_discount",
+        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+        //            success:function(result){           
+        //            }
+        //         });
+        // }
       //end member discount
       $.ajax({type: "POST",
         url: "<%= origami_payment_visa_path  %>",
@@ -181,6 +183,10 @@
             swal({
              title: "Information!",
              text: "Payment Successfully",
+             html: true,
+             closeOnConfirm: false,
+             closeOnCancel: false,
+             allowOutsideClick: false
            }, function () {
              window.location.href = '/origami/sale/'+ sale_id  + "/payment";
            });
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index b795c380..38e55330 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -15,8 +15,8 @@
           <%= f.input :api_settings %>
           <%= f.input :page_width %>
           <%= f.input :page_height %>
-          <%= f.input :print_copies %>
-          <%= f.input :precision %>
+          <%= f.input :print_copies, input_html: { min: 1, step: '1', :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanOne(this.value);" } %>
+          <%= f.input :precision, input_html: { min: 0, max: 2, :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanTwo(this.value);" } %>
           <%= f.input :delimiter %>
           <%= f.input :heading_space %>
         </div>
@@ -58,4 +58,23 @@
       </div>
     </div>  
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+  function isNumberKey(evt) {
+      var charCode = (evt.which) ? evt.which : event.keyCode;
+      if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
+          return false;
+      } else {
+          return true;
+      }      
+  }
+
+  function greaterThanOne(val){
+    if(parseInt(val)==0) $("#print_setting_print_copies").val(1);
+  }
+
+  function greaterThanTwo(val){
+    if(parseInt(val)>2) $("#print_setting_precision").val(2);
+  }
+</script>
\ No newline at end of file
diff --git a/app/views/reports/commission/_commission_report_filter.html.erb b/app/views/reports/commission/_commission_report_filter.html.erb
index 0e2f71f8..d7d41eb6 100755
--- a/app/views/reports/commission/_commission_report_filter.html.erb
+++ b/app/views/reports/commission/_commission_report_filter.html.erb
@@ -1,7 +1,7 @@
 <div class="p-l-15">
-<%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
+  <%= 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>
@@ -12,17 +12,17 @@
           <% end %>
         </div> -->
         <div class="col-lg-3 col-md-3 col-sm-3">          
-        <!-- <label class="">Select Shift Period</label> -->
-        <label class="font-14"><%= t("views.right_panel.detail.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"><%= t("views.right_panel.detail.to") %></label>
-        <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
-      </div>
+          <!-- <label class="">Select Shift Period</label> -->
+          <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
+          <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
+        </div>
+        <div class="col-lg-3 col-md-3 col-sm-3">
+          <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
+          <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
+        </div>
         <div class="col-lg-2 col-md-2 col-sm-2">
           <label class="font-14"><%= t :commissioner %></label>
-          <select class="form-control" name="commissioner" id="commissioner">
+          <select class="form-control" name="commissioner" id="commissioner" style="height: 37px;">
             <option value=""></option>
             <% @commissioner.each do |c| %>
             <% if @com_id == c.id %>
@@ -34,16 +34,16 @@
           </select>
         </div>
         <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
-        <br>
+          <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>
+      <% end %>
+      <% end %>
     </div>
-  <% end %>
-<% end %>
-</div>
 <!-- <script type="text/javascript">
 
     $(document).ready(function () {
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 6fb6dbf9..bcf12b6b 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
@@ -22,15 +22,15 @@
 				<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">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
 				</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">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
 				</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 class="form-control select" name="shift_name" id="shift_name" style="height: 37px;">
 					</select>
 				</div>
 				<div class="form-group col-md-1 ">
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 8becb13c..7c520fe3 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -65,7 +65,7 @@
 	$(function(){
 
 		var check_arr = [];
-
+		search_by_period();
 		$('#sel_period').change(function(){
 			
 			search_by_period();
@@ -83,20 +83,24 @@
 		
 		// OK button is clicked
 		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#from').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#from').val(from)
 			search_by_date();
 		});
 		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#to').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#to').val(to)
 			search_by_date();
-		});   
+		});  
 		
 		function search_by_date(){
 			
-			var to_date   = new Date($('#to').val()); 
-	        var to        = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear();
-	        var from_date = new Date($('#from').val()); 
-	        var from      = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear();
+			from = $("#from").val();
+	  		to   = $("#to").val(); 
 
 			var period = 0;
 			var period_type = 1;	   
@@ -119,7 +123,10 @@
 		
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			
 			var str = '';
diff --git a/app/views/reports/credit_payment/index.xls.erb b/app/views/reports/credit_payment/index.xls.erb
index 9597e3d9..ebf360a9 100755
--- a/app/views/reports/credit_payment/index.xls.erb
+++ b/app/views/reports/credit_payment/index.xls.erb
@@ -1,20 +1,21 @@
-<div class="container margin-top-20">
-	<div class="card row">
+
+<div class="margin-top-20">
+	<div class="card ">
 		<% unless @sale_data.blank? %>
 
 			<table class="table table-striped" border="0">
 			  <thead>
 				<% if !params[:from].blank?%>
 			    <tr>
-			        <th colspan="7">From Date : <%= params[:from]  rescue '-'%>	,	To Date : <%= params[:to]  rescue '-'%></th>
+			        <th colspan="7"><%= t("views.right_panel.detail.from_date") %> : <%= params[:from]  rescue '-'%>	,	<%= t("views.right_panel.detail.to_date") %> : <%= params[:to]  rescue '-'%></th>
 				</tr>
 				<% end %>		  
 				<tr>
-					<th> Shift Name </th>
-				  	<th> Receive No</th>
-				   	<th> Cashier Name</th>
-				  	<th> Customer Name</th>		   
-				  	<th> Credit Amount </th>
+					<th> <%= t("views.right_panel.detail.shift_name") %> </th>
+				  	<th> <%= t("views.right_panel.detail.receipt_no") %></th>
+				   	<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+				  	<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>		   
+				  	<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
 				</tr>
 			  </thead>
 			  <tbody>
@@ -36,4 +37,4 @@
 			</table>
 		<% end %>
 	</div>
-</div>
\ No newline at end of file
+</div>
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 e584bbba..d3afcbfe 100755
--- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
@@ -24,11 +24,11 @@
 			<div class="col-lg-3 col-md-3 col-sm-3">					
 				<!-- <label class="">Select Shift Period</label> -->
 				<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 37px;">
+				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 35px;">
 			</div>
 			<div class="col-lg-3 col-md-3 col-sm-3">
 				<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 37px;">
+				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 35px;">
 			</div>
 			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
 			    <label></label><br>
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index e258f892..b8eded4f 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -1,5 +1,5 @@
 
-<div class="page-header">
+<div class="page-header" style="width:130%;">
 	<ol class="breadcrumb">
 		<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
 		<li class="breadcrumb-item active"><%= t("views.right_panel.detail.daily_sale_report") %></li>
@@ -10,7 +10,6 @@
 </div>
 <div class="row">
 	<div class="col-md-12 col-lg-12 col-sm-12 ">
-
 		<%= render :partial=>'shift_sale_report_filter',
 		:locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
 		<hr />
@@ -20,7 +19,7 @@
 
 		<div class="row">
 			<div class="col-md-12 col-lg-12">
-				<div class="card ">
+				<div class="card" style="width:129%;">
 					<div class="body table-responsive">
 						<table class="table table-bordered">
 							<thead> 
@@ -73,7 +72,7 @@
 								<% credit += sale[:credit_amount] %>   
 								<% foc += sale[:foc_amount] %>
 								<% discount += sale[:total_discount] %>
-								<% total += sale[:old_grand_total].to_f + sale[:rounding_adj].to_f  %>
+								<% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f  %>
 								<% grand_total += sale[:grand_total].to_f  %>	
 								<% old_grand_total += sale[:old_grand_total].to_f  %>	
 								<% rounding_adj += sale[:rounding_adj].to_f %>	
@@ -90,9 +89,9 @@
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>    
 									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total]), :delimiter => ',') rescue '-'%></td>	   	
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%></td>	   	
 								</tr>
 								<% count = count + 1 %>
 								<% end %>
@@ -110,7 +109,7 @@
 									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",old_grand_total), :delimiter => ',') rescue '-'%></td>   
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%></td>   
 								</tr>
 
 								<% total_tax = 0 %>
diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb
index c1eda6ef..44a9cc57 100755
--- a/app/views/reports/dailysale/index.xls.erb
+++ b/app/views/reports/dailysale/index.xls.erb
@@ -1,118 +1,127 @@
-<div class="container margin-top-20">
-	<div class="card row">
-	  <div class="table-responsive">
-	  <table class="table table-bordered">
-	  <thead> 
-		    <tr>
-		        <th colspan="15"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
-		   </tr>
-		    <tr>
-		    <th style='text-align:center;'>Sr.no</th>
-		    <th style='text-align:center;'>Date</th>
-		    <th style='text-align:center;'>Void Amount</th>
-		    <th style='text-align:center;'>Mpu Sales</th>
-		    <th style='text-align:center;'>Master Sales</th>
-		    <th style='text-align:center;'>Visa Sales</th>
-		    <th style='text-align:center;'>Jcb Sales</th>
-		    <th style='text-align:center;'>Redeem Sales</th>
-		    <th style='text-align:center;'>Cash Sales</th>
-		    <th style='text-align:center;'>Credit Sales</th>
-		    <th style='text-align:center;'>FOC Sales</th>
-		    <th style='text-align:center;'>(Discount)</th>
-		    <th style='text-align:center;'>Grand Total + <br/> Rounding Adj.</th>     
-		    <th style='text-align:center;'>Rounding Adj.</th>
-		    <th style='text-align:center;'>Grand Total</th>     	        
-		    </tr>
-		  </thead>
-		<% unless @sale_data.empty? %>
-		  
-		  <tbody>
-		  <% void   = 0 %>
-		  <% mpu    = 0 %>
-		  <% master = 0 %>
-		  <% visa   = 0 %>
-		  <% jcb    = 0 %>
-		  <% paypar = 0 %>
-		  <% cash   = 0 %>
-		  <% credit = 0 %>
-		  <% foc    = 0 %>
-		  <% discount = 0 %>
-		  <% total    = 0 %>
-		  <% grand_total = 0 %> 
-		  <% old_grand_total = 0 %>  
-		  <% count = 1 %> <% rounding_adj = 0 %>
-		  <% @sale_data.each do |sale| %>
-		    <% void += sale[:void_amount] %>
-		    <% mpu += sale[:mpu_amount] %>
-		    <% master += sale[:master_amount] %>
-		    <% visa += sale[:visa_amount] %>
-		    <% jcb += sale[:jcb_amount] %>
-		    <% paypar += sale[:paypar_amount] %>
-		    <% cash += sale[:cash_amount]-sale[:total_change_amount] %>
-		    <% credit += sale[:credit_amount] %>   
-		    <% foc += sale[:foc_amount] %>
-		    <% discount += sale[:total_discount] %>
-		    <% total += sale[:old_grand_total].to_f + sale[:rounding_adj].to_f  %>
-		    <% grand_total += sale[:grand_total].to_f  %>	
-		    <% old_grand_total += sale[:old_grand_total].to_f  %>	
-		    <% rounding_adj += sale[:rounding_adj].to_f %>	
-		  <tr>
-		    <td style='text-align:right;'><%= count %></td>
-		    <td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
-		    <td style='color:red;text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>    
-		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total]), :delimiter => ',') rescue '-'%></td>	   	
-		  </tr>
-		  <% count = count + 1 %>
-		  <% end %>
 
-		  <tr style="font-weight:600;">
-		    <td colspan="3" style='text-align:center;'>Total</td>	
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%></td>    
-		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
-			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
-			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",old_grand_total), :delimiter => ',') rescue '-'%></td>   
-		  </tr>
+<div class="row">
+	<div class="col-md-12 col-lg-12 col-sm-12 ">
+		
+		<div class="row">
+			<div class="col-md-12 col-lg-12">
+				<div class="card" >
+					<div class="body table-responsive">
+						<table class="table table-bordered">
+							<thead> 
+								<tr>
+									<th colspan="15"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+								</tr>
+								<tr>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.sr") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.date") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.mpu_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.master_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.visa_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.jcb_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.redeem_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.foc_sales") %></th>
+									<th style='text-align:center;'>(<%= t("views.right_panel.detail.discount") %>)</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %> + <br/> <%= t("views.right_panel.detail.rnd_adj_sh") %></th>     
+									<th style='text-align:center;'><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %></th>     	        
+								</tr>
+							</thead>
+							<% unless @sale_data.empty? %>
 
-		  <% total_tax = 0 %>
-		  <% unless @tax.empty? %>
-		  <% @tax.each do |tax| %>
-		  <% total_tax += tax.tax_amount.to_f %>
-		  <tr style="font-weight:600;">
-		    <td colspan="12" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%></td>
-			<td colspan="2">&nbsp;</td>
-		  </tr>
-		  
-		  <% end %>
-		  <% net = total - total_tax %>
-		  <tr style="font-weight:600;">
-		    <td colspan="12" style='text-align:right;'>Net Amount</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%></td>
-			<td colspan="2">&nbsp;</td>	
-		  </tr>
-		  <% end %>
-		  </tbody>
-		<% end %>
-		</table>
+							<tbody>
+								<% void   = 0 %>
+								<% mpu    = 0 %>
+								<% master = 0 %>
+								<% visa   = 0 %>
+								<% jcb    = 0 %>
+								<% paypar = 0 %>
+								<% cash   = 0 %>
+								<% credit = 0 %>
+								<% foc    = 0 %>
+								<% discount = 0 %>
+								<% total    = 0 %>
+								<% grand_total = 0 %> 
+								<% old_grand_total = 0 %>  
+								<% count = 1 %> <% rounding_adj = 0 %>
+								<% @sale_data.each do |sale| %>
+								<% void += sale[:void_amount] %>
+								<% mpu += sale[:mpu_amount] %>
+								<% master += sale[:master_amount] %>
+								<% visa += sale[:visa_amount] %>
+								<% jcb += sale[:jcb_amount] %>
+								<% paypar += sale[:paypar_amount] %>
+								<% cash += sale[:cash_amount]-sale[:total_change_amount] %>
+								<% credit += sale[:credit_amount] %>   
+								<% foc += sale[:foc_amount] %>
+								<% discount += sale[:total_discount] %>
+								<% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f  %>
+								<% grand_total += sale[:grand_total].to_f  %>	
+								<% old_grand_total += sale[:old_grand_total].to_f  %>	
+								<% rounding_adj += sale[:rounding_adj].to_f %>	
+								<tr>
+									<td style='text-align:right;'><%= count %></td>
+									<td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
+									<td style='color:red;text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>    
+									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%></td>	   	
+								</tr>
+								<% count = count + 1 %>
+								<% end %>
+
+								<tr style="font-weight:600;">
+									<td colspan="3" style='text-align:center;'>Total</td>	
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%></td>    
+									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%></td>   
+								</tr>
+
+								<% total_tax = 0 %>
+								<% unless @tax.empty? %>
+								<% @tax.each do |tax| %>
+								<% total_tax += tax.tax_amount.to_f %>
+								<tr style="font-weight:600;">
+									<td colspan="12" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%></td>
+									<td colspan="2">&nbsp;</td>
+								</tr>
+
+								<% end %>
+								<% net = total - total_tax %>
+								<tr style="font-weight:600;">
+									<td colspan="12" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%></td>
+									<td colspan="2">&nbsp;</td>	
+								</tr>
+								<% end %>
+							</tbody>
+							<% end %>
+						</table>
+					</div>
+				</div>
+			</div>
 		</div>
+
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/reports/payment_method/_shift_sale_report_filter.html.erb b/app/views/reports/payment_method/_shift_sale_report_filter.html.erb
index 3a7f93c3..30463ed2 100755
--- a/app/views/reports/payment_method/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/payment_method/_shift_sale_report_filter.html.erb
@@ -27,15 +27,15 @@
 		<div class="col-lg-2 col-md-2 col-sm-2">					
 			<!-- <label class="">Select Shift Period</label> -->
 			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-			<input data-behaviour='datepicker' class="form-control datepicker m-t-3 from" name="from" id="from" type="text" placeholder="From date">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3 from" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-			<input data-behaviour='datepicker' class="form-control datepicker m-t-3 to" name="to" id="to" type="text" placeholder="To date">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3 to" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
-			<select class="form-control select" name="shift_name" id="shift_name" >
+			<select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;" >
 			</select>
 		</div>
 		<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index fa32f91c..0c48fe22 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -82,7 +82,7 @@
 					    
 						<tr>
 							<th> <%= t("views.right_panel.detail.shift_name") %> </th>
-							<th> <%= t("views.right_panel.detail.payment_method") %></th>
+							<th><%= t("views.right_panel.detail.receipt_no") %></th>
 							<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
 							<th> <%= t :payment_method %></th>
 							<th> <%= t("views.right_panel.detail.amount") %> </th>
@@ -92,7 +92,11 @@
 					<tbody>
 					    <% total = 0 %>
 						<% @pyament_method.each do |payment| %>
-							<% total += payment.payment_amount %>							
+							<% if payment.payment_method === 'cash'
+							total += payment.payment_amount - payment.change_amount
+						   else
+						   	total += payment.payment_amount  
+							end%>							
 							<tr> 
 								<% if @shift_from.nil? && @shift_to.nil? %>
 								<td><%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p")  rescue '-'%></td>
@@ -103,7 +107,11 @@
 								<td><%= payment.cashier_name rescue '-' %></td>
 								<!--<td><%= payment.sale.customer.name rescue '-' %></td>-->
 								<td><%= payment.payment_method rescue '-' %></td>
-								<td><%= payment.payment_amount rescue '-' %></td>
+								<% if payment.payment_method === 'cash' %>
+								<td><%= payment.payment_amount - payment.change_amount%> </td>
+								<%else%>
+								<td><%= payment.payment_amount%> </td>
+								<%end%>
 								<td><%= payment.sale.grand_total rescue '-' %></td>
 								
 							</tr>
@@ -125,7 +133,7 @@
 <script>
 	$(function(){
 		var check_arr = [];
-
+		search_by_period();
 		$('#sel_period').change(function(){
 			search_by_period();
 		});
@@ -141,20 +149,24 @@
 
 		// OK button is clicked
 		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#from').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#from').val(from)
 			search_by_date();
 		});
 		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#to').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#to').val(to)
 			search_by_date();
-		});   
+		});    
 		
 		function search_by_date(){
 
-			var to_date   = new Date($('#to').val()); 
-	        var to        = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear();
-	        var from_date = new Date($('#from').val()); 
-	        var from      = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear();
+			from = $("#from").val();
+	  		to   = $("#to").val();
 
 			var period = 0;
 			var period_type = 1;	
@@ -177,7 +189,10 @@
 			var shift = $('#shift_name');
 			
 			shift.empty();
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			var str = '';
 			var param_shift = '';	   
 			var param_shift = '<%= params[:shift_name] rescue '-'%>';
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 d791852f..a1db6824 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
@@ -27,11 +27,11 @@
 		<div class="col-lg-2 col-md-2 col-sm-2">					
 			<!-- <label class="">Select Shift Period</label> -->
 			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 76756e0f..e82c3e3c 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -46,8 +46,8 @@
 							<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>		
 							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
 							<th><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> </th>
-							<% @sale_taxes.each do |tax| %>
-							<th><%= tax.tax_name %></th>		
+							<% @tax_profiles.each do |tax| %>
+							<th><%= tax.name %></th>		
 							<% end %>
 							<!-- <th>Other Amount</th> -->
 							<th><%= t("views.right_panel.detail.grand_total") %></th>
@@ -83,11 +83,14 @@
 							<td><%= result.cashier_name rescue '-' %></td>
 							<td><%= result.total_amount rescue '-' %></td>
 							<td><%= result.total_discount rescue '-' %></td>
+							<%if result.customer.customer_type == "Takeaway"%>
+							    <td>0.0</td>
+							<%end%>
 							<% result.sale_taxes.each do |tax| %>
 							<td><%= tax.tax_payable_amount rescue '-' %></td>
 							<%end%>
 
-							<td><%= result.old_grand_total %></td>			
+							<td><%= result.grand_total %></td>			
 							<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
 							<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
 						</tr>
@@ -100,16 +103,17 @@
 							<% @sale_taxes.each do |tax| %>
 							<td><b><%= tax.st_amount.round(2) %></b></td>
 							<% end %>
-							<td><b><%= old_grand_total.to_f.round(2)  rescue '-'%></b></td>		
+							<td><b><%= grand_total.to_f.round(2)  rescue '-'%></b></td>		
 							<td><b><%= rounding_adj  rescue '-'%></b></td>		
-							<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td>				
+							<td><b><%= grand_total.to_f.round + rounding_adj %></b></td>				
 						</tr>
 						<tr>
 							<td colspan="2">&nbsp;</td>
 							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
 							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-							<% @sale_taxes.each do |tax| %>
-							<td><%= tax.tax_name %></td>
+							
+							<% @tax_profiles.each do |tax| %>
+								<td><%= tax.name %></td>
 							<% end %>
 							<td><%= t("views.right_panel.detail.grand_total") %></td>
 							<td><%= t("views.right_panel.detail.rnd_adj_sh") %></td>
@@ -129,7 +133,7 @@
 	$(function(){
 
 		var check_arr = [];
-
+		search_by_period();
 		$('#sel_period').change(function(){
 			
 			search_by_period();
@@ -147,20 +151,24 @@
 		
 		// OK button is clicked
 		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#from').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#from').val(from)
 			search_by_date();
 		});
 		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#to').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#to').val(to)
 			search_by_date();
 		});   
 		
 		function search_by_date(){
 			
-			var to_date   = new Date($('#to').val()); 
-	        var to        = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear();
-	        var from_date = new Date($('#from').val()); 
-	        var from      = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear();
+	  		from = $("#from").val();
+	  		to   = $("#to").val();
 
 			var period = 0;
 			var period_type = 1;	   
@@ -170,7 +178,6 @@
 
 				check_arr.push(to);
 				
-				console.log(check_arr.length)
 				if(check_arr.length == 1){
 					show_shift_name(period,period_type,from,to,'shift_item');	   	
 				}
@@ -189,7 +196,10 @@
 			var str = '';
 			var param_shift = '';	   
 			var param_shift = '<%= params[:shift_name] rescue '-'%>';
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			url = '<%= reports_get_shift_by_date_path %>';
 			
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb
index cddb34f9..c8521b0d 100755
--- a/app/views/reports/receipt_no/index.xls.erb
+++ b/app/views/reports/receipt_no/index.xls.erb
@@ -1,98 +1,106 @@
-<div class="container margin-top-20">
-	<div class="card row">
-		<table class="table table-striped" border="0">
-			<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>
-				   </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>
-					</tr>
-					<% end %>	 
 
-				<tr>
-					<th>Recipt No</th>
-					<th>Cashier Name</th>		
-					<th>Total Amount</th>
-					<th>Discount Amount </th>
-					<% @sale_taxes.each do |tax| %>
-					<th><%= tax.tax_name %></th>
-								
-					<% end %>
-					<!-- <th>Other Amount</th> -->
-					<th>Grand Total</th>
-					<th>Rounding Adj.</th>
-					<th>Grand Total +<br/>
-						Rounding Adj.
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				<% grand_total = 0 %>
-				<% old_grand_total = 0 %>
-				<% total_tax = 0 %>
-				<% guest_count = 0 %>
-				<% total_sum = 0 %>	
-				<% discount_amt = 0 %>		    
-				<% other_amt = 0 %>
-				<% total_nett = 0 %>	 
-				<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>	    	  
-				<%if @sale_data %> 
-					<% @sale_data.each do |result| %>
+<div class="row">
+	<div class="col-md-12">
+		<div class="margin-top-20">
+			<div class="card">
+				<table class="table table-striped" border="0">
+					<thead>
+						<tr>
+							<th colspan="9"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.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="9"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+						</tr>
+						<% end %>	 
 
-					<% grand_total = grand_total.to_f + result.grand_total.to_f %>
-					<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
-					<% total_tax += result.total_tax.to_f %>
-					<% total_sum += result.total_amount.to_f %>	
-					<% discount_amt += result.total_discount.to_f %>
-					<% rounding_adj += result.rounding_adjustment.to_f %>
-					
-					<tr>
-						
-						<td><%= result.receipt_no rescue '-' %> </td>
-						<td><%= result.cashier_name rescue '-' %></td>
-						<td><%= result.total_amount rescue '-' %></td>
-						<td><%= result.total_discount rescue '-' %></td>
-						<% result.sale_taxes.each do |tax| %>
+						<tr>
+							<th><%= t("views.right_panel.detail.receipt_no") %></th>
+							<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>		
+							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
+							<th><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> </th>
+							<% @tax_profiles.each do |tax| %>
+							<th><%= tax.name %></th>		
+							<% end %>
+							<!-- <th>Other Amount</th> -->
+							<th><%= t("views.right_panel.detail.grand_total") %></th>
+							<th><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
+							<th><%= t("views.right_panel.detail.grand_total") %> +<br/>
+								<%= t("views.right_panel.detail.rnd_adj_sh") %>
+							</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% grand_total = 0 %>
+						<% old_grand_total = 0 %>
+						<% total_tax = 0 %>
+						<% guest_count = 0 %>
+						<% total_sum = 0 %>	
+						<% discount_amt = 0 %>		    
+						<% other_amt = 0 %>
+						<% total_nett = 0 %>	 
+						<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>	    	  
+						<%if @sale_data %> 
+						<% @sale_data.each do |result| %>
+
+						<% grand_total = grand_total.to_f + result.grand_total.to_f %>
+						<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
+						<% total_tax += result.total_tax.to_f %>
+						<% total_sum += result.total_amount.to_f %>	
+						<% discount_amt += result.total_discount.to_f %>
+						<% rounding_adj += result.rounding_adjustment.to_f %>
+
+						<tr>
+
+							<td><%= result.receipt_no rescue '-' %> </td>
+							<td><%= result.cashier_name rescue '-' %></td>
+							<td><%= result.total_amount rescue '-' %></td>
+							<td><%= result.total_discount rescue '-' %></td>
+							<%if result.customer.customer_type == "Takeaway"%>
+							    <td>0.0</td>
+							<%end%>
+							<% result.sale_taxes.each do |tax| %>
 							<td><%= tax.tax_payable_amount rescue '-' %></td>
-						<%end%>
-						
-						<td><%= result.old_grand_total %></td>			
-						<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
-						<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
-					</tr>
+							<%end%>
 
-					<% end %>
-					<tr style="border-top:4px double #666;">
-						<td colspan="2">&nbsp;</td>
-						<td><b><%= total_sum  rescue '-'%></b></td>
-						<td><b><%= discount_amt  rescue '-'%></b></td>
-						<% @sale_taxes.each do |tax| %>
+							<td><%= result.grand_total %></td>			
+							<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
+							<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
+						</tr>
+
+						<% end %>
+						<tr style="border-top:4px double #666;">
+							<td colspan="2">&nbsp;</td>
+							<td><b><%= total_sum  rescue '-'%></b></td>
+							<td><b><%= discount_amt  rescue '-'%></b></td>
+							<% @sale_taxes.each do |tax| %>
 							<td><b><%= tax.st_amount.round(2) %></b></td>
-						<% end %>
-						<td><b><%= old_grand_total.to_f.round(2)  rescue '-'%></b></td>		
-						<td><b><%= rounding_adj  rescue '-'%></b></td>		
-						<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td>				
-					</tr>
-					<tr>
-						<td colspan="2">&nbsp;</td>
-						<td>Total Amount</td>
-						<td>Discount Amount</td>
-						<% @sale_taxes.each do |tax| %>
-							<td><%= tax.tax_name %></td>
-						<% end %>
-						<td>Grand Total</td>
-						<td>Rounding Adj.</td>
-						<td>Grand Total +<br/>
-							Rounding Adj.
-						</td>
-					</tr>
-				<%end%>
-		</tbody>
-	</table>
-</div>
+							<% end %>
+							<td><b><%= grand_total.to_f.round(2)  rescue '-'%></b></td>		
+							<td><b><%= rounding_adj  rescue '-'%></b></td>		
+							<td><b><%= grand_total.to_f.round + rounding_adj %></b></td>				
+						</tr>
+						<tr>
+							<td colspan="2">&nbsp;</td>
+							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
+							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
+							
+							<% @tax_profiles.each do |tax| %>
+								<td><%= tax.name %></td>
+							<% end %>
+							<td><%= t("views.right_panel.detail.grand_total") %></td>
+							<td><%= t("views.right_panel.detail.rnd_adj_sh") %></td>
+							<td><%= t("views.right_panel.detail.grand_total") %> +<br/>
+								<%= t("views.right_panel.detail.rnd_adj_sh") %>
+							</td>
+						</tr>
+						<%end%>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
 </div>
\ No newline at end of file
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 c913b592..88f26c1f 100755
--- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
@@ -22,11 +22,11 @@
 		<div class="col-lg-3 col-md-3 col-sm-3">					
 			<!-- <label class="">Select Shift Period</label> -->
 			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date">
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
 		</div>
 		<div class="col-lg-3 col-md-3 col-sm-3">
 			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date">
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14">All Shift</label>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 4a1dd34a..d0def563 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -49,7 +49,9 @@
 							<% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>	 
 
+							<% sub_qty = 0 %>
 							<% sub_total = 0 %>
+							<% other_sub_total = 0 %>
 							<% count = 0 %>
 							<% total_price = 0 %>
 							<% cate_count = 0 %>
@@ -59,76 +61,116 @@
 							<% total_amount = 0 %>
 							<% discount = 0 %>
 							<% total_item_foc = 0 %>
-							<% total_item_dis = 0 %>
+							<% total_item_dis = 0.0 %>
+							<% total_tax = 0 %>
 
 							<% @sale_data.each do |sale| %>
 
-							<% total_qty += sale.total_item %>	 
+								<% if sale.status_type != "Discount" && sale.status_type != "foc"
+									total_qty += sale.total_item
+								end %>
 
-							<% if !acc_arr.include?(sale.account_id) %>
-							<tr>
-								<td><b><%= sale.account_name %></b></td>
-								<td colspan="4">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
-								<td>
-									<% @totalByAccount.each do |account, total| %>
-									<% if sale.account_id == account %>
-									<b><%= total %></b>
-									<% grand_total += total %>	  
-									<% end %>
-									<% end %>
-								</td>
-							</tr>
-							<% acc_arr.push(sale.account_id) %>
+								<% if sale.status_type == "foc" && sale.grand_total < 0
+											total_item_foc += sale.grand_total*(-1)
+										end %>	 
 
-							<% end %>
-							<tr>
-								<td>&nbsp;</td>
-								<% if !cate_arr.include?(sale.menu_category_id) %>	
-								<td><%= sale.menu_category_name %></td>
-								<% cate_arr.push(sale.menu_category_id) %>
-								<% else %>
-								<td>&nbsp;</td>
+										<% if sale.status_type == "Discount" &&  sale.grand_total < 0
+											total_item_dis += sale.grand_total*(-1)
+										end %>
+
+								<% if !acc_arr.include?(sale.account_id) %>
+									<tr>
+										<td><b><%= sale.account_name %></b></td>
+										<td colspan="4">&nbsp;</td>
+										<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
+										<td>
+											<% @totalByAccount.each do |account, total| %>
+											<% if sale.account_id == account %>
+											<b><%= total %></b>
+											<% grand_total += total %>	  
+											<% end %>
+											<% end %>
+										</td>
+									</tr>
+								   <% acc_arr.push(sale.account_id) %>
 								<% end %>
-								<td><%= sale.item_code rescue '-' %></td>
-								<td><%= sale.product_name rescue '-' %></td>
-								<td><%= sale.total_item rescue '-' %></td>
-								<td><%= sale.unit_price rescue '-' %></td>
-								<td><%= sale.grand_total rescue '-' %></td>
-							</tr>
-							<!-- sub total -->
-							<% @menu_cate_count.each do |key,value| %>
-							<% if sale.menu_category_id == key %>
+								<tr>
+									<td>&nbsp;</td>
+									<% if !cate_arr.include?(sale.menu_category_id) %>	
+									<td><%= sale.menu_category_name %></td>
+									<% cate_arr.push(sale.menu_category_id) %>
+									<% else %>
+									<td>&nbsp;</td>
+									<% end %>
+									<td><%= sale.item_code rescue '-' %></td>
+									<td><%= sale.product_name rescue '-' %></td>
+									<td><%= sale.total_item rescue '-' %></td>
+									<td><%= sale.unit_price rescue '-' %></td>
+									<td><%= sale.grand_total rescue '-' %></td>
+								</tr>
+								<!-- sub total -->
 
-							  <% count = count + 1 %>	
-							  <% sub_total += sale.grand_total %>
-							<% if count == value %>	
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.sub_total") %></td>
-								<td ><span class="underline"><%= sub_total %></span></td>
-							</tr>
-							<% if sale.status_type === "foc"
-								total_item_foc += sale.grand_total 
-							end %>	 
+								<% @menu_cate_count.each do |key,value| %>
+								<% if sale.menu_category_id == key %>
 
-							<% if sale.status_type === "Discount"
-								total_item_dis += sale.grand_total 
-							end %>
-							<% sub_total = 0.0%>
-							<% count = 0%>
-							<% end %>
-							<% end %>
-							<% end %>
+								    <% count = count + 1 %>	
+								    <% sub_total += sale.grand_total %>
+								    <% sub_qty += sale.total_item %>
+									<% if count == value %>	
+										<tr>
+											<td colspan="3">&nbsp;</td>
+											<td><b>Total <%= sale.account_name %> Qty </b> </td>
+											<td><b><%= sub_qty %></b></td>
+											<td><%= t("views.right_panel.detail.sub_total") %></td>
+											<td ><span class="underline"><%= sub_total %></span></td>
+										</tr>
+										<% sub_total = 0.0%>
+										<% sub_qty = 0 %>
+										<% count = 0%>
+									<% end %>
+							      <% end %>
+							    <% end %>
 							<!-- end sub total -->
 							<% end %>
-
+							<!--Other Charges -->
+							<% if @other_charges.present? %>
+							   <tr>
+									<td><b>Other Charges</b></td>
+									<td colspan="4">&nbsp;</td>
+									<td></td>
+								</tr>
+								<% @other_charges.each do |other| %>
+									<% if other.total_item > 0
+										total_qty += other.total_item
+									end %>
+									<% grand_total +=other.grand_total%>
+									<tr>
+									<td>&nbsp;</td>
+										<td>Other Charges</td>
+										<td><%= other.item_code rescue '-' %></td>
+										<td><%= other.product_name rescue '-' %></td>
+										<td><%= other.total_item rescue '-' %></td>
+										<td><%= other.unit_price rescue '-' %></td>
+										<td><%= other.grand_total rescue '-' %></td>
+									</tr>
+									<!-- sub total -->
+									
+									    <% other_sub_total += other.grand_total %>
+								    <!-- end sub total -->								
+								<% end %>
+								<tr>
+									<td colspan="5">&nbsp;</td>
+									<td><%= t("views.right_panel.detail.sub_total") %></td>
+									<td ><span><%= other_sub_total %></span></td>
+								</tr>
+						    <%end%>
+							<!-- End Other Charges -->
 							<tr style="border-top:2px solid grey;">
 								<td colspan="3">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
-								<td><%= t("views.right_panel.detail.net_amount") %></td>
-								<td><span><%= grand_total%></span></td> 
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= grand_total%></span></td> 
 							</tr>
 							<% end %>
 
@@ -139,8 +181,8 @@
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= total_item_dis %></span></td>
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= total_item_dis %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
@@ -149,9 +191,31 @@
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= @discount_data %></span></td>
-							</tr>		
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= @discount_data %></span></td>
+							</tr>	
+							
+								<% @sale_taxes.each do |tax| %>
+								<!-- <tr>
+								    <td colspan="5">&nbsp;</td>
+									<td><%= tax.tax_name %></td>
+									<td><%= tax.st_amount.round(2) %>
+										<%total_tax += tax.st_amount%>
+									</td>
+								</tr> -->
+							<% end %>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td style="border-top:2px solid grey;">Net Amount</td>
+								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
+								<td style="border-top:2px solid grey;"><%= grand_total.to_f - @discount_data.to_f%></td> 
+							</tr>
+							<!-- <tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Grand Total</td>
+							
+								<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
+							</tr>	 -->
 						</tbody>
 					</table>
 				</div>
@@ -195,19 +259,23 @@
 
 		// OK button is clicked
 		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#from').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#from').val(from)
 			search_by_date();
 		});
 		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#to').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#to').val(to)
 			search_by_date();
-		});   
+		});     
 
 		function search_by_date(){
-			var to_date   = new Date($('#to').val()); 
-	        var to        = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear();
-	        var from_date = new Date($('#from').val()); 
-	        var from      = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear();
+			from = $("#from").val();
+	  		to   = $("#to").val();
 			var period = 0;
 			var period_type = 1;	   
 
@@ -229,12 +297,15 @@
 
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			var selected = '';
 			var str = '';
 			var param_shift = '<%= params[:shift_name]%>';
-
+			
 			url = '<%= reports_get_shift_by_date_path %>';
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
 				console.log(data)
diff --git a/app/views/reports/saleitem/index.xls.erb b/app/views/reports/saleitem/index.xls.erb
index 74886913..f97edbb8 100755
--- a/app/views/reports/saleitem/index.xls.erb
+++ b/app/views/reports/saleitem/index.xls.erb
@@ -1,148 +1,175 @@
-<div class="container margin-top-20">
-	<div class="card row">
-		<div class="table-responsive">
-			
-
-			<table class="table table-striped" id="items_table" border="0">
-				<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>
-				   </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>
-					</tr>
-					<% end %>
-					<tr>
-						<th>&nbsp;</th>
-						<th>Menu Category</th>
-						<th>Code</th>
-						<th>Product</th>
-						<th>Total Item</th>
-						<th>Unit Price</th>
-						<th>Revenue</th>
-					</tr>	
-				</thead>
-				<tbody>
-				<% unless @sale_data.blank? %>
-					<% acc_arr = Array.new %>
-					<% cate_arr = Array.new %>	 
-
-					<% sub_total = 0.0 %>
-					<% count = 0%>
-					<% total_price = 0.0 %>
-					<% cate_count = 0 %>
-					<% acc_count = 0%>
-					<% grand_total = 0%>
-					<% total_qty = 0%>
-					<% total_amount = 0 %>
-					<% discount = 0%>
-
-					<% @sale_data.each do |sale| %>
-					<% total_qty += sale.total_item %>	  
-
-					<% if !acc_arr.include?(sale.account_id) %>
-					<tr>
-						<td><b><%= sale.account_name %></b></td>
-						<td colspan="4">&nbsp;</td>
-						<td>Total Price By <%= sale.account_name %></td>
-						<td>
-							<% @totalByAccount.each do |account, total| %>
-							<% if sale.account_id == account %>
-							<b><%= total %></b>
-							<% grand_total += total %>	  
+<div class="row">
+	<div class="col-md-12">
+		<div class="margin-top-20">
+			<div class="card">
+				<div class="table-responsive">				
+					<table class="table table-striped" id="items_table" border="0">
+						<thead>
+							<tr>
+								<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.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"> <%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+							</tr>
 							<% end %>
+							<tr>
+								<th>&nbsp;</th>
+								<th><%= t("views.right_panel.header.menu_category") %></th>
+								<th><%= t("views.right_panel.detail.code") %></th>
+								<th><%= t("views.right_panel.detail.product") %></th>
+								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
+								<th><%= t("views.right_panel.detail.unit_price") %></th>
+								<th><%= t("views.right_panel.detail.revenue") %></th>
+							</tr>	
+						</thead>
+						<tbody>
+							<% unless @sale_data.blank? %>
+							<% acc_arr = Array.new %>
+							<% cate_arr = Array.new %>	 
+
+							<% sub_total = 0 %>
+							<% other_sub_total = 0 %>
+							<% count = 0 %>
+							<% total_price = 0 %>
+							<% cate_count = 0 %>
+							<% acc_count = 0 %>
+							<% grand_total = 0 %>
+							<% total_qty = 0 %>
+							<% total_amount = 0 %>
+							<% discount = 0 %>
+							<% total_item_foc = 0 %>
+							<% total_item_dis = 0 %>
+
+							<% @sale_data.each do |sale| %>
+
+								<% if sale.total_item > 0
+									total_qty += sale.total_item
+								end %>
+
+								<% if !acc_arr.include?(sale.account_id) %>
+									<tr>
+										<td><b><%= sale.account_name %></b></td>
+										<td colspan="4">&nbsp;</td>
+										<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
+										<td>
+											<% @totalByAccount.each do |account, total| %>
+											<% if sale.account_id == account %>
+											<b><%= total %></b>
+											<% grand_total += total %>	  
+											<% end %>
+											<% end %>
+										</td>
+									</tr>
+								   <% acc_arr.push(sale.account_id) %>
+								<% end %>
+								<tr>
+									<td>&nbsp;</td>
+									<% if !cate_arr.include?(sale.menu_category_id) %>	
+									<td><%= sale.menu_category_name %></td>
+									<% cate_arr.push(sale.menu_category_id) %>
+									<% else %>
+									<td>&nbsp;</td>
+									<% end %>
+									<td><%= sale.item_code rescue '-' %></td>
+									<td><%= sale.product_name rescue '-' %></td>
+									<td><%= sale.total_item rescue '-' %></td>
+									<td><%= sale.unit_price rescue '-' %></td>
+									<td><%= sale.grand_total rescue '-' %></td>
+								</tr>
+								<!-- sub total -->
+								<% @menu_cate_count.each do |key,value| %>
+								<% if sale.menu_category_id == key %>
+
+								    <% count = count + 1 %>	
+								    <% sub_total += sale.grand_total %>
+									<% if count == value %>	
+										<tr>
+											<td colspan="5">&nbsp;</td>
+											<td><%= t("views.right_panel.detail.sub_total") %></td>
+											<td ><span class="underline"><%= sub_total %></span></td>
+										</tr>
+										<% if sale.status_type === "foc"
+											total_item_foc += sale.grand_total 
+										end %>	 
+
+										<% if sale.status_type === "Discount"
+											total_item_dis += sale.grand_total 
+										end %>
+										<% sub_total = 0.0%>
+										<% count = 0%>
+									<% end %>
+							      <% end %>
+							    <% end %>
+							<!-- end sub total -->
+							<% end %>
+							<!--Other Charges -->
+							<tr>
+								<td><b>Other Charges</b></td>
+								<td colspan="4">&nbsp;</td>
+								<td></td>
+							</tr>
+							<% @other_charges.each do |other| %>
+								<% if other.total_item > 0
+									total_qty += other.total_item
+								end %>
+								<% grand_total +=other.grand_total%>
+								<tr>
+								<td>&nbsp;</td>
+									<td>Other Charges</td>
+									<td><%= other.item_code rescue '-' %></td>
+									<td><%= other.product_name rescue '-' %></td>
+									<td><%= other.total_item rescue '-' %></td>
+									<td><%= other.unit_price rescue '-' %></td>
+									<td><%= other.grand_total rescue '-' %></td>
+								</tr>
+								<!-- sub total -->
+								
+								    <% other_sub_total += other.grand_total %>
+							    <!-- end sub total -->								
+							<% end %>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.sub_total") %></td>
+								<td ><span class="underline"><%= other_sub_total %></span></td>
+							</tr>
+							<!-- End Other Charges -->
+							<tr style="border-top:2px solid grey;">
+								<td colspan="3">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
+								<td><span><%= total_qty%></span></td>
+								<td><%= t("views.right_panel.detail.net_amount") %></td>
+								<td><span><%= grand_total%></span></td> 
+							</tr>
 							<% end %>
-						</td>
-					</tr>
-					<% acc_arr.push(sale.account_id) %>
 
-					<% end %>
-					<tr>
-						<td>&nbsp;</td>
-						<% if !cate_arr.include?(sale.menu_category_id) %>	
-						<td><%= sale.menu_category_name %></td>
-						<% cate_arr.push(sale.menu_category_id) %>
-						<% else %>
-						<td>&nbsp;</td>
-						<% end %>
-						<td><%= sale.item_code rescue '-' %></td>
-						<td><%= sale.product_name rescue '-' %></td>
-						<td><%= sale.total_item rescue '-' %></td>
-						<td><%= sale.unit_price rescue '-' %></td>
-						<td><%= sale.grand_total rescue '-' %></td>
-
-					</tr>
-
-					<!-- sub total -->
-					<% @menu_cate_count.each do |key,value| %>
-					<% if sale.menu_category_id == key %>
-
-					<% count = count + 1 %>	
-					<% sub_total += sale.grand_total %>
-					<% if count == value %>	
-					<tr>
-						<td colspan="5">&nbsp;</td>
-						<td>Sub Total</td>
-						<td ><span class="underline"><%= sub_total %></span></td>
-
-					</tr>
-					<% sub_total = 0.0%>
-					<% count = 0%>
-					<% end %>
-					<% end %>
-					<% end %>
-
-					<!-- end sub total -->
-
-					<% end %>
-
-					<tr style="border-top:2px solid grey;">
-						<td colspan="3">&nbsp;</td>
-						<td>Total Item</td>
-						<td><span><%= total_qty%></span></td>
-						<td>Total Amount</td>
-						<td><span><%= grand_total%></span></td> 
-					</tr>
-				<% end %>
-
-	<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Cash Received</td>
-		<td><span><%= @cash_data - @change_amount %></span></td>
-	</tr>
-	<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Card Sales</td>
-		<td><span><%= @card_data %></span></td>
-	</tr>
-		<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Credit Sales</td>
-		<td><span><%= @credit_data %></span></td>
-	</tr>
-		<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>FOC Sales</td>
-		<td><span><%= @foc_data %></span></td>
-	</tr>
-	<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Discount Amount</td>
-		<td><span><%= @discount_data %></span></td>
-	</tr>		
-	<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Grand Total</td>
-		<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-		 <td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
-	</tr>
-</tbody>
-</table>
-</div>
-</div>
-</div>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td><span><%= total_item_foc %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td><span><%= total_item_dis %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.foc_sales") %></td>
+								<td><span><%= @foc_data %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td><span><%= @discount_data %></span></td>
+							</tr>		
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
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 34b324a6..b519adf9 100755
--- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
@@ -5,6 +5,7 @@
 				<div class="col-lg-2 col-md-2 col-sm-2">
 					<label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
 					<select name="period" id="sel_period" class="form-control">
+					<option value=""><%= t("views.right_panel.detail.select_period") %></option>
 						<option value="0">Today</option>
 						<option value="1">Yesterday</option>
 						<option value="2">This week</option>
@@ -21,11 +22,11 @@
 				<div class="col-lg-3 col-md-3 col-sm-3">					
 					<!-- <label class="font-14">Select Shift Period</label> -->
 					<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
 				</div>
 				<div class="col-lg-3 col-md-3 col-sm-3">
 					<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
 				</div>
 				<div class="col-lg-2 col-md-2 col-sm-2">
 					<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 09a238d3..8138007d 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -54,8 +54,8 @@
 						<th><%= t("views.right_panel.detail.cash_payment") %></th>
 						<!-- <th>Credit Charges</th> -->
 						<th><%= t("views.right_panel.detail.credit_payment") %></th>
-						<!-- <th>FOC Payment</th> -->
 						<th><%= t("views.btn.other_payment") %></th>
+						<th><%= t("views.btn.foc") %> <%= t :payment %></th>
 					<!-- <th>Grand Total 
 					<br/>Rounding Adj</th> -->						
 					<!-- <th>Rounding Adj</th> -->
@@ -74,37 +74,42 @@
 				<% g_total = 0 %>
 
 				<% @sale_data.each do |result|%>
-				<tr>
-					<td>
-						<%= result.cashier_terminal.name  rescue '-'%>
-					</td>
-					<td>
-						<%= result.employee.name  rescue '-'%>
-					</td>
-					<td><%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> -  
-						<%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-'  %>
-					</td>
-					<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
-					<td><%= sprintf "%.2f",result.cash_sales.to_f.to_d  rescue '-'%></td>
-					<td><%= sprintf "%.2f",result.credit_sales.to_f.to_d  rescue '-'%></td>
-					<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
-					  <!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
-					  <td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
-					  <td><%= sprintf "%.2f",result.other_sales.to_f.to_d  rescue '-'%></td>	  		  
-					  <td><%= sprintf "%.2f",result.grand_total.to_f.to_d  rescue '-'%></td>	
+					
+					<tr>
+						<td>
+							<%= result[:cashier_terminal_name]  rescue '-'%>
+						</td>
+						<td>
+							<%= result[:employee_name]  rescue '-'%>
+						</td>
+						<td><%= result[:shift_started_at].strftime("%e %b %I:%M%p") rescue '-' %> -  
+							<%= result[:shift_closed_at].strftime("%e %b %I:%M%p") rescue '-'  %>
+						</td>
+						<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
+						<td><%= sprintf "%.2f",result[:cash_sales].to_f.to_d  rescue '-'%></td>
+						<td><%= sprintf "%.2f",result[:credit_sales].to_f.to_d  rescue '-'%></td>
+						<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
+						<!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
+						<td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
+						<td><%= sprintf "%.2f",result[:other_sales].to_f.to_d  rescue '-'%></td>	  		  
+						<td>
+						 	<%= sprintf "%.2f",result[:foc_sales].to_f.to_d  rescue '-'%>
+						</td>	  		  
+						<td><%= sprintf "%.2f",result[:grand_total].to_f.to_d  rescue '-'%></td>	
 
-					  <!--  <td><%= sprintf "%.2f",result.rounding_adj.to_f.to_d  rescue '-'%></td>	 -->
-					  <% grand_total = result.grand_total.to_f %>	  
-					  <!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->		  		  		  
+						<!--  <td><%= sprintf "%.2f",result[:rounding_adj].to_f.to_d  rescue '-'%></td>	 -->
+						<% grand_total = result[:grand_total].to_f %>	  
+						<!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->		  		  		  
 					</tr>
-					<% cash += result.cash_sales.to_f %>
-					<% credit += result.credit_sales.to_f %>
-					<% card += result.other_sales.to_f %>	
+					<% cash += result[:cash_sales].to_f %>
+					<% credit += result[:credit_sales].to_f %>
+					<% card += result[:other_sales].to_f %>	
+					<% foc += result[:foc_sales].to_f %>	
 
-					<% total += result.grand_total.to_f %>	
+					<% total += result[:grand_total].to_f %>	
 					<% g_total += grand_total.to_f %>
 
-					<% end %>
+				<% end %>
 
 					<tr style="border-top: 3px solid grey;">
 						<td colspan="3"></td>
@@ -114,6 +119,7 @@
 						<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
 						<td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
+						<td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->	
 						<td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>	 			
@@ -127,7 +133,7 @@
 	$(function(){
 
 		var check_arr = [];
-
+		search_by_period();
 		$('#sel_period').change(function(){
 			
 			search_by_period();
@@ -145,20 +151,24 @@
 		
 		// OK button is clicked
 		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#from').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#from').val(from)
 			search_by_date();
 		});
 		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#to').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#to').val(to)
 			search_by_date();
 		});   
 		
 		function search_by_date(){
 
-			var to_date   = new Date($('#to').val()); 
-	        var to        = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear();
-	        var from_date = new Date($('#from').val()); 
-	        var from      = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear();  
+			from = $("#from").val();
+	  		to   = $("#to").val();  
 
 			var period = 0;
 			var period_type = 1;	   
@@ -181,7 +191,10 @@
 		
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			
 			var str = '';
diff --git a/app/views/reports/shiftsale/index.xls.erb b/app/views/reports/shiftsale/index.xls.erb
index 951268e9..aa1d0231 100755
--- a/app/views/reports/shiftsale/index.xls.erb
+++ b/app/views/reports/shiftsale/index.xls.erb
@@ -1,99 +1,107 @@
-<div class="container margin-top-20">
+<div class="row">
+	<div class="col-md-12">
+
+		<div class="margin-top-20">
     <!-- <div class="span11">
 		<div id="report_container" style="min-width: 400px; height: 400px; margin: 0 auto"></div>
 	</div> -->
-	<div class="card row">
-	    <div class="table-responsive">
+	<div class="card">
+		<div class="table-responsive">
 			<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>
-			  	</tr>
-				<% if @shift_from %>
+				<thead>
+					<tr>
+						<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  
+							- <%= t("views.right_panel.detail.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="7"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 					</tr>
-				<% end %>
-					  
-			    <tr>
-					<th>Cashier Station</th>
-					<th>Cashier Name</th>
-			        <th>Shift Name</th>		
-					<!-- <th>Void Amount</th> -->
-					<th>Cash Payment</th>
-					<!-- <th>Credit Charges</th> -->
-					<th>Credit Payment</th>
-					<!-- <th>FOC Payment</th> -->
-					<th>Other Payment</th>
+					<% end %>	  
+					<tr>
+						<th><%= t("views.right_panel.detail.cashier_station") %></th>
+						<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+						<th><%= t("views.right_panel.detail.shift_name") %></th>		
+						<!-- <th>Void Amount</th> -->
+						<th><%= t("views.right_panel.detail.cash_payment") %></th>
+						<!-- <th>Credit Charges</th> -->
+						<th><%= t("views.right_panel.detail.credit_payment") %></th>
+						<th><%= t("views.btn.other_payment") %></th>
+						<th><%= t("views.btn.foc") %> <%= t :payment %></th>
 					<!-- <th>Grand Total 
-						<br/>Rounding Adj</th> -->						
+					<br/>Rounding Adj</th> -->						
 					<!-- <th>Rounding Adj</th> -->
-					<th>Grand Total</th>		
-			    </tr>
-			  </thead>
-			  <tbody>
-				  <% void = 0%>	  
-				  <% cash = 0%>	  
-				  <% credit = 0%>	  
-				  <% accept_credit = 0%>	  
-				  <% foc = 0%>	  
-				  <% card = 0%>
-			  	  <% total = 0%> 
-			  	  <% rounding_adj = 0%> 
-			  	  <% g_total = 0 %>
-
-			    <% @sale_data.each do |result|%>
-			        <tr>
-			  		  <td>
-			  			  <%= result.cashier_terminal.name  rescue '-'%>
-			  		  </td>
-			  		  <td>
-			  			  <%= result.employee.name  rescue '-'%>
-			  		  </td>
-				  	  <td><%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> -  
-						  <%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-'  %>
-					  </td>
-					  <!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
-					  <td><%= sprintf "%.2f",result.cash_sales.to_f.to_d  rescue '-'%></td>
-					  <td><%= sprintf "%.2f",result.credit_sales.to_f.to_d  rescue '-'%></td>
-					  <!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
-					  <!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
-					  <td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
-					  <td><%= sprintf "%.2f",result.other_sales.to_f.to_d  rescue '-'%></td>	  		  
-					  <td><%= sprintf "%.2f",result.grand_total.to_f.to_d  rescue '-'%></td>	
-
-					 <!--  <td><%= sprintf "%.2f",result.rounding_adj.to_f.to_d  rescue '-'%></td>	 -->
-					  <% grand_total = result.grand_total.to_f %>	  
-					 <!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->		  		  		  
-			      </tr>
-				  <% cash += result.cash_sales.to_f %>
-				  <% credit += result.credit_sales.to_f %>
-				  <% card += result.other_sales.to_f %>	
-				 
-				  <% total += result.grand_total.to_f %>	
-				  <% g_total += grand_total.to_f %>
-
-			    <% end %>
-
-				<tr style="border-top: 3px solid grey;">
-					<td colspan="3"></td>
-					<!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
-					<td><b><%= sprintf("%.2f",cash)  rescue '-'%></b></td>
-					<td><b><%= sprintf("%.2f",credit)  rescue '-'%></b></td>
-					<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
-					<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
-					<td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
-					<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
-					<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->	
-					 <td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>	 			
+					<th><%= t("views.right_panel.detail.grand_total") %></th>		
 				</tr>
-			  </tbody>
+			</thead>
+			<tbody>
+				<% void = 0%>	  
+				<% cash = 0%>	  
+				<% credit = 0%>	  
+				<% accept_credit = 0%>	  
+				<% foc = 0%>	  
+				<% card = 0%>
+				<% total = 0%> 
+				<% rounding_adj = 0%> 
+				<% g_total = 0 %>
+
+				<% @sale_data.each do |result|%>
+					
+					<tr>
+						<td>
+							<%= result[:cashier_terminal_name]  rescue '-'%>
+						</td>
+						<td>
+							<%= result[:employee_name]  rescue '-'%>
+						</td>
+						<td><%= result[:shift_started_at].strftime("%e %b %I:%M%p") rescue '-' %> -  
+							<%= result[:shift_closed_at].strftime("%e %b %I:%M%p") rescue '-'  %>
+						</td>
+						<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
+						<td><%= sprintf "%.2f",result[:cash_sales].to_f.to_d  rescue '-'%></td>
+						<td><%= sprintf "%.2f",result[:credit_sales].to_f.to_d  rescue '-'%></td>
+						<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
+						<!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
+						<td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
+						<td><%= sprintf "%.2f",result[:other_sales].to_f.to_d  rescue '-'%></td>	  		  
+						<td>
+						 	<%= sprintf "%.2f",result[:foc_sales].to_f.to_d  rescue '-'%>
+						</td>	  		  
+						<td><%= sprintf "%.2f",result[:grand_total].to_f.to_d  rescue '-'%></td>	
+
+						<!--  <td><%= sprintf "%.2f",result[:rounding_adj].to_f.to_d  rescue '-'%></td>	 -->
+						<% grand_total = result[:grand_total].to_f %>	  
+						<!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->		  		  		  
+					</tr>
+					<% cash += result[:cash_sales].to_f %>
+					<% credit += result[:credit_sales].to_f %>
+					<% card += result[:other_sales].to_f %>	
+					<% foc += result[:foc_sales].to_f %>	
+
+					<% total += result[:grand_total].to_f %>	
+					<% g_total += grand_total.to_f %>
+
+				<% end %>
+
+					<tr style="border-top: 3px solid grey;">
+						<td colspan="3"></td>
+						<!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
+						<td><b><%= sprintf("%.2f",cash)  rescue '-'%></b></td>
+						<td><b><%= sprintf("%.2f",credit)  rescue '-'%></b></td>
+						<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
+						<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
+						<td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
+						<td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td>
+						<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
+						<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->	
+						<td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>	 			
+					</tr>
+				</tbody>
 			</table>
 		</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 b7bb304d..4be0bf46 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
@@ -14,11 +14,11 @@
             <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">
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
             </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">
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
             </div>
             <div class="form-group col-md-4">
                 <label class="font-14">Definition Item</label>
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 46bf04eb..94c8a012 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
@@ -22,15 +22,15 @@
 			<div class="form-group col-lg-2 col-md-2 col-sm-2">					
 				<!-- <label class="">Select Shift Period</label> -->
 				<label class="font-20"><%= t("views.right_panel.detail.from") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
 			</div>
 			<div class="form-group col-lg-2 col-md-2 col-sm-2">
 				<label class="font-20"><%= t("views.right_panel.detail.to") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
 			</div>
 			<div class="form-group col-lg-3 col-md-3 col-sm-3">
 				<label class="font-20"><%= t("views.right_panel.detail.all_shift") %></label>
-				<select class="form-control select" name="shift_name" id="shift_name" >
+				<select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;">
 				</select>
 			</div>
 			<div class=" col-lg-1 col-md-1 col-sm-1 margin-top-20">
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb
index 2302e373..045df74d 100755
--- a/app/views/reports/void_sale/index.html.erb
+++ b/app/views/reports/void_sale/index.html.erb
@@ -1,11 +1,11 @@
 <div class="page-header">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.void_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 %>"><%= t("views.right_panel.button.home") %></a></li>
+		<li class="breadcrumb-item active"><%= t("views.right_panel.detail.void_sale_report") %></li>
+		<span class="float-right">
+			<%= link_to 'Back', dashboard_path %>
+		</span>
+	</ol>
 </div>
 <div class="row">
 	<div class="col-md-12">
@@ -90,6 +90,7 @@
 <script>
     $(function(){
 		var check_arr = [];
+		search_by_period();
 		$('#sel_period').change(function(){
 			search_by_period();
 		});
@@ -105,19 +106,23 @@
 
 		// OK button is clicked
 		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#from').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#from').val(from)
 			search_by_date();
 		});
 		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			$('#to').val(date)
+			new_date = new Date(date) ;
+			month    = parseInt(new_date.getMonth()+1)
+			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
+			$('#to').val(to)
 			search_by_date();
 		});  
 
 		function search_by_date(){
-			var to_date   = new Date($('#to').val()); 
-	        var to        = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear();
-	        var from_date = new Date($('#from').val()); 
-	        var from      = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear();
+			from = $("#from").val();
+	  		to   = $("#to").val();
 			var period = 0;
 			var period_type = 1;	   
 
@@ -139,7 +144,10 @@
 
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 
 			var str = '';
diff --git a/app/views/reports/void_sale/index.xls.erb b/app/views/reports/void_sale/index.xls.erb
index c73a4bde..e07b60b0 100755
--- a/app/views/reports/void_sale/index.xls.erb
+++ b/app/views/reports/void_sale/index.xls.erb
@@ -1,63 +1,66 @@
-<div class="container margin-top-20">
-	<div class="card row">
-		<% if @sale_data.count > 0 %>
-	<table class="table table-striped" border="0">
-	  <thead>
-	  	<% if !params[:from].blank?%>
-	      <tr>
-	          <th colspan="7">From Date : <%= params[:from]  rescue '-'%>	,	To Date : <%= params[:to]  rescue '-'%></th>
-	  	</tr>
-	  	<% end %>
-	  	<% if @shift_from %>
-	  	<tr>
-			<% if @shift %>		
-				<% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %>
-			<% end %>	
-	  		<th colspan="3">Shift Name =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
-	      </tr>
-	  	<% end %>		  
-	    <tr>
-			<th>Receipt No</th>
-			<th>Sale Date</th>
-			<th>Total Amount</th>
-			<th>Grand Total</th>
-			<th>Rounding Adj.</th>
-			<th>Grand Total + <br/>Rounding Adj.</th>			
-			<!-- <th>Sale Status</th> -->
-	    </tr>
-	  </thead>
-	  <tbody>
-	  <% total_amount = 0.0 %>
-	  <% grand_total = 0.0 %>
-	  <% rounding_adjustment = 0.0 %>
-	  <% grand_rounding_adjustment = 0.0 %>
-		<% @sale_data.each do |result| %>
-			<% result[:items].each do |item| %>
-			<tr>
-				<td><%= item.receipt_no rescue '-' %> </td>
-				<td><%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %></td>
-				<td><%= item.total_amount.to_f  rescue '-'%> </td>
-				<td><%= item.grand_total.to_f  rescue '-'%> </td>
-				<td><%= item.rounding_adjustment.to_f rescue '-' %></td>
-				<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>								
-				<!-- <td><%= result.sales_status rescue '-' %> </td> -->
-				<!-- <td><%= item.remarks rescue '-' %> </td> -->
-			</tr>
-			<% total_amount = total_amount.to_f + item.total_amount.to_f %>
-			<% grand_total = grand_total.to_f + item.grand_total.to_f %>
-			<% rounding_adjustment = rounding_adjustment.to_f + item.rounding_adjustment.to_f %>
-			<% grand_rounding_adjustment = grand_rounding_adjustment.to_f + item.grand_total.to_f + item.rounding_adjustment.to_f %>
-			<% end %>
-		<% end %>
-		<tr style="border-top:4px double #666;font-weight:600;">
-	    	<td colspan="2" style="text-align:center;">Total Void Amount :</td>
-	    	<td><%= total_amount rescue '-' %></td>
-	    	<td><%= grand_total rescue '-' %></td>
-	    	<td><%= rounding_adjustment  rescue '-'%></td>
-	    	<td colspan=""><%= grand_rounding_adjustment  rescue '-'%></td>
-	    </tr>
-	  </tbody>
-	</table>
-<% end %>
-	</div>
-</div>
\ No newline at end of file
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="margin-top-20">
+			<div class="card">
+				<% if @sale_data.count > 0 %>
+				<table class="table table-striped" border="0">
+					<thead>
+						<% if !params[:from].blank?%>
+						<tr>
+							<th colspan="7"><%= t("views.right_panel.detail.from_date") %> : <%= params[:from]  rescue '-'%>	,	<%= t("views.right_panel.detail.to_date") %> : <%= params[:to]  rescue '-'%></th>
+						</tr>
+						<% end %>
+						<% if @shift_from %>
+						<tr>
+							<% if @shift %>		
+							<% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %>
+							<% end %>	
+							<th colspan="3"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
+						</tr>
+						<% end %>		  
+						<tr>
+							<th><%= t("views.right_panel.detail.receipt_no") %></th>
+							<th><%= t("views.right_panel.detail.sale_date") %></th>
+							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
+							<th><%= t("views.right_panel.detail.grand_total") %></th>
+							<th><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
+							<th><%= t("views.right_panel.detail.grand_total") %> + <br/><%= t("views.right_panel.detail.rnd_adj_sh") %></th>			
+							<!-- <th>Sale Status</th> -->
+						</tr>
+					</thead>
+					<tbody>
+						<% total_amount = 0.0 %>
+						<% grand_total = 0.0 %>
+						<% rounding_adjustment = 0.0 %>
+						<% grand_rounding_adjustment = 0.0 %>
+						<% @sale_data.each do |result| %>
+						<% result[:items].each do |item| %>
+						<tr>
+							<td><%= item.receipt_no rescue '-' %> </td>
+							<td><%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %></td>
+							<td><%= item.total_amount.to_f  rescue '-'%> </td>
+							<td><%= item.grand_total.to_f  rescue '-'%> </td>
+							<td><%= item.rounding_adjustment.to_f rescue '-' %></td>
+							<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>								
+							<!-- <td><%= result.sales_status rescue '-' %> </td> -->
+							<!-- <td><%= item.remarks rescue '-' %> </td> -->
+						</tr>
+						<% total_amount = total_amount.to_f + item.total_amount.to_f %>
+						<% grand_total = grand_total.to_f + item.grand_total.to_f %>
+						<% rounding_adjustment = rounding_adjustment.to_f + item.rounding_adjustment.to_f %>
+						<% grand_rounding_adjustment = grand_rounding_adjustment.to_f + item.grand_total.to_f + item.rounding_adjustment.to_f %>
+						<% end %>
+						<% end %>
+						<tr style="border-top:4px double #666;font-weight:600;">
+							<td colspan="2" style="text-align:center;">Total Void Amount :</td>
+							<td><%= total_amount rescue '-' %></td>
+							<td><%= grand_total rescue '-' %></td>
+							<td><%= rounding_adjustment  rescue '-'%></td>
+							<td colspan="3"><%= grand_rounding_adjustment  rescue '-'%></td>
+						</tr>
+					</tbody>
+				</table>
+				<% end %>
+			</div>
+		</div>
\ No newline at end of file
diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb
index b2524a1c..d1a3133b 100755
--- a/app/views/settings/membership_actions/_form.html.erb
+++ b/app/views/settings/membership_actions/_form.html.erb
@@ -22,10 +22,25 @@
   <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">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_communication_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.gateway_url") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_url_txt") %> <br>
+        5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.auth_token_txt") %> <br>
+        6) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.merchant_account_txt") %> <br>
+        7) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.created_by_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/membership_actions/edit.html.erb b/app/views/settings/membership_actions/edit.html.erb
index 10da5370..c804ee06 100755
--- a/app/views/settings/membership_actions/edit.html.erb
+++ b/app/views/settings/membership_actions/edit.html.erb
@@ -1,9 +1,9 @@
 
 <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_membership_actions_path %>">Membership Actions</a></li>
-    <li class="breadcrumb-item active">Edit</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_membership_actions_path %>"><%= t("views.right_panel.detail.setting_membership_actions") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), settings_membership_actions_path %>
     </span>
diff --git a/app/views/settings/membership_actions/index.html.erb b/app/views/settings/membership_actions/index.html.erb
index 4823889d..d4bb8d8d 100755
--- a/app/views/settings/membership_actions/index.html.erb
+++ b/app/views/settings/membership_actions/index.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 active">Settings Membership Actions</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.setting_membership_actions") %></li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
     </span>
@@ -20,11 +20,11 @@
           <table class="table">
             <thead>
               <tr>
-                <th>Membership type</th>
+                <th><%= t("views.right_panel.detail.membership_type") %></th>
             <!--     <th>Gateway url</th> -->
-                <th>Merchant account</th>
+                <th><%= t("views.right_panel.detail.merchant_account") %></th>
 
-                <th>Actions</th>
+                <th><%= t("views.right_panel.detail.actions") %></th>
               </tr>
             </thead>
 
@@ -48,10 +48,25 @@
   <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
+        <h5>
+          <i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i>          
+        </h5>
+        <p>
+        1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <br>
+        2) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.merchant_account_txt") %> <br>
+        3) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+        3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/membership_actions/new.html.erb b/app/views/settings/membership_actions/new.html.erb
index d32bb6e7..c6dc0b89 100755
--- a/app/views/settings/membership_actions/new.html.erb
+++ b/app/views/settings/membership_actions/new.html.erb
@@ -1,9 +1,9 @@
 
 <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_membership_actions_path %>">Membership Actions</a></li>
-    <li class="breadcrumb-item active">New</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_membership_actions_path %>"><%= t("views.right_panel.detail.setting_membership_actions") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), settings_membership_actions_path %>
     </span>
diff --git a/app/views/settings/membership_actions/show.html.erb b/app/views/settings/membership_actions/show.html.erb
index 58193063..4bfbb6b2 100755
--- a/app/views/settings/membership_actions/show.html.erb
+++ b/app/views/settings/membership_actions/show.html.erb
@@ -1,69 +1,101 @@
 
 <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_membership_actions_path %>">Membership Actions</a></li>
-    <li class="breadcrumb-item active">Details</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_membership_actions_path %>"><%= t("views.right_panel.detail.setting_membership_actions") %></a></li>
+    <li class="breadcrumb-item active"><%= t :details %></li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), settings_membership_actions_path %>
     </span>
   </ol>
 </div>
-<div class="card">
-  <div class="card-block">
-    <table class="table">
-      <tbody>
-        <tr>
-          <th>Membership type</th>
-          <td><%= @settings_membership_action.membership_type %></td>
-        </tr>
-        <tr>
-          <th>Is active</th>
-          <td><%= @settings_membership_action.is_active %></td>
-        </tr>
-        <tr>
-          <th>Gateway communication type</th>
-          <td><%= @settings_membership_action.gateway_communication_type %></td>
-        </tr>
-        <tr>
-          <th>Gateway url</th>
-          <td><%= @settings_membership_action.gateway_url %></td>
-        </tr>
-        <tr>
-          <th>Auth token</th>
-          <td><%= @settings_membership_action.auth_token %></td>
-        </tr>
-        <tr>
-          <th>Merchant account</th>
-          <td><%= @settings_membership_action.merchant_account_id %></td>
-        </tr>
-        <tr>
-          <th>Created by</th>
-          <td><%= @settings_membership_action.created_by %></td>
-        </tr>
-        <tr>
-          <th>Additional parameter</th>
-          <td><%= @settings_membership_action.additional_parameter %></td>
-        </tr>
-        <tr>
-        <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") %>
-            </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 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">
+          <tbody>
+            <tr>
+              <th><%= t("views.right_panel.detail.membership_type") %></th>
+              <td><%= @settings_membership_action.membership_type %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.is_active") %></th>
+              <td><%= @settings_membership_action.is_active %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.gateway_communication_type") %></th>
+              <td><%= @settings_membership_action.gateway_communication_type %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.gateway_url") %></th>
+              <td><%= @settings_membership_action.gateway_url %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.auth_token") %></th>
+              <td><%= @settings_membership_action.auth_token %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.merchant_account") %></th>
+              <td><%= @settings_membership_action.merchant_account_id %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.created_by") %></th>
+              <td><%= @settings_membership_action.created_by %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.additional_parameter") %></th>
+              <td><%= @settings_membership_action.additional_parameter %></td>
+            </tr>
+            <tr>
+            <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") %>
+                </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>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+    <div class="card">
+      <div class="body">
+        <h5><%= t("views.right_panel.header.membership_actions") %></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+          <p>
+          1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <br>
+          2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+          3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.gateway_communication_type_txt") %><br>
+          4) <%= t("views.right_panel.detail.gateway_url") %> - <%= t("views.right_panel.detail.gateway_url_txt") %><br>
+          5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.auth_token_txt") %><br>
+          6) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.merchant_account_txt") %><br>
+          7) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+          8) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+          </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
+      </div>
+    </div> 
   </div>
 </div>
-
 </div>
 
 
diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb
index 19361bb4..10aefcb5 100755
--- a/app/views/settings/membership_settings/_form.html.erb
+++ b/app/views/settings/membership_settings/_form.html.erb
@@ -24,10 +24,27 @@
   <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">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %>  <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_communication_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.gateway_url") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_url_txt") %> <br>
+        5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.auth_token_txt") %> <br>
+        6) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.discount_txt") %> <br>
+        7) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %> <br>
+        8) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.bonus_txt") %> <br>
+        9) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.membership_setting_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.membership_setting_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb
index d9d752db..ace63190 100755
--- a/app/views/settings/membership_settings/index.html.erb
+++ b/app/views/settings/membership_settings/index.html.erb
@@ -1,8 +1,8 @@
 
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-     <li class="breadcrumb-item">Membership Setting</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+     <li class="breadcrumb-item"><%= t("views.right_panel.detail.membership_setting") %></li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
     </span>
@@ -17,16 +17,16 @@
       <table class="table table-striped">
         <thead>
           <tr>
-            <th>Membership type</th>
-            <th>Is active</th>
-            <th>Gateway communication type</th>
+            <th><%= t("views.right_panel.detail.membership_type") %></th>
+            <th><%= t("views.right_panel.detail.is_active") %></th>
+            <th><%= t("views.right_panel.detail.gateway_communication_type") %></th>
             <!-- <th>Gateway url</th> -->
         <!-- <th>Auth token</th>
         <th>Merchant account</th> -->
-        <th>Discount</th>
-        <th>Rebate</th>
-        <th>Bonus</th>
-        <th>Points</th>
+        <th><%= t("views.right_panel.detail.discount") %></th>
+        <th><%= t("views.right_panel.detail.rebate") %></th>
+        <th><%= t("views.right_panel.detail.bonus") %></th>
+        <th><%= t("views.right_panel.detail.point") %></th>
         <th ></th>
       </tr>
     </thead>
@@ -55,10 +55,27 @@
 <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
+      <h5>
+          <i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i>          
+        </h5>
+        <p>
+        1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.name_txt") %> <br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.gateway_communication_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.discount_txt") %> <br>
+        5) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.rebate_txt") %> <br>
+        6) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.bonus_txt") %> <br>
+        7) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.point_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.membership_setting_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
     </div>
   </div>  
 </div>
diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb
index 870c19bc..8d8c044c 100755
--- a/app/views/settings/menu_categories/index.html.erb
+++ b/app/views/settings/menu_categories/index.html.erb
@@ -30,7 +30,7 @@
         <th><%= t("views.right_panel.detail.name") %></th>
         <th><%= t("views.right_panel.detail.alt_name") %></th>
         <th><%= t("views.right_panel.detail.is_available") %></th>
-        <th><%= t("views.right_panel.detail.order_by") %></th>
+        <!-- <th><%= t("views.right_panel.detail.order_by") %></th> -->
         <th><%= t("views.right_panel.detail.parent") %></th>
         <th><%= t("views.right_panel.detail.actions") %></th>
       </tr>
@@ -43,7 +43,7 @@
         <td><%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %></td>
         <td><%= settings_menu_category.alt_name rescue ''%></td>
         <td><%= settings_menu_category.is_available rescue false%></td>
-        <td><%= settings_menu_category.order_by rescue ''%></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-sm waves-effect' %> 
        </td></td>
@@ -51,8 +51,8 @@
        <% end %>
      </tbody>
    </table>
+   <%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %> 
  </div>
- <%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %> 
 </div>
 <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
   <div class="card">
diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb
index 12a31e6b..7d3fcd7a 100755
--- a/app/views/settings/menu_categories/show.html.erb
+++ b/app/views/settings/menu_categories/show.html.erb
@@ -45,7 +45,7 @@
             <td><%= @settings_menu_category.menu.name %></td>
             <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.is_available rescue false%></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' %>
diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb
index 13b2c8ad..cc478055 100755
--- a/app/views/settings/menu_item_instances/_form.html.erb
+++ b/app/views/settings/menu_item_instances/_form.html.erb
@@ -3,15 +3,26 @@
     <div class="card">
       <div class="body">
         <%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %>
-        <%= f.error_notification %>
+        <% if(flash["instance_code_error"]) %>
+          <div class="alert alert-danger">Please review the problems below:</div>
+        <% end %>
 
         <div class="col-md- panel">
           <div class="form-group p-l-15">
-            <%= f.input :item_instance_code %>
+            <%= f.input :item_instance_code ,:input_html=>{:class=>""},:required=>true  %>
+            
+            <% flash.each do |test, msg| %>
+              <% str="[\"#{msg['item_instance_code']}\"]"
+                 str.gsub!('["', '')
+                 str.gsub!('"]', '')
+              %>
+              <span class="help-block"><%= str %></span>
+            <% end %>
+
             <%= f.input :item_instance_name %>
             <%= f.input :price %>
 
-            <%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %>
+            <%= f.input :item_attributes, collection: @item.item_attributes, include_blank: false, include_hidden: false%>
 
             <%= f.input :is_on_promotion %>
             <%= f.input :promotion_price %>      
diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb
index 48b45dfc..f7346135 100755
--- a/app/views/settings/processing_items/_form.html.erb
+++ b/app/views/settings/processing_items/_form.html.erb
@@ -51,14 +51,14 @@
                 </div>
               <% end %>
             </div>
+
+            <div class="row">
+              <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 align-center">
+                <%= f.submit "Update",:class => 'btn btn-primary btn-lg waves-effect', :style => "width: 150px" %>
+              </div>
+            </div>
           </div>
       </div>
-      
-
-      <div class="form-actions">
-        <%= f.submit "Update",:class => 'btn btn-primary btn-lg waves-effect' %>
-      </div>
-      <br>
     <% end %>
   </div>
  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index 6150eff8..e90c8ef5 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -106,39 +106,39 @@
               </div>
             -->
             <div class="row">
-              <% arr =  MenuItem.active.order("name desc").pluck(:name,:item_code) %>
+              <% arr =  MenuItem.active.joins("JOIN menu_item_instances as b ON b.menu_item_id=menu_items.id").group("menu_items.id").order("name desc").pluck(:name,:item_code) %>
               <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
-              <% arr.push(p) %>
+                <% arr.push(p) %>
               <% end %>
               <div class="col-md-3 form-group">
                 <label class="control-label"><abbr title="required">*</abbr>  Item</label>
                 <select class="form-control item_code_place">
                   <% if !@promotion.original_product.nil? %>
-                  <% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@promotion.original_product) %>
-                  <% if menuiteminstance.nil?%>
-                  <% code = @promotion.original_product %>
-                  <% else %>
-                  <% code = menuiteminstance.menu_item.item_code %>
-                  <% end %>
+                    <% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@promotion.original_product) %>
+                    <% if menuiteminstance.nil?%>
+                      <% code = @promotion.original_product %>
+                    <% else %>
+                      <% code = menuiteminstance.menu_item.item_code %>
+                    <% end %>
                   <% end %>
                   <option value="" selected>Choose Something</option>
                   <% arr.each do |a| %>
-                  <% if a[1] == code %>
-                  <option value="<%= a[1]%>" selected><%= a[0]  %></option>
-                  <% else %>
-                  <option value="<%= a[1]%>"><%= a[0] %></option>
-                  <% end %>
+                    <% if a[1] == code %>
+                      <option value="<%= a[1]%>" selected><%= a[0]  %></option>
+                    <% else %>
+                      <option value="<%= a[1]%>"><%= a[0] %></option>
+                    <% end %>
                   <% end %>
                 </select>
               </div>
 
               <% sample = [] %>
               <% if !@promotion.original_product.nil? %>
-              <% if !MenuItemInstance.find_by_item_instance_code(@promotion.original_product).nil? %>
-              <% sample = MenuItemInstance.where("item_instance_code=?",@promotion.original_product).pluck(:item_instance_name,:item_instance_code)%>
-              <% else %>
-              <% sample = Product.where("item_code=?",@promotion.original_product).pluck(:name,:item_code)%>
-              <% end %>
+                <% if !MenuItemInstance.find_by_item_instance_code(@promotion.original_product).nil? %>
+                  <% sample = MenuItemInstance.where("item_instance_code=?",@promotion.original_product).pluck(:item_instance_name,:item_instance_code)%>
+                <% else %>
+                  <% sample = Product.where("item_code=?",@promotion.original_product).pluck(:name,:item_code)%>
+                <% end %>
               <% end %>
               <div class="col-md-3 form-group"><%= f.input :original_product,collection: sample  %></div>
               <!-- <div class="col-md-6"><%= f.input :original_product,collection: MenuItemInstance.order("item_instance_name desc").pluck(:item_instance_name,:item_instance_code),input_html: { selected: 2 } %></div> -->
@@ -160,7 +160,7 @@
                   <%= f.fields_for :promotion_products do |pro| %>
                   <div class="row">
                     <%= pro.hidden_field :item_code,:class => "promo_product" %>
-                    <% arr =  MenuItem.active.order("name desc").pluck(:name,:item_code) %>
+                    <% arr =  MenuItem.joins("JOIN menu_item_instances as b ON b.menu_item_id=menu_items.id").group("menu_items.id").order("name desc").pluck(:name,:item_code) %>
                     <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
                     <% arr.push(p) %>
                     <% end %>
@@ -247,9 +247,10 @@
 </div>
 
 <script>
-
-
   $(document).ready(function(){
+    if(($('.item_code_place').val()!=undefined) && ($('.item_code_place').val()!="")){
+      getItemInstance($('.item_code_place').val());
+    }
 
     $('#promotion_promo_start_hour').on('change', function(event) {
       $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00");
@@ -273,7 +274,7 @@
     });
 
     var dayy = $("#promotion_promo_day").val().replace("[","").replace("]","");
-    jQuery.each( dayy.split(","), function( i, d ) {
+    $.each( dayy.split(","), function( i, d ) {
       $("input.selectDay[value='"+d+"']").prop( "checked", true );
     });
 
@@ -324,8 +325,13 @@
   // $(".item_code_place").select2();
 
   $(".item_code_place").on('change', function(event) {
-    var ajax_url = "<%= settings_find_item_instance_path %>";
     var item_code =  this.value;
+    getItemInstance(item_code);
+  });
+
+  function getItemInstance(item_code) {
+    var ajax_url = "<%= settings_find_item_instance_path %>";
+    var original_product = "<%= @promotion.original_product %>";
     $.ajax({
       type: "GET",
       url: ajax_url,
@@ -334,13 +340,15 @@
         $("#promotion_original_product").empty();
         var itemlist;
         for (var i = 0; i < result.length; i++) {
-          itemlist += "<option value ="+result[i][1]+">"+result[i][0]+"</option>"
+          var selected = "";
+          if(original_product == result[i][1]) selected = "selected";
+          itemlist += "<option value ="+result[i][1]+" "+selected+">"+result[i][0]+"</option>"
         }
         $("#promotion_original_product").append(itemlist);
             //$("#promotion_original_product").select2();
-          }
-        });
-  });
+        }
+    });
+  }
 
   //$(".promotion_promotion_products_item_code select").select2();
   //$(".item_code_place1").select2();
@@ -356,7 +364,7 @@
 
   // for promotion products data showing
   var promopdt = $(".promo_product");
-  jQuery.each( promopdt, function( i, ppdt ) {
+  $.each( promopdt, function( i, ppdt ) {
     var ajax_url = "<%= settings_find_parent_item_path	%>";
     var item_code =  ppdt.value;
     var select_id =  ppdt.id;
@@ -365,14 +373,33 @@
       url: ajax_url,
       data: 'item_instance_code=' + item_code,
       success: function (result) {
+        // console.log(result);
+        var par_item_code = "";
+        var arr_item_inst = "";
+        if((result[0]!=undefined) && (result[0]!="")){
+          $.each(result[0],function(k,val){
+            par_item_code = k;
+            arr_item_inst = val;
+          });
+        }
+
         if(result.length > 0){
-          $("select#"+select_id).empty();
-          $("select#"+select_id).append("<option value='"+item_code+"'>"+result[0]+"</option>");
-          $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").find("option[value='"+result[1]+"']").attr("selected","true")
+          var iteminstlists;
+          $.each(arr_item_inst,function(k2,v2al){
+            $("select#"+select_id).empty();
+            var selected = "";
+            $.each(v2al,function(k3,v3al){
+              if(k3 == item_code) selected = "selected";
+              iteminstlists += "<option value='"+k3+"' "+selected+">"+v3al+"</option>";
+            });
+          });
+          $("select#"+select_id).append(iteminstlists);
+          
+          $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").find("option[value='"+par_item_code+"']").attr("selected","true")
                  // $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").select2();
-               }
-             }
-           });
+        }
+      }
+    });
   });
 
   // promotion_promotion_products_attributes_0_item_code
@@ -394,8 +421,8 @@
           }
           $("select#"+id).append(itemlist);
               //$("select#"+id).select2();
-            }
-          });
+        }
+      });
     });
   }
 
diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb
index 21e86e85..0f8eed54 100755
--- a/app/views/settings/set_menu_items/_form.html.erb
+++ b/app/views/settings/set_menu_items/_form.html.erb
@@ -10,12 +10,14 @@
           <%= f.input :item_code,:input_html => {:class => "col-md-9"} %>
           <%= f.input :name,:input_html => {:class => "col-md-9"} %>
           <%= f.input :alt_name,:input_html => {:class => "col-md-9"} %>
-          <%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"},:input_html => {:class => "col-md-9"} %>
+          <%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"},:input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %>
           <%= f.input :min_qty,:input_html => {:class => "col-md-9"} %>
-          <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %> 
+          <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %> 
 
           <%= f.input :is_available,:input_html => {:class => "col-md-9"} %> 
 
+          <%= f.input :taxable,:input_html => {:class => "col-md-9"} %> 
+
           <%= f.input :is_sub_item,:input_html => {:class => "col-md-9"} %>
 
           <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:input_html => {:class => "col-md-9"} %>
diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb
index 4e953ccd..39932bdd 100755
--- a/app/views/settings/simple_menu_items/_form.html.erb
+++ b/app/views/settings/simple_menu_items/_form.html.erb
@@ -10,12 +10,14 @@
               <%= f.input :item_code,:input_html => {:class => "col-md-9"} %>
               <%= f.input :name,:input_html => {:class => "col-md-9"} %>
               <%= f.input :alt_name,:input_html => {:class => "col-md-9"} %>
-              <%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"} %>
+              <%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %>
               <%= f.input :min_qty,:input_html => {:class => "col-md-9"} %>
-              <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %> 
+              <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %> 
               
               <%= f.input :is_available,:input_html => {:class => "col-md-9"} %> 
 
+              <%= f.input :taxable,:input_html => {:class => "col-md-9"} %> 
+
               <%= f.input :is_sub_item,:input_html => {:class => "col-md-9"} %>
 
               <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:input_html => {:class => "col-md-9"} %>
diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb
index 22a3a930..79d361df 100755
--- a/app/views/settings/simple_menu_items/show.html.erb
+++ b/app/views/settings/simple_menu_items/show.html.erb
@@ -107,7 +107,9 @@
 
           <td><%= settings_menu_item.item_instance_code %></td>
           <td><%= settings_menu_item.item_instance_name %></td>
-          <td><%= settings_menu_item.item_attributes %></td>
+          <td>
+            <%= MenuItemAttribute.where(id: settings_menu_item.item_attributes).pluck(:name) %>    
+          </td>
           <td><%= settings_menu_item.price %></td>
           <!-- <td><%= settings_menu_item.is_on_promotion %></td> -->
           <td><%= settings_menu_item.promotion_price %></td>
diff --git a/app/views/sym_control/run.html.erb b/app/views/sym_control/run.html.erb
new file mode 100755
index 00000000..8b137891
--- /dev/null
+++ b/app/views/sym_control/run.html.erb
@@ -0,0 +1 @@
+
diff --git a/app/views/transactions/bookings/index.html.erb b/app/views/transactions/bookings/index.html.erb
index 8c667197..7c587d32 100755
--- a/app/views/transactions/bookings/index.html.erb
+++ b/app/views/transactions/bookings/index.html.erb
@@ -19,7 +19,7 @@
                     <div class="row clearfix">
                        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
                          <label><%= t("views.right_panel.detail.enter_keyboards") %></label>
-                         <input type="text" id="receipt_no"  name="receipt_no" class="form-control" placeholder="" style="margin-right: 10px">
+                         <input type="text" id="receipt_no"  name="receipt_no" class="form-control" placeholder="Booking/Sale ID" style="margin-right: 10px">
                        </div>
                        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3"> 
                          <label class=""><%= t("views.right_panel.detail.from") %></label>
diff --git a/app/views/transactions/shift_sales/index.html.erb b/app/views/transactions/shift_sales/index.html.erb
index 53e2dbad..481b52c8 100755
--- a/app/views/transactions/shift_sales/index.html.erb
+++ b/app/views/transactions/shift_sales/index.html.erb
@@ -70,7 +70,7 @@
                       <td><%=shift_sale.cashier_terminal.name%></td>
                       <td><%= shift_sale.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') %>
                       </td>
-                       <td><%= shift_sale.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') rescue '-' %>
+                       <td><%= shift_sale.shift_closed_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') rescue '-' %>
                       </td>
                       <td><%=shift_sale.opening_balance %></td>
                       <td><%=shift_sale.closing_balance %></td>
diff --git a/config/application.rb b/config/application.rb
index b83917cc..6a3bc551 100755
--- a/config/application.rb
+++ b/config/application.rb
@@ -18,6 +18,6 @@ module SXRestaurants
 
     config.active_record.time_zone_aware_types = [:datetime, :time]
     config.active_job.queue_adapter = :sidekiq
-    config.time_zone = 'Asia/Rangoon'    
+    config.time_zone = 'Asia/Rangoon'
   end
 end
diff --git a/config/deploy.rb b/config/deploy.rb
new file mode 100644
index 00000000..a2144cd1
--- /dev/null
+++ b/config/deploy.rb
@@ -0,0 +1,20 @@
+lock "3.10.1"
+
+set :application, "sxrestaurant"
+set :repo_url, 'git@bitbucket.org:code2lab/sxrestaurant.git'
+
+set :deploy_user, 'deploy'
+
+set :rbenv_type, :global
+set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec"
+
+set :rbenv_map_bins, %w{rake gem bundle ruby rails}
+
+set :keep_releases, 5
+
+set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml}
+
+set :linked_dirs, %w{bin log tmp/puma tmp/pids tmp/cache tmp/sockets vendor/bundle public/system pids sockets}
+
+set :tests, []
+set :pty, true
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
new file mode 100644
index 00000000..9a498da8
--- /dev/null
+++ b/config/deploy/production.rb
@@ -0,0 +1,9 @@
+set :stage, :production
+set :server_name, "svr.sxrestaurant.host"
+
+set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}"
+server '192.168.1.27', user: 'deploy', roles: %w{web app db}, primary: true
+
+set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}"
+set :rbenv_ruby, '2.4.0'
+set :rails_env, :production
diff --git a/config/environments/production.rb b/config/environments/production.rb
index daf783e7..dc3341f3 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -86,6 +86,6 @@ Rails.application.configure do
   config.active_record.dump_schema_after_migration = false
 
   # Action Cable Setup
-  config.action_cable.url = "ws://192.168.1.24:9292/cable"
+  # config.action_cable.url = "ws://192.168.1.24:9292/cable"
   config.action_cable.allowed_request_origins = [/http:\/\/*/, /https:\/\/*/]
 end
diff --git a/config/initializers/license.rb b/config/initializers/license.rb
index edb075ea..e329f313 100644
--- a/config/initializers/license.rb
+++ b/config/initializers/license.rb
@@ -1,4 +1,6 @@
-config = YAML.load_file(Rails.root.join("config/license.yml"))
-config.fetch(Rails.env, {}).each do |key, value|
-  ENV[key.upcase] = value.to_s
+if File.exist?("config/license.yml")   
+	config = YAML.load_file(Rails.root.join("config/license.yml"))
+	config.fetch(Rails.env, {}).each do |key, value|
+	  ENV[key.upcase] = value.to_s
+	end
 end
\ No newline at end of file
diff --git a/config/license.yml b/config/license.yml
index f98a6e81..cc470a1d 100644
--- a/config/license.yml
+++ b/config/license.yml
@@ -1,14 +1,15 @@
-development:
- server_mode: cloud
- license_key: IAAXHpbSWAfvlWGYpDoXvZdmuRABNGk
-
- 
-test:
- sx_provision_url: "provision.test.ws/api"
-
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
-production:
- server_mode: cloud 
- license_key: IAAXHpbSWAfvlWGYpDoXvZdmuRABNGk 
-
+iv_key: TP8dIx4nBGzr+tYyKn5+Xw==
+shop_name: Osaka
+email: wathonaun9@gmail.com
+telephone: 09979204288
+fax: 09979204288
+address: Yangon
+dbhost: nk57NaR38B2eSYyron3Nbw==
+dbschema: 3orxFaTi0uQhatBqZGiitQ==
+dbusername: EtMle9Gr0/PE3NFHHfwo5A==
+dbpassword: 86h61/O38GGo64nekz6oeA==
+api_token: FVAGMnjVdaScfydXMbMvPPRWnkEwCSuxs
+app_token: IoXPdqzbnQWbHsnxLAjMjimnjEJNySOeIo
+plan_sku: PyQJ2sk5NZTudqQ2YIU16A==
+renewable_date: d/Fk1deU/iPbZFDOdyKsjA==
+plan_name: weWOqr1tZ61Av6YKth1lDw==
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ce493bc5..f47f9aaf 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -69,6 +69,7 @@ en:
   inventory_definitions: "Inventory Definitions"
   sale_audits: "Sale Audits"
   bottom: "Bottom"
+  payment: "Payment"
 
   views:
     btn:
@@ -155,6 +156,9 @@ en:
         cashier_terminal: "Cashier Terminal"
         print_settings: "Print Settings"
         transaction_sales: "Transactions Sales"
+        setting_membership_actions: "Setting Membership Actions"
+        membership_actions: "Membership Actions"
+        membership_setting: "Membership Setting"
       button:
         new: "NEW"
         create: "CREATE"
@@ -429,7 +433,17 @@ en:
         sale_date: "Sale Date"
         commission_report: "Commission Report"
         commission_price: "Commission Price"
-        commission_amount: "Commission Amount"
+        commission_amount: "Customer Amount"
+        survey: "Survey"
+        receipt: "Receipt"
+        tax: "Tax"
+        card_sale: "Card Sale"
+        dine_in: "Dine in"
+        takeaway: "Takeaway"
+        membership: "Membership"
+        gateway_communication_type: "Gateway communication type"
+        gateway_url: "Gateway url"
+        additional_parameter: "Additional parameter"
         
         code_txt: "code "
         charge_txt: "charge"
@@ -589,6 +603,13 @@ en:
         no_data_txt: "There is no data for search"
         assign_txt: "to assign "
         remove_txt: "to remove "
+        membership_type_txt: "membership type"
+        merchant_account_txt: "merchant account"
+        membership_actions_txt: "membership actions"
+        gateway_communication_type_txt: "gateway communication type"
+        gateway_url_txt: "gateway url"
+        membership_setting_txt: "membership setting"
+
         cancel_btn_txt: "to cancel "
         image_btn_txt: "to upload "
         create_btn_txt: "to create "
@@ -598,7 +619,6 @@ en:
         edit_btn_txt: "to edit "
         delete_btn_txt: "to delete "
         update_btn_txt: "to update "
-        survey: "Survey"
 
   helpers:
     page_entries_info:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 5becd44b..29121da8 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -1,13 +1,11 @@
 mm:
-  welcome: "မဂ်လာပါ"
+  welcome: "မင်္ဂလာပါ" 
   main_navigation: "မာတိကာ"
-  dashboard: "မျက်နှာစာ"
+  dashboard: "ပင်မမျက်နှာစာ"
   oqs: "အမှာစာနေရာများ"
   origami: "အရောင်းကောင်တာ"
   crm: "စားသုံးသူကြီးကြပ်ရေး"
-  customer: "စားသုံးသူကြီးကြပ်ရေး"
-  queue: "တန်းစီစာရင်း"
-  inventory: "ကုန်လှောင်ရုံ"
+  inventory: "ကုန်လှောင်ရုံစာရင်း"
   settings: "သတ်မှတ်ချက်များ"
   transactions: "အလုပ်ပြီးမြောက်မှု့များ"
   reports: "အစီရင်ခံစာ"
@@ -20,17 +18,15 @@ mm:
   staff: "၀န်ထမ်းများ"
   products: "ကုန်စည်များ"
   promotions: "အရောင်းမြှင့်တင်ရေး"
-  commissions: "ကော်မရှင်များ"
-  commissioners: "ကော်မရှင်နာများ"
   printer: "ပရင့်တာ"
   logout: "ထွက်ရန်"
   sale: "အရောင်း"
   hourly: "နာရီအလိုက်"
+  time: "အချိန်"
   top: "အရောင်းရဆုံး"
   orders: "အော်ဒါများ"
-  shiftsale: "အော်ဒါများ"
-  bookings: "အော်ဒါများ"
   credit: "အကြွေး"
+  bookings: "ကြိုတင်စာရင်းသွင်းခြင်း"
   home: "မူလစာမျက်နှာ"
   simple_menu_item: "ဟင်းလျာများ"
   set_menu_item: "တွဲဖက်ဟင်းလျာများ"
@@ -65,9 +61,10 @@ mm:
   customer_details: "စားသုံးသူကိုယ်ရေးအသေးစိတ်"
   order_details: "မှာကြားမှုအသေးစိတ်"
   sale_details: "ရောင်းရငွေအသေးစိတ်"
-  booking_details: "ရောင်းရငွေအသေးစိတ်"
   inventory_definitions: "ကုန်လှောင်ရုံပစ္စည်းဖွင့်ဆိုချက်များ"
   sale_audits: "အရောင်းပြင်ဆင်ခြင်းများ"
+  bottom: "အရောင်းအနဲဆုံး"
+  payment: "ငွေပေးချေမှု"
   
   views:
     btn:       
@@ -91,6 +88,7 @@ mm:
       filter: "ဇကာစစ်ရှာဖွေရန်"
       del: "ဖျက်ပါ"
       clr: "ရှင်းပါ"
+      assign: "ချမှတ်သည်"
 
       print_order_summary: "အော်ဒါအကျဉ်းချုပ်များ စာရွက်ထုတ်ရန်"
       memeber_card: "အသင်းဝင်ကတ်ပြား"
@@ -112,6 +110,9 @@ mm:
       foc: "မေတ္တာဖြင့်ကျွေးမွေးသည်"
       nett: "အသားတင်"
       cash: "ငွေသား"
+      mpu: "MPU"
+      jcb: "JCB"
+      visa: "VISA"
       credit: "အကြွေး"
       other_payment: "အခြားငွေပေးဆောင်မှုများ"
       percentage: "ရာခိုင်နှုန်း"
@@ -123,13 +124,498 @@ mm:
       generate_report: "အစီရင်ခံစာများရှာဖွေရန်"
       exp_to_excel: "Excel သို့ ပို့ပြီးဆက်လက်လုပ်ဆောင်ရန်"
 
-
     pagination:
       first: "&laquo; ပထမ"
       last: "အဆံုး &raquo;"
       previous: "&lsaquo; ေနာက္သို့"
       next: "ေရ့သို့ &rsaquo;"
       truncate: "&hellip;"
+
+    right_panel:    
+      header:
+        page_detail: "စာမျက်နှာအသေးစိတ်"
+        button_lists: "ခလုတ်စာရင်း"
+        link_lists: "လင့်ခ်စာရင်း"
+        zone: "ဇုန်"
+        dining_facilities: "စားပွဲဆိုင်ရာအထောက်အပံ့ပစ္စည်းများ"
+        menu: "မီနူး"
+        menu_categories: "ဟင်းပွဲအမျိုးအစားများ"
+        menu_category: "ဟင်းပွဲအမျိုးအစား"
+        menu_item: "ဟင်းပွဲ"
+        menu_items: "ဟင်းပွဲများ"
+        menu_item_instances: "ဟင်းလျာများ"
+        menu_item_attributes: "ရွေးချယ်စရာများ"
+        menu_item_options: "ဟင်းပွဲပြုပြင်ရန်"
+        order_queue_stations: "အော်ဒါများတန်းစီသည့်စက်"
+        cashier_terminal: "ငွေရှင်းကောင်တာ"
+        print_settings: "ပရင်တာပြင်ဆင်ရန်"
+        transaction_sales: "အရောင်းစာရင်းများ"
+        setting_membership_actions: "အဖွဲ့၀င်မှုဆိုင်ရာချိတ်ဆက်မှုပြင်ဆင်ချက်များ"
+        membership_actions: "အဖွဲ့၀င်မှုဆိုင်ရာချိတ်ဆက်မှု"
+        membership_setting: "အဖွဲ့၀င်မှုဆိုင်ရာပြင်ဆင်ချက်များ"
+
+      button: 
+        new: "အသစ်"
+        create: "တည်ဆောက်"
+        show: "ပြသ"
+        update: "အသစ်ပြောင်း"
+        edit: "ပြုပြင်"
+        delete: "ဖျက်"
+        new_table: "စားပွဲအသစ်"
+        new_room: "အခန်းအသစ်"
+        add_extra_charges: "ထပ်မံငွေကောက်ခံ"
+        home: "မူလစာမျက်နှာ"
+        back: "အနောက်သို့"
+        menu: "မီနူး"
+        item_set: "ဟင်းပွဲအစုံလိုက်"
+        item_attributes: "ဟင်းပွဲရွေးချယ်စရာများ"
+        item_options: "ပြုပြင်ရန်"
+        submit: "အတည်ပြုရန်"
+        new_simple_menu_item: "ဟင်းပွဲအသစ်"
+        new_set_menu_item: "ဟင်းပွဲအစုံအသစ်"
+        pick_image: "ဓာတ်ပုံရွေးချယ်ရန်"
+        cancel: "ဖျက်သိမ်းသည်"
+        assign_processing_items: "ချက်ရန်ဟင်းပွဲများသတ်မှတ်ရန်"
+        add_product: "ကုန်ပစ္စည်းအသစ်တိုးရန်"
+        queue: "တန်းစီ"
+        save: "သိမ်းဆည်း"
+        finish: "ပြီးဆုံး"
+        save_to_journal: "မှတ်တမ်းတင်မည်"
+        search_keyboard: "စကားလုံးရှာဖွေမှုများ"
+      detail:
+        name: "နာမည်"
+        type: "အမျိုးအစား"
+        status: "အခြေအနေ"
+        order_by: "ဖြင့်စီမည်"
+        seater: "ထိုင်ခုံ"
+        is_active: "လူရှိနေသော၀ိုင်း"
+        account: "အကောင့်"
+        created_by: "ပြုလုပ်ခဲ့သူ"
+        created_at: "ပြုလုပ်ခဲ့ချိန်"
+        updated_at: "ပြောင်းလဲခဲ့ချိန်"
+        action: "လုပ်ဆောင်မှု"
+        action_at: "လုပ်ဆောင်ခဲ့ချိန်"
+        actions: "လုပ်ဆောင်မှုများ"
+        item_code: "ဟင်းပွဲ၏နံပါတ်"
+        unit_price: "တပွဲစာစျေးနှုန်း"
+        taxable: "အခွန်ကောက်နိုင်သည်"
+        charge_type: "ငွေကောက်ခံမှုအမျိုးအစား"
+        minimum_free_time: "အစပိုင်းအခမဲ့ပေးချိန်"
+        charge_block: "ငွေကောက်ခံမှုတပိုင်းစာ"
+        time_rounding: "အချိန်အတိုးအလျှော့"
+        for: "အတွက်"
+        checkbox: "အမှန်ခြစ်ရန်အကွက် "
+        valid_days: "သတ်မှတ်ရက်များ"
+        valid_from: "စတင်အကြုံး၀င်ချိန်"
+        valid_to: "အကြုံး၀င်ချိန်အဆုံး"
+        sub_cat_count: "ထပ်ဆင့်ဟင်းအမျိုးအစားအရေအတွက်"
+        items_count: "ဟင်းပွဲအရေအတွက်"
+        number_of: "အရေအတွက်များ"
+        category_code: "ဟင်းပွဲအမျိုးအစားနံပါတ်"
+        alt_name: "အခြားအမည်"
+        parent: "အုပ်စု"
+        parent_item: "အမျိုးအစားအုပ်စု"
+        min_qty: "အနည်းဆုံးမှာရန်"
+        account_type: "အကောင့်အမျိုးအစား"
+        is_sub_item: "သည်ဟင်းပွဲအဆင့်ငယ်ဖြစ်သလား"
+        unit: "ယူနစ်"
+        item_attributes: "ဟင်းပွဲရွေးချယ်စရာများ"
+        item_options: "ဟင်းပွဲပြုပြင်စရာများ"
+        menu_item_image: "ဟင်းပွဲဓာတ်ပုံ"
+        item_set: "ဟင်းပွဲအစုံလိုက်"
+        item_sets: "ဟင်းပွဲအစုံလိုက်များ"
+        instance_code: "ဟင်းလျာနံပါတ်"
+        instance_name: "ပါ၀င်ဟင်းလျာအမည်"
+        price: "စျေးနှုန်း"
+        promotion: "လျော့စျေး"
+        item_instance_code: "ဟင်းပွဲနံပါတ်"
+        item_instance_name: "ဟင်းပွဲအမည်"
+        is_on_promotion: "သည် လျော့စျေးနှုန်းဖြစ်သည်"
+        promotion_price: "လျော့စျေးနှုန်း"
+        is_default: "မူလသတ်မှတ်ထားသည်"
+        min_selectable_qty: "အနည်းဆုံးရွေးချယ်နိုင်သောအရေအတွက်"
+        max_selectable_qty: "အများဆုံးရွေးချယ်နိုင်သောအရေအတွက်"
+        value: "တန်ဖိုး"
+        station_name: "စက်အမည်"
+        printer_name: "ပရင်တာအမည်"
+        auto_print: "အလိုအလျောက်စာရွက်ထုတ်သည်"
+        print_copy: "၂ရွက်ထုတ်သည်"
+        alternate_name: "အခြားအမည်"
+        processing_items: "ချက်ပြုတ်နေသောဟင်းလျာများ"
+        font_size: "စာလုံးအရွယ်အစား"
+        cut_per_print: "တကြောင်းစီဖြတ်တောက်သည်"
+        select_menu_items: "မီနူးဟင်းလျာများရွေးချယ်ပါ"
+        select_item: "ဟင်းပွဲရွေးချယ်ပါ"
+        employee: "ဆိုင်၀န်ထမ်း"
+        role: "ရာထူးအဆင့်"
+        employee_numeric_id: "ဆိုင်၀န်ထမ်းကိုယ်ပိုင်အမှတ်"
+        password: "လျို့၀ှက်နံပါတ်"
+        login: "၀င်ရောက်မည်"
+        show_tax: "အခွန်ပြသမည်"
+        show_cashier: "ငွေရှင်းကောင်တာပြသမည်"
+        is_currently_login: "သည်ယခု၀င်ရောက်ထားသည်"
+        auto_print_receipt: "ငွေလက်ခံဖြတ်ပိုင်းအလိုအလျောက်ထုတ်မည်"
+        font: "စာလုံး"
+        show_guest_info: "စားသုံးသူအချက်အလက်ပြသမည်"
+        header: "ခေါင်းစဥ်"
+        footer: "စာကြွင်း"
+        unique_code: "သီးသန့်နံပါတ်"
+        page_width: "စာရွက်အကျယ်"
+        page_height: "စာရွက်အမြင့်"
+        print_copies: "ပိုထုတ်ထားသောစာရွက်များ"
+        template: "ပုံစံခွက်"
+        api_settings: "API ပြုပြင်ရန်"
+        precision: "တိကျမှု"
+        delimiter: "ကိန်းဂဏန်းတွင်ကော်မာကုတ်ရန်"
+        heading_space: "ထိပ်ပိုင်းနေရာ"
+        rate: "နှုန်း"
+        inclusive: "ပါ၀င်ပြီး"
+        payment_method: "ငွေပေးချေရန်နည်းလမ်း"
+        gateway: "အဓိကလမ်းကြောင်း"
+        comm_type: "ဆက်သွယ်မှုအမျိုးအစား"
+        auth_token: "ချိတ်ဆက်စစ်ဆေးရန် တုံကင်"
+        merchant_account: "ဆိုင်အကောင့်"
+        additional_parameters: "ထပ်ဆောင်းသတ်မှတ်မှုများ"
+        title: "ခေါင်းစဥ်"
+        discount: "လျှော့စျေး"
+        item_discount: "ဟင်းပွဲအလိုက်လျှော့စျေးများ"
+        point: "ပွိုင့်"
+        bonus: "အပိုဆောင်း"
+        rebate: "ဆုကြေး"
+        description: "ရှင်းလင်းစာ"
+        information: "သတင်းအချက်အလက်"
+        product_image: "ကုန်ပစ္စည်းဓာတ်ပုံ"
+        promotion_code: "လျှော့စျေးကုတ်ဒ်နံပါတ်"
+        start_date: "စတင်ရက်"
+        end_date: "ကုန်ဆုံးရက်"
+        start_time: "စတင်ချိန်"
+        end_time: "ကုန်ဆုံးချိန်"
+        promotion_day: "လျှော့စျေးရက်များ"
+        original_product: "မူလကုန်ပစ္စည်း"
+        item: "ဟင်းလျာ"
+        net_off: "လျှော့စျေး"
+        net_price: "စျေးအသစ်"
+        percentage: "ရာခိုင်နှုန်း"
+        product: "ကုန်ပစ္စည်း"
+        commission: "ကော်မရှင်"
+        commission_type: "ကော်မရှင်အမျိုးအစား"
+        amount: "သင့်ငွေ"
+        active: "လက်ရှိသုံးစွဲနေ"
+        joined_date: "စတင်သည့်နေ့စွဲ"
+        resigned_date: "ထွက်စာတင်နေ့စွဲ"
+        qty: "အရေအတွက်"
+        date: "ရက်စွဲ"
+        queue_no: "စောင့်ဆိုင်းအမှတ်စဥ်"
+        contact_no: "ဆက်သွယ်ရန်ဖုန်း"
+        remark: "စာကြွင်း"
+        can_get_points: "ပွိုင့်ရနိုင်သည်"
+        can_rebate: "ဆုကြေးရနိုင်သည်"
+        is_available: "လစ်လပ်နေသည်"
+        attribute_type: "အမျိုးအစား"
+        sr_no: "ထုတ်လုပ်မှုအမှတ်စဥ်"
+        card_no: "ကတ်နံပါတ်"
+        email: "အီးမေးလ်"
+        inventory: "ကုန်လှောင်ရုံစာရင်း"
+        stock_taking: "စတော့ကောက်သည်"
+        stock_check: "စတော့စစ်ဆေးသည်"
+        stock_check_report: "စတော့စစ်ဆေးမှုမှတ်တမ်း"
+        min_order: "အနည်းဆုံးမှာယူမှု"
+        max_stock: "အများဆုံးစတော့"
+        created_time: "စတင်တည်ဆောက်ခဲ့ချိန်"
+        level: "အဆင့်"
+        balance: "လက်ကျန်ငွေ"
+        set_stock_check_reason: "စတော့စစ်ဆေးမှုခေါင်းစဥ်ထားရန်"
+        salutation: "နှုတ်ဆက်"
+        mr: "ဦး"
+        miss: "မ"
+        mrs: "ဒေါ်"
+        mdm: "ဒေါ်"
+        gender: "လိင်"
+        male: "အမျိုးသား"
+        female: "အမျိုးသမီး"
+        sr_no: "ထုတ်လုပ်မှုအမှတ်စဥ်"
+        date_of_birth: "မွေးနေ့မွေးရက်"
+        select_customer_type: "စားသုံးသူအမျိုးအစားရွေးချယ်ပါ"
+        paypar_account_no: "Paypar အကောင့်နံပါတ်"
+        select_membership_group: "အသင်း၀င်အုပ်စုအမျိုးအစားရွေးချယ်ပါ"
+        company: "ကုမဏ္ဏီ"
+        nrc_passport_no: "မှတ်ပုံတင်/ပတ်စပို့နံပါတ်"
+        address: "နေရပ်လိပ်စာ"
+        dob: "မွေးနေ့"
+        membership_type: "အသင်း၀င်အမျိုးအစား"
+        discount_amount: "လျှော့စျေးပမာဏ"
+        from_account: "ဤအကောင့်မှ"
+        receipt_no: "ငွေလက်ခံဖြတ်ပိုင်းနံပါတ်"
+        order_id: "မှာယူမှုနံပါတ်"
+        order_date: "မှာယူသည့်နေ့စွဲ"
+        sale_id: "အရောင်းနံပါတ်"
+        receipt_no: "ငွေလက်ခံဖြတ်ပိုင်းနံပါတ်"
+        grand_total: "ကျသင့်ငွေ"
+        tax_amount: "အခွန်ပမာဏ"
+        sales_status: "အရောင်းအနေအထား"
+        receipt_date: "ငွေလက်ခံဖြတ်ပိုင်းနေ့စွဲ"
+        check_by: "စစ်ဆေးသူ"
+        check_at: "စစ်ဆေးချိန်"
+        reason: "အကြောင်းပြချက်"
+        stock_count: "ပစ္စည်းရေတွက်မှု"
+        stock_balance: "ပစ္စည်းလက်ကျန်"
+        different: "ကွာခြားချက်"
+        order: "အော်ဒါ"
+        from: "မှ"
+        to: "ဆီသို့"
+        order_status: "အော်ဒါမှာကြားမှုအခြေအနေ"
+        order_items: "အော်ဒါမှာထားသောဟင်းလျာများ"
+        total_price: "စုစုပေါင်းကျသင့်ငွေ"
+        enter_keyboards: "စကားလုံးများရိုက်ထည့်ပါ"
+        receipt_generated_at: "ငွေလက်ခံဖြတ်ပိုင်းထွက်သည့်အချိန်"
+        total: "စုစုပေါင်း"
+        total_pay_amount: "စုစုပေါင်းပေးငွေပမာဏ"
+        change: "ပြန်အမ်းငွေ"
+        option: "ရွေးချယ်ရန်"
+        waiter: "ဆိုင်၀န်ထမ်း"
+        membership_transactions: "အဖွဲ့၀င်အရောင်းစာရင်းများ"
+        redeem: "ဆုကြေးပြန်သုံးငွေ"
+        approved_at: "ခွင့်ပြုချိန်"
+        credit_note: "အကြွေး"
+        requested_by: "တောင်းယူသူ"
+        requested_at: "တောင်းယူချိန်"
+        payment_status: "ငွေပေးချေမှုအခြေအနေ"
+        sale_status: "အရောင်းအခြေအနေ"
+        total_amount: "စုစုပေါင်းကျသင့်ငွေပမာဏ"
+        total_discount: "စုစုပေါင်းလျှော့စျေးပမာဏ"
+        total_tax: "အခွန်စုစုပေါင်း"
+        tax_type: "အခွန်အမျိုးအစား"
+        rnd_adj: "ငွေအတိုးအလျှော့ချိန်ညှိမှု"
+        amt_received: "လက်ခံရရှိငွေ"
+        amt_changed: "ပြန်အမ်းငွေ"
+        select_customer: "စားသုံးသူရွေးချယ်ပါ"
+        credit_amount: "အကြွေးငွေပမာဏ"
+        daily_sale_report: "နေ့စဥ်ရောင်းရငွေအစီရင်ခံစာ"
+        from_date: "မှ​ရက်စွဲ"
+        to_date: "ထိရက်စွဲ"
+        sr: "အမှတ်စဥ်"
+        void_amount: "ပြန်ဖျက်သည့်ပမာဏ"
+        mpu_sales: "MPU ရောင်းရငွေ"
+        master_sales: "Master ရောင်းရငွေ"
+        visa_sales: "Visa ရောင်းရငွေ"
+        jcb_sales: "JCB ရောင်းရငွေ"
+        redeem_sales: "ဆုကြေးပြန်သုံးငွေနှင့် ရောင်းရငွေ"
+        cash_sales: "ငွေသား ရောင်းရငွေ"
+        credit_sales: "အကြွေး ရောင်းရငွေ"
+        foc_sales: "အခမဲ့ ရောင်းရငွေ"
+        foc_item: "အခမဲ့ ဟင်းလျာများ"
+        net_amount: "အသတင်စျေးနှုန်း"
+        sale_item_report: "ရောင်းရဟင်းလျာအစီရင်ခံစာ"
+        select_period: "အချိန်ကာလသတ်မှတ်ပါ"
+        shift_name: "တာ၀န်ချိန်"
+        code: "ကုတ်နံပါတ်"
+        item: "ဟင်းလျာ"
+        revenue: "ရောင်းရ၀င်ငွေ"
+        total_price_by: "စုစုပေါင်းငွေပမာဏ"
+        sub_total: "စုစုပေါင်း"
+        cash_received: "လက်ခံရရှိငွေ"
+        card_sales: "ကတ်ဖြင့်ရောင်းရငွေများ"
+        select_payments: "ငွေပေးချေမှုအမျိုးအစားရွေးချယ်ပါ"
+        all_shift: "တာ၀န်ချိန်များအားလုံး"
+        receipt_no_report: "ငွေလက်ခံဖြတ်ပိုင်းနံပါတ် အစီရင်ခံစာ"
+        payment_method_report: "ငွေပေးချေမှုနည်းလမ်းအလိုက် အစီရင်ခံစာ"
+        rnd_adj_sh: "ငွေအတိုးအလျှော့ချိန်ညှိမှု"
+        shift_sale_report: "တာ၀န်ချိန်အလိုက်ရောင်းရငွေ အစီရင်ခံစာ"
+        cashier_station: "ငွေရှင်းကောင်တာ"
+        cash_payment: "ငွေသားပေးချေမှု"
+        credit_payment: "အကြွေးပေးချေမှု"
+        credit_payment_report: "အကြွေးပေးချေမှုဆိုင်ရာ အစီရင်ခံစာ"
+        void_sale_report: "ဖျက်သိမ်းအရောင်းစာရင်းများဆိုင်ရာ အစီရင်ခံစာ"
+        sale_date: "ရောင်းချသည့်ရက်စွဲ"
+        commission_report: "ကော်မရှင်စား အစီရင်ခံစာ"
+        commission_price: "ကော်မရှင်စား စျေးနှုန်း"
+        commission_amount: "ကော်မရှင်စား ငွေပမာဏ"
+        receipt: "ငွေလက်ခံဖြတ်ပိုင်း"
+        tax: "အခွန်"
+        card_sale: "ကတ်ဖြင့်ရောင်းရငွေ"
+        dine_in: "ဆိုင်တွင်စားသောက်ခြင်း"
+        takeaway: "ပါဆယ်၀ယ်ယူခြင်း"
+        membership: "အသင်း၀င်ခြင်း"
+        gateway_communication_type: "အဓိကလမ်းကြောင်းဆက်သွယ်မှုအမျိုးအစား"
+        gateway_url: "အဓိကလမ်းကြောင်းဆက်သွယ်မှုလိပ်စာ"
+        additional_parameter: "ထပ်ဖြည့်အကြောင်းအရာ"
+        survey: "ခြုံငုံလေ့လာခြင်း"
+        
+        code_txt: "ကုတ်ဒ် "
+        charge_txt: "ကောက်ခံသည်"
+        time_txt: "အချိန်"
+        block_txt: " ဘလောက်"
+        price_txt: " စျေးနှုန်း"
+        zone_txt: "ဇုန်"
+        table_txt: "စားပွဲ"
+        seat_txt: "ထိုင်ခုံ"
+        order_txt: "မှာယူမှု"
+        room_txt: "အခန်း"
+        extra_charges_txt: "ထပ်ဆောင်းကောက်ခံမှု"
+        dashboard_txt: "မူလနေရာ"
+        data_txt: "ဒေတာ"
+        type_txt: "အမျိုးအစား"
+        home_txt: "မူလနေရာသို့သွားရန်"
+        back_txt: "ပြန်သွားရန်"
+        name_txt : " နာမည် / အသုံးပြုသူများကြည့်နိုင်သည်"
+        name_txt2: "နာမည်"
+        is_active_txt : "လက်ရှိသုံးနေသည် သို့ မသုံးပါ"
+        created_by_txt : "မှ တည်ဆောက်ခဲ့သည် "
+        actions_txt : "အသုံးပြုသူမှ ကြည့်နိုင်/ပြောင်းနိုင်သည် "
+        actions_txt2 : "အသုံးပြုသူမှ ပြောင်းနိုင်/ဖျက်နိုင်သည် "
+        actions_txt3: "အသုံးပြုသူမှ ပြောင်းနိုင်သည်"
+        status_txt: "သည် လစ်လပ်နေ/မနေ"
+        created_at_txt: "တည်ဆောက်ခဲ့ချိန် "
+        updated_at_txt: "ပြင်ဆင်ခဲ့ချိန် "
+        item_code_txt: "ထုတ်ထားသောကုန်ပစ္စည်းအမှတ်များ"
+        taxable_txt: " အခွန်ကောက်ထား/မထား"
+        minimum_free_time_txt: "အခန်းခကင်းလွတ်ချိန်"
+        time_rounding_txt: "အချိန်ပို"
+        time_rounding_txt2: "အချိန်ပို"
+        write_txt: "ရေးရန် "
+        menu_txt: "မီနူး"
+        menu_categories_txt: "ဟင်းပွဲအမျိုးအစားများ"
+        item_set_txt: "ဟင်းပွဲအစုံလိုက်"
+        valid_days_txt: " အကြုံး၀င်ရက်စွဲများ ([၁- ၇] => [တနင်္လာ - တနင်္ဂနွေ) " 
+        valid_from_txt: "မှ ရက်စွဲ/စတင်ချိန်"
+        valid_to_txt: "ထိ ရက်စွဲ/ပြီးဆုံးချိန် "
+        select_txt: "ရွေးချယ်"
+        sub_categories_txt: "ထပ်ဆင့်ဟင်းပွဲအမျိုးအစားများ"
+        item_txt: "အမျိုးအမည်"
+        items_txt: "အမျိုးအမည်များ"
+        alt_name_txt: "အမည်နောက်တမျိုး"
+        parent_txt: "အပေါ်အဆင့်"
+        menu_item_txt: "ဟင်းလျာ"
+        parent_item_txt: "ဟင်းလျာအမျိုးအစား"
+        simple_menu_item_txt: "ရိုးရိုးဟင်းလျာ"
+        set_menu_item_txt: "ဟင်းလျာတစုံစာ"
+        min_qty_txt: "အနည်းဆုံးအရေအတွက်"
+        account_type_txt: "အကောင့်အမျိုးအစား"
+        sub_item_txt: "ထပ်ဆင့်အမျိုးအစား"
+        unit_txt: "ယူနစ်"
+        multi_select_txt: "အများစုရွေးချယ်"
+        upload_txt: "ထည့်ရန်"
+        item_attributes_txt: "ဟင်းလျာရွေးချယ်စရာများ"
+        item_options_txt: "ဟင်းလျာပြင်ဆင်ရန်"
+        image_txt: "ဓာတ်ပုံ"
+        item_sets_txt: "ဟင်းလျာအမျိုးအစား"
+        item_attributes_txt: "ဟင်းလျာရွေးချယ်စရာများ"
+        item_options_txt: "ဟင်းလျာပြင်ဆင်ရန်"
+        menu_item_instance_txt: "ဟင်းလျာ"
+        promotion_txt: "လျော့စျေး"
+        default_txt: "မူလသတ်မှတ်ထားသော"
+        is_on_promotion_txt: "လျော့စျေးကာလဖြစ်နေသလား"
+        min_selectable_qty_txt: "အနည်းဆုံးရွေးချယ်နိုင်သောပမာဏ"
+        max_selectable_qty_txt: "အများဆုံးရွေးချယ်နိုင်သောပမာဏ"
+        value_txt: "တန်ဖိုး"
+        type_txt2: "အမျိုးအစား"
+        order_queue_stations_txt: "အော်ဒါများစီတန်းသောနေရာ"
+        station_name_txt: "နေရာအမည်"
+        printer_txt: "ပရင်တာ"
+        auto_print_txt: "အလိုအလျောက် စာရွက်ထွက်မည်"
+        status_txt2: "အခြေအနေ"
+        copy_print_txt: "စာရွက်အပိုထွက်မည်"
+        assign_processing_items_txt: "ချက်ပြုတ်မည့်ဟင်းလျာများ နေရာချထားရန်"
+        processing_items_txt: "ချက်ပြုတ်နေသောဟင်းလျာ"
+        cut_per_item_txt: "ဟင်းလျာတမျိုးစီဖြတ်တောက်မည်"
+        font_size_txt: "စာလုံးအရွယ်အစား"
+        employee_txt: "၀န်ထမ်း"
+        role_txt: "ရာထူး"
+        employee_numeric_id_txt: "၀န်ထမ်းကိုယ်ပိုင်အမှတ်"
+        password_txt: "လျို့၀ှက်ဂဏန်း"
+        cashier_terminal_txt: "ငွေရှင်းကောင်တာ"
+        login_txt: "၀င်ရောက်မည်"
+        tax_txt: "အခွန်"
+        cashier_txt: "ငွေကိုင်"
+        is_currently_login_txt: "သည် ယခု၀င်ရောက်နေသည်"
+        auto_print_receipt_txt: "ငွေလက်ခံဖြတ်ပိုင်းအလိုအလျောက်ထုတ်မည်"
+        font_txt: "စာလုံး"
+        guest_info_txt: "ဧည့်သည်မှတ်တမ်း"
+        header_txt: "ခေါင်းစဥ်"
+        footer_txt: "စာကြွင်း"
+        unique_code_txt: "ထပ်တူမရှိသောကုတ်ဒ်"
+        page_width_txt: "စာရွက်အကျယ်"
+        page_height_txt: "စာရွက်အမြင့်"
+        print_copies_txt: "အပိုထုတ်သောစာရွက်များ"
+        print_settings_txt: "ပရင့်ထုတ်ခြင်းဆိုင်ရာပြင်ဆင်ရန်"
+        template_txt: "ကြိုတင်ပြုလုပ်ထားသောပုံစံခွက်"
+        api_settings_txt: "api ပြင်ဆင်ခြင်းများ"
+        delimiter_txt: "ဂဏန်းရာဖြတ်"
+        heading_space_txt: "ခေါင်းစဥ်နေရာလွတ်"
+        tax_profiles_txt: "အခွန်အမျိုးအစားများ"
+        inclusive_txt: "ပါ၀င်ပြီး"
+        rate_txt: "နှုန်း"
+        gateway_txt: "စုရပ်"
+        payment_method_txt: "ငွေပေးချေခြင်းနည်းလမ်းများ"
+        comm_type_txt: "comm အမျိုးအစားများ"
+        url_txt: "အင်တာနက်လိပ်စာ"
+        auth_token_txt: "ချိတ်ဆက်စစ်ဆေးရန် တုံကင်"
+        merchant_account_txt: "ဆိုင်ရှင်အကောင့်"
+        additional_parameters_txt: "ထပ်ဆောင်းညှိနှိုင်းရန်များ"
+        title_txt: "ခေါင်းစဥ်"
+        account_txt: "အကောင့်"
+        discount_txt: "လျှော့စျေး"
+        point_txt: "ပွိုင့်"
+        bonus_txt: "ဆုကြေး"
+        rebate_txt: "ပြန်ပေးသည်"
+        product_txt: "ထုတ်ကုန်"
+        description_txt: "ရည်ညွှန်းစာ"
+        information_txt: "အချက်အလက်"
+        promotion_txt: "လျှော့စျေး"
+        promotion_txt2: "လျှော့စျေး"
+        promotion_code_txt: "လျှော့စျေးဆိုင်ရာကုတ်ဒ်နံပါတ်"
+        start_date_txt: "စတင်သောရက်စွဲ"
+        end_date_txt: "ကုန်ဆုံးရက်စွဲ"
+        start_time_txt: "စတင်ချိန်"
+        end_time_txt: "ပြီးဆုံးချိန်"
+        promotion_day_txt: "လျှော့စျေးပေးသောရက်"
+        original_product_txt: "မူလကုန်ပစ္စည်း"
+        net_off_txt: "လျှော့ပေးငွေ"
+        net_price_txt: "သတ်မှတ်စျေးအသစ်"
+        percentage_txt: "ရာခိုင်နှုန်း"
+        commission_txt: "ကော်မရှင်"
+        product_txt: "ကုန်ပစ္စည်း"
+        commission_type_txt: "ကော်မရှင်အမျိုးအစား"
+        amount_txt: "ပမာဏ"
+        active_txt: "လက်ရှိအသုံးပြုနေသည်"
+        commissioner_txt: "ကော်မရှင်စား"
+        joined_date_txt: "စတင်၀င်ရောက်သည့်နေ့"
+        resigned_date_txt: "အလုပ်ထွက်သည့်နေ့"
+        qty_txt: "အရေအတွက်"
+        date_txt: "ရက်စွဲ"
+        queue_txt: "တန်းစီ"
+        queue_no_txt: "တန်းစီအမှတ်"
+        contacct_no_txt: "ဆက်သွယ်ရန်ဖုန်း"
+        remark_txt: "စာကြွင်း"
+        accounts_txt: "အကောင့်များ"
+        stock_taking_txt: "စတော့ကောက်သည်"
+        stock_check_report_txt: "စတော့စစ်ဆေးမှုမှတ်တမ်း"
+        item_code_txt2: "ဟင်းလျာအမှတ်စဥ်"
+        min_order_level_txt: "အနည်းဆုံးမှာယူမည့်အဆင့်သတ်မှတ်မှု"
+        max_stock_level_txt: "အများဆုံးမှာယူမည့်အဆင့်သတ်မှတ်မှု"
+        stock_check_reason_txt: "စတော့စစ်ဆေးမှုအကြောင်းပြချက်"
+        stock_check_txt: "စတော့စစ်ဆေးသည်"
+        detail_txt: "အသေးစိတ်"
+        no_data_txt: "ရှာဖွေခြင်း မတွေ့ရှိပါ"
+        assign_txt: "ချမှတ်သည်"
+        remove_txt: "ဖြုတ်ပစ်သည်"
+        membership_type_txt: "အသင်း၀င်မှုအမျိုးအစား"
+        merchant_account_txt: "စားသောက်ဆိုင်ဘက်ဆိုင်ရာအကောင့်"
+        membership_actions_txt: "အဖွဲ့၀င်မှုဆိုင်ရာချိတ်ဆက်မှု"
+        gateway_communication_type_txt: "အဓိကလမ်းကြောင်းဆက်သွယ်မှုအမျိုးအစား"
+        gateway_url_txt: "အဓိကလမ်းကြောင်းဆက်သွယ်မှုလိပ်စာ"
+        membership_setting_txt: "အဖွဲ့၀င်မှုဆိုင်ရာပြင်ဆင်ချက်များ"
+        
+        cancel_btn_txt: "ပြန်ဖျက်ရန်"
+        image_btn_txt: "တင်သွင်းရန်"
+        create_btn_txt: "တည်ဆောက်ရန်"
+        submit_btn_txt: "အတည်ပြုရန်"
+        new_btn_txt: "အသစ်လုပ်ရန်"
+        show_btn_txt: "ပြသရန်"
+        edit_btn_txt: "ပြင်ဆင်ရန်"
+        delete_btn_txt: "ဖျက်ပစ်ရန်"
+        update_btn_txt: "အသစ်ပြောင်းရန်"
+
   helpers:
     page_entries_info:
       one_page:
diff --git a/config/routes.rb b/config/routes.rb
index 1afa1ea8..9ffeb352 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,9 +9,10 @@ scope "(:locale)", locale: /en|mm/ do
   # Action Cable Creation
    mount ActionCable.server => "/cable"
 
-  #--------- SmartSales Installation ------------#
-  get 'install' => 'install#index'
-  post 'install' => 'install#create'
+  #--------- SmartSales Activation ------------#
+  get 'activate' => 'install#index'
+  post 'activate' => 'install#activate'
+  get 'run_sym' => 'sym_control#run'
 
   #--------- Login/Authentication ------------#
   get 'auth/:emp_id' => 'home#show', as: :emp_login
@@ -68,9 +69,13 @@ scope "(:locale)", locale: /en|mm/ do
     end
 
     namespace :origami do
-      post "check_in/:dining_id" => "check_in_process#check_in_process"
+      get "check_in/:dining_id" => "check_in_process#check_in_time"
+      post "check_in" => "check_in_process#check_in_process"
       post "request_time" => "check_in_process#request_time"
+      post "call_waiter" => "call_waiters#index"
     end
+
+    
   end
 
   #--------- Cashier ------------#
@@ -185,6 +190,7 @@ scope "(:locale)", locale: /en|mm/ do
     post '/:id/create_survey' => "surveys#create", :as => "create_surveys"
 
     get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
+    get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' }
     get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
 
     get '/:addorders/:id' => "addorders#detail"
@@ -239,7 +245,7 @@ scope "(:locale)", locale: /en|mm/ do
     post "/:id", to: "edit#update"
 
     # Pass assigned_order_item_id
-    get 'print/print/:id', to: "print#print"
+    post 'print/print/:id', to: "print#print"
     get 'print/print_order_summary/:id', to: "print#print_order_summary"
 
     get "/get_items/:id" => "home#get_items_by_oqs", :as => "get_order_items_by_oqs"
diff --git a/config/schedule.rb b/config/schedule.rb
index 6a43ba25..17f336a0 100755
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -10,3 +10,6 @@ every 30.minutes do
   runner "Customer.update_membership"
 end
 
+every 1.minutes do
+  runner "CheckinJob.perform"
+end
\ No newline at end of file
diff --git a/config/secrets.yml b/config/secrets.yml
index 09555540..37b1f0b0 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,11 +12,10 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: provision.zsai.ws/api  #192.168.1.94:3002
-  server_mode: cloud
+  sx_provision_url: 192.168.1.49:3002/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  server_mode: application
   cipher_type: AES-256-CBC
-  aes_key: <%= ENV['AES_KEY'] %>
-  aes_iv: <%= ENV['AES_IV'] %>
+  sx_key: Wh@t1$C2L
 
 test:
   secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0
@@ -27,6 +26,6 @@ production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
   sx_provision_url: provision.zsai.ws/api  #192.168.1.94:3002
   server_mode: cloud
-  aes_key: <%= ENV['AES_KEY'] %>
-  aes_iv: <%= ENV['AES_IV'] %>
+  cipher_type: AES-256-CBC
+  sx_key: Wh@t1$C2L
 
diff --git a/db/seeds.rb b/db/seeds.rb
index ab6e2348..79aab88f 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -130,13 +130,17 @@ food = Account.create({title: "Food", account_type: "0"})
 beverage = Account.create({title: "Beverage", account_type: "1"})
 product = Account.create({title: "Product", account_type: "2"})
 
+# YGN BBQ
+# person = Account.create({title: "Person", account_type: "3"})
+# END 
+
 #Default Menu Options
 menu_options = MenuItemOption.create([{option_type: "Spicy", name: "Less Spicy", value: "less_spicy"},{option_type: "Spicy", name: "Spicy", value: "spicy"},{option_type: "Spicy", name: "Super Spicy", value: "super_spicy"}])
 menu_options = MenuItemOption.create([{option_type: "Oil", name: "Less Oil", value: "less_oil"},{name: "No MSG", value: "no_msg"},{option_type: "Sweet", name: "Less Sweet", value: "less_sweet"}])
 menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle", value: "Bottle"},{option_type: "Package", name: "Can", value: "can"}])
 
 # #Default Menu Category
- menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base", alt_name: "Soup_base", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
+ # menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Person", alt_name: "Person", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
 # menu_category2 = MenuCategory.create({menu: menu, code:"C005", name: "Beef & Mutton", alt_name: "Beef_and_mutton", order_by: 2,created_by: "SYSTEM DEFAULT"})
 # menu_category3 = MenuCategory.create({menu: menu, code:"C006", name: "Pork", alt_name: "Pork", order_by: 3,created_by: "SYSTEM DEFAULT"})
 # menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Chicken", alt_name: "Chicken", order_by: 1, menu_category_id: menu_category3.id, created_by: "SYSTEM DEFAULT"})
@@ -154,6 +158,17 @@ menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle
 # menu_category2_menu_item1 = SimpleMenuItem.create({item_code:"I008", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 , account: food})
 # menu_category2_menu_item2 = SimpleMenuItem.create({item_code:"I009", name: "Default Menu Item Name 2", alt_name: "Alternate Menu Item Name 2",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 3 , account: food})
 
+# YGN BBQ
+# menu_item_attribute_adult = MenuItemAttribute.create({attribute_type:"person", name: "Adult", value: "adult"})
+# menu_item_attribute_child = MenuItemAttribute.create({attribute_type:"person", name: "Child", value: "child"})
+
+ # menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"P00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" })
+ # menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+
+ # menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"P00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" })
+ # menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
+# END
+
 menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size", name: "Small", value: "small"})
 menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"})
 menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"})
@@ -178,23 +193,23 @@ close_cashier_printer=PrintSetting.create({name: "Close Cashier", unique_code: "
 crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})
 queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})
 
-cashier_terminal = CashierTerminal.create({name:"Terminal 1", printer_name: "Cashier"})
+# cashier_terminal = CashierTerminal.create({name:"Terminal 1", printer_name: "Cashier"})
 
 zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"})
 
-member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"})
+member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "https://staging.membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"})
 
-member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_member_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:5},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:5},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
-  {membership_type:"search_paypar_account_no",gateway_url:"/api/generic_customer/get_membership_customer_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}
+member_actions= MembershipAction.create([{membership_type:"get_account_balance",is_active:1,gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"redeem",is_active:1,gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"create_membership_customer",is_active:1,gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"update_membership_customer",is_active:1,gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"get_all_member_group",is_active:1,gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"rebate",is_active:1,gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"get_all_member_account",is_active:1,gateway_url:"/api/generic_customer/get_member_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"get_member_transactions",is_active:1,gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"member_discount",is_active:1,gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:5},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"get_member_campaign",is_active:1,gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:5},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"search_paypar_account_no",is_active:1,gateway_url:"/api/generic_customer/get_membership_customer_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}
 ])
 
 payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://membership.paypar.ws"})
@@ -204,13 +219,13 @@ payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_u
 payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"})
 
 #Default Order Queue stations
-order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"})
-order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: false,printer_name: "Cashier", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"})
-zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: false, printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004','02005','02006','02007','02008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"})
+# order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"})
+# order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: false,printer_name: "Cashier", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"})
+# zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: false, printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004','02005','02006','02007','02008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"})
 
 # QueueStationZone
-zone_queue_station1 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station1, zone: zone})
-zone_queue_station2 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station2, zone: zone})
-zone_queue_station3 = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone})
+# zone_queue_station1 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station1, zone: zone})
+# zone_queue_station2 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station2, zone: zone})
+# zone_queue_station3 = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone})
 
-puts " Finished System Default Set Up Data vWSsseoZCzxd6xcNf_uS  RxzaYyAGzm7VqAZ4hKnv "
+puts " Finished System Default Set Up Data"
diff --git a/db/sym_master.sql b/db/sym_master.sql
index 6b392f58..4330b41f 100755
--- a/db/sym_master.sql
+++ b/db/sym_master.sql
@@ -23,8 +23,8 @@
 -- Sample Data
 ------------------------------------------------------------------------------
 -- insert into item (item_id, name) values (11000001, 'Yummy Gum');
--- insert into item_selling_price (item_id, store_id, price, cost) values (11000001, '001',0.20, 0.10);
--- insert into item_selling_price (item_id, store_id, price, cost) values (11000001, '002',0.30, 0.20);
+-- insert into item_selling_price (item_id, cloud_id, price, cost) values (11000001, '001',0.20, 0.10);
+-- insert into item_selling_price (item_id, cloud_id, price, cost) values (11000001, '002',0.30, 0.20);
 
 -- insert into sale_transaction (tran_id, store_id, workstation, day, seq) 
 -- values (900, '001', '3', '2012-12-01', 90);
@@ -48,6 +48,10 @@ delete from sym_node;
 
 
 # Create Channels for logically grouped tables
+	# For Initial Data Faster by bulk
+    update sym_channel set data_loader_type='mysql_bulk', max_batch_size=100000, max_data_to_route=100000
+     where channel_id = 'reload';
+
 	insert into sym_channel 
 	(channel_id, processing_order, max_batch_size, enabled, description)
 	values('setting', 1, 100000, 1, 'All Settings');
@@ -78,10 +82,10 @@ delete from sym_node;
 
 # Create Node Groups and Links
 	insert into sym_node_group (node_group_id) values ('sx');
-	insert into sym_node_group (node_group_id) values ('store');
+	insert into sym_node_group (node_group_id) values ('cloud');
 
-	insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('sx', 'store', 'W');
-	insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('store', 'sx', 'P');
+	insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('sx', 'cloud', 'W');
+	insert into sym_node_group_link (source_node_group_id, target_node_group_id, data_event_action) values ('cloud', 'sx', 'P');
 
 # Create Trigger for Setting Channel 
 
@@ -305,466 +309,466 @@ delete from sym_node;
 # Create Routers for Nodes
 	insert into sym_router 
 	(router_id,source_node_group_id,target_node_group_id,router_type,create_time,last_update_time)
-	values('sx_2_store', 'sx', 'store', 'default',current_timestamp, current_timestamp);
+	values('sx_2_cloud', 'sx', 'cloud', 'default',current_timestamp, current_timestamp);
 
 	insert into sym_router 
 	(router_id,source_node_group_id,target_node_group_id,router_type,sync_on_delete,create_time,last_update_time)
-	values('store_2_sx', 'store', 'sx', 'default',0,current_timestamp, current_timestamp);
+	values('cloud_2_sx', 'cloud', 'sx', 'default',0,current_timestamp, current_timestamp);
 
 -- insert into sym_router 
 -- (router_id,source_node_group_id,target_node_group_id,router_type,router_expression,create_time,last_update_time)
--- values('sx_2_one_store', 'sx', 'store', 'column','STORE_ID=:EXTERNAL_ID or OLD_STORE_ID=:EXTERNAL_ID',current_timestamp, current_timestamp);
+-- values('sx_2_one_cloud', 'sx', 'cloud', 'column','cloud_ID=:EXTERNAL_ID or OLD_cloud_ID=:EXTERNAL_ID',current_timestamp, current_timestamp);
 
 
 # Add triggers for tables with router
 
-# Setting Channel # From Store to Master
+# Setting Channel # From cloud to Master
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('lookups','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('lookups','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('membership_actions','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('membership_actions','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('membership_settings','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('membership_settings','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('payment_method_settings','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('payment_method_settings','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('print_settings','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('print_settings','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('shops','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('shops','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('customers','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('customers','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
-# Setting Channel # From Master to Store
+# Setting Channel # From Master to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('lookups','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('lookups','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('membership_actions','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('membership_actions','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('membership_settings','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('membership_settings','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('payment_method_settings','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('payment_method_settings','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('print_settings','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('print_settings','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('shops','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('shops','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('customers','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('customers','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 #End Setting Channel
 
-# Dining Channel # From Store to SX
+# Dining Channel # From cloud to SX
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('zones','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('zones','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('dining_charges','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('dining_charges','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('dining_facilities','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('dining_facilities','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('dining_queues','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('dining_queues','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
-# Dining Channel # From SX to Store
+# Dining Channel # From SX to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('zones','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('zones','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('dining_charges','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('dining_charges','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('dining_facilities','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('dining_facilities','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('dining_queues','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('dining_queues','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 #end Dining Channel
 
-# Commission/Promotion/Product Channel # From Store to SX
+# Commission/Promotion/Product Channel # From cloud to SX
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('commissioners','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('commissioners','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('commissions','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('commissions','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('employees','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('employees','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('in_duties','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('in_duties','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('inventory_definitions','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('inventory_definitions','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('product_commissions','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('product_commissions','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('products','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('products','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('promotion_products','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('promotion_products','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('promotions','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('promotions','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
-# Commission/Promotion/Product Channel # From SX to Store
+# Commission/Promotion/Product Channel # From SX to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('commissioners','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('commissioners','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('commissions','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('commissions','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('employees','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('employees','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('in_duties','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('in_duties','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('inventory_definitions','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('inventory_definitions','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('product_commissions','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('product_commissions','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('products','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('products','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('promotion_products','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('promotion_products','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('promotions','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('promotions','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 #end Commission/Promotion/Product Channel
 
-# Menu Channel # From Store to SX
+# Menu Channel # From cloud to SX
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('accounts','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('accounts','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_item_attributes','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('menu_item_attributes','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_item_options','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('menu_item_options','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menus','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('menus','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_categories','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('menu_categories','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_items','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('menu_items','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_item_instances','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('menu_item_instances','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('item_sets','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('item_sets','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_item_sets','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('menu_item_sets','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_instance_item_sets','store_2_sx', 100, current_timestamp, current_timestamp);
+	values('menu_instance_item_sets','cloud_2_sx', 100, current_timestamp, current_timestamp);
 
-# Menu Channel # From SX to Store
+# Menu Channel # From SX to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('accounts','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('accounts','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_item_attributes','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('menu_item_attributes','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_item_options','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('menu_item_options','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menus','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('menus','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_categories','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('menu_categories','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_items','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('menu_items','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_item_instances','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('menu_item_instances','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('item_sets','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('item_sets','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_item_sets','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('menu_item_sets','sx_2_cloud', 100, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('menu_instance_item_sets','sx_2_store', 100, current_timestamp, current_timestamp);
+	values('menu_instance_item_sets','sx_2_cloud', 100, current_timestamp, current_timestamp);
 #End Menu Channel
 
-# Order Channel # From Store to Sx
+# Order Channel # From cloud to Sx
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('orders','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('orders','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('order_items','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('order_items','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('bookings','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('bookings','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('booking_orders','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('booking_orders','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
-# Order Channel # From SX to Store
+# Order Channel # From SX to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('orders','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('orders','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('order_items','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('order_items','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('bookings','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('bookings','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('booking_orders','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('booking_orders','sx_2_cloud', 200, current_timestamp, current_timestamp);
 # End Order Channel 
 
-# Sale Channel # From Store to Sx
+# Sale Channel # From cloud to Sx
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sales','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('sales','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_items','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('sale_items','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_audits','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('sale_audits','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_orders','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('sale_orders','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_payments','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('sale_payments','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_taxes','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('sale_taxes','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('payment_journals','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('payment_journals','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('shift_sales','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('shift_sales','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('stock_check_items','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('stock_check_items','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('stock_checks','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('stock_checks','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('stock_journals','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('stock_journals','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('surveys','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('surveys','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
-# Sale Channel # From SX to Store
+# Sale Channel # From SX to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sales','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('sales','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_items','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('sale_items','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_audits','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('sale_audits','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_orders','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('sale_orders','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_payments','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('sale_payments','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('sale_taxes','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('sale_taxes','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('payment_journals','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('payment_journals','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('shift_sales','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('shift_sales','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('stock_check_items','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('stock_check_items','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('stock_checks','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('stock_checks','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('stock_journals','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('stock_journals','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('surveys','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('surveys','sx_2_cloud', 200, current_timestamp, current_timestamp);
 # End Sale Channel 
 
-# Oqs Channel # From Store to Sx
+# Oqs Channel # From cloud to Sx
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('assigned_order_items','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('assigned_order_items','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('cashier_terminals','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('cashier_terminals','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('cashier_terminal_by_zones','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('cashier_terminal_by_zones','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('cashier_login_logs','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('cashier_login_logs','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('order_queue_process_by_zones','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('order_queue_process_by_zones','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('order_queue_stations','store_2_sx', 200, current_timestamp, current_timestamp);
+	values('order_queue_stations','cloud_2_sx', 200, current_timestamp, current_timestamp);
 
-# Oqs Channel # From SX to Store
+# Oqs Channel # From SX to cloud
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('assigned_order_items','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('assigned_order_items','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('cashier_terminals','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('cashier_terminals','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('cashier_terminal_by_zones','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('cashier_terminal_by_zones','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('cashier_login_logs','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('cashier_login_logs','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('order_queue_process_by_zones','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('order_queue_process_by_zones','sx_2_cloud', 200, current_timestamp, current_timestamp);
 
 	insert into sym_trigger_router 
 	(trigger_id,router_id,initial_load_order,last_update_time,create_time)
-	values('order_queue_stations','sx_2_store', 200, current_timestamp, current_timestamp);
+	values('order_queue_stations','sx_2_cloud', 200, current_timestamp, current_timestamp);
 # End Oqs Channel
 
 
 insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) 
  values ('000','sx','000',1,null,null,null,null,null,current_timestamp,null,0,0,'000');
 insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) 
- values ('001','store','001',1,null,null,null,null,null,current_timestamp,null,0,0,'000');
+ values ('001','cloud','001',1,null,null,null,null,null,current_timestamp,null,0,0,'000');
 -- insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) 
---  values ('002','store','002',1,null,null,null,null,null,current_timestamp,null,0,0,'000');
+--  values ('002','cloud','002',1,null,null,null,null,null,current_timestamp,null,0,0,'000');
 
 
 insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) 
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 3071132b..126d8db7 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -9,6 +9,7 @@ namespace :clear do
     SaleOrder.delete_all
     SaleItem.delete_all
     Sale.delete_all
+    SaleTax.delete_all
     SaleAudit.delete_all
     SalePayment.delete_all
     ShiftSale.delete_all
diff --git a/spec/jobs/call_waiter_job_spec.rb b/spec/jobs/call_waiter_job_spec.rb
new file mode 100644
index 00000000..d0699adb
--- /dev/null
+++ b/spec/jobs/call_waiter_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CallWaiterJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/jobs/check_in_booking_job_spec.rb b/spec/jobs/check_in_booking_job_spec.rb
new file mode 100644
index 00000000..04d03684
--- /dev/null
+++ b/spec/jobs/check_in_booking_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CheckInBookingJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/jobs/checkin_job_spec.rb b/spec/jobs/checkin_job_spec.rb
new file mode 100644
index 00000000..80f4ac0e
--- /dev/null
+++ b/spec/jobs/checkin_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CheckinJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end