Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant

2017-06-23 17:51:46 +06:30
parent 27ff8b89e7 3a0e26b2ea
commit a996ccc7ee
16 changed files with 183 additions and 69 deletions
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -190,7 +190,7 @@
             </tr>
             <tr>
               <td class="charges-name"><strong>Discount:</strong></td>
-               <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
+               <td class="item-attr"><strong id="order-discount">(<%=@obj.total_discount rescue 0%>)</strong></td>
             </tr>
            <% if @status == "sale" %>
             <tr>