diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 3e4dfca0..c6ecbc6b 100755 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -60,17 +60,17 @@ <%end%> <%end%> - <% end %> + <% end %> - <%= @sale.receipt_date.strftime("%d-%M-%Y") %> + <%= @sale.receipt_date.strftime("%d-%m-%Y") %> <%= @sale.receipt_no %> <%= @sale.cashier_name rescue '-' %> <%= @sale.sale_status %> - <%= @sale.requested_at.strftime("%m-%d-%Y %H:%M %p") %> - + <%= @sale.requested_at.strftime("%d-%m-%Y %H:%M %p") %> + <%= t :sale %> <%= t("views.right_panel.detail.item_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.qty") %> @@ -78,20 +78,20 @@ <%= t("views.right_panel.detail.total_price") %> <%= t("views.right_panel.detail.created_at") %> <%= t("views.right_panel.detail.remark") %> - + <% @sale.sale_items.each do |s| %> <%=s.product_name rescue ' '%> <%=s.qty rescue ' '%> <%= number_with_precision(s.unit_price, :precision => 2, :delimiter => ',') rescue ' '%> - <%= number_with_precision(s.price, :precision => 2, :delimiter => ',') rescue ' '%> + <%= number_with_precision(s.price, :precision => 2, :delimiter => ',') rescue ' '%> <%=l s.created_at.utc.getlocal , :format => :short rescue ' ' %> <%=s.remark rescue ' '%> - <% end %> + <% end %> - <%= t("views.right_panel.detail.total") %> + <%= t("views.right_panel.detail.total") %> <%= number_with_precision(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%> @@ -102,10 +102,10 @@ <% @sale.sale_taxes.each do |r|%> - <%= r.tax_name %> + <%= r.tax_name %> <%= number_with_precision(r.tax_payable_amount, :precision => 2, :delimiter => ',') rescue ' '%> - <% end %> + <% end %> <%= t("views.right_panel.detail.grand_total") %> @@ -122,8 +122,8 @@ <%= r.payment_method.capitalize rescue ' '%> Payment <%= number_with_precision(r.payment_amount, :precision => 2, :delimiter => ',') rescue ' '%> - - <% end %> + + <% end %> <%= t("views.right_panel.detail.change") %> @@ -208,7 +208,7 @@ <%= t("views.right_panel.detail.receipt_no") %> - + <% if @response["status"] == true %> <% @response["data"].each do |transaction| %> @@ -216,7 +216,7 @@ <%= transaction["redeem"]%> <%= transaction["rebate"] %> <%= transaction["balance"] %> - <%= transaction["account_status"] %> + <%= transaction["account_status"] %> <%= transaction["status"] %> <%= transaction["receipt_no"] %> @@ -241,13 +241,13 @@ <%= t("views.right_panel.detail.remark") %> - + <% @sale_audits.each do |audit| %> <%= audit.action%> <%= audit.action_at.strftime("%m-%d-%Y %H:%M %p")%> <%= audit.approved_by%> - <%= audit.remark%> + <%= audit.remark%> <% end %> @@ -297,7 +297,7 @@
- + <% @payment_methods.each_with_index do |pay, pay_index| %> <%if (pay_index+1)%3 == 0 %>
@@ -308,8 +308,8 @@ <%end %> - - + +