diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb
index 576703ed..763f5086 100755
--- a/app/controllers/settings/dining_charges_controller.rb
+++ b/app/controllers/settings/dining_charges_controller.rb
@@ -16,9 +16,9 @@ class Settings::DiningChargesController < ApplicationController
   # GET /dining_charges/new
   def new
     @dining_charge = DiningCharge.new
-    @dining_charge.minimum_free_time="00:30"
-    @dining_charge.charge_block="02:00"
-    @dining_charge.time_rounding_block="00:15"
+    @dining_charge.minimum_free_time = "00:15:00".to_datetime
+    @dining_charge.charge_block= "02:00:00".to_datetime
+    @dining_charge.time_rounding_block="00:15:00".to_datetime
   end
 
   # GET /dining_charges/1/edit
@@ -27,15 +27,19 @@ class Settings::DiningChargesController < ApplicationController
 
   # POST /dining_charges
   # POST /dining_charges.json
-  def create
+  def create    
     @dining_charge = DiningCharge.new(dining_charge_params)
     @dining_charge.dining_facility_id = @settings_dining_facility.id
+    @dining_charge.minimum_free_time = DateTime.parse(dining_charge_params["minimum_free_time"])
+    @dining_charge.charge_block = DateTime.parse(dining_charge_params["charge_block"])
+    @dining_charge.time_rounding_block = DateTime.parse(dining_charge_params["time_rounding_block"])
+    
     respond_to do |format|
       if @dining_charge.save
         if @table
-          format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+          format.html { redirect_to settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
         else
-          format.html { redirect_to edit_settings_zone_room_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+          format.html { redirect_to settings_zone_room_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
         end
         format.json { render :show, status: :created, location: @dining_charge }
       else
@@ -56,9 +60,9 @@ class Settings::DiningChargesController < ApplicationController
         # @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.' }
+          format.html { redirect_to settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
         else
-          format.html { redirect_to edit_settings_zone_room_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
+          format.html { redirect_to settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
         end
         format.json { render :show, status: :ok, location: @dining_charge }
       else