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

Room Charges Bug Fix

Browse Source
This commit is contained in:
Phyo
2017-08-14 15:33:13 +06:30
parent 497a1b60f7
commit af3a7c1d88
3 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/settings/dining_charges_controller.rb
View File

@@ -29,7 +29,11 @@ class Settings::DiningChargesController < ApplicationController
@dining_charge.dining_facility_id = @settings_dining_facility.id @dining_charge.dining_facility_id = @settings_dining_facility.id
respond_to do |format| respond_to do |format|
if @dining_charge.save 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 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 } format.json { render :show, status: :created, location: @dining_charge }
else else
format.html { render :new } format.html { render :new }
@@ -44,7 +48,11 @@ class Settings::DiningChargesController < ApplicationController
respond_to do |format| respond_to do |format|
@dining_charge.dining_facility_id = @settings_dining_facility.id @dining_charge.dining_facility_id = @settings_dining_facility.id
if @dining_charge.update(dining_charge_params) if @dining_charge.update(dining_charge_params)
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 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 } format.json { render :show, status: :ok, location: @dining_charge }
else else
format.html { render :edit } format.html { render :edit }

22
app/views/settings/rooms/_form.html.erb
View File

@@ -7,6 +7,28 @@
<%= f.input :seater %> <%= f.input :seater %>
<%= f.input :order_by %> <%= f.input :order_by %>
<%= f.input :is_active %> <%= 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>
<div class="form-actions"> <div class="form-actions">

2
app/views/settings/tables/_form.html.erb
View File

@@ -8,11 +8,13 @@
<%= f.input :order_by %> <%= f.input :order_by %>
<%= f.input :is_active %> <%= f.input :is_active %>
<% if @settings_table.dining_charges.length == 0 %> <% if @settings_table.dining_charges.length == 0 %>
<% if @settings_table.id != nil %>
<div class="div-border"> <div class="div-border">
<div class="col-md-10"> <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' %> <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %>
</div> </div>
</div> </div>
<% end %>
<% else %> <% else %>
<% @settings_table.dining_charges.each do |dc| %> <% @settings_table.dining_charges.each do |dc| %>
<div class="div-border"> <div class="div-border">