merge with origin master

app/controllers/api/bill_controller.rb

@@ -37,14 +37,18 @@ class Api::BillController < Api::ApiController
     # # get member information
     # member_info = Customer.get_member_account(customer)
 
+
     # # get printer info
     # print_settings=PrintSetting.find_by_unique_code(unique_code)
 
     # # Calculate Price by accounts
     # item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
 
+
     # 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