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

update OQS and cashier

Browse Source
This commit is contained in:
Aung Myo
2017-11-14 09:43:13 +06:30
parent 8db96beca0
commit f1a28d64e1
31 changed files with 378 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/transactions/credit_notes/index.html.erb
View File

@@ -91,7 +91,7 @@
</td>
<td><%= sale.cashier_name rescue '-' %></td>
<td><%= link_to sale.customer.name, crm_customer_path(sale.customer_id) %></td>
<td> <%= sale.receipt_date.strftime("%d-%m-%Y") %> </td>
<td> <%= sale.receipt_date.strftime("%d-%m-%Y %I:%M %p") %> </td>
</tr>
<% end %>
<% else %>

2
app/views/transactions/orders/index.html.erb
View File

@@ -64,7 +64,7 @@
<td><%= order.order_type %></td>
<td><%= order.customer.name rescue '-' %></td>
<td><%= order.status %></td>
<td> <%= order.date.strftime("%d-%m-%Y") %> </td>
<td> <%= order.date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
<td> <%= order.item_count %> </td>
</tr>

12
app/views/transactions/orders/show.html.erb
View File

@@ -11,7 +11,7 @@
<hr>
<div class="row">
<div class="col-lg-11 col-md-11 col-sm-11">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="main-box-body clearfix p-l-5 p-r-5">
<div class="table-responsive">
<table class="table table-striped">
@@ -30,12 +30,12 @@
<td><%= @order.order_type %></td>
<td><%= @order.customer.name rescue '-' %></td>
<td><%= @order.status %></td>
<td> <%= @order.date.strftime("%d-%m-%Y") %> </td>
<td> <%= @order.waiter rescue '-' %> </td>
<td> <%= @order.date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
<td> <%= @order.waiters rescue '-' %> </td>
</tr>
</tbody>
</table>
<h3><%= t("views.right_panel.detail.order_items") %></h3>
<h5><%= t("views.right_panel.detail.order_items") %></h5>
<table class="table table-striped">
<thead>
<tr>
@@ -45,7 +45,7 @@
<th><%= t("views.right_panel.detail.total_price") %></th>
<!-- <th>Option</th> -->
<th><%= t("views.right_panel.detail.status") %></th>
<th><%= t("views.right_panel.detail.order_by") %></th>
<!-- <th><%= t("views.right_panel.detail.order_by") %></th> -->
<th><%= t("views.right_panel.detail.created_at") %></th>
</tr>
@@ -61,7 +61,7 @@
<td><%= order.qty * order.price %></td>
<!-- <td> <%= order.options %> </td> -->
<td> <%= order.order_item_status %> </td>
<td> <%= order.item_order_by %> </td>
<!-- <td> <%= order.item_order_by %> </td> -->
<td> <%= order.created_at.strftime("%d-%m-%Y") %> </td>
</tr>
<% end %>

10
app/views/transactions/sales/index.html.erb
View File

@@ -53,8 +53,10 @@
<tr>
<th><%= t("views.right_panel.detail.sale_id") %></th>
<th><%= t("views.right_panel.detail.receipt_no") %></th>
<th><%= t("views.right_panel.detail.grand_total") %></th>
<th><%= t("views.right_panel.detail.total_discount") %></th>
<th><%= t("views.right_panel.detail.tax_amount") %></th>
<th><%= t("views.right_panel.detail.sub_total") %></th>
<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.receipt_date") %></th>
@@ -67,11 +69,13 @@
<tr>
<td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
<td><%= sale.receipt_no %></td>
<td><%= sale.grand_total rescue '-' %></td>
<td><%= sale.total_discount %></td>
<td><%= sale.total_tax %></td>
<td><%= sale.total_amount %></td>
<td><%= sale.grand_total rescue '-' %></td>
<td><%= sale.cashier_name rescue '-' %></td>
<td> <%= sale.sale_status %> </td>
<td> <%= sale.receipt_date.strftime("%d-%m-%Y") %> </td>
<td> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
</tr>
<% end %>
<% else %>

11
app/views/transactions/sales/show.html.erb
View File

@@ -149,7 +149,7 @@
<td><%= order_item.options %></td>
<td><%= order_item.order_item_status %></td>
<td><%= order_item.item_order_by %> </td>
<td><%= order_item.created_at.strftime("%d-%m-%y") %></td>
<td><%= order_item.created_at.strftime("%d-%m-%y %I:%M %p") %></td>
</tr>
<% end %>
</tbody>
@@ -185,9 +185,10 @@
<td><%= @customer.address%></td>
<td><%= @customer.date_of_birth %></td>
</tr>
<tr></tr>
<tr><td></td></tr>
<% if @customer.membership_id %>
<tr>
<th colspan="5"><%= t("views.right_panel.detail.membership_transactions") %></th>
<th colspan="8"><%= t("views.right_panel.detail.membership_transactions") %></th>
</tr>
<tr>
<th><%= t("views.right_panel.detail.date") %></th>
@@ -197,6 +198,7 @@
<th><%= t("views.right_panel.detail.from_account") %></th>
<th><%= t("views.right_panel.detail.status") %></th>
<th><%= t("views.right_panel.detail.receipt_no") %></th>
<th></th>
</tr>
<%
@@ -210,10 +212,11 @@
<td><%= transaction["account_status"] %></td>
<td><%= transaction["status"] %></td>
<td><%= transaction["receipt_no"] %></td>
<td></td>
</tr>
<% end %>
<% end %>
<% end %>
</tbody>
</table>
</div>