update conflix for request bill

2018-02-20 16:24:06 +06:30
parent b0cc934625 98c4737a2a
commit 4ebe353182
3 changed files with 4 additions and 5 deletions
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -5,7 +5,6 @@ class Origami::RequestBillsController < ApplicationController
    @sale = Sale.new
    sale_order=SaleOrder.new

-    # if shift = ShiftSale.current_open_shift(current_user.id)
    if !ShiftSale.current_shift.nil?
      order_id = params[:id] # order_id
      bk_order = BookingOrder.find_by_order_id(order_id)