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

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

Browse Source
This commit is contained in:
phyusin
2017-10-26 16:20:35 +06:30
parent 51dbb321a2 6b88403186
commit c98b5cbb6e
14 changed files with 129 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,31 +21,26 @@
<% @settings_room.dining_charges.each do |dc| %>
<div class="card">
<div class="col-md-7">
<div class="col-md-">
<table class="table">
<tr><td colspan="2">
<div class="col-md-10"><b><u>Dining Charge</u></b></div></td>
</tr>
<tr>
<td>Item code :</td>
<td><%= dc.item_code %></td>
</tr>
<tr>
<td>Unit price : </td>
<td><%= dc.unit_price %></td>
</tr>
<tr>
<td>Charge type : </td>
<td><%= dc.charge_type %></td>
</tr>
<tr>
<td class="align-right">Item code :</td>
<td class="align-left"><%= dc.item_code %></td>
<td class="align-right">Unit price : </td>
<td class="align-left"><%= dc.unit_price %></td>
<td class="align-right">Charge type : </td>
<td class="align-left"><%= dc.charge_type %></td>
<td>
<%= link_to 'Edit Charges', edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc),:class => 'btn bg-deep-purple' %>
<!-- <button class="btn btn-primary" src="<%= edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc) %>">Edit Charge</button> -->
</td>
<td></td>
</tr>
</tr>
</table>
</div>
</div>

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

@@ -24,22 +24,16 @@
<div class="col-md-10"><b><u>Dining Charge</u></b></div></td>
</tr>
<tr>
<td>Item code :</td>
<td><%= dc.item_code %></td>
</tr>
<tr>
<td>Unit price : </td>
<td><%= dc.unit_price %></td>
</tr>
<tr>
<td>Charge type : </td>
<td><%= dc.charge_type %></td>
</tr>
<tr>
<td><%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn bg-deep-purple' %>
<td class="align-right">Item code :</td>
<td class="align-left"><%= dc.item_code %></td>
<td class="align-right">Unit price : </td>
<td class="align-left"><%= dc.unit_price %></td>
<td class="align-right">Charge type : </td>
<td class="align-left"><%= dc.charge_type %></td>
<td><%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn bg-deep-purple' %>
<!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> --></td>
<td></td>
</tr>
</tr>
</table>
</div>
</div>