remove conflict data

2018-03-05 16:24:45 +06:30
parent 4b311789e1 311bef4411
commit bd06e80b37
111 changed files with 3612 additions and 1386 deletions
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -8,6 +8,9 @@ class Origami::RequestBillsController < ApplicationController
    if !ShiftSale.current_shift.nil?
      order_id = params[:id] # order_id
      bk_order = BookingOrder.find_by_order_id(order_id)
+      puts params[:id]
+      puts bk_order
+      puts bk_order.booking_id
      check_booking = Booking.find_by_booking_id(bk_order.booking_id)
      
      if check_booking.sale_id.nil?