From 384c0f2dd2804a0b795cf0049df25e48147bf0e0 Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 16 Nov 2017 18:23:42 +0630 Subject: [PATCH] align summary panel in dashboard --- app/views/home/dashboard.html.erb | 33 ++++++++++++++++--------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 0f7ee757..fa0c9c72 100755 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -112,23 +112,23 @@ - + - + - + - + - +
Total Receipt : <%= @summ_sale.total_receipt %><%= @summ_sale.total_receipt %>
Total Sale : <%= @summ_sale.total_amount %><%= @summ_sale.total_amount %>
Total Discount : <%= @summ_sale.total_discount %><%= @summ_sale.total_discount %>
Tax (Services+Commercial) : <%= @summ_sale.total_tax %><%= @summ_sale.total_tax %>
Grand Total : <%= @summ_sale.grand_total %><%= @summ_sale.grand_total %>
@@ -138,12 +138,12 @@ <% if payment.payment_method == 'mpu' || payment.payment_method == 'visa' || payment.payment_method == 'master' || payment.payment_method == 'jcb' %> - + <% else %> - - + <% end %> <% end %> @@ -179,7 +179,7 @@ <% if @total_dinein.total_dinein_cus > 0 %> - + <% end %> <% end %> @@ -187,7 +187,7 @@ <% if @total_takeaway.total_take_cus > 0 %> - + <% end %> <% end %> @@ -195,7 +195,7 @@ <% if @total_other_customer.total_cus > 0 %> - + <% end %> <% end %> @@ -203,7 +203,7 @@ <% if @total_membership.total_memb_cus > 0 %> - + <% end %> <% end %> @@ -223,7 +223,7 @@ <% if @total_order.total_order > 0 %> - + <% end %> <% end %> @@ -232,7 +232,7 @@ <% @total_accounts.each do |account| %> - - + <% end %> <% if !@total_foc_items.nil? %> <% if @total_foc_items > 0 %> - + <% end %> <% end %>
Card Sale : <%= @sale_data[0]['card'] %><%= @sale_data[0]['card'] %>
<%= payment.payment_method.to_s.capitalize %> Sale : + <% @sale_data.each do |data| %> <% pay_mth = payment.payment_method %> <%= data[""+pay_mth+""] %> @@ -171,7 +171,7 @@ <% if @total_customer.total_cus > 0 %>
Total Customer : <%= @total_customer.total_cus %><%= @total_customer.total_cus %>
Dine in : <%= @total_dinein.total_dinein_cus %><%= @total_dinein.total_dinein_cus %>
Takeaway : <%= @total_takeaway.total_take_cus %><%= @total_takeaway.total_take_cus %>
Customer : <%= @total_other_customer.total_cus %><%= @total_other_customer.total_cus %>
Membership : <%= @total_membership.total_memb_cus %><%= @total_membership.total_memb_cus %>
Total Order : <%= @total_order.total_order %><%= @total_order.total_order %>
<%= account.title %> (Account) : + <% @account_data.each do |data| %> <% acc = account.title %> <%= data[""+acc+""] %> <% if !data[''+acc+''].nil? %> ( <%= data[''+acc+'_amount'] %> ) <% end %> @@ -244,14 +244,15 @@ <% if !@top_items.nil? %>
Top Item : <%= @top_items.item_name %> ( <%= @top_items.item_total_price %> )<%= @top_items.item_name %> +
( <%= @top_items.item_total_price %> )
Total FOC Item : <%= @total_foc_items %><%= @total_foc_items %>