git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering

Browse Source
This commit is contained in:
EikhantMon
2018-06-27 13:56:33 +06:30
parent 66ffb1cfd1 e5ccf7e5cb
commit 81cfcfe50d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/origami/product_commissions/load_commissioners.html.erb
View File

@@ -73,6 +73,7 @@
# Can't check for discount # Can't check for discount
unless sale_item.price == 0 unless sale_item.price == 0
%> %>
<% if sale_item.status.nil? %>
<tr id="sale_item" class="sale_item" data-sale-item="<%= sale_item.sale_item_id %>"> <tr id="sale_item" class="sale_item" data-sale-item="<%= sale_item.sale_item_id %>">
<td width="4%"><%= count %></td> <td width="4%"><%= count %></td>
<td class='product_name' width="40%"> <td class='product_name' width="40%">
@@ -92,6 +93,7 @@
<% <%
end end
end end
end
%> %>
</tbody> </tbody>
</table> </table>