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

clean shop code

Browse Source
This commit is contained in:
Zin Moe
2020-01-13 16:23:33 +06:30
parent d379c05298
commit 66c375cc38
37 changed files with 20 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/sale.rb
View File

@@ -847,7 +847,7 @@ def self.get_by_range_by_saleitems(from,to,status,report_type)
query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status)
end
def self.get_by_shiftsales(from,to,shift,shop_code)
def self.get_by_shiftsales(from,to,shift)
if !shift.blank?
query = ShiftSale.where("shift_sales.id =?",shift.id)
else
@@ -972,7 +972,7 @@ def self.get_other_charges()
query = query.group("i.sale_item_id")
end
def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type,account_type,shop_code)
def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type,account_type)
# date_type_selection = get_sql_function_for_report_type(report_type)
if account_type.blank?
account_type = ''
@@ -1254,7 +1254,7 @@ def self.get_shift_sales_by_receipt_no_detail(shift_sale_range,shift,from,to,pay
return query
end
def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,order_source,shop_code)
def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,order_source)
payments_for_credits = SalePayment.select("
sales.sale_id,
DATE_FORMAT(CONVERT_TZ(sale_payments.created_at,'+00:00','+06:30'),'%d %b %y %h:%i%p') as credit_payment_receipt_date,
@@ -1310,7 +1310,7 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,
credits = credits.group("sale_payments.sale_payment_id, sales_sale_payments.sale_id")
end
def self.get_void_sale(shift,from,to,shop_code)
def self.get_void_sale(shift,from,to)
sale_arr = Array.new
query = Sale.select("sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment")