diff --git a/.idea/workspace.xml b/.idea/workspace.xml index aa32b1ed..8a05bbbf 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,33 +2,11 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - @@ -72,31 +50,91 @@ - - + + - - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -105,68 +143,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -194,6 +172,7 @@ order_item origami_commissions_path green + reports_dailysale_index_path @@ -202,10 +181,6 @@ @@ -448,6 +427,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -911,12 +913,12 @@ - + - @@ -929,12 +931,13 @@ + - + @@ -963,64 +966,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1077,14 +1022,6 @@ - - - - - - - - @@ -1317,14 +1254,6 @@ - - - - - - - - @@ -1349,14 +1278,6 @@ - - - - - - - - @@ -1366,9 +1287,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/reports/commission_controller.rb b/app/controllers/reports/commission_controller.rb new file mode 100644 index 00000000..2d421ef5 --- /dev/null +++ b/app/controllers/reports/commission_controller.rb @@ -0,0 +1,50 @@ +class Reports::CommissionController < BaseReportController + # authorize_resource :class => false + + def index + + from, to = get_date_range_from_params + @shift = '' + if params[:shift_name].to_i != 0 + @shift = ShiftSale.find(params[:shift_name]) + end + @sale_data = Sale.get_by_shiftsales(from,to,@shift) + @from = from + @to = to + if @shift.present? + + @shift_from = @shift.shift_started_at.nil? ? '-' : @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_to = @shift.shift_closed_at.nil? ? '-' : @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_data = @shift + end + + respond_to do |format| + format.html + format.xls + end + end + + def show + from, to = get_date_range_from_params + + @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) + + date_arr = Array.new + @sale_data.each do |sale| + local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p") + local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p") + opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc + closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc + shift_id = sale.id.nil? ? '-' : sale.id + str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date} + date_arr.push(str) + end + + out = {:status => 'ok', :message => date_arr} + + respond_to do |format| + format.json { render json: out } + end + end +end + diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index cdb2d51b..a8369af2 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -55,6 +55,7 @@
  • <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %>
  • <%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %>
  • <%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %>
    • +
  • diff --git a/app/views/reports/commission/_commission_report_filter.html.erb b/app/views/reports/commission/_commission_report_filter.html.erb new file mode 100644 index 00000000..ff1a044b --- /dev/null +++ b/app/views/reports/commission/_commission_report_filter.html.erb @@ -0,0 +1,119 @@ +
    +
    + <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
    +
    + + +
    + +
    + + + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + <% end %> + + <% end %> +
    +
    + + \ No newline at end of file diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb new file mode 100644 index 00000000..9f75c8d5 --- /dev/null +++ b/app/views/reports/commission/index.html.erb @@ -0,0 +1,211 @@ +
    +
      +
    • Home
      • +
    • Commission Report
      • +
    +
    + +
    + <%= render :partial=>'commission_report_filter', + :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_commission_index_path} %> +
    +
    + +
    +
    +
    + Export to Excel +
    +
    +
    + +
    + +
    +
    + + + + + + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + + + + + + <% void = 0%> + <% cash = 0%> + <% credit = 0%> + <% accept_credit = 0%> + <% foc = 0%> + <% card = 0%> + <% total = 0%> + <% rounding_adj = 0%> + <% g_total = 0 %> + + <% @sale_data.each do |result|%> + + + + + + + + + + + + + + <% grand_total = result.grand_total.to_f %> + + + <% cash += result.cash_sales.to_f %> + <% credit += result.credit_sales.to_f %> + <% card += result.other_sales.to_f %> + + <% total += result.grand_total.to_f %> + <% g_total += grand_total.to_f %> + + <% end %> + + + + + + + + + + + + + + +
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> + - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> + +
    Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    Cashier StationCashier NameShift NameCash PaymentCredit PaymentOther PaymentGrand Total
    + <%= result.cashier_terminal.name rescue '-'%> + + <%= result.employee.name rescue '-'%> + <%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - + <%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-' %> + <%= sprintf "%.2f",result.cash_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.credit_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.other_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.grand_total.to_f.to_d rescue '-'%>
    <%= sprintf("%.2f",cash) rescue '-'%><%= sprintf("%.2f",credit) rescue '-'%><%= sprintf("%.2f",card) rescue '-'%><%= sprintf("%.2f",g_total) rescue '-'%>
    +
    +
    +
    + + + diff --git a/app/views/reports/commission/index.xls.erb b/app/views/reports/commission/index.xls.erb new file mode 100644 index 00000000..e3daaca2 --- /dev/null +++ b/app/views/reports/commission/index.xls.erb @@ -0,0 +1,100 @@ +
    + +
    +
    + + + + + + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + + + + + + + <% void = 0%> + <% cash = 0%> + <% credit = 0%> + <% accept_credit = 0%> + <% foc = 0%> + <% card = 0%> + <% total = 0%> + <% rounding_adj = 0%> + <% g_total = 0 %> + + <% @sale_data.each do |result|%> + + + + + + + + + + + + + + <% grand_total = result.grand_total.to_f %> + + + <% cash += result.cash_sales.to_f %> + <% credit += result.credit_sales.to_f %> + <% card += result.other_sales.to_f %> + + <% total += result.grand_total.to_f %> + <% g_total += grand_total.to_f %> + + <% end %> + + + + + + + + + + + + + + +
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> + - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> + +
    Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    Cashier StationCashier NameShift NameCash PaymentCredit PaymentOther PaymentGrand Total
    + <%= result.cashier_terminal.name rescue '-'%> + + <%= result.employee.name rescue '-'%> + <%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - + <%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-' %> + <%= sprintf "%.2f",result.cash_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.credit_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.other_sales.to_f.to_d rescue '-'%><%= sprintf "%.2f",result.grand_total.to_f.to_d rescue '-'%>
    <%= sprintf("%.2f",cash) rescue '-'%><%= sprintf("%.2f",credit) rescue '-'%><%= sprintf("%.2f",card) rescue '-'%><%= sprintf("%.2f",g_total) rescue '-'%>
    +
    +
    +
    \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 17c315b7..7008cc47 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -323,6 +323,7 @@ Rails.application.routes.draw do resources :shiftsale, :only => [:index, :show] resources :credit_payment, :only => [:index, :show] resources :void_sale, :only => [:index, :show] + resources :commission, :only => [:index, :show] get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date" end