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

change query

Browse Source
This commit is contained in:
phyusin
2018-07-16 17:25:47 +06:30
parent 3859bdebcf
commit f6cb06099e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/sale.rb
View File

@@ -726,10 +726,10 @@ class Sale < ApplicationRecord
def self.daily_sales_list(from,to)
sub_query = "SELECT SUM(sale_payments.payment_amount)
FROM SXRestaurants_development.sale_payments
INNER JOIN SXRestaurants_development.sale_audits sa
FROM sale_payments
INNER JOIN sale_audits sa
ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id
INNER JOIN SXRestaurants_development.sales ON sa.sale_id = sales.sale_id
INNER JOIN sales ON sa.sale_id = sales.sale_id
WHERE sales.sale_status='completed' AND sales.receipt_date between '#{from}' and '#{to}'"
payments_total = Sale.select("CAST((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')) AS DATE) as sale_date,
@@ -1228,10 +1228,10 @@ end
def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type)
sub_query = "SELECT SUM(sale_payments.payment_amount)
FROM SXRestaurants_development.sale_payments
INNER JOIN SXRestaurants_development.sale_audits sa
FROM sale_payments
INNER JOIN sale_audits sa
ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id
INNER JOIN SXRestaurants_development.sales ON sa.sale_id = sales.sale_id
INNER JOIN sales ON sa.sale_id = sales.sale_id
WHERE sales.sale_status='completed' "
if shift.present?
@@ -1245,12 +1245,12 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type
end
sub_query1 = "CASE WHEN (SELECT SUM(sale_payments.payment_amount)
FROM SXRestaurants_development.sale_payments
FROM sale_payments
WHERE sale_payments.payment_method = 'creditnote'
AND sale_payments.sale_id = s.sale_id
) - (SELECT SUM(sale_payments.payment_amount)
FROM SXRestaurants_development.sale_payments
INNER JOIN SXRestaurants_development.sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id
FROM sale_payments
INNER JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id
WHERE sale_payments.sale_id = s.sale_id) = 0
THEN sale_payments.sale_id = s.sale_id
AND sale_payments.payment_method!='creditnote' ELSE 1 END"