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/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -1,11 +1,8 @@
 class Origami::TableInvoicesController < BaseOrigamiController
 	def index
    @table = DiningFacility.find(params[:table_id])
-    # shop        =  Shop.first
-    puts "table bookig lenght"
    @sale_array = Array.new
    @table.bookings.each do |booking|
-      puts booking.sale_id

         if booking.sale_id.nil?
         else
@@ -30,7 +27,6 @@ class Origami::TableInvoicesController < BaseOrigamiController
 	end

  def show
-    # puts 'Catch me if you can.......................'
    @table = DiningFacility.find(params[:table_id])
    @membership = MembershipSetting.find_by_shop_code(@shop.shop_code)
    @payment_methods = PaymentMethodSetting.where("shop_code='#{@shop.shop_code}'")