pull origin master
This commit is contained in:
@@ -7,6 +7,7 @@
|
||||
</div>
|
||||
<div class="card-block">
|
||||
<div class="card-columns" id="commissioners" style="float: left; padding-top:10px; column-gap: 1.2rem; min-height:600px; max-height:600px; overflow-x:scroll;">
|
||||
<div style="color: gray"><i>* Select One Item</i></div>
|
||||
<% @commissioners.each do |commissioner| %>
|
||||
<div class="card tables green text-white commissioner" data-commissioner-id="<%= commissioner.id %>" data-commissioner-name="<%= commissioner.name %>">
|
||||
<div class="card-block">
|
||||
@@ -77,7 +78,7 @@
|
||||
<%= sale_item.qty %>
|
||||
</td>
|
||||
<td class='unit_price' width="20%">
|
||||
<%= sale_item.unit_price %>
|
||||
<%= sale_item.price %>
|
||||
</td>
|
||||
<td class='commissioner' width="20%">
|
||||
<% product_commission = ProductCommission.find_by_sale_item_id(sale_item.id) %>
|
||||
|
||||
Reference in New Issue
Block a user