fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30
parent 858ddfd93b 2010b6a4bb
commit d41d957688
37 changed files with 295 additions and 430 deletions
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -46,9 +46,6 @@ class Api::OrdersController <  Api::ApiController
      @tax_profile = TaxProfile.where("lower(group_type)='cashier'")
    # end

-    # @shop = Shop.first
-    puts "Hello world"
-    puts @shop.to_json
    return @shop.to_json
  end

@@ -150,7 +147,6 @@ class Api::OrdersController <  Api::ApiController
    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"