From 600a17b0f1a4212947547651220dea54155ee721 Mon Sep 17 00:00:00 2001
From: EikhantMon <eikhantmon@code2lab.com>
Date: Fri, 7 Sep 2018 13:40:25 +0630
Subject: [PATCH 01/66] login dashboard & origami css

---
 app/assets/stylesheets/login.scss          | 11 ++++++++++-
 app/assets/stylesheets/origami.scss        | 18 ++++++++++++++++++
 app/views/layouts/login_dashboard.html.erb |  6 +++---
 app/views/origami/payments/show.html.erb   |  4 ++--
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index a1058d25..2a7b0b16 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -82,19 +82,24 @@
 }
 
 .p-card{
-  margin: 20px 0;
+  margin: 20px -8px;
   text-align: center;
 }
 
 .p-name{
+  padding-left: 6px;
+  padding-right: 6px;
   padding-bottom: 20px;
   font-size: 14px;
+  weight : 30px;
+  height : 48px;
 }
 
 .style_image{
   height : 138px;
   padding : 20px 0 20px 0;
   width : 70%;
+  opacity: 0.7;
 }
 
 .style_icon{
@@ -108,4 +113,8 @@
   font-size: 21px;
   font-weight: bold;
   margin : 0 0 20px 0;
+}
+
+.box {
+  margin : 0 -60px 0 -60px;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 6d784645..dc60703c 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -524,4 +524,22 @@ nav.pagination .page a:hover,
 	background-color:#ffab51;
 	color:#fff;
 	
+}
+
+
+/*----chane font_size (Amount Due && Balance)----*/
+#balance{
+	height: 50%;
+	font-size: 20px;
+}
+
+.amount_balance{
+	height: 50%;
+	font-size: 20px;
+}
+
+
+#amount_due{
+	height: 50%;
+	font-size: 20px;
 }
\ No newline at end of file
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 10d9def1..e7027c16 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -72,7 +72,7 @@
                 </div>
             </div>
         </div>
-        <div class="row bg-white">   
+        <div class="row bg-white box">   
             <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
                 <div class="row justify-content-center form-group">                    
                     <input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID">
@@ -122,14 +122,14 @@
                     
                 </ul>  
 
-                <div class="tab-content" style="max-height:650px; overflow:auto">
+                <div class="tab-content" style="max-height:550px; overflow:auto">
 
                     <% @roles.each do |role| %>
                         <%if role != "administrator" %>
                             <div class="tab-pane"  id="<%=role%>" role="tabpanel" style="max-height:; overflow:auto">
                                 <% @employees.each do |employee| %>
                                     <%if employee.role == role %>
-                                        <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
+                                        <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
                                             <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                             </form>
                                             <%if employee.image_path.present? %>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 245467f9..c182e5a5 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -166,7 +166,7 @@
   <div class="card">
     <div class="card-header">
       <div class="row m-l-5 m-r-5">
-        <div class="col-md-8"><strong>Amount Due <% if !@sale_payment.nil? %>( Credit )<% end %></strong></div>
+        <div class="col-md-8"><strong class='amount_balance'>Amount Due <% if !@sale_payment.nil? %>( Credit )<% end %></strong></div>
         <div class="col-md-4">
           <strong>
             <span id="grand_total" class="hidden">
@@ -341,7 +341,7 @@
         </div>
 
         <div class="row m-l-5 m-r-5">
-          <div class="col-md-8"><strong>Balance</strong></div>
+          <div class="col-md-8"><strong class='amount_balance'>Balance</strong></div>
           <div class="col-md-4"><strong><span id='balance'><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></span></strong></div>
         </div>
         <!-- <br> -->

From b8680e8b6b4af065a81503875e81aafe1ad750b1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 10 Sep 2018 10:00:35 +0630
Subject: [PATCH 02/66] add oqs for movetable

---
 app/models/order_queue_station.rb     | 26 +++++++++++++-------------
 app/models/printer/receipt_printer.rb | 13 +++++++++++--
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index a275d420..6e347ada 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -238,7 +238,7 @@ class OrderQueueStation < ApplicationRecord
       AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
   
     else
-      move_print_pdf(change_to,current_user,table_id,order_items)
+      move_print_pdf(change_to,current_user,table_id,order_items,oqs)
     end
      
   end
@@ -281,12 +281,12 @@ class OrderQueueStation < ApplicationRecord
       assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
       AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
     else
-      move_print_pdf(change_to,current_user,table_id,assigned_items)
+      move_print_pdf(change_to,current_user,table_id,assigned_items,oqs)
     end
     
   end
 
-  def move_print_pdf(change_to,current_user,change_from,order_items)
+  def move_print_pdf(change_to,current_user,change_from,order_items,oqs)
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       # get printer info
       @from          = (DiningFacility.find(change_from)).name
@@ -296,18 +296,18 @@ class OrderQueueStation < ApplicationRecord
       @date          = DateTime.now
       @shop          = Shop.first
       unique_code    = "MoveTablePdf" 
-      pdf_no        = PrintSetting.where(:unique_code => unique_code).count
-      #print_settings = PrintSetting.find_by_unique_code(unique_code)
-      printer_array = []
-      printer_array = PrintSetting.where(:unique_code => unique_code)
+      # pdf_no         = PrintSetting.where(:unique_code => unique_code).count
+      print_settings = PrintSetting.find_by_unique_code(unique_code)
+      # printer_array = []
+      # printer_array = PrintSetting.where(:unique_code => unique_code)
 
-      for i in 0..pdf_no
-        if i != pdf_no
-          print_settings = printer_array[i]
+      # for i in 0..pdf_no
+      #   if i != pdf_no
+          # print_settings = printer_array[i]
           printer        = Printer::ReceiptPrinter.new(print_settings)  
-          printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items)
-        end  
-      end  
+          printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items,oqs)
+      #   end  
+      # end  
     end
   end
 end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 607232af..cb516be2 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -266,13 +266,22 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
   end
 
   #Move Table Print
-  def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by,order_items)
+  def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by,order_items,oqs)
     #Use CUPS service
     #Generate PDF
     #Print
+
     pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by,order_items)
     pdf.render_file "tmp/print_move_table.pdf"
-    self.print("tmp/print_move_table.pdf")
+
+    if oqs.print_copy
+      self.print("tmp/print_move_table.pdf",oqs.printer_name)
+    else
+      print_settings.print_copies = 1
+      print_settings.save!
+      #no print in cloud server
+      self.print("tmp/print_move_table.pdf", oqs.printer_name)
+    end
   end
 
   #Bill Receipt Print

From 968577434f950469347a428f3e68a386509276e0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 10 Sep 2018 10:05:38 +0630
Subject: [PATCH 03/66] update complete tab

---
 app/models/sale.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 779db759..645e52d1 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -2874,10 +2874,15 @@ end
                   .group("bookings.booking_id")
   end
   def self.completed_sale(type)
+    if type == "cashier"
+      type = "and orders.source = 'emenu' or orders.source = 'cashier'"
+    else
+      type = "and orders.source = '#{type}'"
+    end
     query = Sale.all
     query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
                  .joins("join orders as orders on orders.order_id = sale_orders.order_id")
-    query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' AND orders.source =? ","#{type}")
+    query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' #{type}")
     query = query.where("DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? ",DateTime.now.strftime('%Y-%m-%d'))
                   .group("sales.sale_id")
   end

From 6194c56786ce4f53df04073f7feafa240672d18b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 10 Sep 2018 14:14:02 +0630
Subject: [PATCH 04/66] order queue station

---
 app/models/order_queue_station.rb | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 6e347ada..cfa44968 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -47,7 +47,7 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                   if (order_item.qty > 0)
+                   if (order_item.qty > 0) && (pdf_status.nil?)
                     AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
                     oqs_order_items.push(order_item)
                    end
@@ -86,7 +86,7 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                  if (order_item.qty > 0)
+                  if (order_item.qty > 0) && (pdf_status.nil?)
                     AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
                     oqs_order_items.push(order_item)
                   end
@@ -233,14 +233,12 @@ class OrderQueueStation < ApplicationRecord
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
       order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
-
-      assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
-      AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
-  
     else
       move_print_pdf(change_to,current_user,table_id,order_items,oqs)
     end
-     
+    
+    assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
+    AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
   end
 
   #Print order_item in 1 slip per item
@@ -277,13 +275,12 @@ class OrderQueueStation < ApplicationRecord
           order_queue_printer.print_order_item(print_settings, oqs,order_item.order_id, order_item.order_items_id, print_status="" )
         end
       end
-      
-      assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
-      AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
     else
       move_print_pdf(change_to,current_user,table_id,assigned_items,oqs)
     end
     
+    assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
+    AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
   end
 
   def move_print_pdf(change_to,current_user,change_from,order_items,oqs)

From 430d5eaa7a1c5045b75670727aacd184c46b82b6 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 10 Sep 2018 14:19:20 +0630
Subject: [PATCH 05/66] update oqs update

---
 app/assets/javascripts/OQS.js          | 53 ++++++++++++++++++++++----
 app/controllers/oqs/home_controller.rb | 47 ++++++++++++++++++-----
 app/views/oqs/home/index.html.erb      | 18 ++++++++-
 3 files changed, 100 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index acca225a..ad121484 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -67,13 +67,15 @@ $(document).on('turbolinks:load', function() {
        	$('#table_id').val(table_id);
 
         oqs_id = $("#oqs_id").val();
+        status = $("#status").val();
+
     	if (table_id){
     		var table = table_id
     	}else{
     		var table = null
     	}
     	
-    	if (oqs_id > 0) {
+    	if (oqs_id > 0 || status != "All" || tabel != null) {
     	   $(".oqs_click").removeClass('oqs_active');
 	       $(".queue_station").removeClass('queue_station_box');
 	       $("#completed").addClass('hide');
@@ -84,7 +86,7 @@ $(document).on('turbolinks:load', function() {
 	        $("#oqs_active").attr('data-id',oqs_id);
 	       var url    = 'oqs/get_items/'+oqs_id;
 	       
-	       show_details(url,table);
+	       show_details(url,table,status);
     	}else{
     		$("#completed").removeClass('hide')
             $(".oqs_append").addClass('hide')
@@ -94,6 +96,7 @@ $(document).on('turbolinks:load', function() {
     // $(".oqs_click").on("click", function(){
     $(document).on('click', '.oqs_click', function(event){ 
     	oqs_id = $(this).val();
+    	status = $("#status").val();
     	var table_id = $('#table_id').val();
     	if (table_id){
     		var table = table_id
@@ -101,7 +104,7 @@ $(document).on('turbolinks:load', function() {
     		var table = null
     	}
     	
-    	if (oqs_id > 0) {
+    	if (oqs_id > 0 || status != "All" || tabel != null) {
     	   $(".oqs_click").removeClass('oqs_active');
 	       $(".queue_station").removeClass('queue_station_box');
 	       $("#completed").addClass('hide');
@@ -112,16 +115,44 @@ $(document).on('turbolinks:load', function() {
 	        $("#oqs_active").attr('data-id',oqs_id);
 	       var url    = 'oqs/get_items/'+oqs_id;
 	       
-	       show_details(url,table);
+	       show_details(url,table,status);
+    	}else{
+    		$("#completed").removeClass('hide')
+            $(".oqs_append").addClass('hide')
+    	}
+    }); //End Click
+
+    // $(".oqs_click").on("click", function(){
+    $(document).on('click', '.status_click', function(event){ 
+    	oqs_id = $("#oqs_id").val();
+    	status = $(this).val();
+    	var table_id = $('#table_id').val();
+    	if (table_id){
+    		var table = table_id
+    	}else{
+    		var table = null
+    	}
+
+	   if (oqs_id > 0 || status != "All" || tabel != null) {
+    	   $(".oqs_click").removeClass('oqs_active');
+	       $(".queue_station").removeClass('queue_station_box');
+	       $("#completed").addClass('hide');
+	       $(".oqs_append").removeClass('hide');
+	       $("#oqs_active").addClass('oqs_active');
+	       $(".queue_station").addClass('queue_station_box');
+	       // oqs_id = $(this).find(".oqs-id").text();
+	        $("#oqs_active").attr('data-id',oqs_id);
+	       var url    = 'oqs/get_items/'+oqs_id;
+	       
+	       show_details(url,table,status);
     	}else{
     		$("#completed").removeClass('hide')
             $(".oqs_append").addClass('hide')
     	}
-       
 
     }); //End Click
  
-	function show_details(url,table_id){  
+	function show_details(url,table_id,status){  
 	     var oqs_append = $('.oqs_append');
 	     oqs_append.empty();
 	     var filter = $('.filter').text();
@@ -130,7 +161,7 @@ $(document).on('turbolinks:load', function() {
 	    $.ajax({      
 	      type: "GET",         
 	      url: url, 
-	      data: {'filter':filter,'table_id':table_id},
+	      data: {'filter':filter,'table_id':table_id,'status':status},
 	      dataType: "json",
 	      success: function(data) {
 	          for(var field in data) {
@@ -162,6 +193,10 @@ $(document).on('turbolinks:load', function() {
             		table_type = "No Table"
             		
             	}
+            	var delivery_status = ''
+            	if (data[field]["delivery_status"] == true) {
+				   delivery_status = "hidden"
+				}
 
 	            row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
@@ -191,9 +226,11 @@ $(document).on('turbolinks:load', function() {
 	                        +'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '
 	                    +'</div>'
 
-	                    +'<div class="card-footer">'
+	                    +'<div class="card-footer ">'
+	                      +'<span class="'+delivery_status+'">'
 	                        +'<button id="edit_'+ data[field]["assigned_order_item_id"] + '" data-no-turbolink="true" class="btn btn-warning order-item order-item-edit">EDIT</button>'
 	                        +' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+	                      +'</span>'
 	                    +'</div>'
 
 	                +'</div>'; 
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index be896f1e..576b1d54 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -13,7 +13,8 @@ class Oqs::HomeController < BaseOqsController
 
     @queue_stations = OrderQueueStation.active
    
-    @queue_completed_item = completed_order(@filter)
+    # @queue_completed_item = completed_order(@filter)
+    @queue_completed_item = all_order(@filter)
     if !@queue_completed_item.empty?
       @queue_completed_item.each do |queue_item|
         if !queue_item.set_menu_items.nil?
@@ -114,10 +115,10 @@ class Oqs::HomeController < BaseOqsController
     oqs_id = params[:id]
     filter = params[:filter]
     table_id = params[:table_id]
-    puts params
-    puts table_id
-    puts "sssssssssssss"
-    items  = queue_items_query(false,oqs_id,filter,table_id)
+    status = params[:status]
+
+    items  = queue_items_query(false,oqs_id,filter,table_id,status)
+
     if !items.empty?
       items.each do |item|
         if !item.set_menu_items.nil?
@@ -155,13 +156,20 @@ class Oqs::HomeController < BaseOqsController
 
 
   # Query for OQS with delivery status
-  def queue_items_query(status,oqs_id=nil,filter,table_id) 
+  def queue_items_query(status,oqs_id=nil,filter,table_id,delivery_status) 
     if oqs_id == nil
        oqs = ''
     else
       oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
     end
 
+    if delivery_status == "All"
+      queue_status = ''
+    elsif delivery_status == "Processed"
+      queue_status = "and assigned_order_items.delivery_status = true "
+    else
+      queue_status = "and assigned_order_items.delivery_status = false " 
+    end
     if !table_id.empty?
        tableId = table_id.to_a.map{|h| h}.join(",")
        table = "and df.id IN (#{tableId})"
@@ -175,7 +183,8 @@ class Oqs::HomeController < BaseOqsController
                               df.name as zone, df.type as table_type, 
                               odt.order_id, odt.item_code, odt.item_name, 
                               odt.price, odt.qty, odt.item_order_by, odt.options, odt.set_menu_items, 
-                              cus.name as customer_name, odt.created_at")
+                              cus.name as customer_name, odt.created_at,
+                              assigned_order_items.delivery_status")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
               left join orders as od ON od.order_id = assigned_order_items.order_id
@@ -184,7 +193,7 @@ class Oqs::HomeController < BaseOqsController
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} #{table}")
+    .where("assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} #{table} #{queue_status}")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
     .order("assigned_order_items.assigned_order_item_id desc")
     .group("odt.order_items_id")
@@ -193,7 +202,7 @@ class Oqs::HomeController < BaseOqsController
 
   # Completed Order
   def completed_order(filter)
-   query =  AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, odt.set_menu_items, cus.name as customer_name, odt.created_at")
+   query =  AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, odt.set_menu_items, cus.name as customer_name, odt.created_at,assigned_order_items.delivery_status")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
               left join orders as od ON od.order_id = assigned_order_items.order_id
@@ -212,6 +221,26 @@ class Oqs::HomeController < BaseOqsController
      # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
   end
 
+  # all Order
+  def all_order(filter)
+   query =  AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, odt.set_menu_items, cus.name as customer_name, odt.created_at,assigned_order_items.delivery_status")
+    .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
+              left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
+              left join orders as od ON od.order_id = assigned_order_items.order_id
+              left join order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
+              left join customers as cus ON cus.customer_id = od.customer_id
+              left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
+              left join bookings as bk on bk.booking_id = bo.booking_id
+              left join dining_facilities as df on df.id = bk.dining_facility_id")
+    .where("assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
+    query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
+                 .group("odt.order_items_id")
+                 .order("assigned_order_items.created_at")
+
+
+     # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
+  end
+
   # def queue_items_count_query(status,filter) 
   #   query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id")
   #   .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 88b660b4..d040c9d1 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -7,7 +7,7 @@
           <label class="label-align">Select Station</label>
           <span class="hidden" id="oqs_active"></span>
           <select class="form-control select oqs_click" name="oqs_id" id="oqs_id">
-            <option value="0"  data-id="0">Processed</option>
+            <option value="0"  data-id="0">All</option>
             <% @queue_stations.each do |qsi|  %>
               <% if qsi.is_active != false %>
                <% selected = ""%>
@@ -20,6 +20,16 @@
             <% end %> 
           </select>
         </div>
+
+        <div class="form-group col-lg-2 col-md-2 col-sm-2">
+          <label class="label-align">Select Status</label>
+          <span class="hidden" id="oqs_active"></span>
+          <select class="form-control select status_click" name="status" id="status">
+            <option value="All">All</option>
+            <option value="New">New</option>
+            <option value="Processed">Processed</option>
+          </select>
+        </div>
 <!-- 
         <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
         <span class="hidden" id="room_id"></span>
@@ -88,6 +98,12 @@
                     <p class="hidden order-customer"><%= qid.customer_name %></p>
                     <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>           
                   </div>
+                  <% if !qid.delivery_status %>
+                  <div class="card-footer">
+                    <button id="edit_<%= qid.assigned_order_item_id %>" data-no-turbolink="true" class="btn btn-warning order-item order-item-edit">EDIT</button>
+                     <button id="assigned_queue_<%= qid.assigned_order_item_id %>" class="btn btn-primary order-item order-complete">COMPLETE</button>
+                  </div>
+                  <%end%>
                </div> 
               <% end %>    
             </div>

From 8a2512e78de1fb918563bf6403f45155622efff9 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 10 Sep 2018 16:11:19 +0630
Subject: [PATCH 06/66] order queue station

---
 app/models/order_queue_station.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index cfa44968..42891015 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -47,8 +47,10 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                   if (order_item.qty > 0) && (pdf_status.nil?)
-                    AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                   if (order_item.qty > 0)
+                    if pdf_status.nil?
+                      AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                    end
                     oqs_order_items.push(order_item)
                    end
                 # end                                           
@@ -86,8 +88,10 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                  if (order_item.qty > 0) && (pdf_status.nil?)
-                    AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                  if (order_item.qty > 0)
+                    if pdf_status.nil?
+                      AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                    end
                     oqs_order_items.push(order_item)
                   end
                 # end                                           

From a42edf551943aaa143a00de9d31ddf49e02d47a3 Mon Sep 17 00:00:00 2001
From: EikhantMon <eikhantmon@code2lab.com>
Date: Mon, 10 Sep 2018 16:38:45 +0630
Subject: [PATCH 07/66] change dashboard login size

---
 app/assets/stylesheets/login.scss          | 2 +-
 app/views/layouts/_header.html.erb         | 6 ++++++
 app/views/layouts/login_dashboard.html.erb | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index 2a7b0b16..f156d4d3 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -96,7 +96,7 @@
 }
 
 .style_image{
-  height : 138px;
+  height : 137.5px;
   padding : 20px 0 20px 0;
   width : 70%;
   opacity: 0.7;
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d21b1743..934de4d0 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -59,6 +59,12 @@
                         </a>
                     </p>    
                 </li>
+                <!-- <li>
+                    <p class="waves-effect waves-block p-l-30 m-b-5">
+                           <i class="material-icons font-7 logout_icon shopinfo">add</i>
+                            <span class="font-15 shopinfo" >Team Viewer</span>
+                    </p>    
+                </li> -->
                 <% end %>
                 <li>
                     <!-- <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index e7027c16..f203bd44 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -122,7 +122,7 @@
                     
                 </ul>  
 
-                <div class="tab-content" style="max-height:550px; overflow:auto">
+                <div class="tab-content" style="max-height:650px; overflow:auto">
 
                     <% @roles.each do |role| %>
                         <%if role != "administrator" %>

From 8d1ca45f306b2e297edfc5d144551732886ca54b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 10 Sep 2018 18:39:10 +0630
Subject: [PATCH 08/66] update oqs

---
 app/assets/javascripts/OQS.js          | 11 ++--
 app/controllers/oqs/home_controller.rb | 11 ++--
 app/views/oqs/home/index.html.erb      | 77 +++++++++++---------------
 3 files changed, 44 insertions(+), 55 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index ad121484..f4d21724 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -69,13 +69,13 @@ $(document).on('turbolinks:load', function() {
         oqs_id = $("#oqs_id").val();
         status = $("#status").val();
 
-    	if (table_id){
+    	if (table_id.length>0){
     		var table = table_id
     	}else{
     		var table = null
     	}
     	
-    	if (oqs_id > 0 || status != "All" || tabel != null) {
+    	if (oqs_id > 0 || status != "All" || table != null) {
     	   $(".oqs_click").removeClass('oqs_active');
 	       $(".queue_station").removeClass('queue_station_box');
 	       $("#completed").addClass('hide');
@@ -85,7 +85,7 @@ $(document).on('turbolinks:load', function() {
 	       // oqs_id = $(this).find(".oqs-id").text();
 	        $("#oqs_active").attr('data-id',oqs_id);
 	       var url    = 'oqs/get_items/'+oqs_id;
-	       
+	       console.log(table)
 	       show_details(url,table,status);
     	}else{
     		$("#completed").removeClass('hide')
@@ -104,7 +104,7 @@ $(document).on('turbolinks:load', function() {
     		var table = null
     	}
     	
-    	if (oqs_id > 0 || status != "All" || tabel != null) {
+    	if (oqs_id > 0 || status != "All" || table_id != null) {
     	   $(".oqs_click").removeClass('oqs_active');
 	       $(".queue_station").removeClass('queue_station_box');
 	       $("#completed").addClass('hide');
@@ -133,7 +133,7 @@ $(document).on('turbolinks:load', function() {
     		var table = null
     	}
 
-	   if (oqs_id > 0 || status != "All" || tabel != null) {
+	   if (oqs_id > 0 || status != "All" || table != null) {
     	   $(".oqs_click").removeClass('oqs_active');
 	       $(".queue_station").removeClass('queue_station_box');
 	       $("#completed").addClass('hide');
@@ -153,6 +153,7 @@ $(document).on('turbolinks:load', function() {
     }); //End Click
  
 	function show_details(url,table_id,status){  
+		console.log(table_id)
 	     var oqs_append = $('.oqs_append');
 	     oqs_append.empty();
 	     var filter = $('.filter').text();
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 576b1d54..654dcaff 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -118,7 +118,8 @@ class Oqs::HomeController < BaseOqsController
     status = params[:status]
 
     items  = queue_items_query(false,oqs_id,filter,table_id,status)
-
+puts "items0"
+puts items.to_json
     if !items.empty?
       items.each do |item|
         if !item.set_menu_items.nil?
@@ -157,10 +158,10 @@ class Oqs::HomeController < BaseOqsController
 
   # Query for OQS with delivery status
   def queue_items_query(status,oqs_id=nil,filter,table_id,delivery_status) 
-    if oqs_id == nil
-       oqs = ''
+    if oqs_id != "0"   
+        oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
     else
-      oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
+       oqs = ''
     end
 
     if delivery_status == "All"
@@ -176,7 +177,7 @@ class Oqs::HomeController < BaseOqsController
     else
      table = ''
     end
-
+    
     query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, 
                               oqs.id as station_id, oqs.station_name, 
                               oqs.is_active, oqpz.zone_id, 
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index d040c9d1..7f2ea4e1 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -1,53 +1,40 @@
 <!-- Column One -->
 <div class="row clearfix" style="">
-  <div class="col-lg-8 col-md-8 col-sm-8">  
-    <div class="body p-l-10">
-      <div class="row clearfix">
-        <div class="form-group col-lg-2 col-md-2 col-sm-2">
-          <label class="label-align">Select Station</label>
-          <span class="hidden" id="oqs_active"></span>
-          <select class="form-control select oqs_click" name="oqs_id" id="oqs_id">
-            <option value="0"  data-id="0">All</option>
-            <% @queue_stations.each do |qsi|  %>
-              <% if qsi.is_active != false %>
-               <% selected = ""%>
-              <%if qsi.id == current_user.order_queue_station_id %>
-                  <% selected = 'selected=""'%>
-              <%end%>
-              <p class="hidden oqs-id"><%= qsi.id  %></p>
-              <option value="<%= qsi.id %>"  data-id="<%= qsi.id %>" <%=selected%> style="padding:5px 20px !important;"> <%= qsi.station_name %></option>
-              <% end %>
-            <% end %> 
-          </select>
-        </div>
-
-        <div class="form-group col-lg-2 col-md-2 col-sm-2">
-          <label class="label-align">Select Status</label>
-          <span class="hidden" id="oqs_active"></span>
-          <select class="form-control select status_click" name="status" id="status">
-            <option value="All">All</option>
-            <option value="New">New</option>
-            <option value="Processed">Processed</option>
-          </select>
-        </div>
-<!-- 
-        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
-        <span class="hidden" id="room_id"></span>
-          <select class="form-control select rooms" name="table_id" id="rooms">
-            <option value="">Select Room</option>
-            <% @rooms.each do |table|  %>
-              
-              <option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
-              
-            <% end %> 
-          </select>
-        </div> -->
-      </div>
-    </div>
-    
+  <div class="col-lg-8 col-md-8 col-sm-8"> 
     <p class="hidden filter"><%= @filter %></p>
     <div class="card">
       <div class="card-block">
+        <div class="body p-l-10">
+          <div class="row clearfix">
+            <div class="form-group col-lg-4 col-md-4 col-sm-4">
+              <label class="label-align">Select Station</label>
+              <span class="hidden" id="oqs_active"></span>
+              <select class="form-control select oqs_click" name="oqs_id" id="oqs_id">
+                <option value="0"  data-id="0">All</option>
+                <% @queue_stations.each do |qsi|  %>
+                  <% if qsi.is_active != false %>
+                   <% selected = ""%>
+                  <%if qsi.id == current_user.order_queue_station_id %>
+                      <% selected = 'selected=""'%>
+                  <%end%>
+                  <p class="hidden oqs-id"><%= qsi.id  %></p>
+                  <option value="<%= qsi.id %>"  data-id="<%= qsi.id %>" <%=selected%> style="padding:5px 20px !important;"> <%= qsi.station_name %></option>
+                  <% end %>
+                <% end %> 
+              </select>
+            </div>
+
+            <div class="form-group col-lg-4 col-md-4 col-sm-4">
+              <label class="label-align">Select Status</label>
+              <span class="hidden" id="oqs_active"></span>
+              <select class="form-control select status_click" name="status" id="status">
+                <option value="All">All</option>
+                <option value="New">New</option>
+                <option value="Processed">Processed</option>
+              </select>
+            </div>
+          </div>
+        </div>
         <div class="tab-content" id="custom-slimscroll" style="">
           <div class="tab-pane in active" id="completed" role="tabpanel">
             <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;column-count: ;">

From d7de89632fa50fc84eb13ad84c4dab93b2bfd79d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 11 Sep 2018 11:56:18 +0630
Subject: [PATCH 09/66] order reservation action times

---
 app/assets/javascripts/order_reservation.js   | 32 +++++++++++++++++++
 app/models/order_reservation.rb               | 27 +++++++++++++---
 .../order_reservation/get_order.json.jbuilder |  2 +-
 .../origami/order_reservation/index.html.erb  | 10 +++---
 4 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index bffd65fb..00d04f89 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -8,6 +8,9 @@ $(function() {
   $(".tbl_customer").hide();
   $(".order_close_cashier").hide();
   $(".order_payment_type").hide();
+  $(".accepted_time").hide();
+  $(".kitchen_time").hide();
+  $(".ready_time").hide();
   $(function() { 
     $('.first-1').click();
   });
@@ -290,7 +293,36 @@ function show_order_detail(url,sr_no){
       var delivery = data["delivery"];
       var items    = data["order_items"];
       var item_list = $('.summary-items');
+      var action_times = "";
+      $("#accepted_time").html("");
+      $("#send_kitchen_time").html("");
+      $("#ready_delivery_time").html("");
+      if((data["action_times"]!=undefined) && (data["action_times"]!=null)){
+        action_times = JSON.parse(data["action_times"]);
+        if((action_times.accepted_time!=undefined) && (action_times.accepted_time!="")){
+          $(".accepted_time").show();
+          var acceptedDate = new Date(action_times.accepted_time);
+          var acceptedTime = timeFormat(acceptedDate);
+          var accepted_time = getOrderMonth(acceptedDate.getMonth()) +' '+ (acceptedDate.getDate() >= 10? acceptedDate.getDate() : '0' + acceptedDate.getDate()) +', '+acceptedDate.getFullYear()+'('+getOrderDay(acceptedDate.getDay())+')'+' '+acceptedTime;
+          $("#accepted_time").html(accepted_time);
+        }
+        if((action_times.kitchen_time!=undefined) && (action_times.kitchen_time!="")){
+          $(".kitchen_time").show();
+          var kitchenDate = new Date(action_times.kitchen_time);
+          var kitchenTime = timeFormat(kitchenDate);
+          var kitchen_time = getOrderMonth(kitchenDate.getMonth()) +' '+ (kitchenDate.getDate() >= 10? kitchenDate.getDate() : '0' + kitchenDate.getDate()) +', '+kitchenDate.getFullYear()+'('+getOrderDay(kitchenDate.getDay())+')'+' '+kitchenTime;
+          $("#send_kitchen_time").html(kitchen_time);
+        }
 
+        if((action_times.ready_time!=undefined) && (action_times.ready_time!="")){
+          $(".ready_time").show();
+          var readyDate = new Date(action_times.ready_time);
+          var readyTime = timeFormat(readyDate);
+          var ready_time = getOrderMonth(readyDate.getMonth()) +' '+ (readyDate.getDate() >= 10? readyDate.getDate() : '0' + readyDate.getDate()) +', '+readyDate.getFullYear()+'('+getOrderDay(readyDate.getDay())+')'+' '+readyTime;
+          $("#ready_delivery_time").html(ready_time);
+        }
+      }
+      
       var newDate = new Date(data.requested_time);
       var time = timeFormat(newDate);
       // var requested_date = newDate.getFullYear() + '-' + (newDate.getMonth() >= 10? newDate.getMonth() : '0' + (newDate.getMonth() + 1)) +'-'+ (newDate.getDate() >= 10? newDate.getDate() : '0' + newDate.getDate()) +' '+time;
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 43d0145e..2eceb8de 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -11,7 +11,7 @@ class OrderReservation < ApplicationRecord
 	scope :latest_order, -> { order("order_reservation_id desc, created_at desc") }
 
 	SEND_TO_KITCHEN = "send_to_kitchen"
-	READY_TO_DELIVERY = "ready_to_deliver"
+	READY_TO_DELIVERY = "ready_to_delivery"
 	DELIVERED = "delivered"
 	COMPLETED = "completed"
 
@@ -134,7 +134,7 @@ class OrderReservation < ApplicationRecord
 
           #order status send to doemal
           callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN)
-          #order reservation status updated
+          # order reservation status updated
           update_order_reservation(order.id, @sale.sale_id, SEND_TO_KITCHEN)
 
           result = {:status=> @status, :data => @sale, :message => "send to kitchen" }
@@ -237,6 +237,7 @@ class OrderReservation < ApplicationRecord
 
     def self.update_order_reservation(id, sale_id, status, expected_waiting_time=nil, remark=nil, access_code=nil, current_user=nil)
     	order_reservation  = OrderReservation.find(id)
+    	action_times = {}
     	if sale_id.present?
     		order_reservation.sale_id = sale_id
     	end
@@ -252,11 +253,27 @@ class OrderReservation < ApplicationRecord
     	if status == "delivered"
     		order_reservation.payment_status = "paid"
     	end
+    	if status == "accepted"
+    		action_times = {"accepted_time" => DateTime.now.utc, "kitchen_time" => "", "ready_time" => ""}
+    		order_reservation.action_times = action_times.to_json
+    	elsif status == SEND_TO_KITCHEN
+    		if !order_reservation.action_times.nil?
+    			action_data = JSON.parse(order_reservation.action_times)
+    			action_data["kitchen_time"] = DateTime.now.utc
+    			order_reservation.action_times = action_data.to_json
+    		end
+    	elsif status == READY_TO_DELIVERY
+    		if !order_reservation.action_times.nil?
+    			action_data = JSON.parse(order_reservation.action_times)
+    			action_data["ready_time"] = DateTime.now.utc
+    			order_reservation.action_times = action_data.to_json
+    		end
+    	end
     	order_reservation.save
 
-    	# if !order_reservation.sale_id.nil? && status == "rejected"
-    	# 	void_doemal_payment(order_reservation.sale_id, remark, access_code, current_user)
-    	# end
+    	if !order_reservation.sale_id.nil? && status == "rejected"
+    		void_doemal_payment(order_reservation.sale_id, remark, access_code, current_user)
+    	end
     end
 
     def self.void_doemal_payment(sale_id, remark, access_code, current_user)
diff --git a/app/views/origami/order_reservation/get_order.json.jbuilder b/app/views/origami/order_reservation/get_order.json.jbuilder
index 9ab022ed..3217dc5c 100644
--- a/app/views/origami/order_reservation/get_order.json.jbuilder
+++ b/app/views/origami/order_reservation/get_order.json.jbuilder
@@ -4,7 +4,7 @@ if @order
 						:requested_time,:pickup_time,:expected_waiting_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type,
 						:payment_status,:payment_ref,:taxes,:total_amount,:total_tax,
 						:discount_amount,:convenience_charge,:grand_total,:status,:order_remark,
-						:remark,:sale_id)
+						:remark,:sale_id,:action_times)
 	@delivery = Delivery.find_by_order_reservation_id(@order.order_reservation_id)
 	if @delivery
 	    json.delivery do |json|
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index 1d7f5615..d4c4e9cf 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -468,26 +468,26 @@
                 </tr>
               </tbody>
           </table>
-          <!-- <table class="table">
+          <table class="table">
             <tr>
-              <td colspan="2" class="body-td align-left">
+              <td colspan="2" class="body-td align-left accepted_time">
                  <span class="font-13">ACCEPTED</span><br>
                  <b id="accepted_time">Sept 06, 2018(Weds) 10:00 AM</b>
               </td>
             </tr>
             <tr>
-              <td colspan="2" class="body-td align-left">
+              <td colspan="2" class="body-td align-left kitchen_time">
                  <span class="font-13">SEND TO KITCHEN</span><br>
                  <b id="send_kitchen_time">Sept 06, 2018(Weds) 11:00 AM</b>
               </td>
             </tr>
             <tr>
-              <td colspan="2" class="body-td align-left">
+              <td colspan="2" class="body-td align-left ready_time">
                  <span class="font-13">READY TO DELIVERY</span><br>
                  <b id="ready_delivery_time">Sept 06, 2018(Weds) 12:00 PM</b>
               </td>
             </tr>
-          </table> -->
+          </table>
         </div>
 
         <div class="card-footer grand-card-footer">

From 70143033e751850e6d8be94474388346240677d2 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 11 Sep 2018 13:22:48 +0630
Subject: [PATCH 10/66] edit oqs data

---
 app/controllers/oqs/edit_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index c804d65a..acdef9f8 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -36,7 +36,7 @@ class Oqs::EditController < BaseOqsController
       order_item.remark = remarks
       order_item.save
 
-      if ENV["SERVER_MODE"] != "cloud" && order.source == 'cashier' #no print in cloud server
+      if ENV["SERVER_MODE"] != "cloud" #&& order.source == 'cashier' #no print in cloud server
         # print
         assigned_item = AssignedOrderItem.find_by_instance_code_and_order_id(order_item.item_instance_code, order_item.order_id)    
         assigned_items = nil

From 1dee84d733a0eb8c1423508c85c89d3055700009 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 11 Sep 2018 15:30:43 +0630
Subject: [PATCH 11/66] update oqs and add to extisting

---
 app/assets/javascripts/OQS.js          | 5 +++--
 app/controllers/oqs/home_controller.rb | 8 ++++----
 app/views/origami/home/show.html.erb   | 2 ++
 app/views/origami/rooms/show.html.erb  | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index f4d21724..183e7412 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -64,7 +64,8 @@ $(document).on('turbolinks:load', function() {
 		for (i = 0; i < list.length; i++) {
 		    table_id.push(list[i].value);
 		} 
-       	$('#table_id').val(table_id);
+		 console.log(table_id)
+       	$('#table').val(table_id);
 
         oqs_id = $("#oqs_id").val();
         status = $("#status").val();
@@ -85,7 +86,7 @@ $(document).on('turbolinks:load', function() {
 	       // oqs_id = $(this).find(".oqs-id").text();
 	        $("#oqs_active").attr('data-id',oqs_id);
 	       var url    = 'oqs/get_items/'+oqs_id;
-	       console.log(table)
+	      
 	       show_details(url,table,status);
     	}else{
     		$("#completed").removeClass('hide')
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 654dcaff..aa06d103 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -177,7 +177,7 @@ puts items.to_json
     else
      table = ''
     end
-    
+
     query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, 
                               oqs.id as station_id, oqs.station_name, 
                               oqs.is_active, oqpz.zone_id, 
@@ -215,8 +215,8 @@ puts items.to_json
     .where("assigned_order_items.delivery_status = true  AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
                  .group("assigned_order_items.order_id")
-                 .limit(20)
-                 .order("assigned_order_items.created_at")
+                 .limit(50)
+                 .order("assigned_order_items.created_at desc")
 
 
      # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
@@ -236,7 +236,7 @@ puts items.to_json
     .where("assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
                  .group("odt.order_items_id")
-                 .order("assigned_order_items.created_at")
+                 .order("assigned_order_items.created_at desc")
 
 
      # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index aef82ecf..2ed70673 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -1057,6 +1057,7 @@
     $('#request_bills').click(function () {
       var order_id = $('#save_order_id').attr('data-order');
       var ajax_url = "/origami/" + order_id + "/request_bills";
+      localStorage.setItem("tax_type", "all");
       if(order_id!=undefined && order_id!=null && order_id!=""){
         if($('#request_bills').is(":visible")) {
           $('#request_bills').prop("disabled",true);
@@ -1104,6 +1105,7 @@
         var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
         var ajax_url = "/origami/sale/append_order";
         var tax_type = localStorage.getItem("tax_type");
+        console.log(tax_type)
         $.ajax({
             type: "POST",
             url: ajax_url,
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 59546349..a1f4cb80 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -1124,6 +1124,7 @@ $('#request_bills').click(function() {
     if($('#request_bills').is(":visible")) {
       $('#request_bills').prop("disabled",true);
     }
+    localStorage.setItem("tax_type", "all");
     $.ajax({
         type: "GET",
         url: ajax_url,

From 49268a9fca28abac9d83ee41bfe92073ea668477 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 11 Sep 2018 16:33:15 +0630
Subject: [PATCH 12/66] sale_id not tally for show details

---
 app/views/origami/home/show.html.erb           | 12 ++++++------
 app/views/origami/rooms/show.html.erb          |  8 ++++----
 app/views/origami/table_invoices/show.html.erb |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index aef82ecf..0cae743a 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -1161,7 +1161,7 @@
 
     $('#edit').on('click', function () {
         var dining_id = "<%= @dining.id %>"
-        var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+        var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>"
         if ($(this).attr('active')=== "true") {
            window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
         }else{
@@ -1172,7 +1172,7 @@
 
     $('#commissions').on('click', function () {
         var dining_id = "<%= @dining.id %>"
-        var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+        var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>"
         window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
     });
 
@@ -1195,7 +1195,7 @@
             closeOnConfirm: false
         }, function (isConfirm) {
           if (isConfirm) {
-            var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+            var sale_id = $("#sale_id").val();//"<%= @obj_sale.sale_id rescue "" %>"
             var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
             var remark  = $("#remark").val();
 
@@ -1303,7 +1303,7 @@
             closeOnConfirm: false
         }, function (isConfirm) {
           if (isConfirm) {
-            var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+            var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>"
             var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
             $.ajax({
                 type: 'POST',
@@ -1334,7 +1334,7 @@
               createAccessCode(code);
                if (type == "edit") {
                 var dining_id = "<%= @dining.id rescue "" %> ";
-                  var sale_id   = "<%= @obj_sale.sale_id rescue "" %>";
+                  var sale_id   = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>";
                   window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
                }else if(type == "void"){
                  $('#AccessCodeModal').modal('hide');
@@ -1369,7 +1369,7 @@
     var cashier_type = 'cashier';
     var sale_id = $('#sale_id').text();
     var dining_id = "<%= @dining.id rescue "" %> ";
-    var sale_id   = "<%= @obj_sale.sale_id rescue "" %>";
+    var sale_id   = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>";
     localStorage.removeItem("tax_type");
     swal({
       title: "Alert",
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 59546349..0bea82d4 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -1259,7 +1259,7 @@ $('#add_invoice').on('click',function(){
 
   $('#edit').on('click',function(){
     var dining_id = "<%= @room.id %>"
-    var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+    var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>"
     window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/cashier/edit";
   });
 
@@ -1318,7 +1318,7 @@ $('#add_invoice').on('click',function(){
 
   $('#commissions').on('click', function () {
         var dining_id = "<%= @room.id %>"
-        var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+        var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>"
         window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
     });
 
@@ -1383,7 +1383,7 @@ $('#add_invoice').on('click',function(){
             closeOnConfirm: false
         }, function (isConfirm) {
           if (isConfirm) {
-            var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+            var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>"
             var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
             $.ajax({
                 type: 'POST',
@@ -1420,7 +1420,7 @@ $('#add_invoice').on('click',function(){
               createAccessCode(code);
                if (type == "edit") {
                 var dining_id = "<%= @room.id rescue ""%>";
-                  var sale_id   = "<%= @obj_sale.sale_id rescue "" %>";
+                  var sale_id   = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>";
                   window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/cashier/edit";
                }else if(type == "void"){
                  $('#AccessCodeModal').modal('hide');
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index d16f9581..a95c5398 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -80,7 +80,7 @@
                     count += 1
                   sub_total = sub_total + sale_item.price
                %>
-               <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
+               <input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
                <%
                # Can't check for discount
                 # unless sale_item.price == 0

From b1480a506659c443fa98f2e94b8956a972e0f5c7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 12 Sep 2018 17:54:04 +0630
Subject: [PATCH 13/66] update payment link with payment method

---
 app/controllers/origami/dinga_controller.rb   | 11 ++++++-----
 app/controllers/origami/voucher_controller.rb | 13 +++++++------
 app/models/sale_payment.rb                    | 15 ++++++++-------
 app/views/origami/home/show.html.erb          |  6 ++++--
 app/views/origami/rooms/show.html.erb         |  5 ++++-
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
index be35a5c1..55705fce 100644
--- a/app/controllers/origami/dinga_controller.rb
+++ b/app/controllers/origami/dinga_controller.rb
@@ -35,12 +35,13 @@ class Origami::DingaController < BaseOrigamiController
               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
+                # payment_data =MembershipAction.find_by_membership_type("get_account_balance")
+                 payment_data = PaymentMethodSetting.find_by_payment_method("DINGA")
+                if payment_data.gateway_url
                  @campaign_type_id = nil
-                 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
+                 url = membership_setting.gateway_url.to_s + payment_data.gateway_url.to_s
+                 merchant_uid= payment_data.merchant_account_id
+                 auth_token = payment_data.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"]
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index 74b35b3c..515bf3a1 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -37,12 +37,13 @@ class Origami::VoucherController < BaseOrigamiController
         membership_id = customer_data.membership_id
         membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
         if membership_setting.gateway_url
-          member_actions =MembershipAction.find_by_membership_type("get_account_balance") #need to modify here
-          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
+         # payment_data =MembershipAction.find_by_membership_type("get_account_balance") #need to modify here
+         payment_data = PaymentMethodSetting.find_by_payment_method("Voucher")
+          if payment_data.gateway_url
+            campaign_type_id = payment_data.additional_parameters["campaign_type_id"]
+            url = membership_setting.gateway_url.to_s + payment_data.gateway_url.to_s
+            merchant_uid= payment_data.merchant_account_id
+            auth_token = payment_data.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
             # app_token: token,membership_id:membership_id,
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 97ee07a7..43923134 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -169,14 +169,15 @@ class SalePayment < ApplicationRecord
   end
 
   def self.redeem(paypar_url,token,membership_id,received_amount,sale_id)
-      membership_actions_data = MembershipAction.find_by_membership_type("redeem");
+       # membership_actions_data = MembershipAction.find_by_membership_type("redeem");
+        membership_actions_data = PaymentMethodSetting.find_by_payment_method("Redeem")
 
       if !membership_actions_data.nil?
 
         url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
         merchant_uid = membership_actions_data.merchant_account_id
         auth_token = membership_actions_data.auth_token
-        campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"]
+        campaign_type_id = membership_actions_data.additional_parameters["campaign_type_id"]
         sale_data = Sale.find_by_sale_id(sale_id)
 
         if sale_data
@@ -227,8 +228,9 @@ class SalePayment < ApplicationRecord
 
   end
 
-  def self.create_payment(paypar_url,token,membership_id,received_amount,sale_id)
-      membership_actions_data = MembershipAction.find_by_membership_type("create_payment");
+  def self.create_payment(paypar_url,payment_type,membership_id,received_amount,sale_id)
+      # membership_actions_data = MembershipAction.find_by_membership_type("create_payment");
+      membership_actions_data = PaymentMethodSetting.find_by_payment_method(payment_type)
       sale_data = Sale.find_by_sale_id(sale_id)
       customer_data = Customer.find_by_customer_id(sale_data.customer_id)
       if !membership_actions_data.nil?
@@ -236,7 +238,6 @@ class SalePayment < ApplicationRecord
         url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
         merchant_uid = membership_actions_data.merchant_account_id
         auth_token = membership_actions_data.auth_token
-        
 
         if sale_data
           others = 0
@@ -457,7 +458,7 @@ class SalePayment < ApplicationRecord
     #   account_no  = customer_data.membership_id
     # end
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id)
+    membership_data = SalePayment.create_payment(membership_setting.gateway_url,"PAYMAL",account_no,self.received_amount,self.sale.sale_id)
 
      #record an payment in sale-audit
       remark = "#{membership_data} PayMal Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
@@ -507,7 +508,7 @@ class SalePayment < ApplicationRecord
     # end
 
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id)
+    membership_data = SalePayment.create_payment(membership_setting.gateway_url,"DINGA",account_no,self.received_amount,self.sale.sale_id)
 
      #record an payment in sale-audit
       remark = "#{membership_data} Dinga Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 24d00575..98e4f6f5 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -359,6 +359,7 @@
               <tr>
                 <td class="charges-name"><strong>
                   <% if !@sale_taxes.empty? %>
+                  <input type="hidden" name="" id="check_tax" value="all">
                   Tax:
                   (<% @i = 0
                    @sale_taxes.each do |ct| %>
@@ -368,6 +369,7 @@
                      <%end%>
                     <%end %>)
                   <% else %>
+                  <input type="hidden" name="" id="check_tax" value="">
                     No Tax
                   <% end %></strong><br>
                   <%if !@webview && @changable_tax %>
@@ -1104,8 +1106,8 @@
         var dining_id = "<%= @dining.id %>";
         var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
         var ajax_url = "/origami/sale/append_order";
-        var tax_type = localStorage.getItem("tax_type");
-        console.log(tax_type)
+        // var tax_type = localStorage.getItem("tax_type");
+        var tax_type = $("#check_tax").val();
         $.ajax({
             type: "POST",
             url: ajax_url,
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 2af644e6..918758e4 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -393,6 +393,7 @@
              <tr>
                <td class="charges-name"><strong>
                <% if !@sale_taxes.empty? %>
+               <input type="hidden" name="" id="check_tax" value="all">
                 Tax:
                 (<% @i = 0
                  @sale_taxes.each do |ct| %>
@@ -402,6 +403,7 @@
                    <%end%>
                   <%end %>)
                 <% else %>
+                <input type="hidden" name="" id="check_tax" value="">
                   No Tax
                 <% end %></strong><br>
                 <%if !@webview && @changable_tax %>
@@ -1168,7 +1170,8 @@ $('#add_invoice').on('click',function(){
   var dining_id = "<%= @room.id %>"
   var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
   var ajax_url = "/origami/sale/append_order";
-  var tax_type = localStorage.getItem("tax_type");
+  // var tax_type = localStorage.getItem("tax_type");
+  var tax_type = $("#check_tax").val();
   $.ajax({
     type: "POST",
       url: ajax_url,

From 57adb091624b6a1e9c9574a77a1a068ae4f334dd Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 13 Sep 2018 11:58:57 +0630
Subject: [PATCH 14/66] change customer UI and header css

---
 app/assets/stylesheets/CRM.scss             | 113 +++-
 app/assets/stylesheets/origami.scss         | 113 +++-
 app/assets/stylesheets/reset.css            |   4 +-
 app/controllers/crm/customers_controller.rb |   4 +
 app/models/sale_payment.rb                  |   6 +-
 app/views/crm/customers/_new_form.html.erb  | 360 +++++++------
 app/views/crm/customers/index.html.erb      | 256 +++++----
 app/views/crm/customers/show.html.erb       | 117 ++--
 app/views/origami/customers/index.html.erb  | 564 ++++++++++++--------
 9 files changed, 995 insertions(+), 542 deletions(-)

diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss
index 5bfab409..de416831 100755
--- a/app/assets/stylesheets/CRM.scss
+++ b/app/assets/stylesheets/CRM.scss
@@ -157,4 +157,115 @@ nav.pagination .page a:hover,
 i.logout_icon{
   position: relative;
   top: 5px;
-}
\ No newline at end of file
+}
+
+/*customer modal UI */
+  .wizard {
+      background: #f1f1f1;
+      padding: 10px;
+  }
+  .wizard .nav-tabs {
+      position: relative;
+      border: 0px;
+  }
+  .wizard > div.wizard-inner {
+      position: relative;
+      margin: 0 0 0 145px !important;
+  }
+  .connecting-line{
+      height:12px;
+      background: #e0e0e0;
+      position: absolute;
+      width: 105%;
+      margin: 0 auto;
+      left: 0;
+      right: 0;
+      top:38%;
+      z-index: 1;
+      border-radius: 15px;
+  }
+  .active-line{
+      height:12px;
+      background: #e0e0e0;
+      position: absolute;
+      width: 5%;
+      margin: 0 auto;
+      left: 0;
+      right: 0;
+      top:61%;
+      z-index: 1;
+      border-radius: 15px !important;
+  }
+  .connecting-line a.active{
+      background-color: #2ED4E0;
+  }
+  .border-right{
+      border-radius: 15px 0 0 15px;
+  }
+  .border-left{
+      border-radius: 0;
+  }
+  .wizard .nav-tabs > li {
+    margin-bottom: -20px;
+  }
+  .wizard .nav-tabs > li > a.active > a, .wizard .nav-tabs > li > a.active > a:hover, .wizard .nav-tabs > li > a.active > a:focus {
+      cursor: default;
+      border: 0;
+      color:#2ED4E0;
+      border-bottom-color: transparent;
+  }
+  .nav-tabs li p{
+      padding-top:40px;
+      font-size: 14px;
+      text-align: center;
+  }
+  .list-inline{
+      text-align: center;
+  }
+  span.round-tab {
+      width: 28px;
+      height: 28px;
+      line-height: 28px;
+      display: inline-block;
+      border-radius: 100px;
+      background:#DFE3E4;
+      border: 2px solid #fff;
+      z-index:1;
+      position:absolute;
+      text-align: center;
+      font-size: 16px;
+  }
+  .wizard li > a.active span.round-tab{
+      background:#2196F3;
+      color:white;
+      border: 1px solid #fff;
+  }
+  span.round-tab:hover{
+      color: white;
+      border: 1px solid #fff;
+      background-color:#2196F3; 
+  }
+  .wizard .nav-tabs > li {
+      width: 25%;
+  }
+  .wizard .nav-tabs > li a{
+      width: 28px;
+      height: 28px;
+      margin: 18px auto;
+      border-radius: 100%;
+      padding: 0;
+      color: #777;
+  }
+  .wizard .tab-pane {
+      position: relative;
+      padding-top: 5px;
+      border-top: 1px solid #fff;
+      margin-top: 20px;
+  }
+  .next-step:hover, .next-step, .prev-step:hover, .prev-step{
+      position: relative;
+      background-color: #2196F3;
+      font-size: 14px;
+      color: #FFFFFF;
+  }
+/*customer modal UI */
\ No newline at end of file
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index dc60703c..a879e4b4 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -542,4 +542,115 @@ nav.pagination .page a:hover,
 #amount_due{
 	height: 50%;
 	font-size: 20px;
-}
\ No newline at end of file
+}
+
+/*customer modal UI */
+  .wizard {
+      background: #f1f1f1;
+      padding: 10px;
+  }
+  .wizard .nav-tabs {
+      position: relative;
+      border: 0px;
+  }
+  .wizard > div.wizard-inner {
+      position: relative;
+      margin: 0 0 0 145px !important;
+  }
+  .connecting-line{
+      height:12px;
+      background: #e0e0e0;
+      position: absolute;
+      width: 110%;
+      margin: 0 auto;
+      left: 0;
+      right: 0;
+      top:38%;
+      z-index: 1;
+      border-radius: 15px;
+  }
+  .active-line{
+      height:12px;
+      background: #e0e0e0;
+      position: absolute;
+      width: 5%;
+      margin: 0 auto;
+      left: 0;
+      right: 0;
+      top:61%;
+      z-index: 1;
+      border-radius: 15px !important;
+  }
+  .connecting-line a.active{
+      background-color: #2ED4E0;
+  }
+  .border-right{
+      border-radius: 15px 0 0 15px;
+  }
+  .border-left{
+      border-radius: 0;
+  }
+  .wizard .nav-tabs > li {
+    margin-bottom: -20px;
+  }
+  .wizard .nav-tabs > li > a.active > a, .wizard .nav-tabs > li > a.active > a:hover, .wizard .nav-tabs > li > a.active > a:focus {
+      cursor: default;
+      border: 0;
+      color:#2ED4E0;
+      border-bottom-color: transparent;
+  }
+  .nav-tabs li p{
+      padding-top:40px;
+      font-size: 14px;
+      text-align: center;
+  }
+  .list-inline{
+      text-align: center;
+  }
+  span.round-tab {
+      width: 28px;
+      height: 28px;
+      line-height: 28px;
+      display: inline-block;
+      border-radius: 100px;
+      background:#DFE3E4;
+      border: 2px solid #fff;
+      z-index:1;
+      position:absolute;
+      text-align: center;
+      font-size: 16px;
+  }
+  .wizard li > a.active span.round-tab{
+      background:#2196F3;
+      color:white;
+      border: 1px solid #fff;
+  }
+  span.round-tab:hover{
+      color: white;
+      border: 1px solid #fff;
+      background-color:#2196F3; 
+  }
+  .wizard .nav-tabs > li {
+      width: 25%;
+  }
+  .wizard .nav-tabs > li a{
+      width: 28px;
+      height: 28px;
+      margin: 18px auto;
+      border-radius: 100%;
+      padding: 0;
+      color: #777;
+  }
+  .wizard .tab-pane {
+      position: relative;
+      padding-top: 5px;
+      border-top: 1px solid #fff;
+      margin-top: 20px;
+  }
+  .next-step:hover, .next-step, .prev-step:hover, .prev-step{
+      position: relative;
+      background-color: #2196F3;
+      font-size: 14px;
+      color: #FFFFFF;
+  }
+/*customer modal UI */
\ No newline at end of file
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index 1326a293..14a803e3 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -286,13 +286,13 @@ section.content {
 
 /* shop name margin */
 .shop-name-margin {
-  margin-left : 20%;
+  margin-left : 15%;
 }
 /* shop name margin */
 
 /* online order margin */
 .online-order-margin {
-  margin-left : 22%;
+  margin-left : 13%;
   margin-bottom : 9.9999px;
 }
 /* online order margin */
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index a64d7af4..9648a246 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -86,6 +86,10 @@ class Crm::CustomersController < BaseCrmController
       end
     end
 
+    params[:type] = nil
+    params[:customer_id] = params[:id]
+    @credit_sales = SalePayment.get_credit_sales(params)
+    
     #get customer amount
       @customer        = Customer.find(params[:id])
       @response        = Customer.get_membership_transactions(@customer)
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 97ee07a7..59da1581 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -876,8 +876,10 @@ class SalePayment < ApplicationRecord
                       .joins("INNER JOIN customers c ON c.customer_id = s.customer_id")
                       .joins("INNER JOIN sale_orders so ON so.sale_id = s.sale_id")
                       .joins("INNER JOIN orders o ON o.order_id = so.order_id")
-                      
-    if params[:type] == "cashier" 
+    
+    if params[:type].nil?
+      query = query.where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END) and s.sale_status = 'completed' and s.payment_status='paid' #{receipt_no} #{customer}")
+    elsif params[:type] == "cashier" 
       query = query.where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' AND o.source='#{params[:type]}' OR o.source='emenu' END) and s.sale_status = 'completed' and s.payment_status='paid' #{receipt_no} #{customer}")
     else
       query = query.where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' AND o.source='#{params[:type]}' END) and s.sale_status = 'completed' and s.payment_status='paid' #{receipt_no} #{customer}")
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 5dcb86b0..c2e0aff4 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -1,163 +1,225 @@
+<section>
+  <div class="wizard">
+      <div class="wizard-inner">
+          <div class="active-line"></div>
+          <ul class="nav nav-tabs" role="tablist">
+              <li role="presentation" class="nav-item">
+                <div class="connecting-line border-right"></div>
+                <a href="#step1" class="nav-link active" data-toggle="tab" aria-controls="step1" role="tab" title="Step 1">
+                  <span class="round-tab">
+                    1
+                  </span>
+                </a>
+              </li>
+              <li role="presentation" class="nav-item disabled">
+                <div class="connecting-line"></div>
+                <a href="#complete" class="nav-link disable" data-toggle="tab" aria-controls="complete" role="tab" title="Complete">
+                    <span class="round-tab">
+                      2
+                    </span>
+                </a>
+              </li>
+          </ul>
+      </div>
+      <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
+          <span class="patch_method"></span>
+          <%= f.hidden_field :id, :class => "form-control " %>
+          <div class="tab-content">
+              <div class="tab-pane active" role="tabpanel" id="step1">
+                  <!-- <h4>Step 1</h4> -->
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <label><%= t("views.right_panel.detail.sr_no") %></label>
+                      <div class="form-line disabled">
+                        <input type="text" name="" value="<%=@count_customer%>" class="form-control" disabled="" >
+                      </div>
+                    </div>
+                  </div>
 
-<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
-<span class="patch_method"></span>
-<%= f.hidden_field :id, :class => "form-control " %>   
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <label for="customer[salutation]" class="control-label"> <%= t("views.right_panel.detail.salutation") %> :</label><br>
+                      <label class="font-12 radio-inline">
+                        <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr"%><%= t("views.right_panel.detail.mr") %>
+                      </label>&nbsp;
+                      <label class="font-12 radio-inline">
+                        <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs"%><%= t("views.right_panel.detail.miss") %>
+                      </label>&nbsp;
+                      <label class="font-12 radio-inline">
+                        <%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss"%><%= t("views.right_panel.detail.mrs") %>
+                      </label>&nbsp;
+                      <label class="font-12 radio-inline">
+                        <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm"%><%= t("views.right_panel.detail.mdm") %>
+                      </label>
+                    </div>
+                  </div>
+                  <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <%= f.input :name, :class => "form-control name", :required => true %>
+                      <% flash.each do |test, msg| %>
+                      <% 
+                      str="[\"#{msg['name']}\"]"
+                      str.gsub!('["', '')
+                      str.gsub!('"]', '') %>
+                      <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
+                      <% end -%>
+                    </div>
+                  </div>
+                  <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <%= f.input :contact_no, :class => "form-control contact_no" ,:required => true%>
 
-<div class="form-group">
-  <label> <%= t("views.right_panel.detail.salutation") %> :</label><br>
-  <label class="font-15"><%= t("views.right_panel.detail.mr") %>
-    <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%>
-  </label>&nbsp;
-  <label class="font-15"><%= t("views.right_panel.detail.miss") %>
-    <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%>
-  </label>&nbsp;
-  <label class="font-15"><%= t("views.right_panel.detail.mrs") %>
-    <%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%>
-  </label>&nbsp;
-  <label class="font-15">
-    <%= t("views.right_panel.detail.mdm") %>
-    <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
-  </label>   
-</div>
+                      <%  flash.each do |name, msg| %>
+                      <% str="[\"#{msg['contact_no']}\"]"
+                      str.gsub!('["', '')
+                      str.gsub!('"]', '') %>
+                      <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
+                      <% end %>
+                    </div>
+                  </div>
 
-<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
-  <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
-  <% flash.each do |test, msg| %>
-  <% 
-  str="[\"#{msg['name']}\"]"
-  str.gsub!('["', '')
-  str.gsub!('"]', '') %>
-  <lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
-  <% end -%>
-</div>
+                  <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <%= f.input :email, :class => "form-control email" ,:required => true%>
 
-<div class="form-group">
-  <label><%= t("views.right_panel.detail.gender") %> :</label><br>
-  <label><%= t("views.right_panel.detail.male") %>
-  <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%></label>
-  <label><%= t("views.right_panel.detail.female") %>
-  <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%></label>
-</div>
+                      <% flash.each do |name, msg| %>
+                      <% str="[\"#{msg['email']}\"]"
+                      str.gsub!('["', '')
+                      str.gsub!('"]', '') %>
+                      <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
+                      <% end %>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <label for="customer[gender]" class="control-label"><%= t("views.right_panel.detail.gender") %> :</label><br>
+                      <label class="font-12 radio-inline">
+                      <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male"%><%= t("views.right_panel.detail.male") %></label>
+                      <label class="font-12 radio-inline">
+                      <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female"%><%= t("views.right_panel.detail.female") %></label>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <%= f.input :nrc_no,:label => "NRC No", :class => "form-control nrc_no" %>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <%= f.input :company, :class => "form-control col-md-6 company"%>
 
-<div class="form-group">
-  <%= f.input :nrc_no,:label => "NRC No", :class => "form-control nrc_no" %>
-</div>
+                      <%  flash.each do |name, msg| %>
+                      <% str="[\"#{msg['company']}\"]"
+                      str.gsub!('["', '')
+                      str.gsub!('"]', '') %>
+                      <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
+                      <% end -%>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <label class="control-label"><%= t("views.right_panel.detail.date_of_birth") %></label>
+                      <%= f.text_field :date_of_birth, :value=>"01-01-1990",:class=>"datepicker form-control col-md-12"%>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <%= f.input :address, :class => "form-control address" %>
+                    </div>
+                  </div>
 
-<div class="form-group">
-  <%= f.input :company, :class => "form-control col-md-6 company"%>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12" align="right">
+                      <button type="button" class="btn btn-md bg-blue btn-info-full next-step">Next</button>
+                    </div>      
+                  </div>
+              </div>
+              <div class="tab-pane" role="tabpanel" id="complete">
+                  <!-- <h4>Step 2</h4> -->
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <label><%= t("views.right_panel.detail.customer_photo") %></label>
+                      <div class="panel padding-10">
+                          <div class="menu-item-img">
+                            <% if f.object.image_path? %>
+                              <p><%= f.object.name %></p>
+                                <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
+                            <% else %>                
+                              <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+                            <% end %>          
+                          </div>
+                          <%= f.file_field :image_path, :class => "img-thumbnail" %>
+                      </div> 
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <label><%= t("views.right_panel.detail.select_customer_type") %></label>
+                      <select class="form-control col-md-12 selectpicker  show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
+                      <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
+                      <option value="<%= ct.value %>">
+                        <%= ct.name %></option>
+                        <%end %>
+                      </select>            
+                    </div>
+                  </div>
 
-  <%  flash.each do |name, msg| %>
-  <% str="[\"#{msg['company']}\"]"
-  str.gsub!('["', '')
-  str.gsub!('"]', '') %>
-  <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
-  <% end -%>
-</div>
-<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
-  <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true },  :class => "form-control tax_profiles" %>
+                    </div>
+                  </div>
 
-  <%  flash.each do |name, msg| %>
-  <% str="[\"#{msg['contact_no']}\"]"
-  str.gsub!('["', '')
-  str.gsub!('"]', '') %>
-  <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
-  <% end %>
-</div>
+                  <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <%= f.input :card_no, :class => "form-control card_no"%>
+                      <% flash.each do |name, msg| %>
+                      <% str="[\"#{msg['card_no']}\"]"
+                      str.gsub!('["', '')
+                      str.gsub!('"]', '') %>
+                      <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
+                      <% end %>
+                    </div>
+                  </div>
 
-<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
-  <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <label class="control-label"><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
+                      <div class="-group">            
+                        <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly/>
+                        <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
+                      </div>
+                    </div>
+                  </div>
 
-  <% flash.each do |name, msg| %>
-  <% str="[\"#{msg['email']}\"]"
-  str.gsub!('["', '')
-  str.gsub!('"]', '') %>
-  <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
-  <% end %>
-</div>
-
-<div class="form-group">
-  <%= f.input :address, :class => "form-control col-md-6 address" %>
-</div>
-
-<div class="form-group">
-  <label><%= t("views.right_panel.detail.sr_no") %></label>
-  <div class="form-line disabled">
-    <input type="text" name="" value="<%=@count_customer%>" class="form-control" disabled="" >
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <label class="control-label"><%= t("views.right_panel.detail.select_membership_group") %></label>
+                      <select class="form-control col-md-12 selectpicker  show-tick"  name="member_group_id"  style="height: " >
+                        <option value=""><%= t("views.right_panel.detail.select_membership_group") %></option>
+                        <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
+                        <option value="<%= member.value %>">
+                        <%= member.name %></option>
+                        <%end %>
+                      </select>   
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12" align="right">
+                      <button type="button" class="btn btn-md bg-blue prev-step">Prev</button>
+                      <!-- <%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
+                      <%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %> -->
+                      <button type="submit" class="btn btn-primary" id="submit_customer"><%= t("views.btn.submit") %></button>
+                      <button type="submit" class="btn btn-info" disabled id="update_customer"><%= t("views.btn.update") %></button>
+                      <button type="button" class="btn btn-danger" id="reset"><%= t("views.btn.reset") %></button>
+                    </div>    
+                  </div>
+              </div>
+              <div class="clearfix"></div>
+          </div>
+      <%end%>
   </div>
-</div>
-
-<div class="form-group">
-  <label><%= t("views.right_panel.detail.date_of_birth") %></label>
-  <%= f.text_field :date_of_birth, :value=>"01-01-1990",:class=>"datepicker form-control col-md-12"%>
-</div> 
-
-<div class="form-group">
-  <label><%= t("views.right_panel.detail.customer_photo") %></label>
-    <div class="panel padding-10">
-        <div class="menu-item-img">
-          <% if f.object.image_path? %>
-            <p><%= f.object.name %></p>
-              <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
-          <% else %>                
-            <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
-          <% end %>          
-        </div>
-        <%= f.file_field :image_path, :class => "img-thumbnail" %>
-    </div> 
-</div>
-   
-<div class="form-group">
-  <label><%= t("views.right_panel.detail.select_customer_type") %></label>
-  <select class="form-control col-md-12 selectpicker  show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
-  <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
-  <option value="<%= ct.value %>">
-    <%= ct.name %></option>
-    <%end %>
-  </select>            
-</div>
-
-<div class="form-group">
-  <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true },  :class => "form-control col-md-6 tax_profiles" %>
-</div>
-
-<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
-  <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
-  <% flash.each do |name, msg| %>
-  <% str="[\"#{msg['card_no']}\"]"
-  str.gsub!('["', '')
-  str.gsub!('"]', '') %>
-  <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
-  <% end %>
-</div>
-
-<div class="form-group">
-  <label><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
-  <div class="-group">            
-    <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly/>
-    <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
-  </div>
-</div>
-
-<div class="form-group">
- <label><%= t("views.right_panel.detail.select_membership_group") %></label>
- <select class="form-control col-md-12 selectpicker  show-tick"  name="member_group_id"  style="height: " >
-  <option value=""><%= t("views.right_panel.detail.select_membership_group") %></option>
-  <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
-  <option value="<%= member.value %>">
-    <%= member.name %></option>
-    <%end %>
-  </select>   
-
-</div>
-  
-<div class="form-group">
-  <!-- <%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
-  <%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %> -->
-  <button type="submit" class="btn btn-primary" id="submit_customer"><%= t("views.btn.submit") %></button>
-  <button type="submit" class="btn btn-info" disabled id="update_customer"><%= t("views.btn.update") %></button>
-  <button type="button" class="btn btn-danger" id="reset"><%= t("views.btn.reset") %></button>
-</div>
-<%end%>
+</section>
 
 
 <div id="sxModal">
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index ceb28f1c..69d5f29f 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -11,28 +11,31 @@
     </div>
 
   <div class="row clearfix">
-    <div class="<%= @create_flag ? 'col-lg-8 col-md-8 col-sm-8' : 'col-lg-12 col-md-12 col-sm-12' %>">
+    <div class="col-lg-12 col-md-12 col-sm-12">
       <div class="card">
         <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 class="col-sm-5 col-md-5 col-lg-5">
+                    <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 btn-sm bg-blue waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.search") %></button>
+                  <div class="col-sm-4 col-md-4 col-lg-4">
+                    <!-- <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"><%= t("views.btn.search") %></button>
                   <!-- </div> -->
-                    <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
-                    <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
+                    <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect"><%= t("views.btn.memeber_card") %></button>
+                    <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect"><%= t("views.btn.qr_code") %></button>
+                  </div>
                 </div>
                 <% end %>
             </div>
           </div>
           <div class="row">
-            <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <div class="col-lg-8 col-md-8 col-sm-8 col-xs-8">
+              <%= paginate @crm_customers %>
               <div class="table-responsive">
                 <table class="table table-hover table-striped" style="width:100%">
               <!-- <div class="table-responsive">
@@ -50,11 +53,12 @@
                     <tr>
                       <th></th>
                       <th><%= t("views.right_panel.detail.sr_no") %></th>
+                      <th><%= t :customer %> <%= t("views.right_panel.detail.type") %></th>
                       <th><%= t("views.right_panel.detail.name") %></th>
-                      <th><%= t("views.right_panel.detail.card_no") %></th>
-                      <th><%= t("views.right_panel.detail.membership_type") %></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 style="width:20%"><%= t("views.right_panel.detail.contact_no") %></th>
+                      <th><%= t("views.right_panel.detail.membership_type") %></th>
+                      <th><%= t("views.right_panel.detail.card_no") %></th>
                       <th><%= t("views.right_panel.detail.action") %></th>
                     </tr>
                   </thead>
@@ -74,8 +78,10 @@
                             -
                             <% end %>
                           </td>
+                          <td><%= crm_customer.customer_type rescue '-' %></td>
                           <td><%= crm_customer.name %></td>
-                          <td><%= crm_customer.card_no rescue '-' %></td>
+                          <td style="width:20px%;word-break: break-all;"><%= crm_customer.email %></td>
+                          <td style="width:20px%;word-break: break-all;"><%= crm_customer.contact_no %></td>
                           <td>
                             <% if !@membership_types.nil? %>
                               <% @membership_types.each do |member_type| %>
@@ -85,9 +91,10 @@
                               <% end %>
                             <% end %>
                           </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>
+                          <td><%= crm_customer.card_no rescue '-' %></td>
+                          <td>
+                            <%= link_to t("views.btn.show"), crm_customer_path(crm_customer), :class => "btn btn-md bg-blue waves-effect" %>
+                          </td>
                         </tr>
                       <% end %>
                     <% else %>
@@ -95,36 +102,24 @@
                     <% end %>
                   </tbody>
                 </table>
-                <br>
-                <%= paginate @crm_customers %>
+                
               </div>
             </div>
-          </div>
-          
+            <% if @create_flag %>
+            <div class="col-sm-4 col-md-4 col-lg-4">
+              <!-- .row-form-input -->
+              <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
+              <!-- .row-form-input -->
+            </div>
+            <% end %>
+          </div> <!-- .end-of-row -->
         </div>
       </div>
     </div>
-    <% if @create_flag %>
-      <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 %>
-          </div>
-        </div>
-      
-        <!-- <div class="col-lg-1 col-md-1 col-sm-1 ">
-          <br>
-          <a href="<%= dashboard_path%>" class="btn btn-primary">
-            <i class="fa fa-arrow-left fa-lg"></i> Back
-          </a>
-        </div> -->
-      </div>
-    <% end %>
 </div>
+
 <script type="text/javascript">
-
-$(function() {
-
+  $(document).ready(function () {
     /*$('.datepicker').datepicker({
         format : 'dd-mm-yyyy',
         autoclose: true
@@ -163,91 +158,127 @@ $(function() {
       $("#search").val(code);
     }
 
-});
+    /*new customer UI func:*/
+    //Initialize tooltips
+    $('.nav-tabs > li a[title]').tooltip();
+    
+    //Wizard
+    $('a[data-toggle="tab"]').on('show.bs.tab', function (e) {
 
-$(document).on('click',".customer_tr",function(){
-     // if(this.checked){
-          $(this).closest('tr').find('.checkbox_check').prop( "checked", true );
-            //$( "#checkbox_check" ).prop( "checked", true );
-            var sale_id     = $("#sale_id").val() || 0;
-            var customer_id = $(this).attr('data-ref');
+        var $target = $(e.target);
+    
+        if ($target.parent().hasClass('disabled')) {
+            return false;
+        }
+    });
 
-            if(sale_id != 0){
-              // var url = "/"+customer_id;
-              update_sale(customer_id,sale_id);
-            }else{
+    $(".next-step").click(function (e) {
+        var $active = $('.wizard .nav-tabs li a.active');
+        $active.parent().next().removeClass('disabled');
+        nextTab($active);
+        $('.wizard .nav-tabs li.active .connecting-line').css({"border-bottom-left-radius": 0, "border-top-left-radius": 0});
+    });
+    $(".prev-step").click(function (e) {
 
-              var url = "customers/" + customer_id + "/edit";
-            }
+        var $active = $('.wizard .nav-tabs li a.active');
+        prevTab($active);
 
-            $("#customer_tax_profiles").children().removeAttr("selected").css({'color':'#000','background':'none'});
+    });
+    /*new customer UI func:*/
+  });
 
-              $.ajax({
-                type: "GET",
-                url: url,
-                data: {},
-                dataType: "json",
-                success: function(data) {                 
-                  // Selected for Taxes  
-                  var taxes = JSON.stringify(data.tax_profiles);  
-                  var parse_taxes = JSON.parse(taxes); 
-                  $.each(parse_taxes, function(i, value){
-                    $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'});
-                  });
+  /*customer UI tab btn*/
+  function nextTab(elem) {
+      $(elem).parent().next().find('a[data-toggle="tab"]').click();
+  }
+  function prevTab(elem) {
+      $(elem).parent().prev().find('a[data-toggle="tab"]').click();
+  }
+  /*customer UI tab btn*/
 
-                    $('#customer_id').val(data.id);
-                    $('#customer_name').val(data.name);
-                    $('#customer_company').val(data.company);
-                    $('#customer_contact_no').val(data.contact_no);
-                    $('#customer_email').val(data.email);
-                    $('#customer_salutation').val(data.salutation);
-                    $('#customer_nrc_no').val(data.nrc_no);
-                    $('#customer_card_no').val(data.card_no);
-                    $('#customer_type').val(data.customer_type);                    
-                    $('#paypar_account_no').val(data.paypar_account_no);
-                    $('#customer_address').val(data.address);
-                    $('#customer_date_of_birth').val(data.date_of_birth);
-                    if(data.image_path.url!=undefined && data.image_path.url!=null){
-                      $('.menu-item-img .img-thumbnail').attr('src',data.image_path.url);
-                    }
-                    $('#customer_membership_type').val(data.membership_type);
-                      $('.selectpicker > option[value="'+data.membership_type+'"]').attr('selected','selected');
-                    if (data.gender == 'Male') {
-                      $('.male').prop( "checked", true )
-                    }else{
-                      $('.female').prop( "checked", true )
-                    }
+  $(document).on('click',".customer_tr",function(){
+       // if(this.checked){
+        $(this).closest('tr').find('.checkbox_check').prop( "checked", true );
+          //$( "#checkbox_check" ).prop( "checked", true );
+          var sale_id     = $("#sale_id").val() || 0;
+          var customer_id = $(this).attr('data-ref');
 
-                    if(data.salutation == 'Mr') {
-                      $('.mr').prop( "checked", true )
-                    }else if(data.salutation == 'Miss') {
-                      $('.miss').prop( "checked", true )
-                    }else if(data.salutation == 'Mrs'){
-                      $('.mrs').prop( "checked", true )
-                    }else{
-                      $('.mdm').prop( "checked", true )
-                    }
+          if(sale_id != 0){
+            // var url = "/"+customer_id;
+            update_sale(customer_id,sale_id);
+          }else{
 
-                    $('.membership_authentication_code').val(data.membership_authentication_code);
+            var url = "customers/" + customer_id + "/edit";
+          }
 
-                    $('#update_customer').removeAttr('disabled').val('');
-                    $('#update_customer').attr('value', 'Update');
-                    $('#submit_customer').attr('disabled','disabled');
+          $("#customer_tax_profiles").children().removeAttr("selected").css({'color':'#000','background':'none'});
 
-                    $("#new_customer").attr('class', 'simple_form edit_customer');
-                    var id = "edit_customer_"+customer_id;
-                    $("#new_customer").attr('id', id);
+            $.ajax({
+              type: "GET",
+              url: url,
+              data: {},
+              dataType: "json",
+              success: function(data) {                 
+                // Selected for Taxes  
+                var taxes = JSON.stringify(data.tax_profiles);  
+                var parse_taxes = JSON.parse(taxes); 
+                $.each(parse_taxes, function(i, value){
+                  $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'});
+                });
 
-                    $(".edit_customer").attr('id', id);
-                    $(".edit_customer").attr('action', '/crm/customers/' + $('#customer_id').val());
-                    $(".edit_customer").attr('action', '/crm/customers/' + $('#customer_id').val());
-                    $(".patch_method").html('<input type="hidden" name="_method" value="patch">');
-                    //$(".edit_customer").attr('method', 'PATCH');
-                }
-             });
-          // }else{
+                  $('#customer_id').val(data.id);
+                  $('#customer_name').val(data.name);
+                  $('#customer_company').val(data.company);
+                  $('#customer_contact_no').val(data.contact_no);
+                  $('#customer_email').val(data.email);
+                  $('#customer_salutation').val(data.salutation);
+                  $('#customer_nrc_no').val(data.nrc_no);
+                  $('#customer_card_no').val(data.card_no);
+                  $('#customer_type').val(data.customer_type);                    
+                  $('#paypar_account_no').val(data.paypar_account_no);
+                  $('#customer_address').val(data.address);
+                  $('#customer_date_of_birth').val(data.date_of_birth);
+                  if(data.image_path.url!=undefined && data.image_path.url!=null){
+                    $('.menu-item-img .img-thumbnail').attr('src',data.image_path.url);
+                  }
+                  $('#customer_membership_type').val(data.membership_type);
+                    $('.selectpicker > option[value="'+data.membership_type+'"]').attr('selected','selected');
+                  if (data.gender == 'Male') {
+                    $('.male').prop( "checked", true )
+                  }else{
+                    $('.female').prop( "checked", true )
+                  }
 
-          // }
+                  if(data.salutation == 'Mr') {
+                    $('.mr').prop( "checked", true )
+                  }else if(data.salutation == 'Miss') {
+                    $('.miss').prop( "checked", true )
+                  }else if(data.salutation == 'Mrs'){
+                    $('.mrs').prop( "checked", true )
+                  }else{
+                    $('.mdm').prop( "checked", true )
+                  }
+
+                  $('.membership_authentication_code').val(data.membership_authentication_code);
+
+                  $('#update_customer').removeAttr('disabled').val('');
+                  $('#update_customer').attr('value', 'Update');
+                  $('#submit_customer').attr('disabled','disabled');
+
+                  $("#new_customer").attr('class', 'simple_form edit_customer');
+                  var id = "edit_customer_"+customer_id;
+                  $("#new_customer").attr('id', id);
+
+                  $(".edit_customer").attr('id', id);
+                  $(".edit_customer").attr('action', '/crm/customers/' + $('#customer_id').val());
+                  $(".edit_customer").attr('action', '/crm/customers/' + $('#customer_id').val());
+                  $(".patch_method").html('<input type="hidden" name="_method" value="patch">');
+                  //$(".edit_customer").attr('method', 'PATCH');
+              }
+           });
+        // }else{
+
+        // }
   })
 
   function update_sale(customer_id,sale_id) {
@@ -289,5 +320,4 @@ $(document).on('click',".customer_tr",function(){
   $("#sxModal .btn_cancel").on('click',function(){
     $("#sxModal").hide();
   });
-
 </script>
diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb
index 5a904000..5b642d13 100644
--- a/app/views/crm/customers/show.html.erb
+++ b/app/views/crm/customers/show.html.erb
@@ -1,5 +1,17 @@
+<div class="container-fluid">
+  <div class="page-header">
+   <ul class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item active">CRM</li>
+     <!-- <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> -->
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ul>
+</div>
+
 <div class="row">
-  <div class="col-lg-11 col-md-11 col-sm-11">
+  <div class="col-lg-12 col-md-12 col-sm-12">
     <!-- Column One -->
     <!-- Nav tabs -->
     <ul class="nav nav-tabs tab-nav-right" role="tablist">
@@ -13,6 +25,9 @@
       <li role="presentation" class="nav-item" >
         <a class="nav-link" data-toggle="tab" href="#sale" ><%= t :sale_details %></a>
       </li>
+      <li role="presentation" class="nav-item" >
+        <a class="nav-link" data-toggle="tab" href="#credit" ><%= t :credit %> <%= t :details %></a>
+      </li>
     </ul>
     <!-- Nav tabs - End -->
 
@@ -148,50 +163,68 @@
 
       <div class="tab-pane" id="sale" role="tabpanel" style="min-height:670px; max-height:670px; ">
           <h5><%= t :sale_details %></h5>
-                <div class="table-responsive">
-                  <table class="table table-striped">           
-                    <thead>
-                      <tr>
-                          <th><%= t("views.right_panel.detail.sale_id") %></th>
-                          <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                          <th><%= t("views.right_panel.detail.total_discount") %></th>
-                          <th><%= t("views.right_panel.detail.tax_amount") %></th>
-                          <th><%= t("views.right_panel.detail.sub_total") %></th>
-                          <th><%= t("views.right_panel.detail.grand_total") %></th>
-                          <th><%= t :cashier %></th>
-                          <th><%= t("views.right_panel.detail.sales_status") %></th>
-                          <th><%= t("views.right_panel.detail.receipt_date") %></th>
-                      </tr>
-                    </thead>
+          <div class="table-responsive">
+            <table class="table table-striped">           
+              <thead>
+                <tr>
+                    <th><%= t("views.right_panel.detail.sale_id") %></th>
+                    <th><%= t("views.right_panel.detail.receipt_no") %></th>
+                    <th><%= t("views.right_panel.detail.total_discount") %></th>
+                    <th><%= t("views.right_panel.detail.tax_amount") %></th>
+                    <th><%= t("views.right_panel.detail.sub_total") %></th>
+                    <th><%= t("views.right_panel.detail.grand_total") %></th>
+                    <th><%= t :cashier %></th>
+                    <th><%= t("views.right_panel.detail.sales_status") %></th>
+                    <th><%= t("views.right_panel.detail.receipt_date") %></th>
+                </tr>
+              </thead>
 
-                    <tbody>
-                        <% @sales.each do |sale| %>
-                          <tr>
-                            <td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
-                      <td><%= sale.receipt_no %></td>
-                      <td><%= sale.total_discount %></td>
-                      <td><%= sale.total_tax %></td>
-                      <td><%= sale.total_amount %></td>
-                      <td><%= sale.grand_total rescue '-' %></td>
-                      <td><%= sale.cashier_name rescue '-' %></td>
-                      <td> <%= sale.sale_status %> </td>
-                      <td> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
-                          </tr>
-                        <% end %>
-                    </tbody>
-                  </table>
-               </div>
-       </div>
-       
+              <tbody>
+                  <% @sales.each do |sale| %>
+                    <tr>
+                      <td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
+                <td><%= sale.receipt_no %></td>
+                <td><%= sale.total_discount %></td>
+                <td><%= sale.total_tax %></td>
+                <td><%= sale.total_amount %></td>
+                <td><%= sale.grand_total rescue '-' %></td>
+                <td><%= sale.cashier_name rescue '-' %></td>
+                <td> <%= sale.sale_status %> </td>
+                <td> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
+                    </tr>
+                  <% end %>
+              </tbody>
+            </table>
+         </div>
+      </div>
+      
+      <div class="tab-pane" id="credit" role="tabpanel" style="min-height:670px; max-height:670px; ">
+        <h5><%= t :credit %> <%= t :details %></h5>
+        <table class="table table-responsive tbl_credit_lists">
+          <thead>
+            <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
+            <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.credit_amount") %> </th>
+          </thead>
+          <tbody>
+            <% if !@credit_sales.nil? %>
+              <% @credit_sales.each do |credit| %>
+                <tr>
+                  <td><%= credit.sale_date.utc.getlocal.strftime("%e %b %Y %I:%M%p") %></td>
+                  <td><%= credit.receipt_no %></td>
+                  <td><%= credit.cashier_name %></td>
+                  <td><%= credit.payment_amount %></td>
+                </tr>
+              <% end %>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
 
+      </div>
     </div>
+
   </div>
-
-  <div class="col-lg-1 col-md-1 col-sm-1">
-        <a href="<%= crm_customers_path%>" class="btn btn-default btn-sm">
-        <i class="material-icons">reply</i><%= t("views.btn.back") %>
-       </a>
-    </div>
-
 </div>
 
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 9644cba1..bdc8e342 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -1,18 +1,18 @@
 <div class="container-fluid">
- <!--  <div class="page-header">
+  <div class="page-header">
    <ul class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">CRM</li>
-     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+     <!-- <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> -->
     <span class="float-right">
-      <a href="#" id="back">Back</a>
+      <%= link_to 'Back', dashboard_path %>
     </span>
   </ul>
-</div> -->
+</div>
 
 
 <div class="row">
-  <div class="<%= @create_flag ? 'col-lg-8 col-md-8 col-sm-8' : 'col-lg-11 col-md-11 col-sm-11' %>">
+  <div class="col-lg-12 col-md-12 col-sm-12">
     <div class="card">
       <div class="body">
         <div class="row p-t-20 p-l-20">
@@ -46,242 +46,305 @@
             <% 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><%= t("views.right_panel.detail.membership_type") %></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>
+        <div class="row">
+          <div class="col-lg-8 col-md-8 col-sm-8 col-xs-8">
+            <%= paginate @crm_customers %>
+            <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><%= t("views.right_panel.detail.membership_type") %></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>
 
-                <tbody>
-                  <% if @crm_customers.count > 0  %> 
-                  <% @i = 0 %>
-                  <% @crm_customers.each do |crm_customer| %>
+                    <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>
-                      <% if !@membership_types.nil? %>
-                        <% @membership_types.each do |member_type| %>
-                          <% if member_type[1] == crm_customer.membership_type %>
-                            <%= member_type[0] %>
+                      <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 %>
-                        <% end %>
+                        </td>
+                        <td><%= crm_customer.name %></td>
+                        <td><%= crm_customer.card_no rescue '-' %></td>
+                        <td>
+                          <% if !@membership_types.nil? %>
+                            <% @membership_types.each do |member_type| %>
+                              <% if member_type[1] == crm_customer.membership_type %>
+                                <%= member_type[0] %>
+                              <% end %>
+                            <% end %>
+                          <% end %>
+                        </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 %>
-                    </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> -->
+                      <%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>
+                </div>
+              </div>
+            </div> <!-- .end-of-col-md-8 -->
+            <div class="col-sm-4 col-md-4 col-lg-4">
+              <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
+              <input type="hidden" id="type" name="type" value="<%= @cashier_type %>" />
+              <input type="hidden" id="page" name="page" value="<%= @page %>" />
+              <%if !@dining_facility.nil?%>
+               <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
+               <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
+               <input type="hidden" id="table_type" name="table_type" value="<%= @dining_facility.type %>" />
+              <% elsif @cashier_type == 'quick_service' %>
+                <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
+                <input type="hidden" id="type" name="type" value="<%= @cashier_type %>" />
+                <input type="hidden" id="page" name="page" value="<%= @page %>" />
+              <%else%>
+                <input type="hidden" id="table_id" name="table_id" value="" />
+                <input type="hidden" id="type" name="type" value="" />
+               <input type="hidden" id="table_type" name="table_type" value="" />
+              <%end%>
 
-                  </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>
+              <section>
+                <div class="wizard">
+                  <div class="wizard-inner">
+                    <div class="active-line"></div>
+                    <ul class="nav nav-tabs" role="tablist">
+                        <li role="presentation" class="nav-item">
+                          <div class="connecting-line border-right"></div>
+                          <a href="#step1" class="nav-link active" data-toggle="tab" aria-controls="step1" role="tab" title="Step 1">
+                            <span class="round-tab">
+                              1
+                            </span>
+                          </a>
+                        </li>
+                        <li role="presentation" class="nav-item disabled">
+                          <div class="connecting-line"></div>
+                          <a href="#complete" class="nav-link disable" data-toggle="tab" aria-controls="complete" role="tab" title="Complete">
+                              <span class="round-tab">
+                                2
+                              </span>
+                          </a>
+                        </li>
+                    </ul>
+                  </div>
+                  <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
+                    <span class="patch_method"></span>
+                    <%= f.error_notification %>
+                    <%= f.hidden_field :id, :class => "form-control col-md-6 " %> 
+                    <div class="tab-content">
+                      <div class="tab-pane active" role="tabpanel" id="step1">
+                        <div class="form-group">
+                          <div class="col-sm-12 col-md-12 col-lg-12">
+                            <label><%= t("views.right_panel.detail.sr_no") %></label>
+                            <div class="form-line disabled">
+                              <input type="text" name="" value="<%=@count_customer%>" class="form-control" disabled="" >
+                            </div>
+                          </div>
+                        </div>
+                        <div class="form-group">
+                          <div class="col-sm-12 col-md-12 col-lg-12">
+                            <label for="customer[salutation]" class="control-label"> <%= t("views.right_panel.detail.salutation") %> :</label><br>
+                            <label class="font-12 radio-inline">
+                              <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr"%><%= t("views.right_panel.detail.mr") %>
+                            </label>&nbsp;
+                            <label class="font-12 radio-inline">
+                              <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs"%><%= t("views.right_panel.detail.miss") %>
+                            </label>&nbsp;
+                            <label class="font-12 radio-inline">
+                              <%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss"%><%= t("views.right_panel.detail.mrs") %>
+                            </label>&nbsp;
+                            <label class="font-12 radio-inline">
+                              <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm"%><%= t("views.right_panel.detail.mdm") %>
+                            </label>
+                          </div>
+                        </div>
+                        <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+                          <div class="col-sm-12 col-md-12 col-lg-12">
+                            <%= f.input :name, :class => "form-control name", :required => true %>
 
-              <%= paginate @crm_customers %>
-            </div>
-          </div>
+                            <% flash.each do |name, msg| %>
+                            <% str="[\"#{msg['name']}\"]"
+                            str.gsub!('["', '')
+                            str.gsub!('"]', '') %>
+                            <span class="help-block"><%= str %></span>
+                            <% end -%>
+                          </div>
+                        </div>
+                        <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <%= f.input :contact_no, :class => "form-control contact_no" ,:required => true%>
+
+                          <%  flash.each do |name, msg| %>
+                          <% str="[\"#{msg['contact_no']}\"]"
+                          str.gsub!('["', '')
+                          str.gsub!('"]', '') %>
+                          <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
+                          <% end %>
+                        </div>
+                      </div>
+
+                      <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <%= f.input :email, :class => "form-control email" ,:required => true%>
+
+                          <% flash.each do |name, msg| %>
+                          <% str="[\"#{msg['email']}\"]"
+                          str.gsub!('["', '')
+                          str.gsub!('"]', '') %>
+                          <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
+                          <% end %>
+                        </div>
+                      </div>
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <label for="customer[gender]" class="control-label"><%= t("views.right_panel.detail.gender") %> :</label><br>
+                          <label class="font-12 radio-inline">
+                          <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male"%><%= t("views.right_panel.detail.male") %></label>
+                          <label class="font-12 radio-inline">
+                          <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female"%><%= t("views.right_panel.detail.female") %></label>
+                        </div>
+                      </div>
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <%= f.input :nrc_no,:label => "NRC No", :class => "form-control nrc_no" %>
+                        </div>
+                      </div>
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <%= f.input :company, :class => "form-control col-md-6 company"%>
+
+                          <%  flash.each do |name, msg| %>
+                          <% str="[\"#{msg['company']}\"]"
+                          str.gsub!('["', '')
+                          str.gsub!('"]', '') %>
+                          <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
+                          <% end -%>
+                        </div>
+                      </div>
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <label class="control-label"><%= t("views.right_panel.detail.date_of_birth") %></label>
+                          <%= f.text_field :date_of_birth, :value=>"01-01-1990",:class=>"datepicker form-control col-md-12"%>
+                        </div>
+                      </div>
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <%= f.input :address, :class => "form-control address" %>
+                        </div>
+                      </div>
+
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12" align="right">
+                          <button type="button" class="btn btn-md bg-blue btn-info-full next-step">Next</button>
+                        </div>      
+                      </div>
+                    </div> <!-- .end-of-step1 -->
+                    <div class="tab-pane" role="tabpanel" id="complete">
+                      <!-- <h4>Step 2</h4> -->
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <label><%= t("views.right_panel.detail.customer_photo") %></label>
+                          <div class="panel padding-10">
+                              <div class="menu-item-img">
+                                <% if f.object.image_path? %>
+                                  <p><%= f.object.name %></p>
+                                    <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
+                                <% else %>                
+                                  <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+                                <% end %>          
+                              </div>
+                              <%= f.file_field :image_path, :class => "img-thumbnail" %>
+                          </div> 
+                        </div>
+                      </div>
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <label><%= t("views.right_panel.detail.select_customer_type") %></label>
+                          <select class="form-control col-md-12 selectpicker  show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
+                          <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
+                          <option value="<%= ct.value %>">
+                            <%= ct.name %></option>
+                            <%end %>
+                          </select>            
+                        </div>
+                      </div>
+
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true },  :class => "form-control tax_profiles" %>
+                        </div>
+                      </div>
+
+                      <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <%= f.input :card_no, :class => "form-control card_no"%>
+                          <% flash.each do |name, msg| %>
+                          <% str="[\"#{msg['card_no']}\"]"
+                          str.gsub!('["', '')
+                          str.gsub!('"]', '') %>
+                          <lable class="error col-red m-t-10" style="margin-top:-6px"><%= str %></lable>
+                          <% end %>
+                        </div>
+                      </div>
+
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <label class="control-label"><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
+                          <div class="-group">            
+                            <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly/>
+                            <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
+                          </div>
+                        </div>
+                      </div>
+
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <label class="control-label"><%= t("views.right_panel.detail.select_membership_group") %></label>
+                          <select class="form-control col-md-12 selectpicker  show-tick"  name="member_group_id"  style="height: " >
+                            <option value=""><%= t("views.right_panel.detail.select_membership_group") %></option>
+                            <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
+                            <option value="<%= member.value %>">
+                            <%= member.name %></option>
+                            <%end %>
+                          </select>   
+                        </div>
+                      </div>
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12" align="right">
+                          <button type="button" class="btn btn-md bg-blue prev-step">Prev</button>
+                          <%= f.submit t("views.btn.submit"),:class => 'btn bg-blue btn-md waves-effect', :id => 'submit_customer' %>
+                          <!--  <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> -->
+                        </div>
+                      </div>
+                    </div><!-- .end-of-step2 -->
+                  </div> <!-- .end-of-tab-content -->
+                  <% end %>
+                </div> <!-- .end-of-wizard -->
+              </section> <!-- .end-of-section -->
+            </div><!-- .end-of-col-md-4 -->
+          </div> <!-- .end-of-row -->
         </div>
       </div>
     </div>
-
-    <!-- <div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll"> -->
-    <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
-    <input type="hidden" id="type" name="type" value="<%= @cashier_type %>" />
-    <input type="hidden" id="page" name="page" value="<%= @page %>" />
-    <%if !@dining_facility.nil?%>
-     <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
-     <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
-     <input type="hidden" id="table_type" name="table_type" value="<%= @dining_facility.type %>" />
-    <% elsif @cashier_type == 'quick_service' %>
-      <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
-      <input type="hidden" id="type" name="type" value="<%= @cashier_type %>" />
-      <input type="hidden" id="page" name="page" value="<%= @page %>" />
-    <%else%>
-      <input type="hidden" id="table_id" name="table_id" value="" />
-      <input type="hidden" id="type" name="type" value="" />
-     <input type="hidden" id="table_type" name="table_type" value="" />
-    <%end%>
-    <% if @create_flag %>
-    <div class="col-lg-3 col-md-3 col-sm-3" >
-      <div class="card">
-      <div class="body" id="custom-slimscroll">
-          <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
-
-          <span class="patch_method"></span>
-          <%= f.error_notification %>
-          <%= f.hidden_field :id, :class => "form-control col-md-6 " %>    
-          <div class="form-group">
-            <label><%= t("views.right_panel.detail.salutation") %> :</label><br>
-            <label class="font-15"><%= t("views.right_panel.detail.mr") %>
-            <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr"%></label>
-            <label class="font-15 m-l-5"><%= t("views.right_panel.detail.miss") %>
-            <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs"%></label>
-            <label class="font-15 m-l-5"><%= t("views.right_panel.detail.mrs") %>
-            <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss"%></label>
-            <label class="font-15 m-l-5"><%= t("views.right_panel.detail.mdm") %>
-            <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm"%></label>
-          </div>
-
-          <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-            <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
-
-            <% flash.each do |name, msg| %>
-            <% str="[\"#{msg['name']}\"]"
-            str.gsub!('["', '')
-            str.gsub!('"]', '') %>
-            <span class="help-block"><%= str %></span>
-            <% end -%>
-          </div>
-
-          <div class="form-group">
-            <label><%= t("views.right_panel.detail.gender") %> :</label><br>
-            <label><%= t("views.right_panel.detail.male") %>
-            <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%></label>
-            <label><%= t("views.right_panel.detail.female") %>
-            <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%></label>
-          </div>
-
-          <div class="form-group">
-            <%= f.input :nrc_no, :label => "NRC No",:class => "form-control nrc_no" %>
-          </div>
-          <div class="form-group">
-            <%= f.input :company, :class => "form-control col-md-6 company"%>
-
-            <%  flash.each do |name, msg| %>
-            <% str="[\"#{msg['company']}\"]"
-            str.gsub!('["', '')
-            str.gsub!('"]', '') %>
-            <span class="help-block"><%= str %></span>
-            <% end -%>
-          </div>
-          <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-            <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%>
-
-            <%  flash.each do |name, msg| %>
-            <% str="[\"#{msg['contact_no']}\"]"
-            str.gsub!('["', '')
-            str.gsub!('"]', '') %>
-            <span class="help-block"><%= str %></span>
-            <% end -%>
-          </div>
-
-          <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-            <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
-            <% flash.each do |name, msg| %>
-            <% str="[\"#{msg['contact_no']}\"]"
-            str.gsub!('["', '')
-            str.gsub!('"]', '') %>
-            <span class="help-block"><%= str %></span>
-            <% end -%>
-          </div>
-
-          <div class="form-group">
-            <%= f.input :address, :class => "form-control col-md-6 address" %>
-          </div>
-
-          <div class="form-group">
-            <label><%= t("views.right_panel.detail.sr_no") %></label>
-            <input type="text" name="" value="<%=@count_customer%>" class="form-control" readonly="true">
-          </div>
-          <div class="form-group">
-            <label><%= t("views.right_panel.detail.date_of_birth") %></label>
-            <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
-          </div>
-
-          <div class="form-group">
-            <label><%= t("views.right_panel.detail.customer_photo") %></label>
-              <div class="panel padding-10">
-                  <div class="menu-item-img">
-                    <% if f.object.image_path? %>
-                      <p><%= f.object.name %></p>
-                        <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
-                    <% else %>                
-                      <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
-                    <% end %>          
-                  </div>
-                  <%= f.file_field :image_path, :class => "img-thumbnail" %>
-              </div> 
-          </div>
-
-          <div class="form-group">
-            <label><%= t("views.right_panel.detail.select_customer_type") %></label>
-            <select class="form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: 40px" >
-              <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
-              <option value="<%= ct.value %>">
-                <%= ct.name %></option>
-                <%end %>
-              </select>            
-            </div>
-
-            <div class="form-group">
-              <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true },  :class => "form-control col-md-6 tax_profiles" %>
-            </div>
-
-            <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-              <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
-              <% flash.each do |name, msg| %>
-              <% str="[\"#{msg['name']}\"]"
-              str.gsub!('["', '')
-              str.gsub!('"]', '') %>
-              <span class="help-block" style="margin-top:-10px"><%= str %></span>
-              <% end -%>
-            </div>
-            <div class="form-group">
-              <label><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
-              <div class="input-group">     
-                <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly />
-                <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
-              </div>
-            </div>
-
-            <div class="form-group">
-             <label><%= t("views.right_panel.detail.select_membership_group") %></label>
-             <select class="form-control col-md-12" name="member_group_id">
-              <option value=""><%= t("views.right_panel.detail.select_membership_group") %></option>
-              <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
-              <option value="<%= member.value %>">
-                <%= member.name %></option>
-                <%end %>
-              </select>
-            </div>
-
-            <div class="form-group">
-              <%= f.submit t("views.btn.submit"),:class => 'btn btn-primary btn-lg waves-effect', :id => 'submit_customer' %>
-              <!--  <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> -->
-            </div>
-            <%end%>
-          </div>
-        </div>
-      </div>
-      <% end %>
-      <!-- Column Three -->
-      <div class="col-lg-1 col-md-1 col-sm-1">
-       <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
-     </div>
    </div>
 
    <div id="sxModal">
@@ -361,8 +424,45 @@
         }
       },100);
     });
+
+    /*new customer UI func:*/
+    //Initialize tooltips
+    $('.nav-tabs > li a[title]').tooltip();
+    
+    //Wizard
+    $('a[data-toggle="tab"]').on('show.bs.tab', function (e) {
+
+        var $target = $(e.target);
+    
+        if ($target.parent().hasClass('disabled')) {
+            return false;
+        }
+    });
+
+    $(".next-step").click(function (e) {
+        var $active = $('.wizard .nav-tabs li a.active');
+        $active.parent().next().removeClass('disabled');
+        nextTab($active);
+        $('.wizard .nav-tabs li.active .connecting-line').css({"border-bottom-left-radius": 0, "border-top-left-radius": 0});
+    });
+    $(".prev-step").click(function (e) {
+
+        var $active = $('.wizard .nav-tabs li a.active');
+        prevTab($active);
+
+    });
+    /*new customer UI func:*/
   });
 
+  /*customer UI tab btn*/
+  function nextTab(elem) {
+      $(elem).parent().next().find('a[data-toggle="tab"]').click();
+  }
+  function prevTab(elem) {
+      $(elem).parent().prev().find('a[data-toggle="tab"]').click();
+  }
+  /*customer UI tab btn*/
+
 
   // Read NFC card no from java
   function getCardNo(){

From 85fcd43ac2f7746c0bfaa698c091cf2601601f9a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 13 Sep 2018 18:03:48 +0630
Subject: [PATCH 15/66] update membershp payment method

---
 .../settings/membership_actions_controller.rb |  2 +-
 .../payment_method_settings_controller.rb     |  1 +
 app/models/payment_method_setting.rb          |  2 +-
 app/models/sale_payment.rb                    |  4 +-
 .../payment_method_settings/_form.html.erb    | 39 +++++++++++++++----
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb
index a41f7ad2..ea8d903b 100755
--- a/app/controllers/settings/membership_actions_controller.rb
+++ b/app/controllers/settings/membership_actions_controller.rb
@@ -72,6 +72,6 @@ class Settings::MembershipActionsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_membership_action_params
-      params.require(:membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by)
+      params.require(:membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by,:additional_parameters)
     end
 end
diff --git a/app/controllers/settings/payment_method_settings_controller.rb b/app/controllers/settings/payment_method_settings_controller.rb
index 2fccfd67..46ad82d4 100755
--- a/app/controllers/settings/payment_method_settings_controller.rb
+++ b/app/controllers/settings/payment_method_settings_controller.rb
@@ -41,6 +41,7 @@ class Settings::PaymentMethodSettingsController < ApplicationController
   # PATCH/PUT /settings/payment_method_settings/1
   # PATCH/PUT /settings/payment_method_settings/1.json
   def update
+    puts settings_payment_method_setting_params
     respond_to do |format|
       if @settings_payment_method_setting.update(settings_payment_method_setting_params)
         format.html { redirect_to settings_payment_method_setting_path(@settings_payment_method_setting), notice: 'Payment method setting was successfully updated.' }
diff --git a/app/models/payment_method_setting.rb b/app/models/payment_method_setting.rb
index 4f1de785..a57e8a4d 100755
--- a/app/models/payment_method_setting.rb
+++ b/app/models/payment_method_setting.rb
@@ -1,4 +1,4 @@
 class PaymentMethodSetting < ApplicationRecord
 	# validations
- 	validates_presence_of :payment_method #, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id
+ 	validates_presence_of :payment_method , :gateway_communication_type  #, :gateway_url, :auth_token, :merchant_account_id
 end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 43923134..4168f874 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -235,7 +235,7 @@ class SalePayment < ApplicationRecord
       customer_data = Customer.find_by_customer_id(sale_data.customer_id)
       if !membership_actions_data.nil?
 
-        url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
+        url = "paypar_url.to_s" + membership_actions_data.gateway_url.to_s
         merchant_uid = membership_actions_data.merchant_account_id
         auth_token = membership_actions_data.auth_token
 
@@ -261,7 +261,7 @@ class SalePayment < ApplicationRecord
                             auth_token:auth_token}.to_json
           end
 
-          
+          puts params
           # Control for Paypar Cloud
           begin
             response = HTTParty.post(url,
diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb
index bb5ae59a..96624821 100755
--- a/app/views/settings/payment_method_settings/_form.html.erb
+++ b/app/views/settings/payment_method_settings/_form.html.erb
@@ -9,15 +9,25 @@
         <div class="form-inputs p-l-15">
           <%= f.input :payment_method %>
           <%= f.input :is_active %>
-          <%= f.input :gateway_communication_type %>
-          <%= f.input :gateway_url %>
-          <%= f.input :auth_token %>
-          <%= f.input :merchant_account_id %>
-          <%= f.input :additional_parameters %>
+          <!-- <div class="form-group gateway_communication_type bmd-form-group">
+            <%= f.label :gateway_communication_type, 'Gateway Communication Type'%>
+            <select class="form-control col-md-12 gateway_type"  name="gateway_communication_type" >
+            <option value="">Select Gateway Type</option>
+              <option value="Api">Api</option>
+              <option value="Device">Device</option>
+              <option value="Default">Default</option>
+            </select> 
+          </div>  -->
+           <%= f.input :gateway_communication_type,:class=>'gateway_type', collection: [ "Api", "Default", "Device"] %>
+          <%= f.input :gateway_url ,:class=>'gateway_type', :required => true %>
+          <%= f.input :auth_token ,:class=>'auth_token', :required => true %>
+          <%= f.input :merchant_account_id ,:class=>'merchant_id', :required => true%>
+          <%= f.input :additional_parameters, as: :text %>
+
         </div>
 
         <div class="form-actions p-l-15">
-          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+          <%= f.submit "Submit",:class => 'btn btn-primary submitBtn btn-lg waves-effect' %>
         </div>
         <% end %>
       </div>
@@ -50,4 +60,19 @@
   </div>
 </div>
 
- 
+<!--  <script type="text/javascript">
+  $(function() { 
+    $(document).on('click', '#payment_method_setting_gateway_communication_type', function(event){
+      if ($(this).val() == "Api") {
+        $('.submitBtn').attr("disabled", true);
+      }else{
+        $('.submitBtn').removeAttr("disabled");
+      }
+    });  
+    $( "#payment_method_setting_gateway_url" ).keypress(function() {
+      
+    });
+  });
+</script>
+
+ -->
\ No newline at end of file

From 9ac2044337fabb08573c7fec5cadceb4519b0faf Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 14 Sep 2018 10:15:05 +0630
Subject: [PATCH 16/66] open TV script

---
 app/controllers/home_controller.rb |  9 +++++++++
 app/views/layouts/_header.html.erb | 26 +++++++++++++++++++++-----
 config/routes.rb                   |  2 ++
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 0d155b9e..19bfb4a3 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -184,6 +184,15 @@ class HomeController < ApplicationController
     render :json => {:status=> "Success", :url => root_path }.to_json
   end
 
+  def run_teamviewer
+    if File.directory?("/opt/teamviewer")
+      output = IO.popen('/opt/teamviewer/tv_bin/script/teamviewer')
+      render :json => {:status=> true}
+    else
+      render :json => {:status=> false}
+    end
+  end
+
   private
 
   # Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index bcd773d1..99033a27 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -69,12 +69,12 @@
                         </a>
                     </p>    
                 </li>
-                <!-- <li>
-                    <p class="waves-effect waves-block p-l-30 m-b-5">
-                           <i class="material-icons font-7 logout_icon shopinfo">add</i>
-                            <span class="font-15 shopinfo" >Team Viewer</span>
+                <li>
+                    <p class="waves-effect waves-block p-l-30 m-b-5 team_viewer">
+                       <i class="material-icons font-7 logout_icon shopinfo">touch_app</i>
+                        <span class="font-15 shopinfo" >Team Viewer</span>
                     </p>    
-                </li> -->
+                </li>
                 <% end %>
                 <li>
                     <!-- <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
@@ -136,6 +136,22 @@
             $('.order_no').addClass("order-badge");
             $('.order_no').html(parseInt(getOnlineOrderCount()));
         }
+
+        $(".team_viewer").on('click',function(){
+            // /opt/teamviewer/tv_bin/script/teamviewer
+            $.ajax({
+                type: "POST",
+                data: {},
+                dataType: 'json',
+                url: "/run_teamviewer",
+                success: function(data){
+                    if(!data.status){
+                        window.open('https://www.teamviewer.com', '_blank');
+                        return false;
+                    }
+                }
+            });
+        });
         
     });
 </script>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index d1cde5da..46696f14 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -537,6 +537,8 @@ scope "(:locale)", locale: /en|mm/ do
   get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options'
 
   resources :commissioners
+
+  post '/run_teamviewer' => 'home#run_teamviewer', :defaults => { :format => 'json' }
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end
 end

From 07a6e45edc17580717cfff3fb4d5a26a70f6295a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 14 Sep 2018 10:32:07 +0630
Subject: [PATCH 17/66] change css

---
 app/assets/stylesheets/origami.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index a879e4b4..6383ac89 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -599,7 +599,7 @@ nav.pagination .page a:hover,
       color:#2ED4E0;
       border-bottom-color: transparent;
   }
-  .nav-tabs li p{
+  .wizard .nav-tabs li p{
       padding-top:40px;
       font-size: 14px;
       text-align: center;

From 63fe7591bf16c6d18148ef15fab32e619ed670a8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 17 Sep 2018 11:12:12 +0630
Subject: [PATCH 18/66] update inventory form

---
 .../inventory_definitions_controller.rb       |   4 +
 .../inventory_definitions/_form.html.erb      | 630 +++++++++++++++---
 .../inventory_definitions/as_form.html.erb    | 119 ++++
 ...03153001_create_payment_method_settings.rb |   2 +-
 4 files changed, 655 insertions(+), 100 deletions(-)
 mode change 100755 => 100644 app/views/inventory/inventory_definitions/_form.html.erb
 create mode 100755 app/views/inventory/inventory_definitions/as_form.html.erb

diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb
index 1b0e072e..19188d2d 100755
--- a/app/controllers/inventory/inventory_definitions_controller.rb
+++ b/app/controllers/inventory/inventory_definitions_controller.rb
@@ -14,6 +14,8 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
 
   # GET /inventory_definitions/new
   def new
+    @menus    = Menu.all   
+    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
     @inventory_definition = InventoryDefinition.new
   end
 
@@ -42,6 +44,8 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
         format.json { render json: @inventory_definition.errors, status: :unprocessable_entity }
       end
     end
+
+
   end
 
   # PATCH/PUT /inventory_definitions/1
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
old mode 100755
new mode 100644
index 9b42de68..7e686d42
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -1,119 +1,551 @@
-<div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
-    <div class="card">
-      <div class="body">
-        <div class="p-l-10">
-         <%= simple_form_for([:inventory, @inventory_definition]) do |f| %>
-         <%= f.error_notification %>
+<%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
 
-         <div class="form-inputs">
-          <div class="row">
-            <% arr = MenuItem.active.order("name desc").pluck(:name, :item_code) %>
-            <% Product.order("name desc").pluck(:name, :item_code).each do |p| %>
-            <% arr.push(p) %>
-            <% end %>
-            <div class="col-md-4 ">
-              <div class="form-group">
-                <label class="control-label"><abbr title="required">*</abbr>Select Item</label>
-                <select class="form-control item_code_place" id="item">
-                  <% if !@inventory_definition.item_code.nil? %>
-                  <% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code) %>
-                  <% if menuiteminstance.nil? %>
-                  <% code = @inventory_definition.item_code %>
-                  <% else %>
-                  <% code = menuiteminstance.menu_item.item_code %>
-                  <% end %>
-                  <% end %>
-                  <option value=""></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 %>
-                  <% end %>
-                </select>
+<div class="container-fluid " style="padding:0px 3px 0px 3px;">
+  <div id="oqs_loading_wrapper" style="display:none;">
+    <div id="oqs_loading"></div>
+  </div>
+
+  <div class="row m-t--20">
+    <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data"> 
+      <li class="list-menu">
+        <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
+
+          <span class="main_menu" id="main_menu menu_name" >
+            <%if @menu.present? %>
+            <%=@menus[0].name%>
+            <% end%>
+          </span>
+        </a>
+        <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
+          <% @menus.each do |menu| %>
+          <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>" style="">
+           <a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
+         </li>
+         <%end%>
+       </ul>
+     </li> 
+     <div id="menu1-slimscroll" data-height="0">
+      <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
+        <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>
+        <% @menu.each do |menu| %>
+        <% if !menu.valid_time.nil? %>
+        <% if menu.menu_category_id.nil? %>
+        <!--if type quick_service or cashier for table -->
+    
+   
+          <% if !menu.code.include? "SPL" %>
+            <li class="nav-item ">
+              <p class="hidden menu-id"><%= menu.id  %></p> 
+              <a class="nav-link menu_category sub_click first_<%=menu.id%>" data-toggle="tab" href="" role="tab" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <%= menu.name%>
+              </a>
+              <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+              </ul>
+            </li>
+          <% end%>
+       
+        
+        <% end%>
+        <% end %>
+        <%end %>
+      </ul>
+    </div>
+  </div>
+
+
+  <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_cache">
+    <li class="list-menu">
+      <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
+        <span class="main_menu menu_cache_name" id="main_menu menu_cache_name"></span>
+      </a>
+      <ul class="ml-menu menu_list aria-hidden menu_cache_list" style="border-top: 1px solid #fff">
+      </ul>
+    </li> 
+    <div id="menu-slimscroll" data-height="0">
+      <ul class="nav nav-tabs flex-column category_list category_cache_list" role="tablist" id="ul-navbar">
+        <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>
+
+
+ <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
+  <div class="card">
+    <div class="card-block" style="">
+      <div class="card-text" id="custom-slimscroll">
+        <div class="row menu_items_list" style="margin:0px 1px 0px 1px ;">
+         <!-- append data -->
+       
+                  </div>
+                </div>
               </div>
             </div>
-
-            <% sample = [] %>
-            <% if @inventory_definition.item_code.nil? %>
-            <% if !MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code).nil? %>
-            <% sample = MenuItemInstance.where("item_instance_code=?", @inventory_definition.item_code).pluck(:item_instance_name, :item_instance_code) %>
-            <% else %>
-            <% sample = Product.where("item_code=?", @inventory_definition.item_code).pluck(:name, :item_code) %>
-            <% end %>
-            <% end %>
-            <div class="col-md-3"><%= f.input :item_code, collection: sample %></div>
           </div>
 
-          <%= f.input :min_order_level %>
-          <%= f.input :max_stock_level %>
-        </div>
+          <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
 
-        <div class="form-actions">
-          <%= f.submit t("views.btn.submit"), class: 'btn bg-blue waves-effect' %>
-        </div>
+          <div class="card-header" style="padding: 0.12rem 0.25rem">
+            </div>
+         <div class="card-block">
+          <div class="card-text" id="order-detail-slimscroll" data-height="140">
+           <table class="table table-striped summary-items" id="order-items-table" >
+             <thead>
+               <tr>
+                 <th>#</th>
+                 <th class="item-name">Items</th>
+                 <th class="item-qty">QTY</th>
+                 <th class="item-attr">Price</th>
+               </tr>
+             </thead>
+             <tbody class="font-13" >
+
+             </tbody>
+           </table>
+         </div>
+         <div class="card-footer custom-card-footer" style="padding: 0.35rem 0.15rem !important;">
+
+           <table class="table" id="order-charges-table" border="0">
+             <tr>
+               <td colspan="2" style="padding:2px; text-align:" class="charges-name" width="25%"><strong>Total:</strong></td>
+               <td style="padding:2px;" width="15%"><strong id="total_qty">0</strong></td>
+               
+               <td style="padding:2px; text-align:" width="25%" class="item-attr"><strong id="sub_total">0.00</strong></td>
+             </tr>
+           </table>
+           
+           <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+   
+
+
+         </div>
+       </div>
+     </div>
+  <input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
+</div>
+
+<div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+  <div class="modal-dialog custom-modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
+        <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
+        <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
 
-        <% end %>
       </div>
+      <div class="modal-body">
+        <div class="row no-set-item">
+          <div class="col-md-12">
+            <p style="text-align: center;" id="modal_box_img"></p>
+            <div class="row">
+              <div class="input-group">
+              <input type="text" value="" id="item_name" class="item_name form-control  ">
+            </div>
+            <div class="input-group">
+              <input type="text" value="1" id="max_qty" class="max_qty form-control ">
+            </div>
+            <div class="input-group">
+              <input type="text" value="1" id="min_qty" class="min_qty form-control">
+            </div>
+            </div>
+           <p class="hidden" id="unit_price"></p>
+           <p class="hidden" id="instance_code"></p>
+           <p class="hidden" id="instance_name"></p>
+           <p class="hidden" id="promotion_price"></p>
+           <p class="hidden" id="item_instances"></p>
+           <p class="hidden" id="item_code"></p>
+          </div>
+          <div class="col-md-7 item-detail">      
+          <h5>Attributes</h5>           
+          <div class="attributes-list">
+          </div>
+        </div>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <div class="row">
+      <div class="col-md-4">
+        <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
+      </div>
+      <div class="col-md-6">
+        <button type="button" class="btn btn-primary add_to_order " data-dismiss="modal" id="add_to_order">Add to Order</button>
       </div>
     </div>
-</div>
-<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
-  <div class="card">
-    <div class="body">
-     <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i> </h5>
-     <p>
-      1) <%= t("views.right_panel.detail.select_item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %> <br>
-      2) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.item_code_txt2") %> <br>
-      3) <%= t("views.right_panel.detail.min_order") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_order_level_txt") %> <br>
-      4) <%= t("views.right_panel.detail.max_stock") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %><%= t("views.right_panel.detail.max_stock_level_txt") %><br>
-    </p>
-    <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
-    <p>
-      1) <%= t("views.btn.submit") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.inventory") %> <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.home_txt") %> <br>
-    </p>
   </div>
-</div>  
 </div>
 </div>
-
-
+</div>
+<style type="text/css">
+  .fadeInRight{
+  -webkit-animation-duration: 350ms !important;
+  }
+</style>
 <script>
+  var cashier_type = $('#cashier_type').val();
+
+  jQuery(function(){
+    var menus = JSON.parse(localStorage.getItem("menus"));
+    if (menus != null) {
+      var id = menus[0]["categories"][0]["id"];
+          // console.log(id);
+    }else{
+       var id = 1;
+     }
+    jQuery('.first_'+id).click();
+  });
 
   $(document).ready(function () {
-        // $(".item_code_place").select2({
-        //     placeholder: 'Select Item'
-        // });
-        // $("select#inventory_definition_item_code").select2();
+    var menus = JSON.parse(localStorage.getItem("menus"));;
+    if (menus != null) {
+      console.log("hi")
+      menu_cache_append(menus);
+    }else{
+      console.log("sssssss")
+      $("#menu_data").removeClass("hidden");
+    }      
 
-        $(".item_code_place").on('change', function (event) {
-          var ajax_url = "<%= settings_find_item_instance_path	 %>";
-          var item_code = this.value;
-          $.ajax({
-            type: "GET",
-            url: ajax_url,
-            data: 'item_code=' + item_code,
-            success: function (result) {
-              $("#inventory_definition_item_code").empty();
-              var itemlist;
-              for (var i = 0; i < result.length; i++) {
-                itemlist = "<option value ='" + result[i][1] + "'>" + result[i][0] + "</option>";
-                $("select#inventory_definition_item_code").append(itemlist);
-              }
-//                    $("select#inventory_definition_item_code").append(itemlist);
-                    // $("select#inventory_definition_item_code").select2();
+    function menu_cache_append(menus){
+      $("#menu_cache").removeClass("hidden");
+      $(".menu_cache_name").text(menus[0]["name"])       
+      for(var i in menus) {
+        menu_list_template(menus[i]);
+      }
+      var category = menus[0]["categories"];
+
+      for(var ii in category) {
+        if (category[ii]["is_available"]== true){
+          if (category[ii]["valid_time"]== true){
+            if (category[ii]["parent_id"] == null ){                         
+              if (category[ii]["code"].includes("SPL") != true) {
+                category_list_template(category[ii]);
+              }                               
+            }
+          }
+        }
+      }        
+    }
+
+    $(document).on('click', '.menu_click', function(event){
+
+      $('.my-toggle').removeClass('toggled');
+      $('.menu_list').css('display', 'none');
+      var menu_id = $(this).attr("data-id");
+      var name = $(this).attr("data-name");
+      var menus = JSON.parse(localStorage.getItem("menus"));;
+
+      if (menus != null) {  
+      console.log("hi")       
+        menu_click_cache_append(name,menus,menu_id);
+      }else{
+        console.log("sssdfdf")
+        var url = "/origami/addorders/get_menu/"+menu_id;
+        show_menu_cat_list(name, url); 
+      }
+    }); 
+      //End menu category Click
+
+    function menu_click_cache_append(name,menus,menu_id) {
+       var menu_list = $('.menu_items_list');
+       menu_list.empty();
+
+       var menu_cat = $('.category_list');
+       menu_cat.empty();
+
+       $(".main_menu").text(name);
+
+        for(var i in menus) {  
+
+          if (menu_id == menus[i]["id"] && menus[i]["is_active"] == true) {
+
+              // menu_list_template(menus[i]);
+              var category = menus[i]["categories"];
+              
+              for(var ii in category) {                  
+                if (category[ii]["is_available"]== true){                    
+                  if (category[ii]["valid_time"]== true){
+                    if (category[ii]["parent_id"] == null ){   
+                                       
+                        if (category[ii]["code"].includes("SPL") != true) {
+                          category_list_template(category[ii]);
+                        }          
+                     
+                    }
                   }
-                });
+                }
+              }  
+            }
+          }
+        }
+
+    function category_list_template(menu) {
+      row = '<li class="nav-item">'
+      +'<p class="hidden menu-id">'+menu.id+'</p> '
+      +'<a class="nav-link menu_category sub_click first_'+menu.id+'" '
+      +'data-toggle="tab" href="" role="tab" data-id="'+menu.id+'" '
+      +'data-sub-id="'+menu.sub_category+'">'+menu.name+''
+      +'</a>'
+      +'<ul class="sub_category_list hidden fadeInTop animated" '
+      +'id="sub_category_list">'
+      +'</ul>'
+
+      +' </li>';
+      $(".category_cache_list").append(row);           
+    }
+
+    function menu_list_template(menu) {
+       row = '<li class="nav-item menu_click" data-name="'+menu.name+'" '
+       +' data-id="'+menu.id+'" style="">'
+       +' <a class="nav-link" data-toggle="tab" href="" role="tab"'
+       +' style="text-transform: lowercase;">'+menu.name+'</a>'
+       +'</li>';
+       $(".menu_cache_list").append(row);           
+    } 
+
+    //show menu item list when click menu category
+    function show_menu_cat_list(name, url_item){ 
+        var menu_list = $('.menu_items_list');
+        menu_list.empty();
+
+        var menu_cat = $('.category_list');
+        menu_cat.empty();
+
+        $(".main_menu").text(name);
+       
+        //Start Ajax
+      $.ajax({      
+        type: "GET",         
+        url: url_item, 
+        data: {},
+        dataType: "json",
+        success: function(data) {
+          for(var i in data) {  
+            if (data[i].is_available == true) {
+                list = '<li class="nav-item menu_category sub_click" data-id="'+ data[i].id +'">'
+                +'<p class="hidden menu-id">'+ data[i].id +'</p> '
+                +'<a class="nav-link" data-toggle="tab" href="" role="tab"> '+ data[i].name +''
+                +'<ul class=" sub_category_list hidden fadeInTop animated"' 
+                +'id="sub_category_list">'
+                +'</ul>'
+                +'</a>'
+                +'</li>';
+                $('.category_list').append(list);
+            }
+          }
+        }
+      });
+        //end Ajax 
+    }
+    //end show list function 
+
+    //click menu sidebar menu category
+    $(document).on('click', '.menu_category', function(e){
+        e.preventDefault();
+        $('.sub_category_list').addClass("hidden");
+        var menu_id = $(this).attr("data-id");
+        var url     = "get_menu_category/"+menu_id;
+        show_menu_item_list(url,menu_id);
+        var sub_id  = $(this).attr("data-sub-id");
+        if (sub_id == "true") {
+          var sub_url = "get_menu_sub_category/"+menu_id;
+          sub_category = $(this).siblings('.sub_category_list');
+          show_sub_category_list(sub_url,sub_category,menu_id);
+        }
+    });  
+    //End menu category Click
+
+    //click menu sidebar menu category
+    $(document).on('click', '.menu_sub_category', function(event){
+    //   event.preventDefault();
+    // $(".menu_sub_category").on("click", function(){
+      $('.sub_category_list').addClass("hidden");
+      var menu_id = $(this).attr("data-id");
+      var url     = "get_menu_category/"+menu_id;
+      show_menu_item_list(url,menu_id);
+    });  
+      //End menu category Click
+
+    //show menu item list when click menu category
+    function show_menu_item_list(url_item,menu_id){ 
+        var menu_list = $('.menu_items_list');
+        menu_list.empty();
+
+        menus = JSON.parse(localStorage.getItem("menus"));
+        if (menus != null) {
+          for(var i in menus) { 
+            var categories = menus[i]["categories"];
+            for(var ii in categories) { 
+              if (categories[ii]["id"] == menu_id) {
+                var menu_items = categories[ii]["items"];
+                show_menu_list(menu_items);
+              }
+            }
+          }
+        }else{     
+
+          //Start Ajax
+          $.ajax({      
+            type: "GET",         
+            url: url_item, 
+            data: {},
+            dataType: "json",
+            success: function(data) {
+              var menu_items_list = $('.menu_items_list');
+              menu_items_list.empty();
+              menu_items = data.menu_items;
+              show_menu_list(menu_items);
+            }
+          });
+          //end Ajax 
+        }
+      }
+    //end show list function
+    function show_menu_list(menu_items) {
+      var menu_list = $('.menu_items_list');
+      menu_list.empty();
+      for(var field in menu_items) {  
+              if (menu_items[field].is_sub_item == false) {
+                instances = menu_items[field].instances ;
+
+                if (!instances.length > 0) {
+                  swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning");
+                }
+                if (instances.length > 0) {
+                  qty = 1;
+                  options = [];
+                  price = 0;
+
+                  if (JSON.stringify(menu_items[field].item_sets)!='[]') {
+                    fa_plus = '';
+                    add = '';
+                    menu_item_box = 'set_add_icon';
+                    data_target = 'sx_item_set_detailModal';
+                    data_modal = 'modal'
+                    add_icon = "set_item_box"
+                       code            =  menu_items[field].code;
+                       name            =  menu_items[field].name;
+                       instances       =  menu_items[field].instances;
+                        $(instances).each(function(i){
+                          if (instances[i].is_default == true) {
+                            price           = parseFloat(instances[i].price).toFixed(2);
+                          }else{
+                            price = 0;
+                          }
+                        });
+                       is_available    = menu_items[field].is_available ;
+                       is_on_promotion = 0;
+                       item_attributes = menu_items[field].attributes;
+                       promotion_price =  menu_items[field].promotion_price;
+                  }else{
+                    fa_plus = 'material-icons';
+                    add = 'view_list'
+                    menu_item_box = 'menu_item_box';
+                    data_target = 'sx_item_detailModal';
+                    data_modal  = ''
+                    add_icon = "add_icon"
+
+                    $(instances).each(function(i){
+                      if (instances[i].is_default === true) {
+                       code            = instances[i].code;
+                       name            = instances[i].name;
+                       price           = parseFloat(instances[i].price).toFixed(2);
+                       is_available    = instances[i].is_available ;
+                       is_on_promotion = instances[i].is_on_promotion;
+                       item_attributes = instances[i].values;
+                       promotion_price = instances[i].promotion_price;
+                       code            = instances[i].code;
+                     }
+                    });
+                  }
+
+                  if (menu_items[field].image) {                   
+                      image_path = menu_items[field].image;                    
+                    
+                  }else{
+                      image_path = "image/logo.png";
+                  }
+
+                  row = '<div class="col-md-3">'
+                  +'<div class="card custom-card testimonial-card fadeInRight"' 
+                     +'data-toggle="modal" data-target=".'+data_target+'" '
+                     +'style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+                           +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
+                            +'<div class="col-md-10 " style="padding:0px !important;">'+ menu_items[field].name +'</div>'
+                            +"<div class='col-md-2 "+menu_item_box+" ' data-item-code='"
+                          + menu_items[field].code +"' data-instance = '"
+                          +JSON.stringify(menu_items[field].instances)+"' data-id = '"
+                          +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
+                          +JSON.stringify(item_attributes)+"' data-option = '"
+                          +JSON.stringify(menu_items[field].options)+"'data-opt = '"
+                          +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
+                          +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' style='padding:0px 5px 0px 5px'>"
+                            +"<i class='m-l--5 fa "+fa_plus+" '>"
+                            +add+ '</i>'
+                            +'</div>'
+                           +'</div>'
+                        +"<div  class='"+add_icon+" p-t-65 m-r-' data-item-code='"
+                              + menu_items[field].code +"' data-name='"
+                              + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
+                              + price +"' data-instance-code = '"+ code +"' data-instance = '"
+                              + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
+                              + JSON.stringify(item_attributes) +"' data-options = '"
+                              + JSON.stringify(menu_items[field].options) +"' data-opt = '"
+                              + JSON.stringify(menu_items[field].options) +"' data-image='"+image_path+"' data-toggle='"
+                              +data_modal+"' data-target='."+data_target+"' data-item-sets = '"
+                          +JSON.stringify(menu_items[field].item_sets)+"'data-instances = '"
+                          +JSON.stringify(menu_items[field].instances)+"'>"
+
+                          // +"<div class='card-block custom-card-block'>"
+                          //   +"<img id='logo' height='' src='"+image_path+"'>"
+                          // +"</div>"
+
+                        +'</div>'
+                        +'</div>'; ; 
+                  $('.menu_items_list').append(row);
+                }
+                //end instances in menu-items alest 1 instance
+              }
+              //end is_sub_item false
+          }
+       }
+
+
+      $(document).on('click', '.cashier_number', function(event){
+        if(event.handled !== true) {
+          var original_value;
+          original_value = $('#modal-qty').attr('data-value');
+          original_qty   = $('#modal-qty').val();
+          var input_type = $(this).attr("data-type");
+
+          switch (input_type) {
+            case 'num':
+            var input_value = $(this).attr("data-value");
+            if (original_value == "0"){
+              $('#modal-qty').val(input_value);
+              $('#modal-qty').attr('data-value',input_value);
+                // update_total_amount();
+              }else{
+                $('#modal-qty').val(original_qty + input_value);
+                $('#modal-qty').attr('data-value',original_qty + input_value);
+                // update_total_amount();
+              }
+              break;
+              case 'add':
+              
+              case 'del' :
+              
+              case 'clr':
+              $('#modal-qty').val(1);
+              $('#modal-qty').attr('data-value',0);
+              // update_total_amount();
+              break;
+
+            }
+            event.handled = true;
+          } else {
+            return false;
+          }
         });
 
-      });
-
-    </script>
\ No newline at end of file
+    });
+  </script>
\ No newline at end of file
diff --git a/app/views/inventory/inventory_definitions/as_form.html.erb b/app/views/inventory/inventory_definitions/as_form.html.erb
new file mode 100755
index 00000000..9b42de68
--- /dev/null
+++ b/app/views/inventory/inventory_definitions/as_form.html.erb
@@ -0,0 +1,119 @@
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
+        <div class="p-l-10">
+         <%= simple_form_for([:inventory, @inventory_definition]) do |f| %>
+         <%= f.error_notification %>
+
+         <div class="form-inputs">
+          <div class="row">
+            <% arr = MenuItem.active.order("name desc").pluck(:name, :item_code) %>
+            <% Product.order("name desc").pluck(:name, :item_code).each do |p| %>
+            <% arr.push(p) %>
+            <% end %>
+            <div class="col-md-4 ">
+              <div class="form-group">
+                <label class="control-label"><abbr title="required">*</abbr>Select Item</label>
+                <select class="form-control item_code_place" id="item">
+                  <% if !@inventory_definition.item_code.nil? %>
+                  <% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code) %>
+                  <% if menuiteminstance.nil? %>
+                  <% code = @inventory_definition.item_code %>
+                  <% else %>
+                  <% code = menuiteminstance.menu_item.item_code %>
+                  <% end %>
+                  <% end %>
+                  <option value=""></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 %>
+                  <% end %>
+                </select>
+              </div>
+            </div>
+
+            <% sample = [] %>
+            <% if @inventory_definition.item_code.nil? %>
+            <% if !MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code).nil? %>
+            <% sample = MenuItemInstance.where("item_instance_code=?", @inventory_definition.item_code).pluck(:item_instance_name, :item_instance_code) %>
+            <% else %>
+            <% sample = Product.where("item_code=?", @inventory_definition.item_code).pluck(:name, :item_code) %>
+            <% end %>
+            <% end %>
+            <div class="col-md-3"><%= f.input :item_code, collection: sample %></div>
+          </div>
+
+          <%= f.input :min_order_level %>
+          <%= f.input :max_stock_level %>
+        </div>
+
+        <div class="form-actions">
+          <%= f.submit t("views.btn.submit"), class: 'btn bg-blue waves-effect' %>
+        </div>
+
+        <% end %>
+      </div>
+      </div>
+    </div>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+  <div class="card">
+    <div class="body">
+     <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i> </h5>
+     <p>
+      1) <%= t("views.right_panel.detail.select_item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %> <br>
+      2) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.item_code_txt2") %> <br>
+      3) <%= t("views.right_panel.detail.min_order") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_order_level_txt") %> <br>
+      4) <%= t("views.right_panel.detail.max_stock") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %><%= t("views.right_panel.detail.max_stock_level_txt") %><br>
+    </p>
+    <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+    <p>
+      1) <%= t("views.btn.submit") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.inventory") %> <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.home_txt") %> <br>
+    </p>
+  </div>
+</div>  
+</div>
+</div>
+
+
+<script>
+
+  $(document).ready(function () {
+        // $(".item_code_place").select2({
+        //     placeholder: 'Select Item'
+        // });
+        // $("select#inventory_definition_item_code").select2();
+
+        $(".item_code_place").on('change', function (event) {
+          var ajax_url = "<%= settings_find_item_instance_path	 %>";
+          var item_code = this.value;
+          $.ajax({
+            type: "GET",
+            url: ajax_url,
+            data: 'item_code=' + item_code,
+            success: function (result) {
+              $("#inventory_definition_item_code").empty();
+              var itemlist;
+              for (var i = 0; i < result.length; i++) {
+                itemlist = "<option value ='" + result[i][1] + "'>" + result[i][0] + "</option>";
+                $("select#inventory_definition_item_code").append(itemlist);
+              }
+//                    $("select#inventory_definition_item_code").append(itemlist);
+                    // $("select#inventory_definition_item_code").select2();
+                  }
+                });
+        });
+
+      });
+
+    </script>
\ No newline at end of file
diff --git a/db/migrate/20170403153001_create_payment_method_settings.rb b/db/migrate/20170403153001_create_payment_method_settings.rb
index 339a3187..4d765af2 100755
--- a/db/migrate/20170403153001_create_payment_method_settings.rb
+++ b/db/migrate/20170403153001_create_payment_method_settings.rb
@@ -7,7 +7,7 @@ class CreatePaymentMethodSettings < ActiveRecord::Migration[5.1]
       t.string :gateway_url
       t.string :auth_token
       t.string :merchant_account_id
-      t.string :additional_parameters
+      t.json :additional_parameters
       t.timestamps
     end
   end

From 1bf2008a9971dd22cde73b3fadf53eb49452adec Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 17 Sep 2018 11:15:25 +0630
Subject: [PATCH 19/66] update survey

---
 app/controllers/origami/surveys_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 31fa6b9d..222a3a88 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -33,7 +33,7 @@ class Origami::SurveysController < BaseOrigamiController
 	       @table_type       = @dining_facility.type
 	       @receipt_no       = nil
 	       @grand_total      = nil
-	       @survey_data  	 = Survey.find_by_dining_name_and_receipt_no(@dining_facility.name,"")
+	       @survey_data  	 = Survey.find_by_dining_name_and_receipt_no(@dining_facility.name,nil)
 	    end 
 	end
 

From 19fa2ecf54ec1d0eece37b4c3edfac03aac6e1a8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 17 Sep 2018 11:15:34 +0630
Subject: [PATCH 20/66] add credit note payment process for online order

---
 .../origami/credit_payments_controller.rb     |  26 +++
 .../reports/credit_payment_controller.rb      |   4 +-
 .../transactions/credit_notes_controller.rb   |  43 +++--
 app/models/order_reservation.rb               |   9 +-
 app/models/sale.rb                            |  52 ++++--
 .../_shift_sale_report_filter.html.erb        |  14 +-
 .../reports/credit_payment/index.html.erb     |  10 ++
 .../reports/credit_payment/index.xls.erb      |  10 ++
 .../transactions/credit_notes/index.html.erb  | 155 +++++++++++++-----
 config/locales/en.yml                         |   1 +
 config/locales/mm.yml                         |   1 +
 config/routes.rb                              |   1 +
 12 files changed, 248 insertions(+), 78 deletions(-)

diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index 6a885f7b..05faf4f7 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -48,4 +48,30 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     end
   end
 
+  def create_credit_payment
+    arr_sale = JSON.parse(params[:data])
+    if !ShiftSale.current_shift.nil?
+      if !arr_sale.nil?
+        arr_sale.each do |arr_sale|
+          arr_sale.each do |sale|
+            if(Sale.exists?(sale[0]))
+              saleObj = Sale.find(sale[0])
+              remark = "credit note payment for Receipt No #{saleObj.receipt_no}"
+              sale_payment = SalePayment.new
+              @status, @sale = sale_payment.process_payment(saleObj, current_user, sale[1], "cash", remark, true)
+            end
+          end
+        end
+      end
+      if @status
+        render :json => {status: true}
+      else
+        render :json => {status: false, message: 'Some error occurred!'}
+      end
+    else
+      render :json => {status: false, message: 'No current shift open for this employee!'}
+    end
+    
+  end
+
 end
diff --git a/app/controllers/reports/credit_payment_controller.rb b/app/controllers/reports/credit_payment_controller.rb
index ccd2b0b5..7a83474d 100755
--- a/app/controllers/reports/credit_payment_controller.rb
+++ b/app/controllers/reports/credit_payment_controller.rb
@@ -2,6 +2,7 @@ class Reports::CreditPaymentController < BaseReportController
 authorize_resource :class => false
 	def index
 		@filter_for_credit = [['All',''],['Paid','paid'],['Unpaid','unpaid']]
+		@sources = [["All",''], ["Cashier","cashier"],["Quick Service","quick_service"],["Online Order","doemal_order"]]
 		from, to  = get_date_range_from_params
 
 		@shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
@@ -18,7 +19,8 @@ authorize_resource :class => false
 	    end
 
 	    @filter 	= params[:filter_check]
-        @sale_data = Sale.get_by_shift_sale_credit_payment(@shift_sale_range,@shift,from,to,@filter) 
+	    @order_source  = params[:order_source]
+        @sale_data = Sale.get_by_shift_sale_credit_payment(@shift_sale_range,@shift,from,to,@filter,@order_source) 
        
         @from       = from
         @to         = to
diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb
index 27f52f12..f7070e8d 100755
--- a/app/controllers/transactions/credit_notes_controller.rb
+++ b/app/controllers/transactions/credit_notes_controller.rb
@@ -6,27 +6,34 @@ class Transactions::CreditNotesController < ApplicationController
   # GET /transactions/sales
   # GET /transactions/sales.json
   def index
-    
+    @sources = [["All",''], ["Cashier","cashier"],["Quick Service","quick_service"],["Online Order","doemal_order"]]
     @customers = Customer.all
 
-      filter   = params[:filter]
-      customer = params[:customer]
-      from     = params[:from]
-      to       = params[:to]
-
-      if filter.nil? && from.nil? && to.nil? && customer.nil?
-        @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
-             @credit_notes = sale 
-             @credit_notes = Kaminari.paginate_array(@credit_notes).page(params[:page]).per(20)
-           else
-             @credit_notes = 0
-           end  
-      end    
+    filter        = params[:filter]
+    customer      = params[:customer]
+    from          = params[:from]
+    to            = params[:to]
+    order_source  = params[:order_source]
 
+    if filter.nil? && from.nil? && to.nil? && customer.nil? && order_source.nil?
+      @credit_notes = Sale.select("sales.*, orders.source")
+                      .joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id")
+                      .where("(CASE WHEN (sales.grand_total + sales.amount_changed)=(select SUM(sale_payments.payment_amount)
+                                        FROM sale_payments WHERE sale_payments.sale_id=sales.sale_id AND sale_payments.payment_method!='creditnote')
+                                THEN NULL ELSE payment_method='creditnote' END)")
+                      .joins(" JOIN bookings ON bookings.sale_id=sales.sale_id")
+                      .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id")
+                      .joins(" JOIN orders ON orders.order_id=booking_orders.order_id")
+      @credit_notes = Kaminari.paginate_array(@credit_notes).page(params[:page]).per(20)
+    else
+        sale = Sale.search_credit_sales(customer,filter,from,to,order_source) 
+        if !sale.nil?
+           @credit_notes = sale 
+           @credit_notes = Kaminari.paginate_array(@credit_notes).page(params[:page]).per(20)
+         else
+           @credit_notes = 0
+         end  
+    end    
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @credit_notes }
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 2eceb8de..e2db107f 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -64,6 +64,7 @@ class OrderReservation < ApplicationRecord
 			order_reservation.transaction_ref = order_reserve[:reference]
 			if order_reserve[:order_info]
 				order_reservation.item_count = order_reserve[:order_info][:items].count
+				order_reservation.payment_methods = order_reserve[:payment_info][:payment_methods].to_json
 				order_reservation.payment_type = order_reserve[:payment_info][:payment_type]
 				order_reservation.payment_status = order_reserve[:payment_info][:payment_status]
 				order_reservation.payment_ref = order_reserve[:payment_info][:payment_ref]
@@ -164,8 +165,12 @@ class OrderReservation < ApplicationRecord
 	      #end rounding adjustment
 	      
 	      sale_payment = SalePayment.new
-	      sale_payment.process_payment(saleObj, current_user, saleObj.grand_total, "cash")
-
+	      if(order.payment_type == "COD")
+	      	sale_payment.process_payment(saleObj, current_user, saleObj.grand_total, "cash")
+	      else
+	      	remark = "credit payment for Receipt No #{saleObj.receipt_no}"
+	      	@status, @sale = sale_payment.process_payment(saleObj, current_user, saleObj.grand_total, "creditnote", remark)
+	      end
 	      #order status send to doemal
           callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,DELIVERED)
           #order reservation status updated
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 645e52d1..f440eb2f 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -737,7 +737,7 @@ class Sale < ApplicationRecord
 
   end
 
-  def self.search_credit_sales(customer,filter,from,to)
+  def self.search_credit_sales(customer,filter,from,to,order_source="")
     if filter.blank?
         keyword = ''
     else
@@ -750,12 +750,30 @@ class Sale < ApplicationRecord
         custo = "and customer_id = '#{customer}'"
     end
 
-    if from.present? && to.present?
-       sale = Sale.all.joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id")
-              .where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and sp.payment_method = 'creditnote'  #{keyword} #{custo}", from,to)
+    if order_source.blank?
+      source = ""
     else
-      sale = Sale.all.joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id")
-            .where("sp.payment_method ='creditnote' #{keyword} #{custo}")
+      if order_source == "cashier"
+        source = "and orders.source='cashier' or orders.source='emenu'"
+      else
+        source = "and orders.source='#{order_source}'"
+      end
+    end
+
+    if from.present? && to.present?
+       sale = Sale.select("sales.*,orders.source").joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id")
+              .joins(" JOIN bookings ON bookings.sale_id=sales.sale_id")
+              .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id")
+              .joins(" JOIN orders ON orders.order_id=booking_orders.order_id")
+              .where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and (CASE WHEN (sales.grand_total + sales.amount_changed)=(select SUM(sale_payments.payment_amount)
+                                                             FROM sale_payments WHERE sale_payments.sale_id=sales.sale_id AND sale_payments.payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END)  #{keyword} #{custo} #{source}", from,to) 
+    else
+      sale = Sale.select("sales.*,orders.source").joins(" JOIN sale_payments sp on sp.sale_id = sales.sale_id")
+            .joins(" JOIN bookings ON bookings.sale_id=sales.sale_id")
+            .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id")
+            .joins(" JOIN orders ON orders.order_id=booking_orders.order_id")
+            .where("(CASE WHEN (sales.grand_total + sales.amount_changed)=(select SUM(sale_payments.payment_amount)
+                                                             FROM sale_payments WHERE sale_payments.sale_id=sales.sale_id AND sale_payments.payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END) #{keyword} #{custo} #{source}")
     end
   end
 
@@ -1186,7 +1204,7 @@ def self.get_shift_sales_by_receipt_no_detail(shift_sale_range,shift,from,to,pay
     return query
 end
 
-def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter)
+def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,order_source)
   sub_query   = "SELECT (CASE WHEN SUM(payment_amount) > 0 
                   THEN DATE_FORMAT(CONVERT_TZ(sale_payments.created_at,'+00:00','+06:30'),'%d %b %y %h:%i%p') ELSE '-' END)
                  FROM `sale_payments`
@@ -1223,10 +1241,19 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter)
                   INNER JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id
                   WHERE sale_audits.sale_id = s.sale_id) = 0"
   end
-    
+  if order_source.blank?
+    source = ""
+  else
+    if order_source == "cashier"
+      source = "and orders.source='cashier' or orders.source='emenu'"
+    else
+      source = "and orders.source='#{order_source}'"
+    end
+  end
   query = SalePayment.select("s.receipt_no, sale_payments.*,
                               SUM(sale_payments.payment_amount) as payment_amount,
                               s.receipt_date as sale_date,
+                              orders.source as order_source,
                               s.cashier_name as cashier_name,
                               (#{sub_query}) as credit_payment_receipt_date,
                               (#{sub_query1}) as credit_payment,
@@ -1234,13 +1261,16 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter)
                               (#{sub_query2}) as credit_payment_shift_name")
                     .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
                     .joins("INNER JOIN shift_sales ss ON ss.id = s.shift_sale_id")
+                    .joins("INNER JOIN bookings ON bookings.sale_id=s.sale_id")
+                    .joins("INNER JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id")
+                    .joins("INNER JOIN orders ON orders.order_id=booking_orders.order_id")
 
   if shift.present?
-    query = query.where("sale_payments.payment_method= 'creditnote' and s.sale_status = 'completed' #{filter_check} and s.shift_sale_id in (?)",shift.to_a)
+    query = query.where("sale_payments.payment_method= 'creditnote' and s.sale_status = 'completed' #{filter_check} and s.shift_sale_id in (?) #{source}",shift.to_a)
   elsif shift_sale_range.present?
-    query = query.where("sale_payments.payment_method='creditnote' and s.sale_status = 'completed' #{filter_check} and s.shift_sale_id in (?)",shift_sale_range.to_a)
+    query = query.where("sale_payments.payment_method='creditnote' and s.sale_status = 'completed' #{filter_check} and s.shift_sale_id in (?) #{source}",shift_sale_range.to_a)
   else
-    query = query.where("sale_payments.payment_method='creditnote' and s.sale_status = 'completed' #{filter_check} and s.receipt_date between ? and ? ",from,to)
+    query = query.where("sale_payments.payment_method='creditnote' and s.sale_status = 'completed' #{filter_check} and s.receipt_date between ? and ? #{source}",from,to)
   end
   query   = query.group("s.sale_id")
 end
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 8c0c83bd..22ae03ce 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
@@ -24,6 +24,10 @@
 					<%= select_tag "filter_check", options_for_select(@filter_for_credit, :selected => params[:filter_check]), :class => "form-control", :style => "height: 37px;" %>
 				</div>
 				<% end %>
+				<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                  <label class="font-14"><%= t("views.right_panel.detail.order_source") %></label>
+                   <%= select_tag "order_source", options_for_select(@sources, :selected => params[:order_source]), :class => "form-control" %>     
+                </div>
 				<div class="form-group col-md-2">					
 					<!-- <label class="">Select Shift Period</label> -->
 					<label class="font-20">From</label>
@@ -37,12 +41,14 @@
 					<label class="font-20">All Shift</label>
 					<select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;">
 					</select>
-				</div>
-				<div class="form-group col-md-1 ">
+				</div>					
+			</div>	
+			<div class="row clearfix">
+				<div class="form-group col-md-12" align="right">
 				<br>
 					<input type="submit" value="Generate Report" class='btn btn-primary'>
-				</div>							
-			</div>													
+				</div>
+			</div>												
 		<% end %>
 	<% end %>	
 </div>	
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 9d06a6d7..ed8ee8a1 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -47,6 +47,7 @@
 				<tr>
 					<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 				  	<th> <%= t("views.right_panel.detail.receipt_no") %></th>
+				  	<th><%= t("views.right_panel.detail.order_source") %></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>
@@ -70,6 +71,15 @@
 							<td><%= @shift_from  rescue '-'%> -  <%= @shift_to   rescue '-'%></td>
 						<% end %>
 						<td><%= credit.receipt_no rescue '-' %></td>
+						<td>
+							<%if credit.order_source == "cashier" || credit.order_source == "emenu" %>
+                            	Cashier
+                          	<% elsif credit.order_source == "quick_service" %>
+                            	Quick Service
+                          	<% else %>
+                            	Online Order
+                          	<% end %> 
+						</td>
 						<td><%= credit.cashier_name rescue '-' %></td>
 						<td><%= credit.sale.customer.name rescue '-' %></td>
 						<td><%= number_with_precision(credit.payment_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
diff --git a/app/views/reports/credit_payment/index.xls.erb b/app/views/reports/credit_payment/index.xls.erb
index fc0767cd..3e38911a 100755
--- a/app/views/reports/credit_payment/index.xls.erb
+++ b/app/views/reports/credit_payment/index.xls.erb
@@ -19,6 +19,7 @@
 				<tr>
 					<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 				  	<th> <%= t("views.right_panel.detail.receipt_no") %></th>
+				  	<th><%= t("views.right_panel.detail.order_source") %></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>
@@ -42,6 +43,15 @@
 							<td><%= @shift_from  rescue '-'%> -  <%= @shift_to   rescue '-'%></td>
 						<% end %>
 						<td><%= credit.receipt_no rescue '-' %></td>
+						<td>
+							<%if credit.order_source == "cashier" || credit.order_source == "emenu" %>
+                            	Cashier
+                          	<% elsif credit.order_source == "quick_service" %>
+                            	Quick Service
+                          	<% else %>
+                            	Online Order
+                          	<% end %> 
+						</td>
 						<td><%= credit.cashier_name rescue '-' %></td>
 						<td><%= credit.sale.customer.name rescue '-' %></td>
 						<td><%= credit.payment_amount rescue '-' %></td>
diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb
index 0546496e..2df29368 100755
--- a/app/views/transactions/credit_notes/index.html.erb
+++ b/app/views/transactions/credit_notes/index.html.erb
@@ -34,13 +34,17 @@
                          </div>
                          <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                           <label class="font-14"><%= t("views.right_panel.detail.select_customer") %></label>
-                           <select class="selectpicker form-control col-md-12 " name="customer"  style="height: 40px" >
+                           <select class="selectpicker form-control col-md-12" name="customer">
                             <option value=""><%= t("views.right_panel.detail.select_customer") %></option>
                               <%  @customers.each do |customer| %>
                                  <option value="<%= customer.customer_id %>">
                                 <%= customer.name %></option>
                               <%end %>
                             </select>   
+                        </div>
+                        <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                          <label class="font-14"><%= t("views.right_panel.detail.order_source") %></label>
+                           <%= select_tag "order_source", options_for_select(@sources, :selected => params[:order_source]), :class => "form-control" %>     
                         </div>
                          <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                            <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
@@ -67,38 +71,61 @@
         </div>
         <div class="card">
           <div class="table-responsive">
-          <table class="table table-striped">
-            <thead>
-              <tr>
-                <th><%= t("views.right_panel.detail.sale_id") %></th>
-                <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                <th><%= t("views.right_panel.detail.credit_amount") %></th>
-                <th><%= t :cashier %></th>
-                <th><%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
-                <th><%= t("views.right_panel.detail.receipt_date") %></th>
-              </tr>
-            </thead>
-
-            <tbody>
-            <% if @credit_notes != 0 %>
-
-                  <% @credit_notes.each do |sale| %>
-                    <tr>
-                      <td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
-                      <td><%= sale.receipt_no %></td>
-                      <td><%credit = SalePayment.where('sale_id = ? AND payment_method=?', sale.sale_id,"creditnote").first %>
-                        <%= credit.payment_amount rescue '-' %>
-                      </td>
-                      <td><%= sale.cashier_name rescue '-' %></td>
-                      <td><%= link_to sale.customer.name, crm_customer_path(sale.customer_id) %></td>
-                      <td> <%= sale.receipt_date.strftime("%d-%m-%Y %I:%M %p") %> </td>
-                    </tr>
+            <% if (!@credit_notes.empty?) && (params[:order_source] == "doemal_order") %>
+              <div class="row pt-3 pb-3 pr-3 float-right">
+                <div class="col-md-12 col-sm-12 col-lg-12">
+                  <button class="btn btn-lg bg-blue waves-effect credit_payment"><%= t :credit %> <%= t :payment %></button>
+                </div>
+              </div>
+            <% end %>
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <% if params[:order_source] == "doemal_order" %>
+                    <th></th>
                   <% end %>
-              <% else %>
-                    <tr><td colspan="8"><strong><p style="text-align: center"><%= t("views.right_panel.detail.no_data_txt") %>....</p></strong></td></tr>
-              <% end %>
-            </tbody>
-          </table>
+                  <th><%= t("views.right_panel.detail.sale_id") %></th>
+                  <th><%= t("views.right_panel.detail.receipt_no") %></th>
+                  <th><%= t("views.right_panel.detail.credit_amount") %></th>
+                  <th><%= t :cashier %></th>
+                  <th><%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+                  <th><%= t("views.right_panel.detail.order_source") %></th>
+                  <th><%= t("views.right_panel.detail.receipt_date") %></th>
+                </tr>
+              </thead>
+
+              <tbody>
+              <% if @credit_notes != 0 %>
+
+                    <% @credit_notes.each do |sale| %>
+                      <tr>
+                        <% if params[:order_source] == "doemal_order" %>
+                          <td><input type="checkbox" class="" name="chk_order" value="<%= sale.sale_id %>"></td>
+                        <% end %>
+                        <td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
+                        <td><%= sale.receipt_no %></td>
+                        <td class="credit_<%= sale.sale_id %>"><%credit = SalePayment.where('sale_id = ? AND payment_method=?', sale.sale_id,"creditnote").first %>
+                          <%= credit.payment_amount rescue '-' %>
+                        </td>
+                        <td><%= sale.cashier_name rescue '-' %></td>
+                        <td><%= link_to sale.customer.name, crm_customer_path(sale.customer_id) %></td>
+                        <td> 
+                          <%if sale.source == "cashier" || sale.source == "emenu" %>
+                            Cashier
+                          <% elsif sale.source == "quick_service" %>
+                            Quick Service
+                          <% else %>
+                            Online Order
+                          <% end %> 
+                        </td>
+                        <td> <%= sale.receipt_date.strftime("%d-%m-%Y %I:%M %p") %> </td>
+                      </tr>
+                    <% end %>
+                <% else %>
+                      <tr><td colspan="8"><strong><p style="text-align: center"><%= t("views.right_panel.detail.no_data_txt") %>....</p></strong></td></tr>
+                <% end %>
+              </tbody>
+            </table>
            <br>
            <% if @credit_notes != 0 %>
                <%= paginate @credit_notes %>
@@ -109,20 +136,64 @@
 
   </div>
 </div>
-<!-- 
+
 <script type="text/javascript">
+  var arr_sale = [];
   $(function () {
-
-            $('.datepicker').datepicker({
-               format : 'dd-mm-yyyy',
-               autoclose: true
-            });
-            $('.datepicker').attr('ReadOnly','true');
-            $('.datepicker').css('cursor','pointer');
-
+     $("input[name='chk_order']").on('click',function(){
+      var arr = {};
+      if($(this).is(':checked')){
+        arr[$(this).val()] = parseFloat($(".credit_"+$(this).val()).html());
+        // console.log(arr);
+        arr_sale.push(arr);
+      }else{
+        arr[$(this).val()] = parseFloat($(".credit_"+$(this).val()).html());
+        arr_sale = removeItem(arr_sale, arr, $(this).val());
+      }
+      // console.log(arr_sale);
+     });
      
+     $(".credit_payment").on('click', function(){
+        $.ajax({
+          type: 'POST',
+          url: '/origami/payment/credit_payment',
+          data: {data: JSON.stringify(arr_sale)},
+          success: function (result) {
+            // console.log(result);
+            if (result.status == true) {
+              swal({
+                title: "Information!",
+                text: "Credit Payment Successfully",
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
+                window.location.reload();
+              });
+            }else{
+              swal("Opps",result.message,"warning");
+            }
+          }
+        });
+     });
   });
-</script> -->
+
+  function removeItem(arr_item, remove, sale_id){
+    if((arr_item!=undefined) && (arr_item!=null)){
+      if(arr_item.length > 0){
+        $.each(arr_item, function(i_key, i_value){
+          $.each(i_value, function(key,val){
+            if(key == sale_id){
+              arr_item.splice(arr_item.indexOf(key),1);
+            }
+          });
+        });
+      }
+    }
+    return arr_item;
+  }
+</script>
 
 
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8f5127d2..0f6a2f23 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -497,6 +497,7 @@ en:
         out_time: "Out Time"
         transaction_fee: "Transaction Fee"
         checked_by: "Checked By"
+        order_source: "Order Source"
         
         code_txt: "code "
         charge_txt: "charge"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index d5440b72..e9696ae6 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -491,6 +491,7 @@ mm:
         out_time: "Out Time"
         transaction_fee: "Transaction Fee"
         checked_by: "Checked By"
+        order_source: "Order Source"
         
         code_txt: "ကုတ်ဒ် "
         charge_txt: "ကောက်ခံသည်"
diff --git a/config/routes.rb b/config/routes.rb
index 46696f14..60cea417 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -202,6 +202,7 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/junctionpay' => 'junction_pay#create'
     post 'payment/dinga' => 'dinga#create'
     post 'payment/gift_voucher' => 'gift_voucher#create'
+    post 'payment/credit_payment' => 'credit_payments#create_credit_payment'
 
     post 'payment/:type/change_tax' => 'payments#change_tax', :defaults => {:format => 'json'}
 

From 953e3e83f173a52a1ee27c2c653d386f78ae4208 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 17 Sep 2018 11:39:44 +0630
Subject: [PATCH 21/66] add receipt no for online order

---
 app/models/order_reservation.rb                    | 2 +-
 app/views/reports/credit_payment/index.html.erb    | 2 +-
 app/views/reports/credit_payment/index.xls.erb     | 2 +-
 app/views/reports/order_reservation/index.html.erb | 4 +++-
 app/views/reports/order_reservation/index.xls.erb  | 4 +++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index e2db107f..1db61331 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -408,7 +408,7 @@ class OrderReservation < ApplicationRecord
 	    	end
 	    end
 
-	    query = OrderReservation.select("order_reservations.*, sales.receipt_date, deliveries.provider, deliveries.delivery_fee, customers.name, customers.email")
+	    query = OrderReservation.select("order_reservations.*, sales.receipt_date, sales.receipt_no, deliveries.provider, deliveries.delivery_fee, customers.name, customers.email")
 	    						.joins(" JOIN deliveries on deliveries.order_reservation_id = order_reservations.order_reservation_id")
 	    						.joins(" JOIN customers on customers.customer_id = order_reservations.customer_id")
 	    						.joins(" JOIN sales on sales.sale_id = order_reservations.sale_id")
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index ed8ee8a1..d7926361 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -90,7 +90,7 @@
 				  </tr>
 				<% end %>
 				<tr>
-					<td colspan="4"><b>Total</b></td>
+					<td colspan="5"><b>Total</b></td>
 					<td colspan="4"><b><%= number_with_precision(total_credit_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 					<td><b><%= number_with_precision(total_credit_payment, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 				</tr>
diff --git a/app/views/reports/credit_payment/index.xls.erb b/app/views/reports/credit_payment/index.xls.erb
index 3e38911a..d2d9f5cb 100755
--- a/app/views/reports/credit_payment/index.xls.erb
+++ b/app/views/reports/credit_payment/index.xls.erb
@@ -62,7 +62,7 @@
 				  </tr>
 				<% end %>
 				<tr>
-					<td colspan="4"><b>Total</b></td>
+					<td colspan="5"><b>Total</b></td>
 					<td colspan="4"><b><%= total_credit_amount rescue '-' %></b></td>
 					<td><b><%= total_credit_payment rescue '-' %></b></td>
 				</tr>
diff --git a/app/views/reports/order_reservation/index.html.erb b/app/views/reports/order_reservation/index.html.erb
index 07dba055..bb6265e0 100755
--- a/app/views/reports/order_reservation/index.html.erb
+++ b/app/views/reports/order_reservation/index.html.erb
@@ -42,6 +42,7 @@
 
 						<tr>
 							<th><%= t("views.right_panel.detail.receipt_date") %></th>
+							<th> <%= t("views.right_panel.detail.receipt_no") %></th>
 							<th><%= t :reference_number %></th>
 							<th><%= t :customer %></th>
 							<!-- <th><%= t("views.right_panel.detail.type") %></th> -->
@@ -139,6 +140,7 @@
 								%>
 								<tr>
 									<td><%= order_reservation.receipt_date.utc.getlocal.strftime("%Y-%m-%d") %></td>
+									<td><%= order_reservation.receipt_no %></td>
 									<td><%= order_reservation.transaction_ref %></td>
 									<td><%= order_reservation.name %></td>
 									<!-- <td><%= order_reservation.order_reservation_type %></td> -->
@@ -160,7 +162,7 @@
 						end %>
 
 						<tr>
-							<td colspan="6"><b>Total</b></td>
+							<td colspan="7"><b>Total</b></td>
 							<td><b><%= number_with_precision(total_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
 							<td><b><%= number_with_precision(total_discount_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
 							<td><b><%= number_with_precision(total_delivery_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
diff --git a/app/views/reports/order_reservation/index.xls.erb b/app/views/reports/order_reservation/index.xls.erb
index bd27fa36..285caf8e 100755
--- a/app/views/reports/order_reservation/index.xls.erb
+++ b/app/views/reports/order_reservation/index.xls.erb
@@ -25,6 +25,7 @@
 
 						<tr>
 							<th><%= t("views.right_panel.detail.receipt_date") %></th>
+							<th> <%= t("views.right_panel.detail.receipt_no") %></th>
 							<th><%= t :reference_number %></th>
 							<th><%= t :customer %></th>
 							<!-- <th><%= t("views.right_panel.detail.type") %></th> -->
@@ -115,6 +116,7 @@
 								%>
 								<tr>
 									<td><%= order_reservation.receipt_date.utc.getlocal.strftime("%Y-%m-%d") %></td>
+									<td><%= order_reservation.receipt_no %></td>
 									<td><%= order_reservation.transaction_ref %></td>
 									<td><%= order_reservation.name %></td>
 									<!-- <td><%= order_reservation.order_reservation_type %></td> -->
@@ -136,7 +138,7 @@
 						end %>
 
 						<tr>
-							<td colspan="6"><b>Total</b></td>
+							<td colspan="7"><b>Total</b></td>
 							<td><b><%= total_amount rescue '0.0'%></b></td>
 							<td><b><%= total_discount_amount rescue '0.0'%></b></td>
 							<td><b><%= total_delivery_fee rescue '0.0'%></b></td>

From 7cb23e5add920f4844f8dbe6a089793cc26afac6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 17 Sep 2018 11:51:34 +0630
Subject: [PATCH 22/66] remove payment methods

---
 app/models/order_reservation.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 1db61331..3185671f 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -64,7 +64,6 @@ class OrderReservation < ApplicationRecord
 			order_reservation.transaction_ref = order_reserve[:reference]
 			if order_reserve[:order_info]
 				order_reservation.item_count = order_reserve[:order_info][:items].count
-				order_reservation.payment_methods = order_reserve[:payment_info][:payment_methods].to_json
 				order_reservation.payment_type = order_reserve[:payment_info][:payment_type]
 				order_reservation.payment_status = order_reserve[:payment_info][:payment_status]
 				order_reservation.payment_ref = order_reserve[:payment_info][:payment_ref]

From 7256469c4a3baeb4681c3275400d3d5ea5b6283f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 19 Sep 2018 10:26:04 +0630
Subject: [PATCH 23/66] change credit payment report query

---
 app/models/sale.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index f440eb2f..d4880929 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1219,11 +1219,12 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,
 
   sub_query2 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL AND credit_payment > 0
                         THEN CONCAT(DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'),' - ',DATE_FORMAT(CONVERT_TZ(shift_closed_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'))
+                        WHEN shift_started_at IS NOT NULL AND shift_closed_at IS NULL AND credit_payment > 0 THEN DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p') 
                         ELSE '-' END)
                 FROM shift_sales
                       WHERE shift_sales.id = s.shift_sale_id"
 
-  sub_query3 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL AND credit_payment > 0
+  sub_query3 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL OR shift_closed_at IS NULL AND credit_payment > 0
                 THEN employees.name ELSE '-' END)
                FROM shift_sales
                  INNER JOIN employees ON employees.id=shift_sales.employee_id

From ee56ccea21401de8d3027388bf6846267be33b0b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 19 Sep 2018 10:32:44 +0630
Subject: [PATCH 24/66] update inventory form

---
 .../inventory_definitions/_form.html.erb      | 411 +++++++++---------
 .../{as_form.html.erb => aa_form.html.erb}    |   0
 2 files changed, 213 insertions(+), 198 deletions(-)
 rename app/views/inventory/inventory_definitions/{as_form.html.erb => aa_form.html.erb} (100%)

diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index 7e686d42..245aeb18 100644
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -1,181 +1,123 @@
 <%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
 
-<div class="container-fluid " style="padding:0px 3px 0px 3px;">
-  <div id="oqs_loading_wrapper" style="display:none;">
-    <div id="oqs_loading"></div>
-  </div>
-
-  <div class="row m-t--20">
-    <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data"> 
-      <li class="list-menu">
-        <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
-
-          <span class="main_menu" id="main_menu menu_name" >
-            <%if @menu.present? %>
-            <%=@menus[0].name%>
-            <% end%>
-          </span>
-        </a>
-        <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
-          <% @menus.each do |menu| %>
-          <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>" style="">
-           <a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
-         </li>
-         <%end%>
-       </ul>
-     </li> 
-     <div id="menu1-slimscroll" data-height="0">
-      <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
-        <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>
-        <% @menu.each do |menu| %>
-        <% if !menu.valid_time.nil? %>
-        <% if menu.menu_category_id.nil? %>
-        <!--if type quick_service or cashier for table -->
-    
-   
-          <% if !menu.code.include? "SPL" %>
-            <li class="nav-item ">
-              <p class="hidden menu-id"><%= menu.id  %></p> 
-              <a class="nav-link menu_category sub_click first_<%=menu.id%>" data-toggle="tab" href="" role="tab" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <%= menu.name%>
-              </a>
-              <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-              </ul>
-            </li>
-          <% end%>
-       
-        
-        <% end%>
-        <% end %>
-        <%end %>
-      </ul>
+  <div class="container-fluid " style="padding:0px 3px 0px 3px;">
+    <div id="oqs_loading_wrapper" style="display:none;">
+      <div id="oqs_loading"></div>
     </div>
-  </div>
+    <div class="row m-t--20">
+      <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data"> 
+        <li class="list-menu">
+          <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
 
-
-  <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_cache">
-    <li class="list-menu">
-      <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
-        <span class="main_menu menu_cache_name" id="main_menu menu_cache_name"></span>
-      </a>
-      <ul class="ml-menu menu_list aria-hidden menu_cache_list" style="border-top: 1px solid #fff">
-      </ul>
-    </li> 
-    <div id="menu-slimscroll" data-height="0">
-      <ul class="nav nav-tabs flex-column category_list category_cache_list" role="tablist" id="ul-navbar">
-        <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>
-
-
- <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
-  <div class="card">
-    <div class="card-block" style="">
-      <div class="card-text" id="custom-slimscroll">
-        <div class="row menu_items_list" style="margin:0px 1px 0px 1px ;">
-         <!-- append data -->
-       
-                  </div>
-                </div>
+            <span class="main_menu" id="main_menu menu_name" >
+              <%if @menu.present? %>
+              <%=@menus[0].name%>
+              <% end%>
+            </span>
+          </a>
+          <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
+            <% @menus.each do |menu| %>
+            <li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>" style="">
+             <a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
+           </li>
+           <%end%>
+         </ul>
+        </li> 
+        <div id="menu1-slimscroll" data-height="0">
+          <ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
+            <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>
+            <% @menu.each do |menu| %>
+              <% if !menu.valid_time.nil? %>
+                <% if menu.menu_category_id.nil? %>
+                  <!--if type quick_service or cashier for table -->
+                  <% if !menu.code.include? "SPL" %>
+                    <li class="nav-item ">
+                      <p class="hidden menu-id"><%= menu.id  %></p> 
+                      <a class="nav-link menu_category sub_click first_<%=menu.id%>" data-toggle="tab" href="" role="tab" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <%= menu.name%>
+                      </a>
+                      <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list"></ul>
+                    </li>
+                  <% end%>
+                <% end%>
+              <% end %>
+            <%end %>
+          </ul>
+        </div>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_cache">
+        <li class="list-menu">
+          <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
+            <span class="main_menu menu_cache_name" id="main_menu menu_cache_name"></span>
+          </a>
+          <ul class="ml-menu menu_list aria-hidden menu_cache_list" style="border-top: 1px solid #fff">
+          </ul>
+        </li> 
+        <div id="menu-slimscroll" data-height="0">
+          <ul class="nav nav-tabs flex-column category_list category_cache_list" role="tablist" id="ul-navbar">
+            <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>
+      <div class="col-md-9 col-lg-9 col-sm-9 m-t-10" >
+        <div class="card">
+          <div class="card-block" style="">
+            <div class="card-text" id="custom-slimscroll">
+              <div class="row menu_items_list" style="margin:0px 1px 0px 1px ;">
+             <!-- append data -->
               </div>
             </div>
           </div>
-
-          <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
-
-          <div class="card-header" style="padding: 0.12rem 0.25rem">
-            </div>
-         <div class="card-block">
-          <div class="card-text" id="order-detail-slimscroll" data-height="140">
-           <table class="table table-striped summary-items" id="order-items-table" >
-             <thead>
-               <tr>
-                 <th>#</th>
-                 <th class="item-name">Items</th>
-                 <th class="item-qty">QTY</th>
-                 <th class="item-attr">Price</th>
-               </tr>
-             </thead>
-             <tbody class="font-13" >
-
-             </tbody>
-           </table>
-         </div>
-         <div class="card-footer custom-card-footer" style="padding: 0.35rem 0.15rem !important;">
-
-           <table class="table" id="order-charges-table" border="0">
-             <tr>
-               <td colspan="2" style="padding:2px; text-align:" class="charges-name" width="25%"><strong>Total:</strong></td>
-               <td style="padding:2px;" width="15%"><strong id="total_qty">0</strong></td>
-               
-               <td style="padding:2px; text-align:" width="25%" class="item-attr"><strong id="sub_total">0.00</strong></td>
-             </tr>
-           </table>
-           
-           <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
-   
-
-
-         </div>
-       </div>
-     </div>
-  <input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
-</div>
-
-<div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-  <div class="modal-dialog custom-modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
-        <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
-        <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
-
+        </div>
       </div>
-      <div class="modal-body">
-        <div class="row no-set-item">
-          <div class="col-md-12">
-            <p style="text-align: center;" id="modal_box_img"></p>
-            <div class="row">
-              <div class="input-group">
-              <input type="text" value="" id="item_name" class="item_name form-control  ">
-            </div>
-            <div class="input-group">
-              <input type="text" value="1" id="max_qty" class="max_qty form-control ">
-            </div>
-            <div class="input-group">
-              <input type="text" value="1" id="min_qty" class="min_qty form-control">
-            </div>
-            </div>
-           <p class="hidden" id="unit_price"></p>
-           <p class="hidden" id="instance_code"></p>
-           <p class="hidden" id="instance_name"></p>
-           <p class="hidden" id="promotion_price"></p>
-           <p class="hidden" id="item_instances"></p>
-           <p class="hidden" id="item_code"></p>
+      <input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
+    </div>
+
+    <div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+      <div class="modal-dialog custom-modal-dialog modal-lg">
+        <div class="modal-content">
+          <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
+            <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
+            <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
           </div>
-          <div class="col-md-7 item-detail">      
-          <h5>Attributes</h5>           
-          <div class="attributes-list">
+          <div class="modal-body">
+            <div class="form-inputs">
+              <div class="form-group">
+                <label class="control-label" for="attribute">Menu Item</label>
+                <input class="form-control col-md-6" type="text" value="" id="item_name" readonly="true">
+                <input type="hidden" value="" id="item_code">
+                <input type="hidden" value="" id="instance_code">
+              </div>
+              <div class="form-group">
+                <label class="control-label" for="attribute">Instances</label>
+                <div class="attributes-list col-md-6"></div>
+              </div>
+              <div class="form-group">
+                <label class="control-label" for="min_qty">Min Qty</label>
+                <input class="form-control col-md-6" type="number" value="1" id="min_qty">
+              </div>
+              <div class="form-group">
+              <label class="control-label" for="max_qty">Max Qty</label>
+              <input class="form-control col-md-6" type="number" value="1" id="max_qty">
+              </div>
+            </div>
+          </div>
+          <div class="modal-footer">
+            <div class="row">
+              <div class="col-md-4">
+                <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
+              </div>
+              <div class="col-md-6">
+                <button type="button" class="btn btn-primary submit " data-dismiss="modal" id="submit">Submit</button>
+              </div>
+            </div>
           </div>
         </div>
-    </div>
-  </div>
-  <div class="modal-footer">
-    <div class="row">
-      <div class="col-md-4">
-        <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
-      </div>
-      <div class="col-md-6">
-        <button type="button" class="btn btn-primary add_to_order " data-dismiss="modal" id="add_to_order">Add to Order</button>
       </div>
     </div>
-  </div>
-</div>
-</div>
-</div>
 <style type="text/css">
   .fadeInRight{
   -webkit-animation-duration: 350ms !important;
@@ -198,10 +140,8 @@
   $(document).ready(function () {
     var menus = JSON.parse(localStorage.getItem("menus"));;
     if (menus != null) {
-      console.log("hi")
       menu_cache_append(menus);
     }else{
-      console.log("sssssss")
       $("#menu_data").removeClass("hidden");
     }      
 
@@ -415,28 +355,6 @@
                   options = [];
                   price = 0;
 
-                  if (JSON.stringify(menu_items[field].item_sets)!='[]') {
-                    fa_plus = '';
-                    add = '';
-                    menu_item_box = 'set_add_icon';
-                    data_target = 'sx_item_set_detailModal';
-                    data_modal = 'modal'
-                    add_icon = "set_item_box"
-                       code            =  menu_items[field].code;
-                       name            =  menu_items[field].name;
-                       instances       =  menu_items[field].instances;
-                        $(instances).each(function(i){
-                          if (instances[i].is_default == true) {
-                            price           = parseFloat(instances[i].price).toFixed(2);
-                          }else{
-                            price = 0;
-                          }
-                        });
-                       is_available    = menu_items[field].is_available ;
-                       is_on_promotion = 0;
-                       item_attributes = menu_items[field].attributes;
-                       promotion_price =  menu_items[field].promotion_price;
-                  }else{
                     fa_plus = 'material-icons';
                     add = 'view_list'
                     menu_item_box = 'menu_item_box';
@@ -456,7 +374,6 @@
                        code            = instances[i].code;
                      }
                     });
-                  }
 
                   if (menu_items[field].image) {                   
                       image_path = menu_items[field].image;                    
@@ -466,19 +383,19 @@
                   }
 
                   row = '<div class="col-md-3">'
-                  +'<div class="card custom-card testimonial-card fadeInRight"' 
+                  +'<div class="card custom-card testimonial-card fadeInRight card-box"' 
                      +'data-toggle="modal" data-target=".'+data_target+'" '
                      +'style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
                            +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
                             +'<div class="col-md-10 " style="padding:0px !important;">'+ menu_items[field].name +'</div>'
                             +"<div class='col-md-2 "+menu_item_box+" ' data-item-code='"
-                          + menu_items[field].code +"' data-instance = '"
-                          +JSON.stringify(menu_items[field].instances)+"' data-id = '"
-                          +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
-                          +JSON.stringify(item_attributes)+"' data-option = '"
-                          +JSON.stringify(menu_items[field].options)+"'data-opt = '"
-                          +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
-                          +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' style='padding:0px 5px 0px 5px'>"
+                              + menu_items[field].code +"' data-instance = '"
+                              +JSON.stringify(menu_items[field].instances)+"' data-id = '"
+                              +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
+                              +JSON.stringify(item_attributes)+"' data-option = '"
+                              +JSON.stringify(menu_items[field].options)+"'data-opt = '"
+                              +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
+                              +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' style='padding:0px 5px 0px 5px'>"
                             +"<i class='m-l--5 fa "+fa_plus+" '>"
                             +add+ '</i>'
                             +'</div>'
@@ -509,6 +426,96 @@
           }
        }
 
+       //click item row for add order
+      $(document).on('click', '.card-box', function(event){ 
+
+        item_data =  $(this).children().siblings('.add_icon');
+
+        $('#item_code').val(item_data.attr('data-item-code'));
+        $('#item_name').val(item_data.attr('data-name'));
+        $('#instance_code').val(item_data.attr('data-instance-code'));
+
+        $('.attributes-list').empty();
+
+        data =  $(this).children().children('.menu_item_box');
+        // data =  $(this).parent().siblings('.add_icon');
+
+        attributes         = $(data).data('id');
+        selected_item      = $(data).data('item');
+        instances          = $(data).data('instance');
+
+        instance_attributes = []
+        for(var field in instances) { 
+          value = instances[field].values;
+          $(value).each(function(i){
+             options = value[i];
+             instance_attributes.push(options);
+          });
+        }
+
+        for(var field in attributes) { 
+          value = attributes[field]["values"];
+          type  = attributes[field]["type"]
+          row = "";
+
+          $(value).each(function(i){
+            disabled = ""
+            status ="";
+            if(parseInt(jQuery.inArray(value[i], selected_item)) !== -1){
+              status = "selected-attribute";
+            }
+            if(parseInt(jQuery.inArray(value[i], instance_attributes)) == -1){
+              disabled = "disabled";
+            }
+            row +="<button id='selected-attribute' data-instances='"+JSON.stringify(instances)+"' data-type='"
+            +type+"' data-value='"+value[i]+"' class='btn btn- waves-effect attribute_btn "
+            + status +" "+ type +" '"+ disabled +" >"
+            +value[i]
+            +"</button>";   
+          });
+          $(".attributes-list").append(row); 
+        }
+      });
+
+      // click select option icon for add 
+      $(document).on('click', '.attribute_btn', function(event){ 
+
+        // $('.change_qty').val(1);
+        value      = $(this).data('value');
+        type       = $(this).data('type');
+        instances  = $(this).data('instances');
+        
+        attributes = $(".attribute_btn");
+        $(attributes).each(function(i){
+          if ($(attributes[i]).attr('data-type')==type){
+            $('.'+type).removeClass("selected-attribute");
+          }
+        });
+        $(this).addClass('selected-attribute');
+        
+        var selected_attr = get_selected_attributes('selected-attribute');
+
+        for(var field in instances) { 
+          item_attr = instances[field].values;
+          
+          if(JSON.stringify(item_attr) == JSON.stringify(selected_attr)){
+            $('#instance_code').val(instances[field].code);
+          }     
+        }
+        
+      }); //End selecct attribute buttom
+
+       // Get Selected Class
+      function get_selected_attributes(selected_class) {
+        var item_row      = $('.'+selected_class);
+        var attribute_arr = [];
+        $(item_row).each(function(i){
+          value = $(item_row[i]).attr('data-value');
+          str = value;
+          attribute_arr.push(str);
+        });
+        return attribute_arr;
+      }
 
       $(document).on('click', '.cashier_number', function(event){
         if(event.handled !== true) {
@@ -546,6 +553,14 @@
             return false;
           }
         });
+         
+      // click select option icon for add 
+      $(document).on('click', '.submit', function(event){ 
+        var params = {'order_source': type, 'order_type': "dine_in",
+                  'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id,
+                  'table_id': table_id, 
+                  'order_items': order_items,'create_type' : "create_only" };
+      });
 
     });
   </script>
\ No newline at end of file
diff --git a/app/views/inventory/inventory_definitions/as_form.html.erb b/app/views/inventory/inventory_definitions/aa_form.html.erb
similarity index 100%
rename from app/views/inventory/inventory_definitions/as_form.html.erb
rename to app/views/inventory/inventory_definitions/aa_form.html.erb

From 06955ea3e33a421ab9078f943989b8caed58d544 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 19 Sep 2018 10:33:37 +0630
Subject: [PATCH 25/66] update payment url

---
 app/models/sale_payment.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 81ec783a..5a0fe2ba 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -235,7 +235,7 @@ class SalePayment < ApplicationRecord
       customer_data = Customer.find_by_customer_id(sale_data.customer_id)
       if !membership_actions_data.nil?
 
-        url = "paypar_url.to_s" + membership_actions_data.gateway_url.to_s
+        url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
         merchant_uid = membership_actions_data.merchant_account_id
         auth_token = membership_actions_data.auth_token
 

From e7ef645200be2c95066b28f6e7e8be675b583a23 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 19 Sep 2018 10:40:45 +0630
Subject: [PATCH 26/66] change query for credit payment report

---
 app/models/sale.rb                              | 1 -
 app/views/reports/credit_payment/index.html.erb | 8 +++++++-
 app/views/reports/credit_payment/index.xls.erb  | 8 +++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index d4880929..6c55c7b7 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1219,7 +1219,6 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,
 
   sub_query2 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL AND credit_payment > 0
                         THEN CONCAT(DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'),' - ',DATE_FORMAT(CONVERT_TZ(shift_closed_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'))
-                        WHEN shift_started_at IS NOT NULL AND shift_closed_at IS NULL AND credit_payment > 0 THEN DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p') 
                         ELSE '-' END)
                 FROM shift_sales
                       WHERE shift_sales.id = s.shift_sale_id"
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index d7926361..53a101d4 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -83,7 +83,13 @@
 						<td><%= credit.cashier_name rescue '-' %></td>
 						<td><%= credit.sale.customer.name rescue '-' %></td>
 						<td><%= number_with_precision(credit.payment_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-						<td><%= credit.credit_payment_shift_name rescue '-' %></td>
+						<td>
+							<%if credit.credit_payment_shift_name == '-' %>
+								<%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p")  rescue '-'%>
+							<% else %>
+								<%= credit.credit_payment_shift_name rescue '-' %>
+							<% end %>
+						</td>
 						<td><%= credit.credit_payment_receipt_date rescue '-' %></td>
 						<td><%= credit.credit_payment_cashier_name rescue '-' %></td>
 						<td><%= number_with_precision(credit.credit_payment, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
diff --git a/app/views/reports/credit_payment/index.xls.erb b/app/views/reports/credit_payment/index.xls.erb
index d2d9f5cb..41d4620f 100755
--- a/app/views/reports/credit_payment/index.xls.erb
+++ b/app/views/reports/credit_payment/index.xls.erb
@@ -55,7 +55,13 @@
 						<td><%= credit.cashier_name rescue '-' %></td>
 						<td><%= credit.sale.customer.name rescue '-' %></td>
 						<td><%= credit.payment_amount rescue '-' %></td>
-						<td><%= credit.credit_payment_shift_name rescue '-' %></td>
+						<td>
+							<%if credit.credit_payment_shift_name == '-' %>
+								<%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p")  rescue '-'%>
+							<% else %>
+								<%= credit.credit_payment_shift_name rescue '-' %>
+							<% end %>
+						</td>
 						<td><%= credit.credit_payment_receipt_date rescue '-' %></td>
 						<td><%= credit.credit_payment_cashier_name rescue '-' %></td>
 						<td><%= credit.credit_payment rescue '-' %></td>

From 95d01b9ffd0820d9274d9f4ba3fbab2a7da7b186 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 19 Sep 2018 15:13:13 +0630
Subject: [PATCH 27/66] update oqs btn

---
 app/assets/javascripts/OQS.js                          | 4 ++--
 app/assets/javascripts/channels/order_queue_station.js | 4 ++--
 app/views/oqs/home/index.html.erb                      | 8 +++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 183e7412..d2a22aef 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -230,8 +230,8 @@ $(document).on('turbolinks:load', function() {
 
 	                    +'<div class="card-footer ">'
 	                      +'<span class="'+delivery_status+'">'
-	                        +'<button id="edit_'+ data[field]["assigned_order_item_id"] + '" data-no-turbolink="true" class="btn btn-warning order-item order-item-edit">EDIT</button>'
-	                        +' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+	                        +'<button id="edit_'+ data[field]["assigned_order_item_id"] + '" data-no-turbolink="true" class="oqs-btn btn-warning order-item order-item-edit">EDIT</button>'
+	                        +' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="oqs-btn btn-primary order-item order-complete">COMPLETE</button>'
 	                      +'</span>'
 	                    +'</div>'
 
diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js
index ccb3b0d3..c17ca42c 100755
--- a/app/assets/javascripts/channels/order_queue_station.js
+++ b/app/assets/javascripts/channels/order_queue_station.js
@@ -68,8 +68,8 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
   		  		+'</div>'
 
   		  		+'<div class="card-footer">'
-  		  		+'<button id="edit_'+ items[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
-  		  		+' <button id="assigned_queue_' + items[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+  		  		+'<button id="edit_'+ items[field]["assigned_order_item_id"]+'" class="oqs-btn btn-warning order-item order-item-edit">EDIT</button>'
+  		  		+' <button id="assigned_queue_' + items[field]["assigned_order_item_id"] +'" class="oqs-btn btn-primary order-item order-complete">COMPLETE</button>'
   		  		+'</div>'
   			    +'</div>'; 
     		  $('.oqs_append').append(row);
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 7f2ea4e1..500772c3 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -200,4 +200,10 @@
   document.getElementById("defaultOpen").click();
   
  
-</script>
\ No newline at end of file
+</script>
+
+<style type="text/css">
+ .oqs-btn {
+   padding: .46875rem 0.25rem;color: #fff !important;position: relative;margin-bottom: .3125rem;font-size: .875rem;text-decoration: none;text-transform: uppercase;letter-spacing: 0;cursor: pointer;border: 0;
+ }
+</style>
\ No newline at end of file

From 5a155f596dd29116555b618be26500bcba503a62 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 20 Sep 2018 16:52:15 +0630
Subject: [PATCH 28/66] update inventory form and list

---
 .../inventory/inventory_controller.rb         | 29 ++++++--
 .../inventory/stock_checks_controller.rb      |  5 +-
 app/models/stock_check_item.rb                | 14 ++++
 .../inventory/_inventory_list.html.erb        | 44 +++++++++----
 app/views/inventory/inventory/index.html.erb  | 10 +--
 .../inventory_definitions/_form.html.erb      | 66 +++++++++++--------
 ...{aa_form.html.erb => backup_form.html.erb} |  0
 .../inventory/stock_checks/show.html.erb      | 20 +++---
 8 files changed, 131 insertions(+), 57 deletions(-)
 rename app/views/inventory/inventory_definitions/{aa_form.html.erb => backup_form.html.erb} (100%)

diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb
index 98a60c4e..ed6347cc 100755
--- a/app/controllers/inventory/inventory_controller.rb
+++ b/app/controllers/inventory/inventory_controller.rb
@@ -12,13 +12,34 @@ class Inventory::InventoryController < BaseInventoryController
     @inventory_definitions = InventoryDefinition.select("inventory_definitions.*,
    							(CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit,
    							(CASE WHEN sj.debit IS NULL THEN 0 ELSE sj.debit END) as debit,
-   							(#{least_stock}) as balance")
-   							.joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id")
-   							.group("inventory_definitions.item_code")
-                .order("balance ASC")
+   							(#{least_stock}) as balance,"+
+                "acc.title as account_name,mi.name as item_name,
+                 mii.item_instance_name as instance_name," +
+                "mc.name as menu_category_name,mc.id as menu_category_id "
+                )
+   							.joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id")                
+                .joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
+                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+                .joins(" JOIN accounts acc ON acc.id = mi.account_id")
+   							.group("mi.menu_category_id,inventory_definitions.item_code")
+                .order("acc.title desc,mi.menu_category_id desc,balance ASC")
 
   end
 
+#   def self.get_item_query(type)
+ 
+#   query = Sale.select("acc.title as account_name,mi.name as item_name,mii.item_instance_name as instance_name" +
+#                      "mc.name as menu_category_name,mc.id as menu_category_id ")
+
+#   query = query.joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
+#                      " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+#                      " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+#   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
+#   query = query.group("acc.title,mi.account_id,mi.menu_category_id")
+#                .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc")
+# end
+
   def show
     inventory_definition_id = params[:inventory_definition_id]
     inventory = InventoryDefinition.find(inventory_definition_id)
diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb
index d5ff6946..d8a56cc6 100755
--- a/app/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -12,7 +12,10 @@ class Inventory::StockChecksController < BaseInventoryController
   end
 
   def show
-    @check = StockCheck.find(params[:id])
+     @check = StockCheck.find(params[:id])
+
+    @stock_check_items = StockCheckItem.get_items_with_category(params[:id])
+
   end
 
   def save_to_journal
diff --git a/app/models/stock_check_item.rb b/app/models/stock_check_item.rb
index 9db680d2..b9a95ef2 100755
--- a/app/models/stock_check_item.rb
+++ b/app/models/stock_check_item.rb
@@ -43,4 +43,18 @@ class StockCheckItem < ApplicationRecord
     end
     transaction
   end
+
+  def self.get_items_with_category(id)
+  query =   StockCheckItem.select("stock_check_items.*,acc.title as account_name,mi.name as item_name,
+                 mii.item_instance_name as instance_name," +
+                "mc.name as menu_category_name,mc.id as menu_category_id ")
+                .joins("JOIN menu_item_instances mii ON mii.item_instance_code = stock_check_items.item_code" +
+                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+                .joins(" JOIN accounts acc ON acc.id = mi.account_id")
+                .where("stock_check_items.stock_check_id=#{id}")
+                .group("mi.menu_category_id,stock_check_items.item_code")
+                .order("acc.title desc,mi.menu_category_id desc")
+  return query
+  end
 end
diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb
index a333dc7a..01e8f98f 100755
--- a/app/views/inventory/inventory/_inventory_list.html.erb
+++ b/app/views/inventory/inventory/_inventory_list.html.erb
@@ -1,7 +1,7 @@
 
 <table class="table table-striped">
   <tr>
-    <th>#</th>
+    <th><%= t("views.right_panel.header.menu_category") %></th>
     <th><%= t("views.right_panel.detail.product") %></th>
     <th><%= t("views.right_panel.detail.min_order") %></th>
     <th><%= t("views.right_panel.detail.max_stock") %></th>
@@ -10,12 +10,36 @@
     <!-- <th><%= t("views.right_panel.detail.created_by") %></th>
     <th><%= t("views.right_panel.detail.created_time") %></th> -->
   </tr>
+  <% cate_arr = Array.new %>  
   <%
   count = 0
   @inventory_definitions.each do |item|
     count += 1
     %>
+
     <tr>
+
+      <% if !cate_arr.include?(item.menu_category_id) %>  
+      <td><%= item.menu_category_name %></td>
+      <% cate_arr.push(item.menu_category_id) %>
+      <% else %>
+      <td>&nbsp;</td>
+      <% end %>
+      <td><%= item.item_name rescue '-' %> - <%= item.instance_name%></td>
+      <td><%= item.min_order_level %></td>
+      <td><%= item.max_stock_level %></td>
+      <td>
+        <% if item.balance.nil? %>
+        0
+        <% else %>
+        <%= item.balance rescue 0 %>
+        <% end %>
+      </td>
+      <td>
+        <button type="button" data-value="<%= item.id %>" class="btn bg-blue waves-effect btn-link show_track"><%= t("views.btn.show") %> <%= t("views.right_panel.detail.stock_check") %></button>
+      </td>
+    </tr>
+   <!--  <tr>
       <td><%= count %></td>
       <td>
         <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
@@ -38,16 +62,14 @@
       <td>
         <button type="button" data-value="<%= item.id %>" class="btn bg-blue waves-effect btn-link show_track"><%= t("views.btn.show") %> <%= t("views.right_panel.detail.stock_check") %></button>
       </td>
-      <!-- <td><%= Employee.find(item.created_by).name rescue '-' %></td>
-      <td><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td> -->
-    </tr>
+    </tr> -->
     <% end %>
-</table>
+  </table>
 
-<script>
-  $('.show_track').on('click', function () {
-    var ID = $(this).attr("data-value");
-    window.location.href = '/inventory/'+ID+'/show';
-  });
+  <script>
+    $('.show_track').on('click', function () {
+      var ID = $(this).attr("data-value");
+      window.location.href = '/inventory/'+ID+'/show';
+    });
 
-</script>
\ No newline at end of file
+  </script>
\ No newline at end of file
diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb
index 55c9884a..d56b9e8c 100755
--- a/app/views/inventory/inventory/index.html.erb
+++ b/app/views/inventory/inventory/index.html.erb
@@ -10,7 +10,7 @@
 
 
 <div class="row">
-    <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <div class="m-b-10 clearfix">
           <!-- <button id="stock_check_report" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> <%= t("views.btn.stock_check_report") %>
           </button> -->
@@ -22,7 +22,7 @@
       <%= render 'inventory_list' %>
     </div>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <!-- <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">
         <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
@@ -32,9 +32,9 @@
         <p>
         2) <%= t("views.right_panel.detail.stock_taking") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.stock_taking_txt") %> <br>
         </p>
-        <!-- <p>
+        <<p>
         3) <%= t("views.right_panel.detail.stock_check_report") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.stock_check_report_txt") %> <br>
-        </p> -->
+        </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>
@@ -42,7 +42,7 @@
           </p>
       </div>
     </div>  
-  </div>
+  </div> -->
 </div>
 
 
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index 245aeb18..9cd2acb4 100644
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -84,28 +84,31 @@
             <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
           </div>
           <div class="modal-body">
-            <div class="form-inputs">
-              <div class="form-group">
-                <label class="control-label" for="attribute">Menu Item</label>
-                <input class="form-control col-md-6" type="text" value="" id="item_name" readonly="true">
-                <input type="hidden" value="" id="item_code">
-                <input type="hidden" value="" id="instance_code">
+            <%= simple_form_for([:inventory, @inventory_definition]) do |f| %>
+ 
+
+              <div class="form-inputs">
+                <div class="form-group">
+                    <div class="form-group">
+                    <label class="control-label" for="attribute">Menu Item</label>
+                    <input class="form-control col-md-6" type="text" value="" id="item_name" readonly="true">
+                    </div>
+                    <%= f.input :item_code , :as => :hidden,:input_html=>{:id=>"instance_code"} %>
+                  <div class="form-group">
+                    <label class="control-label" for="attribute">Instances</label>
+                    <div class="attributes-list col-md-6"></div>
+                  </div>
+                  <%= f.input :min_order_level,:input_html=>{:value=>"1",:class=>"col-md-5"} %>
+                  <%= f.input :max_stock_level,:input_html=>{:value=>"1",:class=>"col-md-5"} %>
+                  <div class="form-actions">
+                    <%= f.submit t("views.btn.submit"), class: 'btn bg-blue waves-effect' %>
+                  </div>
+
+                  <% end %>
               </div>
-              <div class="form-group">
-                <label class="control-label" for="attribute">Instances</label>
-                <div class="attributes-list col-md-6"></div>
-              </div>
-              <div class="form-group">
-                <label class="control-label" for="min_qty">Min Qty</label>
-                <input class="form-control col-md-6" type="number" value="1" id="min_qty">
-              </div>
-              <div class="form-group">
-              <label class="control-label" for="max_qty">Max Qty</label>
-              <input class="form-control col-md-6" type="number" value="1" id="max_qty">
-              </div>
-            </div>
+            </form>
           </div>
-          <div class="modal-footer">
+          <!-- <div class="modal-footer">
             <div class="row">
               <div class="col-md-4">
                 <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
@@ -114,7 +117,7 @@
                 <button type="button" class="btn btn-primary submit " data-dismiss="modal" id="submit">Submit</button>
               </div>
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
@@ -467,7 +470,7 @@
             if(parseInt(jQuery.inArray(value[i], instance_attributes)) == -1){
               disabled = "disabled";
             }
-            row +="<button id='selected-attribute' data-instances='"+JSON.stringify(instances)+"' data-type='"
+            row +="<button type='button' id='selected-attribute' data-instances='"+JSON.stringify(instances)+"' data-type='"
             +type+"' data-value='"+value[i]+"' class='btn btn- waves-effect attribute_btn "
             + status +" "+ type +" '"+ disabled +" >"
             +value[i]
@@ -556,10 +559,21 @@
          
       // click select option icon for add 
       $(document).on('click', '.submit', function(event){ 
-        var params = {'order_source': type, 'order_type': "dine_in",
-                  'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id,
-                  'table_id': table_id, 
-                  'order_items': order_items,'create_type' : "create_only" };
+        var params = {  'item_code': $("#item_code").val(), 
+                        'min_order_level': $("#min_qty").val(),
+                        'max_stock_level': $("#max_qty").val() 
+                     };
+        var ajax_url = '<%=inventory_inventory_definitions_path%>';
+        console.log(ajax_url)
+         $.ajax({
+          type: "POST",
+          url: ajax_url,
+          data: params,
+          dataType: "json",
+           success:function(result){ 
+              
+           }
+        });
       });
 
     });
diff --git a/app/views/inventory/inventory_definitions/aa_form.html.erb b/app/views/inventory/inventory_definitions/backup_form.html.erb
similarity index 100%
rename from app/views/inventory/inventory_definitions/aa_form.html.erb
rename to app/views/inventory/inventory_definitions/backup_form.html.erb
diff --git a/app/views/inventory/stock_checks/show.html.erb b/app/views/inventory/stock_checks/show.html.erb
index acf4535d..10aa3cc9 100755
--- a/app/views/inventory/stock_checks/show.html.erb
+++ b/app/views/inventory/stock_checks/show.html.erb
@@ -44,28 +44,28 @@
               <table class="table table-striped col-md-12">
                 <tr>
                   <th>#</th>
+                  <th><%= t("views.right_panel.header.menu_category") %></th>
                   <th><%= t("views.right_panel.detail.product") %></th>
                   <th><%= t("views.right_panel.detail.stock_count") %></th>
                   <th><%= t("views.right_panel.detail.stock_balance") %></th>
                   <th><%= t("views.right_panel.detail.different") %></th>
                   <th><%= t("views.right_panel.detail.remark") %></th>
                 </tr>
+                <% cate_arr = Array.new %>  
                 <%
                 count = 0
-                @check.stock_check_items.each do |item|
+                @stock_check_items.each do |item|
                   count += 1
                   %>
                   <tr>
                     <td><%= count %></td>
-                    <td>
-                      <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
-                      <% if menu_item.nil? %>
-                      <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
-                      <% else %>
-                      <%= menu_item.menu_item.name rescue "-" %>
-                      - <%= menu_item.item_instance_name rescue "-" %>
-                      <% end %>
-                    </td>
+                    <% if !cate_arr.include?(item.menu_category_id) %>  
+                      <td><%= item.menu_category_name %></td>
+                      <% cate_arr.push(item.menu_category_id) %>
+                    <% else %>
+                       <td>&nbsp;</td>
+                    <% end %>
+                    <td><%= item.item_name rescue '-' %> - <%= item.instance_name%></td>
                     <td><%= item.stock_count %></td>
                     <td><%= item.stock_balance %></td>
                     <td><%= item.different %></td>

From a5ebce1c08330ed455eaf1988b399671edfbff28 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 21 Sep 2018 17:32:16 +0630
Subject: [PATCH 29/66] update menu for ordering

---
 app/controllers/settings/menus_controller.rb  |  4 +--
 app/models/menu.rb                            |  8 +++---
 .../api/restaurant/menu/_menu.json.jbuilder   |  1 +
 .../api/restaurant/menu/index.json.jbuilder   |  2 ++
 .../origami/dashboard/_menu.json.jbuilder     |  1 +
 .../dashboard/get_all_menu.json.jbuilder      | 26 +++++++++++--------
 db/migrate/20170325111608_create_menus.rb     |  1 +
 7 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 65294c81..66d75cc4 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -95,8 +95,8 @@ class Settings::MenusController < ApplicationController
                                               :header_text => true}
       
       # Menu Sheet
-      wb.add_worksheet(name: menu.name) do |sheet|
-        sheet.add_row ["Name",menu.name], :style=>title                
+      wb.add_worksheet(name: menu.name,is_ordering: menu.is_ordering) do |sheet|
+        sheet.add_row ["Name",menu.name,"is_ordering",menu.is_ordering], :style=>title                
         sheet.add_row
 
         sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Account", "Item AltName", "Taxable", "Attributes", "Options", "Instance Code", "Instance Name", "Instance Attribute", "Price", "Is Default", "Image Path"], :style=>header_text  
diff --git a/app/models/menu.rb b/app/models/menu.rb
index ee9414a9..58d540fd 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -91,9 +91,9 @@ class Menu < ApplicationRecord
           elsif sheet_name == "Menu"
             menu = Menu.find_by_id(row["id"])
             if menu
-              Menu.create(name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+              Menu.create(name: row["name"], is_active: row["is_active"], is_ordering: row["is_ordering"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
             else
-              Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+              Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], is_ordering: row["is_ordering"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
             end
           elsif sheet_name == "Menu Category"
              # MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
@@ -150,7 +150,9 @@ class Menu < ApplicationRecord
 
       sheet = spreadsheet.sheet(0) 
       menu = sheet.row(1)[1]
-      imported_menu = Menu.create({name: menu, is_active: true, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by}) 
+      is_ordering = sheet.row(1)[3]?sheet.row(1)[3]:0
+
+      imported_menu = Menu.create({name: menu, is_active: true, is_ordering: is_ordering, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by}) 
 
       (4..sheet.last_row).each do |ii|             
           row = Hash[[sheet.row(3),sheet.row(ii)].transpose]   
diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder
index 082b5f0a..f3ca6e19 100755
--- a/app/views/api/restaurant/menu/_menu.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu.json.jbuilder
@@ -1,6 +1,7 @@
 json.id menu.id
 json.name menu.name
 json.is_active menu.is_active
+json.is_ordering menu.is_ordering
 json.valid_time_from menu.valid_time_from.strftime("%H:%M")
 json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 
diff --git a/app/views/api/restaurant/menu/index.json.jbuilder b/app/views/api/restaurant/menu/index.json.jbuilder
index a230a965..388b064e 100755
--- a/app/views/api/restaurant/menu/index.json.jbuilder
+++ b/app/views/api/restaurant/menu/index.json.jbuilder
@@ -1,6 +1,8 @@
 menu_json = json.array! @menus do |menu|
   json.id menu.id
   json.name menu.name
+  json.is_active menu.is_active
+  json.is_ordering menu.is_ordering
   json.valid_days menu.valid_days
   json.valid_time_from menu.valid_time_from.strftime("%H:%M")
   json.valid_time_to menu.valid_time_to.strftime("%H:%M")
diff --git a/app/views/origami/dashboard/_menu.json.jbuilder b/app/views/origami/dashboard/_menu.json.jbuilder
index e5f75639..0acfda86 100644
--- a/app/views/origami/dashboard/_menu.json.jbuilder
+++ b/app/views/origami/dashboard/_menu.json.jbuilder
@@ -1,5 +1,6 @@
 json.id menu.id
 json.name menu.name
+json.is_ordering menu.is_ordering
 json.is_active menu.is_active
 json.valid_time_from menu.valid_time_from.strftime("%H:%M")
 json.valid_time_to menu.valid_time_to.strftime("%H:%M")
diff --git a/app/views/origami/dashboard/get_all_menu.json.jbuilder b/app/views/origami/dashboard/get_all_menu.json.jbuilder
index 9ecfa65b..aeeb8d03 100644
--- a/app/views/origami/dashboard/get_all_menu.json.jbuilder
+++ b/app/views/origami/dashboard/get_all_menu.json.jbuilder
@@ -1,15 +1,19 @@
 menu_json = json.array! @menus do |menu|
-  json.id menu.id
-  json.name menu.name
-  json.valid_days menu.valid_days
-  json.valid_time_from menu.valid_time_from.strftime("%H:%M")
-  json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 
-  json.partial! 'origami/dashboard/menu', menu: menu
-  # if (@current_menu)
-  #   json.current_menu do
-  #     json.partial! 'api/restaurant/menu/menu', menu: @current_menu
-  #   end
-  # end
+  if menu.is_ordering.to_i > 0
+    json.id menu.id
+    json.name menu.name
+    json.valid_days menu.valid_days
+    json.valid_time_from menu.valid_time_from.strftime("%H:%M")
+    json.valid_time_to menu.valid_time_to.strftime("%H:%M")
+
+    json.partial! 'origami/dashboard/menu', menu: menu
+    # if (@current_menu)
+    #   json.current_menu do
+    #     json.partial! 'api/restaurant/menu/menu', menu: @current_menu
+    #   end
+    # end
+  end
+  
 end
 
diff --git a/db/migrate/20170325111608_create_menus.rb b/db/migrate/20170325111608_create_menus.rb
index b1bef09e..9b7cc17d 100755
--- a/db/migrate/20170325111608_create_menus.rb
+++ b/db/migrate/20170325111608_create_menus.rb
@@ -3,6 +3,7 @@ class CreateMenus < ActiveRecord::Migration[5.1]
     create_table :menus do |t|
       t.string :name
       t.boolean :is_active, :null => false, :deafult => true
+      t.boolean :is_ordering, :default => false
       t.boolean :is_checksum, :default => false
       t.string :valid_days, :null => false, :default => "1,2,3,4,5,6,7"
       t.time :valid_time_from, :null => false, :default => "00:00:00"

From f4b85ad4cc3e431568fc784099c9d75e36bad602 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 24 Sep 2018 10:29:08 +0630
Subject: [PATCH 30/66] add req bill and payment #left order and sale

---
 app/assets/stylesheets/application.scss       |  17 ++
 app/assets/stylesheets/origami.scss           |   7 +-
 .../origami/payments_controller.rb            |   9 +-
 .../origami/request_bills_controller.rb       |   2 +-
 .../transactions/bookings_controller.rb       |   2 +-
 .../transactions/sales_controller.rb          |   3 +-
 app/models/booking.rb                         |   8 +-
 app/views/origami/home/show.html.erb          |  32 ++--
 app/views/origami/payments/show.html.erb      |  55 ++++--
 app/views/origami/rooms/show.html.erb         |  28 ++--
 .../transactions/bookings/index.html.erb      |   2 +-
 app/views/transactions/bookings/show.html.erb |  44 ++++-
 app/views/transactions/sales/show.html.erb    | 157 +++++++++++++++++-
 13 files changed, 311 insertions(+), 55 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 639a763b..b1718ee2 100755
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -107,4 +107,21 @@ i.logout_icon{
 
 .float_right{
   float : right;
+}
+
+.selected-payment {
+  color: #fff !important;
+  background-color: blue !important;
+}
+.payment_btn {
+  white-space: normal !important;
+  margin-bottom: 15px;
+  margin-right: 15px;
+  color:#fff !important;
+ # background-color: green !important;
+} 
+
+.payment-btn-box {
+  width: 130px; 
+  height: 50px;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 6383ac89..2558d846 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -653,4 +653,9 @@ nav.pagination .page a:hover,
       font-size: 14px;
       color: #FFFFFF;
   }
-/*customer modal UI */
\ No newline at end of file
+/*customer modal UI */
+
+.payment-btn-box {
+  width: 130px; 
+  height: 50px;
+}
\ No newline at end of file
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 304e0d90..cc363298 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -255,7 +255,14 @@ class Origami::PaymentsController < BaseOrigamiController
   def show
     path = request.fullpath
     sale_id = params[:sale_id]
-    @cashier_type   = params[:type]
+    @trans_flag = true
+    if params[:type] == "transaction"
+      @trans_flag = false
+      @cashier_type   = "cashier"
+    else
+      @cashier_type   = params[:type]
+    end
+    
     if path.include? ("credit_payment")
       @sale_payment = SalePayment.get_credit_amount_due_left(sale_id)
     end
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 22c8d25c..6d57904e 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -65,7 +65,7 @@ class Origami::RequestBillsController < ApplicationController
       ActionCable.server.broadcast "bill_channel",table: table, from: from      
       if order.source == "quick_service"
         result = {:status=> @status, :data => @sale.sale_id }
-          render :json => result.to_json
+        render :json => result.to_json
       else
         #check checkInOut pdf print
         check_booking = Booking.find_by_sale_id(@sale_id)
diff --git a/app/controllers/transactions/bookings_controller.rb b/app/controllers/transactions/bookings_controller.rb
index 63090c9c..78e8dc1b 100644
--- a/app/controllers/transactions/bookings_controller.rb
+++ b/app/controllers/transactions/bookings_controller.rb
@@ -35,7 +35,7 @@ class Transactions::BookingsController < ApplicationController
   def show
    
     @booking = Booking.find(params[:id])
-
+    @order = []
     @order_items = []
     @booking.booking_orders.each do |booking_order|
       @order = Order.find(booking_order.order_id)
diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index c1e58f6f..32636ccd 100755
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -89,7 +89,8 @@ class Transactions::SalesController < ApplicationController
   # GET /transactions/sales/1
   # GET /transactions/sales/1.json
   def show
-   
+    @membership = MembershipSetting::MembershipSetting
+    @payment_methods = PaymentMethodSetting.where("is_active='1'")
     @sale = Sale.find(params[:id])
 
     @order_items = []
diff --git a/app/models/booking.rb b/app/models/booking.rb
index 7e5470d0..1648f255 100755
--- a/app/models/booking.rb
+++ b/app/models/booking.rb
@@ -46,14 +46,16 @@ class Booking < ApplicationRecord
     if filter.blank?
         keyword = ''
     else
-        keyword = "booking_id LIKE ? OR checkin_by LIKE ? OR booking_status LIKE? OR checkout_by LIKE? OR sale_id ='#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%"
+        keyword = "booking_id LIKE ? OR checkin_by LIKE ? OR booking_status LIKE? OR checkout_by LIKE? OR sale_id ='#{filter}' OR df.name LIKE ?","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%"
     end
 
     if from.present? && to.present?
-       booking = Booking.where("DATE_FORMAT(created_at,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(created_at,'%d-%m-%Y') <= ? and NOT booking_status = 'void' ", from,to)
+       booking = Booking.joins(" LEFT JOIN dining_facilities df ON df.id=bookings.dining_facility_id")
+              .where("DATE_FORMAT(created_at,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(created_at,'%d-%m-%Y') <= ? and NOT booking_status = 'void' ", from,to)
        query = booking.where(keyword)
     else
-        where("booking_id LIKE ? OR checkin_by LIKE ? OR booking_status LIKE? OR checkout_by LIKE? OR sale_id ='#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%")
+        joins(" LEFT JOIN dining_facilities df ON df.id=bookings.dining_facility_id")
+        .where("booking_id LIKE ? OR checkin_by LIKE ? OR booking_status LIKE? OR checkout_by LIKE? OR sale_id ='#{filter}' OR df.name LIKE ?","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%")
     end
 
   end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 98e4f6f5..16bfa3c7 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -557,22 +557,26 @@
                       <h4 class="modal-title" id="paymentModalLabel">Choose Payment Method</h4>
                   </div>
                   <div class="modal-body">
-                   <!--  <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" > -->
-                             <!-- <option value="Cash">Cash</option> -->
-                       <button class='btn waves-effect payment_btn green' data-type='Credit' data-value='Credit'>Credit</button>
-                      <% @payment_methods.each do |pay| %>
-                    <!-- <option value="<%= pay.payment_method %>">
-                        <%= pay.payment_method %>
-                      </option> -->
-                      <button class='btn btn-lg waves-effect payment_btn green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
-                    <%end %>
-                            
-                   <!--  </select>   --> 
+                   <div class="row text-center">
+                      <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+                        <button class='btn btn-md waves-effect btn-link payment-btn-box payment_btn bg-green' data-type='Credit' data-value='Credit'>Credit</button>
+                      </div>
+                    
+                      <% @payment_methods.each_with_index do |pay, pay_index| %>
+                        <%if (pay_index+1)%3 == 0 %>
+                          <div class="row clearfix"></div>
+                        <% end %>
+                        <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+                          <button class='btn btn-md btn-link payment-btn-box waves-effect payment_btn bg-green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
+                        </div>
+                      <%end %>
+
+                    </div>
                   </div>
-                  <div class="modal-footer  p-r-30">
-                    <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                  <div class="modal-footer  p-r-30 pb-3">
+                    <button type="button" class="btn btn-md 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>
+                    <button type="button" class="btn btn-md btn-link bg-blue waves-effect choose_payment">SAVE</button>
                   </div>
                 </div>
               </div>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c182e5a5..49c45e39 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -678,10 +678,19 @@ var cashier_type = "<%= @cashier_type %>";
 var customer_id = "<%= @customer.id %>";
 var customer_name = "<%= @customer.name %>";
 var pdf_view = '<%=@pdf_view%>';
-                console.log(pdf_view)
+var trans_flag = <%= @trans_flag %>;
+                // console.log(pdf_view)
   $(document).ready(function(){
     setHeaderBreadCrumb(_PAYMENTS_);
 
+    /* replace url type*/
+    if(!trans_flag){
+      localStorage.setItem("trans_flag", trans_flag);
+      var sale_id = $('#sale_id').text();
+      window.location.replace('/origami/sale/'+sale_id+'/cashier/payment');
+    }
+    
+    /* replace url type*/
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
         var member_discount = $('#member_discount').text();
@@ -727,11 +736,17 @@ var pdf_view = '<%=@pdf_view%>';
       localStorage.removeItem('cash');
       customer_display_view(null,"reload");
       var sale_id = $('#sale_id').text();
-      if (cashier_type=="cashier") {
-          window.location.href = '/origami/table/'+ dining_id;
+      var flag = localStorage.getItem("trans_flag");
+      if(flag != "true"){
+        window.location.href = '/transactions/sales/'+sale_id;
       }else{
-        window.location.href = '/origami/quick_service/pending_order/'+sale_id;
-      }  
+        if (cashier_type=="cashier") {
+            window.location.href = '/origami/table/'+ dining_id;
+        }else{
+          window.location.href = '/origami/quick_service/pending_order/'+sale_id;
+        } 
+      }
+       
     });
 
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){
@@ -1135,12 +1150,17 @@ var pdf_view = '<%=@pdf_view%>';
             }
 
             if (pdf_view ==1) {
-              if (cashier_type=="cashier") {
-                window.location.href = '/origami';
+              var flag = localStorage.getItem("trans_flag");
+              if(flag != "true"){
+                window.location.href = "/transactions/sales/"+sale_id;
               }else{
-                window.location.href = '/origami/quick_service';
-                customer_display_view(null,"reload");
-              } 
+                if (cashier_type=="cashier") {
+                  window.location.href = '/origami';
+                }else{
+                  window.location.href = '/origami/quick_service';
+                  customer_display_view(null,"reload");
+                } 
+              }
             }else{
               payment_success_alert();
             }
@@ -1176,11 +1196,18 @@ var pdf_view = '<%=@pdf_view%>';
   
 
   $(".btn_pdf_close").on('click',function(){
-    if (cashier_type=="cashier") {
-      window.location.href = '/origami';
+    var flag = localStorage.getItem("trans_flag");
+    if(flag != "true"){
+      var sale_id   = $('#sale_id').text();
+      window.location.href = "/transactions/sales/"+sale_id;
     }else{
-      window.location.href = '/origami/quick_service';
-    } 
+      if (cashier_type=="cashier") {
+        window.location.href = '/origami';
+      }else{
+        window.location.href = '/origami/quick_service';
+      } 
+    }
+    
   });
 
   $(".btn_customer_yes").on('click',function(){
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 918758e4..c78a3cd3 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -575,18 +575,26 @@
                           <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
                       </div>
                       <div class="modal-body">
-                          <button class='btn waves-effect payment_btn green' data-type='Credit' data-value='Credit'>Credit</button>
-                          <% @payment_methods.each do |pay| %>
-                        <!-- <option value="<%= pay.payment_method %>">
-                            <%= pay.payment_method %>
-                          </option> -->
-                          <button class='btn btn-lg waves-effect payment_btn green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
-                        <%end %>   
+                        <div class="row text-center">
+                          <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+                            <button class='btn btn-md waves-effect btn-link payment-btn-box payment_btn bg-green' data-type='Credit' data-value='Credit'>Credit</button>
+                          </div>
+                        
+                          <% @payment_methods.each_with_index do |pay, pay_index| %>
+                            <%if (pay_index+1)%3 == 0 %>
+                              <div class="row clearfix"></div>
+                            <% end %>
+                            <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+                              <button class='btn btn-md btn-link payment-btn-box waves-effect payment_btn bg-green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
+                            </div>
+                          <%end %>
+
+                        </div> 
                       </div>
-                      <div class="modal-footer  p-r-30">
-                          <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                      <div class="modal-footer p-r-30 pb-3">
+                          <button type="button" class="btn btn-md 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>
+                         <button type="button" class="btn btn-md btn-link bg-blue waves-effect choose_payment">SAVE</button>
                       </div>
                   </div>
               </div>
diff --git a/app/views/transactions/bookings/index.html.erb b/app/views/transactions/bookings/index.html.erb
index 463ab27c..47cc60db 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="Booking/Sale ID" style="margin-right: 10px">
+                         <input type="text" id="receipt_no"  name="receipt_no" class="form-control" placeholder="Booking/ Sale ID/ Table/ Room" 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/bookings/show.html.erb b/app/views/transactions/bookings/show.html.erb
index 67065b1c..a8276c60 100755
--- a/app/views/transactions/bookings/show.html.erb
+++ b/app/views/transactions/bookings/show.html.erb
@@ -23,6 +23,7 @@
                 <a class="nav-link" data-toggle="tab" href="#sale" role="tab"><%= t :sale_details %></a>
             </li>
         </ul>
+        
         <!-- Nav tabs - End -->
     <div class="tab-content" style="min-height:670px; max-height:670px;">
         <div class="tab-pane active" id="booking" role="tabpanel">
@@ -39,13 +40,18 @@
                   <th> <%= t("views.right_panel.detail.checkout_by") %></th>
                   <th><%= t("views.right_panel.detail.booking_status") %></th>
                   <th><%= t("views.right_panel.detail.booking_date") %></th>
+                  <%if (@booking.sale_id.nil?) && (current_login_employee.role == "administrator") && (!@order.nil?) %>
+                    <th>
+                      <button id="request_bill" class="btn bg-blue btn-md waves-effect">Req. Bill</button>
+                    </th>
+                  <% end %>
                 </tr>
               </thead>
 
               <tbody>
                 <tr>
                   <td><%= @booking.booking_id%></td>
-                  <td><%= link_to @booking.sale_id, transactions_sale_path(booking.sale_id) rescue '-' %></td>
+                  <td><%= link_to @booking.sale_id, transactions_sale_path(@booking.sale_id) rescue '-' %></td>
                   <td><%= @booking.dining_facility.name rescue '' %></td>
                   <td><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></td>
                   <td><%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") rescue '-'  %></td>
@@ -53,6 +59,9 @@
                   <td><%= @booking.checkout_by rescue '-' %></td>
                   <td><%= @booking.booking_status %> </td>
                   <td><%= @booking.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
+                  <%if (@booking.sale_id.nil?) && (current_login_employee.role == "administrator") && (!@order.nil?) %>
+                    <td></td>
+                  <% end %>
                 </tr>
               </tbody>
             </table>
@@ -135,6 +144,37 @@
 
 
 
-
+<script type="text/javascript">
+  $(document).ready(function(){
+    $("#request_bill").on('click', function(){
+      var order_id = '';
+      <%if !@order.nil? %>
+        order_id ='<%= @order.order_id %>';
+      <% end %>
+      var ajax_url = "/origami/" + order_id + "/request_bills";
+      localStorage.setItem("tax_type", "all");
+      if(order_id!=undefined && order_id!=null && order_id!=""){
+        if($('#request_bill').is(":visible")) {
+          $('#request_bill').prop("disabled",true);
+        } 
+        $.ajax({
+            type: "GET",
+            url: ajax_url,
+            success: function (result) {
+              if (!result.status) {
+                $('#request_bill').prop("disabled",false);
+                swal("Information!", result.error_message);
+              }
+              else {         
+                location.reload();
+              }
+            }
+        }); 
+      }else{
+        swal("Opps","There is no orders!","warning");
+      }
+    });
+  });
+</script>
      
 
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 44b2f95f..d39873cd 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -41,10 +41,22 @@
                 <th><%= t :cashier %></th>
                 <th><%= t("views.right_panel.detail.sales_status") %></th>
                 <th><%= t("views.right_panel.detail.receipt_generated_at") %></th>
-                <% if @sale["sale_status"] == "completed" %>
+                <% if @sale.sale_status == "completed" %>
                   <th>
                     <button type="button" class="btn btn-block bg-red waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
                   </th>
+                <% else %>
+                  <% if current_login_employee.role == "administrator" %>
+                    <%if @membership.discount && @sale.customer.membership_id %>
+                      <th>
+                        <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">Pay</button>
+                      </th>
+                    <%else%>
+                      <th>
+                        <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
+                      </th>
+                    <%end%>
+                  <%end%>
                 <% end %>  
               </tr>
             </thead>
@@ -266,7 +278,107 @@
   </div>
 </div>
 
+<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
+<span class="hidden" id="member_discount"><%= @membership.discount%></span>
+<span class="hidden" id="membership_id"><%= @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 Method</h4>
+      </div>
+      <div class="modal-body">
+       <!--  <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" > -->
+                 <!-- <option value="Cash">Cash</option> -->
+        <div class="row text-center">
+          <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+            <button class='btn btn-md waves-effect payment-btn-box payment_btn bg-green' data-type='Credit' data-value='Credit'>Credit</button>
+          </div>
+        
+          <% @payment_methods.each_with_index do |pay, pay_index| %>
+            <%if (pay_index+1)%3 == 0 %>
+              <div class="row clearfix"></div>
+            <% end %>
+            <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+              <button class='btn btn-md payment-btn-box waves-effect payment_btn bg-green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
+            </div>
+          <%end %>
+
+        </div>
+                
+       <!--  </select>   --> 
+      </div>
+      <div class="modal-footer p-r-30 pb-3">
+        <button type="button" class="btn btn-md btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                &nbsp;  &nbsp;
+        <button type="button" class="btn btn-md btn-link bg-blue waves-effect choose_payment">SAVE</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <script type="text/javascript">
+  // Get Selected Class
+  function get_selected_attributes(selected_class) {
+    var item_row      = $('.'+selected_class);
+    var attribute_arr = [];
+    $(item_row).each(function(i){
+      value = $(item_row[i]).attr('data-value');
+      str = value;
+      attribute_arr.push(str);
+    });
+    return attribute_arr;
+  }
+
+  function calculate_member_discount(sale_id,type,tax_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,'cashier_type':'cashier','tax_type':tax_type },
+      async: false,
+      success:function(result){ }
+    });
+  }
+
+  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));
+    }
+  }
+
+  // click select option icon for add 
+  $('.payment_btn').on('click', function(event){ 
+    active     = $(this).hasClass('selected-payment');
+    value      = $(this).data('value');
+    type       = $(this).data('type');
+    group      = $(this).data('group');
+    payments    = $(".payment_btn");
+
+    if (active) {      
+      $(this).removeClass('selected-payment');
+    }else{      
+      $(this).addClass('selected-payment');
+    }
+  }); //End selecct attribute buttom
+
   $('#void').on('click', function () {
        var access_code  = localStorage.getItem("access_code");
       if ($(this).attr('active')=== "true") {
@@ -280,7 +392,7 @@
             closeOnConfirm: false
         }, function (isConfirm) {
           if (isConfirm) {
-            var sale_id = "<%= @sale.sale_id %>"
+            var sale_id = "<%= @sale.sale_id %>";
             // console.log(sale_id)
             var ajax_url = "/transactions/sales/" + sale_id + '/cashier/void';
             var remark  = $("#remark").val();
@@ -291,10 +403,10 @@
                 data: "remark="+ remark + "&sale_id=" + sale_id+ "&access_code=" + access_code,
                 success: function (result) {
                    // For Server Print - from jade
-                if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
-                }
-                window.location.href = '/transactions/sales/';
+                  if ($("#server_mode").val() == "cloud") {
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  }
+                  window.location.href = '/transactions/sales/';
                 }
             });
           }
@@ -303,5 +415,38 @@
         swal("Opps","You are not authorized for void","warning")
       }
     });
+
+  $(".choose_payment").on('click', function () {
+      $("#loading_wrapper").show();
+      var sale_id = "<%= @sale.sale_id %>";
+      var type    = get_selected_attributes('selected-payment');
+      var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
+
+      // console.log(type);
+
+      if(parseInt(jQuery.inArray("Credit", type)) == -1){
+        if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1 || parseInt(jQuery.inArray("PAYMAL",type))!= -1) {
+          if(!location.pathname.includes("credit_payment")){
+           calculate_member_discount(sale_id,"Card",tax_type);
+          }
+        }else{
+          if(!location.pathname.includes("credit_payment")){
+            calculate_member_discount(sale_id,"Cash",tax_type);
+          }
+        }         
+      }
+
+      $( "#loading_wrapper" ).hide();
+      receipt_no = "<%= @sale.receipt_no %>";
+      if((receipt_no!=undefined) && (receipt_no!=""))
+        createReceiptNoInFirstBillData(receipt_no,type);
+      
+      window.location = '/origami/sale/'+sale_id+'/transaction/payment';
+  });
+
+  $('#pay').on('click', function() {
+    var sale_id = "<%= @sale.sale_id %>";
+    window.location = '/origami/sale/'+sale_id+'/transaction/payment';
+  });
 </script>
 

From 4508cd55b45f5359a26051e7e010d7ab3cfc2e45 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 24 Sep 2018 10:39:50 +0630
Subject: [PATCH 31/66] check query

---
 app/models/booking.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/booking.rb b/app/models/booking.rb
index 1648f255..8ba89bd2 100755
--- a/app/models/booking.rb
+++ b/app/models/booking.rb
@@ -51,7 +51,7 @@ class Booking < ApplicationRecord
 
     if from.present? && to.present?
        booking = Booking.joins(" LEFT JOIN dining_facilities df ON df.id=bookings.dining_facility_id")
-              .where("DATE_FORMAT(created_at,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(created_at,'%d-%m-%Y') <= ? and NOT booking_status = 'void' ", from,to)
+              .where("DATE_FORMAT(bookings.created_at,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(bookings.created_at,'%d-%m-%Y') <= ? and NOT bookings.booking_status = 'void' ", from,to)
        query = booking.where(keyword)
     else
         joins(" LEFT JOIN dining_facilities df ON df.id=bookings.dining_facility_id")

From dd3adb6c560f260e51426e8573d839d06615b1aa Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 24 Sep 2018 13:59:37 +0630
Subject: [PATCH 32/66] update menu json for is ordering

---
 app/views/origami/dashboard/get_all_menu.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/dashboard/get_all_menu.json.jbuilder b/app/views/origami/dashboard/get_all_menu.json.jbuilder
index aeeb8d03..f5e996b0 100644
--- a/app/views/origami/dashboard/get_all_menu.json.jbuilder
+++ b/app/views/origami/dashboard/get_all_menu.json.jbuilder
@@ -1,6 +1,6 @@
 menu_json = json.array! @menus do |menu|
 
-  if menu.is_ordering.to_i > 0
+  if menu.is_ordering
     json.id menu.id
     json.name menu.name
     json.valid_days menu.valid_days

From 312786208151b6b9dc1ccb26dc296ccd8542425a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 24 Sep 2018 15:43:28 +0630
Subject: [PATCH 33/66] acces level for transaction/sale VOID

---
 app/assets/javascripts/reservation.js         |  3 +++
 app/assets/stylesheets/reservation.scss       |  0
 .../origami/dashboard_controller.rb           | 11 ++++++++++
 .../origami/reservation_controller.rb         |  6 +++++
 app/views/origami/dashboard/index.html.erb    | 22 +++++++++++++++----
 app/views/origami/reservation/index.html.erb  |  5 +++++
 app/views/transactions/sales/show.html.erb    |  8 ++++---
 config/initializers/assets.rb                 |  3 +++
 config/locales/en.yml                         |  1 +
 config/locales/mm.yml                         |  1 +
 config/routes.rb                              |  4 ++++
 11 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/javascripts/reservation.js
 create mode 100644 app/assets/stylesheets/reservation.scss
 create mode 100644 app/controllers/origami/reservation_controller.rb
 create mode 100644 app/views/origami/reservation/index.html.erb

diff --git a/app/assets/javascripts/reservation.js b/app/assets/javascripts/reservation.js
new file mode 100644
index 00000000..255f3253
--- /dev/null
+++ b/app/assets/javascripts/reservation.js
@@ -0,0 +1,3 @@
+$(function(){
+  
+});
\ No newline at end of file
diff --git a/app/assets/stylesheets/reservation.scss b/app/assets/stylesheets/reservation.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb
index b9910803..4d53cc15 100644
--- a/app/controllers/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -80,6 +80,17 @@ class Origami::DashboardController < BaseOrigamiController
         end
       end
     end
+
+    #reservation
+    reservation = Lookup.collection_of('reservation')
+    @reservation = 0
+    if !reservation.empty?
+        reservation.each do |reserve|
+            if reserve[0] == 'Reservation'
+                @reservation = reserve[1]
+            end
+        end
+    end
   end
 
 def get_all_menu
diff --git a/app/controllers/origami/reservation_controller.rb b/app/controllers/origami/reservation_controller.rb
new file mode 100644
index 00000000..6b1e3aa5
--- /dev/null
+++ b/app/controllers/origami/reservation_controller.rb
@@ -0,0 +1,6 @@
+class Origami::ReservationController < BaseOrigamiController
+
+	def index
+		
+	end
+end
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 25c64303..92b34074 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -22,7 +22,7 @@
     <!-- Widgets -->
     <div class="row clearfix">
     <% if @quick_service == '1' %>
-      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-10 qs_view">
+      <div class="col-lg-3 col-md-3 col-sm-3 col-xs-10 qs_view">
         <div class="info-box bg-purple">
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>
@@ -32,7 +32,7 @@
       </div>
       <% end %>
       <% if @dinein_cashier == '1' %>
-      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-10 cashier_view">
+      <div class="col-lg-3 col-md-3 col-sm-3 col-xs-10 cashier_view">
         <div class="info-box bg-green">
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>
@@ -40,9 +40,19 @@
           <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
         </div>
       </div>
-       <% end %>
+      <% end %>
+      <% if @reservation == '1' %>
+      <div class="col-lg-3 col-md-3 col-sm-3 col-xs-10 reservation">
+        <div class="info-box bg-orange">
+          <div class="icon" >
+            <i class="material-icons">arrow_forward</i>
+          </div>
+          <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :reservation %></div>
+        </div>
+      </div>
+      <% end %>
       <% if @order_reservation == '1' %>
-      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-10 order_reservation">
+      <div class="col-lg-3 col-md-3 col-sm-3 col-xs-10 order_reservation">
         <div class="info-box bg-blue">
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>
@@ -240,5 +250,9 @@ $(function() {
     var url = $(this).attr("data-href");
     window.open(url,'_blank');
   });
+
+  $(".reservation").on("click", function(){
+    window.location.href = '/origami/reservation';
+  });
 });
 </script>
\ No newline at end of file
diff --git a/app/views/origami/reservation/index.html.erb b/app/views/origami/reservation/index.html.erb
new file mode 100644
index 00000000..0c7d6aae
--- /dev/null
+++ b/app/views/origami/reservation/index.html.erb
@@ -0,0 +1,5 @@
+<%= stylesheet_link_tag    'reservation', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'reservation', 'data-turbolinks-track': 'reload' %> 
+<div class="container-fluid">
+  
+</div>
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index d39873cd..4017e166 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -42,9 +42,11 @@
                 <th><%= t("views.right_panel.detail.sales_status") %></th>
                 <th><%= t("views.right_panel.detail.receipt_generated_at") %></th>
                 <% if @sale.sale_status == "completed" %>
-                  <th>
-                    <button type="button" class="btn btn-block bg-red waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
-                  </th>
+                  <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
+                    <th>
+                      <button type="button" class="btn btn-block bg-red waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
+                    </th>
+                  <% end %>
                 <% else %>
                   <% if current_login_employee.role == "administrator" %>
                     <%if @membership.discount && @sale.customer.membership_id %>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index cede4a18..63881a4f 100755
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -57,3 +57,6 @@ Rails.application.config.assets.precompile += %w( inventory.js )
 Rails.application.config.assets.precompile += %w( order_reservation.css )
 Rails.application.config.assets.precompile += %w( order_reservation.js )
 
+# --- Reservation ----
+Rails.application.config.assets.precompile += %w( reservation.css )
+Rails.application.config.assets.precompile += %w( reservation.js )
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0f6a2f23..4775df7c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -86,6 +86,7 @@ en:
   credits: "Credits"
   track: "Track"
   debit: "Debit"
+  reservation: "Reservation"
   
   views:
     btn:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index e9696ae6..03c5b1b0 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -81,6 +81,7 @@ mm:
   credits: "အကြွေးများ"
   track: "Track"
   debit: "Debit"
+  reservation: "Reservation"
   
   views:
     btn:       
diff --git a/config/routes.rb b/config/routes.rb
index 60cea417..936266de 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -324,6 +324,10 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/credit_payment/others_payment/Alipay' => "alipay#index"
     # get 'sale/:sale_id/:type/credit_payment/others_payment/DINGA' => "dinga#index"
     # get 'sale/:sale_id/:type/credit_payment/others_payment/GiftVoucher' => "gift_voucher#index"
+    
+    #------------- Start Reservation -------------------#
+    get '/reservation' => "reservation#index"
+    #------------- End Reservation -------------------#
   end
 
   #--------- Waiter/Ordering Station ------------#

From 0158f007fa7ecc69f81a6cbf37d2f4d1a8868f95 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 24 Sep 2018 15:55:35 +0630
Subject: [PATCH 34/66] update sotck check

---
 .../inventory/stock_checks_controller.rb         | 16 +++++++++++++++-
 app/models/stock_check_item.rb                   |  3 ++-
 app/views/inventory/stock_checks/index.html.erb  |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb
index d8a56cc6..55fd7d43 100755
--- a/app/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -1,7 +1,21 @@
 class Inventory::StockChecksController < BaseInventoryController
   def index
     @check = StockCheck.new
-    @inventory_definitions = InventoryDefinition.active.all
+     @inventory_definitions1 = InventoryDefinition.active.all
+
+     @inventory_definitions =   InventoryDefinition.select("inventory_definitions.*,
+                  mi.name as item_name,
+                 mii.item_instance_name as instance_name," +
+                "mc.name as menu_category_name,mc.id as menu_category_id ")
+                .joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
+                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+                .group("mi.menu_category_id,inventory_definitions.item_code")
+                .order("mi.menu_category_id desc")
+
+                puts @inventory_definitions.count
+                puts @inventory_definitions1.count
+    puts @inventory_definitions.to_json
   end
 
   def create
diff --git a/app/models/stock_check_item.rb b/app/models/stock_check_item.rb
index b9a95ef2..05ee98a7 100755
--- a/app/models/stock_check_item.rb
+++ b/app/models/stock_check_item.rb
@@ -45,7 +45,8 @@ class StockCheckItem < ApplicationRecord
   end
 
   def self.get_items_with_category(id)
-  query =   StockCheckItem.select("stock_check_items.*,acc.title as account_name,mi.name as item_name,
+  query =   StockCheckItem.select("stock_check_items.*,acc.title as account_name,
+                  mi.name as item_name,
                  mii.item_instance_name as instance_name," +
                 "mc.name as menu_category_name,mc.id as menu_category_id ")
                 .joins("JOIN menu_item_instances mii ON mii.item_instance_code = stock_check_items.item_code" +
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index 667a172e..5ec971d8 100755
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -33,9 +33,9 @@
                           <option value="<%= id.item_code %>">
                             <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
                             <% if menu_item.nil? %>
-                            <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
+                                <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
                             <% else %>
-                            <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                                <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
                             <% end %>
                           </option>
                           <% end %>

From 1e9b0729426f66f9f243dc1f7047d39cd2c1fbbd Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 24 Sep 2018 15:56:59 +0630
Subject: [PATCH 35/66] update menu json

---
 app/views/origami/dashboard/get_all_menu.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/dashboard/get_all_menu.json.jbuilder b/app/views/origami/dashboard/get_all_menu.json.jbuilder
index f5e996b0..9e40c9b2 100644
--- a/app/views/origami/dashboard/get_all_menu.json.jbuilder
+++ b/app/views/origami/dashboard/get_all_menu.json.jbuilder
@@ -1,6 +1,6 @@
 menu_json = json.array! @menus do |menu|
 
-  if menu.is_ordering
+  if !menu.is_ordering
     json.id menu.id
     json.name menu.name
     json.valid_days menu.valid_days

From 3d44c570b2758c4683d729eadd90732ad5a2ddea Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 25 Sep 2018 11:10:08 +0630
Subject: [PATCH 36/66] check status

---
 app/views/origami/reservation/index.html.erb | 6 +++++-
 app/views/transactions/sales/show.html.erb   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/origami/reservation/index.html.erb b/app/views/origami/reservation/index.html.erb
index 0c7d6aae..ff2186c2 100644
--- a/app/views/origami/reservation/index.html.erb
+++ b/app/views/origami/reservation/index.html.erb
@@ -1,5 +1,9 @@
 <%= stylesheet_link_tag    'reservation', media: 'all', 'data-turbolinks-track': 'reload' %>
 <%= javascript_include_tag 'reservation', 'data-turbolinks-track': 'reload' %> 
 <div class="container-fluid">
-  
+  <div class="row">
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+      
+    </div>
+  </div>
 </div>
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 4017e166..2bb45f4e 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -47,7 +47,7 @@
                       <button type="button" class="btn btn-block bg-red waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
                     </th>
                   <% end %>
-                <% else %>
+                <% elsif @sale.sale_status == "new" %>
                   <% if current_login_employee.role == "administrator" %>
                     <%if @membership.discount && @sale.customer.membership_id %>
                       <th>

From 3cf4abe9ce239fb4fa340c2da96d013a6d7178ca Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 25 Sep 2018 17:49:33 +0630
Subject: [PATCH 37/66] check flag for transaction payment

---
 app/assets/javascripts/custom.js             |  10 ++
 app/assets/javascripts/reservation.js        |  28 +++++
 app/assets/stylesheets/reservation.scss      | 110 +++++++++++++++++++
 app/assets/stylesheets/reset.css             |   4 +-
 app/views/origami/payments/show.html.erb     |  90 +++++++++------
 app/views/origami/reservation/index.html.erb |  98 ++++++++++++++++-
 config/locales/en.yml                        |   1 +
 config/locales/mm.yml                        |   1 +
 8 files changed, 303 insertions(+), 39 deletions(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 33316a31..f975ad07 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -101,6 +101,16 @@ $(document).ready(function() {
     railBorderRadius: '0',
     touchScrollStep : 50
   });
+
+  $('#make-reservation-slimscroll').slimScroll({
+    height: height-$('#make-reservation-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0',
+    touchScrollStep : 50
+  });
   // $('.delete').click(function(){
   //   var method    = $(this).attr('data-method');
   //   var url       = $(this).attr('data-ref');
diff --git a/app/assets/javascripts/reservation.js b/app/assets/javascripts/reservation.js
index 255f3253..fa3f3ddd 100644
--- a/app/assets/javascripts/reservation.js
+++ b/app/assets/javascripts/reservation.js
@@ -1,3 +1,31 @@
+//= require custom.js
+
 $(function(){
+  /*new customer UI func:*/
+  //Initialize tooltips
+  $('.nav-tabs > li a[title]').tooltip();
   
+  //Wizard
+  $('a[data-toggle="tab"]').on('show.bs.tab', function (e) {
+
+      var $target = $(e.target);
+  
+      if ($target.parent().hasClass('disabled')) {
+          return false;
+      }
+  });
+
+  $(".next-step").click(function (e) {
+      var $active = $('.wizard .nav-tabs li a.active');
+      $active.parent().next().removeClass('disabled');
+      nextTab($active);
+      $('.wizard .nav-tabs li.active .connecting-line').css({"border-bottom-left-radius": 0, "border-top-left-radius": 0});
+  });
+  $(".prev-step").click(function (e) {
+
+      var $active = $('.wizard .nav-tabs li a.active');
+      prevTab($active);
+
+  });
+  /*new customer UI func:*/
 });
\ No newline at end of file
diff --git a/app/assets/stylesheets/reservation.scss b/app/assets/stylesheets/reservation.scss
index e69de29b..6cc72696 100644
--- a/app/assets/stylesheets/reservation.scss
+++ b/app/assets/stylesheets/reservation.scss
@@ -0,0 +1,110 @@
+/*customer modal UI */
+  .wizard {
+      background: #f1f1f1;
+      padding: 10px;
+  }
+  .wizard .nav-tabs {
+      position: relative;
+      border: 0px;
+  }
+  .wizard > div.wizard-inner {
+      position: relative;
+      margin: 0 0 0 80px !important;
+  }
+  .connecting-line{
+      height:12px;
+      background: #e0e0e0;
+      position: absolute;
+      width: 115%;
+      margin: 0 auto;
+      left: 0;
+      right: 0;
+      top:38%;
+      z-index: 1;
+      border-radius: 15px;
+  }
+  .active-line{
+      height:12px;
+      background: #e0e0e0;
+      position: absolute;
+      width: 5%;
+      margin: 0 auto;
+      left: 0;
+      right: 0;
+      top:61%;
+      z-index: 1;
+      border-radius: 15px !important;
+  }
+  .connecting-line a.active{
+      background-color: #2ED4E0;
+  }
+  .border-right{
+      border-radius: 15px 0 0 15px;
+  }
+  .border-left{
+      border-radius: 0;
+  }
+  .wizard .nav-tabs > li {
+    margin-bottom: -20px;
+  }
+  .wizard .nav-tabs > li > a.active > a, .wizard .nav-tabs > li > a.active > a:hover, .wizard .nav-tabs > li > a.active > a:focus {
+      cursor: default;
+      border: 0;
+      color:#2ED4E0;
+      border-bottom-color: transparent;
+  }
+  .nav-tabs li p{
+      padding-top:40px;
+      font-size: 14px;
+      text-align: center;
+  }
+  .list-inline{
+      text-align: center;
+  }
+  span.round-tab {
+      width: 28px;
+      height: 28px;
+      line-height: 28px;
+      display: inline-block;
+      border-radius: 100px;
+      background:#DFE3E4;
+      border: 2px solid #fff;
+      z-index:1;
+      position:absolute;
+      text-align: center;
+      font-size: 16px;
+  }
+  .wizard li > a.active span.round-tab{
+      background:#2196F3;
+      color:white;
+      border: 1px solid #fff;
+  }
+  span.round-tab:hover{
+      color: white;
+      border: 1px solid #fff;
+      background-color:#2196F3; 
+  }
+  .wizard .nav-tabs > li {
+      width: 25%;
+  }
+  .wizard .nav-tabs > li a{
+      width: 28px;
+      height: 28px;
+      margin: 18px auto;
+      border-radius: 100%;
+      padding: 0;
+      color: #777;
+  }
+  .wizard .tab-pane {
+      position: relative;
+      padding-top: 5px;
+      border-top: 1px solid #fff;
+      margin-top: 20px;
+  }
+  .next-step:hover, .next-step, .prev-step:hover, .prev-step{
+      position: relative;
+      background-color: #2196F3;
+      font-size: 14px;
+      color: #FFFFFF;
+  }
+/*customer modal UI */
\ No newline at end of file
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index 14a803e3..35b88ab8 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -286,13 +286,13 @@ section.content {
 
 /* shop name margin */
 .shop-name-margin {
-  margin-left : 15%;
+  margin-left : 10%;
 }
 /* shop name margin */
 
 /* online order margin */
 .online-order-margin {
-  margin-left : 13%;
+  margin-left : 10%;
   margin-bottom : 9.9999px;
 }
 /* online order margin */
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 49c45e39..8f3190f2 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -737,7 +737,7 @@ var trans_flag = <%= @trans_flag %>;
       customer_display_view(null,"reload");
       var sale_id = $('#sale_id').text();
       var flag = localStorage.getItem("trans_flag");
-      if(flag != "true"){
+      if((flag!=null) && (flag != "true")){
         window.location.href = '/transactions/sales/'+sale_id;
       }else{
         if (cashier_type=="cashier") {
@@ -1151,7 +1151,7 @@ var trans_flag = <%= @trans_flag %>;
 
             if (pdf_view ==1) {
               var flag = localStorage.getItem("trans_flag");
-              if(flag != "true"){
+              if((flag!=null) && (flag != "true")){
                 window.location.href = "/transactions/sales/"+sale_id;
               }else{
                 if (cashier_type=="cashier") {
@@ -1185,19 +1185,24 @@ var trans_flag = <%= @trans_flag %>;
           closeOnCancel: false,
           allowOutsideClick: false
          }, function () {
-          if (cashier_type=="cashier") {
-            window.location.href = '/origami';
+          var flag = localStorage.getItem("trans_flag");
+          if((flag!=null) && (flag != "true")){
+            window.location.href = '/transactions/sales/'+sale_id;
           }else{
-            window.location.href = '/origami/quick_service';
-            customer_display_view(null,"reload");
-          }   
+            if (cashier_type=="cashier") {
+              window.location.href = '/origami';
+            }else{
+              window.location.href = '/origami/quick_service';
+              customer_display_view(null,"reload");
+            } 
+          }
        });
   }
   
 
   $(".btn_pdf_close").on('click',function(){
     var flag = localStorage.getItem("trans_flag");
-    if(flag != "true"){
+    if((flag!=null) && (flag != "true")){
       var sale_id   = $('#sale_id').text();
       window.location.href = "/transactions/sales/"+sale_id;
     }else{
@@ -1430,16 +1435,21 @@ var trans_flag = <%= @trans_flag %>;
                title: "Information!",
                text: 'Thank You !',
              }, function () {
-                        // For Server Print - from jade
-                        if ($("#server_mode").val() == "cloud") {
-                          code2lab.printFile(result.filepath.substr(6), result.printer_url);
-                        }
-                        if (cashier_type=="cashier") {
-                         window.location.href = '/origami';
-                       }else{
-                         window.location.href = '/origami/quick_service';
-                       } 
-                     });
+                // For Server Print - from jade
+                if ($("#server_mode").val() == "cloud") {
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                }
+                var flag = localStorage.getItem("trans_flag");
+                if((flag!=null) && (flag != "true")){
+                  window.location.href = '/transactions/sales/'+sale_id;
+                }else{
+                  if (cashier_type=="cashier") {
+                    window.location.href = '/origami';
+                  }else{
+                    window.location.href = '/origami/quick_service';
+                  } 
+                }
+             });
             }
           }
         });
@@ -1472,11 +1482,16 @@ var trans_flag = <%= @trans_flag %>;
                 if ($("#server_mode").val() == "cloud") {
                   code2lab.printFile(result.filepath.substr(6), result.printer_url);
                 }
-                if (cashier_type=="cashier") {
-                 window.location.href = '/origami';
-               }else{
-                 window.location.href = '/origami/quick_service';
-               } 
+                var flag = localStorage.getItem("trans_flag");
+                if((flag!=null) && (flag != "true")){
+                  window.location.href = '/transactions/sales/'+sale_id;
+                }else{
+                  if (cashier_type=="cashier") {
+                    window.location.href = '/origami';
+                  }else{
+                    window.location.href = '/origami/quick_service';
+                  } 
+                }
              }
            })
       }
@@ -1503,18 +1518,23 @@ var trans_flag = <%= @trans_flag %>;
           data: "remark="+ remark + "&sale_id=" + sale_id+ "&access_code=" + access_code,
           success: function (result) {
             // console.log(result)
-                   // For Server Print - from jade
-                   if ($("#server_mode").val() == "cloud") {
-                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
-                  }
-                  if (cashier_type=="cashier") {
-                    window.location.href = '/origami';
-                  }else{
-                    window.location.href = '/origami/quick_service';
-                    customer_display_view(null,"reload");
-                  } 
-                }
-              });
+             // For Server Print - from jade
+             if ($("#server_mode").val() == "cloud") {
+              code2lab.printFile(result.filepath.substr(6), result.printer_url);
+            }
+            var flag = localStorage.getItem("trans_flag");
+            if((flag!=null) && (flag != "true")){
+              window.location.href = '/transactions/sales/'+sale_id;
+            }else{
+              if (cashier_type=="cashier") {
+                window.location.href = '/origami';
+              }else{
+                window.location.href = '/origami/quick_service';
+                customer_display_view(null,"reload");
+              } 
+            }
+          }
+        });
       }
     }); 
   }
diff --git a/app/views/origami/reservation/index.html.erb b/app/views/origami/reservation/index.html.erb
index ff2186c2..1c3b4060 100644
--- a/app/views/origami/reservation/index.html.erb
+++ b/app/views/origami/reservation/index.html.erb
@@ -2,8 +2,102 @@
 <%= javascript_include_tag 'reservation', 'data-turbolinks-track': 'reload' %> 
 <div class="container-fluid">
   <div class="row">
-    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-      
+    <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
+      <div class="card" id="make-reservation-slimscroll" data-height="-50">
+        <div class="card-header">
+          <h5 class="card-title text-center"><%= t :make_reservation %></h5>
+        </div>
+        <div class="card-body">
+          <div class="wizard">
+            <div class="wizard-inner">
+                <div class="active-line"></div>
+                <ul class="nav nav-tabs" role="tablist">
+                    <li role="presentation" class="nav-item">
+                      <div class="connecting-line border-right"></div>
+                      <a href="#step1" class="nav-link active" data-toggle="tab" aria-controls="reservation" role="tab" title="Reservation">
+                        <span class="round-tab">
+                          1s
+                        </span>
+                      </a>
+                    </li>
+                    <li role="presentation" class="nav-item disabled">
+                      <div class="connecting-line"></div>
+                      <a href="#complete" class="nav-link disable" data-toggle="tab" aria-controls="personal_detail" role="tab" title="Personal Detail">
+                        <span class="round-tab">
+                          2
+                        </span>
+                      </a>
+                    </li>
+                </ul>
+            </div> <!-- .end.wizard-inner -->
+            <div class="tab-content">
+              <div class="tab-pane active" role="tabpanel" id="reservation">
+                <div class="form-row">
+                  <div class="col-sm-12 col-md-12 col-lg-12">
+                    <label class="font-12 radio-inline">
+                      <input type="radio" name="type" checked class="radio-col-indigo" value="0"><%= t("views.right_panel.detail.dine_in") %>
+                    </label>&nbsp;
+                    <label class="font-12 radio-inline">
+                      <input type="radio" name="type" class="radio-col-indigo" value="1"><%= t :room %>
+                    </label>
+                  </div>
+                </div>
+                <div class="form-row clearfix">
+                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                    <input class="form-control check_in_date" name="from" id="from" type="text" placeholder="Check In Date">
+                  </div>
+                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                    <input class="form-control check_out_date" name="from" id="from" type="text" placeholder="Check Out Date">
+                  </div>
+                </div>
+                <div class="form-row clearfix">
+                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                    <input class="form-control check_in_time" name="from" id="from" type="text" placeholder="Check In Time">
+                  </div>
+                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                    <input class="form-control check_out_time" name="from" id="from" type="text" placeholder="Check Out Time">
+                  </div>
+                </div>
+                <div class="form-row clearfix">
+                  <div class="form-group col-sm-12 col-md-12 col-lg-12">
+                    <label for="room_count" class="control-label">ROOMS</label>
+                    <input type="number" class="form-control" name="room_count">
+                  </div>
+                </div>
+                <div class="form-row clearfix">
+                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                    <label for="adult_count" class="control-label">ADULT</label>
+                    <input type="number" class="form-control" name="adult_count">
+                  </div>
+                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                    <label for="child_count" class="control-label">CHILD</label>
+                    <input type="number" class="form-control" name="child_count">
+                  </div>
+                </div>
+                <div class="row text-center">
+                  <div class="form-group col-sm-12 col-md-12 col-lg-12">
+                    <button class="btn bg-blue btn-lg waves-effect">CHECK AVAILABLE</button>
+                  </div>
+                </div>
+              </div><!-- .end.tab-content .reservation -->
+            
+              <div class="tab-pane" role="tabpanel" id="personal_detail">
+
+              </div>
+            </div><!-- .end.tab-content .personal_detail -->
+          </div> <!-- .end.wizard -->
+        </div>
+      </div>
+    </div>
+    <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5">
+      <div class="card font-13">
+
+      </div>
+    </div>
+    <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+      <div class="card font-13">
+
+      </div>
     </div>
   </div>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4775df7c..2c30cb50 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -87,6 +87,7 @@ en:
   track: "Track"
   debit: "Debit"
   reservation: "Reservation"
+  make_reservation: "Make Reservation"
   
   views:
     btn:
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 03c5b1b0..7360c35f 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -82,6 +82,7 @@ mm:
   track: "Track"
   debit: "Debit"
   reservation: "Reservation"
+  make_reservation: "Make Reservation"
   
   views:
     btn:       

From b7134726e17881b9e4fbeb08b1aedb436e65e799 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 26 Sep 2018 10:28:43 +0630
Subject: [PATCH 38/66] check order for booking status moved

---
 app/assets/javascripts/reservation.js               | 11 ++++++++++-
 app/controllers/origami/home_controller.rb          |  2 +-
 app/controllers/transactions/bookings_controller.rb |  2 +-
 app/views/origami/reservation/index.html.erb        |  8 +++++---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/reservation.js b/app/assets/javascripts/reservation.js
index fa3f3ddd..e41dda14 100644
--- a/app/assets/javascripts/reservation.js
+++ b/app/assets/javascripts/reservation.js
@@ -28,4 +28,13 @@ $(function(){
 
   });
   /*new customer UI func:*/
-});
\ No newline at end of file
+});
+
+/*customer UI tab btn*/
+function nextTab(elem) {
+    $(elem).parent().next().find('a[data-toggle="tab"]').click();
+}
+function prevTab(elem) {
+    $(elem).parent().prev().find('a[data-toggle="tab"]').click();
+}
+/*customer UI tab btn*/
\ No newline at end of file
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 44b3e1e3..bfecc019 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -32,7 +32,7 @@ class Origami::HomeController < BaseOrigamiController
     @shop =  shop_detail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-    @dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
+    @dining_booking = @dining.bookings.active #.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
     #@dining_booking = @dining.bookings.active.where("created_at between '#{DateTime.now.utc - 12.hours}' and '#{DateTime.now.utc}'")
     @order_items = Array.new
     @dining_booking.each do |booking|
diff --git a/app/controllers/transactions/bookings_controller.rb b/app/controllers/transactions/bookings_controller.rb
index 78e8dc1b..16d264af 100644
--- a/app/controllers/transactions/bookings_controller.rb
+++ b/app/controllers/transactions/bookings_controller.rb
@@ -35,7 +35,7 @@ class Transactions::BookingsController < ApplicationController
   def show
    
     @booking = Booking.find(params[:id])
-    @order = []
+    @order = nil
     @order_items = []
     @booking.booking_orders.each do |booking_order|
       @order = Order.find(booking_order.order_id)
diff --git a/app/views/origami/reservation/index.html.erb b/app/views/origami/reservation/index.html.erb
index 1c3b4060..720f9d3e 100644
--- a/app/views/origami/reservation/index.html.erb
+++ b/app/views/origami/reservation/index.html.erb
@@ -16,7 +16,7 @@
                       <div class="connecting-line border-right"></div>
                       <a href="#step1" class="nav-link active" data-toggle="tab" aria-controls="reservation" role="tab" title="Reservation">
                         <span class="round-tab">
-                          1s
+                          1
                         </span>
                       </a>
                     </li>
@@ -76,7 +76,7 @@
                 </div>
                 <div class="row text-center">
                   <div class="form-group col-sm-12 col-md-12 col-lg-12">
-                    <button class="btn bg-blue btn-lg waves-effect">CHECK AVAILABLE</button>
+                    <button class="btn bg-blue btn-lg waves-effect next-step">CHECK AVAILABLE</button>
                   </div>
                 </div>
               </div><!-- .end.tab-content .reservation -->
@@ -91,7 +91,9 @@
     </div>
     <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5">
       <div class="card font-13">
-
+        <div class="row">
+          
+        </div>
       </div>
     </div>
     <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">

From 3828356690f8914bf3477be840ed64602cbe0f1e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 26 Sep 2018 10:30:47 +0630
Subject: [PATCH 39/66] remove comment

---
 app/controllers/origami/home_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index bfecc019..44b3e1e3 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -32,7 +32,7 @@ class Origami::HomeController < BaseOrigamiController
     @shop =  shop_detail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-    @dining_booking = @dining.bookings.active #.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
+    @dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
     #@dining_booking = @dining.bookings.active.where("created_at between '#{DateTime.now.utc - 12.hours}' and '#{DateTime.now.utc}'")
     @order_items = Array.new
     @dining_booking.each do |booking|

From 8e152641139a5c974b48bb9b6afa3401a67366b4 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 26 Sep 2018 10:47:47 +0630
Subject: [PATCH 40/66] flag sale_id

---
 app/views/origami/payments/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 8f3190f2..91515771 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1176,7 +1176,7 @@ var trans_flag = <%= @trans_flag %>;
       $('#pay').text("Pay");
       var text  = 'Thank You !';
     }
-
+    var sale_id   = $('#sale_id').text();
     swal({
           title: "Payment Successful!",
           text: text,

From 75118f598287c528eb9136785e790d1a67a39ff6 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 26 Sep 2018 11:23:32 +0630
Subject: [PATCH 41/66] check sale_id

---
 app/views/origami/payments/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 8f3190f2..91515771 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1176,7 +1176,7 @@ var trans_flag = <%= @trans_flag %>;
       $('#pay').text("Pay");
       var text  = 'Thank You !';
     }
-
+    var sale_id   = $('#sale_id').text();
     swal({
           title: "Payment Successful!",
           text: text,

From 786dd8c49086c521be4c0a223f9c7101bdd6683c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 26 Sep 2018 11:51:43 +0630
Subject: [PATCH 42/66] check flag

---
 app/views/origami/home/show.html.erb     | 2 +-
 app/views/origami/payments/show.html.erb | 2 ++
 app/views/origami/rooms/show.html.erb    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 16bfa3c7..42ba0d65 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -790,7 +790,7 @@
 <script>
   var cashier_type = "cashier";
     $(document).ready(function () {
-      // localStorage.removeItem("tax_type");
+      localStorage.removeItem("trans_flag");
       /* check webview loaded*/
       var webview = <%= @webview %>;
       showHideNavbar(webview);
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 91515771..a6e878c5 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1151,6 +1151,7 @@ var trans_flag = <%= @trans_flag %>;
 
             if (pdf_view ==1) {
               var flag = localStorage.getItem("trans_flag");
+              localStorage.removeItem("trans_flag");
               if((flag!=null) && (flag != "true")){
                 window.location.href = "/transactions/sales/"+sale_id;
               }else{
@@ -1186,6 +1187,7 @@ var trans_flag = <%= @trans_flag %>;
           allowOutsideClick: false
          }, function () {
           var flag = localStorage.getItem("trans_flag");
+          localStorage.removeItem("trans_flag");
           if((flag!=null) && (flag != "true")){
             window.location.href = '/transactions/sales/'+sale_id;
           }else{
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index c78a3cd3..84ea9086 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -840,6 +840,7 @@
 var cashier_type = "cashier";
 $(document).ready(function(){
   // localStorage.removeItem("tax_type");
+  localStorage.removeItem("trans_flag");
    /* check webview loaded*/
     var webview = <%= @webview %>;
     showHideNavbar(webview);

From b66bee810ac25f143054c280d6edff95c3794e27 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 26 Sep 2018 16:38:49 +0630
Subject: [PATCH 43/66] update stock taking form

---
 .../inventory/stock_checks_controller.rb      |  27 +-
 app/models/inventory_definition.rb            |  17 +
 ...kup_form.html.erb => _backupform.html.erb} |   0
 .../inventory_definitions/_form.html.erb      |  10 +-
 .../inventory_definitions/new.html.erb        |   4 +-
 .../stock_checks/backup_index.html.erb        | 163 +++++++
 .../get_menu_category.json.jbuilder           |  11 +
 .../inventory/stock_checks/index.html.erb     | 404 ++++++++++++------
 config/routes.rb                              |   2 +
 9 files changed, 488 insertions(+), 150 deletions(-)
 rename app/views/inventory/inventory_definitions/{backup_form.html.erb => _backupform.html.erb} (100%)
 create mode 100755 app/views/inventory/stock_checks/backup_index.html.erb
 create mode 100644 app/views/inventory/stock_checks/get_menu_category.json.jbuilder
 mode change 100755 => 100644 app/views/inventory/stock_checks/index.html.erb

diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb
index 55fd7d43..06db5c5f 100755
--- a/app/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -1,21 +1,15 @@
 class Inventory::StockChecksController < BaseInventoryController
   def index
     @check = StockCheck.new
-     @inventory_definitions1 = InventoryDefinition.active.all
+     # @inventory_definitions1 = InventoryDefinition.active.all
 
-     @inventory_definitions =   InventoryDefinition.select("inventory_definitions.*,
-                  mi.name as item_name,
-                 mii.item_instance_name as instance_name," +
-                "mc.name as menu_category_name,mc.id as menu_category_id ")
+     @category =   InventoryDefinition.select("inventory_definitions.*,"+
+                "mc.name as name,mc.id as id ")
                 .joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
                      " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
                      " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
-                .group("mi.menu_category_id,inventory_definitions.item_code")
+                .group("mi.menu_category_id")
                 .order("mi.menu_category_id desc")
-
-                puts @inventory_definitions.count
-                puts @inventory_definitions1.count
-    puts @inventory_definitions.to_json
   end
 
   def create
@@ -56,6 +50,19 @@ class Inventory::StockChecksController < BaseInventoryController
     end
   end
 
+  def get_menu_category ()
+    if (params[:id])
+      
+      #Pull this menu
+      @menu_category = InventoryDefinition.search_by_category(params[:id])
+      puts @menu_category.to_json
+      # puts @menu.menu_items[1].item_attributes.to_json
+      return @menu_category
+    else
+      MenuCategory.current_menu
+    end
+  end
+
   #Shop Name in Navbor
   helper_method :shop_detail
   def shop_detail
diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb
index 56f726bb..377ac153 100755
--- a/app/models/inventory_definition.rb
+++ b/app/models/inventory_definition.rb
@@ -61,4 +61,21 @@ class InventoryDefinition < ApplicationRecord
         end
      end
   end
+
+  def self.search_by_category(cat_id)
+     @inventory_definitions =   InventoryDefinition.select("inventory_definitions.*,
+                 mi.name as item_name,mii.item_instance_name as instance_name," +
+                 "mi.item_code as item_code,mii.item_instance_code as instance_code," +
+                "mc.name as menu_category_name,mc.id as menu_category_id ")
+                .joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
+                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+                .where("mc.id=#{cat_id}")
+                .group("mi.menu_category_id,inventory_definitions.item_code")
+                .order("mi.menu_category_id desc")
+
+                
+    
+  end
+
 end
diff --git a/app/views/inventory/inventory_definitions/backup_form.html.erb b/app/views/inventory/inventory_definitions/_backupform.html.erb
similarity index 100%
rename from app/views/inventory/inventory_definitions/backup_form.html.erb
rename to app/views/inventory/inventory_definitions/_backupform.html.erb
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index 9cd2acb4..d99a4974 100644
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -73,7 +73,11 @@
           </div>
         </div>
       </div>
-      <input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
+      <div class="col-lg-1 col-md-1 col-sm-1" >
+        <button type="button" class="btn btn-lg btn-block btn-default waves-effect m-t-5" id='back'>
+          <i class="material-icons">reply</i>Back
+        </button>
+      </div>
     </div>
 
     <div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
@@ -576,5 +580,9 @@
         });
       });
 
+      $('#back').on('click', function () {
+        window.location.href = '/inventory';
+    });
+
     });
   </script>
\ No newline at end of file
diff --git a/app/views/inventory/inventory_definitions/new.html.erb b/app/views/inventory/inventory_definitions/new.html.erb
index 08dd4239..20ea06c4 100755
--- a/app/views/inventory/inventory_definitions/new.html.erb
+++ b/app/views/inventory/inventory_definitions/new.html.erb
@@ -1,4 +1,4 @@
-<div class="page-header">
+<!-- <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"><a href="<%= inventory_path %>"><%= t :inventory %></a></li>
@@ -7,6 +7,6 @@
       <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %>
     </span>
   </ol>
-</div>
+</div> -->
 <br>
 <%= render 'form', inventory: @inventory_definition %>
\ No newline at end of file
diff --git a/app/views/inventory/stock_checks/backup_index.html.erb b/app/views/inventory/stock_checks/backup_index.html.erb
new file mode 100755
index 00000000..667a172e
--- /dev/null
+++ b/app/views/inventory/stock_checks/backup_index.html.erb
@@ -0,0 +1,163 @@
+<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.stock_check") %></li>
+  <span class="float-right">
+    <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %>
+  </span>
+</ol>
+</div>
+
+
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <!-- <div class="m-b-10 clearfix">
+      <%= link_to t("views.btn.new"),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+    </div -->
+    <div class="card">
+      <div class="p-l-15 p-r-15 p-t-10">
+        <div class="row">
+          <div class="col-md-6">
+                <div class="form-group">
+                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+                        <!-- <label for="remark">Remark</label> -->
+                         <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+                     <!-- <label for="password_2">Item</label> -->
+                        <select class='form-control' id='product_sku'>
+                          <option value="">Select Product</option>
+                          <% @inventory_definitions.each do |id| %>
+                          <option value="<%= id.item_code %>">
+                            <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
+                            <% if menu_item.nil? %>
+                            <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
+                            <% else %>
+                            <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                            <% end %>
+                          </option>
+                          <% end %>
+                        </select>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+                    <!-- <label for="email_address_2">Qty</label> -->
+                        <input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''/>
+                  </div>
+                </div>
+                
+                <div class="form-group">
+                  <div class="col-md-4">
+                     <button class="btn btn-primary form-control" id='save_to_stock_check'> Save</button>
+                  </div>
+                </div>
+          </div>
+
+          <div class="col-md-6">
+            <table class="table table-striped" id='stock_item'>
+              <tr>
+                <!--<th>#</th>-->
+                <th><%= t("views.right_panel.detail.product") %></th>
+                <th><%= t("views.right_panel.detail.balance") %></th>
+                <th><button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> <%= t("views.btn.finish") %></button></th>
+              </tr>
+              <!-- <tr>
+                <td colspan="3">
+                  <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button></td>
+                </tr> -->
+              </table>
+          </div>
+          
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+    <div class="card">
+      <div class="body">
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.detail.set_stock_check_reason") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.stock_check_reason_txt") %> <br>
+        2) <%= t("views.right_panel.detail.select") +" "+ t("views.right_panel.detail.product")  %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        3) <%= t("views.right_panel.detail.qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.qty_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.btn.save") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.stock_check_txt") %> <br>
+        2) <%= t("views.btn.finish") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.stock_check_txt") +" "+ t("views.right_panel.detail.detail_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.home_txt") %> <br>
+        </p>
+      </div>
+    </div>  
+  </div>
+</div>
+
+<script>
+    var count = 0;
+    $(document).ready(function(){
+      clearFormData();
+    });
+    
+    function clearFormData(){
+      $('#stock_check_reason').val("");
+      $('#product_qty').val("");
+      $('#product_sku').val("");
+    }
+
+    $('#save_to_stock_check').on('click', function () {
+        count += 1;
+        product_sku = $('#product_sku').val();
+        product_qty = $('#product_qty').val();
+        product_name = $("#product_sku").find("option:selected").text();
+
+        // clearFormData();
+
+        var tr = '<tr>'
+            //+ '<td>' + count + '</td>'
+            + '<td><input type=hidden value="' + product_sku + '" id="item_sku_' + count + '" name=' + count + '/>'
+            + product_name + '</td>'
+            + '<td><input type=text value="' + product_qty + '" class="form-control col-md-9" id="item_qty_' + count + '" name=' + count + '/></td>'
+            + '<td><input type=button value="X" class="btn btn-danger p-l-15 p-r-15" id="item_remove_' + count + '" name=' + count + ' onclick="remove_row('+ count +')"/></td>'
+            + '</tr>';
+        $('#stock_item').append(tr);
+//        $('#product_sku').val('');
+        $('#product_qty').val('');
+    });
+
+    $('#finish').on('click', function () {
+        var reason = $('#stock_check_reason').val();
+        var arr = [];
+        var jsonStr = '';
+
+        for (var i = 1; i <= count; i++) {
+            itemname = $('#item_sku_' + i).val();
+            itemqty = $('#item_qty_' + i).val();
+            if(itemname !== undefined){
+                arr.push({sku: itemname, qty: itemqty});
+            }
+            jsonStr = JSON.stringify(arr);
+        }
+        console.log(jsonStr);
+        $.ajax({
+            type: 'Post',
+            url: '<%= inventory_stock_check_save_path %>',
+            data: 'stock_item=' + jsonStr + '&reason=' + reason,
+            success: function (data) {
+                window.location.href = '/inventory/stock_checks/' + data['stock_id'];
+            }
+        })
+    });
+
+    function remove_row(row) {
+        $("#item_remove_"+row).parent().parent().remove();
+    }
+
+</script>
diff --git a/app/views/inventory/stock_checks/get_menu_category.json.jbuilder b/app/views/inventory/stock_checks/get_menu_category.json.jbuilder
new file mode 100644
index 00000000..b547ac88
--- /dev/null
+++ b/app/views/inventory/stock_checks/get_menu_category.json.jbuilder
@@ -0,0 +1,11 @@
+if @menu_category
+    json.menu_items @menu_category do |item|
+    	json.id            item.id
+    	json.item_code     item.item_code
+    	json.item_name     item.item_name
+    	json.instance_name item.instance_name
+		json.instance_code item.instance_code
+		json.category_name item.menu_category_name
+		json.category_id   item.menu_category_id
+    end
+end
\ No newline at end of file
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
old mode 100755
new mode 100644
index 5ec971d8..c5a72be1
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -1,135 +1,254 @@
-<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.stock_check") %></li>
-  <span class="float-right">
-    <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %>
-  </span>
-</ol>
-</div>
+<%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
 
+  <div class="container-fluid " style="padding:0px 3px 0px 3px;">
+    <div id="oqs_loading_wrapper" style="display:none;">
+      <div id="oqs_loading"></div>
+    </div>
+    <div class="row m-t">
+      <div class="col-lg-2 col-md-2 col-sm-2" id=""> 
+        <div id="menu1-slimscroll" data-height="0">
+          <ul class="nav nav-tabs flex-column category_list m-t-10" role="tablist" id="ul-navbar">
+            
+            <% @category.each do |cat| %>
+              
+                    <li class="nav-item ">
+                      <p class="hidden cat-id"><%= cat.id  %></p> 
+                      <a class="nav-link menu_category sub_click first_<%=cat.id%>" data-toggle="tab" href="" role="tab" data-id="<%=cat.id%>" ><%= cat.name%>
+                      </a>
+                     
+                    </li>
+                 
+            <%end %>
+          </ul>
+        </div>
+      </div>
 
-<div class="row">
-  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
-    <!-- <div class="m-b-10 clearfix">
-      <%= link_to t("views.btn.new"),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
-    </div -->
-    <div class="card">
-      <div class="p-l-15 p-r-15 p-t-10">
-        <div class="row">
-          <div class="col-md-6">
-                <div class="form-group">
-                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
-                        <!-- <label for="remark">Remark</label> -->
-                         <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
-                  </div>
-                </div>
-                <div class="form-group">
-                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
-                     <!-- <label for="password_2">Item</label> -->
-                        <select class='form-control' id='product_sku'>
-                          <option value="">Select Product</option>
-                          <% @inventory_definitions.each do |id| %>
-                          <option value="<%= id.item_code %>">
-                            <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
-                            <% if menu_item.nil? %>
-                                <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
-                            <% else %>
-                                <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
-                            <% end %>
-                          </option>
-                          <% end %>
-                        </select>
-                  </div>
-                </div>
-                <div class="form-group">
-                  <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
-                    <!-- <label for="email_address_2">Qty</label> -->
-                        <input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''/>
-                  </div>
-                </div>
-                
-                <div class="form-group">
-                  <div class="col-md-4">
-                     <button class="btn btn-primary form-control" id='save_to_stock_check'> Save</button>
-                  </div>
-                </div>
+      <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
+        <div class="card">
+          <div class="card-block" style="">
+            <div class="card-text" id="custom-slimscroll">
+              <div class="row menu_items_list" style="margin:0px 1px 0px 1px ;">
+             <!-- append data -->
+              </div>
+            </div>
           </div>
+        </div>
+      </div>
+      
+      <div class="col-md-3 col-lg-3 col-sm-3">
+        <button type="button" class="btn btn-lg btn-block btn-default waves-effect m-t-5" id='back'>
+          <i class="material-icons">reply</i>Back
+        </button>
+        <br>
+        <div class="card-block">
+          <div class="card-text" id="order-detail-slimscroll" data-height="140">
+           <table class="table table-striped summary-items" id="order-items-table" >
+              <thead>
+               <tr>
+                 <th>#</th>
+                 <th class="item-name">Items</th>
+                 <th class="item-qty">QTY</th>
+                 <th class="item-attr"></th>
+               </tr>
+              </thead>
+              <tbody class="font-13" >
 
-          <div class="col-md-6">
-            <table class="table table-striped" id='stock_item'>
-              <tr>
-                <!--<th>#</th>-->
-                <th><%= t("views.right_panel.detail.product") %></th>
-                <th><%= t("views.right_panel.detail.balance") %></th>
-                <th><button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> <%= t("views.btn.finish") %></button></th>
-              </tr>
-              <!-- <tr>
-                <td colspan="3">
-                  <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button></td>
-                </tr> -->
-              </table>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="card-footer">
+          <button type="button" class="btn btn-lg btn-block btn-primary waves-effect m-t-5" id='finish'>Finish
+        </button>
+        </div>
+     </div>
+    </div>
+
+    </div>
+
+    <div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+      <div class="modal-dialog custom-modal-dialog modal-lg">
+        <div class="modal-content">
+          <div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
+            <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
+            <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+          </div>
+          <div class="modal-body">
+            <div class="form-group">
+                <div class="form-group">
+                    <label class="control-label" for="attribute">Stock Check Reason</label>
+                     <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
+                </div>
+                <div class="form-group">
+                    <label class="control-label" for="attribute">Item</label>
+                     <input type='text' id='item' class='form-control' readonly="true" value=''/>
+                </div>
+                <div class="form-group">
+                    <label class="control-label" for="attribute">Qty</label>
+                  <input type='text' class='form-control keypress_qty' placeholder="Qty" id='product_qty' value="1" />
+                </div>
+                <input type="hidden" id="instance_code" value="">
+                <input type="hidden" id="item_code" value="">
+                <input type="hidden" id="item_name" value="">
+                <input type="hidden" id="instance_name" value="">
+
+                <div class="form-actions">
+                  <button type="button" class="btn btn-primary" data-dismiss="modal" id="save_to_stock_check">Save</button>
+                 <!--  <button type="button" class="btn btn-primary add_to_order " data-dismiss="modal" id="add_to_order">Add to Order<div class="ripple-container"></div></button> -->
+                </div>
+
+              </div>
           </div>
-          
         </div>
       </div>
     </div>
-  </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
-    <div class="card">
-      <div class="body">
-        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i> </h5>
-        <p>
-        1) <%= t("views.right_panel.detail.set_stock_check_reason") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.stock_check_reason_txt") %> <br>
-        2) <%= t("views.right_panel.detail.select") +" "+ t("views.right_panel.detail.product")  %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
-        3) <%= t("views.right_panel.detail.qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.qty_txt") %> <br>
-        </p>
-        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
-        <p>
-        1) <%= t("views.btn.save") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.stock_check_txt") %> <br>
-        2) <%= t("views.btn.finish") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.stock_check_txt") +" "+ t("views.right_panel.detail.detail_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.home_txt") %> <br>
-        </p>
-      </div>
-    </div>  
-  </div>
-</div>
-
+<style type="text/css">
+  .fadeInRight{
+  -webkit-animation-duration: 350ms !important;
+  }
+</style>
 <script>
+
+  jQuery(function(){
+    id = "<%=@category[0].id%>";
+    console.log(id)
+    jQuery('.first_'+id).click();
+  });
+
+  $(document).ready(function () {
     var count = 0;
-    $(document).ready(function(){
-      clearFormData();
+    //click menu sidebar menu category
+    $(document).on('click', '.menu_category', function(e){
+        e.preventDefault();
+        $('.sub_category_list').addClass("hidden");
+        var menu_id = $(this).attr("data-id");
+        var url     = "/inventory/get_menu_category/"+menu_id;
+        show_menu_item_list(url,menu_id);
+    });  
+    //End menu category Click
+
+    //show menu item list when click menu category
+    function show_menu_item_list(url_item,menu_id){ 
+        var menu_list = $('.menu_items_list');
+        menu_list.empty();
+
+          //Start Ajax
+          $.ajax({      
+            type: "GET",         
+            url: url_item, 
+            data: {},
+            dataType: "json",
+            success: function(data) {
+              var menu_items_list = $('.menu_items_list');
+              menu_items_list.empty();
+              menu_items = data.menu_items;
+              console.log(menu_items)
+              show_menu_list(menu_items);
+            }
+          });
+          //end Ajax         
+      }
+    //end show list function
+    function show_menu_list(items) {
+      var menu_list = $('.menu_items_list');
+      menu_list.empty();
+
+      for(var i in items) {  
+        
+        fa_plus       = 'material-icons';
+        add           = 'view_list'
+        menu_item_box = 'menu_item_box';
+        data_target   = 'sx_item_detailModal';
+        data_modal    = ''
+        add_icon      = "add_icon"
+        if (items[i].image) {                   
+          image_path  = items[i].image;                    
+
+        }else{
+          image_path  = "image/logo.png";
+        }
+
+        row = '<div class="col-md-3">'
+          +'<div class="card custom-card testimonial-card fadeInRight card-box"' 
+          +'item_name="'+items[i]["item_name"]+'"' 
+          +'item_code="'+items[i]["item_code"]+'"' 
+          +'instance_name="'+items[i]["instance_name"]+'" '
+          +'instance_code="'+items[i]["instance_code"]+'"' 
+          +'data-toggle="modal" data-target=".'+data_target+'" '
+          +'style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+          +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
+          +'<div class="col-md-10 " style="padding:0px !important;">'+ items[i]["item_name"] +"-" +items[i]["instance_name"]+'</div>'
+          +"<div class='col-md-2 "+menu_item_box+" ' style='padding:0px 5px 0px 5px'>"
+          +"<i class='m-l--5 fa "+fa_plus+" '>"
+          +add+ '</i>'
+          +'</div>'
+          +'</div>'
+          +"<div  class='"+add_icon+" p-t-65 m-r-' >"
+          +'</div>'
+          +'</div>';
+        $('.menu_items_list').append(row);
+      }
+
+       }
+
+    //click item row for add order
+    $(document).on('click', '.card-box', function(event){ 
+      $("#product_qty").val(1);
+        $('#product_qty').empty(); 
+        $("#stock_check_reason").val('');
+        $('#item_code').val($(this).attr('item_code'));
+        $('#instance_code').val($(this).attr('instance_code'));
+        $('#item').val($(this).attr('item_name')+"-"+$(this).attr('instance_name'));
+        $('#instance_name').val($(this).attr('instance_name'));
+        $('#item_name').val($(this).attr('item_name'));
     });
-    
-    function clearFormData(){
-      $('#stock_check_reason').val("");
-      $('#product_qty').val("");
-      $('#product_sku').val("");
-    }
+
 
     $('#save_to_stock_check').on('click', function () {
-        count += 1;
-        product_sku = $('#product_sku').val();
-        product_qty = $('#product_qty').val();
-        product_name = $("#product_sku").find("option:selected").text();
+      
+      if ($("#product_qty").val()>0) {
+          item_name     = $('#item_name').val();
+          instance_name = $('#instance_name').val();
+          product_qty   = $('#product_qty').val();
+          product_name  = $("#item").val();
 
-        // clearFormData();
+          item_code     = $("#item_code").val();
+          instance_code = $("#instance_code").val();
 
-        var tr = '<tr>'
-            //+ '<td>' + count + '</td>'
-            + '<td><input type=hidden value="' + product_sku + '" id="item_sku_' + count + '" name=' + count + '/>'
-            + product_name + '</td>'
-            + '<td><input type=text value="' + product_qty + '" class="form-control col-md-9" id="item_qty_' + count + '" name=' + count + '/></td>'
-            + '<td><input type=button value="X" class="btn btn-danger p-l-15 p-r-15" id="item_remove_' + count + '" name=' + count + ' onclick="remove_row('+ count +')"/></td>'
-            + '</tr>';
-        $('#stock_item').append(tr);
-//        $('#product_sku').val('');
-        $('#product_qty').val('');
+          reason =  $("#stock_check_reason").val();
+
+          var rowCount = $('.summary-items tbody tr').length+1;
+
+          row ="<tr class='item_box' data-toggle='modal' data-target='#sx_itemModal' 'data-code ='"
+                  +item_code+ "' data-instance-code='"+instance_code+"' data-row ='"+rowCount+ "' data-reason ='"+reason+ "'>"
+                  +'<td class="item-cell-no">'+rowCount+'</td>'
+                  +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + instance_name +'</td>'
+                  +'<td class="item-cell-qty" id="item_qty">' + product_qty + '</td>' 
+                  +'<td class="" id="remove"><i class="material-icons" id="remove_row" style="cursor:pointer;">delete_forever</i></td>' 
+              +'</tr>';
+        $(".summary-items tbody").append(row);
+      }else{
+         swal("Opps", "Please enter number for qty ","warning");
+      }
+    });
+
+    $(document).on('click', '#remove_row', function(event){ 
+      console.log( $(this).parent().parent())
+      $($(this).parent().parent()).attr('data-active',true);
+       $('.summary-items tr').filter(function(){
+          if ($(this).attr('data-active') == 'true'){
+            $(this).remove();
+          }
+        });
+      });
+
+    $(".keypress_qty").on('keyup change', function (){
+        value = $(this).val();
+        if ($.isNumeric(value)) {
+          $('#product_qty').val(value);
+        }else{
+          swal("Opps","Please enter number for qty","warning");
+        }
     });
 
     $('#finish').on('click', function () {
@@ -137,27 +256,38 @@
         var arr = [];
         var jsonStr = '';
 
-        for (var i = 1; i <= count; i++) {
-            itemname = $('#item_sku_' + i).val();
-            itemqty = $('#item_qty_' + i).val();
-            if(itemname !== undefined){
-                arr.push({sku: itemname, qty: itemqty});
-            }
-            jsonStr = JSON.stringify(arr);
-        }
+        var jsonStr = JSON.stringify(get_order_item_rows());
         console.log(jsonStr);
-        $.ajax({
-            type: 'Post',
-            url: '<%= inventory_stock_check_save_path %>',
-            data: 'stock_item=' + jsonStr + '&reason=' + reason,
-            success: function (data) {
-                window.location.href = '/inventory/stock_checks/' + data['stock_id'];
-            }
-        })
+        if (jsonStr) {
+          $.ajax({
+              type: 'Post',
+              url: '<%= inventory_stock_check_save_path %>',
+              data: 'stock_item=' + jsonStr + '&reason=' + reason,
+              success: function (data) {
+                  window.location.href = '/inventory/stock_checks/' + data['stock_id'];
+              }
+          })
+        }else{
+           swal("Opps","Please add item ","warning");
+        }        
     });
 
-    function remove_row(row) {
-        $("#item_remove_"+row).parent().parent().remove();
-    }
 
-</script>
+  /* Get Item rows */
+  function get_order_item_rows(){
+    var items = [];  
+    var item_row    = $('.summary-items tbody tr');
+    $(item_row).each(function(i){
+      var item_list = {};
+      
+      item_list.remark = $(item_row[i]).attr('data-reason');
+      item_list.sku    = $(item_row[i]).attr('data-instance-code');
+      item_list.qty    = $(item_row[i]).children('#item_qty').text();
+
+      items.push(item_list);
+    }); 
+    return items;
+  }
+
+  });
+</script>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 60cea417..62422432 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -516,6 +516,8 @@ scope "(:locale)", locale: /en|mm/ do
     resources :stock_journals
     resources :inventory_definitions
     get ':inventory_definition_id/show' => 'inventory#show'
+
+    get 'get_menu_category/:id' => "stock_checks#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
   end
   #mount_compendium at: '/report' #, controller: 'reports'
 

From 6632caa4f44684ea065420cbe7ffabd4403ff0a6 Mon Sep 17 00:00:00 2001
From: aungmyozaw <aungmyo.zaw@code2lab.com>
Date: Thu, 27 Sep 2018 15:37:55 +0630
Subject: [PATCH 44/66] update bundle

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b7f4b2ca..4e6ba0f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -160,7 +160,7 @@ GEM
       railties (>= 3.1)
     multi_json (1.12.2)
     multi_xml (0.6.0)
-    mysql2 (0.4.9)
+    mysql2 (0.4.10)
     nested_form (0.3.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -368,4 +368,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

From 449404d9cfe9f136c9778f75fe0acbfd4009dac0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 27 Sep 2018 16:29:11 +0630
Subject: [PATCH 45/66] update stockcheck

---
 .../inventory/stock_checks/index.html.erb     | 24 ++++++++++++++++++-
 .../inventory/stock_checks/show.html.erb      |  2 +-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index c5a72be1..5577a8df 100644
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -264,7 +264,29 @@
               url: '<%= inventory_stock_check_save_path %>',
               data: 'stock_item=' + jsonStr + '&reason=' + reason,
               success: function (data) {
-                  window.location.href = '/inventory/stock_checks/' + data['stock_id'];
+                if (data['stock_id']) {
+                  check_id = data['stock_id'];
+                   $.ajax({
+                      type: 'post',
+                      url: '<%= inventory_save_to_journal_path %>',
+                      data: 'data=' + check_id,
+                      success: function () {
+                        swal({
+                          title: "Information!",
+                          text: "Successfully saved to journal",
+                          html: true,
+                          closeOnConfirm: false,
+                          closeOnCancel: false,
+                          allowOutsideClick: false
+                          }, function () {
+                            // window.location.href = '/inventory';
+                            window.location.href = '/inventory/stock_checks/' + check_id;
+                        });
+                      }
+                  })
+                   // window.location.href = '/inventory/stock_checks/' + data['stock_id'];
+                }
+                  
               }
           })
         }else{
diff --git a/app/views/inventory/stock_checks/show.html.erb b/app/views/inventory/stock_checks/show.html.erb
index 10aa3cc9..feb8f385 100755
--- a/app/views/inventory/stock_checks/show.html.erb
+++ b/app/views/inventory/stock_checks/show.html.erb
@@ -79,7 +79,7 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
 
       <div class="body">
-              <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> <%= t("views.right_panel.button.save_to_journal") %></button>
+              <!-- <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> <%= t("views.right_panel.button.save_to_journal") %></button> -->
               <button id="print" type="button" class="btn btn-block btn-primary"> <%= t :print %></button>
       </div>
 

From 5a0473d777f15f025cbd22c3b5137a9a9f736bc1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 28 Sep 2018 15:54:17 +0630
Subject: [PATCH 46/66] reservation data

---
 app/assets/javascripts/OQS.js                 |   8 +-
 app/assets/javascripts/custom.js              |  20 +++
 app/assets/javascripts/reservation.js         |  24 ++++
 .../origami/customers_controller.rb           |   1 -
 .../origami/reservation_controller.rb         |  41 ++++++-
 app/models/reservation.rb                     |  15 +++
 app/models/reservation_item.rb                |  13 ++
 app/views/origami/home/show.html.erb          |  20 ++-
 app/views/origami/payments/show.html.erb      |  16 ++-
 .../pending_order/completed_sale.html.erb     |   8 +-
 app/views/origami/reservation/index.html.erb  | 114 ++++++++++++------
 app/views/origami/rooms/show.html.erb         |  16 ++-
 app/views/origami/sales/show.html.erb         |   8 +-
 .../origami/table_invoices/show.html.erb      |  16 ++-
 app/views/transactions/sales/show.html.erb    |   4 +-
 config/routes.rb                              |   2 +-
 .../20180928052742_create_reservations.rb     |  24 ++++
 ...20180928074338_create_reservation_items.rb |  26 ++++
 18 files changed, 313 insertions(+), 63 deletions(-)
 create mode 100644 app/models/reservation.rb
 create mode 100644 app/models/reservation_item.rb
 create mode 100644 db/migrate/20180928052742_create_reservations.rb
 create mode 100644 db/migrate/20180928074338_create_reservation_items.rb

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index d2a22aef..72ff4733 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -404,7 +404,9 @@ $(document).on('turbolinks:load', function() {
 	     	success: function(result){
 	     		 // For Server Print - from jade
 	              if ($("#server_mode").val() == "cloud") {
-	                code2lab.printFile(result.filepath.substr(6), result.printer_url);
+	              	if(typeof code2lab != 'undefined'){
+	                	code2lab.printFile(result.filepath.substr(6), result.printer_url);
+	                }
 	              }
 	         location.reload();
 
@@ -428,7 +430,9 @@ $(document).on('turbolinks:load', function() {
 	     	success: function(result){
 	     		// For Server Print - from jade
 	              if ($("#server_mode").val() == "cloud") {
-	                code2lab.printFile(result.filepath.substr(6), result.printer_url);
+	              	if(typeof code2lab != 'undefined'){
+	                	code2lab.printFile(result.filepath.substr(6), result.printer_url);
+	                }
 	              }
 	            location.reload();
 	     	}
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index f975ad07..3843f297 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -111,6 +111,26 @@ $(document).ready(function() {
     railBorderRadius: '0',
     touchScrollStep : 50
   });
+
+  $('#process-reservation-slimscroll').slimScroll({
+    height: height-$('#process-reservation-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0',
+    touchScrollStep : 50
+  });
+
+  $('#reservation-info-slimscroll').slimScroll({
+    height: height-$('#reservation-info-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0',
+    touchScrollStep : 50
+  });
   // $('.delete').click(function(){
   //   var method    = $(this).attr('data-method');
   //   var url       = $(this).attr('data-ref');
diff --git a/app/assets/javascripts/reservation.js b/app/assets/javascripts/reservation.js
index e41dda14..0dea213e 100644
--- a/app/assets/javascripts/reservation.js
+++ b/app/assets/javascripts/reservation.js
@@ -1,6 +1,7 @@
 //= require custom.js
 
 $(function(){
+  $(".room_type").hide();
   /*new customer UI func:*/
   //Initialize tooltips
   $('.nav-tabs > li a[title]').tooltip();
@@ -21,6 +22,7 @@ $(function(){
       nextTab($active);
       $('.wizard .nav-tabs li.active .connecting-line').css({"border-bottom-left-radius": 0, "border-top-left-radius": 0});
   });
+  
   $(".prev-step").click(function (e) {
 
       var $active = $('.wizard .nav-tabs li a.active');
@@ -28,6 +30,28 @@ $(function(){
 
   });
   /*new customer UI func:*/
+
+  $(".reservation_type").on("click", function(){
+    if($(this).val() == "Dine-in"){
+      $(".dining_type").show();
+      $(".room_type").hide();
+    }else{
+      $(".dining_type").hide();
+      $(".room_type").show();
+    }
+  });
+
+  $(".number_limit").on("click", function(){
+    if(parseInt($(this).val()) <= 0){
+      if($(this).attr("data-type") == "room"){
+        $("#room_count").val(1);
+      }else if($(this).attr("data-type") == "adult"){
+        $("#adult_count").val(1);
+      }else{
+        $("#child_count").val(1);
+      }
+    }
+  });
 });
 
 /*customer UI tab btn*/
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 0eee0400..94f4f1ea 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -76,7 +76,6 @@ class Origami::CustomersController < BaseOrigamiController
     filter = params[:filter]
     
     if filter.nil?
-      puts params[:page]
       @crm_customers = Customer.order("customer_id") #.page(params[:page])
       #@products = Product.order("name").page(params[:page]).per(5)
     else
diff --git a/app/controllers/origami/reservation_controller.rb b/app/controllers/origami/reservation_controller.rb
index 6b1e3aa5..91ce359f 100644
--- a/app/controllers/origami/reservation_controller.rb
+++ b/app/controllers/origami/reservation_controller.rb
@@ -1,6 +1,45 @@
 class Origami::ReservationController < BaseOrigamiController
 
 	def index
-		
+		@reservations = Reservation.all
 	end
+
+	def show
+	end
+
+	def new
+	end
+
+	def edit
+	end
+
+	def create 
+
+	end
+
+	def update
+
+	end
+
+	# DELETE /crm/customers/1
+  # DELETE /crm/customers/1.json
+  def destroy
+    @reservation.destroy
+    respond_to do |format|
+      format.html { redirect_to origami_reservation_url, notice: 'Reservation was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_origami_reservation
+      @reservation = Reservation.find(params[:reservation_id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def customer_params
+
+      params.require(:reservation).permit(:reservation_id)
+    end
 end
diff --git a/app/models/reservation.rb b/app/models/reservation.rb
new file mode 100644
index 00000000..4e5ff37a
--- /dev/null
+++ b/app/models/reservation.rb
@@ -0,0 +1,15 @@
+class Reservation < ApplicationRecord
+	self.primary_key = "reservation_id"
+
+	#primary key - need to be unique generated for multiple shops
+  	before_create :generate_custom_id
+
+  	has_many :reservation_items
+
+  	scope :active, -> { where("created_at BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") }
+
+  	private
+		def generate_custom_id
+			self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "RS")
+		end
+end
diff --git a/app/models/reservation_item.rb b/app/models/reservation_item.rb
new file mode 100644
index 00000000..19e28b82
--- /dev/null
+++ b/app/models/reservation_item.rb
@@ -0,0 +1,13 @@
+class ReservationItem < ApplicationRecord
+	self.primary_key = "reservation_items_id"
+
+	#primary key - need to be unique
+  	before_create :generate_custom_id
+
+	belongs_to :reservation, autosave: true
+
+	private
+		def generate_custom_id
+			self.reservation_items_id = SeedGenerator.generate_id(self.class.name, "RSI")
+		end
+end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 42ba0d65..eca1a7ef 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -958,7 +958,9 @@
 
               // For Server Print - from jade
               if ($("#server_mode").val() == "cloud") {
-                code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                if(typeof code2lab != 'undefined'){
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                }
               }
             location.reload();
             }
@@ -1011,9 +1013,11 @@
                   if((receipt_no!=undefined) && (receipt_no!=""))
                     createReceiptNoInFirstBillData(receipt_no,type);
                   // For Server Print - from jade
-                   if ($("#server_mode").val() == "cloud") {
-                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
-                   }
+                  if ($("#server_mode").val() == "cloud") {
+                    if(typeof code2lab != 'undefined'){
+                      code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                    }
+                  }
                   location.reload();
               }
           });  
@@ -1214,7 +1218,9 @@
                 success: function (result) {
                    // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  if(typeof code2lab != 'undefined'){
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  }
                 }
                 window.location.href = '/origami/';
                 }
@@ -1321,7 +1327,9 @@
                   console.log(result)
                    // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  if(typeof code2lab != 'undefined'){
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  }
                 }
                 window.location.href = '/origami/';
                 }
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index a6e878c5..4d3f430c 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1146,7 +1146,9 @@ var trans_flag = <%= @trans_flag %>;
         success:function(result){
           // For Server Print - from jade
             if ($("#server_mode").val() == "cloud") {
-              code2lab.printFile(result.filepath.substr(6), result.printer_url);
+              if(typeof code2lab != 'undefined'){
+                code2lab.printFile(result.filepath.substr(6), result.printer_url);
+              }
             }
 
             if (pdf_view ==1) {
@@ -1439,7 +1441,9 @@ var trans_flag = <%= @trans_flag %>;
              }, function () {
                 // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  if(typeof code2lab != 'undefined'){
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  }
                 }
                 var flag = localStorage.getItem("trans_flag");
                 if((flag!=null) && (flag != "true")){
@@ -1482,7 +1486,9 @@ var trans_flag = <%= @trans_flag %>;
             customer_display_view(null,"reload");
                 // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  if(typeof code2lab != 'undefined'){
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  }
                 }
                 var flag = localStorage.getItem("trans_flag");
                 if((flag!=null) && (flag != "true")){
@@ -1522,7 +1528,9 @@ var trans_flag = <%= @trans_flag %>;
             // console.log(result)
              // For Server Print - from jade
              if ($("#server_mode").val() == "cloud") {
-              code2lab.printFile(result.filepath.substr(6), result.printer_url);
+              if(typeof code2lab != 'undefined'){
+                code2lab.printFile(result.filepath.substr(6), result.printer_url);
+              }
             }
             var flag = localStorage.getItem("trans_flag");
             if((flag!=null) && (flag != "true")){
diff --git a/app/views/origami/pending_order/completed_sale.html.erb b/app/views/origami/pending_order/completed_sale.html.erb
index bc4719f9..f2d66b37 100644
--- a/app/views/origami/pending_order/completed_sale.html.erb
+++ b/app/views/origami/pending_order/completed_sale.html.erb
@@ -324,7 +324,9 @@ $(document).ready(function(){
       url: ajax_url,
       success: function (result) {
         if ($("#server_mode").val() == "cloud") {
-          code2lab.printFile(result.filepath.substr(6), result.printer_url);
+          if(typeof code2lab != 'undefined'){
+            code2lab.printFile(result.filepath.substr(6), result.printer_url);
+          }
         }
         location.reload();
       }
@@ -433,7 +435,9 @@ function check_emp_access_code(access_code,type) {
                   url: ajax_url,
                   success: function (result) {
                     if ($("#server_mode").val() == "cloud") {
-                      code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                      if(typeof code2lab != 'undefined'){
+                        code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                      }
                     }
                     location.reload();
                   }
diff --git a/app/views/origami/reservation/index.html.erb b/app/views/origami/reservation/index.html.erb
index 720f9d3e..1374983b 100644
--- a/app/views/origami/reservation/index.html.erb
+++ b/app/views/origami/reservation/index.html.erb
@@ -5,7 +5,7 @@
     <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
       <div class="card" id="make-reservation-slimscroll" data-height="-50">
         <div class="card-header">
-          <h5 class="card-title text-center"><%= t :make_reservation %></h5>
+          <h5 class="card-title text-center bg-faded"><%= t :make_reservation %></h5>
         </div>
         <div class="card-body">
           <div class="wizard">
@@ -14,7 +14,7 @@
                 <ul class="nav nav-tabs" role="tablist">
                     <li role="presentation" class="nav-item">
                       <div class="connecting-line border-right"></div>
-                      <a href="#step1" class="nav-link active" data-toggle="tab" aria-controls="reservation" role="tab" title="Reservation">
+                      <a href="#reservation" class="nav-link active" data-toggle="tab" aria-controls="reservation" role="tab" title="Reservation">
                         <span class="round-tab">
                           1
                         </span>
@@ -22,7 +22,7 @@
                     </li>
                     <li role="presentation" class="nav-item disabled">
                       <div class="connecting-line"></div>
-                      <a href="#complete" class="nav-link disable" data-toggle="tab" aria-controls="personal_detail" role="tab" title="Personal Detail">
+                      <a href="#personal_detail" class="nav-link disable" data-toggle="tab" aria-controls="personal_detail" role="tab" title="Personal Detail">
                         <span class="round-tab">
                           2
                         </span>
@@ -35,70 +35,114 @@
                 <div class="form-row">
                   <div class="col-sm-12 col-md-12 col-lg-12">
                     <label class="font-12 radio-inline">
-                      <input type="radio" name="type" checked class="radio-col-indigo" value="0"><%= t("views.right_panel.detail.dine_in") %>
+                      <input type="radio" name="reservation_type" checked class="radio-col-indigo reservation_type" value="0"><%= t("views.right_panel.detail.dine_in") %>
                     </label>&nbsp;
                     <label class="font-12 radio-inline">
-                      <input type="radio" name="type" class="radio-col-indigo" value="1"><%= t :room %>
+                      <input type="radio" name="reservation_type" class="radio-col-indigo reservation_type" value="1"><%= t :room %>
                     </label>
                   </div>
                 </div>
-                <div class="form-row clearfix">
-                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
-                    <input class="form-control check_in_date" name="from" id="from" type="text" placeholder="Check In Date">
+
+                <div class="dining_type">
+                  <div class="form-row clearfix">
+                    <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                      <input class="form-control check_in_date datepicker" name="check_in_date" id="check_in_date" type="text" placeholder="Check-in Date">
+                    </div>
+                    <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                      <input class="form-control check_out_date datepicker" name="check_out_date" id="check_out_date" type="text" placeholder="Check Out Date">
+                    </div>
                   </div>
-                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
-                    <input class="form-control check_out_date" name="from" id="from" type="text" placeholder="Check Out Date">
+                  <div class="form-row clearfix">
+                    <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                      <input class="form-control check_in_time timepicker" name="check_in_time" id="check_in_time" type="text" placeholder="Check-in Time">
+                    </div>
+                    <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                      <input class="form-control check_out_time timepicker" name="check_out_time" id="check_out_time" type="text" placeholder="Check Out Time">
+                    </div>
                   </div>
                 </div>
-                <div class="form-row clearfix">
-                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
-                    <input class="form-control check_in_time" name="from" id="from" type="text" placeholder="Check In Time">
+
+                <div class="room_type">
+                  <div class="form-row clearfix">
+                    <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                      <input class="form-control check_in_date datepicker" name="check_in_date" id="check_in_date" type="text" placeholder="Check-in Date">
+                    </div>
+                    <div class="form-group col-sm-6 col-md-6 col-lg-6">
+                      <input class="form-control check_out_date datepicker" name="check_out_date" id="check_out_date" type="text" placeholder="Check Out Date">
+                    </div>
                   </div>
-                  <div class="form-group col-sm-6 col-md-6 col-lg-6">
-                    <input class="form-control check_out_time" name="from" id="from" type="text" placeholder="Check Out Time">
-                  </div>
-                </div>
-                <div class="form-row clearfix">
-                  <div class="form-group col-sm-12 col-md-12 col-lg-12">
-                    <label for="room_count" class="control-label">ROOMS</label>
-                    <input type="number" class="form-control" name="room_count">
+                  <div class="form-row clearfix">
+                    <div class="form-group col-sm-12 col-md-12 col-lg-12">
+                      <label for="room_count" class="control-label">ROOMS</label>
+                      <input type="number" class="form-control number_limit" name="room_count" id="room_count" data-type="room" value="1">
+                    </div>
                   </div>
                 </div>
+                
                 <div class="form-row clearfix">
                   <div class="form-group col-sm-6 col-md-6 col-lg-6">
                     <label for="adult_count" class="control-label">ADULT</label>
-                    <input type="number" class="form-control" name="adult_count">
+                    <input type="number" class="form-control number_limit" name="adult_count" id="adult_count" data-type="adult" value="1">
                   </div>
                   <div class="form-group col-sm-6 col-md-6 col-lg-6">
                     <label for="child_count" class="control-label">CHILD</label>
-                    <input type="number" class="form-control" name="child_count">
+                    <input type="number" class="form-control number_limit" name="child_count" id="child_count" data-type="child">
                   </div>
                 </div>
                 <div class="row text-center">
                   <div class="form-group col-sm-12 col-md-12 col-lg-12">
-                    <button class="btn bg-blue btn-lg waves-effect next-step">CHECK AVAILABLE</button>
+                    <button class="btn bg-blue btn-lg waves-effect">CHECK AVAILABLE</button>
+                    <button class="btn bg-blue btn-lg waves-effect next-step">NEXT</button>
                   </div>
                 </div>
-              </div><!-- .end.tab-content .reservation -->
+              </div><!-- .end.tab-panel .reservation -->
             
               <div class="tab-pane" role="tabpanel" id="personal_detail">
-
+                <div class="form-row">
+                  <div class="form-group col-sm-12 col-md-12 col-lg-12">
+                    <input class="form-control" name="name" id="name" type="text" placeholder="NAME">
+                  </div>
+                </div>
+                <div class="form-row">
+                  <div class="form-group col-sm-12 col-md-12 col-lg-12">
+                    <input class="form-control" name="contact_no" id="contact_no" type="number" placeholder="PHONE NUMBER">
+                  </div>
+                </div>
+                <div class="form-row">
+                  <div class="form-group col-sm-12 col-md-12 col-lg-12">
+                    <input class="form-control" name="address" id="address" type="text" placeholder="ADDRESS">
+                  </div>
+                </div>
+                <div class="form-row">
+                  <div class="form-group col-sm-12 col-md-12 col-lg-12">
+                    <label for="reservation_note" class="control-label">RESERVATION NOTE</label>
+                    <textarea rows="3" id="reservation_note" name="reservation_note" class="form-control"></textarea>
+                  </div>
+                </div>
+                <div class="row text-center">
+                  <div class="form-group col-sm-12 col-md-12 col-lg-12">
+                    <button class="btn bg-blue btn-lg prev-step">PREV</button>
+                    <button class="btn bg-blue btn-lg">SUBMIT</button>
+                  </div>
+                </div>
               </div>
+
             </div><!-- .end.tab-content .personal_detail -->
           </div> <!-- .end.wizard -->
         </div>
       </div>
     </div>
-    <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5">
-      <div class="card font-13">
-        <div class="row">
-          
-        </div>
-      </div>
-    </div>
-    <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
-      <div class="card font-13">
 
+    <div class="col-xs-9 col-sm-9 col-md-9 col-lg-9">
+      <div class="card font-13">
+        <div class="row clearfix">
+          <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5" id="process-reservation-slimscroll" data-height="-80">
+            
+          </div>
+          <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4" id="reservation-info-slimscroll" data-height="-80">
+
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 84ea9086..b7df32a0 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -1052,7 +1052,9 @@ $("#first_bill").on('click', function(){
             createReceiptNoInFirstBillData(receipt_no,"");
             // For Server Print - from jade
             if ($("#server_mode").val() == "cloud") {
-              code2lab.printFile(result.filepath.substr(6), result.printer_url);
+              if(typeof code2lab != 'undefined'){
+                code2lab.printFile(result.filepath.substr(6), result.printer_url);
+              }
             }
             location.reload();
           }
@@ -1090,7 +1092,9 @@ $(".choose_payment").on('click', function () {
 
       // For Server Print - from jade
       if ($("#server_mode").val() == "cloud") {
-        code2lab.printFile(result.filepath.substr(6), result.printer_url);
+        if(typeof code2lab != 'undefined'){
+          code2lab.printFile(result.filepath.substr(6), result.printer_url);
+        }
       }
 
       location.reload();
@@ -1317,7 +1321,9 @@ $('#add_invoice').on('click',function(){
                 success: function (result) {
                    // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  if(typeof code2lab != 'undefined'){
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  }
                 }
                 window.location.href = '/origami/';
                 }
@@ -1406,7 +1412,9 @@ $('#add_invoice').on('click',function(){
                   console.log(result)
                    // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  if(typeof code2lab != 'undefined'){
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  }
                 }
                 window.location.href = '/origami/';
                 }
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index 2d16d3bb..bfe1f0a9 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -435,7 +435,9 @@ $('#reprint').on('click', function () {
       url: ajax_url,
       success: function (result) {
         if ($("#server_mode").val() == "cloud") {
-          code2lab.printFile(result.filepath.substr(6), result.printer_url);
+          if(typeof code2lab != 'undefined'){
+            code2lab.printFile(result.filepath.substr(6), result.printer_url);
+          }
         }
         location.reload();
       }
@@ -536,7 +538,9 @@ $(document).on('click', '.access_modal', function(event){
                     success: function (result) {
                       // For Server Print - from jade
                       if ($("#server_mode").val() == "cloud") {
-                        code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                        if(typeof code2lab != 'undefined'){
+                          code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                        }
                       }
                       location.reload();
                     }
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index a95c5398..84efbc66 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -370,7 +370,9 @@ $(document).ready(function(){
 
               // For Server Print - from jade
               if ($("#server_mode").val() == "cloud") {
-                code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                if(typeof code2lab != 'undefined'){
+                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                }
               }
             location.reload();
             }
@@ -403,7 +405,9 @@ $(document).ready(function(){
                 createReceiptNoInFirstBillData(receipt_no,type);
                 // For Server Print - from jade
                 if ($("#server_mode").val() == "cloud") {
-                  code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  if(typeof code2lab != 'undefined'){
+                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                  }
                 }
                 location.reload();
           }
@@ -475,7 +479,9 @@ $('#void').on('click',function () {
               success: function (result) {
                 // For Server Print - from jade
                    if ($("#server_mode").val() == "cloud") {
-                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                    if(typeof code2lab != 'undefined'){
+                      code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                    }
                   }
                   window.location.href = '/origami';
               }
@@ -512,7 +518,9 @@ $('#foc').click(function() {
              }, function () {
                    // For Server Print - from jade
                   if ($("#server_mode").val() == "cloud") {
-                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                    if(typeof code2lab != 'undefined'){
+                      code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                    }
                   }
                   window.location.href = '/origami';
                });
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 2bb45f4e..04732fb3 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -406,7 +406,9 @@
                 success: function (result) {
                    // For Server Print - from jade
                   if ($("#server_mode").val() == "cloud") {
-                    code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                    if(typeof code2lab != 'undefined'){
+                      code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                    }
                   }
                   window.location.href = '/transactions/sales/';
                 }
diff --git a/config/routes.rb b/config/routes.rb
index 936266de..f9a61b63 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -326,7 +326,7 @@ scope "(:locale)", locale: /en|mm/ do
     # get 'sale/:sale_id/:type/credit_payment/others_payment/GiftVoucher' => "gift_voucher#index"
     
     #------------- Start Reservation -------------------#
-    get '/reservation' => "reservation#index"
+    resources :reservation
     #------------- End Reservation -------------------#
   end
 
diff --git a/db/migrate/20180928052742_create_reservations.rb b/db/migrate/20180928052742_create_reservations.rb
new file mode 100644
index 00000000..637c4ba0
--- /dev/null
+++ b/db/migrate/20180928052742_create_reservations.rb
@@ -0,0 +1,24 @@
+class CreateReservations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :reservations, :id => false do  |t|
+		t.string     :reservation_id, :limit => 16, :primary_key => true
+		t.string     :source, :null => false, :default => "Cashier"
+		t.string 	 :reservation_type, :null => false
+		t.string 	 :customer_id, :null => false
+		t.datetime 	 :checkin_datetime, :null => false
+		t.datetime   :checkout_datetime
+		t.json       :reservation_info
+		t.string     :remark
+		t.string 	 :status, :null => false, :default => "new"
+		t.datetime   :action_at, :null => false
+		t.string     :action_by, :null => false
+		t.datetime   :modify_at
+		t.string     :modify_by
+		t.timestamps
+    end
+  end
+
+  def down
+  	drop_table :reservations
+  end
+end
diff --git a/db/migrate/20180928074338_create_reservation_items.rb b/db/migrate/20180928074338_create_reservation_items.rb
new file mode 100644
index 00000000..54ee6097
--- /dev/null
+++ b/db/migrate/20180928074338_create_reservation_items.rb
@@ -0,0 +1,26 @@
+class CreateReservationItems < ActiveRecord::Migration[5.1]
+  def change
+    create_table :reservation_items, :id => false do |t|
+    	t.string   :reservation_items_id, :limit => 16, :primary_key => true
+    	t.string   :reservation_id, foreign_key: true, :null => false, :limit => 16
+    	t.string   :item_status, :null => false, :default => "new"
+		t.string   :item_code, :null => false
+		t.string   :item_instance_code
+		t.string   :item_name, :null => false
+		t.string   :alt_name, :null => false
+		t.json     :set_menu_items
+		t.integer  :account_id, :limit => 8, :null => false, :default => 1
+		t.decimal  :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.decimal  :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.decimal  :price, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.string   :remark
+		t.string   :options
+		t.boolean  :taxable, :null => false, :default => true
+		t.timestamps
+    end
+  end
+
+  def down
+  	drop_table :reservation_items
+  end
+end

From 9731e676b4ad623f66dabc78323eb6875294bcb0 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 28 Sep 2018 16:38:27 +0630
Subject: [PATCH 47/66] back JS

---
 app/views/inventory/inventory_definitions/_form.html.erb | 2 +-
 app/views/inventory/stock_checks/index.html.erb          | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index d99a4974..e4a48875 100644
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -582,7 +582,7 @@
 
       $('#back').on('click', function () {
         window.location.href = '/inventory';
-    });
+      });
 
     });
   </script>
\ No newline at end of file
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index 5577a8df..b2c353b2 100644
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -36,7 +36,7 @@
       </div>
       
       <div class="col-md-3 col-lg-3 col-sm-3">
-        <button type="button" class="btn btn-lg btn-block btn-default waves-effect m-t-5" id='back'>
+        <button type="button" class="btn btn-md btn-block btn-default waves-effect m-t-5" id='back'>
           <i class="material-icons">reply</i>Back
         </button>
         <br>
@@ -127,6 +127,10 @@
     });  
     //End menu category Click
 
+    $('#back').on('click', function () {
+      window.location.href = '/inventory';
+    });
+
     //show menu item list when click menu category
     function show_menu_item_list(url_item,menu_id){ 
         var menu_list = $('.menu_items_list');

From e11db90289402191961e0faba28e1989269a3a35 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 1 Oct 2018 13:55:24 +0630
Subject: [PATCH 48/66] update sotck ch

---
 .../inventory/stock_checks/index.html.erb     | 216 +++++++++++++++---
 1 file changed, 180 insertions(+), 36 deletions(-)

diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index b2c353b2..b064cfc7 100644
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -8,16 +8,12 @@
       <div class="col-lg-2 col-md-2 col-sm-2" id=""> 
         <div id="menu1-slimscroll" data-height="0">
           <ul class="nav nav-tabs flex-column category_list m-t-10" role="tablist" id="ul-navbar">
-            
             <% @category.each do |cat| %>
-              
-                    <li class="nav-item ">
-                      <p class="hidden cat-id"><%= cat.id  %></p> 
-                      <a class="nav-link menu_category sub_click first_<%=cat.id%>" data-toggle="tab" href="" role="tab" data-id="<%=cat.id%>" ><%= cat.name%>
-                      </a>
-                     
-                    </li>
-                 
+              <li class="nav-item ">
+                <p class="hidden cat-id"><%= cat.id  %></p> 
+                  <a class="nav-link menu_category sub_click first_46" data-toggle="tab" href="" role="tab" data-id="<%=cat.id%>" ><%= cat.name%>
+                  </a>
+              </li>  
             <%end %>
           </ul>
         </div>
@@ -36,7 +32,7 @@
       </div>
       
       <div class="col-md-3 col-lg-3 col-sm-3">
-        <button type="button" class="btn btn-md btn-block btn-default waves-effect m-t-5" id='back'>
+        <button type="button" class="btn btn-lg btn-block btn-default waves-effect m-t-5" id='back'>
           <i class="material-icons">reply</i>Back
         </button>
         <br>
@@ -102,6 +98,70 @@
         </div>
       </div>
     </div>
+
+    <!-- Modal -->
+     <div class=" modal" id="sx_itemModal" tabindex="-1" role="dialog" aria-labelledby="sx_itemModalLabel" aria-hidden="true" style="">
+      <div class="modal-dialog custom-modal-dialog" role="document">
+        <div class="modal-content">
+
+          <div class="modal-body">
+            <table width="100%" class="table table-striped">
+             <thead>
+               <tr>
+                 <th style="">Item Name</th>
+                 <th style="">Quantity</th>
+                 <th></th>
+               </tr>
+             </thead>
+             <tbody>
+               <tr>
+                 <td class="item_name" id="modal-item-name"></td>
+                 <td>
+                   <input type="number" name="qty" class="form-control col-md-12 input-number" data-value="0" id="modal-qty" value="" min="1" max="10000">
+                 </td>
+                 <td>
+                   <button type="button" id="remove" class="btn btn-danger" data-dismiss="modal">Remove</button>
+                 </td>
+               </tr>
+             </tbody>
+           </table>
+           <div class="row bottom p-l-15 p-r-15 m-t-10">
+             <div class="col-md-3 cashier_number border-top border-left" data-value="1" data-type="num">1</div>
+             <div class="col-md-3 cashier_number border-top border-left" data-value="2" data-type="num">2</div>
+             <div class="col-md-3 cashier_number border-top border-left" data-value="3" data-type="num">3</div>
+             <div class="col-md-3 cashier_number border-top border-left" data-value="4" data-type="num">4</div>
+           </div>
+           <div class="row bottom p-l-15 p-r-15">
+             <div class="col-md-3 cashier_number border-top border-left" data-value="5" data-type="num">5</div>
+             <div class="col-md-3 cashier_number border-top border-left" data-value="6" data-type="num">6</div>
+             <div class="col-md-3 cashier_number border-top border-left" data-value="7" data-type="num">7</div>
+             <div class="col-md-3 cashier_number border-top border-left" data-value="8" data-type="num">8</div>
+           </div>
+           <div class="row bottom p-l-15 p-r-15">
+             <div class="col-md-3 cashier_number border-top border-left" data-value="9" data-type="num">9</div>
+             <div class="col-md-3 cashier_number border-top border-left" data-value="0" data-type="num">0</div>
+             <div class="col-md-3 cashier_number border-top border-left" data-value="00" data-type="num">00</div>
+             <div class="col-md-3 cashier_number border-top border-left  bg-orange" data-type="clr">Clr</div>
+           </div>
+         </div>
+         <div class="modal-footer">
+          <div class="row">
+            <div class="col-md-5">
+              <button type="button" class="btn btn-default" data-dismiss="modal" id="close">Close</button>
+            </div>
+            <div class="col-md-5">
+              <button type="button" class="btn btn-primary " data-dismiss="modal" id="save">Update</button>
+            </div>
+          </div>
+
+
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Menu Item modal -->
+
 <style type="text/css">
   .fadeInRight{
   -webkit-animation-duration: 350ms !important;
@@ -112,7 +172,7 @@
   jQuery(function(){
     id = "<%=@category[0].id%>";
     console.log(id)
-    jQuery('.first_'+id).click();
+    jQuery('.first_46').click();
   });
 
   $(document).ready(function () {
@@ -127,10 +187,6 @@
     });  
     //End menu category Click
 
-    $('#back').on('click', function () {
-      window.location.href = '/inventory';
-    });
-
     //show menu item list when click menu category
     function show_menu_item_list(url_item,menu_id){ 
         var menu_list = $('.menu_items_list');
@@ -236,15 +292,46 @@
       }
     });
 
-    $(document).on('click', '#remove_row', function(event){ 
-      console.log( $(this).parent().parent())
-      $($(this).parent().parent()).attr('data-active',true);
-       $('.summary-items tr').filter(function(){
-          if ($(this).attr('data-active') == 'true'){
-            $(this).remove();
-          }
-        });
+    //click item row for update qty
+    $('.summary-items').on('click', '.item_box', function(){
+      $(this).attr('data-active',true);
+      name =  $(this).children('#item_name').text();
+      qty  =  $(this).children('#item_qty').text();
+      $('#modal-item-name').text(name);
+      $('#modal-qty').val(qty);
+    });
+
+    //click remove buttom in modal box
+    $('#sx_itemModal').on('click','#remove', function(){
+      $('.summary-items tr').filter(function(){
+        if ($(this).attr('data-active') == 'true'){
+          $(this).remove();
+        }
       });
+    });
+
+    //click close
+    $('#sx_itemModal').on('click','#close', function(){ 
+      $(".item_box").removeAttr("data-active");
+    });
+  //click save buttom after change qty
+    $('#sx_itemModal').on('click','#save', function(){  
+      if ($('#modal-qty').val()>0) {
+        summary_items_filter(); 
+      }else{
+        swal("Opps", "Please enter number for qty ","warning");
+      }
+    });
+
+    // $(document).on('click', '#remove_row', function(event){ 
+    //   console.log( $(this).parent().parent())
+    //   $($(this).parent().parent()).attr('data-active',true);
+    //    $('.summary-items tr').filter(function(){
+    //       if ($(this).attr('data-active') == 'true'){
+    //         $(this).remove();
+    //       }
+    //     });
+    //   });
 
     $(".keypress_qty").on('keyup change', function (){
         value = $(this).val();
@@ -255,6 +342,7 @@
         }
     });
 
+
     $('#finish').on('click', function () {
         var reason = $('#stock_check_reason').val();
         var arr = [];
@@ -298,22 +386,78 @@
         }        
     });
 
+    $(document).on('click', '.cashier_number', function(event){
+      if(event.handled !== true) {
+        var original_value;
+        original_value = $('#modal-qty').attr('data-value');
+        original_qty   = $('#modal-qty').val();
+        var input_type = $(this).attr("data-type");
 
-  /* Get Item rows */
-  function get_order_item_rows(){
-    var items = [];  
-    var item_row    = $('.summary-items tbody tr');
-    $(item_row).each(function(i){
-      var item_list = {};
-      
-      item_list.remark = $(item_row[i]).attr('data-reason');
-      item_list.sku    = $(item_row[i]).attr('data-instance-code');
-      item_list.qty    = $(item_row[i]).children('#item_qty').text();
+        switch (input_type) {
+          case 'num':
+            var input_value = $(this).attr("data-value");
+            if (original_value == "0"){
+              $('#modal-qty').val(input_value);
+              $('#modal-qty').attr('data-value',input_value);
+                // update_total_amount();
+            }else{
+              $('#modal-qty').val(original_qty + input_value);
+              $('#modal-qty').attr('data-value',original_qty + input_value);
+              // update_total_amount();
+            }
+          break;
+          case 'add':
+              
+          case 'del' :
+              
+          case 'clr':
+            $('#modal-qty').val(1);
+            $('#modal-qty').attr('data-value',0);
+            // update_total_amount();
+          break;
+          }
+          event.handled = true;
+      } else {
+        return false;
+      }
+    });
 
-      items.push(item_list);
+    $("#back").on("click", function(){
+      window.location.href = "/inventory";
     }); 
-    return items;
-  }
+
+
+
+    function summary_items_filter(){
+      $('.summary-items tr').filter(function(){
+        if ($(this).attr('data-active') == 'true'){
+          qty   = $('#modal-qty').val();
+          price = parseFloat($(this).attr('data-price'));
+          total_price = parseFloat(price*qty).toFixed(2);
+
+          $(this).find('#item_qty').text(qty);
+          $(this).find('.item-cell-price').text(total_price);  
+          
+          $(this).removeAttr('data-active');
+        }
+      });
+    }
+
+    /* Get Item rows */
+    function get_order_item_rows(){
+      var items = [];  
+      var item_row    = $('.summary-items tbody tr');
+      $(item_row).each(function(i){
+        var item_list = {};
+        
+        item_list.remark = $(item_row[i]).attr('data-reason');
+        item_list.sku    = $(item_row[i]).attr('data-instance-code');
+        item_list.qty    = $(item_row[i]).children('#item_qty').text();
+
+        items.push(item_list);
+      }); 
+      return items;
+    }
 
   });
 </script>
\ No newline at end of file

From b8c87fda6c92bc55c271c93cb0e27a203c62da26 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 2 Oct 2018 11:24:32 +0630
Subject: [PATCH 49/66] check status

---
 .../api/order_reserve/order_reservation_controller.rb         | 2 +-
 app/views/origami/reservation/index.html.erb                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index fc05fe20..aa157a2c 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -131,7 +131,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 					result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't get FOC!" }
 				end
 			elsif status == 'VOID'
-				if order_reservation.status == "ready_to_delivery"
+				if order_reservation.status == "ready_to_delivery" || order_reservation.status == "delivered"
 					OrderReservation.update_order_reservation(order_reservation_id, nil, nil,nil,reason)
 					result = {:status=> true, :message => "VOID successfully" }
 				else
diff --git a/app/views/origami/reservation/index.html.erb b/app/views/origami/reservation/index.html.erb
index 1374983b..1575b1e5 100644
--- a/app/views/origami/reservation/index.html.erb
+++ b/app/views/origami/reservation/index.html.erb
@@ -136,10 +136,10 @@
     <div class="col-xs-9 col-sm-9 col-md-9 col-lg-9">
       <div class="card font-13">
         <div class="row clearfix">
-          <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5" id="process-reservation-slimscroll" data-height="-80">
+          <div class="col-xs-7 col-sm-7 col-md-7 col-lg-7" id="process-reservation-slimscroll" data-height="-80">
             
           </div>
-          <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4" id="reservation-info-slimscroll" data-height="-80">
+          <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5" id="reservation-info-slimscroll" data-height="-80">
 
           </div>
         </div>

From 4a2f7b0e4b054d5f5f8d2b0c299cc7990fa91a96 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 2 Oct 2018 11:57:07 +0630
Subject: [PATCH 50/66] crm customer chagnes

---
 app/controllers/crm/customers_controller.rb   |  4 +-
 .../origami/order_reservation_controller.rb   |  2 +-
 app/models/booking.rb                         |  2 +-
 app/models/customer.rb                        |  2 +-
 app/models/sale.rb                            |  2 +-
 app/views/crm/customers/_new_form.html.erb    | 50 ++++++++--------
 app/views/crm/customers/index.html.erb        |  8 +--
 app/views/crm/customers/show.html.erb         |  4 +-
 app/views/layouts/_header.html.erb            |  2 +-
 app/views/origami/customers/index.html.erb    | 60 ++++++++++---------
 config/locales/en.yml                         |  1 +
 config/locales/mm.yml                         |  1 +
 12 files changed, 72 insertions(+), 66 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 9648a246..cc00984d 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -70,8 +70,8 @@ class Crm::CustomersController < BaseCrmController
   # GET /crm/customers/1
   # GET /crm/customers/1.json
   def show
-    @orders = Order.where("customer_id=?", params[:id])
-    @sales  = Sale.where("customer_id=?", params[:id])
+    @orders = Order.where("customer_id=?", params[:id]).limit(20)
+    @sales  = Sale.where("customer_id=?", params[:id]).limit(20)
 
     if @orders
       @order_items = []
diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb
index f4f993d5..81f38324 100644
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -97,7 +97,7 @@ class Origami::OrderReservationController < BaseOrigamiController
   end
 
   def get_order_info
-    order_reservation = OrderReservation.where("status = 'new' OR status='accepted' OR status='send_to_kitchen' OR status = 'ready_to_delivery'").count()
+    order_reservation = OrderReservation.where("status = 'new'").count()
     render :json => order_reservation
   end
 
diff --git a/app/models/booking.rb b/app/models/booking.rb
index 8ba89bd2..46c098b7 100755
--- a/app/models/booking.rb
+++ b/app/models/booking.rb
@@ -57,7 +57,7 @@ class Booking < ApplicationRecord
         joins(" LEFT JOIN dining_facilities df ON df.id=bookings.dining_facility_id")
         .where("booking_id LIKE ? OR checkin_by LIKE ? OR booking_status LIKE? OR checkout_by LIKE? OR sale_id ='#{filter}' OR df.name LIKE ?","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%")
     end
-
+    .order("sale_id DESC")
   end
 
   private
diff --git a/app/models/customer.rb b/app/models/customer.rb
index a88f79c0..55a41722 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -336,7 +336,7 @@ class Customer < ApplicationRecord
   def self.search(search)
     if search
       # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"])
-      where("name LIKE ? OR contact_no LIKE ? OR card_no LIKE ? OR paypar_account_no ='#{search}'", "%#{search}%", "%#{search}%", "%#{search}%",)
+      where("name LIKE ? OR customer_type OR contact_no LIKE ? OR card_no LIKE ? OR DATE_FORMAT(date_of_birth,'%Y-%m-%d') LIKE ? OR nrc_no LIKE ? OR gender LIKE ? OR paypar_account_no ='#{search}'", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%", "%#{search}%")
     else
       find(:all)
     end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 6c55c7b7..4890aadf 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -734,7 +734,7 @@ class Sale < ApplicationRecord
         where("receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}' and shift_sale_id = ?","%#{filter}%","%#{filter}%",shift.id)
       end
     end
-
+    .order("sale_id DESC")
   end
 
   def self.search_credit_sales(customer,filter,from,to,order_source="")
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index c2e0aff4..ef5c76ba 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -90,6 +90,31 @@
                       <% end %>
                     </div>
                   </div>
+
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12" align="right">
+                      <button type="button" class="btn btn-md bg-blue btn-info-full next-step">Next</button>
+                    </div>      
+                  </div>
+              </div>
+              <div class="tab-pane" role="tabpanel" id="complete">
+                  <!-- <h4>Step 2</h4> -->
+                  <div class="form-group">
+                    <div class="col-sm-12 col-md-12 col-lg-12">
+                      <label><%= t("views.right_panel.detail.customer_photo") %></label>
+                      <div class="panel padding-10">
+                          <div class="menu-item-img">
+                            <% if f.object.image_path? %>
+                              <p><%= f.object.name %></p>
+                                <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
+                            <% else %>                
+                              <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+                            <% end %>          
+                          </div>
+                          <%= f.file_field :image_path, :class => "img-thumbnail" %>
+                      </div> 
+                    </div>
+                  </div>
                   <div class="form-group">
                     <div class="col-sm-12 col-md-12 col-lg-12">
                       <label for="customer[gender]" class="control-label"><%= t("views.right_panel.detail.gender") %> :</label><br>
@@ -127,31 +152,6 @@
                       <%= f.input :address, :class => "form-control address" %>
                     </div>
                   </div>
-
-                  <div class="form-group">
-                    <div class="col-sm-12 col-md-12 col-lg-12" align="right">
-                      <button type="button" class="btn btn-md bg-blue btn-info-full next-step">Next</button>
-                    </div>      
-                  </div>
-              </div>
-              <div class="tab-pane" role="tabpanel" id="complete">
-                  <!-- <h4>Step 2</h4> -->
-                  <div class="form-group">
-                    <div class="col-sm-12 col-md-12 col-lg-12">
-                      <label><%= t("views.right_panel.detail.customer_photo") %></label>
-                      <div class="panel padding-10">
-                          <div class="menu-item-img">
-                            <% if f.object.image_path? %>
-                              <p><%= f.object.name %></p>
-                                <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
-                            <% else %>                
-                              <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
-                            <% end %>          
-                          </div>
-                          <%= f.file_field :image_path, :class => "img-thumbnail" %>
-                      </div> 
-                    </div>
-                  </div>
                   <div class="form-group">
                     <div class="col-sm-12 col-md-12 col-lg-12">
                       <label><%= t("views.right_panel.detail.select_customer_type") %></label>
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 69d5f29f..275ae672 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -1,14 +1,14 @@
 
-    <div class="page-header">
+    <!-- <div class="page-header">
      <ul class="breadcrumb">
       <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-      <li class="breadcrumb-item active"><%= t :crm %></li>
+      <li class="breadcrumb-item active"><%= t :crm %></li> -->
      <!--  <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> -->
-      <span class="float-right">
+      <!-- <span class="float-right">
         <%= link_to 'Back', dashboard_path %>
       </span>
      </ul>
-    </div>
+    </div> -->
 
   <div class="row clearfix">
     <div class="col-lg-12 col-md-12 col-sm-12">
diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb
index 5b642d13..572b3937 100644
--- a/app/views/crm/customers/show.html.erb
+++ b/app/views/crm/customers/show.html.erb
@@ -5,7 +5,7 @@
     <li class="breadcrumb-item active">CRM</li>
      <!-- <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> -->
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to 'Back', crm_customers_path %>
     </span>
   </ul>
 </div>
@@ -34,6 +34,7 @@
     <div class="tab-content" style="min-height:670px; max-height:670px; ">
 
       <div class="tab-pane active" id="customer" role="tabpanel" style="min-height:670px; max-height:670px; ">
+        <h5><%= t :customer_details %></h5>
         <div class="table-responsive">
         <br><br>
           <table class="table table-striped">
@@ -78,6 +79,7 @@
         </div>
 
         <div class="table-responsive">
+          <h6><%= t("views.right_panel.detail.paymal_transactions ") %></h6>
           <table class="table table-striped">
             <thead>
               <tr>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 99033a27..1854a1df 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -69,13 +69,13 @@
                         </a>
                     </p>    
                 </li>
+                <% end %>
                 <li>
                     <p class="waves-effect waves-block p-l-30 m-b-5 team_viewer">
                        <i class="material-icons font-7 logout_icon shopinfo">touch_app</i>
                         <span class="font-15 shopinfo" >Team Viewer</span>
                     </p>    
                 </li>
-                <% end %>
                 <li>
                     <!-- <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>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index bdc8e342..2a28c68d 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -1,14 +1,14 @@
-<div class="container-fluid">
+<!-- <div class="container-fluid">
   <div class="page-header">
    <ul class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item active">CRM</li>
+    <li class="breadcrumb-item active">CRM</li> -->
      <!-- <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> -->
-    <span class="float-right">
+    <!-- <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
   </ul>
-</div>
+</div> -->
 
 
 <div class="row">
@@ -56,6 +56,7 @@
                       <tr>
                         <th></th>
                         <th><%= t("views.right_panel.detail.sr_no") %></th>
+                        <th><%= t :customer %> <%= t("views.right_panel.detail.type") %></th>
                         <th><%= t("views.right_panel.detail.name") %></th>
                         <th><%= t("views.right_panel.detail.card_no") %></th>
                         <th><%= t("views.right_panel.detail.membership_type") %></th>
@@ -80,6 +81,7 @@
                           -
                           <% end %>
                         </td>
+                        <td><%= crm_customer.customer_type rescue '-' %></td>
                         <td><%= crm_customer.name %></td>
                         <td><%= crm_customer.card_no rescue '-' %></td>
                         <td>
@@ -214,6 +216,31 @@
                           <% end %>
                         </div>
                       </div>
+
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12" align="right">
+                          <button type="button" class="btn btn-md bg-blue btn-info-full next-step">Next</button>
+                        </div>      
+                      </div>
+                    </div> <!-- .end-of-step1 -->
+                    <div class="tab-pane" role="tabpanel" id="complete">
+                      <!-- <h4>Step 2</h4> -->
+                      <div class="form-group">
+                        <div class="col-sm-12 col-md-12 col-lg-12">
+                          <label><%= t("views.right_panel.detail.customer_photo") %></label>
+                          <div class="panel padding-10">
+                              <div class="menu-item-img">
+                                <% if f.object.image_path? %>
+                                  <p><%= f.object.name %></p>
+                                    <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
+                                <% else %>                
+                                  <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+                                <% end %>          
+                              </div>
+                              <%= f.file_field :image_path, :class => "img-thumbnail" %>
+                          </div> 
+                        </div>
+                      </div>
                       <div class="form-group">
                         <div class="col-sm-12 col-md-12 col-lg-12">
                           <label for="customer[gender]" class="control-label"><%= t("views.right_panel.detail.gender") %> :</label><br>
@@ -251,31 +278,6 @@
                           <%= f.input :address, :class => "form-control address" %>
                         </div>
                       </div>
-
-                      <div class="form-group">
-                        <div class="col-sm-12 col-md-12 col-lg-12" align="right">
-                          <button type="button" class="btn btn-md bg-blue btn-info-full next-step">Next</button>
-                        </div>      
-                      </div>
-                    </div> <!-- .end-of-step1 -->
-                    <div class="tab-pane" role="tabpanel" id="complete">
-                      <!-- <h4>Step 2</h4> -->
-                      <div class="form-group">
-                        <div class="col-sm-12 col-md-12 col-lg-12">
-                          <label><%= t("views.right_panel.detail.customer_photo") %></label>
-                          <div class="panel padding-10">
-                              <div class="menu-item-img">
-                                <% if f.object.image_path? %>
-                                  <p><%= f.object.name %></p>
-                                    <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
-                                <% else %>                
-                                  <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
-                                <% end %>          
-                              </div>
-                              <%= f.file_field :image_path, :class => "img-thumbnail" %>
-                          </div> 
-                        </div>
-                      </div>
                       <div class="form-group">
                         <div class="col-sm-12 col-md-12 col-lg-12">
                           <label><%= t("views.right_panel.detail.select_customer_type") %></label>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2c30cb50..a1f18e30 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -500,6 +500,7 @@ en:
         transaction_fee: "Transaction Fee"
         checked_by: "Checked By"
         order_source: "Order Source"
+        paymal_transactions: "Paymal Transactions"
         
         code_txt: "code "
         charge_txt: "charge"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 7360c35f..3af2d40a 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -494,6 +494,7 @@ mm:
         transaction_fee: "Transaction Fee"
         checked_by: "Checked By"
         order_source: "Order Source"
+        paymal_transactions: "Paymal Transactions"
         
         code_txt: "ကုတ်ဒ် "
         charge_txt: "ကောက်ခံသည်"

From 6e24b8a5b57b6435098fe9baefdeca40e903a711 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 2 Oct 2018 15:06:32 +0630
Subject: [PATCH 51/66] small changes

---
 .../origami/quick_service_controller.rb       | 17 ++++++++++
 app/views/origami/addorders/detail.html.erb   | 32 ++++++++++++-------
 .../payment_method_settings/_form.html.erb    |  2 +-
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 86433417..61e4d7d5 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -21,6 +21,23 @@ class Origami::QuickServiceController < ApplicationController
     @customer = Customer.all
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
+
+    #checked quick_service only
+    @quick_service_only = true
+    lookup_dine_in = Lookup.collection_of('dinein_cashier')
+    if !lookup_dine_in.empty?
+      lookup_dine_in.each do |dine_in|
+        if dine_in[0].downcase == "dineincashier" 
+          if dine_in[1] == '1' 
+            @quick_service_only = false
+          end
+        end
+      end
+    end
+
+    puts "@quick_service_only"
+    puts @quick_service_only
+    
     render "origami/addorders/detail"
   end
 
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index c0e298e7..a553c018 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -165,12 +165,15 @@
              Back
            </button>
 
-           <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
-           </button>
-           
-           <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
-           <input type="hidden" name="table_id" value="" id="table_id">
-
+            <% if @quick_service_only %>
+              <button type="button" class="btn btn-lg btn-primary waves-effect col-md-9" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
+              </button>
+            <% else %>
+              <button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
+              </button>
+              <a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style="    padding: .5rem 0.15rem !important;">Select</a>
+              <input type="hidden" name="table_id" value="" id="table_id">
+            <% end %>
            <%else%>
            <button type="button" class="btn btn-lg btn-block btn-default waves-effect" id='back'>
             <i class="material-icons">reply</i>Back
@@ -270,14 +273,21 @@
            <%elsif !modify_order && type%>
            <input type="hidden" name="customer_id" id="customer_id" value="CUS-000000000001">
            <% if current_user.role != "waiter"%>
-           <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
-           <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+           
+            <% if @quick_service_only %>
+              <button type="button" class="btn btn-primary action-btn create col-md-12" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
+            <% else %>
+              <button type="button" class="btn btn-primary action-btn create col-md-4" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
+              <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+            <% end %>
            <%end%>
-           <% if current_user.role == "waiter"%>
-           <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+           <% if !@quick_service_only && current_user.role == "waiter"%>
+            <button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
            <%end%>
            <%else%>
-           <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+             <% if !@quick_service_only %>
+              <button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
+             <%end%>
            <%end%>
 
 
diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb
index 96624821..2679d1b2 100755
--- a/app/views/settings/payment_method_settings/_form.html.erb
+++ b/app/views/settings/payment_method_settings/_form.html.erb
@@ -18,7 +18,7 @@
               <option value="Default">Default</option>
             </select> 
           </div>  -->
-           <%= f.input :gateway_communication_type,:class=>'gateway_type', collection: [ "Api", "Default", "Device"] %>
+           <%= f.input :gateway_communication_type,:class=>'gateway_type', collection: [ "Api", "Device", "Manual"] %>
           <%= f.input :gateway_url ,:class=>'gateway_type', :required => true %>
           <%= f.input :auth_token ,:class=>'auth_token', :required => true %>
           <%= f.input :merchant_account_id ,:class=>'merchant_id', :required => true%>

From 1ccdeb387b114a309572262fd0a1fe1b204ff575 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 2 Oct 2018 15:07:43 +0630
Subject: [PATCH 52/66] remove print data

---
 app/controllers/origami/quick_service_controller.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 61e4d7d5..1924f33e 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -34,9 +34,6 @@ class Origami::QuickServiceController < ApplicationController
         end
       end
     end
-
-    puts "@quick_service_only"
-    puts @quick_service_only
     
     render "origami/addorders/detail"
   end

From 12ceb8220c133bdbe5851558e8f967e5b606287c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 2 Oct 2018 16:42:52 +0630
Subject: [PATCH 53/66] customer back

---
 app/views/origami/customers/index.html.erb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 2a28c68d..968f8d12 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -16,7 +16,7 @@
     <div class="card">
       <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">
+          <div class="col-lg-10 col-md-10 col-sm-10 col-xs-10">
             <!--  <% 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">
@@ -45,6 +45,11 @@
             </div>
             <% end %>
           </div>
+          <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+            <button type="button" class="btn btn-md btn-block btn-default waves-effect" id='back'>
+            <i class="material-icons">reply</i>Back
+            </button>
+          </div>
         </div>
         <div class="row">
           <div class="col-lg-8 col-md-8 col-sm-8 col-xs-8">

From 6e555e6b8c1415ef75657f2b6b9b0ed629dc9e8e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 3 Oct 2018 09:41:45 +0630
Subject: [PATCH 54/66] change fun:

---
 .../order_reserve/order_reservation_controller.rb  |  4 ++--
 app/models/order_reservation.rb                    | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index aa157a2c..76300129 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -125,14 +125,14 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 				end
 			elsif status == 'FOC'
 				if order_reservation.status == "new" || order_reservation.status == "accepted" || order_reservation.status == "send_to_kitchen"
-					OrderReservation.update_order_reservation(order_reservation_id, nil, nil,nil,reason)
+					OrderReservation.update_order_reservation(order_reservation_id, nil, 'foc',nil,reason, nil, current_login_employee)
 					result = {:status=> true, :message => "FOC successfully" }
 				else
 					result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't get FOC!" }
 				end
 			elsif status == 'VOID'
 				if order_reservation.status == "ready_to_delivery" || order_reservation.status == "delivered"
-					OrderReservation.update_order_reservation(order_reservation_id, nil, nil,nil,reason)
+					OrderReservation.update_order_reservation(order_reservation_id, nil, 'void',nil,reason, nil, current_login_employee)
 					result = {:status=> true, :message => "VOID successfully" }
 				else
 					result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't VOID!" }
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 3185671f..f269c91f 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -256,7 +256,12 @@ class OrderReservation < ApplicationRecord
     	end
     	if status == "delivered"
     		order_reservation.payment_status = "paid"
+    	elsif status == 'foc'
+    		order_reservation.payment_status = "paid"
+    	elsif status == 'void'
+    		order_reservation.payment_status = "void"
     	end
+
     	if status == "accepted"
     		action_times = {"accepted_time" => DateTime.now.utc, "kitchen_time" => "", "ready_time" => ""}
     		order_reservation.action_times = action_times.to_json
@@ -273,9 +278,10 @@ class OrderReservation < ApplicationRecord
     			order_reservation.action_times = action_data.to_json
     		end
     	end
+
     	order_reservation.save
 
-    	if !order_reservation.sale_id.nil? && status == "rejected"
+    	if !order_reservation.sale_id.nil? && (status == "rejected" || status == "void")
     		void_doemal_payment(order_reservation.sale_id, remark, access_code, current_user)
     	end
     end
@@ -303,7 +309,11 @@ class OrderReservation < ApplicationRecord
 	      sale.save
 
 	      # FOr Sale Audit 
-	      action_by = current_user.name
+	      if !current_user.nil?
+	      	action_by = current_user.name
+	      else
+	      	action_by = "code2LAB"
+	      end
 	      approved_by = Employee.find_by_emp_id(access_code)
 	      # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
 	      sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, approved_by.name,remark,"SALEVOID" )

From 9dba93ea9c1920964c1c171712a4e9f721102043 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 3 Oct 2018 10:22:50 +0630
Subject: [PATCH 55/66] change api update status func:

---
 .../order_reserve/order_reservation_controller.rb   |  2 +-
 app/models/order_reservation.rb                     | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index 76300129..6ebeda11 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -118,7 +118,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			
 			if status == 'REMOVE'
 				if order_reservation.status == "new" || order_reservation.status == "accepted"
-					OrderReservation.update_order_reservation(order_reservation_id, nil, "rejected",nil,remark)
+					OrderReservation.update_order_reservation(order_reservation_id, nil, "rejected",nil,remark, nil, current_login_employee)
 					result = {:status=> true, :message => "rejected" }
 				else
 					result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't remove!" }
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index f269c91f..bc7382c3 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -308,15 +308,22 @@ class OrderReservation < ApplicationRecord
 	      sale.sale_status = 'void'
 	      sale.save
 
-	      # FOr Sale Audit 
+	      # For Sale Audit 
 	      if !current_user.nil?
 	      	action_by = current_user.name
 	      else
-	      	action_by = "code2LAB"
+	      	action_by = "doemal"
 	      end
+
+	      approved_name = nil
 	      approved_by = Employee.find_by_emp_id(access_code)
+	      
+	      if !approved_by.nil?
+	      	approved_name = approved_by.name
+	      end
+	      cashier_name = Employee.where("id=?",sale.cashier_id).name
 	      # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
-	      sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, approved_by.name,remark,"SALEVOID" )
+	      sale_audit = SaleAudit.record_audit_for_edit(sale_id,cashier_name, approved_name,remark,"SALEVOID" )
 
 	      # update complete order items in oqs
 	      SaleOrder.where("sale_id = '#{ sale_id }'").find_each do |sodr|        

From 7bf01a863cd9a0bf8fe1c6f2949b2eaf7d8e8986 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 3 Oct 2018 14:17:08 +0630
Subject: [PATCH 56/66] booking status changed

---
 .../transactions/bookings_controller.rb       | 13 ++++++
 app/views/transactions/bookings/show.html.erb | 46 +++++++++++++++++--
 app/views/transactions/sales/show.html.erb    | 17 +++----
 config/routes.rb                              |  1 +
 4 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/app/controllers/transactions/bookings_controller.rb b/app/controllers/transactions/bookings_controller.rb
index 16d264af..f8a74a53 100644
--- a/app/controllers/transactions/bookings_controller.rb
+++ b/app/controllers/transactions/bookings_controller.rb
@@ -53,6 +53,19 @@ class Transactions::BookingsController < ApplicationController
     end
   end
 
+  def update_status
+    data = Booking.where("sale_id IS NULL AND booking_status='assign' AND booking_id = ?", params[:booking_id])
+    if !data.nil?
+      booking = Booking.find(params[:booking_id])
+      booking.booking_status = 'moved'
+      booking.save!
+
+      render :json => {:status => true, :message => "Update status successfully."}
+    else
+      render :json => {:status => false, :error_message => "Can't update status!"}
+    end
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_transactions_booking
diff --git a/app/views/transactions/bookings/show.html.erb b/app/views/transactions/bookings/show.html.erb
index a8276c60..4aae7c79 100755
--- a/app/views/transactions/bookings/show.html.erb
+++ b/app/views/transactions/bookings/show.html.erb
@@ -40,9 +40,14 @@
                   <th> <%= t("views.right_panel.detail.checkout_by") %></th>
                   <th><%= t("views.right_panel.detail.booking_status") %></th>
                   <th><%= t("views.right_panel.detail.booking_date") %></th>
-                  <%if (@booking.sale_id.nil?) && (current_login_employee.role == "administrator") && (!@order.nil?) %>
+                  <%if current_login_employee.role == "administrator" %>
                     <th>
+                      <%if (!@order.nil?) && (@booking.sale_id.nil?) %>
                       <button id="request_bill" class="btn bg-blue btn-md waves-effect">Req. Bill</button>
+                      <% end %>
+                      <%if @order.nil? && @booking.booking_status == 'assign' && (@booking.sale_id.nil?) %>
+                        <button id="change_booking_status" class="btn bg-blue btn-md waves-effect">Update Status</button>
+                      <% end %>
                     </th>
                   <% end %>
                 </tr>
@@ -59,8 +64,14 @@
                   <td><%= @booking.checkout_by rescue '-' %></td>
                   <td><%= @booking.booking_status %> </td>
                   <td><%= @booking.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
-                  <%if (@booking.sale_id.nil?) && (current_login_employee.role == "administrator") && (!@order.nil?) %>
-                    <td></td>
+                  <%if current_login_employee.role == "administrator" %>
+                      <%if (!@order.nil?) && (@booking.sale_id.nil?) %>
+                        <td></td>
+                      <% end %>
+                      <%if @order.nil? %>
+                        <td></td>
+                      <% end %>
+                    </th>
                   <% end %>
                 </tr>
               </tbody>
@@ -175,6 +186,35 @@
       }
     });
   });
+
+  $("#change_booking_status").on("click", function(){
+    $('#change_booking_status').prop("disabled",true);
+    var booking_id = '<%= @booking.booking_id %>';
+    $.ajax({
+        type: "GET",
+        url: "/transactions/bookings/update_status/"+booking_id,
+        success: function (result) {
+          if (!result.status) {
+            $('#change_booking_status').prop("disabled",false);
+            swal("Opps",result.error_message,"warning");
+          }
+          else {         
+            swal({
+              title: "Information", 
+              text: result.message, 
+              type: "success",
+              html: true,
+              closeOnConfirm: false,
+              closeOnCancel: false,
+              allowOutsideClick: false
+            }, function() {
+              // Redirect the user
+              window.location.reload();
+            });
+          }
+        }
+    }); 
+  });
 </script>
      
 
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 04732fb3..3e4dfca0 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -41,21 +41,22 @@
                 <th><%= t :cashier %></th>
                 <th><%= t("views.right_panel.detail.sales_status") %></th>
                 <th><%= t("views.right_panel.detail.receipt_generated_at") %></th>
-                <% if @sale.sale_status == "completed" %>
+                <% if @sale.sale_status == "new" || @sale.sale_status == "completed" %>
                   <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
                     <th>
-                      <button type="button" class="btn btn-block bg-red waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
-                    </th>
+                      <div class="form-group">
+                        <button type="button" class="btn btn-block bg-red waves-effect col-md-5" style="margin-top: 8px;" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
                   <% end %>
-                <% elsif @sale.sale_status == "new" %>
+                <% end %>
+                <% if @sale.sale_status == "new" %>
                   <% if current_login_employee.role == "administrator" %>
                     <%if @membership.discount && @sale.customer.membership_id %>
-                      <th>
-                        <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">Pay</button>
+                          <button type="button" class="btn btn-block bg-blue waves-effect col-md-5" data-toggle="modal" data-target="#paymentModal">Pay</button>
+                        </div>
                       </th>
                     <%else%>
-                      <th>
-                        <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
+                          <button type="button" id="pay" class="btn btn-block bg-blue waves-effect col-md-5">Pay</button>
+                        </div>
                       </th>
                     <%end%>
                   <%end%>
diff --git a/config/routes.rb b/config/routes.rb
index 59742571..3dabf4d8 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -479,6 +479,7 @@ scope "(:locale)", locale: /en|mm/ do
     get "/sales/:sale_id/void" => "manual_sales#void", :as => "void"
     post "sales/:sale_id/manual_void_sale", to: "manual_sales#manual_void_sale", :as => "manual_void_sale"
     post "sales/:sale_id/:type/void" => "sales#overall_void"
+    get "/bookings/update_status/:booking_id" => "bookings#update_status", :default => { :format => 'json' }
   end
 
   #--------- Reports Controller Sections ------------#

From 497458371bb236931f8ea72b755c87f5be5d61af Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 4 Oct 2018 10:25:15 +0630
Subject: [PATCH 57/66] check menu and table status

---
 app/controllers/settings/menus_controller.rb | 2 +-
 app/views/settings/menus/index.html.erb      | 2 ++
 app/views/settings/rooms/_form.html.erb      | 2 +-
 app/views/settings/tables/_form.html.erb     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 66d75cc4..aad7ae45 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -5,7 +5,7 @@ class Settings::MenusController < ApplicationController
   # GET /settings/menus
   # GET /settings/menus.json
   def index
-    @settings_menus = Menu.all.page(params[:page]).per(10)
+    @settings_menus = Menu.unscoped.all.page(params[:page]).per(10)
     respond_to do |format|
       format.html
       format.xlsx
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index ddbb89b6..78a41acb 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -41,6 +41,7 @@
           <th><%= t("views.right_panel.detail.valid_days") %></th>
           <th><%= t("views.right_panel.detail.valid_from") %></th>
           <th><%= t("views.right_panel.detail.valid_to") %></th>
+          <th><%= t("views.right_panel.detail.is_active") %></th>
             <!-- <th>Created By</th>
             <th>Created At</th> -->
 
@@ -55,6 +56,7 @@
             <td><%= settings_menu.valid_days %></td>
             <td><%= settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %></td>
             <td><%= settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td>
+            <td><%= settings_menu.is_active %></td>
             <!-- <td><%= settings_menu.created_by %></td> -->
             <!-- <td><%= settings_menu.created_at %></td> -->
             <!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb
index d2f43cb0..27ec89a9 100755
--- a/app/views/settings/rooms/_form.html.erb
+++ b/app/views/settings/rooms/_form.html.erb
@@ -7,7 +7,7 @@
 
         <div class="form-inputs p-l-15">
           <%= f.input :name %>
-          <%= f.input :status %>
+          <%= f.input :status, collection: [ ["Available","available"], ["Occupied","occupied"] ], :selected => @settings_room.status %>
           <%= f.input :seater %>
           <%= f.input :order_by %>
           <%= f.input :is_active %>
diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb
index 42ce2d4c..7bbd318e 100755
--- a/app/views/settings/tables/_form.html.erb
+++ b/app/views/settings/tables/_form.html.erb
@@ -7,7 +7,7 @@
 
         <div class="form-inputs p-l-15">
           <%= f.input :name %>
-          <%= f.input :status %>
+          <%= f.input :status, collection: [ ["Available","available"], ["Occupied","occupied"] ], :selected => @settings_table.status %>
           <%= f.input :seater %>
           <%= f.input :order_by %>
           <%= f.input :is_active %>

From 1816b760285b21886adaf04b3a00eaa79c5a0ac2 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 4 Oct 2018 14:42:02 +0630
Subject: [PATCH 58/66] update inventory

---
 .../inventory_definitions_controller.rb       | 46 ++++++---
 .../inventory/_inventory_list.html.erb        |  2 +-
 app/views/inventory/inventory/index.html.erb  |  2 +-
 .../inventory_definitions/_form.html.erb      | 95 ++++++++++++++-----
 .../inventory/stock_checks/index.html.erb     | 12 ++-
 config/initializers/action_controller.rb      |  2 +-
 config/locales/en.yml                         |  1 +
 config/locales/mm.yml                         |  1 +
 config/routes.rb                              |  2 +
 9 files changed, 118 insertions(+), 45 deletions(-)

diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb
index 19188d2d..4491669e 100755
--- a/app/controllers/inventory/inventory_definitions_controller.rb
+++ b/app/controllers/inventory/inventory_definitions_controller.rb
@@ -26,26 +26,44 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
   # POST /inventory_definitions
   # POST /inventory_definitions.json
   def create
-    inventory = InventoryDefinition.find_by_item_code(inventory_definition_params[:item_code])
+    inventory = InventoryDefinition.find_by_item_code(params[:item_code])
     if inventory.nil?
-      @inventory_definition = InventoryDefinition.new(inventory_definition_params)
+      
+      @inventory_definition = InventoryDefinition.new
+      @inventory_definition.item_code = params[:item_code]
+      @inventory_definition.min_order_level = params[:min_order_level]
+      @inventory_definition.max_stock_level = params[:max_stock_level]
+      @inventory_definition.save
     else
       @inventory_definition = InventoryDefinition.find(inventory.id)
-      @inventory_definition.min_order_level = inventory_definition_params[:min_order_level]
-      @inventory_definition.max_stock_level = inventory.max_stock_level.to_i + inventory_definition_params[:max_stock_level].to_i
+      @inventory_definition.min_order_level = params[:min_order_level]
+      @inventory_definition.max_stock_level = inventory.max_stock_level.to_i + params[:max_stock_level].to_i
     end
     @inventory_definition.created_by = current_user.id
-    respond_to do |format|
-      if @inventory_definition.save
-        format.html { redirect_to inventory_path, notice: 'Inventory definition was successfully created.' }
-        format.json { render :show, status: :created, location: @inventory_definition }
-      else
-        format.html { render :new }
-        format.json { render json: @inventory_definition.errors, status: :unprocessable_entity }
-      end
+    if @inventory_definition.save
+      result = {:status=> true, :message => "Inventory definition was created successfully",:data=> @inventory_definition}
+    else
+      result = {:status=> false, :message => "Inventory definition was created successfully",:data=> @inventory_definition}
     end
-
-
+    render :json => result.to_json
+    # inventory = InventoryDefinition.find_by_item_code(inventory_definition_params[:item_code])
+    # if inventory.nil?
+    #   @inventory_definition = InventoryDefinition.new(inventory_definition_params)
+    # else
+    #   @inventory_definition = InventoryDefinition.find(inventory.id)
+    #   @inventory_definition.min_order_level = inventory_definition_params[:min_order_level]
+    #   @inventory_definition.max_stock_level = inventory.max_stock_level.to_i + inventory_definition_params[:max_stock_level].to_i
+    # end
+    # @inventory_definition.created_by = current_user.id
+    # respond_to do |format|
+    #   if @inventory_definition.save
+    #     format.html { redirect_to inventory_path, notice: 'Inventory definition was successfully created.' }
+    #     format.json { render :show, status: :created, location: @inventory_definition }
+    #   else
+    #     format.html { render :new }
+    #     format.json { render json: @inventory_definition.errors, status: :unprocessable_entity }
+    #   end
+    # end
   end
 
   # PATCH/PUT /inventory_definitions/1
diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb
index 01e8f98f..0f4813f2 100755
--- a/app/views/inventory/inventory/_inventory_list.html.erb
+++ b/app/views/inventory/inventory/_inventory_list.html.erb
@@ -36,7 +36,7 @@
         <% end %>
       </td>
       <td>
-        <button type="button" data-value="<%= item.id %>" class="btn bg-blue waves-effect btn-link show_track"><%= t("views.btn.show") %> <%= t("views.right_panel.detail.stock_check") %></button>
+        <button type="button" data-value="<%= item.id %>" class="btn bg-blue waves-effect btn-link show_track"> <%= t("views.right_panel.detail.stock_ledger") %></button>
       </td>
     </tr>
    <!--  <tr>
diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb
index d56b9e8c..aff62d84 100755
--- a/app/views/inventory/inventory/index.html.erb
+++ b/app/views/inventory/inventory/index.html.erb
@@ -15,7 +15,7 @@
           <!-- <button id="stock_check_report" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> <%= t("views.btn.stock_check_report") %>
           </button> -->
           <button id="stock_taking" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> <%= t("views.btn.stock_taking") %></button>
-          <button id='new_inventory_product' class='btn btn-primary  float-right waves-effect' style='margin-left:5px;'><%= (t :track) +" "+ t("views.btn.new") + " " + (t :inventory) %>
+          <button id='new_inventory_product' class='btn btn-primary  float-right waves-effect' style='margin-left:5px;'><%= (t :track) +" "+ t("views.btn.new") + " " %> <%= t("views.right_panel.detail.item") %>
          </button>     
       </div>
       <div class="card">
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index e4a48875..36493eb4 100644
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -62,7 +62,7 @@
           </ul>
         </div>
       </div>
-      <div class="col-md-9 col-lg-9 col-sm-9 m-t-10" >
+      <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
         <div class="card">
           <div class="card-block" style="">
             <div class="card-text" id="custom-slimscroll">
@@ -73,10 +73,33 @@
           </div>
         </div>
       </div>
-      <div class="col-lg-1 col-md-1 col-sm-1" >
+      <div class="col-lg-3 col-md-3 col-sm-3" >
         <button type="button" class="btn btn-lg btn-block btn-default waves-effect m-t-5" id='back'>
           <i class="material-icons">reply</i>Back
         </button>
+
+        <div class="card-block">
+          <div class="card-text" id="order-detail-slimscroll" data-height="140">
+           <table class="table table-striped summary-items" id="order-items-table" >
+              <thead>
+               <tr>
+                 <th>#</th>
+                 <th class="item-name">Items</th>
+                 <th class="item-qty">Min Qty</th>
+                 <th class="item-attr">Max Qty</th>
+               </tr>
+              </thead>
+              <tbody class="font-13" >
+
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="card-footer">
+          <button type="button" class="btn btn-lg btn-block btn-primary waves-effect m-t-5" id='stock_taking'>Stock Taking
+        </button>
+        </div>
+     </div>
       </div>
     </div>
 
@@ -88,31 +111,34 @@
             <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
           </div>
           <div class="modal-body">
-            <%= simple_form_for([:inventory, @inventory_definition]) do |f| %>
- 
-
               <div class="form-inputs">
+
                 <div class="form-group">
-                    <div class="form-group">
+                  <div class="form-group">
                     <label class="control-label" for="attribute">Menu Item</label>
                     <input class="form-control col-md-6" type="text" value="" id="item_name" readonly="true">
-                    </div>
-                    <%= f.input :item_code , :as => :hidden,:input_html=>{:id=>"instance_code"} %>
+                  </div>
+                  
+                    <input type="hidden" name="item_code" id="instance_code">
                   <div class="form-group">
                     <label class="control-label" for="attribute">Instances</label>
                     <div class="attributes-list col-md-6"></div>
                   </div>
-                  <%= f.input :min_order_level,:input_html=>{:value=>"1",:class=>"col-md-5"} %>
-                  <%= f.input :max_stock_level,:input_html=>{:value=>"1",:class=>"col-md-5"} %>
-                  <div class="form-actions">
-                    <%= f.submit t("views.btn.submit"), class: 'btn bg-blue waves-effect' %>
+
+                  <div class="form-group">
+                    <label class="control-label" for="attribute">Min Order Level</label>
+                     <input type="text" name="min_order_level" id="min_qty" value="1" class="col-md-5 form-control">
                   </div>
 
-                  <% end %>
+                  <div class="form-group">
+                    <label class="control-label" for="attribute">Max Order Level</label>
+                    <input type="text" name="max_order_level" id="max_qty" value="1" class="col-md-5 form-control">
+                  </div>
+                  
+                </div>
               </div>
-            </form>
           </div>
-          <!-- <div class="modal-footer">
+          <div class="modal-footer">
             <div class="row">
               <div class="col-md-4">
                 <button type="button" class="btn btn-default " data-dismiss="modal" id="close">Close</button>
@@ -121,8 +147,8 @@
                 <button type="button" class="btn btn-primary submit " data-dismiss="modal" id="submit">Submit</button>
               </div>
             </div>
-          </div> -->
-        </div>
+          </div>
+        
       </div>
     </div>
 <style type="text/css">
@@ -563,26 +589,49 @@
          
       // click select option icon for add 
       $(document).on('click', '.submit', function(event){ 
-        var params = {  'item_code': $("#item_code").val(), 
-                        'min_order_level': $("#min_qty").val(),
-                        'max_stock_level': $("#max_qty").val() 
-                     };
+
+        var item_code = $("#instance_code").val();
+        var min_qty = $("#min_qty").val();
+        var max_qty = $("#max_qty").val();
+        var item_name = $("#item_name").val();
+
+        console.log(item_code);
+        console.log(min_qty);
+        console.log(max_qty);
+        var params = {'item_code': item_code, 
+                        'min_order_level': min_qty,
+                        'max_stock_level': max_qty};
         var ajax_url = '<%=inventory_inventory_definitions_path%>';
-        console.log(ajax_url)
          $.ajax({
           type: "POST",
           url: ajax_url,
           data: params,
           dataType: "json",
            success:function(result){ 
-              
+             if (result.status) {
+              var rowCount = $('.summary-items tbody tr').length+1;
+              row ="<tr class=''>"
+                  +'<td class="">'+rowCount+'</td>'
+                  +'<td class="">' + item_name +'</td>'
+                  +'<td class="">' + min_qty + '</td>' 
+                  +'<td class="">' + max_qty + '</td>' 
+              +'</tr>';
+             $(".summary-items tbody").append(row);
+              swal("Success",result.message,"success");
+             }else{
+              swal("Opps",result.message,"warning");
+             }
            }
         });
+        
       });
 
       $('#back').on('click', function () {
         window.location.href = '/inventory';
       });
+      $('#stock_taking').on('click', function () {
+        window.location.href = '/inventory/stock_checks';
+      });
 
     });
   </script>
\ No newline at end of file
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index b064cfc7..2fd6ec57 100644
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -71,10 +71,7 @@
           </div>
           <div class="modal-body">
             <div class="form-group">
-                <div class="form-group">
-                    <label class="control-label" for="attribute">Stock Check Reason</label>
-                     <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
-                </div>
+                
                 <div class="form-group">
                     <label class="control-label" for="attribute">Item</label>
                      <input type='text' id='item' class='form-control' readonly="true" value=''/>
@@ -87,7 +84,12 @@
                 <input type="hidden" id="item_code" value="">
                 <input type="hidden" id="item_name" value="">
                 <input type="hidden" id="instance_name" value="">
-
+                
+                <div class="form-group">
+                    <label class="control-label" for="attribute">Stock Check Reason</label>
+                     <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
+                </div>
+                
                 <div class="form-actions">
                   <button type="button" class="btn btn-primary" data-dismiss="modal" id="save_to_stock_check">Save</button>
                  <!--  <button type="button" class="btn btn-primary add_to_order " data-dismiss="modal" id="add_to_order">Add to Order<div class="ripple-container"></div></button> -->
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index fb212f13..1d8b678e 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -19,7 +19,7 @@ class ActionController::Base
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
     else         
-      # check for license file
+      check for license file
       if check_license
         current_license(ENV["SX_PROVISION_URL"])
       else
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2c30cb50..b279b80b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -346,6 +346,7 @@ en:
         inventory: "inventory"
         stock_taking: "Stock Taking"
         stock_check: "Stock Check"
+        stock_ledger: "Stock Ledger"
         stock_check_report: "Stock Check Report"
         min_order: "Min Order"
         max_stock: "Max Stock"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 7360c35f..b5222359 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -340,6 +340,7 @@ mm:
         inventory: "ကုန်လှောင်ရုံစာရင်း"
         stock_taking: "စတော့ကောက်သည်"
         stock_check: "စတော့စစ်ဆေးသည်"
+        stock_ledger: "စတော့စစ်ဆေးသည်"
         stock_check_report: "စတော့စစ်ဆေးမှုမှတ်တမ်း"
         min_order: "အနည်းဆုံးမှာယူမှု"
         max_stock: "အများဆုံးစတော့"
diff --git a/config/routes.rb b/config/routes.rb
index 59742571..6388560b 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -522,6 +522,8 @@ scope "(:locale)", locale: /en|mm/ do
     get ':inventory_definition_id/show' => 'inventory#show'
 
     get 'get_menu_category/:id' => "stock_checks#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
+
+    post 'inventory_definitions/create_inventory' => 'inventory_definitions#create_inventory'
   end
   #mount_compendium at: '/report' #, controller: 'reports'
 

From b4aa1c600ff9eeedc65a9d443242e177acfbf375 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 4 Oct 2018 16:31:19 +0630
Subject: [PATCH 59/66] check js func: and card balance amount for Paymal
 payment

---
 README.md                                     |  4 +
 .../origami/payments_controller.rb            | 15 +++-
 app/controllers/origami/void_controller.rb    |  2 +-
 .../origami/waste_spoile_controller.rb        |  2 +-
 .../transactions/sales_controller.rb          |  2 +-
 app/models/printer/receipt_printer.rb         |  8 +-
 app/models/sale_audit.rb                      | 34 ++++++++-
 app/pdf/receipt_bill_a5_pdf.rb                | 26 ++++++-
 app/pdf/receipt_bill_pdf.rb                   | 30 +++++++-
 app/views/origami/dinga/index.html.erb        | 73 ++++++++++---------
 app/views/origami/paymal/index.html.erb       | 73 ++++++++++---------
 11 files changed, 181 insertions(+), 88 deletions(-)

diff --git a/README.md b/README.md
index 363d0be3..0e92142a 100755
--- a/README.md
+++ b/README.md
@@ -257,6 +257,10 @@ For TaxProfiles On/Off
 For Add Kitchen Role
 	1) settings/lookups => {type:employee_roles, name:Kitchen, value:kitchen}
 
+For Food Court Settings On/Off
+	** '0' means can not use food court and '1' means can use food court **
+	=> settings/lookups => { type:food_court, name: FoodCourt, value:'{0 or 1}' }
+
 * ToDo list
 
 1. Migration
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index cc363298..7294eb80 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -91,7 +91,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
       printer = Printer::ReceiptPrinter.new(print_settings)
 
-      filename, receipt_no, cashier_printer = 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_detail, "Frt",current_balance,nil,other_amount,nil)    
+      filename, receipt_no, cashier_printer = 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_detail, "Frt",current_balance,nil,other_amount,nil,nil)    
 
       result = { 
         :filepath => filename, 
@@ -234,6 +234,9 @@ class Origami::PaymentsController < BaseOrigamiController
               card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
             end
           end
+
+          #card_balance amount for Paymal payment
+          card_balance_amount = SaleAudit.getCardBalanceAmount(sale_id)
           
           # get printer info
           print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -243,7 +246,7 @@ class Origami::PaymentsController < BaseOrigamiController
           other_amount = SaleItem.calculate_other_charges(sale_items)
 
           printer = Printer::ReceiptPrinter.new(print_settings)
-          filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "Paid",current_balance,card_data,other_amount,latest_order_no)
+          filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "Paid",current_balance,card_data,other_amount,latest_order_no,card_balance_amount)
 
           render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name})
 
@@ -524,6 +527,10 @@ class Origami::PaymentsController < BaseOrigamiController
           card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id})
         end
       end
+
+      #card_balance amount for Paymal payment
+      card_balance_amount = SaleAudit.getCardBalanceAmount(sale_id)
+
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
 
@@ -533,7 +540,7 @@ class Origami::PaymentsController < BaseOrigamiController
       other_amount = SaleItem.calculate_other_charges(saleObj.sale_items)
 
       printer = Printer::ReceiptPrinter.new(print_settings)
-      filename, receipt_no, cashier_printer = 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_detail, "Re-print",current_balance,card_data,other_amount,latest_order_no)
+      filename, receipt_no, cashier_printer = 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_detail, "Re-print",current_balance,card_data,other_amount,latest_order_no,card_balance_amount)
       
       result = { 
         :status => true,
@@ -619,7 +626,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
         printer = Printer::ReceiptPrinter.new(print_settings)
 
-        filename, sale_receipt_no, printer_name = 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_detail, "FOC",nil,nil,other_amount,nil)
+        filename, sale_receipt_no, printer_name = 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_detail, "FOC",nil,nil,other_amount,nil,nil)
         result = { 
               :status => true,
               :filepath => filename, 
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 1e9acafb..2748a5c2 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -126,7 +126,7 @@ class Origami::VoidController < BaseOrigamiController
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
         other_amount = SaleItem.calculate_other_charges(sale.sale_items)
         printer = Printer::ReceiptPrinter.new(print_settings)                                    
-        filename, sale_receipt_no, printer_name = 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,nil,other_amount,nil)   
+        filename, sale_receipt_no, printer_name = 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,nil,other_amount,nil,nil)   
         result = { 
               :filepath => filename, 
               :printer_model => print_settings.brand_name, 
diff --git a/app/controllers/origami/waste_spoile_controller.rb b/app/controllers/origami/waste_spoile_controller.rb
index 6d2bb094..bea7c455 100755
--- a/app/controllers/origami/waste_spoile_controller.rb
+++ b/app/controllers/origami/waste_spoile_controller.rb
@@ -107,7 +107,7 @@ class Origami::WasteSpoileController < BaseOrigamiController
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
         other_amount = SaleItem.calculate_other_charges(sale.sale_items)
         printer = Printer::ReceiptPrinter.new(print_settings)                                    
-        filename, sale_receipt_no, printer_name = 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, remark,current_balance,nil,other_amount,nil)   
+        filename, sale_receipt_no, printer_name = 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, remark,current_balance,nil,other_amount,nil,nil)   
         result = { 
               :filepath => filename, 
               :printer_model => print_settings.brand_name, 
diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index 32636ccd..c93766a5 100755
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -364,7 +364,7 @@ class Transactions::SalesController < ApplicationController
 
         other_amount = SaleItem.calculate_other_charges(sale.sale_items) #other charges
         printer = Printer::ReceiptPrinter.new(print_settings)                                    
-        filename, sale_receipt_no, printer_name = 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,nil,other_amount,nil)   
+        filename, sale_receipt_no, printer_name = 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,nil,other_amount,nil,nil)   
         result = { 
               :filepath => filename, 
               :printer_model => print_settings.brand_name, 
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index cb516be2..8b7f5d56 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -188,19 +188,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,balance,card_data,other_amount,latest_order_no)
+  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,card_data,other_amount,latest_order_no,card_balance_amount)
     #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,balance,card_data,other_amount,latest_order_no)
+    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,card_data,other_amount,latest_order_no,card_balance_amount)
     receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
     if !receipt_bill_a5_pdf.empty?
       receipt_bill_a5_pdf.each do |receipt_bilA5|
         if receipt_bilA5[0] == 'ReceiptBillA5Pdf' 
           if receipt_bilA5[1] == '1'
-            pdf = ReceiptBillA5Pdf.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,card_data,other_amount,latest_order_no)
+            pdf = ReceiptBillA5Pdf.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,card_data,other_amount,latest_order_no,card_balance_amount)
           else
-            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,card_data,other_amount,latest_order_no)
+            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,card_data,other_amount,latest_order_no,card_balance_amount)
           end
         end
       end
diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb
index b28753c4..33be29f1 100755
--- a/app/models/sale_audit.rb
+++ b/app/models/sale_audit.rb
@@ -119,8 +119,36 @@ class SaleAudit < ApplicationRecord
 
   end
 
-  private
-  def generate_custom_id
-    self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI")
+  def self.getCardBalanceAmount(sale_id)
+    card_balance_amount = 0
+    sale_audits = SaleAudit.where("sale_id='#{sale_id}' AND action='PAYMAL'")
+    if !sale_audits.nil?
+      sale_audits.each do |sale_audit|
+        if sale_audit.remark.split('}')[0]
+          if self.valid_json('['+ sale_audit.remark.split('}')[0] + '}]')
+            remark = JSON.parse(('['+ sale_audit.remark.split('}')[0] + '}]'))
+            if remark[0]
+              if remark[0]["status"]
+                card_balance_amount = remark[0]["card_balance_amount"]
+              end
+            end
+          end
+        end
+      end
+    end
+    
+    return card_balance_amount
   end
+
+  def self.valid_json(json)
+      JSON.parse(json)
+      return true
+    rescue JSON::ParserError => e
+      return false
+  end
+
+  private
+    def generate_custom_id
+      self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI")
+    end
 end
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 0314b1a9..f32c1009 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -2,7 +2,7 @@ class ReceiptBillA5Pdf < 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, :line_move
-  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,card_data,other_charges_amount,latest_order_no)
+  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,card_data,other_charges_amount,latest_order_no,card_balance_amount)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.header_font_size = printer_settings.header_font_size.to_i
@@ -72,7 +72,12 @@ class ReceiptBillA5Pdf < Prawn::Document
         card_sale_data(card_data)
     end
     #end card sale trans data
-
+    #start card blanace amount
+    if !card_balance_amount.nil?
+        card_balance_data(card_balance_amount)
+    end
+    #end card blanace amount
+    
     if discount_price_by_accounts.length > 0 && shop_details.show_account_info
         discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
     end
@@ -707,6 +712,23 @@ class ReceiptBillA5Pdf < Prawn::Document
         end
     end
 
+    #start card balance data
+    def card_balance_data(card_balance_amount)
+        if card_balance_amount > 0
+            move_down line_move
+            stroke_horizontal_rule
+            move_down line_move
+
+            y_position = cursor
+            bounding_box([0, y_position], :width =>self.label_width) do
+                text "Card Balance: ",:style => :bold, :size => header_font_size,:align => :left
+            end    
+            bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+                text "#{card_balance_amount}" , :size => self.item_font_size,:align => :right
+            end
+        end
+    end
+
     #check ReceiptBillAltName included
     def show_alt_name
         bill_alt_name = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index f060a95a..e3fb259b 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -3,7 +3,7 @@ class ReceiptBillPdf < 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, :description_width, :price_num_width, :line_move
   
-    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,card_data,other_charges_amount,latest_order_no)
+    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,card_data,other_charges_amount,latest_order_no,card_balance_amount)
         self.page_width = printer_settings.page_width
         self.page_height = printer_settings.page_height
         self.header_font_size = printer_settings.header_font_size.to_i
@@ -73,6 +73,11 @@ class ReceiptBillPdf < Prawn::Document
             card_sale_data(card_data)
         end
         #end card sale trans data
+        #start card blanace amount
+        if !card_balance_amount.nil?
+            card_balance_data(card_balance_amount)
+        end
+        #end card blanace amount
 
         if discount_price_by_accounts.length > 0 && shop_details.show_account_info
             discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
@@ -509,9 +514,9 @@ class ReceiptBillPdf < Prawn::Document
             bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                  text "Total 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(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
-              end
+            bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+                text "#{number_with_precision(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+            end
         end
        
     end
@@ -707,6 +712,23 @@ class ReceiptBillPdf < Prawn::Document
         end
     end
 
+    #start card balance data
+    def card_balance_data(card_balance_amount)
+        if card_balance_amount > 0
+            move_down line_move
+            stroke_horizontal_rule
+            move_down line_move
+
+            y_position = cursor
+            bounding_box([0, y_position], :width =>self.label_width) do
+                text "Card Balance: ",:style => :bold, :size => header_font_size,:align => :left
+            end    
+            bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+                text "#{card_balance_amount}" , :size => self.item_font_size,:align => :right
+            end
+        end
+    end
+
     #check ReceiptBillAltName included
     def show_alt_name
         bill_alt_name = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb
index 3e4a909f..8c326ac2 100644
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -201,47 +201,52 @@
 		}
 	});
 
-	$("#dinga_payment").click(function(){
+	$("#dinga_payment").on('click', function(){
 		valid_amount = $("#valid_amount").val();
 		sale_id = $("#valid_amount").attr('data-value');
 		membership_id = $("#valid_amount").attr('data-member-value');
 		payment_amount = parseFloat($("#used_amount").text());
-		if((membership_id!=undefined) && (membership_id!="") && (membership_id > 0)){
-			if(payment_amount<=0 ){
-				swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
-			}else if(valid_amount< payment_amount){
-				swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
-			}else{
-				if(payment_amount <= "<%= @payment_prices %>"){
-					$(this).off("click");
-					$.ajax({
-						type: "POST",
-						url:  "<%=origami_payment_dinga_path%>",
-						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:"",account_no:0},
-						success: function(result){
-							if(result.status == true){
-								swal({
-									title: "Information!",
-									text: result.message,
-									html: true,
-									closeOnConfirm: false,
-									closeOnCancel: false,
-									allowOutsideClick: false
-								}, function () {
-									window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
-								});
+		if(payment_amount > 0){
+			if((membership_id!=undefined) && (membership_id!="") && (membership_id > 0)){
+				if(payment_amount<=0 ){
+					swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
+				}else if(valid_amount< payment_amount){
+					swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
+				}else{
+					if(payment_amount <= "<%= @payment_prices %>"){
+						$(this).off("click");
+						$.ajax({
+							type: "POST",
+							url:  "<%=origami_payment_dinga_path%>",
+							data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:"",account_no:0},
+							success: function(result){
+								if(result.status == true){
+									swal({
+										title: "Information!",
+										text: result.message,
+										html: true,
+										closeOnConfirm: false,
+										closeOnCancel: false,
+										allowOutsideClick: false
+									}, function () {
+										window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
+									});
 
-							}else{
-								swal ( "Information" , result.message);
+								}else{
+									swal ( "Information" , result.message);
+								}
 							}
-						}
-					})
-				}else {
-					swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+						})
+					}else {
+						swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+					}
 				}
+			}else{
+				$("#is_paymemberModal").show();
+				$("#is_paymemberModal").modal({show : true, backdrop: false, keyboard : false});
 			}
 		}else{
-			$("#is_paymemberModal").modal({show : true, backdrop: false, keyboard : false});
+			swal ( "Oops" ,  "Amount should be greater than 0!" ,  "warning" );
 		}
 	});
 
@@ -273,7 +278,7 @@
           	console.log(data)
             if (data.status == true) {
             	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
-            	$("#valid_amount").val(parseFloat(valid_amount));
+            	$("#valid_amount").val((valid_amount > 0) ? parseFloat(valid_amount) : 0);
 
               	$.ajax({
 					type: "POST",
@@ -350,7 +355,7 @@
 	          success: function(data) {
 	            if (data.status == true) {
 	            	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
-	            	$("#valid_amount").val(parseFloat(valid_amount));
+	            	$("#valid_amount").val((valid_amount > 0) ? parseFloat(valid_amount) : 0);
 
 	              	$.ajax({
 						type: "POST",
diff --git a/app/views/origami/paymal/index.html.erb b/app/views/origami/paymal/index.html.erb
index 0035784b..802c1ce4 100644
--- a/app/views/origami/paymal/index.html.erb
+++ b/app/views/origami/paymal/index.html.erb
@@ -197,47 +197,52 @@
 		}
 	});
 
-	$("#paymal_payment").click(function(){
+	$("#paymal_payment").on('click',function(){
 		valid_amount = $("#valid_amount").val();
 		sale_id = $("#valid_amount").attr('data-value');
 		membership_id = $("#valid_amount").attr('data-member-value');
 		payment_amount = parseFloat($("#used_amount").text());
-		if((membership_id!=undefined) && (membership_id!="") && (membership_id > 0)){
-			if(payment_amount<=0 ){
-				swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
-			}else if(valid_amount< payment_amount){
-				swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
-			}else{
-				if(payment_amount <= "<%= @payment_prices %>"){
-					$(this).off("click");
-					$.ajax({
-						type: "POST",
-						url:  "<%=origami_payment_paymal_path%>",
-						data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:"",account_no:0},
-						success: function(result){
-							if(result.status == true){
-								swal({
-									title: "Information!",
-									text: result.message,
-									html: true,
-									closeOnConfirm: false,
-									closeOnCancel: false,
-									allowOutsideClick: false
-								}, function () {
-									window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
-								});
+		if(payment_amount > 0){
+			if((membership_id!=undefined) && (membership_id!="") && (membership_id > 0)){
+				if(payment_amount<=0 ){
+					swal ( "Oops" ,  "Please type valid amount!" ,  "warning" );
+				}else if(valid_amount< payment_amount){
+					swal ( "Oops" ,  "Insufficient Amount!" ,  "warning" );
+				}else{
+					if(payment_amount <= "<%= @payment_prices %>"){
+						$(this).off("click");
+						$.ajax({
+							type: "POST",
+							url:  "<%=origami_payment_paymal_path%>",
+							data: {payment_amount:payment_amount,membership_id:membership_id,sale_id:sale_id,transaction_ref:"",account_no:0},
+							success: function(result){
+								if(result.status == true){
+									swal({
+										title: "Information!",
+										text: result.message,
+										html: true,
+										closeOnConfirm: false,
+										closeOnCancel: false,
+										allowOutsideClick: false
+									}, function () {
+										window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
+									});
 
-							}else{
-								swal ( "Information" , result.message);
+								}else{
+									swal ( "Information" , result.message);
+								}
 							}
-						}
-					})
-				}else {
-					swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+						})
+					}else {
+						swal ( "Oops" ,  "Payment Amount is over!" ,  "warning" );
+					}
 				}
+			}else{
+				$("#is_paymemberModal").show();
+				$("#is_paymemberModal").modal({show : true, backdrop: false, keyboard : false});
 			}
 		}else{
-			$("#is_paymemberModal").modal({show : true, backdrop: false, keyboard : false});
+			swal ( "Oops" ,  "Amount should be greater than 0!" ,  "warning" );
 		}
 	});
 
@@ -268,7 +273,7 @@
           success: function(data) {
             if (data.status == true) {
             	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
-            	$("#valid_amount").val(parseFloat(valid_amount));
+            	$("#valid_amount").val((valid_amount > 0) ? parseFloat(valid_amount) : 0);
 
               	$.ajax({
 					type: "POST",
@@ -344,7 +349,7 @@
 	          success: function(data) {
 	            if (data.status == true) {
 	            	var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
-	            	$("#valid_amount").val(parseFloat(valid_amount));
+	            	$("#valid_amount").val((valid_amount > 0) ? parseFloat(valid_amount) : 0);
 
 	              	$.ajax({
 						type: "POST",

From 5535a5db81f584d5a371fa7cbef2adf3d33566e8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 4 Oct 2018 16:47:44 +0630
Subject: [PATCH 60/66] UI changed

---
 app/controllers/origami/dinga_controller.rb   |  14 +-
 app/controllers/origami/paymal_controller.rb  |  14 +-
 .../origami/redeem_payments_controller.rb     |  14 +-
 app/controllers/origami/voucher_controller.rb |   2 +-
 app/views/origami/voucher/index.html.erb      | 139 ++++++++++--------
 5 files changed, 100 insertions(+), 83 deletions(-)

diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
index 55705fce..01e35004 100644
--- a/app/controllers/origami/dinga_controller.rb
+++ b/app/controllers/origami/dinga_controller.rb
@@ -7,13 +7,13 @@ class Origami::DingaController < BaseOrigamiController
      @sale_data = Sale.find_by_sale_id(@sale_id)
      @receipt_no = @sale_data.receipt_no
      @shop        = Shop.first 
-          # 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  
-          @rounding_adj = @sale_data.rounding_adjustment  
+          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  
+          # @rounding_adj = @sale_data.rounding_adjustment  
 
           @payparcount = 0
           others = 0
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index 911d5a24..19645e18 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -7,13 +7,13 @@ class Origami::PaymalController < BaseOrigamiController
      sale_data = Sale.find_by_sale_id(@sale_id)
      @receipt_no = sale_data.receipt_no
      @shop        = Shop.first 
-          # 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  
-          @rounding_adj = sale_data.rounding_adjustment  
+          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  
+          # @rounding_adj = sale_data.rounding_adjustment  
 
           @payparcount = 0
           others = 0
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 708f9f8f..c0edf879 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -7,13 +7,13 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
         @shop        = Shop.first 
-        # 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  
-        @rounding_adj = sale_data.rounding_adjustment  
+        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  
+        # @rounding_adj = sale_data.rounding_adjustment  
 
         @payparcount = 0
         others = 0
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index 515bf3a1..e512a48b 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -1,7 +1,7 @@
 class Origami::VoucherController < BaseOrigamiController
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit voucher_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
diff --git a/app/views/origami/voucher/index.html.erb b/app/views/origami/voucher/index.html.erb
index c8d99c28..cf7a30d9 100755
--- a/app/views/origami/voucher/index.html.erb
+++ b/app/views/origami/voucher/index.html.erb
@@ -1,13 +1,21 @@
+<div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
+  <!-- <div class="page-header">
+    <ol class="breadcrumb">
+      <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
+      <li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
+      <li class="breadcrumb-item active"><%= t("views.btn.unionpay") %></li>
+      <span class="float-right">
+        <%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
+      </span>
+    </ol>
+  </div> -->
+	<div class="row">
 
-<div class="row">
-
-	<div class="col-lg-5 col-md-5 col-sm-3">
-		<div class="row">
-			<div class="col-md-6">
-				<h2>Voucher / Coupon</h2>
-			</div>
-		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
+		<div class="col-lg-5 col-md-5 col-sm-5">
+			<div class="card m-l-10 m-t-10" style="padding:0px 20px;">
 				<div class="rebate-form">
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -42,60 +50,60 @@
 			    	</div>
 		    	</div>
 			</div>
-	</div>
+		</div>
 
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
-
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett" >Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="voucher_pay">Pay</div>
-           </div>
-         </div>
-      </div>
-
-    </div>
-    <input type="hidden" id="sale_id" value="<%= @sale_id %>">
-	<div class="col-lg-1 col-md-1 col-sm-1">
-		<button type="button" class="btn btn-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> Back </button>
+	    <div class="col-lg-6 col-md-6 col-sm-6" style="">
+			<div class=" m-t-10 p-l-20">
+				<div class="row">
+				 <div class="col-lg-6 col-md-6 col-sm-6">
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number " data-value="1" data-type="num">1</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="2" data-type="num">2</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="3" data-type="num">3</div>
+				   </div>
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number  border-left" data-value="4" data-type="num">4</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="5" data-type="num">5</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="6" data-type="num">6</div>
+				   </div>
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number  border-left" data-value="7" data-type="num">7</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="8" data-type="num">8</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="9" data-type="num">9</div>
+				   </div>
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number  border-left" data-value="0" data-type="num">0</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="." data-type="num">.</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="00" data-type="num">00</div>
+				   </div>
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number green border-left" data-type="nett" >Nett</div>
+				     <div class="col-md-4 cashier_number red border-left" data-type="del">Del</div>
+				     <div class="col-md-4 cashier_number orange border-left" data-type="clr">Clr</div>
+				   </div>
+				 </div>
+				 <div class="col-lg-6 col-md-6 col-sm-6">
+				   <div class="row bottom m-l-5">
+				     <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
+				     <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+				   </div>
+				   <div class="row bottom m-l-5">
+				     <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
+				     <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+				   </div>
+				   <div class="row bottom m-l-5">
+				     <div class="pay purple left" id="unionpay_pay">Pay</div>
+				   </div>
+				 </div>
+				</div>
+			</div>
+		</div>
+	    <input type="hidden" id="sale_id" value="<%= @sale_id %>">
+		<div class="col-lg-1 col-md-1 col-sm-1">
+			<button type="button" class="btn bg-default m-t-10 btn-block" id="back"><i class="material-icons m-t--5">reply</i> Back </button>
+		</div>
 	</div>
 </div>
-
 <script>
 $(document).ready(function() {
       	setHeaderBreadCrumb(_VOUCHER_);
@@ -177,5 +185,14 @@ $(document).on('click', '.cashier_number', function(event){
 		}else{
 			alert("Paid Amount is over!");
 		}
-  })
+  });
+
+  $('#back').on('click',function(){
+    var url_param = "payment";
+    if(location.pathname.includes("credit_payment")){
+      url_param = "credit_payment";
+    }
+    window.location.href = '/origami/sale/'+'<%= @sale_id %>'+'/<%= @cashier_type %>/'+url_param;
+      // window.location.href = '/origami/sale/' + sale_id + "/cashier/payment";
+  });
 </script>

From 677c4ac5cb1ffa1b9aeada9fa1a875a38d7d68b6 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 5 Oct 2018 10:22:44 +0630
Subject: [PATCH 61/66] update inventory

---
 config/initializers/action_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 1d8b678e..fb212f13 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -19,7 +19,7 @@ class ActionController::Base
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
     else         
-      check for license file
+      # check for license file
       if check_license
         current_license(ENV["SX_PROVISION_URL"])
       else

From 03fd7c79b846b30bbbcf4d411f0062f5be51eecd Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 8 Oct 2018 17:41:22 +0630
Subject: [PATCH 62/66] food court and Booking ID for order and receipt

---
 README.md                                     |   8 +
 app/assets/javascripts/addorder.js            |  40 +-
 app/assets/javascripts/channels/bill.js       |  22 +-
 app/assets/javascripts/custom.js              |   1 +
 .../origami/addorders_controller.rb           |  14 +-
 .../origami/dashboard_controller.rb           |  10 +
 .../origami/food_court_controller.rb          | 262 ++++++++++
 app/controllers/origami/paymal_controller.rb  | 108 ++--
 .../origami/payments_controller.rb            |   5 +-
 .../origami/pending_order_controller.rb       |  32 +-
 .../origami/quick_service_controller.rb       |   4 +-
 .../origami/request_bills_controller.rb       |   6 +-
 app/controllers/origami/surveys_controller.rb |   2 +-
 app/models/sale.rb                            |   8 +-
 app/pdf/order_item_customise_pdf.rb           |  17 +
 app/pdf/order_item_pdf.rb                     |  19 +-
 app/pdf/order_item_slim_customise_pdf.rb      |  18 +
 app/pdf/order_item_slim_pdf.rb                |  18 +
 app/pdf/order_set_item_customise_pdf.rb       |  18 +
 app/pdf/order_set_item_pdf.rb                 |  36 +-
 app/pdf/order_summary_customise_pdf.rb        |  20 +-
 app/pdf/order_summary_pdf.rb                  |  20 +-
 app/pdf/order_summary_set_customise_pdf.rb    |  18 +
 app/pdf/order_summary_set_pdf.rb              |  18 +
 app/pdf/order_summary_slim_customise_pdf.rb   |  20 +-
 app/pdf/order_summary_slim_pdf.rb             |  18 +
 app/pdf/receipt_bill_a5_pdf.rb                |   7 +-
 app/pdf/receipt_bill_pdf.rb                   |   7 +-
 app/views/origami/addorders/detail.html.erb   |   5 +-
 app/views/origami/cash_ins/new.html.erb       |  18 +-
 app/views/origami/cash_outs/new.html.erb      |  20 +-
 app/views/origami/customers/index.html.erb    |   6 +-
 app/views/origami/dashboard/index.html.erb    |  23 +
 app/views/origami/discounts/index.html.erb    |  10 +-
 .../origami/other_charges/index.html.erb      |   2 +-
 app/views/origami/payments/show.html.erb      | 465 +++++++++++++-----
 .../pending_order/completed_sale.html.erb     |  75 +--
 .../origami/pending_order/index.html.erb      |  26 +-
 app/views/origami/pending_order/show.html.erb |  82 +--
 .../origami/quick_service/index.html.erb      |   0
 app/views/origami/sale_edit/edit.html.erb     |   4 +-
 app/views/origami/surveys/_form.html.erb      |   2 +-
 config/routes.rb                              |  18 +-
 db/seeds.rb                                   |   1 +
 44 files changed, 1155 insertions(+), 378 deletions(-)
 create mode 100644 app/controllers/origami/food_court_controller.rb
 delete mode 100644 app/views/origami/quick_service/index.html.erb

diff --git a/README.md b/README.md
index 0e92142a..2d9d60c9 100755
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ For MoveTablePdf in print settings
 1) settings/lookups => { type:tax_profiles, name: Cashier, value:cashier }
 2) settings/lookups => { type:tax_profiles, name: Quick Service, value: quick_service }
 3) settings/lookups => { type:tax_profiles, name: Doemal, value: doemal }
+4) settings/lookups => { type:tax_profiles, name: Food Court, value: food_court }
 /* Tax Profile Group Types in lookups */
 
 /*Receipt Pdf View in lookups */
@@ -261,6 +262,13 @@ For Food Court Settings On/Off
 	** '0' means can not use food court and '1' means can use food court **
 	=> settings/lookups => { type:food_court, name: FoodCourt, value:'{0 or 1}' }
 
+/* Customer Types in lookups */
+1) settings/lookups => { type:customer_type, name: Dinein, value:Dinein }
+2) settings/lookups => { type:customer_type, name: Takeaway, value: Takeaway }
+3) settings/lookups => { type:customer_type, name: Doemal, value: Doemal }
+4) settings/lookups => { type:customer_type, name: FoodCourt, value: FoodCourt }
+/* Tax Profile Group Types in lookups */
+
 * ToDo list
 
 1. Migration
diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index d7c176ab..1c6acf1b 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -2,7 +2,7 @@ $(function() {
   var role = $('#role').val();
   var second_display_lookup = $("#display_type");
   console.log(second_display_lookup)
-  type = window.location.href.indexOf("quick_service");
+  type = window.location.href.indexOf("quick_service") || window.location.href.indexOf("food_court");
   modify_order = window.location.href.indexOf("modify_order");
   
   //click menu sidebar menu category
@@ -146,7 +146,7 @@ $(function() {
       }
     }else{
 
-      type = window.location.href.indexOf("quick_service");
+      type = window.location.href.indexOf("quick_service") || window.location.href.indexOf("food_court");
       modify_order = window.location.href.indexOf("modify_order");
       
       if (type != -1 && modify_order != -1) {
@@ -155,7 +155,7 @@ $(function() {
         url_item = 'addorders/'+url_item;
       }
       if (type ==-1 && modify_order == -1){
-        url_item = url_item
+        url_item = url_item;
       }
 
       //Start Ajax
@@ -241,7 +241,7 @@ $(function() {
             }
           }
         }else{
-          type = window.location.href.indexOf("quick_service");
+          type = window.location.href.indexOf("quick_service") || window.location.href.indexOf("food_court");
          modify_order = window.location.href.indexOf("modify_order");
           if (type != -1 && modify_order != -1) {
             url = '../../../addorders/get_item_instance/'+value[i]["id"];
@@ -848,17 +848,18 @@ $(function() {
     $(this).attr('disabled', 'disabled');
     e.preventDefault();
     $("#oqs_loading_wrapper").show();
-    
+    var cashier_type = $("#link_type").val();
     quick_service = window.location.href.indexOf("quick_service");
-    if (quick_service != -1) {
-      type = 'quick_service'
+    food_court = window.location.href.indexOf("food_court");
+    if (quick_service != -1 || food_court != -1) {
+      type = cashier_type;
       var table_type  = $('#table_type').text();
       var table_id    = $('#table_id').val();
       var customer_id = $('#customer_id').val();
       var booking_id  = $('#booking_id').text();
       var ajax_url = 'addorders/create';
     }else{
-      type = 'cashier'
+      type = 'cashier';
       var table_type  = $('#table_type').text();
       var table_id    = $('#table_id').text();
       var customer_id = $('#customer_id').text();
@@ -886,14 +887,14 @@ $(function() {
           data: params,
           dataType: "json",
            success:function(result){ 
-              if (type == "quick_service") {
-                   window.location.href = "/origami/quick_service"
+              if (type == "quick_service" || type=="food_court") {
+                   window.location.href = "/origami/"+type;
               }else{
                 if(table_type == "Table"){
-                   window.location.href = "/origami/table/" + table_id
+                   window.location.href = "/origami/table/" + table_id;
                 }
                 else {
-                   window.location.href = "/origami/room/" + table_id
+                   window.location.href = "/origami/room/" + table_id;
                 } 
               }
               if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){
@@ -914,11 +915,11 @@ $(function() {
   $("#create_pay_order").on('click', function(e){
     $(this).attr('disabled', 'disabled');
     e.preventDefault();
-    type = "quick_service"
+    type = $("#link_type").val();
     modify_order = window.location.href.indexOf("modify_order");
     $("#oqs_loading_wrapper").show();
       if (modify_order !=-1) {
-        var ajax_url   = '../../../quick_service/update_modify_order';
+        var ajax_url   = '../../../'+type+'/update_modify_order';
         var table_type = $('#table_type').text();
         var table_id    = $('#table_id').text();
         var customer_id = $('#customer_id').text();
@@ -962,13 +963,13 @@ $(function() {
                   confirmButtonText: "Ok",
                   closeOnConfirm: false
               }, function () {
-                 window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+                 window.location.href = '/origami/'+type+'/pending_order/' + $('#sale_id').text();
               });
 
             }else if(result.data == 'OK'){
-              window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+              window.location.href = '/origami/'+type+'/pending_order/' + $('#sale_id').text();
             }else{
-              window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
+              window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment";
             }
           }
        } 
@@ -1096,13 +1097,14 @@ $(function() {
   $("#back").on("click", function(){
     var table_id   = $('#table_id').text();
     var table_type = $('#table_type').text();
-    type = window.location.href.includes("quick_service");
+    var cashier_type = $("#link_type").val();
+    type = window.location.href.includes("quick_service") || window.location.href.includes("food_court");
     if (type == true) {
       var table_type = $('#table_id').find("option:selected").data('type');
       var table_id    = $('#table_id').val();
       if(window.location.href.includes("modify_order")){
         var link_url = window.location.href.split("/");
-        window.location.href = "/origami/quick_service/pending_order/"+link_url[link_url.length - 1];
+        window.location.href = "/origami/"+cashier_type+"/pending_order/"+link_url[link_url.length - 1];
       }else{
         window.location.href = "/origami/dashboard";
       }
diff --git a/app/assets/javascripts/channels/bill.js b/app/assets/javascripts/channels/bill.js
index 278e3d41..f551c103 100755
--- a/app/assets/javascripts/channels/bill.js
+++ b/app/assets/javascripts/channels/bill.js
@@ -9,16 +9,18 @@ App.order = App.cable.subscriptions.create('BillChannel', {
     var hostname = location.hostname.trim();
     if(data.from == "" || hostname == data.from)
     {
-    	if($('.table_'+data.table.id).hasClass('blue')){
-        $('.table_'+data.table.id).removeClass('blue');
-        $('.table_'+data.table.id).removeClass('green');
-        $('.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');
-      $('.new_text_'+data.table.id).text('billed');
+      if(data.table != undefined && data.table != null && data.table!=""){
+        if($('.table_'+data.table.id).hasClass('blue')){
+          $('.table_'+data.table.id).removeClass('blue');
+          $('.table_'+data.table.id).removeClass('green');
+          $('.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');
+        $('.new_text_'+data.table.id).text('billed');
+      }
     }
  }
 });
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 3843f297..6aeace1e 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -228,6 +228,7 @@ function getOnlineOrderCount(){
     url: "/origami/get_order_info",
     dataType: "json",
     success: function(data){
+      console.log(data);
       if(parseInt(data) > 0){
         count = parseInt(data);
       }
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 025da23c..35d2a534 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -14,6 +14,7 @@ class Origami::AddordersController < BaseOrigamiController
   end
 
   def detail
+    @cashier_type = params[:type]
     @webview = false
     if check_mobile
       @webview = true  
@@ -194,7 +195,7 @@ class Origami::AddordersController < BaseOrigamiController
          
         end
 
-        if params[:order_source] != "quick_service"
+        if params[:order_source] != "quick_service" && params[:order_source] != "food_court"
           process_order_queue(@order.order_id,@order.table_id,@order.source)
         end    
       end  
@@ -202,13 +203,16 @@ class Origami::AddordersController < BaseOrigamiController
       # Order.send_customer_view(@booking)
     
       if current_user.role != "waiter" && params[:create_type] == "create_pay"
-        if @status && @booking && @order.source == 'quick_service'
+        if @status && @booking && (@order.source == 'quick_service') || (@order.source == 'food_court')
         
           @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
+          
           # for second display 
-          from = getCloudDomain #get sub domain in cloud mode
-          ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale",from:from          
-           #end
+          if @order.source == 'quick_service'
+            from = getCloudDomain #get sub domain in cloud mode
+            ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale",from:from          
+          end
+          #end
           result = {:status=> @status, :data => @sale }
           render :json => result.to_json
         end
diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb
index 4d53cc15..08557cd6 100644
--- a/app/controllers/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -59,6 +59,16 @@ class Origami::DashboardController < BaseOrigamiController
     if !quick_service[0].nil?
       @quick_service = quick_service[0][1]
     end
+
+    #fourt court
+    food_court = Lookup.collection_of('food_court')
+    @food_court = 0
+    @food_court_name = nil
+    if !food_court[0].nil?
+      @food_court = food_court[0][1]
+      @food_court_name = food_court[0][0]
+    end
+
     #order reservation
     order_reservation = Lookup.collection_of('order_reservation')
     @order_reservation = 0
diff --git a/app/controllers/origami/food_court_controller.rb b/app/controllers/origami/food_court_controller.rb
new file mode 100644
index 00000000..857da01f
--- /dev/null
+++ b/app/controllers/origami/food_court_controller.rb
@@ -0,0 +1,262 @@
+class Origami::FoodCourtController < ApplicationController
+  # before_action :set_dining, only: [:detail]
+   before_action :check_user
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  
+  def index
+    today = DateTime.now
+    day = Date.today.wday
+     # if params[:menu] == "true"
+     @menus    = []
+     @menu     = []
+   # else
+   #    @menus    = Menu.all   
+   #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+   # end
+    @zone     = Zone.all
+    @customer = Customer.all
+    @tables   = Table.all.active.order('status desc')
+    @rooms    = Room.all.active.order('status desc')
+    @cashier_type = "food_court"
+    #checked quick_service only
+    @quick_service_only = true
+    lookup_dine_in = Lookup.collection_of('dinein_cashier')
+    if !lookup_dine_in.empty?
+      lookup_dine_in.each do |dine_in|
+        if dine_in[0].downcase == "dineincashier" 
+          if dine_in[1] == '1' 
+            @quick_service_only = false
+          end
+        end
+      end
+    end
+    
+    render "origami/addorders/detail"
+  end
+
+  def modify_order
+    @cashier_type = "food_court"
+    today = DateTime.now
+    day = Date.today.wday
+     # if params[:menu] == "true"
+     @menus    = []
+     @menu     = []
+   # else
+   #    @menus    = Menu.all   
+   #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+   # end
+    if(params[:id][0,3] == "BKI")
+      @table_id = nil
+      @table = nil
+      @booking = Booking.find(params[:id])
+    else
+      @table_id = params[:id]
+      @table = DiningFacility.find(@table_id)
+      @booking = @table.get_booking
+    end
+    
+    @sale_id = params[:sale_id]
+
+    if @booking
+      @booking_id = @booking.booking_id
+      @order_items = Array.new
+      @booking.booking_orders.each do |booking_order|
+        order = Order.find(booking_order.order_id)
+        if (order.status == "new")
+          @obj_order = order
+          @customer = order.customer
+          @date = order.created_at
+          order.order_items.each do |item|
+            @order_items.push(item)
+          end
+        end
+      end
+    else
+      @booking = nil
+    end
+     render "origami/addorders/detail"
+  end
+
+  def update_modify_order
+    Rails.logger.debug "Order Source - " + params[:order_source].to_s
+    Rails.logger.debug "Table ID - " + params[:table_id].to_s
+    is_extra_time = false
+    extra_time = ''
+    @cashier_type = "food_court"
+
+    items_arr = []
+    JSON.parse(params[:order_items]).each { |i| 
+      i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+       if i["item_instance_code"].include? "ext"
+         is_extra_time = true
+         arr_exts = i["item_instance_code"].split("_")
+         if arr_exts[1].match(/^(\d)+$/)
+          time = arr_exts[1].to_i*60*i["quantity"].to_i
+          extra_time = Time.at(time)
+         end
+       end
+       if i["parent_order_item_id"]
+         items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"parent_order_item_id": i["parent_order_item_id"],"options": i["options"]}
+       else
+        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
+       end
+       items_arr.push(items)
+     }
+
+    # begin
+    @order = Order.new
+    @order.source = params[:order_source]
+    @order.order_type = params[:order_type]
+    @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    @order.items = items_arr
+    @order.guest = params[:guest_info]
+    @order.table_id = params[:table_id]  # this is dining facilities's id
+    @order.new_booking = true
+    @order.waiters = current_login_employee.name
+    @order.employee_name = current_login_employee.name
+
+    @order.is_extra_time = is_extra_time
+    @order.extra_time    = extra_time
+
+      #Create Table Booking or Room Booking
+      if !params["booking_id"].nil?
+          # check booking id is already completed.
+          booking = Booking.find(params[:booking_id])
+          if params[:table_id].to_i > 0
+            table_status = booking.dining_facility_id.to_i == params[:table_id].to_i
+          else
+            table_status = true
+          end
+          if booking
+              if table_status && booking.booking_status != 'moved'
+                if !booking.sale_id.nil?
+                  sale_status = check_order_with_booking(booking)
+                  if sale_status
+                    return return_json_status_with_code(400, "bill requested")
+                  end
+                else
+                  @order.new_booking = false
+                  @order.booking_id = params[:booking_id]
+                end
+              else
+                if params[:table_id].to_i > 0
+                  sale_status = check_order_with_table(params[:table_id])
+                  if sale_status
+                    return return_json_status_with_code(400, "bill requested")
+                  end
+                end
+              end
+          end #booking exists
+      else
+        if params[:table_id].to_i > 0
+          sale_status = check_order_with_table(params[:table_id])
+          if sale_status
+            # return false , @message = "bill requested"
+            return return_json_status_with_code(400, "bill requested")
+          end
+        end
+      end
+
+      @status, @booking = @order.generate
+      if(params[:sale_id][0,3] == "SAL") 
+        if @status && @booking && (@order.source == 'quick_service' || @order.source == 'food_court')
+          if params[:sale_id]
+            @sale = Sale.find(params[:sale_id])
+            if @order.table_id.to_i > 0
+              @table_id = @order.table_id
+            else
+              @table_id = nil
+            end
+            update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking)
+          end
+          
+          result = {:status=> true, :data => @sale }
+          render :json => result.to_json
+        end  
+      elsif (params[:sale_id][0,3] == "BKI")
+         result = {:status=> true, :data => 'OK' }
+          render :json => result.to_json 
+      else
+        result = {:status=> true, :data => nil }
+        render :json => result.to_json
+      end 
+
+  end
+
+  def get_menu_category ()
+    if (params[:id])
+      puts params[:id]
+      #Pull this menu
+      @menu = MenuCategory.find_by_id(params[:id])
+      # puts @menu.menu_items[1].item_attributes.to_json
+      return @menu
+    else
+      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   
+  end
+
+  # render json for http status code
+  def return_json_status_with_code(code, msg)
+    render status: code, json: {
+      message: msg,
+      booking_id: booking_id
+    }.to_json
+  end
+
+  def check_order_with_table(table_id)
+    table =  DiningFacility.find(table_id)
+    if table
+       booking = table.get_current_booking
+       # puts booking
+       if booking
+        if !booking.sale_id.nil?
+          if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new"
+           @order.new_booking = true
+           return false
+          end
+        else
+           @order.new_booking = false
+           @order.booking_id = booking.booking_id
+           return false
+         end
+       end
+    end
+  end
+
+  def check_user
+    if current_user.nil?
+      redirect_to root_path
+    end
+  end
+  # this can always true
+  def check_order_with_booking(booking)
+    if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new"
+      @order.new_booking = true
+      return false
+    else
+      @order.new_booking = false
+      @order.booking_id = params[:booking_id]
+      return false
+    end
+  end
+
+end
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index 19645e18..36c19327 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -1,68 +1,66 @@
 class Origami::PaymalController < BaseOrigamiController
  def index
-     @sale_id = params[:sale_id]
-     payment_method = params[:payment_method]
-     @cashier_type   = params[:type]
-     @membership_rebate_balance=0
-     sale_data = Sale.find_by_sale_id(@sale_id)
-     @receipt_no = sale_data.receipt_no
-     @shop        = Shop.first 
-          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  
-          # @rounding_adj = sale_data.rounding_adjustment  
+  @sale_id = params[:sale_id]
+  payment_method = params[:payment_method]
+  @cashier_type   = params[:type]
+  @membership_rebate_balance=0
+  sale_data = Sale.find_by_sale_id(@sale_id)
+  @receipt_no = sale_data.receipt_no
+  @shop        = Shop.first 
+  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  
+  # @rounding_adj = sale_data.rounding_adjustment  
 
-          @payparcount = 0
-          others = 0
-          sale_data.sale_payments.each do |sale_payment|
-            if sale_payment.payment_method == "paypar"
-              @payparcount = @payparcount + sale_payment.payment_amount
+  @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
+  @payment_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 = nil
+              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
-              others = others + sale_payment.payment_amount
+              @out =false,0
             end
-          end
-          @payment_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 = nil
-                 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
+          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
   else
     @out = false, 0
   end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 7294eb80..bade57a0 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -271,7 +271,8 @@ class Origami::PaymentsController < BaseOrigamiController
     end
     
     @member_discount = MembershipSetting.find_by_discount(1)
-    
+    @membership_rebate_balance=0
+
     if Sale.exists?(sale_id)
       @cash = 0.0
       @other = 0.0
@@ -399,6 +400,8 @@ class Origami::PaymentsController < BaseOrigamiController
 
       #end customer amount
 
+      #paymal payment 
+
       @sale_data.bookings.each do |sbk|
         if sbk.dining_facility_id.to_i >0
           df = DiningFacility.find(sbk.dining_facility_id)
diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb
index f66c4017..20b3f6f7 100644
--- a/app/controllers/origami/pending_order_controller.rb
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -2,17 +2,21 @@ class Origami::PendingOrderController < BaseOrigamiController
   def index
     # @dining= DiningFacility.where("status = 'occupied'")
     # @order = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status = 'billed' and source = 'quick_service'",DateTime.now.strftime('%Y-%m-%d'))
-    @sale = Sale.pending_sale
-    @order = Sale.pending_order
-    @completed = Sale.completed_sale("quick_service")
+    @cashier_type = params[:type]
+    @sale = Sale.pending_sale(@cashier_type)
+    @order = Sale.pending_order(@cashier_type)
+    @completed = Sale.completed_sale(@cashier_type)
     @customers = Customer.pluck("customer_id, name")
     
     @occupied_table = @sale.count.length + @order.count.length
+    
   end
+
   def show
-    @sales  = Sale.pending_sale
-    @orders = Sale.pending_order
-    @completed = Sale.completed_sale("quick_service")
+    @cashier_type = params[:type]
+    @sales  = Sale.pending_sale(@cashier_type)
+    @orders = Sale.pending_order(@cashier_type)
+    @completed = Sale.completed_sale(@cashier_type)
     @customers = Customer.pluck("customer_id, name")
 
     @occupied_table = @sales.count.length + @orders.count.length
@@ -51,9 +55,10 @@ class Origami::PendingOrderController < BaseOrigamiController
   end
 
   def completed_sale
-    @sales     = Sale.pending_sale
-    @orders    = Sale.pending_order
-    @completed = Sale.completed_sale("quick_service")
+    @cashier_type = params[:type]
+    @sales     = Sale.pending_sale(@cashier_type)
+    @orders    = Sale.pending_order(@cashier_type)
+    @completed = Sale.completed_sale(@cashier_type)
     @customers = Customer.pluck("customer_id, name")
 
     @occupied_table = @sales.count.length + @orders.count.length
@@ -76,16 +81,19 @@ class Origami::PendingOrderController < BaseOrigamiController
   end
 
   def cash_ins
+    @cashier_type = params[:type]
     render "origami/cash_ins/new"
   end
   def cash_outs
+    @cashier_type = params[:type]
     render "origami/cash_outs/new"
   end
 
   def credit_sale
-    @sales     = Sale.pending_sale
-    @orders    = Sale.pending_order
-    @completed = Sale.completed_sale("quick_service")
+    @cashier_type = params[:type]
+    @sales     = Sale.pending_sale(@cashier_type)
+    @orders    = Sale.pending_order(@cashier_type)
+    @completed = Sale.completed_sale(@cashier_type)
 
     @occupied_table = @sales.count.length + @orders.count.length
     
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 1924f33e..85d09486 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -21,7 +21,7 @@ class Origami::QuickServiceController < ApplicationController
     @customer = Customer.all
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
-
+    @cashier_type = "quick_service"
     #checked quick_service only
     @quick_service_only = true
     lookup_dine_in = Lookup.collection_of('dinein_cashier')
@@ -39,6 +39,7 @@ class Origami::QuickServiceController < ApplicationController
   end
 
   def modify_order
+    @cashier_type = "quick_service"
     today = DateTime.now
     day = Date.today.wday
      # if params[:menu] == "true"
@@ -85,6 +86,7 @@ class Origami::QuickServiceController < ApplicationController
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
     is_extra_time = false
     extra_time = ''
+    @cashier_type = "quick_service"
 
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 6d57904e..617e5c35 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -62,8 +62,10 @@ class Origami::RequestBillsController < ApplicationController
         from = ""
       end
 
-      ActionCable.server.broadcast "bill_channel",table: table, from: from      
-      if order.source == "quick_service"
+      if order.source == "cashier" || order.source == "quick_service"
+        ActionCable.server.broadcast "bill_channel",table: table, from: from
+      end
+      if order.source == "quick_service" || order.source == "food_court"
         result = {:status=> @status, :data => @sale.sale_id }
         render :json => result.to_json
       else
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 222a3a88..700159bb 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -64,7 +64,7 @@ class Origami::SurveysController < BaseOrigamiController
 		  shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(shift.cashier_terminal_id,nil)
 		end
 		
-		if @type == "quick_service"
+		if @type == "quick_service" || @type == "food_court"
 			@url = "/origami/sale/"+@sale_id+"/"+@type+"/payment"
 		else
 			@url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id]
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 4890aadf..c772516d 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -2889,18 +2889,18 @@ end
       end
   end
 
-  def self.pending_sale
+  def self.pending_sale(type)
     query = Sale.all
     query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
                  .joins("join orders as orders on orders.order_id = sale_orders.order_id")
-    query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
+    query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","#{type}")
                   .group("sales.sale_id")
   end
-  def self.pending_order
+  def self.pending_order(type)
     query = Booking.all
     query = query.joins("join booking_orders as booking_orders on booking_orders.booking_id = bookings.booking_id")
                  .joins("join orders as orders on orders.order_id = booking_orders.order_id")
-    query = query.where("bookings.booking_status = 'assign' AND orders.status = 'new' AND orders.source =? ","quick_service")
+    query = query.where("bookings.booking_status = 'assign' AND orders.status = 'new' AND orders.source =? ","#{type}")
                   .group("bookings.booking_id")
   end
   def self.completed_sale(type)
diff --git a/app/pdf/order_item_customise_pdf.rb b/app/pdf/order_item_customise_pdf.rb
index dde79917..dcd45ebd 100644
--- a/app/pdf/order_item_customise_pdf.rb
+++ b/app/pdf/order_item_customise_pdf.rb
@@ -52,6 +52,15 @@ class OrderItemCustomisePdf < Prawn::Document
 
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)  
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :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 "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left    
@@ -142,4 +151,12 @@ class OrderItemCustomisePdf < Prawn::Document
         end
     end
 
+    def get_booking_id(order_no)
+        booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+                .joins(" JOIN orders o ON o.order_id=bo.order_id")
+                .where("o.order_id='#{order_no}'")
+                .first()
+
+        return booking.booking_id
+    end
 end
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index c3bf566f..086447db 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -50,7 +50,16 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Write Order Information to PDF
-  def order_info(order_no, order_by, order_at)  
+  def order_info(order_no, order_by, order_at) 
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 2
     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    
@@ -141,4 +150,12 @@ class OrderItemPdf < Prawn::Document
     end
   end
 
+  def get_booking_id(order_no)
+    booking = Order.joins(" JOIN booking_orders bo ON bo.order_id = orders.order_id")
+            .joins(" JOIN bookings b ON b.booking_id=bo.booking_id")
+            .where("orders.order_id='#{order_no}'")
+            .first() 
+
+    return booking.booking_id
+  end
 end
diff --git a/app/pdf/order_item_slim_customise_pdf.rb b/app/pdf/order_item_slim_customise_pdf.rb
index a63900a6..f2a67eb0 100644
--- a/app/pdf/order_item_slim_customise_pdf.rb
+++ b/app/pdf/order_item_slim_customise_pdf.rb
@@ -52,6 +52,15 @@ class OrderItemSlimCustomisePdf < Prawn::Document
 
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)  
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :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 "OrderNo: #{order_no} ", :size => self.item_slim_font_size,:align => :left    
@@ -141,4 +150,13 @@ class OrderItemSlimCustomisePdf < Prawn::Document
             end
         end
     end
+
+    def get_booking_id(order_no)
+        booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+                .joins(" JOIN orders o ON o.order_id=bo.order_id")
+                .where("o.order_id='#{order_no}'")
+                .first()
+
+        return booking.booking_id
+    end
 end
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index 92158663..5db7e78a 100755
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -51,6 +51,15 @@ class OrderItemSlimPdf < Prawn::Document
 
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)  
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :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 "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
@@ -140,4 +149,13 @@ class OrderItemSlimPdf < Prawn::Document
     end
   end
 
+  def get_booking_id(order_no)
+    booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+            .joins(" JOIN orders o ON o.order_id=bo.order_id")
+            .where("o.order_id='#{order_no}'")
+            .first()
+
+    return booking.booking_id
+  end
+
 end
diff --git a/app/pdf/order_set_item_customise_pdf.rb b/app/pdf/order_set_item_customise_pdf.rb
index 2f985c5f..7cdea13a 100644
--- a/app/pdf/order_set_item_customise_pdf.rb
+++ b/app/pdf/order_set_item_customise_pdf.rb
@@ -51,6 +51,15 @@ class OrderSetItemCustomisePdf < Prawn::Document
 
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)  
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :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 "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left    
@@ -157,4 +166,13 @@ class OrderSetItemCustomisePdf < Prawn::Document
         end
     end
 
+    def get_booking_id(order_no)
+        booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+                .joins(" JOIN orders o ON o.order_id=bo.order_id")
+                .where("o.order_id='#{order_no}'")
+                .first()
+
+        return booking.booking_id
+    end
+
 end
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 14a8ff62..1e9ca6cd 100755
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -50,6 +50,15 @@ class OrderSetItemPdf < Prawn::Document
 
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)  
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 2
     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    
@@ -143,17 +152,26 @@ class OrderSetItemPdf < Prawn::Document
 
   end
 
-  #add updated qty text
-  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
-    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
-        move_down 5
+    #add updated qty text
+    def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+        if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+            move_down 5
 
-        # add option
-        y_position = cursor
-        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :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 "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+            end
         end
     end
-  end
+
+    def get_booking_id(order_no)
+        booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+                .joins(" JOIN orders o ON o.order_id=bo.order_id")
+                .where("o.order_id='#{order_no}'")
+                .first()
+
+        return booking.booking_id
+    end
 
 end
diff --git a/app/pdf/order_summary_customise_pdf.rb b/app/pdf/order_summary_customise_pdf.rb
index 30a32117..a5b39dd9 100644
--- a/app/pdf/order_summary_customise_pdf.rb
+++ b/app/pdf/order_summary_customise_pdf.rb
@@ -55,7 +55,16 @@ class OrderSummaryCustomisePdf < Prawn::Document
   end
 
   # Write Order Information to PDF
-  def order_info(order_no, order_by, order_at)    
+  def order_info(order_no, order_by, order_at)  
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :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 "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left    
@@ -144,4 +153,13 @@ class OrderSummaryCustomisePdf < Prawn::Document
       # end
     end        
   end
+
+  def get_booking_id(order_no)
+      booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+              .joins(" JOIN orders o ON o.order_id=bo.order_id")
+              .where("o.order_id='#{order_no}'")
+              .first()
+
+      return booking.booking_id
+  end
 end
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 5feb337e..e1d7e17d 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -54,7 +54,16 @@ class OrderSummaryPdf < Prawn::Document
   end
 
   # Write Order Information to PDF
-  def order_info(order_no, order_by, order_at)    
+  def order_info(order_no, order_by, order_at) 
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 5   
     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    
@@ -154,4 +163,13 @@ class OrderSummaryPdf < Prawn::Document
       # end
     end        
   end
+
+  def get_booking_id(order_no)
+    booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+            .joins(" JOIN orders o ON o.order_id=bo.order_id")
+            .where("o.order_id='#{order_no}'")
+            .first()
+
+    return booking.booking_id
+  end
 end
diff --git a/app/pdf/order_summary_set_customise_pdf.rb b/app/pdf/order_summary_set_customise_pdf.rb
index 5f12fc4c..e2d22891 100644
--- a/app/pdf/order_summary_set_customise_pdf.rb
+++ b/app/pdf/order_summary_set_customise_pdf.rb
@@ -55,6 +55,15 @@ class OrderSummarySetCustomisePdf < Prawn::Document
 
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)    
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :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 "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left    
@@ -159,4 +168,13 @@ class OrderSummarySetCustomisePdf < Prawn::Document
       # end
     end        
   end
+
+  def get_booking_id(order_no)
+    booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+            .joins(" JOIN orders o ON o.order_id=bo.order_id")
+            .where("o.order_id='#{order_no}'")
+            .first()
+
+    return booking.booking_id
+  end
 end
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
index 316bbe44..d07f7afe 100755
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -54,6 +54,15 @@ class OrderSummarySetPdf < Prawn::Document
 
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)    
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 5   
     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    
@@ -169,4 +178,13 @@ class OrderSummarySetPdf < Prawn::Document
       # end
     end        
   end
+
+  def get_booking_id(order_no)
+    booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+            .joins(" JOIN orders o ON o.order_id=bo.order_id")
+            .where("o.order_id='#{order_no}'")
+            .first()
+
+    return booking.booking_id
+  end
 end
diff --git a/app/pdf/order_summary_slim_customise_pdf.rb b/app/pdf/order_summary_slim_customise_pdf.rb
index 2b7402af..8225c0c3 100644
--- a/app/pdf/order_summary_slim_customise_pdf.rb
+++ b/app/pdf/order_summary_slim_customise_pdf.rb
@@ -54,7 +54,16 @@ class OrderSummarySlimCustomisePdf < Prawn::Document
   end
 
   # Write Order Information to PDF
-  def order_info(order_no, order_by, order_at)    
+  def order_info(order_no, order_by, order_at)   
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :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 "OrderNo: #{order_no} ", :size => self.item_slim_font_size,:align => :left    
@@ -145,4 +154,13 @@ class OrderSummarySlimCustomisePdf < Prawn::Document
       # end
     end        
   end
+
+  def get_booking_id(order_no)
+    booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+            .joins(" JOIN orders o ON o.order_id=bo.order_id")
+            .where("o.order_id='#{order_no}'")
+            .first()
+
+    return booking.booking_id
+  end
 end
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
index 1e93fc0d..8f60c711 100755
--- a/app/pdf/order_summary_slim_pdf.rb
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -54,6 +54,15 @@ class OrderSummarySlimPdf < Prawn::Document
 
   # Write Order Information to PDF
   def order_info(order_no, order_by, order_at)    
+    #booking ID
+    booking_id = get_booking_id(order_no)
+
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Booking: #{booking_id}", :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 "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
@@ -152,4 +161,13 @@ class OrderSummarySlimPdf < Prawn::Document
       # end
     end        
   end
+
+  def get_booking_id(order_no)
+    booking = Booking.joins(" JOIN booking_orders bo ON bo.booking_id = bookings.booking_id")
+            .joins(" JOIN orders o ON o.order_id=bo.order_id")
+            .where("o.order_id='#{order_no}'")
+            .first()
+
+    return booking.booking_id
+  end
 end
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index f32c1009..579c6ff8 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -118,12 +118,17 @@ class ReceiptBillA5Pdf < Prawn::Document
   end
 
   def cashier_info(sale_data, customer_name, latest_order_no)
+        move_down line_move
+        text "Booking : #{ sale_data.bookings[0].booking_id }", :size => self.header_font_size+5,:align => :left
+        move_down line_move
+
         move_down line_move
         if !latest_order_no.nil?
             move_down line_move
-            text "OrderNo : #{ latest_order_no }", :size => self.header_font_size,:align => :left
+            text "OrderNo : #{ latest_order_no }", :size => self.header_font_size+2,:align => :left
         end
         move_down line_move
+        
         # move_down 2
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index e3fb259b..9dd3faeb 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -118,12 +118,17 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     def cashier_info(sale_data, customer_name, latest_order_no)
+        move_down line_move
+        text "Booking : #{ sale_data.bookings[0].booking_id }", :size => self.header_font_size+2,:align => :left
+        move_down line_move
+
         move_down line_move
         if !latest_order_no.nil?
             move_down line_move
-            text "OrderNo : #{ latest_order_no }", :size => self.header_font_size,:align => :left
+            text "OrderNo : #{ latest_order_no }", :size => self.header_font_size+2,:align => :left
         end
         move_down line_move
+        
         # move_down 2
         y_position = cursor
         bounding_box([0,y_position], :width =>self.description_width + self.price_num_width, :height => self.item_height) do
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index a553c018..50f25902 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -2,7 +2,7 @@
 <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> 
 
 
-<% type = request.path_info.include?('quick_service')%>
+<% type = request.path_info.include?('quick_service') || request.path_info.include?('food_court')%>
 <% modify_order = request.path_info.include?('modify_order')%>
 
 <div class="container-fluid " style="padding:0px 3px 0px 3px;">
@@ -11,6 +11,7 @@
   </div>
   <input type="hidden" name="type" id="role" value="<%= current_user.role%>">
   <input type="hidden" name="cashier_type" id="cashier_type" value="<%= type%>">
+  <input type="hidden" name="link_type" id="link_type" value="<%= @cashier_type %>">
   <input type="hidden" name="display_type" id="display_type" value="<%= @display_type%>">
   <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data"> 
@@ -650,7 +651,7 @@
             });
 
             $('#pending_order').on('click', function () {
-             window.location.href = '/origami/quick_service/pending_order';
+             window.location.href = '/origami/'+'<%= @cashier_type %>'+'/pending_order';
            });
 
             $(document).on('click', '.menu_click', function(event){
diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb
index 1297249b..5b23656e 100755
--- a/app/views/origami/cash_ins/new.html.erb
+++ b/app/views/origami/cash_ins/new.html.erb
@@ -56,7 +56,7 @@
 </div>
 
 <script>
-   cashier_type   = window.location.href.indexOf("quick_service");
+   cashier_type   = '<%= @cashier_type %>';
     console.log(cashier_type)
 
   var payment_method = "";
@@ -83,19 +83,19 @@
       url: "<%= origami_cash_ins_path %>",
       data: "reference="+ reference + "&remark=" + remark + "&amount="+ amount + "&payment_method="+payment_method + "&payment_method_reference="+ payment_method_reference,
       success:function(result){
-        if (cashier_type == -1) {
-          window.location.href = '/origami';
+        if (cashier_type == 'quick_service' || cashier_type == 'food_court') {
+          window.location.href = '/origami/'+cashier_type+'/pending_order';
         }else{
-          window.location.href = '/origami/quick_service/pending_order';
+          window.location.href = '/origami';
         }
       }
     });
   })
   $('#back').on('click',function(){
-   if (cashier_type == -1) {
-          window.location.href = '/origami';
-        }else{
-          window.location.href = '/origami/quick_service/pending_order';
-        }
+    if (cashier_type == 'quick_service' || cashier_type == 'food_court') {
+      window.location.href = '/origami/'+cashier_type+'/pending_order';
+    }else{
+      window.location.href = '/origami';
+    }
  })
 </script>
diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb
index 32f43099..ea83b2e0 100755
--- a/app/views/origami/cash_outs/new.html.erb
+++ b/app/views/origami/cash_outs/new.html.erb
@@ -25,7 +25,7 @@
   </div>
 </div>
 <script>
- cashier_type   = window.location.href.indexOf("quick_service");
+ cashier_type   = '<%= @cashier_type %>';
   $('#cash_out').on('click',function(){
     var reference = $('#reference').val();
     var remark = $('#remark').val();
@@ -34,22 +34,20 @@
       url: "<%= origami_cash_outs_path %>",
       data: "reference="+ reference + "&remark=" + remark + "&amount="+ amount,
       success:function(result){
-       
-        if (cashier_type == -1) {
-          window.location.href = '/origami';
+        if (cashier_type == 'quick_service' || cashier_type == 'food_court') {
+          window.location.href = '/origami/'+cashier_type+'/pending_order';
         }else{
-          window.location.href = '/origami/quick_service/pending_order';
+          window.location.href = '/origami';
         }
       }
     });
   })
 
   $('#back').on('click',function(){
-    cashier_type   = window.location.href.indexOf("quick_service");
-        if (cashier_type == -1) {
-          window.location.href = '/origami';
-        }else{
-          window.location.href = '/origami/quick_service/pending_order';
-        }
+    if (cashier_type == 'quick_service' || cashier_type == 'food_court') {
+      window.location.href = '/origami/'+cashier_type+'/pending_order';
+    }else{
+      window.location.href = '/origami';
+    }
   })
 </script>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 968f8d12..585ee33f 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -120,7 +120,7 @@
                <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
                <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
                <input type="hidden" id="table_type" name="table_type" value="<%= @dining_facility.type %>" />
-              <% elsif @cashier_type == 'quick_service' %>
+              <% elsif @cashier_type == 'quick_service' || @cashier_type == "food_court" %>
                 <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
                 <input type="hidden" id="type" name="type" value="<%= @cashier_type %>" />
                 <input type="hidden" id="page" name="page" value="<%= @page %>" />
@@ -643,7 +643,7 @@
             <% if !@booking_order.nil? %>
               booking_id = "<%= @booking_order.booking_id %>";
             <% end %>
-            if (cashier_type == "quick_service") {
+            if (cashier_type == "quick_service" || cashier_type == "food_court") {
               if(booking_id!= "" && page == "pending"){
                 window.location.href = '/origami/'+cashier_type+'/pending_order/'+booking_id;
               }else{
@@ -673,7 +673,7 @@
     var id       = $("#table_id").val();
     var type     = $("#table_type").val();
     var sale_id  = $("#sale_id").val();
-    if (cashier_type == "quick_service") {
+    if (cashier_type == "quick_service" || cashier_type == "food_court") {
       window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
     }else{
       if(page == "pending"){
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 92b34074..065c0686 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -31,6 +31,16 @@
         </div>
       </div>
       <% end %>
+      <% if @food_court == '1' %>
+      <div class="col-lg-3 col-md-3 col-sm-3 col-xs-10 fc_view">
+        <div class="info-box bg-pink">
+          <div class="icon" >
+            <i class="material-icons">arrow_forward</i>
+          </div>
+          <div class="text font-20 m-l-5" style="line-height: 80px;"><%= @food_court_name %></div>
+        </div>
+      </div>
+      <% end %>
       <% if @dinein_cashier == '1' %>
       <div class="col-lg-3 col-md-3 col-sm-3 col-xs-10 cashier_view">
         <div class="info-box bg-green">
@@ -242,6 +252,19 @@ $(function() {
      window.location.href = '/origami/quick_service'; 
   });
 
+  $(".fc_view").on('click', function() {
+    var display_type = '<%= @display_type %>';
+    if (display_type.length>0) {
+      display_type = '<%= @display_type %>';
+    }else{
+      display_type = null;
+    }
+    if ($('#server_mode').val() != "cloud" && display_type == 2) {
+      document.getElementById('second_view').click();
+    }
+     window.location.href = '/origami/food_court'; 
+  });
+
   $(".order_reservation").on('click', function() {
      window.location.href = '/origami/order_reservation';
   });
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index ac94fd18..e23e4e6f 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -265,7 +265,7 @@ var cashier_type = "<%= @cashier_type %>";
 		    var id       = $("#table_id").text();
 		    var type     = $("#table_type").text();
 		    var sale_id = $('#sale-id').text();
-		    if (cashier_type=="quick_service") {
+		    if (cashier_type=="quick_service" || cashier_type=="food_court") {
 				window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
 		    }else{
 		    	if (type=="Table") {
@@ -454,7 +454,7 @@ var cashier_type = "<%= @cashier_type %>";
 			        title: "Information!",
 			        text: result.status,
 			    }, function () {
-			    	if (cashier_type=="quick_service") {
+			    	if (cashier_type=="quick_service" || cashier_type=="food_court") {
 			    		window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
 			    	}else{
 			    		if(result.table_type == "Table"){
@@ -504,7 +504,7 @@ var cashier_type = "<%= @cashier_type %>";
 			        text: result.status,
 			        type: "success",
 			    }, function () {
-			    	if (cashier_type=="quick_service") {
+			    	if (cashier_type=="quick_service" || cashier_type=="food_court") {
 			    		window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
 			    	}else{
 				    	if(result.table_type == "Table"){
@@ -531,7 +531,7 @@ var cashier_type = "<%= @cashier_type %>";
 			        text: result.status,
 			        type: "success",
 			    }, function () {
-			    	if (cashier_type=="quick_service") {
+			    	if (cashier_type=="quick_service" || cashier_type=="food_court") {
 			    		window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
 			    	}else{
 				    	if(result.table_type == "Table"){
@@ -580,7 +580,7 @@ var cashier_type = "<%= @cashier_type %>";
 			        confirmButtonText: 'OK',
 			        confirmButtonColor: btn_color,
 			    }, function () {
-			    	if (cashier_type=="quick_service") {
+			    	if (cashier_type=="quick_service" || cashier_type=="food_court") {
 			    		window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
 			    	}else{
 				    	if(result.table_type == "Table"){
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index fe74f057..886eda51 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -333,7 +333,7 @@
             title: "Information!",
             text: "Success",
           }, function () {
-            if (cashier_type=="quick_service") {
+            if (cashier_type=="quick_service" || cashier_type=="food_court") {
               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
             }else{
               if(result.table_type == "Table"){
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 4d3f430c..caa72f5e 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -35,7 +35,7 @@
             <div class="row p-l-5 p-r-5">
               <div class="col-lg-6 col-md-6 col-sm-6">
                 <strong>Customer :</strong>
-                <% if @cashier_type == 'quick_service' %>
+                <% if @cashier_type == 'quick_service' || @cashier_type == 'food_court' %>
                   <button type="button" class="btn bg-info waves-effect" id='customer_name'><%= @sale_data.customer.name%></button>
                 <% else %>
                   <span id="customer_name"><%= @sale_data.customer.name%></span>
@@ -193,7 +193,7 @@
             <%= number_with_precision(@cash, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
         </div>
       </div>
-      <% if @sale_payment.nil? %>
+      <% if @sale_payment.nil? && @cashier_type != "food_court" %>
         <div class="row payment credit-color p-l-5 p-r-5" id="credit_payment" >
           <div class="col-md-8">Credit</div>
           <div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
@@ -209,7 +209,7 @@
           </div>
         </div>
       <% else %>
-        <div class="row payment other-payment-color" id="card_payment"  >
+        <div class="row payment other-payment-color" id="card_payment" >
           <div class="col-md-8">Other Payments</div>
           <div class="col-md-4" id="other_payment_amount">
             <%= number_with_precision(@other_payment, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %>
@@ -432,7 +432,7 @@
     <% end %>
   <% end %>
 
-<% if @cashier_type=="quick_service" && @sale_payment.nil? %>
+<% if (@cashier_type=="quick_service" || @cashier_type=="food_court") && @sale_payment.nil? %>
 <hr>
 
  <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
@@ -669,6 +669,32 @@
   </div>
 </div> 
 
+<!-- customer light box -->
+<div class="modal fade" id="is_paymemberModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-md" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h1 class="modal-title" id="is_paymemberModalLabel">Are you Member?</h1>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      </div>
+      <div class="modal-body">
+        <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
+        <input type="hidden" name="qr_code" id="qr_code" />
+        <div class="row text-center m-t-20">
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_paymal_member">Card Member</button>
+          </div>
+
+          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_paymal_qr_code">QR Code</button>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer"></div>
+    </div>
+  </div>
+</div>  
+
 <script type="text/javascript">
 // //control borwser back
 window.location.hash="no-back-button";
@@ -681,6 +707,9 @@ var pdf_view = '<%=@pdf_view%>';
 var trans_flag = <%= @trans_flag %>;
                 // console.log(pdf_view)
   $(document).ready(function(){
+    <%if @cashier_type == "food_court" && @paymalcount == 0.0 %>
+      $("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false});
+    <% end %>
     setHeaderBreadCrumb(_PAYMENTS_);
 
     /* replace url type*/
@@ -743,7 +772,7 @@ var trans_flag = <%= @trans_flag %>;
         if (cashier_type=="cashier") {
             window.location.href = '/origami/table/'+ dining_id;
         }else{
-          window.location.href = '/origami/quick_service/pending_order/'+sale_id;
+          window.location.href = '/origami/'+cashier_type+'/pending_order/'+sale_id;
         } 
       }
        
@@ -775,124 +804,130 @@ var trans_flag = <%= @trans_flag %>;
       if(location.pathname.includes("credit_payment")){
         url_param = "credit_payment";
       }
-      window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/"+url_param+"/others_payment";
-      return false;
+      if(cashier_type != "food_court"){
+        window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/"+url_param+"/others_payment";
+        return false;
+      }else{
+        <% if @paymalcount == 0.0 %>
+          $("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false});
+        <% end %>
+      }
     });
 
     $('#pay').click(function() {
       sub_total = $('#sub-total').text();
       member = $('#membership_id').text();
       // console.log(member)
-      if (parseInt(jQuery.inArray("MPU", payment_type)) != -1 && $('.mpu').text() == 0 && sub_total != 0.0 && member) {
-          swal("Oops","Please Pay with MPU Payment","warning");
-      }else if(parseInt(jQuery.inArray("Redeem", payment_type)) != -1 && $('#ppamount').text()==0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with Redeem Payment","warning");
-      }else if(parseInt(jQuery.inArray("VISA", payment_type)) != -1 && $('#visacount').text()== 0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with Visa Payment","warning");
-        
-      }else if(parseInt(jQuery.inArray("JCB", payment_type)) != -1 && $('#jcbcount').text()== 0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with jcb Payment","warning");
-      }
-      else if(parseInt(jQuery.inArray("Master", payment_type)) != -1 && $('#mastercount').text()== 0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with Master Payment","warning");
-      }
-      else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()== 0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with UNIONPAY Payment","warning");
-      }
-      else if(parseInt(jQuery.inArray("Alipay", payment_type)) != -1 && $('#alipaycount').text()== 0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with Alipay Payment","warning");
-      }
-      else if(parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) != -1 && $('#junctionpaycount').text()==0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with JUNCTIONPAY Payment","warning");
-      }
-      else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with Credit Payment","warning");
-      }else if(parseInt(jQuery.inArray("PAYMAL", payment_type)) != -1 && $('#paymalcount').text()== 0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with Paymal Payment","warning");
-      }else if(parseInt(jQuery.inArray("DINGA", payment_type)) != -1 && $('#dingacount').text()== 0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with Dinga Payment","warning");
-      }else if(parseInt(jQuery.inArray("GiftVoucher", payment_type)) != -1 && $('#giftvouchercount').text()== 0 && sub_total != 0.0 && member){
-          swal("Oops","Please Pay with Gift Voucher","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');
-
-          //  payment
-            var cash   = $('#cash').text();
-            var credit = $('#credit').text();
-            var card   = $('#card').text();
-
-            var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
-            if (credit <= 0 && (!location.pathname.includes("credit_payment"))) {
-              calculate_member_discount(sale_id,tax_type);
-            }
-
-            // $("#pdfModal").on('shown.bs.modal', function () { 
-            //   $('#pdfModal').focus() }).modal({show : true, backdrop : false, keyboard : false});
-            /* check credit payment or not*/
-            if(location.pathname.includes("credit_payment")){
-              var url = "<%= origami_credit_payment_cash_path %>";
-            }else{
-              var url = "<%= origami_payment_cash_path %>";
-            }
-
-            $.ajax({type: "POST",
-              url: url,
-              data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type + "&tax_type=" + tax_type,
-              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(location.pathname.includes("credit_payment")){
-                  payment_success_alert();
-                }else{
-                  //PDF lightbox data
-                  var pdfPath = "/en/pdfjs/minimal?file=" + result.filename.substring(6);
-                  $("#sale_receipt_no").val(result.receipt_no);
-                  $("#filename").val(result.filename);
-                  $("#printer_name").val(result.printer_name);
-                  $("#receipt_pdf").attr("src", pdfPath);
-                  $("#changed_amount").text("");
-                  if($('#balance').text() < 0){
-                    <% if precision.to_i > 0 %>
-                      $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
-                    <% else %>
-                      $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
-                    <% end %>
-                  }
-
-                  if (pdf_view == 1) {
-                    $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
-                    $("#pdfModalLabel").text("Sale Completed");
-                  }else{
-                    //PDF lightbox data 
-                    print_receipt();
-                  }
-                }
-              }
-            });
-          }
+        if (parseInt(jQuery.inArray("MPU", payment_type)) != -1 && $('.mpu').text() == 0 && sub_total != 0.0 && member) {
+            swal("Oops","Please Pay with MPU Payment","warning");
+        }else if(parseInt(jQuery.inArray("Redeem", payment_type)) != -1 && $('#ppamount').text()==0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with Redeem Payment","warning");
+        }else if(parseInt(jQuery.inArray("VISA", payment_type)) != -1 && $('#visacount').text()== 0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with Visa Payment","warning");
+          
+        }else if(parseInt(jQuery.inArray("JCB", payment_type)) != -1 && $('#jcbcount').text()== 0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with jcb Payment","warning");
         }
+        else if(parseInt(jQuery.inArray("Master", payment_type)) != -1 && $('#mastercount').text()== 0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with Master Payment","warning");
+        }
+        else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()== 0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with UNIONPAY Payment","warning");
+        }
+        else if(parseInt(jQuery.inArray("Alipay", payment_type)) != -1 && $('#alipaycount').text()== 0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with Alipay Payment","warning");
+        }
+        else if(parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) != -1 && $('#junctionpaycount').text()==0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with JUNCTIONPAY Payment","warning");
+        }
+        else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with Credit Payment","warning");
+        }else if(parseInt(jQuery.inArray("PAYMAL", payment_type)) != -1 && $('#paymalcount').text()== 0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with Paymal Payment","warning");
+        }else if(parseInt(jQuery.inArray("DINGA", payment_type)) != -1 && $('#dingacount').text()== 0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with Dinga Payment","warning");
+        }else if(parseInt(jQuery.inArray("GiftVoucher", payment_type)) != -1 && $('#giftvouchercount').text()== 0 && sub_total != 0.0 && member){
+            swal("Oops","Please Pay with Gift Voucher","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');
+
+            //  payment
+              var cash   = $('#cash').text();
+              var credit = $('#credit').text();
+              var card   = $('#card').text();
+
+              var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
+              if (credit <= 0 && (!location.pathname.includes("credit_payment"))) {
+                calculate_member_discount(sale_id,tax_type);
+              }
+
+              // $("#pdfModal").on('shown.bs.modal', function () { 
+              //   $('#pdfModal').focus() }).modal({show : true, backdrop : false, keyboard : false});
+              /* check credit payment or not*/
+              if(location.pathname.includes("credit_payment")){
+                var url = "<%= origami_credit_payment_cash_path %>";
+              }else{
+                var url = "<%= origami_payment_cash_path %>";
+              }
+
+              $.ajax({type: "POST",
+                url: url,
+                data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type + "&tax_type=" + tax_type,
+                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(location.pathname.includes("credit_payment")){
+                    payment_success_alert();
+                  }else{
+                    //PDF lightbox data
+                    var pdfPath = "/en/pdfjs/minimal?file=" + result.filename.substring(6);
+                    $("#sale_receipt_no").val(result.receipt_no);
+                    $("#filename").val(result.filename);
+                    $("#printer_name").val(result.printer_name);
+                    $("#receipt_pdf").attr("src", pdfPath);
+                    $("#changed_amount").text("");
+                    if($('#balance').text() < 0){
+                      <% if precision.to_i > 0 %>
+                        $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
+                      <% else %>
+                        $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
+                      <% end %>
+                    }
+
+                    if (pdf_view == 1) {
+                      $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
+                      $("#pdfModalLabel").text("Sale Completed");
+                    }else{
+                      //PDF lightbox data 
+                      print_receipt();
+                    }
+                  }
+                }
+              });
+            }
+          }
     });
   
     // $('#void').on('click',function () {
@@ -1160,8 +1195,10 @@ var trans_flag = <%= @trans_flag %>;
                 if (cashier_type=="cashier") {
                   window.location.href = '/origami';
                 }else{
-                  window.location.href = '/origami/quick_service';
-                  customer_display_view(null,"reload");
+                  window.location.href = '/origami/'+cashier_type;
+                  if (cashier_type=="quick_service"){
+                    customer_display_view(null,"reload");
+                  }
                 } 
               }
             }else{
@@ -1195,10 +1232,12 @@ var trans_flag = <%= @trans_flag %>;
           }else{
             if (cashier_type=="cashier") {
               window.location.href = '/origami';
-            }else{
-              window.location.href = '/origami/quick_service';
-              customer_display_view(null,"reload");
-            } 
+            }else {
+              window.location.href = '/origami/'+cashier_type;
+              if(cashier_type=="quick_service"){
+                customer_display_view(null,"reload");
+              }
+            }
           }
        });
   }
@@ -1213,7 +1252,7 @@ var trans_flag = <%= @trans_flag %>;
       if (cashier_type=="cashier") {
         window.location.href = '/origami';
       }else{
-        window.location.href = '/origami/quick_service';
+        window.location.href = '/origami/'+cashier_type;
       } 
     }
     
@@ -1452,7 +1491,7 @@ var trans_flag = <%= @trans_flag %>;
                   if (cashier_type=="cashier") {
                     window.location.href = '/origami';
                   }else{
-                    window.location.href = '/origami/quick_service';
+                    window.location.href = '/origami/'+cashier_type;
                   } 
                 }
              });
@@ -1497,7 +1536,7 @@ var trans_flag = <%= @trans_flag %>;
                   if (cashier_type=="cashier") {
                     window.location.href = '/origami';
                   }else{
-                    window.location.href = '/origami/quick_service';
+                    window.location.href = '/origami/'+cashier_type;
                   } 
                 }
              }
@@ -1539,8 +1578,10 @@ var trans_flag = <%= @trans_flag %>;
               if (cashier_type=="cashier") {
                 window.location.href = '/origami';
               }else{
-                window.location.href = '/origami/quick_service';
-                customer_display_view(null,"reload");
+                window.location.href = '/origami/'+cashier_type;
+                if(cashier_type=="quick_service"){
+                  customer_display_view(null,"reload");
+                }
               } 
             }
           }
@@ -1611,10 +1652,178 @@ var trans_flag = <%= @trans_flag %>;
   /* customer light-box */
   $("#customer_name").on("click",function(){
     //start customer modal popup
-    if((cashier_type=='quick_service') && (customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
+    if((cashier_type=='quick_service' || cashier_type=='food_court') && (customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
       // if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
         $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
       // }
     }
   });
+
+  // Read Card Reader
+  $(".btn_paymal_member").on('click', function(){  
+    var cardNo = ""; 
+    var sale_id     = $("#sale_id").text() || 0;
+    var receipt_no = "";        
+    if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+      receipt_no = ($("#receipt_no").html()).trim();
+    }
+
+    var customer_mamber_card_no = 0;
+    var payment_amount = parseFloat($("#grand_total").text());
+
+    $("#is_paymemberModal").hide();
+    $("#sxModal").show();   
+    setTimeout(function(){
+      getCardNo();
+      $("#sxModal").hide();        
+      customer_mamber_card_no = $("#paypar_account_no").val();
+      if (customer_mamber_card_no == 0) {
+        customer_mamber_card_no = $("#membership_id").text() || 0;
+      }
+      if(sale_id != 0 && customer_mamber_card_no !=0){ 
+        $.ajax({
+          type: "POST",
+          url: "/origami/"+sale_id+"/send_account" ,
+          data: { account_no : customer_mamber_card_no, amount : payment_amount, receipt_no : receipt_no},
+          dataType: "json",
+          success: function(data) {
+            if (data.status == true) {
+              var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
+              // $("#valid_amount").val((valid_amount > 0) ? parseFloat(valid_amount) : 0);
+
+                $.ajax({
+                  type: "POST",
+                  url:  "<%=origami_payment_paymal_path%>",
+                  data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:customer_mamber_card_no},
+                  success: function(result){
+                    if(result.status == true){
+                      swal({
+                        title: "Information!",
+                        text: result.message,
+                        html: true,
+                        closeOnConfirm: false,
+                        closeOnCancel: false,
+                        allowOutsideClick: false
+                      }, function () {
+                        window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+                      });
+
+                    }else{
+                      swal({
+                        title: 'Oops',
+                        text: result.message,
+                        type: 'warning',
+                        html: true,
+                        closeOnConfirm: false,
+                        closeOnCancel: false,
+                        allowOutsideClick: false
+                      }, function () {
+                        window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment";
+                      });
+                    }
+                }
+              });
+            }else{
+              swal({
+                title: 'Oops',
+                text: data.message.toString(),
+                type: 'error',
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment";
+              });
+            }
+          }
+        });                
+      }else{
+        swal({
+          title: 'Oops',
+          text: 'Please Check Member',
+          type: 'warning',
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment";
+        });
+      }
+     },100);
+  });
+
+  // QR Code Reader
+  $(".btn_paymal_qr_code").on('click', function(e){
+    $("#is_paymemberModal").hide();
+    var code = ""; 
+    var sale_id     = $("#sale_id").text() || 0;
+    var receipt_no = "";        
+    if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+      receipt_no = ($("#receipt_no").html()).trim();
+    }
+    var payment_amount = parseFloat($("#grand_total").text());
+    setTimeout(function(){
+      code=getQRCode(); 
+      if(sale_id != 0 && code != ""){    
+         $.ajax({
+          type: "POST",
+          url: "/origami/"+sale_id+"/send_account" ,
+          data: { account_no : code, amount : payment_amount, receipt_no : receipt_no},
+          dataType: "json",
+          success: function(data) {
+            if (data.status == true) {
+              var valid_amount = parseFloat(data.old_balance_amount) - parseFloat(data.reload_amount);
+              // $("#valid_amount").val((valid_amount > 0) ? parseFloat(valid_amount) : 0);
+
+                $.ajax({
+                type: "POST",
+                url:  "<%=origami_payment_paymal_path%>",
+                data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
+                success: function(result){
+                  if(result.status == true){
+                    swal({
+                      title: "Information!",
+                      text: result.message,
+                      html: true,
+                      closeOnConfirm: false,
+                      closeOnCancel: false,
+                      allowOutsideClick: false
+                    }, function () {
+                      window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
+                    });
+                  }else{
+                    swal({
+                      title: 'Oops',
+                      text: result.message,
+                      type: 'warning',
+                      html: true,
+                      closeOnConfirm: false,
+                      closeOnCancel: false,
+                      allowOutsideClick: false
+                    }, function () {
+                      window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment";
+                    });
+                  }
+                }
+              });
+            }else{
+              swal({
+                title: 'Oops',
+                text: 'Please Check Member',
+                type: 'warning',
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment";
+              });
+            }
+          }
+        });                
+      }         
+    },100);
+  });
 </script>
diff --git a/app/views/origami/pending_order/completed_sale.html.erb b/app/views/origami/pending_order/completed_sale.html.erb
index f2d66b37..a90c8d8f 100644
--- a/app/views/origami/pending_order/completed_sale.html.erb
+++ b/app/views/origami/pending_order/completed_sale.html.erb
@@ -10,10 +10,11 @@
         <li class="nav-item">
           <a class="nav-link " data-toggle="tab" href="#pending_order" role="tab">Pending</a>
         </li>
-
+        <% if @cashier_type == "quick_service" %>
         <li class="nav-item credit_items">
           <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credits %></a>
         </li>
+        <% end %>
       </ul>
       <div id="custom-slimscroll">
          <div class="tab-content m-t-15">              
@@ -49,37 +50,39 @@
             </div>
 
             <!-- Credit Sale Panel -->
-            <div class="tab-pane dining" id="credits" role="tabpanel">
-              <div class="card-block">
-                <div class="row m-t-10 m-l-10 clearfix">
-                  <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
-                    <input type="text" name="filter" id="filter" onchange="getCreditData('quick_service');" style="height: 32px;" placeholder="Receipt No." class="form-control">
+            <% if @cashier_type == "quick_service" %>
+              <div class="tab-pane dining" id="credits" role="tabpanel">
+                <div class="card-block">
+                  <div class="row m-t-10 m-l-10 clearfix">
+                    <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
+                      <input type="text" name="filter" id="filter" onchange="getCreditData('quick_service');" style="height: 32px;" placeholder="Receipt No." class="form-control">
+                    </div>
+                    <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
+                      <select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData('quick_service');">
+                        <option value="">-- Select Customer --</option>
+                        <% if !@customers.empty? %>
+                        <% @customers.each do |cus| %>
+                        <option value="<%= cus[0] %>"><%= cus[1] %></option>
+                        <% end %>
+                        <% end %>
+                      </select>
+                    </div>
                   </div>
-                  <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
-                    <select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData('quick_service');">
-                      <option value="">-- Select Customer --</option>
-                      <% if !@customers.empty? %>
-                      <% @customers.each do |cus| %>
-                      <option value="<%= cus[0] %>"><%= cus[1] %></option>
-                      <% end %>
-                      <% end %>
-                    </select>
+                  <div class="row clearfix m-t-20 m-l-10">
+                    <table class="table table-responsive tbl_credit_lists">
+                      <thead>
+                        <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></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>
+                      </thead>
+                      <tbody class="tbd_credit_lists"></tbody>
+                    </table>
                   </div>
                 </div>
-                <div class="row clearfix m-t-20 m-l-10">
-                  <table class="table table-responsive tbl_credit_lists">
-                    <thead>
-                      <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></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>
-                    </thead>
-                    <tbody class="tbd_credit_lists"></tbody>
-                  </table>
-                </div>
               </div>
-            </div>
+            <% end %>
             <!-- Credit Sale Panel -->
           </div>
       </div>
@@ -303,17 +306,17 @@
 <!-- script data for credit lists -->
 
 <script>
-var cashier_type = "quick_service";
+var cashier_type = "<%= @cashier_type %>";
 $(document).ready(function(){
   getCreditSales("","",cashier_type); //credit sales script data binding
 
   $(".sales").on('click',function(){
       var sale_id = $(this).attr("data-id");
-      window.location.href = '/origami/quick_service/pending_order/' + sale_id;
+      window.location.href = '/origami/'+cashier_type+'/pending_order/' + sale_id;
   })
   $(".completed").on('click',function(){
       var sale_id = $(this).attr("data-id");
-      window.location.href = '/origami/quick_service/completed_sale/' + sale_id;
+      window.location.href = '/origami/'+cashier_type+'/completed_sale/' + sale_id;
   })
   $('#reprint').on('click', function () {
     var sale_id = $('#sale_id').val();
@@ -333,12 +336,12 @@ $(document).ready(function(){
     });
   });
   $('#back').on('click', function () {
-    window.location.href = '/origami/quick_service/pending_order';
+    window.location.href = '/origami/'+cashier_type+'/pending_order';
   });
   
   $('#close_cashier').on('click',function(e){
     e.preventDefault(); // Prevent the href from redirecting directly
-    var linkURL = '/origami/shift/quick_service/close';
+    var linkURL = '/origami/shift/'+cashier_type+'/close';
     occupied_count = $(this).data("count");
     warnBeforeRedirect(linkURL,occupied_count);
   });
@@ -364,11 +367,11 @@ $(document).ready(function(){
   }
 
    $('#cash_in').on('click',function(){
-      window.location.href = '/origami/quick_service/cash_ins';
+      window.location.href = '/origami/'+cashier_type+'/cash_ins';
     })
 
     $('#cash_out').on('click',function(){
-      window.location.href  = '/origami/quick_service/cash_outs';
+      window.location.href  = '/origami/'+cashier_type+'/cash_outs';
     });
 
     $('#void').on('click', function () {
@@ -397,7 +400,7 @@ $(document).ready(function(){
                   if ($("#server_mode").val() == "cloud") {
                     code2lab.printFile(result.filepath.substr(6), result.printer_url);
                   }
-                  window.location.href = '/origami/quick_service';
+                  window.location.href = '/origami/'+cashier_type;
                 }
             });
           }
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
index a6e91d63..903c13a5 100644
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -10,9 +10,11 @@
             <li class="nav-item">
               <a class="nav-link active" data-toggle="tab" href="#pending_order" role="tab">Pending</a>
             </li>
-            <li class="nav-item credit_items">
-              <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credits %></a>
-            </li>
+            <%if @cashier_type=='quick_service' %>
+              <li class="nav-item credit_items">
+                <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credits %></a>
+              </li>
+            <% end %>
           </ul>
           <!-- Nav tabs - End -->
 	            	<div id="custom-slimscroll">
@@ -49,6 +51,7 @@
                     </div>
 
                     <!-- Credit Sales Panel -->
+                    <%if @cashier_type=='quick_service' %>
                     <div class="tab-pane dining" id="credits" role="tabpanel">
                        <div class="card-block">
                         <div class="row m-t-10 m-l-10 clearfix">
@@ -80,6 +83,7 @@
                         </div>
                       </div>
                     </div>
+                    <% end %>
                     <!-- Credit Sales Panel -->
                   </div>
 		          </div>
@@ -112,39 +116,39 @@
 <!-- script data for credit lists -->
 
 <script>
-  var cashier_type = "quick_service";
+  var cashier_type = "<%= @cashier_type %>";
   $(document).ready(function(){
     getCreditSales("","",cashier_type); //credit sales script data binding
 
      $(".sales").on('click',function(){
         var sale_id = $(this).attr("data-id");
-        window.location.href = '/origami/quick_service/pending_order/' + sale_id;
+        window.location.href = '/origami/'+cashier_type+'/pending_order/' + sale_id;
       });
       $(".completed").on('click',function(){
           var sale_id = $(this).attr("data-id");
-          window.location.href = '/origami/quick_service/completed_sale/' + sale_id;
+          window.location.href = '/origami/'+cashier_type+'/completed_sale/' + sale_id;
       });
       $('#pay').on('click', function () {
           var sale_id = $('#sale_id').val();
-          window.location.href = '/origami/sale/' + sale_id + "/quick_service/payment";
+          window.location.href = '/origami/sale/' + sale_id + "/"+cashier_type+"/payment";
       });
       $('#back').on('click', function () {
-          window.location.href = '/origami/quick_service';
+          window.location.href = '/origami/'+cashier_type;
       });
 
       $('#close_cashier').on('click',function(e){
         e.preventDefault(); // Prevent the href from redirecting directly
-        var linkURL = '/origami/shift/quick_service/close';
+        var linkURL = '/origami/shift/'+cashier_type+'/close';
         occupied_count = $(this).data("count");
         warnBeforeRedirect(linkURL,occupied_count);
       });
 
       $('#cash_in').on('click',function(){
-        window.location.href = '/origami/quick_service/cash_ins';
+        window.location.href = '/origami/'+cashier_type+'/cash_ins';
       });
 
       $('#cash_out').on('click',function(){
-        window.location.href  = '/origami/quick_service/cash_outs';
+        window.location.href  = '/origami/'+cashier_type+'/cash_outs';
       });
   });
 
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index bf0e7d3a..b4f71e8d 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -9,9 +9,11 @@
         <li class="nav-item">
           <a class="nav-link active" data-toggle="tab" href="#pending_order" role="tab">Pending</a>
         </li>
+        <% if @cashier_type == "quick_service" %>
         <li class="nav-item credit_items">
           <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credits %></a>
         </li>
+        <% end %>
       </ul>
       <div id="custom-slimscroll">
          <div class="tab-content m-t-15">              
@@ -47,37 +49,39 @@
             </div>
 
             <!-- Credit Sale Panel -->
-            <div class="tab-pane dining" id="credits" role="tabpanel">
-              <div class="card-block">
-                <div class="row m-t-10 m-l-10 clearfix">
-                  <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
-                    <input type="text" name="filter" id="filter" onchange="getCreditData('quick_service');" style="height: 32px;" placeholder="Receipt No." class="form-control">
+            <% if @cashier_type == "quick_service" %>
+              <div class="tab-pane dining" id="credits" role="tabpanel">
+                <div class="card-block">
+                  <div class="row m-t-10 m-l-10 clearfix">
+                    <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
+                      <input type="text" name="filter" id="filter" onchange="getCreditData('quick_service');" style="height: 32px;" placeholder="Receipt No." class="form-control">
+                    </div>
+                    <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
+                      <select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData('quick_service');">
+                        <option value="">-- Select Customer --</option>
+                        <% if !@customers.empty? %>
+                        <% @customers.each do |cus| %>
+                        <option value="<%= cus[0] %>"><%= cus[1] %></option>
+                        <% end %>
+                        <% end %>
+                      </select>
+                    </div>
                   </div>
-                  <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
-                    <select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData('quick_service');">
-                      <option value="">-- Select Customer --</option>
-                      <% if !@customers.empty? %>
-                      <% @customers.each do |cus| %>
-                      <option value="<%= cus[0] %>"><%= cus[1] %></option>
-                      <% end %>
-                      <% end %>
-                    </select>
+                  <div class="row clearfix m-t-20 m-l-10">
+                    <table class="table table-responsive tbl_credit_lists">
+                      <thead>
+                        <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></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>
+                      </thead>
+                      <tbody class="tbd_credit_lists"></tbody>
+                    </table>
                   </div>
                 </div>
-                <div class="row clearfix m-t-20 m-l-10">
-                  <table class="table table-responsive tbl_credit_lists">
-                    <thead>
-                      <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></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>
-                    </thead>
-                    <tbody class="tbd_credit_lists"></tbody>
-                  </table>
-                </div>
               </div>
-            </div>
+            <% end %>
             <!-- Credit Sale Panel -->
           </div>
       </div>
@@ -244,40 +248,40 @@
 <!-- script data for credit lists -->
 
 <script>
-var cashier_type = "quick_service";
+var cashier_type = "<%= @cashier_type %>";
 $(document).ready(function(){
   getCreditSales("","",cashier_type); //credit sales script data binding
   
   $(".sales").on('click',function(){
       var sale_id = $(this).attr("data-id");
-      window.location.href = '/origami/quick_service/pending_order/' + sale_id;
+      window.location.href = '/origami/'+cashier_type+'/pending_order/' + sale_id;
   })
   $(".completed").on('click',function(){
       var sale_id = $(this).attr("data-id");
-      window.location.href = '/origami/quick_service/completed_sale/' + sale_id;
+      window.location.href = '/origami/'+cashier_type+'/completed_sale/' + sale_id;
   })
   $('#pay').on('click', function () {
     var sale_id = $('#sale_id').val();
-    window.location.href = '/origami/sale/' + sale_id + "/quick_service/payment";
+    window.location.href = '/origami/sale/' + sale_id + "/"+cashier_type+"/payment";
   });
   $('#back').on('click', function () {
-    window.location.href = '/origami/quick_service';
+    window.location.href = '/origami/'+cashier_type;
   });
   $('#addorder').on('click', function () {
     var table_id = "<%=@table_id%>";
     var booking_id = "<%=@bookings.booking_id%>";
     var sale_id = $("#sale_id").val();
     if (table_id) {
-      window.location.href = '/origami/quick_service/modify_order/' + table_id+"/"+sale_id;
+      window.location.href = '/origami/'+cashier_type+'/modify_order/' + table_id+"/"+sale_id;
     }else{
-      window.location.href = '/origami/quick_service/modify_order/'+ booking_id+"/" +sale_id;
+      window.location.href = '/origami/'+cashier_type+'/modify_order/'+ booking_id+"/" +sale_id;
     }
     
   });
   // Bill Request
     $('#request_bills').click(function () {
       var order_id = $('#save_order_id').val();
-      var ajax_url = "../../../origami/" +order_id+ "/request_bills";
+      var ajax_url = "/origami/" +order_id+ "/request_bills";
       console.log(ajax_url)
       $.ajax({
           type: "GET",
@@ -288,7 +292,7 @@ $(document).ready(function(){
                 swal("Information!", result.error_message);
               }
               else {              
-                 window.location.href = '/origami/sale/'+result.data+'/quick_service/payment';
+                 window.location.href = '/origami/sale/'+result.data+'/'+cashier_type+'/payment';
               }
           }
       });   
@@ -352,7 +356,7 @@ $(document).ready(function(){
 
   $('#close_cashier').on('click',function(e){
     e.preventDefault(); // Prevent the href from redirecting directly
-    var linkURL = '/origami/shift/quick_service/close';
+    var linkURL = '/origami/shift/'+cashier_type+'/close';
     occupied_count = $(this).data("count");
     warnBeforeRedirect(linkURL,occupied_count);
   });
@@ -385,11 +389,11 @@ $(document).ready(function(){
   });
 
    $('#cash_in').on('click',function(){
-      window.location.href = '/origami/quick_service/cash_ins';
+      window.location.href = '/origami/'+cashier_type+'/cash_ins';
     })
 
     $('#cash_out').on('click',function(){
-      window.location.href  = '/origami/quick_service/cash_outs';
+      window.location.href  = '/origami/'+cashier_type+'/cash_outs';
     })
 });
 </script>
diff --git a/app/views/origami/quick_service/index.html.erb b/app/views/origami/quick_service/index.html.erb
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 08613715..66aaf379 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -321,7 +321,7 @@ var access_code  = localStorage.getItem("access_code");
     $('#back').on('click', function () {
         var table_id = '<%= @table_id %>'
         var sale_id = "<%= @saleobj.sale_id %>"
-        if (cashier_type=="quick_service") {
+        if (cashier_type=="quick_service" || cashier_type == "food_court") {
           window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
         }else{
           window.location.href = '/origami/table/' + table_id;
@@ -350,7 +350,7 @@ var access_code  = localStorage.getItem("access_code");
             url: ajax_url,
             data: 'sale_id=' + sale_id+'&type='+cashier_type,
             success: function (result) {
-              if (cashier_type=="quick_service") {
+              if (cashier_type=="quick_service" || cashier_type=="food_court") {
                 window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
               }else{
                  window.location.href = '/origami/table/' + table_id;
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index eddb275d..8bc99b8b 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -429,7 +429,7 @@ var cashier_type = "<%= @cashier_type %>";
       var table_type    = $('#table_type').val();
       var table_id      = $('#table_id').val();
 
-      if (cashier_type == "quick_service") {
+      if (cashier_type == "quick_service" || cashier_type == "food_court") {
         window.location.href = '/origami/sale/<%= @id %>/<%= @cashier_type %>/payment/';
       }else{
         if(table_type == "Table"){
diff --git a/config/routes.rb b/config/routes.rb
index 3dabf4d8..b3ad9a6a 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -105,16 +105,24 @@ scope "(:locale)", locale: /en|mm/ do
 
     get "quick_service" => "quick_service#index"
     
-    get "quick_service/pending_order" => "pending_order#index"
-    get "quick_service/pending_order/:sale_id" => "pending_order#show"
-    get "quick_service/completed_sale/:sale_id" => "pending_order#completed_sale"
+    get ":type/pending_order" => "pending_order#index"
+    get ":type/pending_order/:sale_id" => "pending_order#show"
+    get ":type/completed_sale/:sale_id" => "pending_order#completed_sale"
 
     get "quick_service/modify_order/:id/:sale_id" => "quick_service#modify_order"
     get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
     post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' }
     
-    get "quick_service/cash_ins" => "pending_order#cash_ins"
-    get "quick_service/cash_outs" => "pending_order#cash_outs"
+    get ":type/cash_ins" => "pending_order#cash_ins"
+    get ":type/cash_outs" => "pending_order#cash_outs"
+
+    #food court routes
+    get "food_court" => "food_court#index"
+
+    get "food_court/modify_order/:id/:sale_id" => "food_court#modify_order"
+    get "food_court/modify_order/:sale_id" => "food_court#modify_order"
+    post 'food_court/update_modify_order' => "food_court#update_modify_order", :defaults => { :format => 'json' }
+    #food court routes
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]
diff --git a/db/seeds.rb b/db/seeds.rb
index df5e815e..6cd11d4c 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -95,6 +95,7 @@ float_value = Lookup.create([{lookup_type:'float_value', name: '500', value: '50
 
 # customer type
 customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', value: 'Dinein'},
+                                {lookup_type:'customer_type', name: 'FoodCourt', value: 'FoodCourt'},
                                 {lookup_type:'customer_type', name: 'Takeaway', value: 'Takeaway'},
                                 {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}])
 

From 87502ec0f22a35ff51883c63d4a83462c082107b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 9 Oct 2018 16:12:52 +0630
Subject: [PATCH 63/66] update inventory and shop and seed

---
 .../concerns/login_verification.rb            | 10 ++++-
 .../inventory/inventory_controller.rb         | 40 ++-----------------
 .../inventory/stock_checks_controller.rb      |  4 +-
 app/controllers/origami/void_controller.rb    |  2 +-
 .../origami/waste_spoile_controller.rb        |  2 +-
 app/controllers/settings/shops_controller.rb  |  4 +-
 app/models/inventory_definition.rb            | 33 +++++++++++++--
 app/uploaders/commissioner_image_uploader.rb  |  4 +-
 app/uploaders/customer_image_uploader.rb      |  4 +-
 app/uploaders/employee_image_uploader.rb      |  4 +-
 app/uploaders/menu_item_image_uploader.rb     |  6 +--
 app/uploaders/product_image_uploader.rb       |  4 +-
 app/uploaders/shop_image_uploader.rb          |  4 +-
 app/views/inventory/inventory/index.html.erb  | 14 +++++++
 config/initializers/action_controller.rb      |  2 +-
 db/seeds.rb                                   | 26 ++++++------
 lib/tasks/receipt.rake                        |  4 +-
 17 files changed, 92 insertions(+), 75 deletions(-)

diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index 78864e34..72d621b3 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -3,7 +3,7 @@ module LoginVerification
 
   included do
     before_action :authenticate_session_token
-    helper_method :current_company, :current_login_employee, :current_user, :get_cashier, :order_reservation, :bank_integration
+    helper_method :current_company,:current_shop, :current_login_employee, :current_user, :get_cashier, :order_reservation, :bank_integration
   end
 
   #this is base api base controller to need to inherit.
@@ -17,6 +17,14 @@ module LoginVerification
     end
   end
 
+  def current_shop
+    begin
+     return Shop.first
+    rescue
+      return nil
+    end
+  end
+
   def current_login_employee
     @employee = Employee.find_by_token_session(session[:session_token])
   end
diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb
index ed6347cc..d987a59d 100755
--- a/app/controllers/inventory/inventory_controller.rb
+++ b/app/controllers/inventory/inventory_controller.rb
@@ -1,45 +1,13 @@
 class Inventory::InventoryController < BaseInventoryController
   load_and_authorize_resource
   def index
-    least_stock = "SELECT (CASE WHEN stock_journals.remark != 'out of stock'
-                  THEN (SELECT balance FROM stock_journals
-                                  WHERE item_code = inventory_definitions.item_code AND remark != 'out of stock'
-                                      ORDER BY created_at DESC LIMIT 1) ELSE 0 END)
-                                      FROM stock_journals
-                                        WHERE stock_journals.item_code = inventory_definitions.item_code
-                                      ORDER BY stock_journals.created_at DESC LIMIT 1"
 
-    @inventory_definitions = InventoryDefinition.select("inventory_definitions.*,
-   							(CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit,
-   							(CASE WHEN sj.debit IS NULL THEN 0 ELSE sj.debit END) as debit,
-   							(#{least_stock}) as balance,"+
-                "acc.title as account_name,mi.name as item_name,
-                 mii.item_instance_name as instance_name," +
-                "mc.name as menu_category_name,mc.id as menu_category_id "
-                )
-   							.joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id")                
-                .joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
-                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
-                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
-                .joins(" JOIN accounts acc ON acc.id = mi.account_id")
-   							.group("mi.menu_category_id,inventory_definitions.item_code")
-                .order("acc.title desc,mi.menu_category_id desc,balance ASC")
+    filter = params[:filter]
+
+    @inventory_definitions = InventoryDefinition.get_by_category(filter)
 
   end
-
-#   def self.get_item_query(type)
- 
-#   query = Sale.select("acc.title as account_name,mi.name as item_name,mii.item_instance_name as instance_name" +
-#                      "mc.name as menu_category_name,mc.id as menu_category_id ")
-
-#   query = query.joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
-#                      " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
-#                      " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
-#   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
-#   query = query.group("acc.title,mi.account_id,mi.menu_category_id")
-#                .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc")
-# end
-
+  
   def show
     inventory_definition_id = params[:inventory_definition_id]
     inventory = InventoryDefinition.find(inventory_definition_id)
diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb
index 06db5c5f..b7f7369d 100755
--- a/app/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -41,7 +41,7 @@ class Inventory::StockChecksController < BaseInventoryController
     member_info = nil
     unique_code = 'StockCheckPdf'
 
-    shop_details = Shop.find(1)
+    shop_details = current_shop
     checker = Employee.find(stockcheck.check_by)
     print_settings = PrintSetting.find_by_unique_code(unique_code)
     if !print_settings.nil?
@@ -66,7 +66,7 @@ class Inventory::StockChecksController < BaseInventoryController
   #Shop Name in Navbor
   helper_method :shop_detail
   def shop_detail
-    @shop = Shop.first
+    @shop = current_shop
   end
 
   # before_action :set_stock_check, only: [:show, :edit, :update, :destroy]
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 1e9acafb..f0c842ae 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -109,7 +109,7 @@ class Origami::VoidController < BaseOrigamiController
         customer= Customer.find(sale.customer_id)
         
          #shop detail
-        shop_details = Shop.find(1)
+        shop_details = current_shop
          # get member information
         rebate = MembershipSetting.find_by_rebate(1)
         if customer.membership_id != nil && rebate
diff --git a/app/controllers/origami/waste_spoile_controller.rb b/app/controllers/origami/waste_spoile_controller.rb
index 6d2bb094..5090847c 100755
--- a/app/controllers/origami/waste_spoile_controller.rb
+++ b/app/controllers/origami/waste_spoile_controller.rb
@@ -90,7 +90,7 @@ class Origami::WasteSpoileController < BaseOrigamiController
         customer= Customer.find(sale.customer_id)
         
          #shop detail
-        shop_details = Shop.find(1)
+        shop_details = current_shop
          # get member information
         rebate = MembershipSetting.find_by_rebate(1)
         if customer.membership_id != nil && rebate
diff --git a/app/controllers/settings/shops_controller.rb b/app/controllers/settings/shops_controller.rb
index 38c3336c..598e4f9b 100644
--- a/app/controllers/settings/shops_controller.rb
+++ b/app/controllers/settings/shops_controller.rb
@@ -59,11 +59,11 @@ class Settings::ShopsController < ApplicationController
                   File.delete(delete_path) 
                 end  
               end              
-              save_path = Rails.root.join("public/#{Shop.find(1).shop_code}_#{a.original_filename}")
+              save_path = Rails.root.join("public/#{current_shop.shop_code}_#{a.original_filename}")
               File.open(save_path, 'wb') do |f|
                 f.write a.read
               end
-              audio_name = "#{Shop.find(1).shop_code}_#{a.original_filename}"
+              audio_name = "#{current_shop.shop_code}_#{a.original_filename}"
               @settings_shop.display_images.where(:name => "order_audio").destroy_all
               @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :name => "order_audio", :image => audio_name)
             else
diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb
index 377ac153..13d295a1 100755
--- a/app/models/inventory_definition.rb
+++ b/app/models/inventory_definition.rb
@@ -72,10 +72,37 @@ class InventoryDefinition < ApplicationRecord
                      " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
                 .where("mc.id=#{cat_id}")
                 .group("mi.menu_category_id,inventory_definitions.item_code")
-                .order("mi.menu_category_id desc")
+                .order("mi.menu_category_id desc")        
+  end
 
-                
-    
+  def self.get_by_category(filter)
+    least_stock = "SELECT (CASE WHEN stock_journals.remark != 'out of stock'
+                  THEN (SELECT balance FROM stock_journals
+                                  WHERE item_code = inventory_definitions.item_code AND remark != 'out of stock'
+                                      ORDER BY created_at DESC LIMIT 1) ELSE 0 END)
+                                      FROM stock_journals
+                                        WHERE stock_journals.item_code = inventory_definitions.item_code
+                                      ORDER BY stock_journals.created_at DESC LIMIT 1"
+
+    @inventory_definitions = InventoryDefinition.select("inventory_definitions.*,
+                (CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit,
+                (CASE WHEN sj.debit IS NULL THEN 0 ELSE sj.debit END) as debit,
+                (#{least_stock}) as balance,"+
+                "acc.title as account_name,mi.name as item_name,
+                 mii.item_instance_name as instance_name," +
+                "mc.name as menu_category_name,mc.id as menu_category_id "
+                )
+                .joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id")                
+                .joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
+                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+                .joins(" JOIN accounts acc ON acc.id = mi.account_id")
+                .where("inventory_definitions.item_code LIKE ? OR inventory_definitions.min_order_level LIKE ? 
+                  OR inventory_definitions.max_stock_level LIKE ? OR sj.balance LIKE ? OR mi.name LIKE ? 
+                  OR mii.item_instance_name LIKE ? OR mc.name LIKE ?","%#{filter}%","%#{filter}%","%#{filter}%",
+                  "%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%")
+                .group("mi.menu_category_id,inventory_definitions.item_code")
+                .order("acc.title desc,mi.menu_category_id desc,balance ASC")
   end
 
 end
diff --git a/app/uploaders/commissioner_image_uploader.rb b/app/uploaders/commissioner_image_uploader.rb
index 8baa6dac..a6389405 100644
--- a/app/uploaders/commissioner_image_uploader.rb
+++ b/app/uploaders/commissioner_image_uploader.rb
@@ -20,10 +20,10 @@ class CommissionerImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if Shop.find(1).shop_code.nil?
+    if current_shop.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/customer_image_uploader.rb b/app/uploaders/customer_image_uploader.rb
index 3c4c6f67..13a384f0 100644
--- a/app/uploaders/customer_image_uploader.rb
+++ b/app/uploaders/customer_image_uploader.rb
@@ -20,10 +20,10 @@ class CustomerImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if Shop.find(1).shop_code.nil?
+    if current_shop.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/employee_image_uploader.rb b/app/uploaders/employee_image_uploader.rb
index f1e32849..e176d660 100644
--- a/app/uploaders/employee_image_uploader.rb
+++ b/app/uploaders/employee_image_uploader.rb
@@ -20,10 +20,10 @@ class EmployeeImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if Shop.find(1).shop_code.nil?
+    if current_shop.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/menu_item_image_uploader.rb b/app/uploaders/menu_item_image_uploader.rb
index 5e1016a6..4198e501 100755
--- a/app/uploaders/menu_item_image_uploader.rb
+++ b/app/uploaders/menu_item_image_uploader.rb
@@ -15,15 +15,15 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "image/menu_images/#{Shop.find(1).shop_code}"
+    "image/menu_images/#{current_shop.shop_code}"
     # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
   def filename
-    if Shop.find(1).shop_code.nil?
+    if current_shop.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/product_image_uploader.rb b/app/uploaders/product_image_uploader.rb
index 4b702a00..32e5f272 100755
--- a/app/uploaders/product_image_uploader.rb
+++ b/app/uploaders/product_image_uploader.rb
@@ -20,10 +20,10 @@ class ProductImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if Shop.find(1).shop_code.nil?
+    if current_shop.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/shop_image_uploader.rb b/app/uploaders/shop_image_uploader.rb
index 009d83d9..7927548a 100644
--- a/app/uploaders/shop_image_uploader.rb
+++ b/app/uploaders/shop_image_uploader.rb
@@ -20,10 +20,10 @@ class ShopImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if Shop.find(1).shop_code.nil?
+    if current_shop.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb
index aff62d84..db77bf9a 100755
--- a/app/views/inventory/inventory/index.html.erb
+++ b/app/views/inventory/inventory/index.html.erb
@@ -7,8 +7,22 @@
   </span>
 </ol>
 </div>
+    <%= form_tag inventory_path, :id => "filter_form", :method => :get do %>
+<div class="row">
 
 
+      <div class="col-lg-4 col-md-4 col-sm-4">
+        <label class="font-14"><%= t("views.right_panel.detail.product") %></label>
+        <input type="text" class="form-control" name="filter" id="Product" type="text" placeholder="" style="height: 32px;">
+      </div>
+      
+      <div class="col-lg-2 col-md-2 col-sm-2 text-">
+        <br>
+        <input type="submit" value="Filter" class='btn btn-primary'>
+      </div>   
+       
+</div> 
+    <% end %>     
 <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <div class="m-b-10 clearfix">
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 1d8b678e..fb212f13 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -19,7 +19,7 @@ class ActionController::Base
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
     else         
-      check for license file
+      # check for license file
       if check_license
         current_license(ENV["SX_PROVISION_URL"])
       else
diff --git a/db/seeds.rb b/db/seeds.rb
index df5e815e..a39f71e2 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -208,26 +208,26 @@ queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf
 
 zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"})
 
-member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "https://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:"pZBHXEFbGNj/G"})
 
-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"}
+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:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {membership_type:"redeem",is_active:1,gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {membership_type:"create_membership_customer",is_active:1,gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {membership_type:"update_membership_customer",is_active:1,gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {membership_type:"get_all_member_group",is_active:1,gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {membership_type:"rebate",is_active:1,gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {membership_type:"get_all_member_account",is_active:1,gateway_url:"/api/generic_customer/get_member_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {membership_type:"get_member_transactions",is_active:1,gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {membership_type:"member_discount",is_active:1,gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:5},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {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:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"},
+  {membership_type:"search_paypar_account_no",is_active:1,gateway_url:"/api/generic_customer/get_membership_customer_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"}
 ])
 
 payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://membership.paypar.ws"})
 payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://membership.paypar.ws"})
 payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://membership.paypar.ws"})
 payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://membership.paypar.ws"})
-payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"})
+payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "/api/membership_campaigns/redeem",merchant_account_id:"pZBHXEFbGNj/G"})
 
 #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"})
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index 08692a0e..5e3c524c 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -3,7 +3,7 @@ namespace :consolidate do
   task :receipt => :environment do
     # Receipt.delete_all
     sales = Sale.all_receipts
-    shop  = Shop.find(1)
+    shop  = current_shop
     sales.each do |sale|
       
      if sale.shift_sale_id.present?
@@ -57,7 +57,7 @@ namespace :consolidate do
     ReceiptDetail.delete_all
     sales = Sale.all_receipt_details
 
-    shop  = Shop.find(1)
+    shop  = current_shop
 
     sale_id = ''
     count   = 0

From b77602754a17a2012ca6305fa3f9c7827c8b1c1f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 9 Oct 2018 18:03:44 +0630
Subject: [PATCH 64/66] change UI

---
 app/views/origami/payments/show.html.erb | 28 ++++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index caa72f5e..da1c1a2a 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -670,24 +670,25 @@
 </div> 
 
 <!-- customer light box -->
-<div class="modal fade" id="is_paymemberModal" tabindex="-1" role="dialog">
+<div class="modal fade m-t-40" id="is_paymemberModal" tabindex="-1" role="dialog">
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h1 class="modal-title" id="is_paymemberModalLabel">Are you Member?</h1>
+        <!-- <h1 class="modal-title" id="is_paymemberModalLabel">Are you Member?</h1> -->
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
       </div>
       <div class="modal-body">
         <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
         <input type="hidden" name="qr_code" id="qr_code" />
-        <div class="row text-center m-t-20">
+        <div class="row text-center m-t-20" align="center">
+          <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3"></div>
           <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
-            <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_paymal_member">Card Member</button>
+            <button type="button" class="btn btn-lg btn-link bg-primary btn_paymal_member">Card</button>
           </div>
 
-          <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+          <!-- <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
             <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_paymal_qr_code">QR Code</button>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="modal-footer"></div>
@@ -705,11 +706,12 @@ var customer_id = "<%= @customer.id %>";
 var customer_name = "<%= @customer.name %>";
 var pdf_view = '<%=@pdf_view%>';
 var trans_flag = <%= @trans_flag %>;
+var paymalcount = <%= @paymalcount %>;
                 // console.log(pdf_view)
   $(document).ready(function(){
-    <%if @cashier_type == "food_court" && @paymalcount == 0.0 %>
+    if(cashier_type == "food_court" && paymalcount == 0.0){
       $("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false});
-    <% end %>
+    }
     setHeaderBreadCrumb(_PAYMENTS_);
 
     /* replace url type*/
@@ -808,9 +810,9 @@ var trans_flag = <%= @trans_flag %>;
         window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/"+url_param+"/others_payment";
         return false;
       }else{
-        <% if @paymalcount == 0.0 %>
+        if(paymalcount == 0.0){
           $("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false});
-        <% end %>
+        }
       }
     });
 
@@ -1305,7 +1307,9 @@ var trans_flag = <%= @trans_flag %>;
 
   // Read NFC card no from java
   function getCardNo(){
-    code2lab.readNFC();
+    if(typeof code2lab != 'undefined'){
+      code2lab.readNFC();
+    }
   }
 
   // get CardNo from Java
@@ -1660,7 +1664,7 @@ var trans_flag = <%= @trans_flag %>;
   });
 
   // Read Card Reader
-  $(".btn_paymal_member").on('click', function(){  
+  $(".btn_paymal_member").on('click', function (){  
     var cardNo = ""; 
     var sale_id     = $("#sale_id").text() || 0;
     var receipt_no = "";        

From 557b15a7ee52835205d26e48ddc0522ce1f71d29 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 9 Oct 2018 18:04:31 +0630
Subject: [PATCH 65/66] update shop

---
 app/uploaders/commissioner_image_uploader.rb | 4 ++--
 app/uploaders/customer_image_uploader.rb     | 4 ++--
 app/uploaders/employee_image_uploader.rb     | 4 ++--
 app/uploaders/menu_item_image_uploader.rb    | 4 ++--
 app/uploaders/product_image_uploader.rb      | 4 ++--
 app/uploaders/shop_image_uploader.rb         | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/uploaders/commissioner_image_uploader.rb b/app/uploaders/commissioner_image_uploader.rb
index a6389405..9b65e4a8 100644
--- a/app/uploaders/commissioner_image_uploader.rb
+++ b/app/uploaders/commissioner_image_uploader.rb
@@ -20,10 +20,10 @@ class CommissionerImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if current_shop.shop_code.nil?
+    if Shop.first.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
+      "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/customer_image_uploader.rb b/app/uploaders/customer_image_uploader.rb
index 13a384f0..be1326d6 100644
--- a/app/uploaders/customer_image_uploader.rb
+++ b/app/uploaders/customer_image_uploader.rb
@@ -20,10 +20,10 @@ class CustomerImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if current_shop.shop_code.nil?
+    if Shop.first.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
+      "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/employee_image_uploader.rb b/app/uploaders/employee_image_uploader.rb
index e176d660..17c9d120 100644
--- a/app/uploaders/employee_image_uploader.rb
+++ b/app/uploaders/employee_image_uploader.rb
@@ -20,10 +20,10 @@ class EmployeeImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if current_shop.shop_code.nil?
+    if Shop.first.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
+      "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/menu_item_image_uploader.rb b/app/uploaders/menu_item_image_uploader.rb
index 4198e501..8a340b22 100755
--- a/app/uploaders/menu_item_image_uploader.rb
+++ b/app/uploaders/menu_item_image_uploader.rb
@@ -20,10 +20,10 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if current_shop.shop_code.nil?
+    if Shop.first.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
+      "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/product_image_uploader.rb b/app/uploaders/product_image_uploader.rb
index 32e5f272..c39d867d 100755
--- a/app/uploaders/product_image_uploader.rb
+++ b/app/uploaders/product_image_uploader.rb
@@ -20,10 +20,10 @@ class ProductImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if current_shop.shop_code.nil?
+    if Shop.first.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
+      "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 
diff --git a/app/uploaders/shop_image_uploader.rb b/app/uploaders/shop_image_uploader.rb
index 7927548a..394704c3 100644
--- a/app/uploaders/shop_image_uploader.rb
+++ b/app/uploaders/shop_image_uploader.rb
@@ -20,10 +20,10 @@ class ShopImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if current_shop.shop_code.nil?
+    if Shop.first.shop_code.nil?
       "#{original_filename}" if original_filename.present? 
     else
-      "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? 
+      "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? 
     end    
   end
 

From d913c074e085da8e5da55ad571401f016f750b24 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 9 Oct 2018 18:07:13 +0630
Subject: [PATCH 66/66] remove reservation migrate

---
 .../20180928052742_create_reservations.rb     | 24 -----------------
 ...20180928074338_create_reservation_items.rb | 26 -------------------
 2 files changed, 50 deletions(-)
 delete mode 100644 db/migrate/20180928052742_create_reservations.rb
 delete mode 100644 db/migrate/20180928074338_create_reservation_items.rb

diff --git a/db/migrate/20180928052742_create_reservations.rb b/db/migrate/20180928052742_create_reservations.rb
deleted file mode 100644
index 637c4ba0..00000000
--- a/db/migrate/20180928052742_create_reservations.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-class CreateReservations < ActiveRecord::Migration[5.1]
-  def change
-    create_table :reservations, :id => false do  |t|
-		t.string     :reservation_id, :limit => 16, :primary_key => true
-		t.string     :source, :null => false, :default => "Cashier"
-		t.string 	 :reservation_type, :null => false
-		t.string 	 :customer_id, :null => false
-		t.datetime 	 :checkin_datetime, :null => false
-		t.datetime   :checkout_datetime
-		t.json       :reservation_info
-		t.string     :remark
-		t.string 	 :status, :null => false, :default => "new"
-		t.datetime   :action_at, :null => false
-		t.string     :action_by, :null => false
-		t.datetime   :modify_at
-		t.string     :modify_by
-		t.timestamps
-    end
-  end
-
-  def down
-  	drop_table :reservations
-  end
-end
diff --git a/db/migrate/20180928074338_create_reservation_items.rb b/db/migrate/20180928074338_create_reservation_items.rb
deleted file mode 100644
index 54ee6097..00000000
--- a/db/migrate/20180928074338_create_reservation_items.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class CreateReservationItems < ActiveRecord::Migration[5.1]
-  def change
-    create_table :reservation_items, :id => false do |t|
-    	t.string   :reservation_items_id, :limit => 16, :primary_key => true
-    	t.string   :reservation_id, foreign_key: true, :null => false, :limit => 16
-    	t.string   :item_status, :null => false, :default => "new"
-		t.string   :item_code, :null => false
-		t.string   :item_instance_code
-		t.string   :item_name, :null => false
-		t.string   :alt_name, :null => false
-		t.json     :set_menu_items
-		t.integer  :account_id, :limit => 8, :null => false, :default => 1
-		t.decimal  :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
-		t.decimal  :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00
-		t.decimal  :price, :precision => 10, :scale => 2, :null => false, :default => 0.00
-		t.string   :remark
-		t.string   :options
-		t.boolean  :taxable, :null => false, :default => true
-		t.timestamps
-    end
-  end
-
-  def down
-  	drop_table :reservation_items
-  end
-end