Merge branch 'r-1902001-01' into foodcourt

This commit is contained in:
Thein Lin Kyaw
2020-08-04 11:45:01 +06:30
43 changed files with 401 additions and 970 deletions

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>