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

18
app/views/crm/customers/_new_form.html.erb
View File

@@ -15,14 +15,14 @@
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
</div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
<%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
<% flash.each do |test, msg| %>
<%
str="[\"#{msg['name']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block" style="margin-top:-6px"><%= str %></span>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<% end -%>
</div>
@@ -45,28 +45,28 @@
<% str="[\"#{msg['company']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block" style="margin-top:-6px"><%= str %></span>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<% end -%>
</div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
<%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['contact_no']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block" style="margin-top:-6px"><%= str %></span>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<% end %>
</div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
<%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['email']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block" style="margin-top:-6px"><%= str %></span>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<% end %>
</div>
@@ -101,13 +101,13 @@
<%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %>
</div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
<%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['card_no']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block" style="margin-top:-6px"><%= str %></span>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<% end %>
</div>

24
app/views/layouts/CRM.html.erb
View File

@@ -47,14 +47,22 @@
<!-- Main Content -->
<section class="content">
<% flash.each do |type, message| %>
<div class="alert-danger fade in">
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
<% if !flash["errors"]%>
<%=message%>
<% end %>
</div>
<% flash.each do |type, message| %>
<% if !flash["errors"]%>
<%
if type == "notice"
color = "alert-success"
elsif type == "error"
color = "alert-danger"
else
color = "bg-black"
end
%>
<p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p>
<% end %>
<% end %>
<%= yield %>
</section>

15
app/views/layouts/application.html.erb
View File

@@ -47,7 +47,20 @@
</section>
<!-- Main Content -->
<section class="content">
<section class="content">
<% flash.each do |type, message| %>
<% if type == "notice"
color = "alert-success"
elsif type == "error"
color = "alert-danger"
else
color = "bg-black"
end %>
<p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p>
<% end %>
<%= yield %>
</section>
</body>

20
app/views/layouts/origami.html.erb
View File

@@ -48,14 +48,18 @@
<!-- Main Content -->
<section class="content">
<% flash.each do |type, message| %>
<% if !flash["errors"]%>
<div class="alert fade in">
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
<%=message%>
</div>
<% end %>
<% end %>
<% if type == "notice"
color = "alert-success"
elsif type == "error"
color = "alert-danger"
else
color = "bg-black"
end %>
<p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p>
<% end %>
<%= yield %>
</section>
</body>

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>