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/receipt_no_detail/_shift_sale_report_filter.html.erb
View File

@@ -20,7 +20,7 @@
</div>
<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
<label class="font-14"><%= t("views.right_panel.detail.customer_name") %></label>
<label class="font-14"><%= t :customer_name %></label>
<input type="text" placeholder="Customer name" class="form-control m-t-3" name="customer" value="<%= params[:customer] %>" id="customer_filter" style="height: 32px;">
</div>

5
app/views/reports/receipt_no_detail/index.html.erb
View File

@@ -30,7 +30,7 @@
<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
<th><b><%= t("views.right_panel.detail.receipt_date") %></b></th>
<th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
<th><b><%= t :cashier %> <%= t("views.right_panel.detail.name") %></b></th>
<th><b><%= t :cashier %></b></th>
<th><b><%= t("views.right_panel.detail.table") %></b></th>
<th><b><%= t("views.right_panel.detail.revenue") %></b></th>
<th>&nbsp;</th>
@@ -174,8 +174,8 @@
<td>&nbsp;</td>
</tr>
<% end %>
<tr><td colspan="6">&nbsp;</td></tr>
<% end %>
<% end %>
<tr style="border-top:4px double #666;">
<td>&nbsp;</td>
@@ -185,7 +185,6 @@
<td><b>Total Nett</b> - <b><%= number_format(grand_total, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %></b></td>
<td>&nbsp;</td>
</tr>
</tbody>
</table>
</div>

8
app/views/reports/receipt_no_detail/index.xls.erb
View File

@@ -28,7 +28,7 @@
<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
<th><b><%= t("views.right_panel.detail.receipt_date") %></b></th>
<th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
<th><b><%= t :cashier %> <%= t("views.right_panel.detail.name") %></b></th>
<th><b><%= t :cashier %></b></th>
<th><b><%= t("views.right_panel.detail.table") %></b></th>
<th><b><%= t("views.right_panel.detail.revenue") %></b></th>
<th>&nbsp;</th>
@@ -75,7 +75,7 @@
</tr>
<% end %>
<tr><td colspan="5">&nbsp;</td></tr>
<tr><td colspan="6">&nbsp;</td></tr>
<%survey = Survey.find_by_receipt_no(result.receipt_no)%>
<% if !survey.nil?%>
@@ -173,8 +173,8 @@
<td>&nbsp;</td>
</tr>
<% end %>
<tr><td colspan="6">&nbsp;</td></tr>
<% end %>
<% end %>
<tr style="border-top:4px double #666;">
<td>&nbsp;</td>
@@ -184,10 +184,8 @@
<td><b>Total Nett</b> - <b><%= grand_total %></b></td>
<td>&nbsp;</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>