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

fixed credit transactions

Browse Source
This commit is contained in:
NyanLinHtut
2020-01-15 16:26:55 +06:30
parent 2d57faf7cf
commit ab70ddb8aa
3 changed files with 28 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/controllers/transactions/credit_notes_controller.rb
View File

@@ -1,5 +1,5 @@
class Transactions::CreditNotesController < ApplicationController
before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy]
before_action :check_user
@@ -15,24 +15,9 @@ class Transactions::CreditNotesController < ApplicationController
to = params[:to]
order_source = params[:order_source]
if filter.nil? && from.nil? && to.nil? && customer.nil? && order_source.nil?
order_source_query = "(select orders.source FROM orders JOIN sale_orders so ON so.order_id=orders.order_id WHERE so.sale_id=sales.sale_id GROUP BY so.sale_id)"
@credit_notes = Sale.select("sales.*, #{order_source_query} as source")
.joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id")
.where("(CASE WHEN (sales.grand_total + sales.amount_changed)=(select SUM(sale_payments.payment_amount)
FROM sale_payments WHERE sale_payments.sale_id=sales.sale_id AND sale_payments.payment_method!='creditnote')
THEN NULL ELSE payment_method='creditnote' END)")
@credit_notes = Kaminari.paginate_array(@credit_notes).page(params[:page]).per(20)
else
sale = Sale.search_credit_sales(customer,filter,from,to,order_source)
if !sale.nil?
@credit_notes = sale
@credit_notes = Kaminari.paginate_array(@credit_notes).page(params[:page]).per(20)
else
@credit_notes = 0
end
end
sale = Sale.search_credit_sales(customer,filter,from,to,order_source)
@credit_notes = Kaminari.paginate_array(sale).page(params[:page]).per(20)
respond_to do |format|
format.html # index.html.erb
format.json { render json: @credit_notes }
@@ -45,5 +30,5 @@ class Transactions::CreditNotesController < ApplicationController
redirect_to root_path
end
end
end
end