diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb
index 6de504bf..2c8e3b7e 100644
--- a/app/controllers/settings/dining_charges_controller.rb
+++ b/app/controllers/settings/dining_charges_controller.rb
@@ -29,7 +29,11 @@ class Settings::DiningChargesController < ApplicationController
     @dining_charge.dining_facility_id = @settings_dining_facility.id
     respond_to do |format|
       if @dining_charge.save
-        format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+        if @table
+          format.html { redirect_to edit_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.' }
+        end
         format.json { render :show, status: :created, location: @dining_charge }
       else
         format.html { render :new }
@@ -44,7 +48,11 @@ class Settings::DiningChargesController < ApplicationController
     respond_to do |format|
       @dining_charge.dining_facility_id = @settings_dining_facility.id
       if @dining_charge.update(dining_charge_params)
-        format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
+        if @table
+          format.html { redirect_to edit_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.' }
+        end
         format.json { render :show, status: :ok, location: @dining_charge }
       else
         format.html { render :edit }
diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb
index 25af618c..a0118e61 100644
--- a/app/views/settings/rooms/_form.html.erb
+++ b/app/views/settings/rooms/_form.html.erb
@@ -7,6 +7,28 @@
     <%= f.input :seater %>
     <%= f.input :order_by %>
     <%= f.input :is_active %>
+    <% if @settings_room.dining_charges.length == 0 %>
+     <% if @settings_room.id != nil %>
+        <div class="div-border">
+              <div class="col-md-10">
+                  <%= link_to 'Add For Extra Charges', new_settings_zone_room_dining_charge_path(@zone,@settings_room),:class => 'btn btn-primary' %>
+              </div>
+        </div>
+      <% end %>
+    <% else %>
+      <%  @settings_room.dining_charges.each do |dc| %>
+      <div class="div-border">
+            <div class="col-md-10"><b><u>Dining Charge</u></b></div>
+            <div class="col-md-10">item code   :  <%= dc.item_code %></div>
+            <div class="col-md-10">Unit price  :  <%= dc.unit_price %></div>
+            <div class="col-md-10">Charge type :  <%= dc.charge_type %></div>
+            <div class="col-md-10">
+              <%= link_to 'Edit Charges', edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc),:class => 'btn btn-primary' %>
+              <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc) %>">Edit Charge</button> -->
+            </div>
+      </div>
+      <% end %>
+    <% end %>
   </div>
 
   <div class="form-actions">
diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb
index 3d641592..9736f523 100644
--- a/app/views/settings/tables/_form.html.erb
+++ b/app/views/settings/tables/_form.html.erb
@@ -8,11 +8,13 @@
     <%= f.input :order_by %>
     <%= f.input :is_active %>
     <% if @settings_table.dining_charges.length == 0 %>
-    <div class="div-border">
-          <div class="col-md-10">
-              <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %>
-          </div>
-    </div>
+      <% if @settings_table.id != nil %>
+        <div class="div-border">
+              <div class="col-md-10">
+                  <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %>
+              </div>
+        </div>
+      <% end %>
     <% else %>
       <%  @settings_table.dining_charges.each do |dc| %>
       <div class="div-border">