diff --git a/app/controllers/api/customers_controller.rb b/app/controllers/api/customers_controller.rb
index ce432b90..e20a2d68 100755
--- a/app/controllers/api/customers_controller.rb
+++ b/app/controllers/api/customers_controller.rb
@@ -1,5 +1,5 @@
-class Api::CustomersController < ActionController::API
-
+class Api::CustomersController < Api::ApiController
+  skip_before_action  :authenticate
   #List all active customers by name
   def index
     @customers = Customer.order("name asc")
@@ -17,6 +17,6 @@ class Api::CustomersController < ActionController::API
 
   #Show customer last five order
   def get_customer_last_orders
-    @customer = Customer.find(params[:customer_id])
+    @sales =Sale.where("sales.customer_id=? and sales.sale_status =?",params[:customer_id],'completed').order("created_at desc").limit(5)
   end
 end
diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 68d1e32c..777588ba 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -46,7 +46,7 @@ class Api::OrdersController <  Api::ApiController
       @tax_profile = TaxProfile.where("lower(group_type)='cashier'")
     # end
 
-    #  
+    #
     return @shop.to_json
   end
 
diff --git a/app/controllers/api/verifications_controller.rb b/app/controllers/api/verifications_controller.rb
index b53b2bad..845c7bc4 100644
--- a/app/controllers/api/verifications_controller.rb
+++ b/app/controllers/api/verifications_controller.rb
@@ -5,7 +5,7 @@ class Api::VerificationsController < Api::ApiController
 
 		#TODO - user generate
 		cus = Customer.new
-		@cus = cus.draft_customer(phone_number, rand(1000..9999))
+		@cus = cus.draft_customer(params, rand(1000..9999))
 	    if @cus.verify_status == false
 	    	VerifyNumber.send_message(phone_number, @cus.pin_code)
 	    	@result = true
diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb
index aa856801..ae9ad34a 100755
--- a/app/controllers/settings/order_queue_stations_controller.rb
+++ b/app/controllers/settings/order_queue_stations_controller.rb
@@ -6,7 +6,7 @@ class Settings::OrderQueueStationsController < ApplicationController
   # GET /settings/order_queue_stations
   # GET /settings/order_queue_stations.json
   def index
-    @settings_order_queue_stations = OrderQueueStation.all
+    @settings_order_queue_stations = OrderQueueStation.where("shop_code=?",@shop.shop_code)
     @settings_order_queue_stations = Kaminari.paginate_array(@settings_order_queue_stations).page(params[:page]).per(50)
   end
 
@@ -29,7 +29,7 @@ class Settings::OrderQueueStationsController < ApplicationController
   # POST /settings/order_queue_stations
   # POST /settings/order_queue_stations.json
   def create
-     
+
     @settings_order_queue_station = OrderQueueStation.new(settings_order_queue_station_params)
     @settings_order_queue_station.created_by = current_login_employee.name
     @settings_order_queue_station.processing_items = "[]"
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 569efac1..0850b6a4 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -17,11 +17,11 @@ class Customer < ApplicationRecord
 
   paginates_per 50
 
-  def draft_customer(phone, pin)
-    cus = Customer.find_by_contact_no(phone)
+  def draft_customer(params, pin)
+    cus = Customer.find_by_contact_no(params[:phone_number])
     if cus.nil?
-      self.name = "User " + pin.to_s
-      self.contact_no = phone
+      self.name = params[:name]
+      self.contact_no = params[:phone_number]
       self.email = pin.to_s + "@gmail.com"
       self.pin_code = pin.to_s
       self.pin_sent_at = Time.now
diff --git a/app/models/order.rb b/app/models/order.rb
index 6bf30813..f7b2c269 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -37,11 +37,13 @@ class Order < ApplicationRecord
                                 :checkin_at => Time.now.utc,:checkout_at => Time.now.utc + self.extra_time.to_i,
                                 :checkin_by =>  self.employee_name,
                                 :booking_status => "assign",
+                                :customer_id => self.customer_id,
                                 :shop_code=>self.shop_code})
       else
         booking = Booking.create({:dining_facility_id => table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
                                 :booking_status => "assign",
+                                :customer_id => self.customer_id,
                                 :shop_code=>self.shop_code })
       end
       #end extra time
diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb
index 39cbb431..e0d4fc85 100755
--- a/app/models/printer/printer_worker.rb
+++ b/app/models/printer/printer_worker.rb
@@ -38,20 +38,20 @@ class Printer::PrinterWorker
   end
 
   def print(file_path,printer_destination = nil )
-    # if printer_destination.nil?
-    #   printer_destination = self.printer_destination
-    # end
-    #
-    # puts printer_destination
-    # puts '........Printer Destination..........'
-    #
-    # copy = self.print_copies
-    # #Print only when printer information is not null
-    # if !self.printer_destination.nil?
-    #   (1..copy).each do
-    #     page = Cups::PrintJob.new(file_path, printer_destination)
-    #     page.print
-    #   end
-    # end
+    if printer_destination.nil?
+      printer_destination = self.printer_destination
+    end
+
+    puts printer_destination
+    puts '........Printer Destination..........'
+
+    copy = self.print_copies
+    #Print only when printer information is not null
+    if !self.printer_destination.nil?
+      (1..copy).each do
+        page = Cups::PrintJob.new(file_path, printer_destination)
+        page.print
+      end
+    end
   end
 end
diff --git a/app/views/api/customers/get_customer_last_orders.json.jbuilder b/app/views/api/customers/get_customer_last_orders.json.jbuilder
new file mode 100644
index 00000000..79acbfed
--- /dev/null
+++ b/app/views/api/customers/get_customer_last_orders.json.jbuilder
@@ -0,0 +1,9 @@
+if(@sales)
+	json.sales @sales do |sale|
+		json.sale_id sale.sale_id
+		json.customer_id sale.customer_id
+		json.receipt_no sale.receipt_no
+		json.grand_total sale.grand_total
+		json.sale_items sale.sale_items
+	end
+end
diff --git a/app/views/foodcourt/dashboard/_menu.json.jbuilder b/app/views/foodcourt/dashboard/_menu.json.jbuilder
index 9c9f1963..19b05aa5 100644
--- a/app/views/foodcourt/dashboard/_menu.json.jbuilder
+++ b/app/views/foodcourt/dashboard/_menu.json.jbuilder
@@ -8,22 +8,17 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 if (menu.menu_categories)
   order_by = Lookup.find_by_lookup_type("order_by")
   # if !order_by.nil? && order_by.value == "name"
-  #   categories = MenuCategory.unscoped.where("menu_id ='#{menu.id}'").order("name asc")
+  #   categories = MenuCategory.unscope(:order).where("menu_id ='#{menu.id}'").order("name asc")
   # else
   #   categories = menu.menu_categories
   # end
   categories = menu.menu_categories
   json.categories  categories do |category|
     if category.is_available
-      parent_category = category.parent
-      if !parent_category.nil?
-        json.sub_category "true"
-      else
-        json.sub_category "false"
-      end
+      json.sub_category category.children.present?
+
       valid_time = category.valid_time
       json.valid_time valid_time
-
       json.id category.id
       json.code category.code
       json.order_by category.order_by
@@ -80,7 +75,7 @@ if (menu.menu_categories)
                 alt_name: its.alt_name,
                 min_selectable_qty: its.min_selectable_qty,
                 max_selectable_qty: its.max_selectable_qty,
-                instances: its.menu_item_instances.pluck(:id).map { |id| {id: id}}
+                instances: its.menu_item_instances.map { |i| {id: i.id} }
               }
             }
 
@@ -100,6 +95,7 @@ if (menu.menu_categories)
                 json.is_default is.is_default
                 json.is_on_promotion is.is_on_promotion
                 json.promotion_price is.promotion_price
+                json.out_of_stock is.is_out_of_stock
                 json.values instance_attr
               end
             end
diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb
index 908e2844..41185fca 100755
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/app/views/settings/order_queue_stations/_form.html.erb
@@ -31,7 +31,7 @@ div.form-inputs span{
           <%= f.input :print_copy %>
           <%= f.hidden_field :processing_items %>
           <%= f.label "Select Zones", :class => 'control-label' %>
-          <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'checkbox'%>
+          <%= f.collection_check_boxes :zone_ids , Zone.shop, :id, :name , :class => 'checkbox'%>
           <%= f.input :cut_per_item %>
           <%= f.input :use_alternate_name %>
           <%= f.input :processing_items, as: :hidden %>
@@ -69,24 +69,24 @@ div.form-inputs span{
           2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.order_queue_stations_txt") %> <br>
         </p>
       </div>
-    </div>  
+    </div>
   </div>
 </div>
 
 <script type="text/javascript">
   $(document).ready(function(){
-    var serverMode = "<%= @server_mode %>";    
+    var serverMode = "<%= @server_mode %>";
     if(serverMode == 'cloud'){
-      var printers = code2lab.getPrinters();      
-      var printerInfo = JSON.parse([printers]); 
-      var select = $("#order_queue_station_printer_name"); 
+      var printers = code2lab.getPrinters();
+      var printerInfo = JSON.parse([printers]);
+      var select = $("#order_queue_station_printer_name");
 
-      $.each(printerInfo, function(key, value) {      
+      $.each(printerInfo, function(key, value) {
        $('#order_queue_station_printer_name')
            .append($("<option></option>")
                       .attr("value",value.target)
-                      .text(value.deviceName)); 
-      }); 
-    } 
+                      .text(value.deviceName));
+      });
+    }
   });
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 0cd05e48..8828b51f 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -83,7 +83,7 @@ scope "(:locale)", locale: /en|mm/ do
     get "customers/get_order/:id" => "customers#get_customer_order"
 
     #get customer last five  orders
-    get "customers/get_orders/:customer_id" => "customers#get_customer_last_orders"
+    get "get_customer_last_orders" => "customers#get_customer_last_orders"
 
     #Generating Invoice and making payments - output render @sale
     resources :invoices, only: [:index, :show, :create, :update, :destroy] do