update payment menthod report

app/controllers/reports/payment_method_controller.rb

@@ -0,0 +1,64 @@
+class Reports::PaymentMethodController < BaseReportController	  
+# authorize_resource :class => false
+	def index
+
+		@payments = [["Cash Payment","cash"], ["Credit Payment","creditnote"],
+		            ["FOC Payment","foc"], ["MPU Payment","mpu"], ["Visa Payment","visa"], 
+		            ["Master Payment","master"], ["JCB Payment","jcb"], ["Redeem Payment","paypar"]]
+
+		from, to  = get_date_range_from_params
+
+		@shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+
+	    @shift = ''
+	    if params[:shift_name].to_i != 0
+	      shift_sale = ShiftSale.find(params[:shift_name])
+	      if to.blank?        
+	        @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
+	      else
+	        @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) 
+       
+        @from       = from
+        @to         = to
+
+        if @shift.present?
+	      @shift.each do |sh|
+	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
+	        @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
+	        @shift_data = sh
+	      end
+	    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

app/models/sale.rb

@@ -507,7 +507,7 @@ class Sale < ApplicationRecord
   end
 
 
-  def self.daily_sales_list(from,to)
+def self.daily_sales_list(from,to)
     payments_total = Sale.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,
@@ -564,7 +564,7 @@ class Sale < ApplicationRecord
 
     end
     return daily_total
-  end
+end
 
 def self.get_by_range_by_saleitems(from,to,status,report_type)
   query = Sale.select("
@@ -792,6 +792,43 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
   end
 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,
+                       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,
+                       SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
+                       SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
+                       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")
+                    
+
+    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')")
+
+     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)
+    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)         
+    end
+    return all_total,sale_type
+end
+
 # def self.get_separate_tax(from,to,payment_method=nil)
 
 #     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")

app/views/reports/payment_method/_shift_sale_report_filter.html.erb

@@ -0,0 +1,128 @@
+<div class="p-l-15">
+	<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+	<div class="row">
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
+			<select name="period" id="sel_period" class="form-control">
+				<option value=""><%= t("views.right_panel.detail.select_period") %></option>
+				<option value="0">Today</option>
+				<option value="1">Yesterday</option>
+				<option value="2">This week</option>
+				<option value="3">Last week</option>
+				<option value="4">Last 7 days</option>
+				<option value="5">This month</option>
+				<option value="6">Last month</option>
+				<option value="7">Last 30 days</option>
+				<option value="8">This year</option>
+				<option value="9">Last year</option>
+			</select>
+		</div>
+		<% if defined? payments %>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14"><%= t("views.right_panel.detail.select_payments") %></label>
+			<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
+		</div>
+		<% end %>
+		<div class="col-lg-2 col-md-2 col-sm-2">					
+			<!-- <label class="">Select Shift Period</label> -->
+			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+		</div>
+		<div class="col-lg-2 col-md-2 col-sm-2">
+			<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
+			<select class="form-control select" name="shift_name" id="shift_name" >
+			</select>
+		</div>
+		<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
+			<br>
+			<input type="submit" value="Generate Report" class='btn btn-primary'>
+		</div>							
+	</div>													
+	<% end %>
+
+	<% end %>	
+</div>	
+
+<script type="text/javascript">
+	$(function(){
+		$('#custom_excel').hide();
+		
+		$('#custom_excel').click(function(){
+			var url = $('#custom_excel').attr('data-url');
+			$('#frm_report').attr('action',url)
+			$('#frm_report').submit();
+		// window.location = url;
+	});
+		
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+		
+		if(item == 'order'){
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}		
+		}
+		else if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();
+		}
+		else{
+			$('#waiter').hide();
+			$('#cashier').show();		
+			$("#item").val('sale');
+		}
+	});
+
+	<% if params[:shift_name].to_i > 0%>
+	shift_id = '<%= params[:shift_name] %>'
+	local_date = '<%= @shift_from %> - <%= @shift_to %> '
+	var shift = $('#shift_name');
+	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
+	shift.append(str);
+	<% end %>
+
+	$("#from").val("<%=params[:from] rescue '-'%>");
+	$("#to").val("<%=params[:to] rescue '-'%>");
+	$("#sel_period").val(<%=params[:period] rescue '-'%>);
+	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+ // shift = $(".shift-id").text()
+ // if (shift.length>0) {
+ //  $('.shift_name > option[value="'+shift+'"]').attr('selected','selected');
+ // }
+
+ <% if params[:period_type] == 1 || params[:period_type] == "1" %>
+ $("#rd_period_type_1").attr("checked","checked");
+ <% else %>
+ $("#rd_period_type_0").attr("checked","checked");
+ <% end %>
+ $(".btn-group button").removeClass("active");
+ <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+ $("#btn_report_type_<%= report_type %>").addClass("active");
+
+ $('#item').change(function(){
+ 	var item = $('#item').val();
+ 	var payment_type = $('#payment_type');
+
+ 	if(item == 'sale'){
+ 		$('#waiter').hide();
+ 		$('#cashier').show();		
+ 		if(payment_type){
+ 			$('#payment_type').show();
+ 		}
+ 	}
+ 	else{
+ 		$('#cashier').hide();
+ 		$('#waiter').show();
+ 		if(payment_type){
+ 			$('#payment_type').hide();
+ 		}
+ 	}
+ });
+</script>

app/views/reports/payment_method/index.html.erb

@@ -0,0 +1,186 @@
+<div class="page-header">
+	<ol class="breadcrumb">
+		<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+		<li class="breadcrumb-item active"><%= t("views.right_panel.detail.receipt_no_report") %></li>
+		<span class="float-right">
+			<%= link_to 'Back', dashboard_path %>
+		</span>
+	</ol>
+</div>
+<div class="row">
+	<div class="col-md-12">
+
+		<!-- <div class="container"> -->
+		<%= render :partial=>'shift_sale_report_filter',
+		:locals=>{ 	:period_type => true, :shift_name => true,:payments => true, :report_path =>reports_payment_method_index_path} %>
+		<hr />
+		<div class="text-right">
+			<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
+		</div>	  			
+
+		<div class="margin-top-20">
+			<div class="card">
+				<table class="table table-bordered">
+					<thead> 
+						<tr>
+							<th colspan="9"> <%= 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 '-'%></th>
+						</tr>
+						<% if @shift_from %>
+						<tr>
+							<% if @shift_data.employee %>		
+							<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+							<% end %>			
+							<th colspan="9"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+						</tr>
+						<% end %>
+						<tr>
+							<th><%= t("views.right_panel.detail.mpu_sales") %></th>
+							<th><%= t("views.right_panel.detail.master_sales") %></th>
+							<th><%= t("views.right_panel.detail.visa_sales") %></th>
+							<th><%= t("views.right_panel.detail.jcb_sales") %></th>
+							<th><%= t("views.right_panel.detail.redeem_sales") %></th>
+							<th><%= t("views.right_panel.detail.cash_sales") %></th>
+							<th><%= t("views.right_panel.detail.credit_sales") %></th>
+							<th><%= t("views.right_panel.detail.foc_sales") %></th>
+						</tr>
+					</thead>
+					<% unless @sale_data.empty? %>
+						<tbody>
+							<% @sale_data.each do |sale| %>
+							<tr>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>
+							</tr>
+							<% end %>
+							
+						</tbody>
+					<% end %>
+				</table>
+				<table class="table table-bordered">
+					<thead>
+						<tr>
+							<th> <%= t("views.right_panel.detail.shift_name") %> </th>
+							<th> <%= t("views.right_panel.detail.receipt_no") %></th>
+							<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+							<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+							<th> <%= t("views.right_panel.detail.amount") %> </th>
+							<th><%= t("views.right_panel.detail.grand_total") %></th>
+						</tr>
+					</thead>
+					<tbody>
+						<% @pyament_method.each do |payment| %>
+						<tr> 
+							<% if @shift_from.nil? && @shift_to.nil? %>
+							<td><%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p")  rescue '-'%></td>
+							<% else %>
+							<td><%= @shift_from  rescue '-'%> -  <%= @shift_to   rescue '-'%></td>
+							<% end %>
+							<td><%= payment.receipt_no rescue '-' %></td>
+							<td><%= payment.cashier_name rescue '-' %></td>
+							<td><%= payment.sale.customer.name rescue '-' %></td>
+							<td><%= payment.payment_amount rescue '-' %></td>
+							<td><%= payment.sale.grand_total rescue '-' %></td>
+						</tr>
+						<% end %>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+
+		var check_arr = [];
+
+		$('#sel_period').change(function(){
+			
+			search_by_period();
+			
+		});
+		
+		function search_by_period(){
+			var period = $('#sel_period').val();
+			var period_type = 0;
+			var from = "";
+			var to = "";
+
+			show_shift_name(period,period_type,from,to,'shift_item');	
+		}   
+		
+		$('#from').change(function(){
+			search_by_date();	   
+		});
+		
+		$('#to').change(function(){
+			search_by_date();
+		});   
+		
+		function search_by_date(){
+			var from = $('#from').val();
+			var to = $('#to').val();
+			var period = 0;
+			var period_type = 1;	   
+
+			if(to != '' && from != ''){
+				shift_name = from + ',' + to;
+
+				check_arr.push(to);
+				
+				console.log(check_arr.length)
+				if(check_arr.length == 1){
+					show_shift_name(period,period_type,from,to,'shift_item');	   	
+				}
+				if(check_arr.length == 3){
+					check_arr = [];
+				}
+			}
+			
+		}
+		
+		function show_shift_name(period,period_type,from,to,shift_item){
+			var shift = $('#shift_name');
+			
+			shift.empty();
+			
+			var str = '';
+			var param_shift = '';	   
+			var param_shift = '<%= params[:shift_name] rescue '-'%>';
+
+			url = '<%= reports_get_shift_by_date_path %>';
+			
+			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
+
+				str = '<option value="0">--- All Shift ---</option>';
+				$(data.message).each(function(index){	
+					
+					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
+					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
+					var shift_id = data.message[index].shift_id ;
+					if(param_shift != ''){
+						if(shift_id == param_shift){
+							selected = 'selected = "selected"';
+						}
+						else{
+							selected = '';			   
+						}			   	
+					}else{
+						selected = '';			   
+					}		   			   
+					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
+					
+			   // console.log(sh_date)
+			}) 
+				shift.append(str);
+			});
+		}
+
+	});
+</script>

app/views/reports/payment_method/index.xls.erb

@@ -0,0 +1,98 @@
+<div class="container margin-top-20">
+	<div class="card row">
+		<table class="table table-striped" border="0">
+			<thead>
+					<tr>
+				        <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+				   </tr>
+					<% if @shift_from %>
+					<tr>
+						<% if @shift_data.employee %>		
+						<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+						<% end %>			
+						<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+					</tr>
+					<% end %>	 
+
+				<tr>
+					<th>Recipt No</th>
+					<th>Cashier Name</th>		
+					<th>Total Amount</th>
+					<th>Discount Amount </th>
+					<% @sale_taxes.each do |tax| %>
+					<th><%= tax.tax_name %></th>
+								
+					<% end %>
+					<!-- <th>Other Amount</th> -->
+					<th>Grand Total</th>
+					<th>Rounding Adj.</th>
+					<th>Grand Total +<br/>
+						Rounding Adj.
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<% 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 %>
+					
+					<tr>
+						
+						<td><%= result.receipt_no rescue '-' %> </td>
+						<td><%= result.cashier_name rescue '-' %></td>
+						<td><%= result.total_amount rescue '-' %></td>
+						<td><%= result.total_discount rescue '-' %></td>
+						<% result.sale_taxes.each do |tax| %>
+							<td><%= tax.tax_payable_amount rescue '-' %></td>
+						<%end%>
+						
+						<td><%= result.old_grand_total %></td>			
+						<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
+						<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
+					</tr>
+
+					<% end %>
+					<tr style="border-top:4px double #666;">
+						<td colspan="2">&nbsp;</td>
+						<td><b><%= total_sum  rescue '-'%></b></td>
+						<td><b><%= discount_amt  rescue '-'%></b></td>
+						<% @sale_taxes.each do |tax| %>
+							<td><b><%= tax.st_amount.round(2) %></b></td>
+						<% end %>
+						<td><b><%= old_grand_total.to_f.round(2)  rescue '-'%></b></td>		
+						<td><b><%= rounding_adj  rescue '-'%></b></td>		
+						<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td>				
+					</tr>
+					<tr>
+						<td colspan="2">&nbsp;</td>
+						<td>Total Amount</td>
+						<td>Discount Amount</td>
+						<% @sale_taxes.each do |tax| %>
+							<td><%= tax.tax_name %></td>
+						<% end %>
+						<td>Grand Total</td>
+						<td>Rounding Adj.</td>
+						<td>Grand Total +<br/>
+							Rounding Adj.
+						</td>
+					</tr>
+				<%end%>
+		</tbody>
+	</table>
+</div>
+</div>

app/views/transactions/sales/show.html.erb

@@ -238,7 +238,7 @@
                         <tr>
                           <td><%= audit.action%></td>
                           <td><%=  audit.action_at.strftime("%m-%d-%Y %H:%M %p")%></td>
-                           <td><%=  audit.approved_by.to_datetime.strftime("%m-%d-%Y %H:%M %p")%></td>
+                           <td><%=  audit.approved_by%></td>
                           <td><%= audit.remark%></td>
                          
                         </tr>

config/routes.rb

@@ -341,6 +341,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :void_sale, :only => [:index, :show]
     resources :commission, :only => [:index, :show]
     resources :stock_check, :only => [:index, :show]
+    resources :payment_method
 
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
   end