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/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -153,7 +153,7 @@
   <% if current_user.role != "waiter" || @status != "sale"%>
   <button type="button" id="addorder" class="btn bg-blue btn-block">Add Order</button>
   <%end%>
-   <% if current_user.role != "waiter"%>
+   <% if current_user.role != "waiter" && @status != "order"%>
      <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
   <%end%>
   <% if @status != "sale"%>