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

edit for shop_code query

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-01-13 15:28:26 +06:30
parent bad46cf02c
commit d379c05298
32 changed files with 58 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/foodcourt/customers_controller.rb
View File

@@ -87,8 +87,9 @@ class Foodcourt::CustomersController < BaseFoodcourtController
@count_customer = Customer.count_customer
# @taxes = TaxProfile.where(:group_type => 'cashier')
@taxes = TaxProfile.unscoped.select("id, (CONCAT(name,'(',(SELECT name FROM lookups WHERE lookup_type='tax_profiles' AND value=group_type),')')) as name")
.order("group_type ASC,order_by ASC")
@taxes = TaxProfile.unscope(:order).select("tax_profiles.id, CONCAT(tax_profiles.name, '(', lookups.name, ')') as name")
.joins(:lookup)
.order("group_type ASC, order_by ASC")
# if flash["errors"]
# @crm_customer.valid?
# end

2
app/controllers/foodcourt/sale_edit_controller.rb
View File

@@ -118,7 +118,7 @@ class Foodcourt::SaleEditController < BaseFoodcourtController
sale.compute_by_sale_items(sale.total_discount, nil, order_source)
ProductCommission.edit_product_commission(saleitemObj,sale.shop_code)
ProductCommission.edit_product_commission(saleitemObj)
end
# make cancel void item

2
app/controllers/foodcourt/shifts_controller.rb
View File

@@ -92,7 +92,7 @@ class Foodcourt::ShiftsController < BaseFoodcourtController
#get tax
shift_obj = ShiftSale.where('id =?',@shift.id)
sale_items = ''
@lookup = Lookup.shift_sale_items_lookup_value(@shop.shop_code)
@lookup = Lookup.shift_sale_items_lookup_value
if @lookup.to_i == 1
@sale_items = Sale.get_shift_sale_items(@shift.id)
other_charges = Sale.get_other_charges()