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

Merge branch 'r-1902001-01' into foodcourt

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-08-04 11:45:01 +06:30
parent 9a17ab5d9b ffb8e56031
commit 82925881f7
43 changed files with 401 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/reports/shiftsale/index.html.erb
View File

@@ -41,7 +41,7 @@
<% end %>
<tr>
<th><%= t("views.right_panel.detail.cashier_station") %></th>
<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
<th><%= t :cashier %></th>
<th><%= t("views.right_panel.detail.shift_name") %></th>
<!-- <th>Void Amount</th> -->
<th><%= t("views.right_panel.detail.cash_payment") %></th>

2
app/views/reports/shiftsale/index.xls.erb
View File

@@ -32,7 +32,7 @@
<% end %>
<tr>
<th><%= t("views.right_panel.detail.cashier_station") %></th>
<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
<th><%= t :cashier %></th>
<th><%= t("views.right_panel.detail.shift_name") %></th>
<!-- <th>Void Amount</th> -->
<th><%= t("views.right_panel.detail.cash_payment") %></th>