diff --git a/Gemfile b/Gemfile
index 227cfa72..22275707 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0'
 gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
-gem 'pg'
+# gem 'pg'
 
 # redis server for cable
 # gem 'redis', '~> 3.0'
diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 87121ea3..4c8300e2 100644
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -111,8 +111,9 @@ $(document).ready(function(){
 
   	// Print Order Item
   	$('#print_order_item').on('click',function(){
-  		var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
-  		var params = { 'id':assigned_item_id };
+  		var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
+  		var options = $('.selected-item').children('.card-block').find('.item-options').text();
+  		var params = { 'options':options };
   		$.ajax({
 			type: 'GET',
 	     	url: '/oqs/print/print/'+assigned_item_id,
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 6b350bf1..2670dcc4 100644
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -179,3 +179,11 @@ select.form-control {
 tr.discount-item-row:hover {
 	background-color: #e3e3e3 !important;
 }
+.required abbr{
+    color: red !important;
+}
+/* Jquery Confirm */
+
+.jconfirm-box-container{
+	margin-left:-40px !important
+}
\ No newline at end of file
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 646f6475..17012ad1 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -46,7 +46,7 @@ class Crm::CustomersController < BaseCrmController
     end
 
     #get customer amount
-      @customer       = Customer.find(params[:id])
+      @customer        = Customer.find(params[:id])
       @response        = Customer.get_membership_transactions(@customer)
       #end customer amount
 
@@ -93,7 +93,8 @@ class Crm::CustomersController < BaseCrmController
                                              :headers => {
                                                       'Content-Type' => 'application/json',
                                                       'Accept'       => 'application/json'
-                                              }
+                                              },
+                                              :timeout => 10
                                         )
         rescue Net::OpenTimeout
           response = { status: false }
@@ -163,7 +164,8 @@ end
                                              :headers => {
                                                       'Content-Type' => 'application/json',
                                                       'Accept'       => 'application/json'
-                                              }
+                                              },
+                                              :timeout => 10
                                         )
         rescue Net::OpenTimeout
           response = { status: false }
@@ -201,6 +203,6 @@ end
     def customer_params
 
       params.require(:customer).permit(:name, :company, :contact_no, :email, 
-                :date_of_birth,:salution,:gender,:nrc_no,:address,:card_no)
+                :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no)
     end
 end
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index b4d564f2..18971247 100644
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -2,8 +2,10 @@ class Oqs::HomeController < BaseOqsController
   def index
   	queue_stations=OrderQueueStation.all
 
+    # Query for OQS with delivery status false
   	@queue_items_details = queue_items_query(false)
 
+    # Query for OQS with delivery status true
     @queue_completed_item = queue_items_query(true)
 
     @queue_stations_items=Array.new
@@ -79,29 +81,17 @@ class Oqs::HomeController < BaseOqsController
     render :json => removed_item.to_json
   end
 
-  # Query for OQS with status
-  def queue_items_query(status)
-    puts status
-    puts "put what is status"
-    # AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at")
-    # .joins("  left join order_queue_process_by_zones as oqpz ON oqpz.order_queue_station_id = assigned_order_items.order_queue_station_id
-    #           left join dining_facilities as df on df.zone_id = oqpz.zone_id
-    #           left join order_queue_stations as oqs ON oqs.id = assigned_order_items.order_queue_station_id
-    #           left join orders as od ON od.order_id = assigned_order_items.order_id
-    #           left join order_items as odt ON odt.item_code = assigned_order_items.item_code
-    #           left join customers as cus ON cus.customer_id = od.customer_id")
-    # .where("assigned_order_items.delivery_status = #{status}")
-    # .group("assigned_order_items.assigned_order_item_id")
-    # .order("odt.item_name DESC")
-    AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at")
+  # Query for OQS with delivery status
+  def queue_items_query(status)   
+    AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join orders as od ON od.order_id = assigned_order_items.order_id
-              left join order_items as odt ON odt.item_code = assigned_order_items.item_code
+              left join order_items as odt ON odt.item_code = assigned_order_items.item_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.delivery_status = #{status}")
-    .group("assigned_order_items.assigned_order_item_id,oqs.station_name,oqs.is_active,df.name,odt.item_code,odt.item_name,odt.price, odt.qty, odt.item_order_by,cus.name,odt.created_at")
+    .group("odt.order_items_id")
   end
 end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index ff2cf98d..f3fd5675 100644
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -2,9 +2,10 @@ class Oqs::PrintController < ApplicationController
   # Print Order Item
   def print
   	unique_code="OrderItemPdf"
-  	assigned_item_id=params[:id]
-    assigned_item=AssignedOrderItem.find(assigned_item_id)  	
-    assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+  	assigned_item_id = params[:id]
+    options = params[:options]
+    assigned_item = AssignedOrderItem.find(assigned_item_id)  	
+    assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
     # order queue stations
     oqs = assigned_item.order_queue_station
@@ -13,9 +14,9 @@ class Oqs::PrintController < ApplicationController
     print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
 
     # print when complete click 
-  	print_settings=PrintSetting.find_by_unique_code(unique_code)
-    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-  	order_queue_printer.print_order_item(oqs, assigned_item.order_id, assigned_item.item_code, print_status )
+  	print_settings = PrintSetting.find_by_unique_code(unique_code)
+    order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
+  	order_queue_printer.print_order_item(oqs, assigned_item.order_id, assigned_item.item_code, print_status, options )
   	
     # update print status for completed same order items
     assigned_items.each do |ai|
@@ -27,10 +28,10 @@ class Oqs::PrintController < ApplicationController
   # Print Order Details with booking id
   def print_order_summary
     unique_code="OrderSummaryPdf"
-    assigned_item_id=params[:id]
-    table_name=params[:table_name]
-    assigned_item=AssignedOrderItem.find(assigned_item_id)    
-    assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+    assigned_item_id = params[:id]
+    table_name = params[:table_name]
+    assigned_item = AssignedOrderItem.find(assigned_item_id)    
+    assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
     # order queue stations
     oqs = assigned_item.order_queue_station
@@ -43,13 +44,13 @@ class Oqs::PrintController < ApplicationController
     booking = Booking.find_by_dining_facility_id(dining.id)
     
     # print when complete click 
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
-    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    print_settings = PrintSetting.find_by_unique_code(unique_code)
+    order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
     order_queue_printer.print_booking_summary(oqs, booking.booking_id, print_status)
 
      # update print status for completed same order items
     assigned_items.each do |ai|
-      ai.print_status=true
+      ai.print_status = true
       ai.save       
     end              
   end
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 601055e5..373dc2f5 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -39,5 +39,29 @@ class Origami::CustomersController < BaseOrigamiController
     end
   end
 
+  def update_sale_by_customer
+
+    id = params[:sale_id][0,3]
+    if(id == "SAL")
+       sale   = Sale.find(params[:sale_id])
+       status = sale.update_attributes(customer_id: params[:customer_id])
+    else
+       @booking = BookingOrder.find_by_order_id(params[:sale_id])
+       @orders  = BookingOrder.where("booking_id = ? ", @booking.booking_id)
+
+        @orders.each do |bo|
+          order  = Order.find(bo.order_id)
+          status = order.update_attributes(customer_id: params[:customer_id])
+       end
+
+    end
+
+    if status == true
+        render json: JSON.generate({:status => true})
+    else
+        render json: JSON.generate({:status => false, :error_message => "Record not found"})
+    end
+  end
+
  
 end
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 792cb7a4..802ba51b 100644
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -6,8 +6,24 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
     # limit redeem_amount
-    rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items)
-    nonrebate_prices = sale_data.total_amount - rebate_prices
+    # rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items)
+    # nonrebate_prices = sale_data.total_amount - rebate_prices
+    # @payparcount = 0
+    # others = 0
+    # sale_data.sale_payments.each do |sale_payment|
+    #     if sale_payment.payment_method == "paypar"
+    #       @payparcount = @payparcount + sale_payment.payment_amount
+    #     else
+    #       others = others + sale_payment.payment_amount
+    #     end
+    # end
+    # non_rebate_exceed = others - (nonrebate_prices +  sale_data.total_tax)
+    # if non_rebate_exceed < 0
+    #   @redeem_prices = rebate_prices - @payparcount
+    # else
+    #   @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed
+    # end
+
     @payparcount = 0
     others = 0
     sale_data.sale_payments.each do |sale_payment|
@@ -17,12 +33,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
           others = others + sale_payment.payment_amount
         end
     end
-    non_rebate_exceed = others - (nonrebate_prices +  sale_data.total_tax)
-    if non_rebate_exceed < 0
-      @redeem_prices = rebate_prices - @payparcount
-    else
-      @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed
-    end
+    @redeem_prices = sale_data.grand_total - @payparcount -others
+
 
  		if sale_data
  			if sale_data.customer_id
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 37eef687..93453ffc 100644
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -22,7 +22,7 @@ class Origami::RequestBillsController < BaseOrigamiController
     unique_code = "ReceiptBillPdf"
     # customer= Customer.where('customer_id=' +.customer_id)
     
-    customer= Customer.find( @sale_data.customer_id)
+    customer= Customer.find(@sale_data.customer_id)
     # get member information
       member_info = Customer.get_member_account(customer)
     # get printer info
diff --git a/app/controllers/reports/daily_sale_controller.rb b/app/controllers/reports/daily_sale_controller.rb
index 6e1eb85a..ba453f55 100644
--- a/app/controllers/reports/daily_sale_controller.rb
+++ b/app/controllers/reports/daily_sale_controller.rb
@@ -4,6 +4,10 @@ class Reports::DailySaleController < BaseReportController
 	from, to ,report_type  = get_date_range_from_params
 	@sale_data = Sale.daily_sales_list(from,to)
 	@tax       = SaleTax.get_tax(from,to)
+	respond_to do |format|
+      format.html
+      format.xls
+    end
   end
   
   def show
diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index 86c8d981..d85c7d57 100644
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -8,6 +8,10 @@ class Reports::ReceiptNoController < BaseReportController
 		puts to
 		@sale_data = Sale.get_receipt_no_list(from,to)
 		@sale_data = Kaminari.paginate_array(@sale_data).page(params[:page]).per(50)
+		respond_to do |format|
+	      format.html
+	      format.xls
+	    end
 	end
 
 	def show
diff --git a/app/controllers/reports/sale_item_controller.rb b/app/controllers/reports/sale_item_controller.rb
index 1da31aff..eb7d3b86 100644
--- a/app/controllers/reports/sale_item_controller.rb
+++ b/app/controllers/reports/sale_item_controller.rb
@@ -5,6 +5,11 @@ class Reports::SaleItemController < BaseReportController
       from, to, report_type  = get_date_range_from_params
 
       @sale_data = Sale.get_by_range_by_saleitems(from,to,Sale::SALE_STATUS_COMPLETED,report_type) 
+
+      respond_to do |format|
+	    format.html
+	    format.xls
+	  end
   end
 
   def show
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 63666a68..f8fb5027 100644
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -1,13 +1,13 @@
 class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
-  def print_order_item(oqs,order_id, item_code, print_status)
+  def print_order_item(oqs,order_id, item_code, print_status, options="")
     #Use CUPS service
     #Generate PDF
     #Print
     order_item =  print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code)  
 
     filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf"  
-    pdf = OrderItemPdf.new(order_item[0], print_status)
+    pdf = OrderItemPdf.new(order_item[0], print_status, options)
     pdf.render_file filename
 
     if oqs.print_copy
@@ -31,7 +31,9 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     if oqs.cut_per_item
       order.each do|odi|
         filename = "tmp/order_item_#{odi.item_name}" + ".pdf"
-        pdf = OrderItemPdf.new(odi, print_status)
+        # For Item Options
+        options = odi.options == "[]"? "" : odi.options
+        pdf = OrderItemPdf.new(odi, print_status, options)
         # pdf.render_file "tmp/order_item.pdf"
         pdf.render_file filename
         if oqs.print_copy
@@ -65,7 +67,10 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     if oqs.cut_per_item
       order.each do|odi|
         filename = "tmp/order_item_#{odi.item_name}" + ".pdf"
-        pdf = OrderItemPdf.new(odi, print_status)        
+        # For Item Options
+        options = odi.options == "[]"? "" : odi.options
+        pdf = OrderItemPdf.new(odi, print_status, options)
+             
         pdf.render_file filename               
 
         if oqs.print_copy
@@ -98,7 +103,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   # Query for OQS with status
   def print_query(type, id)
     if type == "order_item"
-      OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining")
+      OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining")
         .joins("left join orders ON orders.order_id = order_items.order_id
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
@@ -107,16 +112,17 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         .where("order_items.item_code = '#{ id }'")
         .group("order_items.item_code")
     elsif type == "order_summary"                                
-      OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining")
+      OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining")
         .joins("left join orders ON orders.order_id = order_items.order_id
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
                 left join dining_facilities AS df ON df.id = b.dining_facility_id
                 left join customers as cus ON cus.customer_id = orders.customer_id")
         .where("orders.order_id = '#{ id }'")
+        .group("order_items.order_items_id")
     else 
       # order summary for booking
-      OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining")
+      OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining")
         .joins("left join orders ON orders.order_id = order_items.order_id
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 6b02e4c8..f79d8642 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -15,7 +15,7 @@ class Sale < ApplicationRecord
   has_many :bookings
 
   scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
-  scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
+  scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") }
 
   REPORT_TYPE = {
   "daily" => 0,
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index e5c5395f..749a8a16 100644
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -1,6 +1,6 @@
 class OrderItemPdf < Prawn::Document
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
-  def initialize(order_item, print_status)
+  def initialize(order_item, print_status, options)
     self.page_width = 210
     self.page_height = 2500
     self.margin = 5
@@ -29,7 +29,7 @@ class OrderItemPdf < Prawn::Document
     order_info(order_item.order_by,order_item.order_at)
 
     # order items
-    order_items(order_item)
+    order_items(order_item, options)
   end
 
   # Write Order Information to PDF
@@ -52,23 +52,11 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items(order_item)
+  def order_items(order_item, options)
     y_position = cursor
 
-    # No Need for Order Item
-    # bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-    #     text "Item", :size => self.item_font_size,:align => :left
-    # end
-
-    # bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do
-    #     text "Qty", :size => self.item_font_size,:align => :right
-    # end
-
-    # stroke_horizontal_rule
-    # move_down 5
-
     #Add Order Item
-    add_order_items(order_item)
+    add_order_items(order_item, options)
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
@@ -76,7 +64,7 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Add order items under order info
-  def add_order_items(order_item)
+  def add_order_items(order_item, options)
     y_position = cursor
 
     move_down 5
@@ -91,6 +79,14 @@ class OrderItemPdf < Prawn::Document
 
     move_down 5
 
+    # add option
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "#{options}", :size => self.item_font_size,:align => :left
+    end
+
+    move_down 5
+
   end
 
 end
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index a1459512..b9c1f6fe 100644
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -92,6 +92,18 @@ class OrderSummaryPdf < Prawn::Document
       end
 
       move_down 5
+
+      # add option
+      options = odi.options == "[]"? "" : odi.options
+      
+      if options != ""
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "#{options}", :size => self.item_font_size,:align => :left
+        end
+
+        move_down 5
+      end
     end        
 
   end
diff --git a/app/views/api/customers/index.json.jbuilder b/app/views/api/customers/index.json.jbuilder
index 2c3c07a7..0d1d37e7 100644
--- a/app/views/api/customers/index.json.jbuilder
+++ b/app/views/api/customers/index.json.jbuilder
@@ -1,3 +1,3 @@
-json.array! @customers, :id, :name, :company, :contact_no,:salution,
+json.array! @customers, :id, :name, :company, :contact_no,:salutation,
 						 :gender,:nrc_no,:address,:card_no, :membership_type,
 						 :membership_id, :created_at
diff --git a/app/views/api/customers/show.json.jbuilder b/app/views/api/customers/show.json.jbuilder
index db56961b..acf54ac1 100644
--- a/app/views/api/customers/show.json.jbuilder
+++ b/app/views/api/customers/show.json.jbuilder
@@ -1,4 +1,4 @@
-json.extract! @customer, :id, :name, :company, :contact_no,:salution,
+json.extract! @customer, :id, :name, :company, :contact_no,:salutation,
 						 :gender,:nrc_no,:address,:card_no, :membership_type,
 						 :membership_id, :created_at
 json.invoices do
diff --git a/app/views/crm/customers/_crm_customer.json.jbuilder b/app/views/crm/customers/_crm_customer.json.jbuilder
index c80c1716..1b1b237e 100644
--- a/app/views/crm/customers/_crm_customer.json.jbuilder
+++ b/app/views/crm/customers/_crm_customer.json.jbuilder
@@ -1,2 +1,2 @@
-json.extract! crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, :created_at, :updated_at
+json.extract! crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, :created_at, :updated_at,:salutation, :gender,:nrc_no,:address,:card_no
 json.url crm_customer_url(crm_customer, format: :json)
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index e7b47460..3678008e 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -120,7 +120,7 @@ $(document).on('click',".customer_tr",function(){
                     $('#customer_company').val(data.company);
                     $('#customer_contact_no').val(data.contact_no);
                     $('#customer_email').val(data.email);
-                    $('#customer_salution').val(data.salution);
+                    $('#customer_salutation').val(data.salutation);
                     $('#customer_nrc_no').val(data.nrc_no);
                     $('#customer_card_no').val(data.card_no);
                     $('#customer_address').val(data.address);
@@ -133,11 +133,11 @@ $(document).on('click',".customer_tr",function(){
                       $('.female').prop( "checked", true )
                     }
 
-                    if(data.salution == 'Mr') {
+                    if(data.salutation == 'Mr') {
                       $('.mr').prop( "checked", true )
-                    }else if(data.salution == 'Miss') {
+                    }else if(data.salutation == 'Miss') {
                       $('.miss').prop( "checked", true )
-                    }else if(data.salution == 'Mrs'){
+                    }else if(data.salutation == 'Mrs'){
                       $('.mrs').prop( "checked", true )
                     }else{
                       $('.mdm').prop( "checked", true )
diff --git a/app/views/crm/customers/show.json.jbuilder b/app/views/crm/customers/show.json.jbuilder
index d41edb5d..86901801 100644
--- a/app/views/crm/customers/show.json.jbuilder
+++ b/app/views/crm/customers/show.json.jbuilder
@@ -1,5 +1,4 @@
 json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth,
                              :membership_id, :membership_type, :membership_authentication_code,
-                             :created_at, :updated_at,
-                             :salution, :gender,:nrc_no,:address,:card_no
+                             :salutation, :gender,:nrc_no,:address,:card_no
 json.url crm_customer_url(@crm_customer, format: :json)
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 084ae8cf..85858a02 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -49,10 +49,9 @@
                       <%= qid.qty %>
                     </span> ]   
                   </h4>                  
-                  <!-- 
-                  Item Options
-                  <p class="card-text">Medium, Fries, Salad</p> 
-                  -->
+                                    
+                  <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+                 
                   <p class="card-text">
                     <small class="text-muted">Order at 
                     <span class="order-at">
@@ -99,11 +98,10 @@
                       <span class="order-qty">
                         <%= qid.qty %>
                       </span> ]   
-                    </h4>                  
-                     <!-- 
-                  Item Options
-                  <p class="card-text">Medium, Fries, Salad</p> 
-                  -->
+                    </h4>   
+
+                    <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>
+
                     <p class="card-text">
                       <small class="text-muted">Order at 
                       <span class="order-at">
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 3b192319..e862ea7f 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -75,7 +75,15 @@
     <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
     <%= f.error_notification %>
     <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
-    
+    <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>Salutation :</label><br>
        <label>
@@ -225,7 +233,7 @@
                     $('.select > option[value="'+data.membership_id+'"]').attr('selected','selected');
                     $('.membership_authentication_code').val(data.membership_authentication_code);
 
-                    $('#customer_salution').val(data.salution);
+                    $('#customer_salutation').val(data.salutation);
                     $('#customer_nrc_no').val(data.nrc_no);
 
                     if (data.gender == 'Male') {
@@ -234,11 +242,11 @@
                       $('.female').prop( "checked", true )
                     }
 
-                    if (data.salution == 'Mr') {
+                    if (data.salutation == 'Mr') {
                       $('.mr').prop( "checked", true )
-                    } else if(data.salution == 'Miss') {
+                    } else if(data.salutation == 'Miss') {
                       $('.miss').prop( "checked", true )
-                    }else if(data.salution == 'Mrs'){
+                    }else if(data.salutation == 'Mrs'){
                       $('.mrs').prop( "checked", true )
                     }else{
                       $('.mdm').prop( "checked", true )
@@ -246,7 +254,7 @@
 
                     $('#update_customer').removeAttr('disabled').val('');
                     $('#update_customer').attr('value', 'Update');
-                    $('#submit_customer').attr('disabled','disabled');
+                    // $('#submit_customer').attr('disabled','disabled');
 
                     $("#new_customer").attr('class', 'simple_form edit_customer');
                     var id = "edit_customer_"+$('#customer_id').val();
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 781f925b..d0b53858 100644
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -307,7 +307,7 @@ $(document).ready(function(){
   // bind customer to order or sale
   $("#customer").on('click', function(){
     var sale = $('#sale_id').val();
-    if (sale!="") {
+    if (sale) {
       var sale_id = sale
     }else{
       var sale_id = $('#save_order_id').attr('data-order');
@@ -344,6 +344,7 @@ $('#pay').on('click',function() {
    window.location.href = '/origami/sale/'+ sale_id + "/payment";
 });
 
+// Bill Request
 $('#request_bills').click(function() {
     var order_id = $('#save_order_id').attr('data-order');
     var ajax_url = "/origami/" + order_id + "/request_bills";
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index 023912ca..cbe356b5 100644
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -6,7 +6,7 @@
 		    		<div class="row">
 			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
 			      			<label class="col-lg-4 col-md-4 col-sm-4">You can redeem upto </label>
-						      	<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @redeem_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+						      	<input type="text" name="" id="redeemamt" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @redeem_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 			    		</div>
 			    		<hr>
 						</div>
@@ -131,8 +131,8 @@ $(document).on('click', '.cashier_number', function(event){
 			          $('#used_amount').text(cash.substr(0,cash.length-1));
 								break;
 								case 'nett':
-								alert($('#valid_amount').text())
-								$('#used_amount').text($('#valid_amount').text());
+								var remain_amount = $('#redeemamt').val();
+								$('#used_amount').text(remain_amount);
 			        break;
 
           		}
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index c1797158..d3b78719 100644
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -98,7 +98,7 @@
      <div class="card"  >
        <div class="card-header">
          <% if @status == "order" %>
-            <div><strong id="order-title">ORDER DETAILS </strong></div>
+            <div id="save_order_id" data-order="<%= @obj.order_id %>"><strong id="order-title">ORDER DETAILS </strong></div>
          <% else %>
             <div><strong id="order-title">INVOICE DETAILS </strong></div>
          <% end %>
@@ -139,7 +139,7 @@
                   sub_total = sub_total + sale_item.price
                %>
                <input type="hidden" id="sale_id" value="<%= @obj.sale_id %>">
-               <% unless sale_item.price <= 0 %>
+               <% unless sale_item.price == 0 %>
                <tr>
                  <td class='item-name'><%= sale_item.product_name %></td>
                  <td class='item-attr'><%= sale_item.qty %></td>
@@ -155,7 +155,7 @@
                     @order_items.each do |order_item |
                     sub_total = sub_total + order_item.price
 
-                unless order_item.price <= 0 %>
+                unless order_item.price == 0 %>
                <tr>
                  <td class='item-name'><%= order_item.item_name %></td>
                  <td class='item-attr'><%= order_item.qty %></td>
@@ -259,15 +259,65 @@ $(document).ready(function(){
     var order_id = $(this).attr("data-id");
     window.location.href = '/origami/order/' + order_id;
   })
+
+  // bind customer to order or sale
+  $("#customer").on('click', function(){
+    var sale = $('#sale_id').val();
+    if (sale) {
+      var sale_id = sale
+    }else{
+      var sale_id = $('#save_order_id').attr('data-order');
+    }
+
+    window.location.href = '/origami/'+ sale_id  + "/customers"    
+  });
+
+  // Discount for Payment
+  $('#discount').click(function() {
+    var sale = $('#sale_id').val();
+    if (sale!="") {
+      var sale_id = sale
+    }else{
+      var sale_id = $('#save_order_id').attr('data-order');
+    }
+    
+    if(sale_id!=""){
+      window.location.href = '/origami/' + sale_id + '/discount'
+    }
+    else {
+      alert("Please select an table!");
+    }
+
+    return false;
+  });
 });
+
+
 $('#pay').on('click',function() {
    var sale_id = $('#sale_id').val();
    window.location.href = '/origami/sale/'+ sale_id + "/payment";
 });
+
+// Bill Request
+$('#request_bills').click(function() {
+    var order_id = $('#save_order_id').attr('data-order');
+    var ajax_url = "/origami/" + order_id + "/request_bills";
+    $.ajax({
+      type: "POST",
+        url: ajax_url,
+        data: 'order_id='+ order_id,
+        success:function(result){
+
+          location.reload();
+        }
+    });
+});
+
 $('#move').on('click',function(){
   var dining_id = "<%= @room.id %>"
   window.location.href = '/origami/table/'+ dining_id + "/moveroom";
 })
+
 $('#back').on('click',function(){
   window.location.href = '/origami/';
 })
diff --git a/app/views/reports/sale_item/index.xls.erb b/app/views/reports/sale_item/index.xls.erb
index dfcc18d4..2807ec3f 100644
--- a/app/views/reports/sale_item/index.xls.erb
+++ b/app/views/reports/sale_item/index.xls.erb
@@ -1,116 +1,136 @@
-<div class="card row">
-	  <div class="table-responsive">
-	  <table class="table table-bordered">
-	  <thead> 
-		  <% if params[:from]%>
-		    <tr>
-		        <th colspan="17"> Sale (<%= params[:from] rescue '-' %> - <%= params[:to]  rescue '-'%>)</th>
-		   </tr>
-		  <% end %> 
-		    <tr>
-		    <th style='text-align:center;'>Sr.no</th>
-		    <th style='text-align:center;'>Date</th>
-		    <th style='text-align:center;'>Daily Void Amount</th>
-		    <th style='text-align:center;'>Daily mpu Sales</th>
-		    <th style='text-align:center;'>Daily master Sales</th>
-		    <th style='text-align:center;'>Daily visa Sales</th>
-		    <th style='text-align:center;'>Daily jcb Sales</th>
-		    <th style='text-align:center;'>Daily paypar Sales</th>
-		    <th style='text-align:center;'>Daily Cash Sales</th>
-		    <th style='text-align:center;'>Daily Credit Sales</th>
-		    <th style='text-align:center;'>Daily FOC Sales</th>
-		    <th style='text-align:center;'>(Daily Discount)</th>
-		    <th style='text-align:center;'>Grand Total + <br/> Rounding Adj.</th>     
-		    <th style='text-align:center;'>Rounding Adj.</th>
-		    <th style='text-align:center;'>Grand Total</th>     	        
-		    </tr>
-		  </thead>
-		<% unless @sale_data.empty? %>
-		  
-		  <tbody>
-		  <% void   = 0 %>
-		  <% mpu    = 0 %>
-		  <% master = 0 %>
-		  <% visa   = 0 %>
-		  <% jcb    = 0 %>
-		  <% paypar = 0 %>
-		  <% cash   = 0 %>
-		  <% credit = 0 %>
-		  <% foc    = 0 %>
-		  <% discount = 0 %>
-		  <% total    = 0 %>
-		  <% grand_total = 0 %>  
-		  <% count = 1 %> <% rounding_adj = 0 %>
-		  <% @sale_data.each do |sale| %>
-		    <% void += sale[:void_amount] %>
-		    <% mpu += sale[:mpu_amount] %>
-		    <% master += sale[:master_amount] %>
-		    <% visa += sale[:visa_amount] %>
-		    <% jcb += sale[:jcb_amount] %>
-		    <% paypar += sale[:paypar_amount] %>
-		    <% cash += sale[:cash_amount] %>
-		    <% credit += sale[:credit_amount] %>   
-		    <% foc += sale[:foc_amount] %>
-		    <% discount += sale[:total_discount] %>
-		    <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f  %>
-		    <% grand_total += sale[:grand_total].to_f  %>	
-		    <% rounding_adj += sale[:rounding_adj].to_f %>	
-		  <tr>
-		    <td style='text-align:right;'><%= count %></td>
-		    <td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
-		    <td style='color:red;text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>    
-		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%></td>	   	
-		  </tr>
-		  <% count = count + 1 %>
-		  <% end %>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+	<meta http-equiv="Content-type" content="application/vnd.ms-excel; charset=UTF-8">
+</head>
+<body>
+<div class="span12">
+<% unless @sale_data.blank? %>
 
-		  <tr style="font-weight:600;">
-		    <td colspan="3" style='text-align:center;'>Total</td>	
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%></td>    
-		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
-			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
-			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%></td>   
-		  </tr>
+<table class="table table-striped" id="items_table" border="0">
+  <thead>
 
-		  <% total_tax = 0 %>
-		  <% unless @tax.empty? %>
-		  <% @tax.each do |tax| %>
-		  <% total_tax += tax.tax_amount.to_f %>
-		  <tr style="font-weight:600;">
-		    <td colspan="12" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%></td>
-			<td colspan="2">&nbsp;</td>
-		  </tr>
-		  
-		  <% end %>
-		  <% net = total - total_tax %>
-		  <tr style="font-weight:600;">
-		    <td colspan="12" style='text-align:right;'>Net Amount</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%></td>
-			<td colspan="2">&nbsp;</td>	
-		  </tr>
-		  <% end %>
-		  </tbody>
+	<% if !params[:from].blank?%>
+    <tr>
+        <th colspan="7">From Date : <%= params[:from] %>	,	To Date : <%= params[:to] %></th>
+	</tr>
+	<% end %>
+	<% if @shift_from %>
+	<tr>
+		<% if @shift_data.employee %>		
+			<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+		<% end %>			
+		<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+    </tr>
+	<% end %>
+	<tr>
+		<th>&nbsp;</th>
+		<th>Menu Category</th>
+		<th>Code</th>
+		<th>Product</th>
+		<th>Total Item</th>
+		<th>Unit Price</th>
+ 	 <th>Revenue</th>
+	</tr>	
+  </thead>
+  <tbody>
+	  
+	  <% acc_arr = Array.new %>
+	  <% cate_arr = Array.new %>	  
+
+	  <% sub_total = 0.0 %>
+	  <% count = 0%>
+	  <% total_price = 0.0 %>
+	  <% cate_count = 0 %>
+	  <% acc_count = 0%>
+	  <% grand_total = 0%>
+	  <% total_discount = 0.0 %>
+	
+	<% @sale_data.order("total_item desc").each do |sale| %>
+	
+  	<% if !acc_arr.include?(sale.account_id) %>
+	  	<tr>
+			<td><b><%= sale.account_name %></b></td>
+			<td colspan="4">&nbsp;</td>
+			<td>Total Price By <%= sale.account_name %></td>
+			<td>
+				<% @totalByAccount.each do |account, total| %>
+					<% if sale.account_id == account %>
+						<b><%= total %></b>
+					<% end %>
+				<% end %>
+			</td>
+		</tr>
+		<% acc_arr.push(sale.account_id) %>
+
+	<% end %>
+	<tr>
+		<td>&nbsp;</td>
+		<% if !cate_arr.include?(sale.menu_category_id) %>	
+			<td><%= sale.menu_category_name %></td>
+			<% cate_arr.push(sale.menu_category_id) %>
+		<% else %>
+			<td>&nbsp;</td>
 		<% end %>
-		</table>
-		</div>
-	</div>
\ No newline at end of file
+		<td><%= sale.code rescue '-' %></td>
+		<% if @item_table == 'sale' %>
+			<% if sale.item_remark == 'FOC' %>
+				<td><%= '[PROMO] '.to_s + sale.product_name.to_s rescue '-' %></td>
+			<% elsif sale.item_remark == 'FOC ITEM' %>
+				<td><%= '[DIS:QTY] '.to_s + sale.product_name.to_s rescue '-' %></td>
+			<% elsif sale.item_remark == 'DISCOUNT' %>
+				<td><%= '[DIS:TP] '.to_s + sale.product_name.to_s rescue '-' %></td>
+			<% else %>
+				<td><%= sale.product_name.to_s rescue '-' %></td>
+			<% end %>
+			<% if sale.item_remark == 'DISCOUNT' %>
+				<td> - </td>
+				<td> - </td>
+				<td><%= sale.total_price.abs rescue '-' %></td>
+				<% total_price += sale.total_price %>
+			<% else %>
+				<td><%= sale.total_item.abs rescue '-' %></td>
+				<td><%= sale.unit_price rescue '-' %></td>
+				<td><%= sale.grand_total.abs rescue '-' %></td>
+			<% end %>
+		<% else %>
+			<td><%= sale.product_name.to_s rescue '-' %></td>
+			<td><%= sale.total_item.abs rescue '-' %></td>
+			<td><%= sale.unit_price rescue '-' %></td>
+			<td><%= sale.grand_total.abs rescue '-' %></td>
+		<% end %>
+	</tr>
+	
+	<!-- sub total -->
+	 <% @menu_cate_count.each do |key,value| %>
+		<% if sale.menu_category_id == key %> 
+			<% count = count + 1 %>	
+			<% sub_total += sale.grand_total %>
+			<% if count == value %>	
+				<tr>
+					<td colspan="5">&nbsp;</td>
+					<td>Sub Total</td>
+					<td ><span class="underline"><%= sub_total + total_price %></span></td>
+				</tr>
+				<% sub_total = 0.0%>
+				<% total_discount = total_discount + total_price %>
+				<% total_price = 0.0%>
+				<% count = 0%>
+			<% end %>
+		<% end %>
+	 <% end %>
+	<!-- end sub total -->
+	<% grand_total += sale.grand_total%>	  
+	<% end %>
+	<tr>
+		<td colspan="5">&nbsp;</td>
+		<td>Grand Total</td>
+		<td><span class="double_underline"><%= grand_total + total_discount %></span></td>
+	</tr>
+  </tbody>
+</table>
+<% end %>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index dc189968..3859c754 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,3 +2,4 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
+Mime::Type.register 'application/vnd.ms-excel', :xls
diff --git a/config/routes.rb b/config/routes.rb
index ca4cb9bc..0bf24ce7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -113,7 +113,7 @@ Rails.application.routes.draw do
     #resources :customers
     get '/:sale_id/customers', to: "customers#add_customer"
     get '/:customer_id/get_customer' => 'home#get_customer'
-    post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table
+    post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer"#update customer id in sale table
   end
 
   #--------- Waiter/Ordering Station ------------#
diff --git a/db/migrate/20170621085729_create_customers.rb b/db/migrate/20170622050926_create_customers.rb
similarity index 81%
rename from db/migrate/20170621085729_create_customers.rb
rename to db/migrate/20170622050926_create_customers.rb
index 57553010..07ec136f 100644
--- a/db/migrate/20170621085729_create_customers.rb
+++ b/db/migrate/20170622050926_create_customers.rb
@@ -1,22 +1,20 @@
 class CreateCustomers < ActiveRecord::Migration[5.1]
   def change
-    create_table :customers, :id => false do |t|
+   create_table :customers, :id => false do |t|
       t.string :customer_id, :limit => 16, :primary_key => true #custom foreign_key to prevent conflict during sync
       t.string :name, :null => false
       t.string :company
-      t.string :contact_no, :unique => true
       t.string :email
-      t.date   :date_of_birth
-      t.string :membership_id
-      t.string :membership_type
-      t.string :membership_authentication_code
-      t.string :salution
+      t.string :contact_no, :unique => true
+      t.date :date_of_birth
+      t.string :salutation
       t.string :gender
       t.string :nrc_no
       t.string :address
       t.string :card_no, :unique => true
-
-      t.timestamps
+      t.string :membership_id
+      t.string :membership_type
+      t.string :membership_authentication_code
     end
   end
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index c3d9a354..fc3e1bde 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -79,12 +79,13 @@ account_type = Lookup.create([{lookup_type:'account_type', name: 'Income', value
 # sale void reason
 void_reason = Lookup.create([{lookup_type:'void_reason', name: 'Approve By Manager', value: 'Approve By Manager'},
                                 {lookup_type:'void_reason', name: 'Customer Mistake', value: 'Customer Mistake'},
-                                {lookup_type:'void_reason', name: 'Cashier Mistake', value: 'Cashier Mistake'},                                
+                                {lookup_type:'void_reason', name: 'Cashier Mistake', value: 'Cashier Mistake'},
                                 {lookup_type:'void_reason', name: 'Waiter Mistake', value: 'Waiter Mistake'}])
 
 #WALK CUSTOMER - Default CUSTOMER (take key 1)
-customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000", card_no:'000' })
-customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111", card_no:'111' })
+customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"})
+customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111"})
+
 
 #Default ZOne
 # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"})