Merge branch 'r-1902001-01' into foodcourt

This commit is contained in:
Thein Lin Kyaw
2020-09-10 10:31:07 +06:30
184 changed files with 2672 additions and 1021 deletions

View File

@@ -1,4 +1,13 @@
<% breadcrumb_add t("views.right_panel.detail.order"), transactions_orders_path, transactions_orders_path, t('details') %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= transactions_orders_path %>"><%= t("views.right_panel.detail.order") %></a></li>
<li class="breadcrumb-item active"><%= t :details %></li>
<span class="float-right">
<%= link_to 'Back', transactions_orders_path %>
</span>
</ol>
</div>
<hr>
<div class="row">
@@ -14,7 +23,7 @@
<th><%= t :customer %></th>
<th><%= t("views.right_panel.detail.order_status") %></th>
<th><%= t("views.right_panel.detail.order_date") %></th>
</tr>
</thead>
@@ -26,8 +35,8 @@
<td><%= @order.customer.name rescue '-' %></td>
<td><%= @order.status %></td>
<td> <%= @order.date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
</tr>
</tr>
</tbody>
</table>
<h5><%= t("views.right_panel.detail.order_items") %></h5>
@@ -62,7 +71,7 @@
<% end %>
</tbody>
</table>
</div>
</div>
@@ -73,8 +82,3 @@
</a>
</div> -->
</div>