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

fixed conflic when pull master item remark

Browse Source
This commit is contained in:
Aung Myo
2018-02-26 17:02:46 +06:30
parent da7dad05e4 b38e98a22a
commit ce8581f892
13 changed files with 147 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/origami/discounts/index.html.erb
View File

@@ -44,7 +44,7 @@
<% @sale_data.sale_items.each do |sale_item| %>
<%
sub_total += sale_item.qty*sale_item.unit_price
if sale_item.price != 0 && sale_item.remark != "void" && sale_item.remark != "foc"
if sale_item.price != 0 && sale_item.status != "void" && sale_item.status != "foc"
%>
<tr class="item-row" id=<%= sale_item.sale_item_id %> >
<td style="width:60%; text-align:left">