diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb index 5c440e17..23c256d3 100644 --- a/app/controllers/reports/payment_method_controller.rb +++ b/app/controllers/reports/payment_method_controller.rb @@ -2,7 +2,7 @@ class Reports::PaymentMethodController < BaseReportController # authorize_resource :class => false def index - @payments = [["Cash Payment","cash"], ["Credit Payment","creditnote"], + @payments = [["All Payment",''],["Cash Payment","cash"], ["Credit Payment","creditnote"], ["FOC Payment","foc"], ["MPU Payment","mpu"], ["Visa Payment","visa"], ["Master Payment","master"], ["JCB Payment","jcb"], ["Redeem Payment","paypar"]] @@ -19,9 +19,10 @@ class Reports::PaymentMethodController < BaseReportController @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) end end - payment_type = params[:payment_type] - @sale_data,@pyament_method = Sale.get_payment_method_by_shift(@shift_sale_range,@shift,from,to,payment_type) - + @payment_type = params[:payment_type] + @sale_data,@pyament_method = Sale.get_payment_method_by_shift(@shift_sale_range,@shift,from,to,@payment_type) + puts @pyament_method.to_json + puts "sssssssssssss" @from = from @to = to diff --git a/app/models/sale.rb b/app/models/sale.rb index c6d30e10..ef91fb76 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -793,11 +793,12 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type) end def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type) + sale_payment = SalePayment.select("s.receipt_no, sale_payments.*,s.receipt_date as sale_date, s.cashier_name as cashier_name") .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id") - payments_total = Sale.select("CAST((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')) AS DATE) as sale_date, + payments_total = SalePayment.select("CAST((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')) AS DATE) as sale_date, SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount, SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount, SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount, @@ -806,26 +807,42 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount, SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount, SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount") - .joins("join (select * from sale_payments group by sale_payments.sale_id, sale_payments.payment_method) sale_payments on sale_payments.sale_id = sales.sale_id") - + .joins("join sales on sales.sale_id = sale_payments.sale_id") if shift.present? - all_total = payments_total.where("sales.shift_sale_id in (?) and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) - # .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')") + all_total = payments_total.where("sales.shift_sale_id in (?) and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) + # .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')") + if payment_type.blank? + sale_type = sale_payment.where("s.sale_status = 'completed' and payment_amount != 0 and s.shift_sale_id in (?)",shift.to_a) + .order("payment_method") + else + sale_type = sale_payment.where("payment_method= '#{payment_type}' and payment_amount != 0 and s.sale_status = 'completed' and s.shift_sale_id in (?)",shift.to_a) + end - sale_type = sale_payment.where("payment_method= '#{payment_type}' and s.sale_status = 'completed' and s.shift_sale_id in (?)",shift.to_a) elsif shift_sale_range.present? - all_total = paymessnts_total.where("sales.shift_sale_id in (?) and sale_status= 'completed' and sale_payments.payment_amount != 0", shift_sale_range.to_a) - - sale_type = sale_payment.where("payment_method='#{payment_type}' and s.sale_status = 'completed' and s.shift_sale_id in (?)",shift_sale_range.to_a) + all_total = payments_total.where("sales.shift_sale_id in (?) and sale_status= 'completed' and sale_payments.payment_amount != 0", shift_sale_range.to_a) + # .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')") + if payment_type.blank? + sale_type = sale_payment.where("s.sale_status = 'completed' and payment_amount != 0 and s.shift_sale_id in (?)",shift_sale_range.to_a) + .order("payment_method") + else + sale_type = sale_payment.where("payment_method='#{payment_type}' and payment_amount != 0 and s.sale_status = 'completed' and s.shift_sale_id in (?)",shift_sale_range.to_a) + end + else - all_total = payments_total.where("sales.receipt_date and sale_status= 'completed' and sale_payments.payment_amount != 0", from,to) - - sale_type = sale_payment.where("payment_method='#{payment_type}' and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to) + all_total = payments_total.where("sales.receipt_date between ? and ? and sales.sale_status= 'completed' and sale_payments.payment_amount != 0", from,to) + # .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')") + if payment_type.blank? + sale_type = sale_payment.where("s.sale_status = 'completed' and payment_amount != 0 and s.receipt_date between ? and ? ",from,to) + .order("payment_method") + else + sale_type = sale_payment.where("payment_method='#{payment_type}' and payment_amount != 0 and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to) + end end + return all_total,sale_type end diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index d269a3c1..cf9f77c0 100755 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -118,6 +118,9 @@
  • Void Sales
    • +
  • + Payment Method +
  • Commission
    • diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb index 9b72ba9b..2eed1622 100755 --- a/app/views/reports/credit_payment/index.html.erb +++ b/app/views/reports/credit_payment/index.html.erb @@ -81,11 +81,13 @@ show_shift_name(period,period_type,from,to,'shift_item'); } - $('#from').change(function(){ - search_by_date(); + // OK button is clicked + $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#from').val(date.format("DD-MM-YYYY")) + search_by_date(); }); - - $('#to').change(function(){ + $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#to').val(date.format("DD-MM-YYYY")) search_by_date(); }); diff --git a/app/views/reports/payment_method/_shift_sale_report_filter.html.erb b/app/views/reports/payment_method/_shift_sale_report_filter.html.erb index d791852f..3a7f93c3 100755 --- a/app/views/reports/payment_method/_shift_sale_report_filter.html.erb +++ b/app/views/reports/payment_method/_shift_sale_report_filter.html.erb @@ -27,11 +27,11 @@
    - +
    - +
    diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb index 17aceaff..40036a37 100755 --- a/app/views/reports/payment_method/index.html.erb +++ b/app/views/reports/payment_method/index.html.erb @@ -1,7 +1,7 @@
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.receipt_no_report") %>
      3. +
    3. Payment Method Report
      4. <%= link_to 'Back', dashboard_path %> @@ -15,7 +15,7 @@ :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_payment_method_index_path} %>
      - <%= t("views.btn.exp_to_excel") %> + <%= t("views.btn.exp_to_excel") %>
      @@ -23,14 +23,20 @@ - + <% if @shift_from %> <% if @shift_data.employee %> <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> <% end %> - + <% end %> @@ -64,30 +70,51 @@
      <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> + + <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> + +
      <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> ) + <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> ) +
      + <%if @payment_type.present?%> + + + + <%else%> + + + + <%end%> + - + - + + <% total = 0 %> <% @pyament_method.each do |payment| %> - - <% if @shift_from.nil? && @shift_to.nil? %> - - <% else %> - - <% end %> - - - - - - + <% total += payment.payment_amount %> + + <% if @shift_from.nil? && @shift_to.nil? %> + + <% else %> + + <% end %> + + + + + + + + + <% end %> + <%if total>0%> + + + + + <%end%>
      <%=@payment_type.upcase%> Payment Details
      All Payment Details
      <%= t("views.right_panel.detail.shift_name") %> <%= t("views.right_panel.detail.receipt_no") %> <%= t("views.right_panel.detail.payment_method") %> <%= t :cashier %> <%= t("views.right_panel.detail.name") %> <%= t :customer %> <%= t("views.right_panel.detail.name") %> <%= t :payment_method %> <%= t("views.right_panel.detail.amount") %> <%= t("views.right_panel.detail.grand_total") %>
      <%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%><%= payment.receipt_no rescue '-' %><%= payment.cashier_name rescue '-' %><%= payment.sale.customer.name rescue '-' %><%= payment.payment_amount rescue '-' %><%= payment.sale.grand_total rescue '-' %>
      <%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%><%= payment.receipt_no rescue '-' %><%= payment.cashier_name rescue '-' %><%= payment.payment_method rescue '-' %><%= payment.payment_amount rescue '-' %><%= payment.sale.grand_total rescue '-' %>
      Total <%=total%>
      @@ -97,13 +124,10 @@ \ No newline at end of file diff --git a/app/views/reports/payment_method/index.xls.erb b/app/views/reports/payment_method/index.xls.erb index cddb34f9..b537f7d7 100755 --- a/app/views/reports/payment_method/index.xls.erb +++ b/app/views/reports/payment_method/index.xls.erb @@ -1,98 +1,101 @@ -
      -
      - - - - - - <% if @shift_from %> - - <% if @shift_data.employee %> - <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> - <% end %> - - - <% end %> - - - - - - - <% @sale_taxes.each do |tax| %> - +
      +
      +
      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 %> )
      Recipt NoCashier NameTotal AmountDiscount Amount <%= tax.tax_name %>
      + + + + + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + <% unless @sale_data.empty? %> + + <% @sale_data.each do |sale| %> + + + + + + + + + + + <% end %> + + + <% end %> +
      + + <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> + +
      + <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> ) +
      <%= t("views.right_panel.detail.mpu_sales") %><%= t("views.right_panel.detail.master_sales") %><%= t("views.right_panel.detail.visa_sales") %><%= t("views.right_panel.detail.jcb_sales") %><%= t("views.right_panel.detail.redeem_sales") %><%= t("views.right_panel.detail.cash_sales") %><%= t("views.right_panel.detail.credit_sales") %><%= t("views.right_panel.detail.foc_sales") %>
      <%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>
      + + + <%if @payment_type.present?%> + + + + <%else%> + + + + <%end%> + + + + + + + + + + + + <% total = 0 %> + <% @pyament_method.each do |payment| %> + <% total += payment.payment_amount %> + + <% if @shift_from.nil? && @shift_to.nil? %> + + <% else %> + + <% end %> + + + + + + - <% end %> - - - - - - - - <% grand_total = 0 %> - <% old_grand_total = 0 %> - <% total_tax = 0 %> - <% guest_count = 0 %> - <% total_sum = 0 %> - <% discount_amt = 0 %> - <% other_amt = 0 %> - <% total_nett = 0 %> - <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - <%if @sale_data %> - <% @sale_data.each do |result| %> - - <% grand_total = grand_total.to_f + result.grand_total.to_f %> - <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> - <% total_tax += result.total_tax.to_f %> - <% total_sum += result.total_amount.to_f %> - <% discount_amt += result.total_discount.to_f %> - <% rounding_adj += result.rounding_adjustment.to_f %> - - - - - - - - <% result.sale_taxes.each do |tax| %> - - <%end%> - - - - - - - <% end %> - - - - - <% @sale_taxes.each do |tax| %> - + + <% end %> - - - - - - - - - <% @sale_taxes.each do |tax| %> - - <% end %> - - - - - <%end%> - -
      <%=@payment_type.upcase%> Payment Details
      All Payment Details
      <%= t("views.right_panel.detail.shift_name") %> <%= t("views.right_panel.detail.receipt_no") %> <%= t :cashier %> <%= t("views.right_panel.detail.name") %> <%= t :payment_method %> <%= t("views.right_panel.detail.amount") %> <%= t("views.right_panel.detail.grand_total") %>
      <%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%><%= payment.receipt_no rescue '-' %><%= payment.cashier_name rescue '-' %><%= payment.payment_method rescue '-' %><%= payment.payment_amount rescue '-' %><%= payment.sale.grand_total rescue '-' %>Grand TotalRounding Adj.Grand Total +
      - Rounding Adj. -
      <%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.total_amount rescue '-' %><%= result.total_discount rescue '-' %><%= tax.tax_payable_amount rescue '-' %><%= result.old_grand_total %><%= result.rounding_adjustment.to_f rescue '-' %><%= result.grand_total_after_rounding() rescue '-'%>
       <%= total_sum rescue '-'%><%= discount_amt rescue '-'%><%= tax.st_amount.round(2) %>
      <%= old_grand_total.to_f.round(2) rescue '-'%><%= rounding_adj rescue '-'%><%= old_grand_total.to_f.round + rounding_adj %>
       Total AmountDiscount Amount<%= tax.tax_name %>Grand TotalRounding Adj.Grand Total +
      - Rounding Adj. -
      -
      -
      \ No newline at end of file + <%if total>0%> + + Total + <%=total%> + + <%end%> + + +
    +
    \ No newline at end of file diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 395dd3ce..32d4df12 100755 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -145,11 +145,13 @@ show_shift_name(period,period_type,from,to,'shift_item'); } - $('#from').change(function(){ - search_by_date(); + // OK button is clicked + $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#from').val(date.format("DD-MM-YYYY")) + search_by_date(); }); - - $('#to').change(function(){ + $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#to').val(date.format("DD-MM-YYYY")) search_by_date(); }); diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index 13b8f598..587d7c52 100755 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -209,11 +209,13 @@ show_shift_name(period,period_type,from,to,'shift_item'); } - $('#from').change(function(){ - search_by_date(); + // OK button is clicked + $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#from').val(date.format("DD-MM-YYYY")) + search_by_date(); }); - - $('#to').change(function(){ + $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#to').val(date.format("DD-MM-YYYY")) search_by_date(); }); diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index 97330404..54b63caa 100755 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -143,11 +143,13 @@ show_shift_name(period,period_type,from,to,'shift_item'); } - $('#from').change(function(){ - search_by_date(); + // OK button is clicked + $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#from').val(date.format("DD-MM-YYYY")) + search_by_date(); }); - - $('#to').change(function(){ + $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#to').val(date.format("DD-MM-YYYY")) search_by_date(); }); diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index 649d422e..3b240c2d 100755 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -103,13 +103,15 @@ show_shift_name(period,period_type,from,to,'shift_item'); } - $('#from').change(function(){ - search_by_date(); - }); - - $('#to').change(function(){ + // OK button is clicked + $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#from').val(date.format("DD-MM-YYYY")) search_by_date(); - }); + }); + $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ + $('#to').val(date.format("DD-MM-YYYY")) + search_by_date(); + }); function search_by_date(){ var from = $('#from').val(); diff --git a/config/locales/en.yml b/config/locales/en.yml index dc020d95..d8780e33 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -411,6 +411,7 @@ en: select_payments: "Select Payments" all_shift: "All Shift" receipt_no_report: "Receipt No Report" + payment_method_report: "Payment Method Report" rnd_adj_sh: "Rounding Adj." shift_sale_report: "Shift Sale Report" cashier_station: "Cashier Station"