Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

This commit is contained in:
phyusin
2017-12-08 18:29:11 +06:30

View File

@@ -163,7 +163,7 @@ class Origami::DiscountsController < BaseOrigamiController
# Check for Card Payment
is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments)
if is_card != "true"
# if is_card != "true"
account_types = Account.where("discount=?",true)
table_id = sale.bookings[0].dining_facility_id
table_type = DiningFacility.find(table_id).type
@@ -239,7 +239,7 @@ class Origami::DiscountsController < BaseOrigamiController
render :json => result.to_json
end #end Is Card Payment
# end #end Is Card Payment
end
#discount for selected order