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

comment in shop.rb

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-07-26 13:58:41 +06:30
parent 3d110774ba
commit cdc9675511
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/sale.rb
View File

@@ -1514,7 +1514,7 @@ def self.get_wastes_and_spoilages(from,to,status)
.joins("JOIN sale_items ON sales.sale_id = sale_items.sale_id" )
.where("sales.receipt_date between ? and ? #{type}",from,to)
.group("sales.receipt_no,sale_items.menu_category_code,sale_items.item_instance_code")
.order("sales.sale_id,sale_items.menu_category_name,sale_items.product_name")
.order("sales.sale_id,sale_items.qty desc,sale_items.menu_category_name,sale_items.product_name")
end
# def self.get_separate_tax(from,to,payment_method=nil)

2
app/models/shop.rb
View File

@@ -1,5 +1,5 @@
class Shop < ApplicationRecord
ShopDetail = Shop.find_by_id(1)
#ShopDetail = Shop.find_by_id(1)
# Shop Image Uploader
mount_uploader :logo, ShopImageUploader