diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb index 854354c2..1d34f9c9 100644 --- a/app/controllers/settings/dining_charges_controller.rb +++ b/app/controllers/settings/dining_charges_controller.rb @@ -51,6 +51,10 @@ class Settings::DiningChargesController < ApplicationController respond_to do |format| @dining_charge.dining_facility_id = @settings_dining_facility.id if @dining_charge.update(dining_charge_params) + # @dining_charge.minimum_free_time = @dining_charge.minimum_free_time.to_datetime.advance(hours: +6, minutes: +30) + # @dining_charge.charge_block = @dining_charge.charge_block.to_datetime.advance(hours: +6, minutes: +30) + # @dining_charge.time_rounding_block = @dining_charge.time_rounding_block.to_datetime.advance(hours: +6, minutes: +30) + # @dining_charge.save if @table format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' } else diff --git a/app/models/promotion.rb b/app/models/promotion.rb index 282d6798..025abd4b 100644 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -146,7 +146,7 @@ class Promotion < ApplicationRecord sale_item.sale_id = sale_id sale_item.save - sale = Sale.find(sale_id). + sale = Sale.find(sale_id) sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount) end @@ -207,6 +207,7 @@ class Promotion < ApplicationRecord return item[1] end end + return 0 end def self.calculate_discount(total, discount)