update osaka demo bugs

2017-07-14 17:23:40 +06:30
parent ef7cc1f6f0
commit 0b7b5cae30
22 changed files with 76 additions and 53 deletions
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -203,7 +203,7 @@
               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
             </tr>
             <tr>
-                <%if @obj.discount_type == 'member_discount'%>
+                <%if @obj != nil && @status_sale == 'sale' && @obj.discount_type == 'member_discount'%>
                <td class="charges-name"><strong>Member Discount:</strong></td>
               <%else%>
                <td class="charges-name"><strong>Discount:</strong></td>