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

latest Aston req from OPT team

Browse Source
This commit is contained in:
phyusin
2018-03-21 17:45:55 +06:30
parent 0390d15e0a
commit 7063d937e3
8 changed files with 143 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/views/transactions/sales/index.html.erb Executable file → Normal file
View File

@@ -59,6 +59,7 @@
<th><%= t("views.right_panel.detail.grand_total") %></th>
<th><%= t :cashier %></th>
<th><%= t("views.right_panel.detail.sales_status") %></th>
<th><%= t("views.right_panel.detail.remark") %></th>
<th><%= t("views.right_panel.detail.receipt_date") %></th>
</tr>
</thead>
@@ -67,7 +68,16 @@
<% if @sales != 0 %>
<% @sales.each do |sale| %>
<tr>
<td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
<td>
<% if !@sale_item_audits.nil? %>
<% @sale_item_audits.each do |audit| %>
<%if audit.include?(sale.sale_id) %>
<span style="color:#2196f3;">*</span>
<% end %>
<% end %>
<% end %>
<%= link_to sale.sale_id, transactions_sale_path(sale) %>
</td>
<td><%= sale.receipt_no %></td>
<td><%= sale.total_discount %></td>
<td><%= sale.total_tax %></td>
@@ -75,6 +85,15 @@
<td><%= sale.grand_total rescue '-' %></td>
<td><%= sale.cashier_name rescue '-' %></td>
<td> <%= sale.sale_status %> </td>
<td>
<% if !@sale_audits.nil? %>
<% @sale_audits.each do |audit| %>
<%if audit.include?(sale.sale_id) %>
<%= audit[sale.sale_id] %>
<% end %>
<% end %>
<% end %>
</td>
<td> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
</tr>
<% end %>