git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-11-01 17:14:44 +06:30
parent 17fb38158b ebb2114243
commit 15196053a0
12 changed files with 233 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/reports/payment_method_controller.rb
View File

@@ -2,7 +2,7 @@ class Reports::PaymentMethodController < BaseReportController
# authorize_resource :class => false # authorize_resource :class => false
def index 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"], ["FOC Payment","foc"], ["MPU Payment","mpu"], ["Visa Payment","visa"],
["Master Payment","master"], ["JCB Payment","jcb"], ["Redeem Payment","paypar"]] ["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) @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)
end end
end end
payment_type = params[: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) @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 @from = from
@to = to @to = to

41
app/models/sale.rb
View File

@@ -793,11 +793,12 @@ 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) 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, sale_payment = SalePayment.select("s.receipt_no, sale_payments.*,s.receipt_date as sale_date,
s.cashier_name as cashier_name") s.cashier_name as cashier_name")
.joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id") .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='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='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='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='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='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") 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? 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) 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')") # .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? 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) 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')")
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) 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 else
all_total = payments_total.where("sales.receipt_date and sale_status= 'completed' and sale_payments.payment_amount != 0", 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')")
sale_type = sale_payment.where("payment_method='#{payment_type}' and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to) 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 end
return all_total,sale_type return all_total,sale_type
end end

3
app/views/layouts/_left_sidebar.html.erb
View File

@@ -118,6 +118,9 @@
<li> <li>
<a href="<%= reports_void_sale_index_path %>">Void Sales</a> <a href="<%= reports_void_sale_index_path %>">Void Sales</a>
</li> </li>
<li>
<a href="<%= reports_payment_method_index_path %>">Payment Method</a>
</li>
<li> <li>
<a href="<%= reports_commission_index_path %>">Commission</a> <a href="<%= reports_commission_index_path %>">Commission</a>
</li> </li>

10
app/views/reports/credit_payment/index.html.erb
View File

@@ -81,11 +81,13 @@
show_shift_name(period,period_type,from,to,'shift_item'); show_shift_name(period,period_type,from,to,'shift_item');
} }
$('#from').change(function(){ // OK button is clicked
search_by_date(); $('#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').change(function(){ $('#to').val(date.format("DD-MM-YYYY"))
search_by_date(); search_by_date();
}); });

4
app/views/reports/payment_method/_shift_sale_report_filter.html.erb
View File

@@ -27,11 +27,11 @@
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<!-- <label class="">Select Shift Period</label> --> <!-- <label class="">Select Shift Period</label> -->
<label class="font-14"><%= t("views.right_panel.detail.from") %></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"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3 from" name="from" id="from" type="text" placeholder="From date">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14"><%= t("views.right_panel.detail.to") %></label> <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"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3 to" name="to" id="to" type="text" placeholder="To date">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label> <label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>

96
app/views/reports/payment_method/index.html.erb
View File

@@ -1,7 +1,7 @@
<div class="page-header"> <div class="page-header">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li> <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> <li class="breadcrumb-item active">Payment Method Report</li>
<span class="float-right"> <span class="float-right">
<%= link_to 'Back', dashboard_path %> <%= link_to 'Back', dashboard_path %>
</span> </span>
@@ -15,7 +15,7 @@
:locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_payment_method_index_path} %> :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_payment_method_index_path} %>
<hr /> <hr />
<div class="text-right"> <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> <a href="javascript:export_to('<%=reports_payment_method_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
</div> </div>
<div class="margin-top-20"> <div class="margin-top-20">
@@ -23,14 +23,20 @@
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <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> <th colspan="9">
<strong>
<%= 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 '-'%>
</strong>
</th>
</tr> </tr>
<% if @shift_from %> <% if @shift_from %>
<tr> <tr>
<% if @shift_data.employee %> <% if @shift_data.employee %>
<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
<% end %> <% end %>
<th colspan="9"><%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th> <th colspan="9">
<strong><%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</strong>
</th>
</tr> </tr>
<% end %> <% end %>
<tr> <tr>
@@ -64,30 +70,51 @@
</table> </table>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<%if @payment_type.present?%>
<tr>
<td colspan="6"><strong><%=@payment_type.upcase%> Payment Details</strong></td>
</tr>
<%else%>
<tr>
<td colspan="6"><strong>All Payment Details</strong></td>
</tr>
<%end%>
<tr> <tr>
<th> <%= t("views.right_panel.detail.shift_name") %> </th> <th> <%= t("views.right_panel.detail.shift_name") %> </th>
<th> <%= t("views.right_panel.detail.receipt_no") %></th> <th> <%= t("views.right_panel.detail.payment_method") %></th>
<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th> <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th> <th> <%= t :payment_method %></th>
<th> <%= t("views.right_panel.detail.amount") %> </th> <th> <%= t("views.right_panel.detail.amount") %> </th>
<th><%= t("views.right_panel.detail.grand_total") %></th> <th><%= t("views.right_panel.detail.grand_total") %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% total = 0 %>
<% @pyament_method.each do |payment| %> <% @pyament_method.each do |payment| %>
<tr> <% total += payment.payment_amount %>
<% if @shift_from.nil? && @shift_to.nil? %> <tr>
<td><%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%></td> <% if @shift_from.nil? && @shift_to.nil? %>
<% else %> <td><%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%></td>
<td><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%></td> <% else %>
<% end %> <td><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%></td>
<td><%= payment.receipt_no rescue '-' %></td> <% end %>
<td><%= payment.cashier_name rescue '-' %></td> <td><%= payment.receipt_no rescue '-' %></td>
<td><%= payment.sale.customer.name rescue '-' %></td> <td><%= payment.cashier_name rescue '-' %></td>
<td><%= payment.payment_amount rescue '-' %></td> <!--<td><%= payment.sale.customer.name rescue '-' %></td>-->
<td><%= payment.sale.grand_total rescue '-' %></td> <td><%= payment.payment_method rescue '-' %></td>
</tr> <td><%= payment.payment_amount rescue '-' %></td>
<td><%= payment.sale.grand_total rescue '-' %></td>
</tr>
<% end %> <% end %>
<%if total>0%>
<tr>
<td colspan="4" style="text-align: right;"><strong >Total </strong></td>
<td colspan="2"><strong><%=total%></strong></td>
</tr>
<%end%>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -97,13 +124,10 @@
<script> <script>
$(function(){ $(function(){
var check_arr = []; var check_arr = [];
$('#sel_period').change(function(){ $('#sel_period').change(function(){
search_by_period(); search_by_period();
}); });
function search_by_period(){ function search_by_period(){
@@ -114,27 +138,30 @@
show_shift_name(period,period_type,from,to,'shift_item'); show_shift_name(period,period_type,from,to,'shift_item');
} }
$('#from').change(function(){ // OK button is clicked
search_by_date(); $('#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').change(function(){ $('#to').val(date.format("DD-MM-YYYY"))
search_by_date(); search_by_date();
}); });
function search_by_date(){ function search_by_date(){
var from = $('#from').val();
var to = $('#to').val();
var period = 0;
var period_type = 1;
var from = $('#from').val();
var to = $('#to').val();
console.log(from);
console.log(to);
var period = 0;
var period_type = 1;
if(to != '' && from != ''){ if(to != '' && from != ''){
shift_name = from + ',' + to; shift_name = from + ',' + to;
check_arr.push(to); check_arr.push(to);
console.log(check_arr.length)
if(check_arr.length == 1){ if(check_arr.length == 1){
show_shift_name(period,period_type,from,to,'shift_item'); show_shift_name(period,period_type,from,to,'shift_item');
} }
@@ -153,11 +180,11 @@
var str = ''; var str = '';
var param_shift = ''; var param_shift = '';
var param_shift = '<%= params[:shift_name] rescue '-'%>'; var param_shift = '<%= params[:shift_name] rescue '-'%>';
console.log(param_shift);
url = '<%= reports_get_shift_by_date_path %>'; url = '<%= reports_get_shift_by_date_path %>';
console.log(url);
$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){ $.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
console.log(data);
str = '<option value="0">--- All Shift ---</option>'; str = '<option value="0">--- All Shift ---</option>';
$(data.message).each(function(index){ $(data.message).each(function(index){
@@ -183,4 +210,5 @@
} }
}); });
</script> </script>

195
app/views/reports/payment_method/index.xls.erb
View File

@@ -1,98 +1,101 @@
<div class="container margin-top-20"> <div class="margin-top-20">
<div class="card row"> <div class="card">
<table class="table table-striped" border="0"> <table class="table table-bordered">
<thead> <thead>
<tr> <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> <th colspan="9">
</tr> <strong>
<% if @shift_from %> <%= 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 '-'%>
<tr> </strong>
<% if @shift_data.employee %> </th>
<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> </tr>
<% end %> <% if @shift_from %>
<th colspan="7">Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th> <tr>
</tr> <% if @shift_data.employee %>
<% end %> <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
<% end %>
<tr> <th colspan="9">
<th>Recipt No</th> <strong><%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</strong>
<th>Cashier Name</th> </th>
<th>Total Amount</th> </tr>
<th>Discount Amount </th> <% end %>
<% @sale_taxes.each do |tax| %> <tr>
<th><%= tax.tax_name %></th> <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>
<%if @payment_type.present?%>
<tr>
<td colspan="6"><strong><%=@payment_type.upcase%> Payment Details</strong></td>
</tr>
<%else%>
<tr>
<td colspan="6"><strong>All Payment Details</strong></td>
</tr>
<%end%>
<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 :payment_method %></th>
<th> <%= t("views.right_panel.detail.amount") %> </th>
<th><%= t("views.right_panel.detail.grand_total") %></th>
</tr>
</thead>
<tbody>
<% total = 0 %>
<% @pyament_method.each do |payment| %>
<% total += payment.payment_amount %>
<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_method rescue '-' %></td>
<td><%= payment.payment_amount rescue '-' %></td>
<td><%= payment.sale.grand_total rescue '-' %></td>
<% end %> </tr>
<!-- <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 %> <% end %>
<td><b><%= old_grand_total.to_f.round(2) rescue '-'%></b></td> <%if total>0%>
<td><b><%= rounding_adj rescue '-'%></b></td> <tr>
<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td> <td colspan="4" style="text-align: right;"><strong >Total </strong></td>
</tr> <td colspan="2"><strong><%=total%></strong></td>
<tr> </tr>
<td colspan="2">&nbsp;</td> <%end%>
<td>Total Amount</td> </tbody>
<td>Discount Amount</td> </table>
<% @sale_taxes.each do |tax| %> </div>
<td><%= tax.tax_name %></td> </div>
<% end %>
<td>Grand Total</td>
<td>Rounding Adj.</td>
<td>Grand Total +<br/>
Rounding Adj.
</td>
</tr>
<%end%>
</tbody>
</table>
</div>
</div>

10
app/views/reports/receipt_no/index.html.erb
View File

@@ -145,11 +145,13 @@
show_shift_name(period,period_type,from,to,'shift_item'); show_shift_name(period,period_type,from,to,'shift_item');
} }
$('#from').change(function(){ // OK button is clicked
search_by_date(); $('#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').change(function(){ $('#to').val(date.format("DD-MM-YYYY"))
search_by_date(); search_by_date();
}); });

10
app/views/reports/saleitem/index.html.erb
View File

@@ -209,11 +209,13 @@
show_shift_name(period,period_type,from,to,'shift_item'); show_shift_name(period,period_type,from,to,'shift_item');
} }
$('#from').change(function(){ // OK button is clicked
search_by_date(); $('#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').change(function(){ $('#to').val(date.format("DD-MM-YYYY"))
search_by_date(); search_by_date();
}); });

10
app/views/reports/shiftsale/index.html.erb
View File

@@ -143,11 +143,13 @@
show_shift_name(period,period_type,from,to,'shift_item'); show_shift_name(period,period_type,from,to,'shift_item');
} }
$('#from').change(function(){ // OK button is clicked
search_by_date(); $('#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').change(function(){ $('#to').val(date.format("DD-MM-YYYY"))
search_by_date(); search_by_date();
}); });

14
app/views/reports/void_sale/index.html.erb
View File

@@ -103,13 +103,15 @@
show_shift_name(period,period_type,from,to,'shift_item'); show_shift_name(period,period_type,from,to,'shift_item');
} }
$('#from').change(function(){ // OK button is clicked
search_by_date(); $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
}); $('#from').val(date.format("DD-MM-YYYY"))
$('#to').change(function(){
search_by_date(); search_by_date();
}); });
$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
$('#to').val(date.format("DD-MM-YYYY"))
search_by_date();
});
function search_by_date(){ function search_by_date(){
var from = $('#from').val(); var from = $('#from').val();

1
config/locales/en.yml
View File

@@ -409,6 +409,7 @@ en:
select_payments: "Select Payments" select_payments: "Select Payments"
all_shift: "All Shift" all_shift: "All Shift"
receipt_no_report: "Receipt No Report" receipt_no_report: "Receipt No Report"
payment_method_report: "Payment Method Report"
rnd_adj_sh: "Rounding Adj." rnd_adj_sh: "Rounding Adj."
shift_sale_report: "Shift Sale Report" shift_sale_report: "Shift Sale Report"
cashier_station: "Cashier Station" cashier_station: "Cashier Station"