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

check tax error, filter for credit payment report and add query for sale payment in receipt no detail

Browse Source
This commit is contained in:
phyusin
2018-07-20 13:43:29 +06:30
parent 91fc8696af
commit 5c75a99e41
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/origami/home_controller.rb
View File

@@ -60,7 +60,7 @@ class Origami::HomeController < BaseOrigamiController
accounts = @customer.tax_profiles accounts = @customer.tax_profiles
@account_arr =[] @account_arr =[]
accounts.each do |acc| accounts.each do |acc|
account = TaxProfile.find(acc) account = TaxProfile.find_by_id(acc)
if !account.nil? if !account.nil?
@account_arr.push(account) @account_arr.push(account)
end end
@@ -85,7 +85,7 @@ class Origami::HomeController < BaseOrigamiController
accounts = @customer.tax_profiles accounts = @customer.tax_profiles
@account_arr =[] @account_arr =[]
accounts.each do |acc| accounts.each do |acc|
account = TaxProfile.find(acc) account = TaxProfile.find_by_id(acc)
if !account.nil? if !account.nil?
@account_arr.push(account) @account_arr.push(account)
end end

4
app/controllers/origami/rooms_controller.rb
View File

@@ -60,7 +60,7 @@ class Origami::RoomsController < BaseOrigamiController
accounts = @customer.tax_profiles accounts = @customer.tax_profiles
@account_arr =[] @account_arr =[]
accounts.each do |acc| accounts.each do |acc|
account = TaxProfile.find(acc) account = TaxProfile.find_by_id(acc)
if !account.nil? if !account.nil?
@account_arr.push(account) @account_arr.push(account)
end end
@@ -85,7 +85,7 @@ class Origami::RoomsController < BaseOrigamiController
accounts = @customer.tax_profiles accounts = @customer.tax_profiles
@account_arr =[] @account_arr =[]
accounts.each do |acc| accounts.each do |acc|
account = TaxProfile.find(acc) account = TaxProfile.find_by_id(acc)
if !account.nil? if !account.nil?
@account_arr.push(account) @account_arr.push(account)
end end

4
app/controllers/reports/credit_payment_controller.rb
View File

@@ -4,7 +4,7 @@ authorize_resource :class => false
@filter_for_credit = [['All',''],['Paid','paid'],['Unpaid','unpaid']] @filter_for_credit = [['All',''],['Paid','paid'],['Unpaid','unpaid']]
from, to = get_date_range_from_params from, to = get_date_range_from_params
@shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) @shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
@shift = '' @shift = ''
if params[:shift_name].to_i != 0 if params[:shift_name].to_i != 0
@@ -42,7 +42,7 @@ authorize_resource :class => false
def show def show
from, to = get_date_range_from_params from, to = get_date_range_from_params
@sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
date_arr = Array.new date_arr = Array.new
@sale_data.each do |sale| @sale_data.each do |sale|

2
app/models/sale.rb
View File

@@ -1926,7 +1926,7 @@ end
query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first() query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
end end
else else
if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor' if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account'
if !from_time.nil? && !to_time.nil? if !from_time.nil? && !to_time.nil?
query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id") query = Sale.joins("JOIN sale_payments as sp ON sp.sale_id = sales.sale_id")
if payment_method == 'card' if payment_method == 'card'

8
app/views/reports/receipt_no_detail/index.html.erb
View File

@@ -127,14 +127,14 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<% end %> <% end %>
<% sale_payments = SalePayment.get_sale_payments(result) %>
<% if result.sale_payments.count > 0%> <% if sale_payments.length > 0%>
<% result.sale_payments.each do |rec| %> <% sale_payments.each do |rec| %>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>Payment <%= rec.payment_method.upcase %></td> <td>Payment <%= rec.payment_method.upcase %></td>
<td><%= rec.payment_amount %> ( <%= result.payment_status %> )</td> <td><%= rec.payment_amount %> ( <%= rec.payment_status %> )</td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>

5
app/views/reports/receipt_no_detail/index.xls.erb
View File

@@ -119,8 +119,9 @@
</tr> </tr>
<% end %> <% end %>
<% if result.sale_payments.count > 0%> <% sale_payments = SalePayment.get_sale_payments(result) %>
<% result.sale_payments.each do |rec| %> <% if sale_payments.length > 0%>
<% sale_payments.each do |rec| %>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>