Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/assets/javascripts/CRM.js

@@ -18,4 +18,5 @@
 //= require cable
 //= require jquery-ui
 //= require bootstrap-datepicker
-//= require bootstrap/modal
+//= require bootstrap/modal
+

app/assets/javascripts/OQS.js

@@ -11,6 +11,7 @@
 // about supported directives.
 //
 //= require jquery
+//= require tether
 //= require bootstrap
 //= require jquery_ujs
 //= require turbolinks

app/controllers/api/bill_controller.rb

@@ -28,6 +28,10 @@ class Api::BillController < Api::ApiController
       @status = false
       @error_message = "No Current Open Shift"
     end
+
+    #@sale_data = Sale.find_by_sale_id(@sale_id)
+    #@sale_items = SaleItem.where("sale_id=?",@sale_id)
+
 # Not Use for these printed bill cannot give customer
     # @sale_data = Sale.find_by_sale_id(@sale_id)
     # @sale_items = SaleItem.where("sale_id=?",@sale_id)
@@ -47,11 +51,12 @@ class Api::BillController < Api::ApiController
     # # Calculate Price by accounts
     # item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
 
+    #customer= Customer.find(@sale_data.customer_id)
+    # get member information
+    #member_info = Customer.get_member_account(customer)
 
     # printer = Printer::ReceiptPrinter.new(print_settings)
     # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
-
-
   end