update fixed issues for quickservice from sqa

2018-02-28 14:20:22 +06:30
parent 0acd533bfe
commit 1d70a9f178
17 changed files with 641 additions and 890 deletions
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -156,7 +156,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
      end

      @status, @booking = @order.generate
-      if current_user.role != "waiter"
+      if current_user.role != "waiter" && params[:create_type] == "create_pay"
        if @status && @booking && @order.source == 'quick_service'
        
          @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)